[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - 111 commits - accessibility/inc accessibility/source avmedia/source basctl/source binaryurp/source bin/lo-all-static-libs bin/update_pch.sh bridges/inc canvas/source chart2/qa chart2/source codemaker/source compilerplugins/clang configure.ac connectivity/source cppuhelper/source cppu/source cui/source dbaccess/inc dbaccess/source desktop/source desktop/unx download.lst editeng/source extensions/inc extensions/source external/coinmp external/collada2gltf external/cppunit external/freetype external/glew external/lcms2 external/openssl external/python3 filter/source forms/source formula/source fpicker/source framework/inc helpcontent2 hwpfilter/source idlc/inc idlc/source include/codemaker include/editeng include/formula include/osl include/sfx2 include/svl include/svtools include/svx include/toolkit include/tools include/vcl lotuswordpro/inc lotuswordpro/Library_lwpft.mk lotuswordpro/source officecfg/registry oox/source package/sour ce pyuno/source reportdesign/inc reportdesign/source rsc/source sal/cppunittester sal/osl sal/qa sal/util scaddins/source sc/inc scripting/workben sc/source sdext/Library_pdfimport.mk sdext/source sd/inc sd/source sfx2/inc sfx2/source slideshow/Library_OGLTrans.mk slideshow/source solenv/bin starmath/inc starmath/source stoc/source svl/source svtools/source svx/inc svx/source svx/workben sw/inc sw/qa sw/source sw/uiconfig tools/source ucb/source unotools/source uui/source vcl/inc vcl/Library_vcl.mk vcl/osx vcl/source vcl/unx wizards/source writerfilter/inc writerfilter/source xmloff/source xmlsecurity/inc xmlsecurity/qa xmlsecurity/source
Rachit Gupta
rachitgupta1792 at gmail.com
Wed May 21 00:16:33 PDT 2014
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 2
accessibility/inc/accessibility/helper/accessiblestrings.hrc | 1
accessibility/inc/pch/precompiled_acc.hxx | 4
accessibility/source/extended/textwindowaccessibility.cxx | 4
avmedia/source/framework/modeltools.cxx | 5
avmedia/source/viewer/mediawindow.src | 12
basctl/source/dlged/dlgresid.src | 3
basctl/source/inc/dlgresid.hrc | 2
bin/lo-all-static-libs | 7
bin/update_pch.sh | 2
binaryurp/source/bridgefactory.cxx | 31
binaryurp/source/bridgefactory.hxx | 2
bridges/inc/bridges/cpp_uno/shared/bridge.hxx | 2
bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx | 2
bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx | 2
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 2
canvas/source/cairo/cairo_canvas.hxx | 8
canvas/source/cairo/cairo_canvasbitmap.hxx | 10
canvas/source/cairo/cairo_canvascustomsprite.hxx | 8
canvas/source/cairo/cairo_canvashelper.hxx | 4
canvas/source/cairo/cairo_repainttarget.hxx | 2
canvas/source/cairo/cairo_spritecanvas.hxx | 12
canvas/source/cairo/cairo_surfaceprovider.hxx | 12
canvas/source/cairo/cairo_textlayout.hxx | 2
chart2/qa/extras/chart2export.cxx | 40
chart2/qa/extras/data/docx/fdo78290_Combination_Chart_Marker_x.docx |binary
chart2/qa/extras/data/docx/fdo78290_Line_Chart_Marker_x.docx |binary
chart2/qa/extras/data/docx/fdo78290_Scatter_Chart_Marker_x.docx |binary
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 6
chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 4
chart2/source/controller/dialogs/Bitmaps.hrc | 12
chart2/source/controller/dialogs/Bitmaps.src | 7
chart2/source/controller/dialogs/ResourceIds.hrc | 1
chart2/source/controller/dialogs/Strings.src | 8
chart2/source/controller/dialogs/Strings_Statistic.src | 3
chart2/source/controller/inc/MenuResIds.hrc | 1
chart2/source/controller/inc/ShapeController.hrc | 1
chart2/source/controller/main/DrawCommandDispatch.hrc | 1
chart2/source/controller/menus/ShapeContextMenu.src | 1
chart2/source/controller/menus/ShapeEditContextMenu.src | 1
chart2/source/inc/Strings.hrc | 7
chart2/source/model/filter/XMLFilter.cxx | 2
chart2/source/model/template/CandleStickChartType.cxx | 4
chart2/source/model/template/PieChartTypeTemplate.cxx | 2
chart2/source/tools/FillProperties.cxx | 4
chart2/source/tools/ModifyListenerHelper.cxx | 4
chart2/source/view/charttypes/GL3DBarChart.cxx | 6
chart2/source/view/inc/GL3DRenderer.hxx | 17
chart2/source/view/main/3DChartObjects.cxx | 10
chart2/source/view/main/GL3DRenderer.cxx | 51
codemaker/source/cppumaker/includes.hxx | 2
codemaker/source/javamaker/classfile.hxx | 4
compilerplugins/clang/passstuffbyref.cxx | 34
configure.ac | 42
connectivity/source/inc/resource/ado_res.hrc | 2
connectivity/source/inc/resource/calc_res.hrc | 2
connectivity/source/inc/resource/common_res.hrc | 2
connectivity/source/inc/resource/conn_shared_res.hrc | 1
connectivity/source/inc/resource/dbase_res.hrc | 2
connectivity/source/inc/resource/evoab2_res.hrc | 2
connectivity/source/inc/resource/file_res.hrc | 1
connectivity/source/inc/resource/hsqldb_res.hrc | 2
connectivity/source/inc/resource/kab_res.hrc | 1
connectivity/source/inc/resource/macab_res.hrc | 1
connectivity/source/inc/resource/mork_res.hrc | 2
connectivity/source/inc/resource/mozab_res.hrc | 2
connectivity/source/resource/conn_log_res.src | 2
connectivity/source/resource/conn_shared_res.src | 5
cppu/source/threadpool/thread.cxx | 1
cppu/source/threadpool/threadpool.cxx | 1
cppu/source/threadpool/threadpool.hxx | 13
cppuhelper/source/findsofficepath.c | 12
cui/source/customize/macropg.src | 1
cui/source/dialogs/colorpicker.src | 8
cui/source/dialogs/hangulhanjadlg.hrc | 1
cui/source/dialogs/svuidlg.hrc | 1
cui/source/inc/backgrnd.hxx | 2
cui/source/inc/border.hxx | 2
cui/source/inc/chardlg.hxx | 8
cui/source/inc/connect.hxx | 2
cui/source/inc/cuires.hrc | 1
cui/source/inc/cuitabarea.hxx | 6
cui/source/inc/cuitabline.hxx | 2
cui/source/inc/macroass.hxx | 2
cui/source/inc/measure.hxx | 2
cui/source/inc/numfmt.hxx | 2
cui/source/inc/numpages.hxx | 8
cui/source/inc/page.hxx | 2
cui/source/inc/paragrph.hxx | 6
cui/source/inc/tabstpge.hxx | 2
cui/source/inc/textattr.hxx | 2
cui/source/options/optgdlg.src | 2
cui/source/options/personalization.cxx | 62
cui/source/options/personalization.hxx | 21
cui/source/options/treeopt.cxx | 11
cui/source/tabpages/backgrnd.cxx | 2
cui/source/tabpages/border.cxx | 2
cui/source/tabpages/chardlg.cxx | 8
cui/source/tabpages/connect.cxx | 2
cui/source/tabpages/frmdirlbox.src | 2
cui/source/tabpages/macroass.cxx | 2
cui/source/tabpages/measure.cxx | 2
cui/source/tabpages/numfmt.cxx | 2
cui/source/tabpages/numpages.cxx | 8
cui/source/tabpages/page.cxx | 2
cui/source/tabpages/paragrph.cxx | 12
cui/source/tabpages/tabstpge.cxx | 2
cui/source/tabpages/textattr.cxx | 2
cui/source/tabpages/tparea.cxx | 4
cui/source/tabpages/tpline.cxx | 2
cui/source/tabpages/tpshadow.cxx | 2
dbaccess/inc/dbaccess_slotid.hrc | 1
dbaccess/source/core/api/FilteredContainer.cxx | 18
dbaccess/source/core/api/KeySet.cxx | 3
dbaccess/source/core/inc/dbamiscres.hrc | 2
dbaccess/source/core/resource/strings.src | 2
dbaccess/source/ext/macromigration/dbmm_global.hrc | 9
dbaccess/source/ext/macromigration/macromigration.src | 10
dbaccess/source/inc/dbastrings.hrc | 2
dbaccess/source/inc/dbustrings.hrc | 4
dbaccess/source/inc/stringconstants.hrc | 1
dbaccess/source/sdbtools/inc/sdbt_resource.hrc | 2
dbaccess/source/ui/app/app.src | 1
dbaccess/source/ui/browser/sbagrid.src | 1
dbaccess/source/ui/dlg/AutoControls.src | 3
dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 31
dbaccess/source/ui/dlg/ConnectionPage.hrc | 1
dbaccess/source/ui/dlg/ConnectionPage.src | 1
dbaccess/source/ui/dlg/admincontrols.hrc | 3
dbaccess/source/ui/dlg/dbadmin.hrc | 1
dbaccess/source/ui/dlg/dbadmin.src | 19
dbaccess/source/ui/dlg/dbadmin2.src | 2
dbaccess/source/ui/dlg/dbadminsetup.hrc | 2
dbaccess/source/ui/dlg/dbadminsetup.src | 11
dbaccess/source/ui/dlg/indexdialog.hrc | 1
dbaccess/source/ui/dlg/paramdialog.hrc | 1
dbaccess/source/ui/imagelists/dbimagelists.src | 9
dbaccess/source/ui/inc/dbu_dlg.hrc | 1
dbaccess/source/ui/inc/dbu_qry.hrc | 1
dbaccess/source/ui/inc/dbu_resource.hrc | 14
dbaccess/source/ui/inc/sbagrid.hrc | 1
dbaccess/source/ui/inc/toolbox_tmpl.hrc | 7
dbaccess/source/ui/misc/WizardPages.src | 1
dbaccess/source/ui/misc/dbumiscres.src | 1
dbaccess/source/ui/querydesign/Query.hrc | 1
dbaccess/source/ui/querydesign/query.src | 2
dbaccess/source/ui/tabledesign/TableUndo.cxx | 2
dbaccess/source/ui/tabledesign/TableUndo.hxx | 2
desktop/source/app/desktop.src | 1
desktop/source/deployment/gui/dp_gui.hrc | 1
desktop/source/deployment/gui/dp_gui_dialog.src | 2
desktop/source/deployment/gui/dp_gui_updateinstalldialog.src | 4
desktop/source/deployment/manager/dp_manager.src | 1
desktop/source/deployment/registry/help/dp_help.hrc | 1
desktop/source/deployment/unopkg/unopkg.src | 1
desktop/unx/source/splashx.c | 2
download.lst | 3
editeng/source/editeng/editeng.src | 2
editeng/source/items/svxitems.src | 1
extensions/inc/extensio.hrc | 1
extensions/source/abpilot/abpresid.hrc | 9
extensions/source/abpilot/abspilot.src | 5
extensions/source/bibliography/bib.hrc | 1
extensions/source/bibliography/datman.hrc | 1
extensions/source/dbpilots/dbpresid.hrc | 21
extensions/source/propctrlr/formresid.hrc | 9
extensions/source/propctrlr/propresid.hrc | 2
external/coinmp/ExternalPackage_coinmp.mk | 2
external/coinmp/ExternalProject_coinmp.mk | 4
external/coinmp/UnpackedTarball_coinmp.mk | 2
external/coinmp/android.build.patch.1 | 143 +
external/coinmp/no-binaries.patch.1 | 25
external/collada2gltf/write-only-.dae-file-which-we-need.patch.0 | 2
external/cppunit/ExternalProject_cppunit.mk | 4
external/freetype/ExternalProject_freetype.mk | 2
external/glew/ExternalProject_glew.mk | 2
external/glew/UnpackedTarball_glew.mk | 4
external/glew/glew-debug.patch.1 | 12
external/lcms2/ExternalProject_lcms2.mk | 2
external/openssl/UnpackedTarball_openssl.mk | 1
external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 | 20
external/python3/ExternalProject_python3.mk | 2
external/python3/UnpackedTarball_python3.mk | 5
external/python3/python-3.3.0-implicit-int.patch.1 | 30
external/python3/python-3.3.0-msvc-x64.patch.1 | 22
external/python3/python-3.3.3-msvc2012-winxp.patch.1 | 117 +
external/python3/python-3.3.3-py17797.patch.1 | 44
external/python3/python-3.3.3-quoted-printable.patch.1 | 201 --
external/python3/python-3.3.5-pyexpat-symbols.patch.1 | 28
filter/source/graphicfilter/eps/epsstr.src | 1
filter/source/pdf/pdf.src | 1
filter/source/xsltdialog/xmlfilterdialogstrings.src | 1
forms/source/inc/frm_resource.hrc | 2
forms/source/inc/property.hrc | 5
forms/source/resource/strings.src | 1
forms/source/resource/xforms.src | 1
formula/source/core/inc/core_resource.hrc | 3
formula/source/ui/dlg/formdlgs.hrc | 1
formula/source/ui/dlg/formdlgs.src | 2
formula/source/ui/dlg/parawin.src | 3
formula/source/ui/inc/ForResId.hrc | 2
fpicker/source/office/OfficeFilePicker.hrc | 1
fpicker/source/office/iodlg.hrc | 1
framework/inc/framework.hrc | 2
helpcontent2 | 2
hwpfilter/source/grammar.cxx | 73
idlc/inc/idlc/astattribute.hxx | 4
idlc/inc/idlc/inheritedinterface.hxx | 2
idlc/source/astconstant.cxx | 2
idlc/source/astdump.cxx | 4
idlc/source/astenum.cxx | 4
idlc/source/astinterface.cxx | 4
idlc/source/astoperation.cxx | 2
idlc/source/astservice.cxx | 2
idlc/source/aststruct.cxx | 4
idlc/source/aststructinstance.cxx | 4
idlc/source/attributeexceptions.hxx | 2
idlc/source/idlcmain.cxx | 2
idlc/source/options.cxx | 6
include/codemaker/exceptiontree.hxx | 2
include/codemaker/generatedtypeset.hxx | 2
include/editeng/editids.hrc | 1
include/editeng/editrids.hrc | 1
include/editeng/memberids.hrc | 1
include/formula/compiler.hrc | 1
include/osl/file.h | 16
include/osl/file.hxx | 11
include/sfx2/sfx.hrc | 16
include/sfx2/sfxbasecontroller.hxx | 9
include/sfx2/sfxsids.hrc | 13
include/sfx2/tabdlg.hxx | 2
include/sfx2/viewsh.hxx | 7
include/svl/memberid.hrc | 2
include/svtools/controldims.hrc | 1
include/svtools/svtools.hrc | 7
include/svx/dialogs.hrc | 12
include/svx/relfld.hxx | 3
include/svx/svdstr.hrc | 2
include/svx/svxids.hrc | 18
include/svx/svxitems.hrc | 1
include/toolkit/awt/xsimpleanimation.hxx | 70
include/toolkit/awt/xthrobber.hxx | 73
include/toolkit/controls/tksimpleanimation.hxx | 95 -
include/toolkit/controls/tkthrobber.hxx | 103 -
include/tools/resmgr.hxx | 4
include/vcl/builder.hxx | 2
include/vcl/fpicker.hrc | 1
include/vcl/opengl/OpenGLContext.hxx | 3
include/vcl/opengl/OpenGLHelper.hxx | 7
include/vcl/outdev.hxx | 6
include/vcl/window.hxx | 2
lotuswordpro/Library_lwpft.mk | 2
lotuswordpro/inc/pch/precompiled_lwpft.cxx | 12
lotuswordpro/inc/pch/precompiled_lwpft.hxx | 80 +
lotuswordpro/source/filter/bento.hxx | 4
lotuswordpro/source/filter/genericfilter.cxx | 1
lotuswordpro/source/filter/lwpbackgroundstuff.cxx | 8
lotuswordpro/source/filter/lwpcharsetmgr.cxx | 2
lotuswordpro/source/filter/lwpfilter.cxx | 3
lotuswordpro/source/filter/lwpoleobject.hxx | 2
lotuswordpro/source/filter/lwpsdwfileloader.cxx | 2
lotuswordpro/source/filter/lwpsdwfileloader.hxx | 3
lotuswordpro/source/filter/lwptblformula.cxx | 6
lotuswordpro/source/filter/lwptblformula.hxx | 6
lotuswordpro/source/filter/lwptools.cxx | 1
lotuswordpro/source/filter/lwpunoheader.hxx | 10
lotuswordpro/source/filter/xfilter/xfdefs.hxx | 2
lotuswordpro/source/filter/xfilter/xfglobal.hxx | 2
lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx | 2
lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx | 11
lotuswordpro/source/filter/xfilter/xfsaxstream.cxx | 1
lotuswordpro/source/filter/xfilter/xfsaxstream.hxx | 14
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 26
oox/source/drawingml/diagram/diagram.hxx | 8
oox/source/drawingml/shape.cxx | 6
oox/source/export/chartexport.cxx | 5
package/source/xstor/xstorage.cxx | 14
pyuno/source/module/pyuno.cxx | 3
pyuno/source/module/pyuno_callable.cxx | 3
pyuno/source/module/pyuno_runtime.cxx | 3
reportdesign/inc/RptResId.hrc | 2
reportdesign/source/core/inc/core_resource.hrc | 3
reportdesign/source/inc/stringconstants.hrc | 3
reportdesign/source/inc/xmlstrings.hrc | 1
reportdesign/source/ui/dlg/CondFormat.src | 1
reportdesign/source/ui/dlg/GroupsSorting.hrc | 1
reportdesign/source/ui/dlg/GroupsSorting.src | 2
reportdesign/source/ui/report/report.src | 2
rsc/source/rscpp/cpp3.c | 3
sal/cppunittester/cppunittester.cxx | 8
sal/osl/unx/file_misc.cxx | 26
sal/osl/unx/socket.c | 8
sal/osl/w32/file_dirvol.cxx | 6
sal/qa/osl/process/osl_Thread.cxx | 5
sal/qa/rtl/ostring/rtl_str.cxx | 14
sal/util/sal.map | 1
sc/inc/chartarr.hxx | 24
sc/inc/column.hxx | 4
sc/inc/document.hxx | 3
sc/inc/sc.hrc | 3
sc/source/core/data/column.cxx | 2
sc/source/core/data/column2.cxx | 10
sc/source/core/data/column3.cxx | 6
sc/source/core/data/documen5.cxx | 47
sc/source/core/tool/chartarr.cxx | 36
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 6
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 1
sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx | 2
sc/source/ui/StatisticsDialogs/StatisticsDialogs.src | 1
sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx | 2
sc/source/ui/app/client.cxx | 1
sc/source/ui/app/inputhdl.cxx | 8
sc/source/ui/app/transobj.cxx | 1
sc/source/ui/dbgui/pvfundlg.src | 4
sc/source/ui/drawfunc/drawsh.cxx | 1
sc/source/ui/drawfunc/drawsh2.cxx | 1
sc/source/ui/drawfunc/drformsh.src | 2
sc/source/ui/drawfunc/drtxtob.cxx | 1
sc/source/ui/drawfunc/drtxtob1.cxx | 1
sc/source/ui/drawfunc/objdraw.src | 22
sc/source/ui/inc/TableFillingAndNavigationTools.hxx | 2
sc/source/ui/inc/namedefdlg.hxx | 2
sc/source/ui/inc/tabview.hxx | 2
sc/source/ui/inc/tabvwsh.hxx | 4
sc/source/ui/inc/viewdata.hxx | 3
sc/source/ui/namedlg/namedefdlg.cxx | 2
sc/source/ui/pagedlg/pagedlg.hrc | 2
sc/source/ui/pagedlg/pagedlg.src | 1
sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 5
sc/source/ui/src/hdrcont.src | 7
sc/source/ui/src/popup.src | 3
sc/source/ui/src/scfuncs.src | 2
sc/source/ui/src/scstring.src | 1
sc/source/ui/src/toolbox.src | 1
sc/source/ui/undo/undoblk.cxx | 1
sc/source/ui/unoobj/cellsuno.cxx | 6
sc/source/ui/unoobj/dapiuno.cxx | 26
sc/source/ui/unoobj/datauno.cxx | 2
sc/source/ui/unoobj/linkuno.cxx | 4
sc/source/ui/vba/excelvbahelper.cxx | 1
sc/source/ui/view/cellsh.cxx | 1
sc/source/ui/view/cellsh1.cxx | 1
sc/source/ui/view/cliputil.cxx | 1
sc/source/ui/view/drawvie4.cxx | 1
sc/source/ui/view/editsh.cxx | 1
sc/source/ui/view/select.cxx | 1
sc/source/ui/view/spelldialog.cxx | 1
sc/source/ui/view/tabcont.cxx | 1
sc/source/ui/view/tabview.cxx | 2
sc/source/ui/view/tabvwsh2.cxx | 1
sc/source/ui/view/tabvwsh4.cxx | 27
sc/source/ui/view/tabvwshb.cxx | 6
sc/source/ui/view/tabvwshd.cxx | 1
sc/source/ui/view/tabvwshe.cxx | 1
sc/source/ui/view/tabvwshg.cxx | 1
sc/source/ui/view/viewdata.cxx | 3
sc/source/ui/view/viewfun3.cxx | 1
sc/source/ui/view/viewfun4.cxx | 1
sc/source/ui/view/viewfun7.cxx | 1
scaddins/source/analysis/analysis.hrc | 3
scaddins/source/datefunc/datefunc.hrc | 5
scaddins/source/datefunc/datefunc.src | 4
scaddins/source/pricing/pricing.hrc | 5
scaddins/source/pricing/pricing.src | 12
scripting/workben/bindings/impressmenubar.xml | 2
sd/inc/app.hrc | 1
sd/inc/glob.hrc | 1
sd/source/core/glob.src | 1
sd/source/core/text/textapi.cxx | 6
sd/source/filter/eppt/pptx-epptbase.cxx | 2
sd/source/filter/html/HtmlOptionsDialog.cxx | 5
sd/source/filter/html/pubdlg.src | 1
sd/source/filter/xml/sdxmlwrp.cxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 15
sd/source/ui/app/menuids_tmpl.src | 5
sd/source/ui/app/popup.src | 11
sd/source/ui/app/popup2_tmpl.src | 22
sd/source/ui/app/res_bmp.src | 2
sd/source/ui/app/tbxids_tmpl.src | 3
sd/source/ui/dlg/prntopts.cxx | 2
sd/source/ui/dlg/sdpreslt.cxx | 8
sd/source/ui/dlg/sdtreelb.cxx | 4
sd/source/ui/dlg/tpoption.cxx | 2
sd/source/ui/docshell/docshel3.cxx | 4
sd/source/ui/func/fuarea.cxx | 7
sd/source/ui/func/fubullet.cxx | 7
sd/source/ui/func/fuchar.cxx | 5
sd/source/ui/func/fucopy.cxx | 14
sd/source/ui/func/fucushow.cxx | 5
sd/source/ui/func/fuinsert.cxx | 10
sd/source/ui/func/fuinsfil.cxx | 21
sd/source/ui/func/fuline.cxx | 8
sd/source/ui/func/fulinend.cxx | 4
sd/source/ui/func/fulink.cxx | 4
sd/source/ui/func/fumorph.cxx | 4
sd/source/ui/func/fuoaprms.cxx | 5
sd/source/ui/func/fuolbull.cxx | 7
sd/source/ui/func/fuparagr.cxx | 4
sd/source/ui/inc/prntopts.hxx | 4
sd/source/ui/inc/pubdlg.hrc | 15
sd/source/ui/inc/res_bmp.hrc | 1
sd/source/ui/inc/sdtreelb.hxx | 5
sd/source/ui/inc/strings.hrc | 2
sd/source/ui/inc/tpoption.hxx | 2
sd/source/ui/unoidl/DrawController.cxx | 16
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2
sd/source/ui/unoidl/randomnode.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 10
sd/source/ui/view/drtxtob.cxx | 134 -
sdext/Library_pdfimport.mk | 1
sdext/source/pdfimport/inc/contentsink.hxx | 18
sdext/source/pdfimport/test/tests.cxx | 3
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 16
sdext/source/pdfimport/tree/pdfiprocessor.hxx | 3
sdext/source/pdfimport/wrapper/wrapper.cxx | 31
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 33
sfx2/inc/filedlghelper.hrc | 1
sfx2/source/appl/app.src | 2
sfx2/source/appl/imestatuswindow.hxx | 2
sfx2/source/bastyp/fltfnc.cxx | 28
sfx2/source/dialog/backingcomp.cxx | 14
sfx2/source/dialog/dialog.src | 1
sfx2/source/dialog/filedlghelper.src | 2
sfx2/source/dialog/recfloat.src | 1
sfx2/source/dialog/tabdlg.cxx | 2
sfx2/source/dialog/templdlg.cxx | 17
sfx2/source/doc/doc.hrc | 2
sfx2/source/doc/doc.src | 1
sfx2/source/doc/iframe.cxx | 8
sfx2/source/doc/plugin.cxx | 4
sfx2/source/doc/printhelper.cxx | 8
sfx2/source/doc/sfxbasemodel.cxx | 58
sfx2/source/doc/templatelocnames.src | 3
sfx2/source/inc/fltoptint.hxx | 2
sfx2/source/inc/templdgi.hxx | 2
sfx2/source/sidebar/ResourceManager.cxx | 2
sfx2/source/sidebar/ResourceManager.hxx | 2
sfx2/source/sidebar/Theme.cxx | 10
sfx2/source/view/frmload.cxx | 13
sfx2/source/view/sfxbasecontroller.cxx | 16
sfx2/source/view/view.src | 1
sfx2/source/view/viewsh.cxx | 5
slideshow/Library_OGLTrans.mk | 2
slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx | 87 -
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx | 12
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 747 ++--------
solenv/bin/fix-includes.pl | 6
starmath/inc/starmath.hrc | 1
starmath/source/accessibility.cxx | 8
starmath/source/commands.src | 3
starmath/source/smres.src | 1
starmath/source/toolbox.src | 3
stoc/source/javavm/interact.hxx | 2
stoc/source/javavm/javavm.hxx | 2
svl/source/misc/mediatyp.src | 3
svl/source/numbers/zforfind.cxx | 105 +
svtools/source/contnr/fileview.src | 1
svtools/source/contnr/templwin.hrc | 1
svtools/source/control/ctrlbox.src | 1
svtools/source/dialogs/addresstemplate.hrc | 1
svtools/source/java/javacontext.cxx | 4
svtools/source/java/javaerror.src | 2
svtools/source/java/javainteractionhandler.cxx | 4
svtools/source/uno/statusbarcontroller.cxx | 4
svtools/source/uno/toolboxcontroller.cxx | 4
svtools/source/uno/unoimap.cxx | 14
svx/inc/globlmn_tmpl.hrc | 8
svx/source/accessibility/AccessibleGraphicShape.cxx | 2
svx/source/accessibility/AccessibleOLEShape.cxx | 2
svx/source/accessibility/AccessibleShape.cxx | 6
svx/source/accessibility/accessibility.src | 3
svx/source/dialog/bmpmask.src | 2
svx/source/dialog/contdlg.hrc | 5
svx/source/dialog/contdlg.src | 1
svx/source/dialog/dlgctrl.cxx | 1
svx/source/dialog/docrecovery.hrc | 1
svx/source/dialog/imapdlg.hrc | 6
svx/source/dialog/imapdlg.src | 2
svx/source/dialog/prtqry.src | 1
svx/source/dialog/relfld.cxx | 14
svx/source/dialog/sdstring.src | 22
svx/source/engine3d/float3d.src | 1
svx/source/fmcomp/fmgridif.cxx | 4
svx/source/form/dataaccessdescriptor.cxx | 8
svx/source/form/fmdpage.cxx | 2
svx/source/form/fmundo.cxx | 2
svx/source/form/fmvwimp.cxx | 2
svx/source/form/formcontroller.cxx | 2
svx/source/form/navigatortreemodel.cxx | 6
svx/source/items/svxitems.src | 1
svx/source/sidebar/area/AreaPropertyPanel.src | 1
svx/source/sidebar/text/TextPropertyPanel.src | 3
svx/source/src/app.hrc | 1
svx/source/src/app.src | 1
svx/source/stbctrls/stbctrls.src | 1
svx/source/svdraw/svdstr.src | 7
svx/source/table/accessibletableshape.cxx | 2
svx/source/table/cell.cxx | 18
svx/source/tbxctrls/extrusioncontrols.src | 1
svx/source/unodraw/XPropertyTable.cxx | 10
svx/source/unodraw/gluepts.cxx | 2
svx/source/unodraw/unodtabl.cxx | 2
svx/source/unodraw/unogtabl.cxx | 2
svx/source/unodraw/unohtabl.cxx | 2
svx/source/unodraw/unopool.cxx | 22
svx/source/unodraw/unoprov.cxx | 350 ++--
svx/source/unodraw/unoshap2.cxx | 6
svx/source/unodraw/unoshap3.cxx | 2
svx/source/unodraw/unoshape.cxx | 194 +-
svx/source/unodraw/unoshcol.cxx | 2
svx/source/unodraw/unottabl.cxx | 2
svx/source/unogallery/unogalitem.cxx | 32
svx/source/unogallery/unogaltheme.cxx | 12
svx/source/unogallery/unogalthemeprovider.cxx | 14
svx/source/xml/xmleohlp.cxx | 4
svx/source/xml/xmlxtimp.cxx | 8
svx/source/xoutdev/xattr.cxx | 4
svx/workben/pixelctl.cxx | 25
sw/inc/access.hrc | 1
sw/inc/comcore.hrc | 4
sw/inc/docary.hxx | 2
sw/inc/dochdl.hrc | 1
sw/inc/fldui.hrc | 2
sw/inc/globals.hrc | 4
sw/inc/poolfmt.hrc | 5
sw/inc/rcid.hrc | 5
sw/qa/extras/ooxmlexport/data/fdo78654.docx |binary
sw/qa/extras/ooxmlexport/data/fdo78658.docx |binary
sw/qa/extras/ooxmlexport/data/fdo78659.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 29
sw/source/core/docnode/nodedump.cxx | 34
sw/source/core/frmedt/tblsel.cxx | 3
sw/source/core/inc/pagefrm.hrc | 1
sw/source/core/layout/flycnt.cxx | 4
sw/source/core/uibase/dbui/mailmergechildwindow.src | 1
sw/source/core/uibase/docvw/annotation.hrc | 2
sw/source/core/uibase/docvw/docvw.hrc | 2
sw/source/core/uibase/inc/app.hrc | 2
sw/source/core/uibase/inc/frmui.hrc | 1
sw/source/core/uibase/inc/globdoc.hrc | 4
sw/source/core/uibase/inc/optload.hxx | 37
sw/source/core/uibase/inc/optpage.hxx | 8
sw/source/core/uibase/inc/popup.hrc | 1
sw/source/core/uibase/inc/shells.hrc | 1
sw/source/core/uibase/inc/table.hrc | 3
sw/source/core/uibase/inc/utlui.hrc | 5
sw/source/core/uibase/inc/web.hrc | 2
sw/source/core/uibase/inc/wordcountdialog.hxx | 4
sw/source/core/uibase/ribbar/inputwin.hrc | 1
sw/source/core/uibase/uno/SwXDocumentSettings.cxx | 10
sw/source/core/uibase/uno/unotxdoc.cxx | 48
sw/source/core/uibase/utlui/navipi.src | 1
sw/source/core/uibase/wrtsh/wrtsh.hrc | 2
sw/source/core/undo/undo.hrc | 1
sw/source/core/undo/undraw.cxx | 4
sw/source/core/unocore/unochart.cxx | 4
sw/source/core/unocore/unosett.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 4
sw/source/filter/ww8/writerwordglue.cxx | 104 +
sw/source/filter/ww8/ww8par3.cxx | 3
sw/source/ui/app/app.src | 7
sw/source/ui/app/error.src | 2
sw/source/ui/app/mn.src | 7
sw/source/ui/config/optload.cxx | 40
sw/source/ui/config/optpage.cxx | 8
sw/source/ui/dbui/mmaddressblockpage.src | 1
sw/source/ui/dbui/mmgreetingspage.src | 1
sw/source/ui/dialog/wordcountdialog.cxx | 27
sw/source/ui/dochdl/dochdl.src | 3
sw/source/ui/utlui/utlui.src | 1
sw/uiconfig/swriter/ui/optgeneralpage.ui | 600 ++++----
sw/uiconfig/swriter/ui/wordcount.ui | 52
tools/source/rc/resmgr.cxx | 3
ucb/source/core/ucbcmds.cxx | 2
unotools/source/config/configitem.cxx | 5
unotools/source/ucbhelper/tempfile.cxx | 5
unotools/source/ucbhelper/ucbhelper.cxx | 2
uui/source/alreadyopen.src | 2
uui/source/filechanged.src | 2
uui/source/getcontinuations.hxx | 4
uui/source/iahndl-authentication.cxx | 42
uui/source/iahndl-errorhandler.cxx | 18
uui/source/iahndl-filter.cxx | 34
uui/source/iahndl-ioexceptions.cxx | 6
uui/source/iahndl-locking.cxx | 26
uui/source/iahndl-ssl.cxx | 20
uui/source/iahndl.cxx | 112 -
uui/source/iahndl.hxx | 22
uui/source/ids.hrc | 4
uui/source/interactionhandler.cxx | 2
uui/source/lockfailed.src | 2
uui/source/masterpasscrtdlg.cxx | 4
uui/source/masterpassworddlg.cxx | 4
uui/source/nameclashdlg.cxx | 4
uui/source/nameclashdlg.hrc | 2
uui/source/nameclashdlg.hxx | 8
uui/source/openlocked.src | 2
uui/source/passwordcontainer.cxx | 20
uui/source/passwordcontainer.hxx | 10
uui/source/passworddlg.src | 2
uui/source/passworderrs.src | 2
uui/source/requeststringresolver.hxx | 8
uui/source/secmacrowarnings.cxx | 2
uui/source/sslwarndlg.cxx | 4
uui/source/trylater.src | 2
uui/source/unknownauthdlg.cxx | 4
vcl/Library_vcl.mk | 3
vcl/inc/osx/salinst.h | 1
vcl/osx/salinst.cxx | 4
vcl/source/filter/sgffilt.hxx | 2
vcl/source/filter/sgvmain.cxx | 3
vcl/source/filter/sgvmain.hxx | 2
vcl/source/filter/wmf/winmtf.cxx | 2
vcl/source/filter/wmf/winmtf.hxx | 2
vcl/source/fontsubset/xlat.cxx | 3
vcl/source/opengl/OpenGLContext.cxx | 44
vcl/source/opengl/OpenGLHelper.cxx | 36
vcl/source/outdev/bitmap.cxx | 4
vcl/source/outdev/outdev.cxx | 4
vcl/source/src/images.src | 8
vcl/source/window/builder.cxx | 6
vcl/source/window/debug.cxx | 48
vcl/source/window/dndlcon.cxx | 20
vcl/source/window/globalization.cxx | 35
vcl/source/window/resource.cxx | 158 ++
vcl/source/window/window.cxx | 171 --
vcl/unx/generic/dtrans/X11_clipboard.hxx | 52
vcl/unx/generic/dtrans/X11_dndcontext.hxx | 2
vcl/unx/generic/dtrans/X11_droptarget.cxx | 1
vcl/unx/generic/dtrans/X11_selection.hxx | 124 -
vcl/unx/generic/dtrans/X11_service.cxx | 1
wizards/source/euro/euro.src | 32
wizards/source/formwizard/dbwizres.src | 128 -
wizards/source/importwizard/importwi.src | 38
wizards/source/template/template.src | 24
writerfilter/inc/resourcemodel/TableManager.hxx | 2
writerfilter/inc/resourcemodel/util.hxx | 9
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 76 -
writerfilter/source/dmapper/StyleSheetTable.hxx | 12
writerfilter/source/dmapper/TablePropertiesHandler.hxx | 6
writerfilter/source/dmapper/TblStylePrHandler.cxx | 2
writerfilter/source/dmapper/TblStylePrHandler.hxx | 4
writerfilter/source/resourcemodel/TagLogger.cxx | 36
writerfilter/source/rtftok/rtfvalue.cxx | 4
writerfilter/source/rtftok/rtfvalue.hxx | 4
xmloff/source/chart/ColorPropertySet.cxx | 2
xmloff/source/chart/PropertyMaps.cxx | 8
xmloff/source/chart/SchXMLEnumConverter.cxx | 4
xmloff/source/core/SettingsExportHelper.cxx | 12
xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx | 2
xmloff/source/core/unoatrcn.cxx | 6
xmloff/source/draw/animationimport.cxx | 2
xmloff/source/draw/sdpropls.cxx | 38
xmloff/source/draw/ximpshap.cxx | 2
xmloff/source/style/XMLFontAutoStylePool.cxx | 4
xmloff/source/style/prhdlfac.cxx | 4
xmloff/source/text/XMLAutoTextEventImport.cxx | 4
xmloff/source/text/txtparae.cxx | 2
xmloff/source/text/txtprhdl.cxx | 6
xmloff/source/transform/OOo2Oasis.cxx | 8
xmloff/source/transform/TransformerBase.cxx | 6
xmlsecurity/inc/xmlsecurity/biginteger.hxx | 2
xmlsecurity/inc/xmlsecurity/global.hrc | 1
xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h | 4
xmlsecurity/qa/certext/SanCertExt.cxx | 12
xmlsecurity/source/component/certificatecontainer.cxx | 2
xmlsecurity/source/component/documentdigitalsignatures.cxx | 6
xmlsecurity/source/component/documentdigitalsignatures.hxx | 2
xmlsecurity/source/component/registerservices.cxx | 4
xmlsecurity/source/dialogs/certificatechooser.cxx | 4
xmlsecurity/source/dialogs/certificateviewer.cxx | 2
xmlsecurity/source/dialogs/dialogs.hrc | 1
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.src | 1
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
xmlsecurity/source/framework/xsec_framework.cxx | 14
xmlsecurity/source/helper/documentsignaturehelper.cxx | 6
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 4
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 4
xmlsecurity/source/helper/xsecctl.cxx | 2
xmlsecurity/source/helper/xsecparser.cxx | 2
xmlsecurity/source/helper/xsecparser.hxx | 2
xmlsecurity/source/helper/xsecsign.cxx | 2
xmlsecurity/source/helper/xsecverify.cxx | 2
xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx | 2
xmlsecurity/source/xmlsec/diagnose.cxx | 4
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx | 2
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 2
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 6
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx | 2
xmlsecurity/source/xmlsec/serialnumberadapter.cxx | 30
xmlsecurity/source/xmlsec/serialnumberadapter.hxx | 8
xmlsecurity/source/xmlsec/xmlstreamio.cxx | 2
699 files changed, 3875 insertions(+), 4468 deletions(-)
New commits:
commit cc0585c66a3fb6c401ec134488e2e097f0e205d3
Author: Rachit Gupta <rachitgupta1792 at gmail.com>
Date: Wed May 21 11:38:21 2014 +0530
Added SearchAndParseThread.
The search results data is retrieved and parsed in a separate
thread so that the UI doesn't hang awkwardly.
Change-Id: I51437edd4cfbd45f5fb7e487ad2baf5dba6618a4
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index a46b7b2..b454d17 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star::ucb;
SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
: ModalDialog( pParent, "SelectPersonaDialog", "cui/ui/select_persona_dialog.ui" )
{
- PushButton *pButton;
get( pButton, "search_personas" );
pButton->SetClickHdl( LINK( this, SelectPersonaDialog, VisitPersonas ) );
@@ -55,29 +54,10 @@ OUString SelectPersonaDialog::GetPersonaURL() const
IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, /*pButton*/ )
{
- Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
- Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext);
- PersonasDocHandler* pHandler = new PersonasDocHandler();
- Reference< xml::sax::XDocumentHandler > xDocHandler = pHandler;
- uno::Reference< ucb::XSimpleFileAccess3 > xFileAccess( ucb::SimpleFileAccess::create( comphelper::getProcessComponentContext() ), uno::UNO_QUERY );
- uno::Reference< io::XInputStream > xStream;
- xParser->setDocumentHandler( xDocHandler );
-
OUString searchTerm = m_pEdit->GetText();
OUString rURL = "https://addons.allizom.org/en-US/firefox/api/1.5/search/" + searchTerm + "/9/";
- if ( !xFileAccess.is() )
- return false;
-
- try {
- xStream = xFileAccess->openFileRead( rURL );
- }
- catch (...)
- {
- return false;
- }
- xml::sax::InputSource aParserInput;
- aParserInput.aInputStream = xStream;
- xParser->parseStream( aParserInput );
+ m_aSearchThread = new SearchAndParseThread( this, rURL );
+ m_aSearchThread->launch();
return 0;
}
@@ -297,4 +277,42 @@ bool SvxPersonalizationTabPage::CopyPersonaToGallery( const OUString &rURL )
return true;
}
+
+SearchAndParseThread::SearchAndParseThread( SelectPersonaDialog* pDialog,
+ const OUString& rURL ) :
+ Thread( "cuiPersonasSearchThread" ),
+ m_pPersonaDialog( pDialog ),
+ m_aURL( rURL )
+{
+}
+
+SearchAndParseThread::~SearchAndParseThread()
+{
+}
+
+void SearchAndParseThread::execute()
+{
+ Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
+ Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext);
+ PersonasDocHandler* pHandler = new PersonasDocHandler();
+ Reference< xml::sax::XDocumentHandler > xDocHandler = pHandler;
+ uno::Reference< ucb::XSimpleFileAccess3 > xFileAccess( ucb::SimpleFileAccess::create( comphelper::getProcessComponentContext() ), uno::UNO_QUERY );
+ uno::Reference< io::XInputStream > xStream;
+ xParser->setDocumentHandler( xDocHandler );
+
+ // if ( !xFileAccess.is() )
+ // return false;
+
+ try {
+ xStream = xFileAccess->openFileRead( m_aURL );
+ }
+ catch (...)
+ {
+ // return false;
+ }
+ xml::sax::InputSource aParserInput;
+ aParserInput.aInputStream = xStream;
+ xParser->parseStream( aParserInput );
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 9190eb2..906a969 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -11,8 +11,12 @@
#define INCLUDED_CUI_SOURCE_OPTIONS_PERSONALIZATION_HXX
#include <sfx2/tabdlg.hxx>
+#include <salhelper/thread.hxx>
+#include <rtl/ref.hxx>
+#include <vcl/prgsbar.hxx>
class FixedText;
+class SearchAndParseThread;
class SvxPersonalizationTabPage : public SfxTabPage
{
@@ -57,9 +61,12 @@ class SelectPersonaDialog : public ModalDialog
{
private:
Edit *m_pEdit; ///< The input line for the Persona URL
+ PushButton *pButton;
+
public:
SelectPersonaDialog( Window *pParent );
+ ::rtl::Reference< SearchAndParseThread > m_aSearchThread;
/// Get the URL from the Edit field.
OUString GetPersonaURL() const;
@@ -69,7 +76,21 @@ private:
DECL_LINK( VisitPersonas, PushButton* );
};
+class SearchAndParseThread: public salhelper::Thread
+{
+private:
+
+ SelectPersonaDialog *m_pPersonaDialog;
+ OUString m_aURL;
+ virtual ~SearchAndParseThread();
+ virtual void execute() SAL_OVERRIDE;
+
+public:
+
+ SearchAndParseThread( SelectPersonaDialog* pDialog,
+ const OUString& rURL );
+};
#endif // INCLUDED_CUI_SOURCE_OPTIONS_PERSONALIZATION_HXX
commit d5fd7e78329f8a8eebf264685c10e786c5b45690
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Tue May 20 17:53:25 2014 +0300
fdo#78921 Don't crash when there is no storage specified
Not sure it's a good idea to get here at all
when exporting as flat xml, but anyway it
shouldn't crash.
Change-Id: Ib2ce6b044b4395222a394312d49f5a01d157f9f3
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index ff95ad6..4800c05 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -325,6 +325,10 @@ OUString XMLFontAutoStylePool::embedFontFile( const OUString& fileUrl )
osl::File file( fileUrl );
if( file.open( osl_File_OpenFlag_Read ) != osl::File::E_None )
return OUString();
+
+ if ( !GetExport().GetTargetStorage().is() )
+ return OUString();
+
uno::Reference< embed::XStorage > storage;
storage.set( GetExport().GetTargetStorage()->openStorageElement( OUString( "Fonts" ),
::embed::ElementModes::WRITE ), uno::UNO_QUERY_THROW );
commit 0dfe989dde1e2fd2e3e82a4a74162beb28bd18c7
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 12 16:13:30 2014 +0200
upgrade to python-3.3.5
- remove now obselete patches, which were applied upstream.
- Hack to get MacOS to build
Change-Id: Id68e78e411efc92a46ea9e180f09c390fe5acb4a
Reviewed-on: https://gerrit.libreoffice.org/9311
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/download.lst b/download.lst
index 69aa304..8a3b889 100644
--- a/download.lst
+++ b/download.lst
@@ -110,7 +110,8 @@ export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9
export PNG_TARBALL := libpng-1.5.18.tar.gz
export POPPLER_TARBALL := 1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz
export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2
+export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
+export PYTHON_TARBALL := Python-3.3.5.tgz
export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
export REDLAND_TARBALL := 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk
index d08ba1f..d6a1d04 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -24,13 +24,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.3.0-msvc-disable.patch.1 \
external/python3/python-3.3.0-msvc-x64.patch.1 \
external/python3/python-3.3.0-ssl.patch.1 \
- external/python3/python-3.3.0-implicit-int.patch.1 \
external/python3/python-3.3.0-gcc-4.8.patch.1 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
- external/python3/python-3.3.3-quoted-printable.patch.1 \
external/python3/python-3.3.3-py17797.patch.1 \
external/python3/python-3.3.3-msvc2012-winxp.patch.1 \
+ external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
))
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-3.3.0-implicit-int.patch.1 b/external/python3/python-3.3.0-implicit-int.patch.1
deleted file mode 100644
index 6e4d2b0..0000000
--- a/external/python3/python-3.3.0-implicit-int.patch.1
+++ /dev/null
@@ -1,30 +0,0 @@
-fix function names in import.h
-
-MSVC complains about some declarations in Include/import.h.
-Apparently the problem is a missing space between PyAPI_FUNC(int) and the
-function name, leading to concatenated int_PyImport... names and no
-return type.
-
-diff -ru python3.old/Include/import.h python3/Include/import.h
---- python3.old/Include/import.h 2012-09-29 10:00:26.000000000 +0200
-+++ python3/Include/import.h 2012-11-27 16:09:26.449390966 +0100
-@@ -86,15 +86,15 @@
-
- PyAPI_FUNC(void) _PyImport_ReInitLock(void);
-
--PyAPI_FUNC(PyObject *)_PyImport_FindBuiltin(
-+PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin(
- const char *name /* UTF-8 encoded string */
- );
--PyAPI_FUNC(PyObject *)_PyImport_FindExtensionObject(PyObject *, PyObject *);
--PyAPI_FUNC(int)_PyImport_FixupBuiltin(
-+PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *);
-+PyAPI_FUNC(int) _PyImport_FixupBuiltin(
- PyObject *mod,
- char *name /* UTF-8 encoded string */
- );
--PyAPI_FUNC(int)_PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *);
-+PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *);
-
- struct _inittab {
- char *name; /* ASCII encoded string */
diff --git a/external/python3/python-3.3.0-msvc-x64.patch.1 b/external/python3/python-3.3.0-msvc-x64.patch.1
index 03fcfa7..8882a1c 100644
--- a/external/python3/python-3.3.0-msvc-x64.patch.1
+++ b/external/python3/python-3.3.0-msvc-x64.patch.1
@@ -210,7 +210,7 @@ diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--- python3/PCbuild/pythoncore.vcxproj
+++ python3/PCbuild/pythoncore.vcxproj
-@@ -185,35 +185,35 @@
+@@ -195,35 +195,35 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
@@ -236,14 +236,14 @@ diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<BaseAddress>0x1e000000</BaseAddress>
</Link>
+ <PreBuildEvent>
+ <Command>$(KillPythonExe)
+ IF %ERRORLEVEL% NEQ 0 (
+ echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
+ exit /b 0
+ )</Command>
+ </PreBuildEvent>
+ <PreBuildEvent>
+ <Message>Killing any running $(PythonExe) instances...</Message>
+ </PreBuildEvent>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
- <IntrinsicFunctions>false</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- </ClCompile>
diff --git a/external/python3/python-3.3.3-quoted-printable.patch.1 b/external/python3/python-3.3.3-quoted-printable.patch.1
deleted file mode 100644
index 30c065d..0000000
--- a/external/python3/python-3.3.3-quoted-printable.patch.1
+++ /dev/null
@@ -1,201 +0,0 @@
-
-# HG changeset patch
-# User R David Murray <rdmurray at bitdance.com>
-# Date 1389637161 18000
-# Node ID 4c5b1932354bc4707ef182cf0fa61b2e8ccfaa5e
-# Parent 0ce2396a134bebca11b17337734d5e9966e2a95f
-#20206, #5803: more efficient algorithm that doesn't truncate output.
-
-This fixes an edge case (20206) where if the input ended in a character
-needing encoding but there was no newline on the string, the last byte
-of the encoded character would be dropped. The fix is to use a more
-efficient algorithm, provided by Serhiy Storchaka (5803), that does not
-have the bug.
-
-diff --git a/Lib/email/quoprimime.py b/Lib/email/quoprimime.py
---- a/Lib/email/quoprimime.py
-+++ b/Lib/email/quoprimime.py
-@@ -53,8 +53,9 @@ EMPTYSTRING = ''
- # space-wise. Remember that headers and bodies have different sets of safe
- # characters. Initialize both maps with the full expansion, and then override
- # the safe bytes with the more compact form.
--_QUOPRI_HEADER_MAP = dict((c, '=%02X' % c) for c in range(256))
--_QUOPRI_BODY_MAP = _QUOPRI_HEADER_MAP.copy()
-+_QUOPRI_MAP = ['=%02X' % c for c in range(256)]
-+_QUOPRI_HEADER_MAP = _QUOPRI_MAP[:]
-+_QUOPRI_BODY_MAP = _QUOPRI_MAP[:]
-
- # Safe header bytes which need no encoding.
- for c in b'-!*+/' + ascii_letters.encode('ascii') + digits.encode('ascii'):
-@@ -121,8 +122,7 @@ def unquote(s):
-
-
- def quote(c):
-- return '=%02X' % ord(c)
--
-+ return _QUOPRI_MAP[ord(c)]
-
-
- def header_encode(header_bytes, charset='iso-8859-1'):
-@@ -140,67 +140,15 @@ def header_encode(header_bytes, charset=
- if not header_bytes:
- return ''
- # Iterate over every byte, encoding if necessary.
-- encoded = []
-- for octet in header_bytes:
-- encoded.append(_QUOPRI_HEADER_MAP[octet])
-+ encoded = header_bytes.decode('latin1').translate(_QUOPRI_HEADER_MAP)
- # Now add the RFC chrome to each encoded chunk and glue the chunks
- # together.
-- return '=?%s?q?%s?=' % (charset, EMPTYSTRING.join(encoded))
-+ return '=?%s?q?%s?=' % (charset, encoded)
-
-
--class _body_accumulator(io.StringIO):
--
-- def __init__(self, maxlinelen, eol, *args, **kw):
-- super().__init__(*args, **kw)
-- self.eol = eol
-- self.maxlinelen = self.room = maxlinelen
--
-- def write_str(self, s):
-- """Add string s to the accumulated body."""
-- self.write(s)
-- self.room -= len(s)
--
-- def newline(self):
-- """Write eol, then start new line."""
-- self.write_str(self.eol)
-- self.room = self.maxlinelen
--
-- def write_soft_break(self):
-- """Write a soft break, then start a new line."""
-- self.write_str('=')
-- self.newline()
--
-- def write_wrapped(self, s, extra_room=0):
-- """Add a soft line break if needed, then write s."""
-- if self.room < len(s) + extra_room:
-- self.write_soft_break()
-- self.write_str(s)
--
-- def write_char(self, c, is_last_char):
-- if not is_last_char:
-- # Another character follows on this line, so we must leave
-- # extra room, either for it or a soft break, and whitespace
-- # need not be quoted.
-- self.write_wrapped(c, extra_room=1)
-- elif c not in ' \t':
-- # For this and remaining cases, no more characters follow,
-- # so there is no need to reserve extra room (since a hard
-- # break will immediately follow).
-- self.write_wrapped(c)
-- elif self.room >= 3:
-- # It's a whitespace character at end-of-line, and we have room
-- # for the three-character quoted encoding.
-- self.write(quote(c))
-- elif self.room == 2:
-- # There's room for the whitespace character and a soft break.
-- self.write(c)
-- self.write_soft_break()
-- else:
-- # There's room only for a soft break. The quoted whitespace
-- # will be the only content on the subsequent line.
-- self.write_soft_break()
-- self.write(quote(c))
--
-+_QUOPRI_BODY_ENCODE_MAP = _QUOPRI_BODY_MAP[:]
-+for c in b'\r\n':
-+ _QUOPRI_BODY_ENCODE_MAP[c] = chr(c)
-
- def body_encode(body, maxlinelen=76, eol=NL):
- """Encode with quoted-printable, wrapping at maxlinelen characters.
-@@ -226,26 +174,56 @@ def body_encode(body, maxlinelen=76, eol
- if not body:
- return body
-
-- # The last line may or may not end in eol, but all other lines do.
-- last_has_eol = (body[-1] in '\r\n')
-+ # quote speacial characters
-+ body = body.translate(_QUOPRI_BODY_ENCODE_MAP)
-
-- # This accumulator will make it easier to build the encoded body.
-- encoded_body = _body_accumulator(maxlinelen, eol)
-+ soft_break = '=' + eol
-+ # leave space for the '=' at the end of a line
-+ maxlinelen1 = maxlinelen - 1
-
-- lines = body.splitlines()
-- last_line_no = len(lines) - 1
-- for line_no, line in enumerate(lines):
-- last_char_index = len(line) - 1
-- for i, c in enumerate(line):
-- if body_check(ord(c)):
-- c = quote(c)
-- encoded_body.write_char(c, i==last_char_index)
-- # Add an eol if input line had eol. All input lines have eol except
-- # possibly the last one.
-- if line_no < last_line_no or last_has_eol:
-- encoded_body.newline()
-+ encoded_body = []
-+ append = encoded_body.append
-
-- return encoded_body.getvalue()
-+ for line in body.splitlines():
-+ # break up the line into pieces no longer than maxlinelen - 1
-+ start = 0
-+ laststart = len(line) - 1 - maxlinelen
-+ while start <= laststart:
-+ stop = start + maxlinelen1
-+ # make sure we don't break up an escape sequence
-+ if line[stop - 2] == '=':
-+ append(line[start:stop - 1])
-+ start = stop - 2
-+ elif line[stop - 1] == '=':
-+ append(line[start:stop])
-+ start = stop - 1
-+ else:
-+ append(line[start:stop] + '=')
-+ start = stop
-+
-+ # handle rest of line, special case if line ends in whitespace
-+ if line and line[-1] in ' \t':
-+ room = start - laststart
-+ if room >= 3:
-+ # It's a whitespace character at end-of-line, and we have room
-+ # for the three-character quoted encoding.
-+ q = quote(line[-1])
-+ elif room == 2:
-+ # There's room for the whitespace character and a soft break.
-+ q = line[-1] + soft_break
-+ else:
-+ # There's room only for a soft break. The quoted whitespace
-+ # will be the only content on the subsequent line.
-+ q = soft_break + quote(line[-1])
-+ append(line[start:-1] + q)
-+ else:
-+ append(line[start:])
-+
-+ # add back final newline if present
-+ if body[-1] in CRLF:
-+ append('')
-+
-+ return eol.join(encoded_body)
-
-
-
-diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
---- a/Lib/test/test_email/test_email.py
-+++ b/Lib/test/test_email/test_email.py
-@@ -4216,6 +4216,11 @@ class TestQuopri(unittest.TestCase):
- def test_encode_one_line_eol(self):
- self._test_encode('hello\n', 'hello\r\n', eol='\r\n')
-
-+ def test_encode_one_line_eol_after_non_ascii(self):
-+ # issue 20206; see changeset 0cf700464177 for why the encode/decode.
-+ self._test_encode('hello\u03c5\n'.encode('utf-8').decode('latin1'),
-+ 'hello=CF=85\r\n', eol='\r\n')
-+
- def test_encode_one_space(self):
- self._test_encode(' ', '=20')
-
diff --git a/external/python3/python-3.3.5-pyexpat-symbols.patch.1 b/external/python3/python-3.3.5-pyexpat-symbols.patch.1
new file mode 100644
index 0000000..c04c78c
--- /dev/null
+++ b/external/python3/python-3.3.5-pyexpat-symbols.patch.1
@@ -0,0 +1,28 @@
+HACK: Fix build breakage on MacOS:
+
+*** WARNING: renaming "pyexpat" since importing it failed: dlopen(build/lib.macosx-10.6-i386-3.3/pyexpat.so, 2): Symbol not found: _XML_ErrorString
+
+This reverts c242a8f30806 from the python hg repo:
+
+restore namespacing of pyexpat symbols (closes #19186)
+
+
+See http://bugs.python.org/issue19186#msg214069
+
+The recommendation to include Modules/inc at first broke the Linux build...
+
+So do it this way, as it was before. Needs some realignment later.
+
+--- python3/Modules/expat/expat_external.h
++++ python3/Modules/expat/expat_external.h
+@@ -7,10 +7,6 @@
+
+ /* External API definitions */
+
+-/* Namespace external symbols to allow multiple libexpat version to
+- co-exist. */
+-#include "pyexpatns.h"
+-
+ #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
+ #define XML_USE_MSC_EXTENSIONS 1
+ #endif
commit ab742563a0a4aaf9b4be8e9a7b2b2bada567df4f
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed May 21 02:09:11 2014 +0200
forgot to release the OpenGL resources
Change-Id: I2baefbe611f9ed28defc46ca3af332d13b32c561
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index cea7e0f..cf75ea6 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -110,6 +110,10 @@ OpenGL3DRenderer::~OpenGL3DRenderer()
glDeleteBuffers(1, &m_RenderVertexBuf);
glDeleteBuffers(1, &m_3DUBOBuffer);
glDeleteBuffers(1, &m_VertexBuffer);
+
+ glDeleteFramebuffers(1, &mnPickingFbo);
+ glDeleteRenderbuffers(1, &mnPickingRbo);
+ glDeleteTextures(1, &mnPickingTexture);
}
void OpenGL3DRenderer::ShaderResources::LoadShaders()
commit b7be20580a5589c45bff58aa0dc2c1f624679658
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed May 21 01:49:59 2014 +0200
use FBO for the picking
Change-Id: Ibab6daa1f76300d159ccd4cfbca061c8d8c1951f
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 1653668..d36a008 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -217,14 +217,16 @@ public:
}
-void GL3DBarChart::clickedAt(const Point& )
+void GL3DBarChart::clickedAt(const Point& rPos)
{
+ sal_uInt32 nId = 1;
{
PickingModeSetter(mpRenderer.get());
render();
+ nId = mpRenderer->GetPixelColorFromPoint(rPos.X(), rPos.Y());
}
if (mpCamera)
- mpCamera->zoom(1);
+ mpCamera->zoom(nId);
}
}
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 52d341a..b08e90e 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -179,6 +179,8 @@ public:
void ProcessUnrenderedShape();
void SetPickingMode(bool bPickingMode);
+
+ sal_uInt32 GetPixelColorFromPoint(long nX, long nY);
private:
void MoveModelf(PosVecf3& trans,PosVecf3& angle,PosVecf3& scale);
@@ -362,6 +364,10 @@ private:
bool mbPickingMode;
SceneBox m_SenceBox;
+
+ GLuint mnPickingFbo;
+ GLuint mnPickingRbo;
+ GLuint mnPickingTexture;
};
}
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 92cf61d..cea7e0f 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -249,6 +249,8 @@ void OpenGL3DRenderer::init()
glBufferData(GL_ARRAY_BUFFER, sizeof(squareVertices), squareVertices, GL_STATIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, 0);
+ OpenGLHelper::createFramebuffer(m_iWidth, m_iHeight, mnPickingFbo, mnPickingRbo, mnPickingTexture);
+
CHECK_GL_ERROR();
Init3DUniformBlock();
@@ -1580,6 +1582,22 @@ void OpenGL3DRenderer::MoveModelf(PosVecf3& trans,PosVecf3& angle,PosVecf3& scal
void OpenGL3DRenderer::SetPickingMode(bool bPickingMode)
{
mbPickingMode = bPickingMode;
+ if(mbPickingMode)
+ {
+ glBindFramebuffer(GL_FRAMEBUFFER, mnPickingFbo);
+ }
+ else
+ {
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ }
+}
+
+sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long nX, long nY)
+{
+ boost::scoped_array<sal_uInt8> buf(new sal_uInt8[4]);
+ glReadPixels(nX, nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
+ Color aColor(buf[3], buf[2], buf[1], buf[0]);
+ return aColor.GetColor();
}
}
commit 4f4fb5ef2f5729616945032f71f20d3f58761c1e
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed May 21 00:41:37 2014 +0200
add method for creating framebuffer objects to OpenGLHelper
Change-Id: I08bd2e58ee98a68accae256fcbcc288a8c56ae0b
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index 3cb482b..70b1d2a 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -29,6 +29,13 @@ public:
static void renderToFile(long nWidth, long nHeight, const OUString& rFileName);
static const char* GLErrorString(GLenum errorCode);
+
+ /**
+ * The caller is responsible for deleting the buffer objects identified by
+ * nFramebufferId, nRenderbufferId and nTexturebufferId
+ */
+ static void createFramebuffer(long nWidth, long nHeight,
+ GLuint& nFramebufferId, GLuint& nRenderbufferId, GLuint& nTexturebufferId);
};
VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix);
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 0e9d710..ad2506d 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -268,5 +268,41 @@ std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix)
return rStrm;
}
+void OpenGLHelper::createFramebuffer(long nWidth, long nHeight,
+ GLuint& nFramebufferId, GLuint& nRenderbufferId, GLuint& nTexturebufferId)
+{
+ // create a renderbuffer
+ glGenRenderbuffers(1, &nRenderbufferId);
+ glBindRenderbuffer(GL_RENDERBUFFER, nRenderbufferId);
+ glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, nWidth, nHeight);
+ glBindRenderbuffer(GL_RENDERBUFFER, 0);
+
+ // create a texture
+ glGenTextures(1, &nTexturebufferId);
+ glBindTexture(GL_TEXTURE_2D, nTexturebufferId);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, nWidth, nHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+ glBindTexture(GL_TEXTURE_2D, 0);
+
+ // create a framebuffer object and attach renderbuffer and texture
+ glGenFramebuffers(1, &nFramebufferId);
+ glCheckFramebufferStatus(GL_FRAMEBUFFER);
+ glBindFramebuffer(GL_FRAMEBUFFER, nFramebufferId);
+ glBindTexture(GL_TEXTURE_2D, nTexturebufferId);
+ // attach a texture to FBO color attachement point
+ glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, nTexturebufferId, 0);
+ glCheckFramebufferStatus(GL_FRAMEBUFFER);
+ glBindTexture(GL_TEXTURE_2D, 0);
+ // attach a renderbuffer to depth attachment point
+ glBindRenderbuffer(GL_RENDERBUFFER, nRenderbufferId);
+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, nRenderbufferId);
+ glCheckFramebufferStatus(GL_FRAMEBUFFER);
+ glBindRenderbuffer(GL_RENDERBUFFER, 0);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 06a214da772857fcd479b095c07726ae6108cd0c
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed May 21 00:18:13 2014 +0200
set the color for the picking
Change-Id: If7b902b16626384440241d88937161cf327e14d5
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index f782140..52d341a 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -79,6 +79,7 @@ struct Polygon3DInfo
bool twoSidesLighting;
long fillStyle;
glm::vec4 polygonColor;
+ glm::vec4 id;
Vertices3D *vertices;
UVs3D *uvs;
Normals3D *normals;
@@ -93,6 +94,7 @@ struct Extrude3DInfo
bool rounded;
bool twoSidesLighting;
glm::vec4 extrudeColor;
+ glm::vec4 id;
float xScale;
float yScale;
float zScale;
@@ -136,6 +138,7 @@ struct PackedVertex{
struct TextInfo
{
+ glm::vec4 id;
GLuint texture;
float vertex[12];
};
@@ -159,20 +162,20 @@ public:
void Set3DSenceInfo(sal_uInt32 color = 255, bool twoSidesLighting = true);
void SetLightInfo(bool lightOn, sal_uInt32 color, const glm::vec4& direction);
void AddShapePolygon3DObject(sal_uInt32 color, bool lineOnly, sal_uInt32 lineColor,
- long fillStyle, sal_uInt32 specular);
+ long fillStyle, sal_uInt32 specular, sal_uInt32 nUniqueId);
void EndAddShapePolygon3DObject();
void AddPolygon3DObjectNormalPoint(float x, float y, float z);
void EndAddPolygon3DObjectNormalPoint();
void AddPolygon3DObjectPoint(float x, float y, float z);
void EndAddPolygon3DObjectPoint();
- void AddShape3DExtrudeObject(bool roundedCorner, sal_uInt32 color, sal_uInt32 specular, glm::mat4 modelMatrix);
+ void AddShape3DExtrudeObject(bool roundedCorner, sal_uInt32 color, sal_uInt32 specular, const glm::mat4& modelMatrix, sal_uInt32 nUniqueId);
void EndAddShape3DExtrudeObject();
double GetTime();
void SetFPS(float fps);
void RenderClickPos(Point aMPos);
void SetSize(const Size& rSize);
void SetCameraInfo(glm::vec3 pos, glm::vec3 direction, glm::vec3 up);
- void CreateTextTexture(const BitmapEx& rBitmapEx, glm::vec3 vTopLeft,glm::vec3 vTopRight, glm::vec3 vBottomRight, glm::vec3 vBottomLeft);
+ void CreateTextTexture(const BitmapEx& rBitmapEx, glm::vec3 vTopLeft,glm::vec3 vTopRight, glm::vec3 vBottomRight, glm::vec3 vBottomLeft, sal_uInt32 nUniqueId);
void ProcessUnrenderedShape();
void SetPickingMode(bool bPickingMode);
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx
index 4581d74..e67c25d 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -39,7 +39,7 @@ Bar::Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_uInt32 aCo
void Bar::render()
{
- mpRenderer->AddShape3DExtrudeObject(mbRoundedCorners, maColor.GetColor(), 0xFFFFFF, maPos);
+ mpRenderer->AddShape3DExtrudeObject(mbRoundedCorners, maColor.GetColor(), 0xFFFFFF, maPos, mnUniqueId);
mpRenderer->EndAddShape3DExtrudeObject();
}
@@ -50,7 +50,7 @@ Line::Line(OpenGL3DRenderer* pRenderer, sal_uInt32 nId):
void Line::render()
{
- mpRenderer->AddShapePolygon3DObject(0, true, maLineColor.GetColor(), 0, 0);
+ mpRenderer->AddShapePolygon3DObject(0, true, maLineColor.GetColor(), 0, 0, mnUniqueId);
mpRenderer->AddPolygon3DObjectPoint(maPosBegin.x, maPosBegin.y, maPosBegin.z);
mpRenderer->AddPolygon3DObjectPoint(maPosEnd.x, maPosEnd.y, maPosEnd.z);
mpRenderer->EndAddShapePolygon3DObject();
@@ -87,7 +87,7 @@ void Text::render()
{
glm::vec3 dir2 = maTopRight - maTopLeft;
glm::vec3 bottomLeft = maBottomRight - dir2;
- mpRenderer->CreateTextTexture(maText, maTopLeft, maTopRight, maBottomRight, bottomLeft);
+ mpRenderer->CreateTextTexture(maText, maTopLeft, maTopRight, maBottomRight, bottomLeft, mnUniqueId);
}
Size Text::getSize() const
@@ -112,7 +112,7 @@ void Rectangle::render()
glm::vec3 dir1 = maBottomRight - maTopLeft;
glm::vec3 dir2 = maTopRight - maTopLeft;
glm::vec3 normal = glm::normalize(glm::cross(dir1, dir2));
- mpRenderer->AddShapePolygon3DObject(maColor.GetColor(), false, 0, 1, 0xFFFFFF);
+ mpRenderer->AddShapePolygon3DObject(maColor.GetColor(), false, 0, 1, 0xFFFFFF, mnUniqueId);
glm::vec3 bottomLeft = maBottomRight - dir2;
//set polygon points and normals
mpRenderer->AddPolygon3DObjectPoint(maBottomRight.x, maBottomRight.y, maBottomRight.z);
@@ -128,7 +128,7 @@ void Rectangle::render()
//we should render the edge if the edge color is different from the fill color
if (maColor.GetColor() != maLineColor.GetColor())
{
- mpRenderer->AddShapePolygon3DObject(0, true, maLineColor.GetColor(), 0, 0xFFFFFF);
+ mpRenderer->AddShapePolygon3DObject(0, true, maLineColor.GetColor(), 0, 0xFFFFFF, mnUniqueId);
mpRenderer->AddPolygon3DObjectPoint(maBottomRight.x, maBottomRight.y, maBottomRight.z);
mpRenderer->AddPolygon3DObjectPoint(maTopRight.x, maTopRight.y, maTopRight.z);
mpRenderer->AddPolygon3DObjectPoint(maTopLeft.x, maTopLeft.y, maTopLeft.z);
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 07b652a..92cf61d 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -706,7 +706,10 @@ void OpenGL3DRenderer::RenderLine3D(Polygon3DInfo &polygon)
//fill vertex buffer
glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
glBufferData(GL_ARRAY_BUFFER, pointList->size() * sizeof(glm::vec3), &pointList[0][0], GL_STATIC_DRAW);
- glUniform4fv(maResources.m_2DColorID, 1, &polygon.polygonColor[0]);
+ if(mbPickingMode)
+ glUniform4fv(maResources.m_2DColorID, 1, &polygon.id[0]);
+ else
+ glUniform4fv(maResources.m_2DColorID, 1, &polygon.polygonColor[0]);
glUniformMatrix4fv(maResources.m_MatrixID, 1, GL_FALSE, &m_3DMVP[0][0]);
// 1rst attribute buffer : vertices
@@ -786,6 +789,7 @@ void OpenGL3DRenderer::RenderPolygon3D(Polygon3DInfo &polygon)
{
glm::mat4 aMVP = m_3DProjection * m_3DView * m_Model;
glUniformMatrix4fv(maPickingResources.m_MatrixID, 1, GL_FALSE, &aMVP[0][0]);
+ glUniform4fv(maResources.m_2DColorID, 1, &polygon.id[0]);
}
GLint maVertexID = mbPickingMode ? maPickingResources.m_2DVertexID : maResources.m_3DVertexID;
@@ -878,9 +882,10 @@ void OpenGL3DRenderer::SetLightInfo(bool lightOn, sal_uInt32 nColor, const glm::
}
}
-void OpenGL3DRenderer::AddShapePolygon3DObject(sal_uInt32 nColor, bool lineOnly, sal_uInt32 nLineColor,long fillStyle, sal_uInt32 specular)
+void OpenGL3DRenderer::AddShapePolygon3DObject(sal_uInt32 nColor, bool lineOnly, sal_uInt32 nLineColor,long fillStyle, sal_uInt32 specular, sal_uInt32 nUniqueId)
{
m_Polygon3DInfo.polygonColor = getColorAsVector(nColor);
+ m_Polygon3DInfo.id = getColorAsVector(nUniqueId);
m_Polygon3DInfo.material.materialColor = m_Polygon3DInfo.polygonColor;//material color seems to be the same for all parts, so we use the polygon color
//line or Polygon
m_Polygon3DInfo.lineOnly = lineOnly;
@@ -960,8 +965,9 @@ void OpenGL3DRenderer::EndAddPolygon3DObjectPoint()
m_Polygon3DInfo.vertices = NULL;
}
-void OpenGL3DRenderer::AddShape3DExtrudeObject(bool roundedCorner, sal_uInt32 nColor, sal_uInt32 specular, glm::mat4 modelMatrix)
+void OpenGL3DRenderer::AddShape3DExtrudeObject(bool roundedCorner, sal_uInt32 nColor, sal_uInt32 specular, const glm::mat4& modelMatrix, sal_uInt32 nUniqueId)
{
+ m_Extrude3DInfo.id = getColorAsVector(nUniqueId);
glm::vec4 tranform = modelMatrix * glm::vec4(0.0, 0.0, 0.0, 1.0);
glm::vec4 DirX = modelMatrix * glm::vec4(1.0, 0.0, 0.0, 0.0);
glm::vec4 DirY = modelMatrix * glm::vec4(0.0, 1.0, 0.0, 0.0);
@@ -1091,6 +1097,7 @@ void OpenGL3DRenderer::RenderExtrudeFlatSurface(const Extrude3DInfo& extrude3D,
{
glm::mat4 aMVP = m_3DProjection * m_3DView * m_Model;
glUniformMatrix4fv(maPickingResources.m_MatrixID, 1, GL_FALSE, &aMVP[0][0]);
+ glUniform4fv(maResources.m_2DColorID, 1, &extrude3D.id[0]);
}
glDrawElements(GL_TRIANGLES, extrude3D.size[surIndex], GL_UNSIGNED_SHORT, reinterpret_cast<GLvoid*>(extrude3D.startIndex[surIndex]));
@@ -1134,6 +1141,7 @@ void OpenGL3DRenderer::RenderExtrudeBottomSurface(const Extrude3DInfo& extrude3D
{
glm::mat4 aMVP = m_3DProjection * m_3DView * m_Model;
glUniformMatrix4fv(maPickingResources.m_MatrixID, 1, GL_FALSE, &aMVP[0][0]);
+ glUniform4fv(maResources.m_2DColorID, 1, &extrude3D.id[0]);
}
glDrawElements(GL_TRIANGLES, extrude3D.size[BOTTOM_SURFACE], GL_UNSIGNED_SHORT, reinterpret_cast<GLvoid*>(extrude3D.startIndex[BOTTOM_SURFACE]));
}
@@ -1178,6 +1186,7 @@ void OpenGL3DRenderer::RenderExtrudeMiddleSurface(const Extrude3DInfo& extrude3D
{
glm::mat4 aMVP = m_3DProjection * m_3DView * m_Model;
glUniformMatrix4fv(maPickingResources.m_MatrixID, 1, GL_FALSE, &aMVP[0][0]);
+ glUniform4fv(maResources.m_2DColorID, 1, &extrude3D.id[0]);
}
glDrawElements(GL_TRIANGLES, extrude3D.size[MIDDLE_SURFACE], GL_UNSIGNED_SHORT, reinterpret_cast<GLvoid*>(extrude3D.startIndex[MIDDLE_SURFACE]));
}
@@ -1223,6 +1232,7 @@ void OpenGL3DRenderer::RenderExtrudeTopSurface(const Extrude3DInfo& extrude3D)
{
glm::mat4 aMVP = m_3DProjection * m_3DView * m_Model;
glUniformMatrix4fv(maPickingResources.m_MatrixID, 1, GL_FALSE, &aMVP[0][0]);
+ glUniform4fv(maResources.m_2DColorID, 1, &extrude3D.id[0]);
}
glDrawElements(GL_TRIANGLES, extrude3D.size[TOP_SURFACE], GL_UNSIGNED_SHORT, reinterpret_cast<GLvoid*>(extrude3D.startIndex[TOP_SURFACE]));
RenderExtrudeFlatSurface(extrude3D, FLAT_BOTTOM_SURFACE);
@@ -1253,6 +1263,7 @@ void OpenGL3DRenderer::RenderNonRoundedBar(const Extrude3DInfo& extrude3D)
{
glm::mat4 aMVP = m_3DProjection * m_3DView * m_Model;
glUniformMatrix4fv(maPickingResources.m_MatrixID, 1, GL_FALSE, &aMVP[0][0]);
+ glUniform4fv(maResources.m_2DColorID, 1, &extrude3D.id[0]);
}
glDrawArrays(GL_TRIANGLES, 0, 36);
}
@@ -1279,7 +1290,9 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
if(mbPickingMode)
+ {
glUseProgram(maPickingResources.m_CommonProID);
+ }
else
{
Update3DUniformBlock();
@@ -1294,6 +1307,9 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
Extrude3DInfo extrude3DInfo = m_Extrude3DList[i];
GLuint vertexBuf = extrude3DInfo.rounded ? m_CubeVertexBuf : m_BoundBox;
GLuint normalBuf = extrude3DInfo.rounded ? m_CubeNormalBuf : m_BoundBoxNormal;
+
+ if(mbPickingMode)
+ glUniform4fv(maResources.m_2DColorID, 1, &extrude3DInfo.id[0]);
// 1st attribute buffer : vertices
GLint aVertexID = mbPickingMode ? maPickingResources.m_2DVertexID : maResources.m_3DVertexID;
@@ -1348,13 +1364,14 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
glDisable(GL_CULL_FACE);
}
-void OpenGL3DRenderer::CreateTextTexture(const BitmapEx& rBitmapEx, glm::vec3 vTopLeft,glm::vec3 vTopRight, glm::vec3 vBottomRight, glm::vec3 vBottomLeft)
+void OpenGL3DRenderer::CreateTextTexture(const BitmapEx& rBitmapEx, glm::vec3 vTopLeft,glm::vec3 vTopRight, glm::vec3 vBottomRight, glm::vec3 vBottomLeft, sal_uInt32 nUniqueId)
{
long bmpWidth = rBitmapEx.GetSizePixel().Width();
long bmpHeight = rBitmapEx.GetSizePixel().Height();
boost::scoped_array<sal_uInt8> bitmapBuf(OpenGLHelper::ConvertBitmapExToRGBABuffer(rBitmapEx));
TextInfo aTextInfo;
+ aTextInfo.id = getColorAsVector(nUniqueId);
aTextInfo.vertex[0] = vBottomRight.x;
aTextInfo.vertex[1] = vBottomRight.y;
aTextInfo.vertex[2] = vBottomRight.z * m_fHeightWeight;
commit 1a54dec3a2064573774a23176a5bdc7c0b2645a0
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Tue May 20 23:59:55 2014 +0200
remove unnecessary whitespaces
Change-Id: I4d93c0149aaf90e2477c1382aa51f8f08c967626
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 8628bb8..f782140 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -106,7 +106,6 @@ struct Extrude3DInfo
int reverse;
};
-
struct CameraInfo
{
glm::vec3 cameraPos;
@@ -150,7 +149,6 @@ typedef struct SceneBox{
float minZCoord;
}SceneBox;
-
class OpenGL3DRenderer
{
public:
commit cbaf33c764917c08cb95b1ce10f3bd9852def165
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Tue May 20 23:47:28 2014 +0200
avoid division by zero that happens to me in some cases
Change-Id: Ifc80462e7826e7d717dc553f50dd00f2b771bf15
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index c98ef30..07b652a 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1030,7 +1030,7 @@ void OpenGL3DRenderer::Init3DUniformBlock()
{
return;
}
- int nUniformBufferAlignSize = 0;
+ int nUniformBufferAlignSize = 1;
glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &nUniformBufferAlignSize);
GLint nBlockDataSizeLight = 0, nBlockDataSizeMertrial = 0;
glGetActiveUniformBlockiv(maResources.m_3DProID, a3DLightBlockIndex, GL_UNIFORM_BLOCK_DATA_SIZE, &nBlockDataSizeLight);
commit 556580c0502447275f080fc7a973dff65aa0d1c0
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Tue May 20 23:46:57 2014 +0200
we need to create the buffer
Somehow this only crashes when I use gdb.
Change-Id: Ic18ffa3af931b80a7241e8fe711753db03da166e
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index f7867d5..c98ef30 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -109,6 +109,7 @@ OpenGL3DRenderer::~OpenGL3DRenderer()
glDeleteBuffers(1, &m_RenderTexCoordBuf);
glDeleteBuffers(1, &m_RenderVertexBuf);
glDeleteBuffers(1, &m_3DUBOBuffer);
+ glDeleteBuffers(1, &m_VertexBuffer);
}
void OpenGL3DRenderer::ShaderResources::LoadShaders()
@@ -216,6 +217,7 @@ void OpenGL3DRenderer::init()
glGenBuffers(1, &m_CubeVertexBuf);
glGenBuffers(1, &m_CubeNormalBuf);
glGenBuffers(1, &m_CubeElementBuf);
+ glGenBuffers(1, &m_VertexBuffer);
glGenBuffers(1, &m_BoundBox);
glBindBuffer(GL_ARRAY_BUFFER, m_BoundBox);
glBufferData(GL_ARRAY_BUFFER, sizeof(boundBox), boundBox, GL_STATIC_DRAW);
commit d54fb7561be8dd3e3e983180ebf884ac7c0bb9b8
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue May 20 23:29:28 2014 +0200
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part18
Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 4633f2a..caccf12 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -195,7 +195,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "AddIn",
PROP_DOCUMENT_ADDIN,
- ::getCppuType( reinterpret_cast< Reference< util::XRefreshable > * >(0)),
+ cppu::UnoType<util::XRefreshable>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
@@ -207,7 +207,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "AdditionalShapes",
PROP_DOCUMENT_ADDITIONAL_SHAPES,
- ::getCppuType( reinterpret_cast< Reference< drawing::XShapes > * >(0)),
+ cppu::UnoType<drawing::XShapes>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::READONLY ));
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 796d755..c7d808c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -1059,21 +1059,21 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut
rOutProperties.push_back(
Property( "DataRegressionProperties",
PROP_CHART_STATISTIC_REGRESSION_PROPERTIES,
- ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "DataErrorProperties",
PROP_CHART_STATISTIC_ERROR_PROPERTIES,
- ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "DataMeanValueProperties",
PROP_CHART_STATISTIC_MEAN_VALUE_PROPERTIES,
- ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
| beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 9fef7da..2469312 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -266,14 +266,14 @@ void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProp
rOutProperties.push_back(
Property( "Volume",
PROP_CHART_STOCK_VOLUME,
- ::getCppuType( reinterpret_cast< sal_Bool * >(0)),
+ cppu::UnoType<sal_Bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "UpDown",
PROP_CHART_STOCK_UPDOWN,
- ::getCppuType( reinterpret_cast< sal_Bool * >(0)),
+ cppu::UnoType<sal_Bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 32f0419..bc5f494 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -339,7 +339,7 @@ sal_Int32 XMLFilter::impl_Import(
{ OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PrivateData"), 0,
- ::getCppuType( (Reference<XInterface> *)0 ),
+ cppu::UnoType<XInterface>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("BaseURI"), 0,
::cppu::UnoType<OUString>::get(),
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 57320b9..faf5f39 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -59,13 +59,13 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "WhiteDay",
PROP_CANDLESTICKCHARTTYPE_WHITE_DAY,
- ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "BlackDay",
PROP_CANDLESTICKCHARTTYPE_BLACK_DAY,
- ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index b30f633..e49decf 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -63,7 +63,7 @@ static void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "OffsetMode",
PROP_PIE_TEMPLATE_OFFSET_MODE,
- ::getCppuType( reinterpret_cast< const chart2::PieChartOffsetMode * >(0)),
+ cppu::UnoType<chart2::PieChartOffsetMode>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index a6177d6..5316984 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -94,7 +94,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
rOutProperties.push_back(
Property( "FillBackground",
FillProperties::PROP_FILL_BACKGROUND,
- ::getCppuType( reinterpret_cast< const sal_Bool * >(0)),
+ cppu::UnoType<sal_Bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
@@ -147,7 +147,7 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun:
rOutProperties.push_back(
Property( "FillBitmapLogicalSize",
FillProperties::PROP_FILL_BITMAP_LOGICALSIZE,
- ::getCppuType( reinterpret_cast< const sal_Bool * >(0)),
+ cppu::UnoType<sal_Bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 3245ca5..ae5e5d0 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -39,7 +39,7 @@ void lcl_fireModifyEvent(
const lang::EventObject * pEvent )
{
::cppu::OInterfaceContainerHelper * pCntHlp = rBroadcastHelper.getContainer(
- ::getCppuType( reinterpret_cast< Reference< util::XModifyListener > * >(0)));
+ cppu::UnoType<util::XModifyListener>::get());
if( pCntHlp )
{
lang::EventObject aEventToSend;
@@ -156,7 +156,7 @@ void ModifyEventForwarder::RemoveListener( const Reference< util::XModifyListene
void ModifyEventForwarder::DisposeAndClear( const Reference< uno::XWeak > & xSource )
{
::cppu::OInterfaceContainerHelper * pCntHlp = m_aModifyListeners.getContainer(
- ::getCppuType( reinterpret_cast< Reference< util::XModifyListener > * >(0)));
+ cppu::UnoType<util::XModifyListener>::get());
if( pCntHlp )
pCntHlp->disposeAndClear( lang::EventObject( xSource ) );
}
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index d3fb0ed..335d697 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -736,7 +736,7 @@ OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeEx
Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception )
{
Sequence< ::com::sun::star::uno::Type > aSeq( 1 );
- aSeq[ 0 ] = getCppuType( static_cast< const Reference< XAccessibleText >* >( NULL ) );
+ aSeq[ 0 ] = cppu::UnoType<XAccessibleText>::get();
return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
}
@@ -1234,8 +1234,8 @@ OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeExc
Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception )
{
Sequence< ::com::sun::star::uno::Type > aSeq( 2 );
- aSeq[ 0 ] = getCppuType( static_cast< const Reference< XAccessibleTable >* >( NULL ) );
- aSeq[ 1 ] = getCppuType( static_cast< const Reference< XAccessibleSelection >* >( NULL ) );
+ aSeq[ 0 ] = cppu::UnoType<XAccessibleTable>::get();
+ aSeq[ 1 ] = cppu::UnoType<XAccessibleSelection>::get();
return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
}
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 0ca5275..3ace2c4 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -493,7 +493,7 @@ Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScDataPilotTablesObj::getElementType() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType((Reference<XDataPilotTable2>*)0);
+ return cppu::UnoType<XDataPilotTable2>::get();
}
sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() throw(RuntimeException, std::exception)
@@ -620,12 +620,12 @@ Sequence< uno::Type > SAL_CALL ScDataPilotDescriptorBase::getTypes()
{
aTypes.realloc( 6 );
uno::Type* pPtr = aTypes.getArray();
- pPtr[ 0 ] = getCppuType( (const Reference< XDataPilotDescriptor >*)0 );
- pPtr[ 1 ] = getCppuType( (const Reference< XPropertySet >*)0 );
- pPtr[ 2 ] = getCppuType( (const Reference< XDataPilotDataLayoutFieldSupplier >*)0 );
- pPtr[ 3 ] = getCppuType( (const Reference< lang::XUnoTunnel >*)0 );
- pPtr[ 4 ] = getCppuType( (const Reference< lang::XTypeProvider >*)0 );
- pPtr[ 5 ] = getCppuType( (const Reference< lang::XServiceInfo >*)0 );
+ pPtr[ 0 ] = cppu::UnoType<XDataPilotDescriptor>::get();
+ pPtr[ 1 ] = cppu::UnoType<XPropertySet>::get();
+ pPtr[ 2 ] = cppu::UnoType<XDataPilotDataLayoutFieldSupplier>::get();
+ pPtr[ 3 ] = cppu::UnoType<lang::XUnoTunnel>::get();
+ pPtr[ 4 ] = cppu::UnoType<lang::XTypeProvider>::get();
+ pPtr[ 5 ] = cppu::UnoType<lang::XServiceInfo>::get();
}
return aTypes;
}
@@ -1128,8 +1128,8 @@ Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() throw(RuntimeExce
for (sal_Int32 i = 0; i < nParentLen; ++i)
pPtr[ i ] = pParentPtr[ i ]; // parent types first
- pPtr[ nParentLen ] = getCppuType( (const Reference< XDataPilotTable2 >*)0 );
- pPtr[ nParentLen+1 ] = getCppuType( (const Reference< XModifyBroadcaster >*)0 );
+ pPtr[ nParentLen ] = cppu::UnoType<XDataPilotTable2>::get();
+ pPtr[ nParentLen+1 ] = cppu::UnoType<XModifyBroadcaster>::get();
}
return aTypes;
}
@@ -1737,7 +1737,7 @@ Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScDataPilotFieldsObj::getElementType() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType((Reference<XPropertySet>*)0);
+ return cppu::UnoType<XPropertySet>::get();
}
sal_Bool SAL_CALL ScDataPilotFieldsObj::hasElements() throw(RuntimeException, std::exception)
@@ -2969,7 +2969,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration()
uno::Type SAL_CALL ScDataPilotFieldGroupsObj::getElementType() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType( (Reference< XNameAccess >*)0 );
+ return cppu::UnoType<XNameAccess>::get();
}
sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() throw(RuntimeException, std::exception)
@@ -3153,7 +3153,7 @@ Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration()
uno::Type SAL_CALL ScDataPilotFieldGroupObj::getElementType() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType( (Reference< XNamed >*)0 );
+ return cppu::UnoType<XNamed>::get();
}
sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() throw(RuntimeException, std::exception)
@@ -3312,7 +3312,7 @@ Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScDataPilotItemsObj::getElementType() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType((Reference<XPropertySet>*)0);
+ return cppu::UnoType<XPropertySet>::get();
}
sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() throw(RuntimeException, std::exception)
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index fd160cf..09762b1 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -95,7 +95,7 @@ static const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap()
{OUString(SC_UNONAME_COPYOUT), 0, getBooleanCppuType(), 0, 0},
{OUString(SC_UNONAME_ISCASE), 0, getBooleanCppuType(), 0, 0},
{OUString(SC_UNONAME_MAXFLD), 0, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY, 0},
- {OUString(SC_UNONAME_ORIENT), 0, getCppuType((table::TableOrientation*)0), 0, 0},
+ {OUString(SC_UNONAME_ORIENT), 0, cppu::UnoType<table::TableOrientation>::get(), 0, 0},
{OUString(SC_UNONAME_OUTPOS), 0, cppu::UnoType<table::CellAddress>::get(), 0, 0},
{OUString(SC_UNONAME_SAVEOUT), 0, getBooleanCppuType(), 0, 0},
{OUString(SC_UNONAME_SKIPDUP), 0, getBooleanCppuType(), 0, 0},
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 27cc395..86e7fc8 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -1675,7 +1675,7 @@ uno::Type SAL_CALL ScExternalDocLinkObj::getElementType()
throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType(static_cast<Reference<sheet::XExternalDocLink>*>(0));
+ return cppu::UnoType<sheet::XExternalDocLink>::get();
}
sal_Bool SAL_CALL ScExternalDocLinkObj::hasElements()
@@ -1789,7 +1789,7 @@ uno::Type SAL_CALL ScExternalDocLinksObj::getElementType()
throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType(static_cast<Reference<sheet::XExternalDocLinks>*>(0));
+ return cppu::UnoType<sheet::XExternalDocLinks>::get();
}
sal_Bool SAL_CALL ScExternalDocLinksObj::hasElements()
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 0eedb57..b705e41 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -120,10 +120,10 @@ const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- {OUString("TextField"), EE_FEATURE_FIELD, ::getCppuType((const Reference< XTextField >*)0), PropertyAttribute::READONLY, 0 },
+ {OUString("TextField"), EE_FEATURE_FIELD, cppu::UnoType<XTextField>::get(), PropertyAttribute::READONLY, 0 },
{OUString("TextPortionType"), WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 },
- {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, ::getCppuType((const Reference< XNameContainer >*)0) , 0, 0},
- {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const Reference< XNameContainer >*)0) , 0, 0},
+ {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0},
+ {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() );
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 4205bf9..411ffad 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -727,7 +727,7 @@ bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, bool bGroup )
if ( !mXShape.is() )
break;
- Any aAny( mXShape->queryInterface( ::getCppuType( (const Reference< XPropertySet >*) 0 ) ));
+ Any aAny( mXShape->queryInterface( cppu::UnoType<XPropertySet>::get()));
aAny >>= mXPropSet;
if ( !mXPropSet.is() )
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 1befad1..411e7b1 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -447,7 +447,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
{ OUString("Preview"), 0, ::cppu::UnoType<sal_Bool>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PageLayouts"), 0, cppu::UnoType<container::XNameAccess>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PrivateData"), 0,
- ::getCppuType( (Reference<XInterface> *)0 ),
+ cppu::UnoType<XInterface>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("BaseURI"), 0,
::cppu::UnoType<OUString>::get(),
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 8ccd117..2891489 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1671,7 +1671,7 @@ void CustomAnimationPane::onChange( bool bCreate )
Reference< XSelectionSupplier > xSel( mxView, UNO_QUERY_THROW );
maViewSelection = xSel->getSelection();
- if( maViewSelection.getValueType() == ::getCppuType((const Reference< XShapes >*)0) )
+ if( maViewSelection.getValueType() == cppu::UnoType<XShapes>::get())
{
Reference< XIndexAccess > xShapes;
maViewSelection >>= xShapes;
@@ -1691,7 +1691,7 @@ void CustomAnimationPane::onChange( bool bCreate )
}
}
}
- else if ( maViewSelection.getValueType() == ::getCppuType((const Reference< XShape >*)0) )
+ else if ( maViewSelection.getValueType() == cppu::UnoType<XShape>::get())
{
aTargets.push_back( maViewSelection );
Reference< XText > xText;
@@ -1699,7 +1699,7 @@ void CustomAnimationPane::onChange( bool bCreate )
if( !xText.is() || xText->getString().isEmpty() )
bHasText = false;
}
- else if ( maViewSelection.getValueType() == ::getCppuType((const Reference< XTextCursor >*)0) )
+ else if ( maViewSelection.getValueType() == cppu::UnoType<XTextCursor>::get())
{
Reference< XShape > xShape;
std::list< sal_Int16 > aParaList;
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index f5ed766..380b69c 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -68,7 +68,7 @@ DrawController::DrawController (ViewShellBase& rBase) throw()
OMultiTypeInterfaceContainerHelper::keyType>& >(
BroadcastHelperOwner::maBroadcastHelper)),
m_aSelectionTypeIdentifier(
- ::getCppuType( (Reference<view::XSelectionChangeListener > *)0 )),
+ cppu::UnoType<view::XSelectionChangeListener>::get()),
mpBase(&rBase),
maLastVisArea(),
mpCurrentPage(NULL),
@@ -125,9 +125,9 @@ Sequence<Type> SAL_CALL DrawController::getTypes (void)
// OPropertySetHelper does not provide getTypes, so we have to
// implement this method manually and list its three interfaces.
OTypeCollection aTypeCollection (
- ::getCppuType (( const Reference<beans::XMultiPropertySet>*)NULL),
- ::getCppuType (( const Reference<beans::XFastPropertySet>*)NULL),
- ::getCppuType (( const Reference<beans::XPropertySet>*)NULL));
+ cppu::UnoType<beans::XMultiPropertySet>::get(),
+ cppu::UnoType<beans::XFastPropertySet>::get(),
+ cppu::UnoType<beans::XPropertySet>::get());
return ::comphelper::concatSequences(
SfxBaseController::getTypes(),
@@ -328,7 +328,7 @@ void SAL_CALL
ThrowIfDisposed();
// Have to forward the event to our selection change listeners.
OInterfaceContainerHelper* pListeners = BroadcastHelperOwner::maBroadcastHelper.getContainer(
- ::getCppuType((Reference<view::XSelectionChangeListener>*)0));
+ cppu::UnoType<view::XSelectionChangeListener>::get());
if (pListeners)
{
// Re-send the event to all of our listeners.
@@ -706,13 +706,13 @@ void DrawController::FillPropertyTable (
beans::Property(
"SubController",
PROPERTY_SUB_CONTROLLER,
- ::getCppuType((const Reference<drawing::XDrawSubController>*)0),
+ cppu::UnoType<drawing::XDrawSubController>::get(),
beans::PropertyAttribute::BOUND));
rProperties.push_back(
beans::Property(
"CurrentPage",
PROPERTY_CURRENTPAGE,
- ::getCppuType((const Reference< drawing::XDrawPage > *)0),
+ cppu::UnoType<drawing::XDrawPage>::get(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property("IsLayerMode",
@@ -727,7 +727,7 @@ void DrawController::FillPropertyTable (
rProperties.push_back(
beans::Property("ActiveLayer",
PROPERTY_ACTIVE_LAYER,
- ::getCppuType((const Reference< drawing::XLayer > *)0),
+ cppu::UnoType<drawing::XLayer>::get(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property("ZoomValue",
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index f84a973..9ba698d 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -190,7 +190,7 @@ enum SdDocumentSettingsPropertyHandles
{ OUString("GradientTableURL"), HANDLE_GRADIENTTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("BitmapTableURL"), HANDLE_BITMAPTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("ForbiddenCharacters"), HANDLE_FORBIDDENCHARS, ::getCppuType((const Reference< XForbiddenCharacters >*)0), 0, 0 },
+ { OUString("ForbiddenCharacters"), HANDLE_FORBIDDENCHARS, cppu::UnoType<XForbiddenCharacters>::get(), 0, 0 },
{ OUString("ApplyUserData"), HANDLE_APPLYUSERDATA, ::getBooleanCppuType(), 0, 0 },
{ OUString("PageNumberFormat"), HANDLE_PAGENUMFMT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index b9c84b9..7ed6c84 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -547,7 +547,7 @@ Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (Runti
// XElementAccess
Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException, std::exception)
{
- return ::getCppuType((const Reference< XAnimationNode >*)0);
+ return cppu::UnoType<XAnimationNode>::get();
}
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index ebc9d65..a4fd2e2 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -124,10 +124,10 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP
{ OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_VISIBLE), WID_PAGE_VISIBLE, ::getBooleanCppuType(), 0, 0},
- { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_PAGE_SOUNDFILE, ::getCppuType((const Any*)0), 0, 0},
+ { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_PAGE_SOUNDFILE, cppu::UnoType<Any>::get(), 0, 0},
{ OUString(sUNO_Prop_IsBackgroundVisible), WID_PAGE_BACKVIS, ::getBooleanCppuType(), 0, 0},
{ OUString(sUNO_Prop_IsBackgroundObjectsVisible), WID_PAGE_BACKOBJVIS, ::getBooleanCppuType(), 0, 0},
- { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("HighResDuration"), WID_PAGE_HIGHRESDURATION, ::cppu::UnoType<double>::get(), 0, 0},
{ OUString("IsBackgroundDark") , WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
@@ -198,7 +198,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP
{ OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
{ OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\
- { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, \
+ { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, \
{ OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \
{ OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \
@@ -271,7 +271,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
{ OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
{ OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("BackgroundFullSize"), WID_PAGE_BACKFULL, ::getBooleanCppuType(), 0, 0},
- { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -287,7 +287,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
{ OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
- { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
{ OUString("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(), 0, 0},
{ OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index 355a373..4a3d45f 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -268,13 +268,13 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes()
lWindowTypes = xProvider->getTypes();
static ::cppu::OTypeCollection aTypeCollection(
- ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XInitialization >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XTypeProvider >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XServiceInfo >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XController >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XComponent >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XDispatchProvider >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XDispatch >*)NULL ),
+ cppu::UnoType<css::lang::XInitialization>::get(),
+ cppu::UnoType<css::lang::XTypeProvider>::get(),
+ cppu::UnoType<css::lang::XServiceInfo>::get(),
+ cppu::UnoType<css::frame::XController>::get(),
+ cppu::UnoType<css::lang::XComponent>::get(),
+ cppu::UnoType<css::frame::XDispatchProvider>::get(),
+ cppu::UnoType<css::frame::XDispatch>::get(),
lWindowTypes);
pTypeCollection = &aTypeCollection;
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index c0631e0..bfa7485 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -143,10 +143,10 @@ const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl()
{ OUString("FrameIsAutoScroll"), WID_FRAME_IS_AUTO_SCROLL, ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
{ OUString("FrameIsBorder"), WID_FRAME_IS_BORDER, ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
{ OUString("FrameIsScrollingMode"), WID_FRAME_IS_SCROLLING_MODE,::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
- { OUString("FrameMarginHeight"), WID_FRAME_MARGIN_HEIGHT, ::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 },
- { OUString("FrameMarginWidth"), WID_FRAME_MARGIN_WIDTH, ::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 },
- { OUString("FrameName"), WID_FRAME_NAME, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
- { OUString("FrameURL"), WID_FRAME_URL, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
+ { OUString("FrameMarginHeight"), WID_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
+ { OUString("FrameMarginWidth"), WID_FRAME_MARGIN_WIDTH, cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
+ { OUString("FrameName"), WID_FRAME_NAME, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
+ { OUString("FrameURL"), WID_FRAME_URL, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
return aIFramePropertyMap_Impl;
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index a1743fd..51ce5b1 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -73,8 +73,8 @@ const SfxItemPropertyMapEntry* lcl_GetPluginPropertyMap_Impl()
static const SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] =
{
{ OUString("PluginCommands"), WID_COMMANDS, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), PROPERTY_UNBOUND, 0},
- { OUString("PluginMimeType"), WID_MIMETYPE, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
- { OUString("PluginURL"), WID_URL , ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
+ { OUString("PluginMimeType"), WID_MIMETYPE, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
+ { OUString("PluginURL"), WID_URL , cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
return aPluginPropertyMap_Impl;
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index e87d2a7..87e2ca8 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -623,7 +623,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
// unpack th URL and check for a valid and well known protocol
OUString sTemp;
if (
- ( rProp.Value.getValueType()!=::getCppuType((const OUString*)0)) ||
+ ( rProp.Value.getValueType()!=cppu::UnoType<OUString>::get()) ||
(!(rProp.Value>>=sTemp))
)
{
@@ -807,7 +807,7 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin
}
::cppu::OInterfaceContainerHelper* pContainer = m_aInterfaceContainer.getContainer(
- ::getCppuType( ( const uno::Reference< view::XPrintJobListener >*) NULL ) );
+ cppu::UnoType<view::XPrintJobListener>::get());
if ( !pContainer )
return;
@@ -823,13 +823,13 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin
void SAL_CALL SfxPrintHelper::addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference < view::XPrintJobListener>*)0), xListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<view::XPrintJobListener>::get(), xListener );
}
void SAL_CALL SfxPrintHelper::removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference < view::XPrintJobListener>*)0), xListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<view::XPrintJobListener>::get(), xListener );
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index b50afe1..40ab212 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -333,7 +333,7 @@ void SAL_CALL SfxPrintHelperListener_Impl::disposing( const lang::EventObject& )
void SAL_CALL SfxPrintHelperListener_Impl::printJobEvent( const view::PrintJobEvent& rEvent ) throw (RuntimeException, std::exception)
{
- ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< view::XPrintJobListener >*) NULL ) );
+ ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<view::XPrintJobListener>::get());
if ( pContainer!=NULL )
{
::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -802,7 +802,7 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< lang::XEventListe
throw(RuntimeException, std::exception)
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
}
@@ -813,7 +813,7 @@ void SAL_CALL SfxBaseModel::removeEventListener( const Reference< lang::XEventLi
throw(RuntimeException, std::exception)
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
}
void
@@ -859,11 +859,11 @@ void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject )
Reference< document::XEventListener > xDocListener( aObject.Source, UNO_QUERY );
if ( xMod.is() )
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XModifyListener >*)0), xMod );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<util::XModifyListener>::get(), xMod );
else if ( xListener.is() )
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), xListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
else if ( xDocListener.is() )
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XEventListener >*)0), xListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<document::XEventListener>::get(), xListener );
}
@@ -1337,7 +1337,7 @@ void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyList
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< util::XModifyListener >*)0),xListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<util::XModifyListener>::get(),xListener );
}
@@ -1348,7 +1348,7 @@ void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyL
{
SfxModelGuard aGuard( *this );
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XModifyListener >*)0), xListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<util::XModifyListener>::get(), xListener );
}
@@ -1363,7 +1363,7 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo
Reference< XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >(this) );
lang::EventObject aSource (static_cast< ::cppu::OWeakObject*>(this));
- ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< util::XCloseListener >*) NULL ) );
+ ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<util::XCloseListener>::get());
if (pContainer!=NULL)
{
::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -1391,7 +1391,7 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo
// no own objections against closing!
m_pData->m_bClosing = true;
- pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< util::XCloseListener >*) NULL ) );
+ pContainer = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<util::XCloseListener>::get());
if (pContainer!=NULL)
{
::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
@@ -1422,7 +1422,7 @@ void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListe
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< util::XCloseListener >*)0), xListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
}
@@ -1433,7 +1433,7 @@ void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseLi
{
SfxModelGuard aGuard( *this );
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XCloseListener >*)0), xListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
}
@@ -2058,7 +2058,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
}
}
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
- && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
+ && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get())
{
::boost::shared_ptr<GDIMetaFile> pMetaFile =
m_pData->m_pObjectShell->GetPreviewMetaFile( true );
@@ -2094,7 +2094,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
}
}
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
- && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
+ && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get())
{
// means HGLOBAL handler to memory storage containing METAFILEPICT structure
@@ -2225,12 +2225,12 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo
aFlavorSeq[8].MimeType =
OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" );
aFlavorSeq[8].HumanPresentableName = "Enhanced Windows MetaFile";
- aFlavorSeq[8].DataType = getCppuType( (const sal_uInt64*) 0 );
+ aFlavorSeq[8].DataType = cppu::UnoType<sal_uInt64>::get();
aFlavorSeq[9].MimeType =
OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" );
aFlavorSeq[9].HumanPresentableName = "Windows MetaFile";
- aFlavorSeq[9].DataType = getCppuType( (const sal_uInt64*) 0 );
+ aFlavorSeq[9].DataType = cppu::UnoType<sal_uInt64>::get();
}
return aFlavorSeq;
@@ -2261,7 +2261,7 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
- && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
+ && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get())
return sal_True;
}
else if ( aFlavor.MimeType == "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )
@@ -2269,7 +2269,7 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
- && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
+ && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get())
return sal_True;
}
else if ( aFlavor.MimeType == "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" )
@@ -2390,7 +2390,7 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventL
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< document::XEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<document::XEventListener>::get(), aListener );
}
@@ -2401,7 +2401,7 @@ void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEve
{
SfxModelGuard aGuard( *this );
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<document::XEventListener>::get(), aListener );
}
@@ -2412,7 +2412,7 @@ void SAL_CALL SfxBaseModel::addDocumentEventListener( const Reference< document:
throw ( RuntimeException, std::exception )
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<document::XDocumentEventListener>::get(), aListener );
}
@@ -2420,7 +2420,7 @@ void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< docume
throw ( RuntimeException, std::exception )
{
SfxModelGuard aGuard( *this );
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<document::XDocumentEventListener>::get(), aListener );
}
@@ -2834,7 +2834,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC ,
void SfxBaseModel::NotifyModifyListeners_Impl() const
{
- ::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const Reference< util::XModifyListener >*)0) );
+ ::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<util::XModifyListener>::get());
if ( pIC )
{
lang::EventObject aEvent( (frame::XModel *)this );
@@ -3164,7 +3164,7 @@ void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame
return;
::cppu::OInterfaceContainerHelper* pIC =
- m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const Reference< document::XDocumentEventListener >*)0 ) );
+ m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<document::XDocumentEventListener>::get());
if ( pIC )
{
SAL_INFO("sfx.doc", "SfxDocumentEvent: " + aName);
@@ -3177,7 +3177,7 @@ void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame
aDocumentEvent ) );
}
- pIC = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const Reference< document::XEventListener >*)0 ) );
+ pIC = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<document::XEventListener>::get());
if ( pIC )
{
SAL_INFO("sfx.doc", "SfxEvent: " + aName);
@@ -3250,7 +3250,7 @@ void SfxBaseModel::notifyEvent( const document::EventObject& aEvent ) const
return;
::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer(
- ::getCppuType((const Reference< document::XEventListener >*)0) );
+ cppu::UnoType<document::XEventListener>::get());
if( pIC )
{
@@ -3272,7 +3272,7 @@ void SfxBaseModel::notifyEvent( const document::EventObject& aEvent ) const
/** returns true if someone added a XEventListener to this XEventBroadcaster */
bool SfxBaseModel::hasEventListeners() const
{
- return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const Reference< document::XEventListener >*)0) ) );
+ return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<document::XEventListener>::get()) );
}
void SAL_CALL SfxBaseModel::addPrintJobListener( const Reference< view::XPrintJobListener >& xListener ) throw (RuntimeException, std::exception)
@@ -3869,7 +3869,7 @@ void SAL_CALL SfxBaseModel::addStorageChangeListener(
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
m_pData->m_aInterfaceContainer.addInterface(
- ::getCppuType((const Reference< document::XStorageChangeListener >*)0), xListener );
+ cppu::UnoType<document::XStorageChangeListener>::get(), xListener );
}
void SAL_CALL SfxBaseModel::removeStorageChangeListener(
@@ -3879,7 +3879,7 @@ void SAL_CALL SfxBaseModel::removeStorageChangeListener(
SfxModelGuard aGuard( *this );
m_pData->m_aInterfaceContainer.removeInterface(
- ::getCppuType((const Reference< document::XStorageChangeListener >*)0), xListener );
+ cppu::UnoType<document::XStorageChangeListener>::get(), xListener );
}
#include "printhelper.hxx"
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 151cfed..701a0947 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -904,22 +904,22 @@ cssu::Type Theme::GetCppuType (const PropertyType eType)
switch(eType)
{
case PT_Image:
- return getCppuType((rtl::OUString*)NULL);
+ return cppu::UnoType<rtl::OUString>::get();
case PT_Color:
- return getCppuType((sal_uInt32*)NULL);
+ return cppu::UnoType<sal_uInt32>::get();
case PT_Paint:
return getCppuVoidType();
case PT_Integer:
- return getCppuType((sal_Int32*)NULL);
+ return cppu::UnoType<sal_Int32>::get();
case PT_Boolean:
- return getCppuType((sal_Bool*)NULL);
+ return cppu::UnoType<sal_Bool>::get();
case PT_Rectangle:
- return getCppuType((awt::Rectangle*)NULL);
+ return cppu::UnoType<awt::Rectangle>::get();
case PT_Invalid:
default:
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 98ad17d..9c07350 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -911,14 +911,14 @@ frame::BorderWidths SAL_CALL SfxBaseController::getBorder()
void SAL_CALL SfxBaseController::addBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener )
throw ( RuntimeException, std::exception )
{
- m_pData->m_aListenerContainer.addInterface( ::getCppuType((const Reference< frame::XBorderResizeListener >*)0),
+ m_pData->m_aListenerContainer.addInterface( cppu::UnoType<frame::XBorderResizeListener>::get(),
xListener );
}
void SAL_CALL SfxBaseController::removeBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener )
throw ( RuntimeException, std::exception )
{
- m_pData->m_aListenerContainer.removeInterface( ::getCppuType((const Reference< frame::XBorderResizeListener >*)0),
+ m_pData->m_aListenerContainer.removeInterface( cppu::UnoType<frame::XBorderResizeListener>::get(),
xListener );
}
@@ -939,7 +939,7 @@ awt::Rectangle SAL_CALL SfxBaseController::queryBorderedArea( const awt::Rectang
void SfxBaseController::BorderWidthsChanged_Impl()
{
::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aListenerContainer.getContainer(
- ::getCppuType( ( const Reference< frame::XBorderResizeListener >*) NULL ) );
+ cppu::UnoType<frame::XBorderResizeListener>::get());
if ( pContainer )
{
frame::BorderWidths aBWidths = getBorder();
@@ -1037,7 +1037,7 @@ void SAL_CALL SfxBaseController::dispose() throw( RuntimeException, std::excepti
void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception )
{
- m_pData->m_aListenerContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
+ m_pData->m_aListenerContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
}
@@ -1046,7 +1046,7 @@ void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEvent
void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception )
{
- m_pData->m_aListenerContainer.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
+ m_pData->m_aListenerContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
}
void SfxBaseController::ReleaseShell_Impl()
diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx
index f5be477..66c85d5 100644
--- a/svtools/source/java/javacontext.cxx
+++ b/svtools/source/java/javacontext.cxx
@@ -43,9 +43,9 @@ JavaContext::~JavaContext()
Any SAL_CALL JavaContext::queryInterface(const Type& aType )
throw (RuntimeException, std::exception)
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list