[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - 334 commits - accessibility/Library_acc.mk accessibility/Library_java_uno_accessbridge.mk accessibility/source animations/Library_animcore.mk apple_remote/Library_AppleRemote.mk avmedia/Library_avmediagst_0_10.mk avmedia/Library_avmediagst.mk avmedia/Library_avmedia.mk avmedia/Library_avmediaQuickTime.mk avmedia/Library_avmediawin.mk basctl/Library_basctl.mk basctl/source basebmp/CppunitTest_basebmp.mk basebmp/Library_basebmp.mk basebmp/StaticLibrary_basebmp.mk basegfx/CppunitTest_basegfx.mk basegfx/Library_basegfx.mk basic/CppunitTest_basic_enable.mk basic/CppunitTest_basic_nested_struct.mk basic/CppunitTest_basic_scanner.mk basic/Library_sb.mk bean/Library_officebean.mk binaryurp/CppunitTest_binaryurp_test-cache.mk binaryurp/CppunitTest_binaryurp_test-unmarshal.mk binaryurp/Library_binaryurp.mk boost/boost.6397.warnings.patch bridges/Library_gcc3_aix_powerpc.mk bridges/Library_gcc3_ios_arm.mk bridges/Library_gcc3_linux_alpha.mk bridges/Library_gcc3_linux_arm.mk bridges/Library_gcc3_linux_hppa.mk bridges/Library_gcc3_linux_ia64.mk bridges/Library_gcc3_linux_intel.mk bridges/Library_gcc3_linux_m68k.mk bridges/Library_gcc3_linux_mips.mk bridges/Library_gcc3_linux_powerpc64.mk bridges/Library_gcc3_linux_powerpc.mk bridges/Library_gcc3_linux_s390.mk bridges/Library_gcc3_linux_s390x.mk bridges/Library_gcc3_linux_sparc.mk bridges/Library_gcc3_linux_x86-64.mk bridges/Library_gcc3_solaris_intel.mk bridges/Library_gcc3_solaris_sparc.mk bridges/Library_java_uno.mk canvas/Library_cairocanvas.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Library_nullcanvas.mk canvas/Library_simplecanvas.mk canvas/Library_vclcanvas.mk canvas/source chart2/Library_chartcontroller.mk chart2/Library_chartcore.mk chart2/source cli_ure/Executable_climaker.mk cli_ure/Library_cli_cppuhelper_native.mk cli_ure/Library_cli_uno.mk clucene/Library_cl ucene.mk codemaker/source comphelper/CppunitTest_comphelper_test.mk comphelper/Library_comphelper.mk config_host.mk.in configmgr/Library_configmgr.mk configure.in connectivity/Library_ado.mk connectivity/Library_calc.mk connectivity/Library_dbase.mk connectivity/Library_dbpool2.mk connectivity/Library_dbtools.mk connectivity/Library_evoab.mk connectivity/Library_file.mk connectivity/Library_flat.mk connectivity/Library_hsqldb.mk connectivity/Library_jdbc.mk connectivity/Library_kab1.mk connectivity/Library_kabdrv1.mk connectivity/Library_macab1.mk connectivity/Library_macabdrv1.mk connectivity/Library_mork.mk connectivity/Library_mozabdrv.mk connectivity/Library_mozab.mk connectivity/Library_mozbootstrap.mk connectivity/Library_mysql.mk connectivity/Library_odbcbase.mk connectivity/Library_odbc.mk connectivity/Library_postgresql-sdbc-impl.mk connectivity/Library_postgresql-sdbc.mk connectivity/Library_sdbc2.mk connectivity/Library_tdeab1.mk connectivity/Library_tdeabdrv1.mk cppcanvas/Library_cppcanvas.mk cppcanvas/Library_mtfrenderer.mk cppu/CppunitTest_cppu_checkapi.mk cppu/CppunitTest_cppu_qa_any.mk cppu/CppunitTest_cppu_qa_recursion.mk cppu/CppunitTest_cppu_qa_reference.mk cppu/CppunitTest_cppu_qa_unotype.mk cppu/CppunitTest_cppu_test_cppumaker.mk cppuhelper/CppunitTest_cppuhelper_checkapi.mk cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk cppuhelper/CppunitTest_cppuhelper_qa_weak.mk cppuhelper/Library_cppuhelper.mk cppu/Library_affine_uno.mk cppu/Library_cppu.mk cppu/Library_log_uno.mk cppu/Library_purpenvhelper.mk cppu/Library_unsafe_uno.mk cpputools/Executable_regcomp.mk cpputools/Executable_regsingleton.mk cpputools/Executable_uno.mk cui/AllLangResTarget_cui.mk cui/Library_cui.mk cui/Module_cui.mk cui/source cui/uiconfig cui/UI_cui.mk dbaccess/CppunitTest_dbaccess_macros_test.mk dbaccess/Executable_odbcconfig.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm .mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk dbaccess/source desktop/Executable_crashrep.com.mk desktop/Executable_officeloader.mk desktop/Executable_oosplash.mk desktop/Executable_quickstart.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_soffice_bin.mk desktop/Executable_soffice.bin.mk desktop/Executable_soffice.mk desktop/Executable_sweb.mk desktop/Executable_swriter.mk desktop/Executable_unopkg.bin.mk desktop/Library_deploymentgui.mk desktop/Library_deploymentmisc.mk desktop/Library_deployment.mk desktop/Library_migrationoo2.mk desktop/Library_migrationoo3.mk desktop/Library_offacc.mk desktop/Library_sofficeapp.mk desktop/Library_spl.mk desktop/Library_spl_unx.mk desktop/Library_unopkgapp.mk drawinglayer/Library_drawinglayer.mk dtrans/Library_dnd.mk dtrans/Library_dtrans.mk dtrans/Library_ftransl.mk dtrans/Library_mcnttype.mk dtrans/Library_sysdtra ns.mk editeng/CppunitTest_editeng_borderline.mk editeng/CppunitTest_editeng_core.mk editeng/CppunitTest_editeng_lookuptree.mk editeng/Library_editeng.mk embeddedobj/Library_embobj.mk embeddedobj/Library_emboleobj.mk embedserv/Library_emser.mk embedserv/Library_inprocserv.mk eventattacher/Library_evtatt.mk extensions/CppunitTest_extensions_test_update.mk extensions/Executable_nsplugin.mk extensions/Library_abp.mk extensions/Library_bib.mk extensions/Library_dbp.mk extensions/Library_ldapbe2.mk extensions/Library_log.mk extensions/Library_npsoplugin.mk extensions/Library_oleautobridge2.mk extensions/Library_oleautobridge.mk extensions/Library_OOoSpotlightImporter.mk extensions/Library_pcr.mk extensions/Library_pl.mk extensions/Library_res.mk extensions/Library_scn.mk extensions/Library_so_activex.mk extensions/Library_so_activex_x64.mk extensions/Library_updchk.mk extensions/source fileaccess/Library_fileacc.mk filter/CppunitTest_filter_pict_test.mk filter/CppunitTest_filter_t ga_test.mk filter/CppunitTest_filter_tiff_test.mk filter/Executable_svg2odf.mk filter/Library_egi.mk filter/Library_eme.mk filter/Library_epb.mk filter/Library_epg.mk filter/Library_epp.mk filter/Library_eps.mk filter/Library_ept.mk filter/Library_era.mk filter/Library_eti.mk filter/Library_exp.mk filter/Library_filterconfig.mk filter/Library_flash.mk filter/Library_icd.mk filter/Library_icg.mk filter/Library_idx.mk filter/Library_ime.mk filter/Library_ipb.mk filter/Library_ipd.mk filter/Library_ips.mk filter/Library_ipt.mk filter/Library_ipx.mk filter/Library_ira.mk filter/Library_itg.mk filter/Library_iti.mk filter/Library_msfilter.mk filter/Library_odfflatxml.mk filter/Library_pdffilter.mk filter/Library_placeware.mk filter/Library_PptImporter.mk filter/Library_svgfilter.mk filter/Library_t602filter.mk filter/Library_textfd.mk filter/Library_xmlfa.mk filter/Library_xmlfd.mk filter/Library_xsltdlg.mk filter/Library_xsltfilter.mk forms/Library_frm.mk formula/Library_for.mk formula/Library_forui.mk fpicker/Library_fpicker.mk fpicker/Library_fps_aqua.mk fpicker/Library_fps.mk fpicker/Library_fps_odma.mk fpicker/Library_fps_office.mk framework/Library_fwe.mk framework/Library_fwi.mk framework/Library_fwk.mk framework/Library_fwl.mk framework/Library_fwm.mk framework/Library_lomenubar.mk framework/source graphite/README hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Library_hwp.mk i18npool/CppunitTest_i18npool_test_breakiterator.mk i18npool/CppunitTest_i18npool_test_characterclassification.mk i18npool/CppunitTest_i18npool_test_languagetag.mk i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk i18npool/Executable_gencoll_rule.mk i18npool/Executable_genconv_dict.mk i18npool/Executable_gendict.mk i18npool/Executable_genindex_data.mk i18npool/Executable_saxparser.mk i18npool/Library_collator_data.mk i18npool/Library_dict_ja.mk i18npool/Library_dict_zh.mk i18npool/Library_i18nisolang1.mk i18npool/Library_i18npool.mk i18npool/Library_i18nse arch.mk i18npool/Library_index_data.mk i18npool/Library_localedata_en.mk i18npool/Library_localedata_es.mk i18npool/Library_localedata_euro.mk i18npool/Library_localedata_others.mk i18npool/Library_textconv_dict.mk i18nutil/Library_i18nutil.mk idl/Executable_svidl.mk io/Library_acceptor.mk io/Library_connector.mk io/Library_streams.mk io/Library_textinstream.mk io/Library_textoutstream.mk javaunohelper/Library_juh.mk javaunohelper/Library_juhx.mk jurt/Library_jpipe.mk jurt/Library_jpipx.mk jvmaccess/Library_jvmaccess.mk jvmfwk/Executable_javaldx.mk jvmfwk/Library_jvmfwk.mk jvmfwk/Library_sunjavaplugin.mk l10ntools/Executable_gsicheck.mk l10ntools/Executable_uiex.mk l10ntools/Executable_ulfconv.mk l10ntools/inc l10ntools/Module_l10ntools.mk l10ntools/source l10ntools/StaticLibrary_transex.mk Library_merged.mk lingucomponent/Library_guesslang.mk lingucomponent/Library_hyphen.mk lingucomponent/Library_lnth.mk lingucomponent/Library_MacOSXSpell.mk lingucomponent/Library_spell.mk linguistic/Library_lng.mk lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Library_lwpft.mk neon/Library_neon.mk o3tl/CppunitTest_o3tl_tests.mk officecfg/CppunitTest_officecfg_cppheader_test.mk officecfg/registry oox/Library_oox.mk package/Library_package2.mk package/Library_xstor.mk padmin/Executable_spadmin.bin.mk padmin/Library_spa.mk postprocess/checkxml postprocess/packconfig pyuno/Library_pyuno_wrapper.mk regexp/Library_regexp.mk registry/Library_reg.mk remotebridges/Library_uuresolver.mk reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/Library_rptxml.mk reportdesign/source RepositoryExternal.mk RepositoryFixes.mk Repository.mk rsc/Executable_rsc.mk sal/CppunitTest_Module_DLL.mk sal/CppunitTest_sal_bytesequence.mk sal/CppunitTest_sal_checkapi.mk sal/CppunitTest_sal_osl_condition.mk sal/CppunitTest_sal_osl_file.mk sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk sal/CppunitTest_sal_osl_module.mk sal/CppunitTest_sal_osl_mu tex.mk sal/CppunitTest_sal_osl_old_test_file.mk sal/CppunitTest_sal_osl_pipe.mk sal/CppunitTest_sal_osl_process.mk sal/CppunitTest_sal_osl_profile.mk sal/CppunitTest_sal_osl_security.mk sal/CppunitTest_sal_osl_setthreadname.mk sal/CppunitTest_sal_osl_thread.mk sal/CppunitTest_sal_rtl_alloc.mk sal/CppunitTest_sal_rtl_cipher.mk sal/CppunitTest_sal_rtl_crc32.mk sal/CppunitTest_sal_rtl_doublelock.mk sal/CppunitTest_sal_rtl_locale.mk sal/CppunitTest_sal_rtl_math.mk sal/CppunitTest_sal_rtl_ostringbuffer.mk sal/CppunitTest_sal_rtl_oustringbuffer.mk sal/CppunitTest_sal_rtl_strings.mk sal/CppunitTest_sal_rtl_uri.mk sal/CppunitTest_sal_rtl_uuid.mk sal/CppunitTest_sal_tcwf.mk sal/CppunitTest_sal_types.mk sal/Executable_cppunittester.mk sal/Executable_osl_process_child.mk salhelper/CppunitTest_salhelper_checkapi.mk salhelper/Library_salhelper.mk sal/inc sal/Library_lo-bootstrap.mk sal/Library_sal.mk sal/Library_sal_textenc.mk sal/Library_uwinapi.mk sax/CppunitTest_sax.mk sax/Library_exp wrap.mk sax/Library_fastsax.mk sax/Library_sax.mk scaddins/Library_analysis.mk scaddins/Library_date.mk sc/AllLangResTarget_sc.mk sccomp/Library_solver.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfieldobj_header.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_modelobj.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_rangelst_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tableautoformatfield.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_ucalc.mk sc/inc sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scui.mk sc/Library_vbaobj.mk sc/Module_sc.mk scp2/source sc ripting/Library_basprov.mk scripting/Library_dlgprov.mk scripting/Library_protocolhandler.mk scripting/Library_scriptframe.mk scripting/Library_stringresource.mk scripting/Library_vbaevents.mk sc/sdi sc/source sc/uiconfig sc/UI_scalc.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_regression_test.mk sd/CppunitTest_sd_uimpress.mk sdext/CppunitTest_pdfimport.mk sdext/source sd/inc sd/Library_sdd.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk sd/Module_sd.mk sd/source sd/uiconfig sd/UI_sdraw.mk sd/UI_simpress.mk sfx2/CppunitTest_sfx2_metadatable.mk sfx2/inc sfx2/Library_qstart.mk sfx2/Library_sfx.mk sfx2/source shell/Executable_gnome_open_url.mk shell/Executable_lngconvex.mk shell/Executable_senddoc.mk shell/Library_cmdmail.mk shell/Library_desktopbe.mk shell/Library_gconfbe.mk shell/Library_kde4be.mk shell/Library_kdebe.mk shell/Library_localebe.mk shell/Library_macbe.mk shell/Library_ooofilt.mk shell/Library_ooofilt_x64.mk shell/Library_propertyhdl.mk shel l/Library_propertyhdl_x64.mk shell/Library_recentfile.mk shell/Library_shlxthdl.mk shell/Library_shlxthdl_x64.mk shell/Library_smplmail.mk shell/Library_syssh.mk shell/Library_syssh_win.mk shell/Library_tdebe.mk shell/Library_wininetbe.mk slideshow/CppunitTest_slideshow.mk slideshow/Executable_demoshow.mk slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk slideshow/source solenv/bin solenv/gbuild sot/CppunitTest_sot_test_sot.mk sot/Library_sot.mk starmath/CppunitTest_starmath_qa_cppunit.mk starmath/Library_smd.mk starmath/Library_sm.mk starmath/Module_starmath.mk starmath/source starmath/uiconfig starmath/UI_smath.mk stoc/Library_bootstrap.mk stoc/Library_introspection.mk stoc/Library_invocadapt.mk stoc/Library_invocation.mk stoc/Library_javaloader.mk stoc/Library_javavm.mk stoc/Library_namingservice.mk stoc/Library_proxyfac.mk stoc/Library_reflection.mk stoc/Library_stocservices.mk store/Library_store.mk svl/CppunitTest_svl_lngmisc.mk svl/CppunitTest_svl_urihelper .mk svl/inc svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk svl/source svtools/CppunitTest_svtools_filters_test.mk svtools/Executable_bmp.mk svtools/Executable_bmpsum.mk svtools/Executable_g2g.mk svtools/Executable_langsupport.mk svtools/inc svtools/Library_hatchwindowfactory.mk svtools/Library_svt.mk svtools/source svx/Executable_gengal.bin.mk svx/inc svx/Library_svxcore.mk svx/Library_svx.mk svx/Library_textconversiondlgs.mk svx/sdi svx/source sw/AllLangResTarget_sw.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_layout_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_regression_test.mk sw/CppunitTest_sw_subsequent_odfexport.mk sw/CppunitTest_sw_subsequent_odfimport.mk sw/CppunitTest_sw_subsequent_ooxmlexport.mk sw/CppunitTest_sw_subsequent_ooxmlimport.mk sw/CppunitTest_sw_subsequent_rtfexport.mk sw/CppunitTest_sw_subsequent_rtfimport.mk sw/CppunitTest_sw_subsequent_ww8export.mk sw/CppunitTest_sw_subsequent_ww8import.mk sw/Cppu nitTest_sw_swdoc_test.mk sw/inc sw/Library_msword.mk sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk sw/Module_sw.mk sw/Package_uiconfig.mk sw/qa sw/source sw/uiconfig sw/UI_sw.mk sw/UI_swriter.mk test/Library_subsequenttest.mk test/Library_test.mk toolkit/Library_tk.mk toolkit/source tools/CppunitTest_tools_test.mk tools/Executable_bestreversemap.mk tools/Executable_mkunroll.mk tools/Executable_rscdep.mk tools/Executable_so_checksum.mk tools/inc tools/Library_tl.mk tools/source touch/Library_libotouch.mk tubes/CppunitTest_tubes_test.mk tubes/Library_tubes.mk ucbhelper/Library_ucbhelper.mk ucb/Library_cached1.mk ucb/Library_srtrs1.mk ucb/Library_ucb1.mk ucb/Library_ucpcmis1.mk ucb/Library_ucpdav1.mk ucb/Library_ucpexpand1.mk ucb/Library_ucpext.mk ucb/Library_ucpfile1.mk ucb/Library_ucpftp1.mk ucb/Library_ucpgio1.mk ucb/Library_ucpgvfs1.mk ucb/Library_ucphier1.mk ucb/Library_ucpodma1.mk ucb/Library_ucppkg1.mk ucb/Library_ucptdoc1.mk UnoControls/Li brary_ctl.mk unotest/Library_unobootstrapprotector.mk unotest/Library_unoexceptionprotector.mk unotest/Library_unotest.mk unotools/Library_utl.mk unoxml/Library_unordf.mk unoxml/Library_unoxml.mk uui/Library_uui.mk vbahelper/Library_msforms.mk vbahelper/Library_vbahelper.mk vcl/Executable_kdefilepicker.mk vcl/Executable_tdefilepicker.mk vcl/Executable_ui-previewer.mk vcl/inc vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/Library_vclplug_tde.mk vcl/Module_vcl.mk vcl/Package_inc.mk vcl/qa vcl/source vcl/uiconfig vcl/UI_vcl.mk vcl/unx writerfilter/CppunitTest_writerfilter_doctok.mk writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/Library_writerfilter.mk writerfilter/Library_writerfilter_uno.mk writerfilter/source writerperfect/Library_wpftdraw.mk writerperfect/Library_wpftwriter.mk xml2cmp/Executa ble_xml2cmp.mk xmloff/Library_xof.mk xmloff/Library_xo.mk xmlreader/Library_xmlreader.mk xmlscript/Library_xmlscript.mk xmlsecurity/CppunitTest_qa_certext.mk xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Library_xsec_fw.mk xmlsecurity/Library_xsec_xmlsec.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Sep 28 14:51:49 PDT 2012
Rebased ref, commits from common ancestor:
commit 771c39fa375321f23b2196ad935962f6919bd000
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Fri Sep 28 17:51:09 2012 -0400
Some basic dialog layout. It's not functional yet.
Change-Id: Icd46699b8249768fdda1ee140fdacca182a731c0
diff --git a/sc/source/ui/inc/xmlsourcedlg.hrc b/sc/source/ui/inc/xmlsourcedlg.hrc
index b87b6a3..24c40b1 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hrc
+++ b/sc/source/ui/inc/xmlsourcedlg.hrc
@@ -12,4 +12,15 @@
#define BTN_OK 0
#define BTN_CANCEL 1
+#define FL_SOURCE_FILE 10
+#define BTN_SELECT_SOURCE_FILE 11
+#define FT_SOURCE_FILE 12
+
+#define FL_MAP_XML_TO_DOCUMENT 20
+#define LB_SOURCE_TREE 21
+
+#define IMG_ELEMENT_DEFAULT 50
+#define IMG_ELEMENT_REPEAT 51
+#define IMG_FILE_OPEN 52
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx
index 3d0237f..2213d42 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -10,10 +10,33 @@
#ifndef __SC_XMLSOURCEDLG_HXX__
#define __SC_XMLSOURCEDLG_HXX__
+#include "vcl/button.hxx"
#include "vcl/dialog.hxx"
+#include "vcl/fixed.hxx"
+#include "svtools/svtreebx.hxx"
+
+class ScXMLSourceTree : public SvTreeListBox
+{
+ Image maImgElemDefault;
+ Image maImgElemRepeat;
+public:
+ ScXMLSourceTree(Window* pParent, const ResId& rResId);
+};
class ScXMLSourceDlg : public ModalDialog
{
+ FixedLine maFlSourceFile;
+ ImageButton maBtnSelectSource;
+ FixedText maFtSourceFile;
+
+ FixedLine maFtMapXmlDoc;
+
+ ScXMLSourceTree maLbTree;
+
+ CancelButton maBtnCancel;
+
+ Image maImgFileOpen;
+
public:
ScXMLSourceDlg(Window* pParent);
virtual ~ScXMLSourceDlg();
diff --git a/sc/source/ui/src/xmlsourcedlg.src b/sc/source/ui/src/xmlsourcedlg.src
index ba80a99..86f8a7d 100644
--- a/sc/source/ui/src/xmlsourcedlg.src
+++ b/sc/source/ui/src/xmlsourcedlg.src
@@ -12,8 +12,66 @@ ModalDialog RID_SCDLG_XML_SOURCE
{
HelpID = "sc:ModalDialog:RID_SCDLG_XML_SOURCE";
Text [ en-US ] = "XML Source" ;
- Size = MAP_APPFONT ( 250 , 135 ) ;
+ Size = MAP_APPFONT ( 250 , 200 ) ;
Moveable = TRUE ;
Closeable = TRUE ;
+
+ FixedLine FL_SOURCE_FILE
+ {
+ Pos = MAP_APPFONT ( 6 , 5 ) ;
+ Size = MAP_APPFONT ( 238 , 8 ) ;
+
+ Text [ en-US ] = "Source file";
+ };
+
+ ImageButton BTN_SELECT_SOURCE_FILE
+ {
+ Pos = MAP_APPFONT ( 6 , 17 ) ;
+ Size = MAP_APPFONT ( 13 , 15 ) ;
+
+ QuickHelpText [ en-US ] = "Browse to set source file.";
+ };
+
+ FixedText FT_SOURCE_FILE
+ {
+ Pos = MAP_APPFONT ( 25 , 21 ) ;
+ Size = MAP_APPFONT ( 225 , 8 ) ;
+
+ Text [ en-US ] = "- not set -";
+ };
+
+ FixedLine FL_MAP_XML_TO_DOCUMENT
+ {
+ Pos = MAP_APPFONT ( 6 , 38 ) ;
+ Size = MAP_APPFONT ( 238 , 8 ) ;
+
+ Text [ en-US ] = "Map to document";
+ };
+
+ Control LB_SOURCE_TREE
+ {
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 114 , 50 ) ;
+ Size = MAP_APPFONT ( 130 , 120 ) ;
+ TabStop = TRUE ;
+ };
+
+ Image IMG_ELEMENT_DEFAULT
+ {
+ ImageBitmap = Bitmap { File = "page.png" ; };
+ MaskColor = STD_MASKCOLOR ;
+ };
+
+ Image IMG_FILE_OPEN
+ {
+ ImageBitmap = Bitmap { File = "file.png" ; };
+ MaskColor = STD_MASKCOLOR ;
+ };
+
+ CancelButton BTN_CANCEL
+ {
+ Pos = MAP_APPFONT ( 194 , 181 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ };
};
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 58f764e..378ba5f 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -12,9 +12,35 @@
#include "scresid.hxx"
+ScXMLSourceTree::ScXMLSourceTree(Window* pParent, const ResId& rResId) :
+ SvTreeListBox(pParent, rResId),
+ maImgElemDefault(ScResId(IMG_ELEMENT_DEFAULT)),
+ maImgElemRepeat(ScResId(IMG_ELEMENT_REPEAT))
+{
+ SetDefaultExpandedEntryBmp(maImgElemDefault);
+ SetDefaultCollapsedEntryBmp(maImgElemDefault);
+
+ SvLBoxEntry* p = InsertEntry(OUString("Test1"));
+ p = InsertEntry(OUString("Test2"));
+ SvLBoxEntry* pPar = p;
+ p = InsertEntry(OUString("Test3"), p);
+ Expand(pPar);
+ pPar = p;
+ p = InsertEntry(OUString("Test4"), p);
+ Expand(pPar);
+}
+
ScXMLSourceDlg::ScXMLSourceDlg(Window* pParent) :
- ModalDialog(pParent, ScResId(RID_SCDLG_XML_SOURCE))
+ ModalDialog(pParent, ScResId(RID_SCDLG_XML_SOURCE)),
+ maFlSourceFile(this, ScResId(FL_SOURCE_FILE)),
+ maBtnSelectSource(this, ScResId(BTN_SELECT_SOURCE_FILE)),
+ maFtSourceFile(this, ScResId(FT_SOURCE_FILE)),
+ maFtMapXmlDoc(this, ScResId(FL_MAP_XML_TO_DOCUMENT)),
+ maLbTree(this, ScResId(LB_SOURCE_TREE)),
+ maBtnCancel(this, ScResId(BTN_CANCEL)),
+ maImgFileOpen(ScResId(IMG_FILE_OPEN))
{
+ maBtnSelectSource.SetModeImage(maImgFileOpen);
FreeResource();
}
commit 8a51e157fdd7a3f14695306bbfe2783956b09f7a
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Wed Sep 26 21:12:11 2012 -0400
Use the resource file correctly.
Change-Id: I40af0beaf0de25347e8241c08e3be5f92ac16f93
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 2d3c64c..9ff824f 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/colorformat.src \
sc/source/ui/src/condformatdlg.src \
sc/source/ui/src/condformatmgr.src \
+ sc/source/ui/src/xmlsourcedlg.src \
sc/source/ui/cctrl/checklistmenu.src \
sc/source/ui/navipi/navipi.src \
sc/source/ui/docshell/tpstat.src \
diff --git a/sc/source/ui/src/xmlsourcedlg.src b/sc/source/ui/src/xmlsourcedlg.src
index 7d67abe..ba80a99 100644
--- a/sc/source/ui/src/xmlsourcedlg.src
+++ b/sc/source/ui/src/xmlsourcedlg.src
@@ -1,4 +1,3 @@
-
/*
* This file is part of the LibreOffice project.
*
@@ -17,3 +16,4 @@ ModalDialog RID_SCDLG_XML_SOURCE
Moveable = TRUE ;
Closeable = TRUE ;
};
+
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 01a09dd..58f764e 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -10,9 +10,12 @@
#include "xmlsourcedlg.hxx"
#include "xmlsourcedlg.hrc"
+#include "scresid.hxx"
+
ScXMLSourceDlg::ScXMLSourceDlg(Window* pParent) :
- ModalDialog(pParent, RID_SCDLG_XML_SOURCE)
+ ModalDialog(pParent, ScResId(RID_SCDLG_XML_SOURCE))
{
+ FreeResource();
}
ScXMLSourceDlg::~ScXMLSourceDlg()
commit c9cb0d80c450edd9a10048086b35a3774640c5e5
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Wed Sep 26 21:06:00 2012 -0400
I forgot to add this.
Change-Id: Idf3600f0194326365e90fbf683cd2133656d3d91
diff --git a/sc/source/ui/src/xmlsourcedlg.src b/sc/source/ui/src/xmlsourcedlg.src
new file mode 100644
index 0000000..7d67abe
--- /dev/null
+++ b/sc/source/ui/src/xmlsourcedlg.src
@@ -0,0 +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/.
+ */
+
+#include "xmlsourcedlg.hrc"
+
+ModalDialog RID_SCDLG_XML_SOURCE
+{
+ HelpID = "sc:ModalDialog:RID_SCDLG_XML_SOURCE";
+ Text [ en-US ] = "XML Source" ;
+ Size = MAP_APPFONT ( 250 , 135 ) ;
+ Moveable = TRUE ;
+ Closeable = TRUE ;
+};
commit 959b5552ab60238a052eba08de1d754b454af021
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Wed Sep 26 20:21:03 2012 -0400
Launch the dialog for real.
Change-Id: I974599f3bd30f5a70bad69d9fde727fef965933c
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 3e1c658..074f69a 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2441,7 +2441,22 @@ void ScCellShell::ExecuteDataPilotDialog()
void ScCellShell::ExecuteXMLSourceDialog()
{
- fprintf(stdout, "ScCellShell::ExecuteXMLSourceDialog: launch xml dialog\n");
+ ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
+ if (!pFact)
+ return;
+
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ if (!pTabViewShell)
+ return;
+
+ boost::scoped_ptr<AbstractScXMLSourceDlg> pDlg(
+ pFact->CreateScXMLSourceDlg(
+ pTabViewShell->GetDialogParent(), RID_SCDLG_XML_SOURCE));
+
+ if (!pDlg)
+ return;
+
+ pDlg->Execute();
}
void ScCellShell::ExecuteSubtotals(SfxRequest& rReq)
commit 7814a8ff3ff15fc07712b0c4d54f76a7b33b0f5f
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Wed Sep 26 20:13:42 2012 -0400
Abstract dialog instantiation code.
Change-Id: I28e7b354928d349d9f6c90092ead2010cfe3c29b
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0dcb1fe..5e5fad0 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1088,6 +1088,7 @@
#define RID_SCDLG_FORMULA_CALCOPTIONS (SC_DIALOGS_START + 157)
#define RID_SCDLG_COND_FORMAT_MANAGER (SC_DIALOGS_START + 158)
+#define RID_SCDLG_XML_SOURCE (SC_DIALOGS_START + 159)
#define SC_DIALOGS_END (SC_DIALOGS_START + 160)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 7081ddb..9623615 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -334,6 +334,11 @@ public:
virtual bool IsDateConversionSet() const = 0;
};
+class AbstractScXMLSourceDlg : public VclAbstractDialog
+{
+public:
+};
+
//-------Scabstract fractory ---------------------------
class ScAbstractDialogFactory
{
@@ -531,6 +536,9 @@ public:
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ) = 0;
virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg
const SfxItemSet* pArgSet,int nId ) = 0;
+
+ virtual AbstractScXMLSourceDlg* CreateScXMLSourceDlg(Window* pParent, int nId) = 0;
+
// for tabpage
virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0;
virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 4dd4bc3..9257a9e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -82,6 +82,7 @@
#include "colorformat.hxx"
#include "condformatdlg.hxx"
#include "condformatmgr.hxx"
+#include "xmlsourcedlg.hxx"
// ause
#include "editutil.hxx"
@@ -123,6 +124,7 @@ IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScXMLSourceDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
// AbstractTabDialog_Impl begin
@@ -685,8 +687,6 @@ AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImpor
return pDlg ? new AbstractScTextImportOptionsDlg_Impl(pDlg) : NULL;
}
-
-
AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window* pParent,
ScAutoFormat* pAutoFormat,
const ScAutoFormatData* pSelFormatData,
@@ -1595,6 +1595,14 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window*
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
+
+AbstractScXMLSourceDlg* ScAbstractDialogFactory_Impl::CreateScXMLSourceDlg(Window* pParent, int nId)
+{
+ ScXMLSourceDlg* pDlg = (nId == RID_SCDLG_XML_SOURCE) ? new ScXMLSourceDlg(pParent) : NULL;
+
+ return pDlg ? new AbstractScXMLSourceDlg_Impl(pDlg) : NULL;
+}
+
#undef SfxTabDialog
#undef AbstractTabDialog_Impl
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index b4c6ddc..73b35d9 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -66,6 +66,7 @@ class ScTextImportOptionsDlg;
class ScDataBarSettingsDlg;
class ScCondFormatDlg;
class ScCondFormatManagerDlg;
+class ScXMLSourceDlg;
#define DECL_ABSTDLG_BASE(Class,DialogClass) \
DialogClass* pDlg; \
@@ -389,6 +390,11 @@ class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDl
virtual bool IsDateConversionSet() const;
};
+class AbstractScXMLSourceDlg_Impl : public AbstractScXMLSourceDlg
+{
+ DECL_ABSTDLG_BASE(AbstractScXMLSourceDlg_Impl, ScXMLSourceDlg)
+};
+
//add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
class AbstractTabDialog_Impl : public SfxAbstractTabDialog
{
@@ -401,6 +407,7 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog
virtual void SetText( const XubString& rStr );
virtual String GetText() const;
};
+
//------------------------------------------------------------------------
//AbstractDialogFactory_Impl implementations
class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory
@@ -602,6 +609,9 @@ public:
virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg
const SfxItemSet* pArgSet,int nId );
+
+ virtual AbstractScXMLSourceDlg* CreateScXMLSourceDlg(Window* pParent, int nId);
+
// For TabPage
virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId );
diff --git a/sc/source/ui/inc/xmlsourcedlg.hrc b/sc/source/ui/inc/xmlsourcedlg.hrc
index 323ef7c..b87b6a3 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hrc
+++ b/sc/source/ui/inc/xmlsourcedlg.hrc
@@ -9,6 +9,7 @@
#include "sc.hrc"
-
+#define BTN_OK 0
+#define BTN_CANCEL 1
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx
index 6177cf3..3d0237f 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -10,8 +10,13 @@
#ifndef __SC_XMLSOURCEDLG_HXX__
#define __SC_XMLSOURCEDLG_HXX__
-class XMLSourceDlg
+#include "vcl/dialog.hxx"
+
+class ScXMLSourceDlg : public ModalDialog
{
+public:
+ ScXMLSourceDlg(Window* pParent);
+ virtual ~ScXMLSourceDlg();
};
#endif
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 59a133c..01a09dd 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -10,4 +10,13 @@
#include "xmlsourcedlg.hxx"
#include "xmlsourcedlg.hrc"
+ScXMLSourceDlg::ScXMLSourceDlg(Window* pParent) :
+ ModalDialog(pParent, RID_SCDLG_XML_SOURCE)
+{
+}
+
+ScXMLSourceDlg::~ScXMLSourceDlg()
+{
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 16f661d6bf9d3cd99443d175456a703fd604104e
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Wed Sep 26 17:53:12 2012 -0400
Add new skeleton files for the new xml source dialog.
Change-Id: I2ac196ea74185fd7f10919ad64434855c5c8b5fa
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 0cc4099..c78faca 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -116,6 +116,7 @@ $(eval $(call gb_Library_add_exception_objects,scui,\
sc/source/ui/pagedlg/tphf \
sc/source/ui/pagedlg/tptable \
sc/source/ui/styleui/styledlg \
+ sc/source/ui/xmlsource/xmlsourcedlg \
))
ifeq ($(OS),WNT)
diff --git a/sc/source/ui/inc/xmlsourcedlg.hrc b/sc/source/ui/inc/xmlsourcedlg.hrc
new file mode 100644
index 0000000..323ef7c
--- /dev/null
+++ b/sc/source/ui/inc/xmlsourcedlg.hrc
@@ -0,0 +1,14 @@
+/* -*- 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 "sc.hrc"
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx
new file mode 100644
index 0000000..6177cf3
--- /dev/null
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -0,0 +1,19 @@
+/* -*- 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/.
+ */
+
+#ifndef __SC_XMLSOURCEDLG_HXX__
+#define __SC_XMLSOURCEDLG_HXX__
+
+class XMLSourceDlg
+{
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
new file mode 100644
index 0000000..59a133c
--- /dev/null
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -0,0 +1,13 @@
+/* -*- 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 "xmlsourcedlg.hxx"
+#include "xmlsourcedlg.hrc"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 300f06da8a11f118ee58fce464cc04bba0f40e16
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Wed Sep 26 17:41:01 2012 -0400
Separate method to launch xml source dialog.
Change-Id: Iac7898d695cd7659f44944d6615a91d4e2b6a52e
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 88043ce..c2f7f01 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -67,6 +67,7 @@ private:
const String& _rSource, sal_uLong _nRefresh, SfxRequest& _rRequest );
void ExecuteDataPilotDialog();
+ void ExecuteXMLSourceDialog();
void ExecuteSubtotals(SfxRequest& rReq);
DECL_LINK( ClipboardChanged, TransferableDataHelper* );
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index e9211c1..3e1c658 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2439,6 +2439,11 @@ void ScCellShell::ExecuteDataPilotDialog()
}
}
+void ScCellShell::ExecuteXMLSourceDialog()
+{
+ fprintf(stdout, "ScCellShell::ExecuteXMLSourceDialog: launch xml dialog\n");
+}
+
void ScCellShell::ExecuteSubtotals(SfxRequest& rReq)
{
ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index f1d6395..0370dc4 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -746,7 +746,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
break;
case SID_MANAGE_XML_SOURCE:
- fprintf(stdout, "ScCellShell::ExecuteDB: SID_MANAGE_XML_SOURCE\n");
+ ExecuteXMLSourceDialog();
break;
case FID_VALIDATION:
{
commit fff6469fe2283ad11a719506689ea2379290440c
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Wed Sep 26 16:11:52 2012 -0400
Add new slot ID for 'Manage XML Source' menu entry.
Plus unwind the mess of slot ID collision between sc and svx.
Change-Id: Iad236e50f58160d85c997d6f8f6dfce405fd82bb
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index e6767b7..a9fbf92 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1194,6 +1194,11 @@
<value xml:lang="en-US">Select ~Range...</value>
</prop>
</node>
+ <node oor:name=".uno:ManageXMLSource" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Manage ~XML Source...</value>
+ </prop>
+ </node>
<node oor:name=".uno:DataSort" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Sort...</value>
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 51cebf3..0dcb1fe 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -361,6 +361,7 @@
#define SID_AUTO_FILTER (DATA_MENU_START + 5)
#define SID_UNFILTER (DATA_MENU_START + 6)
#define SID_QUERY (DATA_MENU_START + 7)
+#define SID_MANAGE_XML_SOURCE (DATA_MENU_START + 8)
#define SID_SUBTOTALS (DATA_MENU_START + 13)
#define SID_AUTO_OUTLINE (DATA_MENU_START + 14)
#define SID_IMPORT_DATA (DATA_MENU_START + 15)
diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h
index 1350c0c..783f757 100644
--- a/sc/inc/sccommands.h
+++ b/sc/inc/sccommands.h
@@ -101,6 +101,7 @@
#define CMD_FID_TAB_EVENTS ".uno:TableEvents"
#define CMD_FID_TAB_MENU_SET_TAB_BG_COLOR ".uno:SetTabBgColor"
#define CMD_FID_TAB_SET_TAB_BG_COLOR ".uno:TabBgColor"
+#define CMD_SID_MANAGE_XML_SOURCE ".uno:ManageXMLSource"
#endif
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 77eea5c..0256ea0 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -60,6 +60,7 @@ interface CellSelection
SID_REFRESH_DBAREA [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_SBA_BRW_INSERT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_SELECT_DB [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
+ SID_MANAGE_XML_SOURCE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_SORT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_DATA_FORM [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
FID_FILTER_OK [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index f9d7057..2cdf7cd 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -5761,7 +5761,30 @@ SfxVoidItem SelectDB SID_SELECT_DB
GroupId = GID_DATA;
]
-//--------------------------------------------------------------------------
+SfxVoidItem ManageXMLSource SID_MANAGE_XML_SOURCE
+(SfxStringItem DbName SID_MANAGE_XML_SOURCE)
+[
+ /* 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 = FALSE,
+ GroupId = GID_DATA;
+]
+
SfxObjectItem SelectedObject SID_SC_ACTIVEOBJECT
[
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 325e713..f1d6395 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -745,6 +745,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
break;
+ case SID_MANAGE_XML_SOURCE:
+ fprintf(stdout, "ScCellShell::ExecuteDB: SID_MANAGE_XML_SOURCE\n");
+ break;
case FID_VALIDATION:
{
const SfxPoolItem* pItem;
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 0bff97c..47e57af 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -416,6 +416,8 @@
<menu:menuitem menu:id=".uno:DefineDBName"/>
<menu:menuitem menu:id=".uno:SelectDB"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ManageXMLSource"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:DataSort"/>
<menu:menu menu:id=".uno:FilterMenu">
<menu:menupopup>
commit 2a3975d474b94f8507c8b7ac87f7358885f4e8d5
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Wed Sep 26 13:02:20 2012 -0400
Switch to orcus-0.3.0 (work-in-progress version from master).
Change-Id: I786face760685a243e6b78f71094a8733256aa46
diff --git a/configure.in b/configure.in
index be63978..ae48422 100644
--- a/configure.in
+++ b/configure.in
@@ -8704,7 +8704,7 @@ AC_MSG_CHECKING([which orcus library to use])
if test "$with_system_orcus" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_LIBORCUS=YES
- PKG_CHECK_MODULES(ORCUS, liborcus-0.2 >= 0.1.0)
+ PKG_CHECK_MODULES(ORCUS, liborcus-0.4 >= 0.3.0)
else
AC_MSG_RESULT([internal])
ORCUS_TARBALL=46d9f4cf8b145c21ce1056e116d2ce71-liborcus_0.1.0.tar.bz2
commit deee6394c0db6c6ec844d2c9606b138d9bcb4672
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Fri Sep 28 12:21:53 2012 -0400
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
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index b5e6b8a..51cebf3 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 451ffca..f9d7057 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 a932a11..8d6e56f 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -232,19 +232,6 @@
#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
// --------------------------------------------------------------------------
#define FN_EDIT (SID_SW_START + 100)
@@ -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 eea97a4..97c1571 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5575,31 +5575,6 @@ SfxBoolItem GridVisible SID_GRID_VISIBLE
]
//--------------------------------------------------------------------------
-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
[
@@ -5735,31 +5710,6 @@ SfxBoolItem HFixedLine SID_INSERT_HFIXEDLINE
]
//--------------------------------------------------------------------------
-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
[
@@ -6073,31 +6023,6 @@ SfxVoidItem InPlaceObjectResize SID_OBJECTRESIZE
]
//--------------------------------------------------------------------------
-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)
[
@@ -10138,31 +10063,6 @@ SvxShadowedItem Shadowed SID_ATTR_CHAR_SHADOWED
]
//--------------------------------------------------------------------------
-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
[
@@ -11508,31 +11408,6 @@ SvxTextLineItem Overline SID_ATTR_CHAR_OVERLINE
]
//--------------------------------------------------------------------------
-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
[
commit 78a102e2060a1a8fc003d91fa3193b2bfa841d26
Author: Noel Power <noel.power at suse.com>
Date: Fri Sep 28 16:59:02 2012 +0100
fix xlsx export missing alignment attributes with cellstyle fdo#55417
Change-Id: I510d0f399c58b5a9b192f3566e093c636cae2c0a
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index ebbe256..a904831 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 );
}
commit d3d720b14c0bbfc849f8562d02b471e223e1b0bc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Sep 28 18:26:44 2012 +0200
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
diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx
index d8f7d3c..ad4774a 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 df3e425..5e87b89 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 e5fb674..81cdcb8 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -26,9 +26,14 @@
*
************************************************************************/
+#include "sal/config.h"
+
+#include <cassert>
#include "pdfihelper.hxx"
+#include <boost/noncopyable.hpp>
+#include <com/sun/star/task/ErrorCodeRequest.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
#include <com/sun/star/task/XInteractionPassword.hpp>
@@ -36,8 +41,9 @@
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/basemutex.hxx>
-
+#include <tools/errcode.hxx>
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 259d700..9a78554 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 61d4b29..2d76fff 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() )
+ {
+ rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd,
+ RTL_TEXTENCODING_ISO_8859_1 );
+ bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() );
+ }
+ if( bAuthenticated )
+ bSuccess = true;
+ else
{
- bool bEntered = false;
- do
+ if( i_xIHdl.is() )
{
- 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 );
+ 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;
+ }
+ if( bAuthenticated )
+ {
+ rtl::OUStringBuffer aBuf( 128 );
+ aBuf.appendAscii( "_OOO_pdfi_Credentials_" );
+ aBuf.append( pPDFFile->getDecryptionKey() );
+ io_rPwd = aBuf.makeStringAndClear();
}
-
- OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not match" );
- bSuccess = bAuthenticated;
}
- 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
commit 050d74b558f896ab510a31bcffde2e0346fc5bd8
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Sep 28 18:18:36 2012 +0200
another oops in svx...
Change-Id: I0f9de9ed23d160a8c3cf6a9db8eece95b4e8795a
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 6ccba76..26acd01 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,\
commit 9024006206451518712ada0d2007397c5d9e6c28
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Sep 29 01:13:00 2012 +0900
The graphite page was moved
Change-Id: I99bc4cd9e600dc0b2e9f74fba7615c6677cf90ca
diff --git a/graphite/README b/graphite/README
index 1cdf775..aac0d0d 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/]
commit 9edb6ba992ad2ef092996903d775df5313613bee
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Sep 28 18:09:43 2012 +0200
add the remaining parts to previous commit
Change-Id: Ia0b9ed9eed30991f38234bf56c49b26392491f30
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index a1cdc8c..e9211c1 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)
commit 985e7e4f5017b67f2734b8885d81e32e2011e470
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri Sep 28 13:40:47 2012 +0100
fdo#54940 - make editing relative refs more intuitive to me
Change-Id: Ib7681de7b1aad9b6dda183e3c4fa1b1010270d3f
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 74bb7be..8bf3bed 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 c9c4c3e..b7347f6 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 b40a523..62b1fdc 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();
commit 5f32a4a2a18b1726c8bb7a5ce694648b0d8aba31
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri Sep 28 13:38:52 2012 +0100
double-click on a conditional format inspects / edits it.
Change-Id: Icdfeae938627b63decd26571e86bc1e80e07f6c6
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index ebaad9b..b40a523 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 2f75dde..3735e63 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;
commit 6b612128794b7dba984c45e8aa7673b5261eb5dd
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri Sep 28 12:43:47 2012 +0100
auto-expand the first conditional format in the list.
Change-Id: I65280d39b560b4b7eed3e21a6e6c7b02c124f10a
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index ef69309..51fc485 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();
commit bee798cf4a91030184e01073c9aaaa5a66174600
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri Sep 28 11:50:31 2012 +0100
improve conditional formatting height calculations.
Change-Id: If5080892b820d268ffef22111d0caee217586b56
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 3be5bc2..ef69309 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);
}
}
commit 9cce64934020576013ee03c3888a696a98d069de
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Fri Sep 28 18:05:28 2012 +0200
sw/qa: more getProperty() usage in extras
Change-Id: Ic4782f3d315b6ef860153fdeb1890bba083f9630
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 68401dd..96503a7 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -199,19 +199,9 @@ void Test::testFdo45553()
uno::Reference<text::XTextRange> xRange(xRangeEnum->nextElement(), uno::UNO_QUERY);
OUString aStr = xRange->getString();
if ( aStr == "space-before" )
- {
- sal_Int32 nMargin = 0;
- uno::Reference<beans::XPropertySet> 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<sal_Int32>(xRange, "ParaTopMargin"));
else if ( aStr == "space-after" )
- {
- sal_Int32 nMargin = 0;
- uno::Reference<beans::XPropertySet> 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<sal_Int32>(xRange, "ParaBottomMargin"));
}
}
}
@@ -249,12 +239,8 @@ void Test::testN695479()
uno::Reference<beans::XPropertySet> 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<sal_Int16>(xPropertySet, "SizeType"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(300)), getProperty<sal_Int32>(xPropertySet, "Height"));
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> 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<table::BorderLine2>(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<sal_Int16>(xPropertySet, "HoriOrientRelation"));
+ CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(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<beans::XPropertySet> 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<awt::Point>(xDraws->getByIndex(0), "AnchorPosition").Y != getProperty<awt::Point>(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<sal_Int16>());
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<OUString>().getLength());
}
}
commit 93a118d728736a9ffb6269b2816d4a1428472baa
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Sep 28 17:57:08 2012 +0200
fix WNT build: missed one oleaut32
Change-Id: Ic079200f6a3f1a1e7ac38f971e4da40a8dd39dd0
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 457a52b..73eb631 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
commit 23126cea9ed09389da9714cd6f0982822aa9805d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Sep 28 10:15:33 2012 -0500
hide clucene warnings under the carpet to avoid poluting make's output
Change-Id: I1f6e4d187ae6200fe1d2444c07af9ca42a010bc1
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 16bfbd5..72a1dcc 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 \
commit be70d912a3bb48018a588365eef031fdd5ce032e
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Sep 28 16:53:11 2012 +0200
vcl: remove gb_STDLIBS that crept in today
Change-Id: Icb760daeca27289e424a72fb743d4e3bbd0e526d
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
index 06cf218..51d12d0 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,\
commit 5032dc0fc339ba6b200e80a5482cc86e00662a0b
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Sep 28 16:29:24 2012 +0200
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
diff --git a/Library_merged.mk b/Library_merged.mk
index 98d4cbf..f6bf68a 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 fd7e173..ee4e033 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 667dcc3..d10769f 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 1579f8a..3b4c27c 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 f4ada9c..9f4d5b4 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 f597bb3..40f952e 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 7906a37..defe843 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 394873f..8bb8561 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 3369dbf..18387a9 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 ed1cc2d..5d6649c 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 ce2b096..b6e1c3b 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 5747cb6..4879303 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 fd385a8..5f3de82 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 a531848..e9c3bb8 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 6d974ec..8cc7a86 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 6e87173..5f6587d 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 a768ddf..268f29a 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 88876b7..193c4a5 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 c29a58c..457a52b 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 64caf3d..d17f795 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 ecde720..93b716c 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 aed5a30..09fbcce 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 99e223a..223d9c8 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 6a0fcba..94711ea 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 97a3703..5020932 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 91613d9..a5dfe34 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 df83427..d9b8112 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 b85321f..b9c93e2 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 1b66f16..ec143c3 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 cb363de..752c02b 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 d45b906..22a989a 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 b053b15..327f9c1 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 ea7376e..0032336 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 1fa62e7..02587dd 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 53599b5..e22d0dc 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 d5d4ec3..be78baa 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 429416d..15b6226 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 73dcb63..0ccd386 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 77ac8ef..16bfbd5 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 11592b7..b3f443d 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 c54d59d..38156d6 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 7dd348d..f7e39ba 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 ed088bc..68abe62 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 489542b..aedd21b 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 14c61ec..0dbb517 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 ac008fe..fbccc3a 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 74d8fea..964f9f3 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 4606b88..6872455 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 c3326b4..8ee3d10 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 84345d8..32e4644 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 b8b0e0f..8521ae3 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 71edd85..23b7553 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 8f2c04e..7fd80cb 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 097848e..ecdd905 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 7058eb5..e55422c 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 feb7543..c4e77da 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 009a3c7..b11cb4f 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 394d227..4b4b789 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 b7f95a8..b73efc2 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 edfb498..cdea5e9 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 71bdd14..4e05e40 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 32961f4..3f7ccbf 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 f2b2d41..8335f7e 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 a76eb7b..7e525a9 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 60fbfc9..1a9f8eb 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 60db324..7f030f1 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 8c40245..59f2f80 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 40601d7..b2df458 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 a37d36e..3fa5f1a 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 eb7dbc4..ac3f418 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 af9e7ea..c47643a 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 2b5f465..0a0342e 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 dffd187..20d7050 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 d2b59a2..2531f42 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 ddc8458..094e185 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 7472a36..f235be8 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 644c820..1edc287 100644
--- a/cppu/Library_affine_uno.mk
+++ b/cppu/Library_affine_uno.mk
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list