[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 110 commits - accessibility/source avmedia/source basctl/source basegfx/source basic/inc basic/source bridges/source canvas/source chart2/inc chart2/source comphelper/inc comphelper/qa comphelper/source config_host/config_opengl.h.in configure.ac connectivity/inc connectivity/source cppcanvas/inc cppcanvas/source cppuhelper/inc cppuhelper/source cppu/qa cui/inc cui/source dbaccess/inc dbaccess/source desktop/inc desktop/source download.lst drawinglayer/source dtrans/source editeng/inc editeng/source embeddedobj/source extensions/source external/ct2n external/glew filter/source forms/source formula/source fpicker/source framework/inc framework/source g helpcompiler/source i18npool/source icon-themes/galaxy icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango icon-themes/tango_testing include/canvas include/comphelper include/connectivity include/dbaccess include/drawinglayer include/editeng include/fra mework include/jvmfwk include/LibreOfficeKit include/oox include/osl include/rtl include/sax include/sfx2 include/svtools include/svx include/toolkit include/ucbhelper include/unotools include/vcl include/xmloff jvmfwk/plugins jvmfwk/source l10ntools/source libreofficekit/qa libreofficekit/source lingucomponent/source lotuswordpro/inc lotuswordpro/source odk/docs odk/examples officecfg/registry oox/inc oox/source opencl/source qadevOOo/tests readlicense_oo/Package_files.mk reportdesign/source sal/cppunittester sal/inc sal/osl sal/qa sal/textenc sax/source sc/inc sc/JunitTest_sc_complex.mk sc/qa scripting/source sc/source sdext/source sd/inc sd/Library_sd.mk sd/qa sd/sdi sd/source sd/uiconfig setup_native/source sfx2/inc sfx2/source shell/source slideshow/source solenv/bin soltools/cpp sot/inc sot/source starmath/source stoc/source svgio/qa svl/inc svl/source svtools/inc svtools/source svx/inc svx/source svx/uiconfig sw/inc sw/qa sw/source sw/uiconfig test/source toolkit/source ucb/s ource unodevtools/source unotools/source unoxml/source vbahelper/source vcl/generic vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/opengl vcl/Package_opengl_blacklist.mk vcl/source vcl/unx vcl/win vcl/workben winaccessibility/source writerfilter/source xmloff/inc xmloff/source xmlsecurity/inc xmlsecurity/source
Pranav Kant
pranavk at gnome.org
Thu Jun 18 12:43:53 PDT 2015
accessibility/source/extended/listboxaccessible.cxx | 2
avmedia/source/opengl/oglframegrabber.cxx | 4
basctl/source/basicide/baside2.cxx | 2
basctl/source/basicide/baside2b.cxx | 3
basctl/source/basicide/macrodlg.cxx | 2
basegfx/source/polygon/b2dpolygoncutandtouch.cxx | 2
basic/inc/pch/precompiled_sb.hxx | 2
basic/source/classes/image.cxx | 6
basic/source/classes/sb.cxx | 6
basic/source/classes/sbunoobj.cxx | 8
basic/source/comp/io.cxx | 2
basic/source/runtime/methods.cxx | 4
basic/source/runtime/methods1.cxx | 4
basic/source/runtime/runtime.cxx | 14
basic/source/sbx/sbxdec.cxx | 4
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 2
canvas/source/cairo/cairo_textlayout.cxx | 4
canvas/source/directx/dx_canvasbitmap.cxx | 4
canvas/source/directx/dx_impltools.cxx | 2
canvas/source/directx/dx_textlayout_drawhelper.cxx | 4
canvas/source/directx/dx_vcltools.cxx | 2
canvas/source/opengl/ogl_canvashelper.cxx | 4
canvas/source/vcl/textlayout.cxx | 8
chart2/inc/pch/precompiled_chartcore.hxx | 2
chart2/source/model/template/ChartTypeTemplate.hxx | 2
chart2/source/tools/AxisHelper.cxx | 2
chart2/source/tools/OPropertySet.cxx | 6
chart2/source/view/axes/DateScaling.cxx | 2
chart2/source/view/axes/Tickmarks.hxx | 2
chart2/source/view/axes/VCartesianAxis.cxx | 2
chart2/source/view/charttypes/Splines.cxx | 14
chart2/source/view/main/ChartView.cxx | 2
chart2/source/view/main/GL3DRenderer.cxx | 4
chart2/source/view/main/VDataSeries.cxx | 2
comphelper/inc/pch/precompiled_comphelper.hxx | 2
comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java | 4
comphelper/source/misc/lok.cxx | 8
comphelper/source/property/propagg.cxx | 14
comphelper/source/property/propertysethelper.cxx | 8
config_host/config_opengl.h.in | 10
configure.ac | 21
connectivity/inc/pch/precompiled_dbase.hxx | 2
connectivity/source/commontools/parameters.cxx | 34
connectivity/source/drivers/ado/AKeys.cxx | 2
connectivity/source/drivers/dbase/dindexnode.cxx | 4
connectivity/source/drivers/macab/MacabResultSet.cxx | 2
connectivity/source/drivers/mozab/MDriver.cxx | 2
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 2
connectivity/source/drivers/odbc/OConnection.cxx | 2
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 2
connectivity/source/drivers/postgresql/pq_tools.cxx | 34
cppcanvas/inc/pch/precompiled_cppcanvas.hxx | 2
cppcanvas/source/mtfrenderer/implrenderer.cxx | 4
cppcanvas/source/mtfrenderer/textaction.cxx | 4
cppu/qa/cppumaker/test_cppumaker.cxx | 4
cppuhelper/inc/pch/precompiled_cppuhelper.hxx | 2
cppuhelper/source/component_context.cxx | 4
cppuhelper/source/interfacecontainer.cxx | 6
cppuhelper/source/propshlp.cxx | 12
cppuhelper/source/tdmgr.cxx | 4
cui/inc/pch/precompiled_cui.hxx | 2
cui/source/dialogs/cuicharmap.cxx | 17
cui/source/inc/cuicharmap.hxx | 1
cui/source/options/optaboutconfig.cxx | 654 +++++-----
cui/source/options/optaboutconfig.hxx | 6
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/backgrnd.cxx | 19
cui/source/tabpages/numfmt.cxx | 4
dbaccess/inc/pch/precompiled_dbu.hxx | 2
dbaccess/source/filter/xml/xmlfilter.hxx | 2
dbaccess/source/ui/browser/genericcontroller.cxx | 1
dbaccess/source/ui/browser/sbagrid.cxx | 4
dbaccess/source/ui/browser/unodatbr.cxx | 3
dbaccess/source/ui/inc/UserAdminDlg.hxx | 2
dbaccess/source/ui/inc/dsmeta.hxx | 2
dbaccess/source/ui/inc/sbagrid.hxx | 2
dbaccess/source/ui/misc/TokenWriter.cxx | 10
dbaccess/source/ui/misc/UITools.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2
desktop/inc/pch/precompiled_deploymentmisc.hxx | 2
desktop/inc/pch/precompiled_sofficeapp.hxx | 2
desktop/source/app/app.cxx | 2
desktop/source/app/officeipcthread.cxx | 4
desktop/source/deployment/manager/dp_extensionmanager.cxx | 2
desktop/source/deployment/manager/dp_manager.cxx | 2
desktop/source/deployment/misc/dp_misc.cxx | 4
desktop/source/deployment/registry/package/dp_package.cxx | 2
desktop/source/lib/init.cxx | 19
desktop/source/migration/services/jvmfwk.cxx | 1
desktop/source/migration/services/jvmfwk.hxx | 2
desktop/source/offacc/acceptor.cxx | 2
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 1
download.lst | 2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 2
dtrans/source/win32/clipb/WinClipboard.hxx | 2
editeng/inc/pch/precompiled_editeng.hxx | 3
editeng/source/accessibility/AccessibleContextBase.cxx | 2
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 4
editeng/source/editeng/editundo.cxx | 2
editeng/source/editeng/impedit2.cxx | 4
editeng/source/editeng/impedit3.cxx | 6
editeng/source/editeng/impedit4.cxx | 2
editeng/source/items/textitem.cxx | 2
editeng/source/outliner/outliner.cxx | 4
editeng/source/uno/unonrule.cxx | 4
embeddedobj/source/general/docholder.cxx | 2
embeddedobj/source/msole/olecomponent.cxx | 4
embeddedobj/source/msole/olepersist.cxx | 2
extensions/source/abpilot/datasourcehandling.hxx | 2
extensions/source/bibliography/datman.cxx | 2
extensions/source/ole/oleobjw.cxx | 23
extensions/source/ole/unoconversionutilities.hxx | 9
extensions/source/plugin/base/nfuncs.cxx | 4
extensions/source/plugin/base/xplugin.cxx | 4
extensions/source/plugin/unx/mediator.cxx | 6
extensions/source/propctrlr/formcomponenthandler.cxx | 4
extensions/source/scanner/grid.cxx | 6
extensions/source/scanner/sane.cxx | 12
extensions/source/scanner/sanedlg.cxx | 6
external/ct2n/ExternalPackage_ct2n.mk | 2
external/glew/0001-stop-linking-to-unneeded-Xmu-Xi-Xext-libraries.patch.1 | 184 --
external/glew/ExternalPackage_glew.mk | 4
external/glew/ExternalProject_glew.mk | 4
external/glew/UnpackedTarball_glew.mk | 14
external/glew/glew-config-guess.patch.0 | 527 --------
external/glew/glew-debug.patch.1 | 12
external/glew/glew-fix-rc-error.patch.1 | 12
external/glew/glew-ios.patch.1 | 19
external/glew/glew-vc2013-project.patch.1 | 508 -------
filter/source/config/cache/typedetection.hxx | 2
filter/source/flash/swfwriter1.cxx | 8
filter/source/graphicfilter/egif/egif.cxx | 4
filter/source/graphicfilter/eos2met/eos2met.cxx | 6
filter/source/graphicfilter/epict/epict.cxx | 6
filter/source/graphicfilter/icgm/bundles.cxx | 4
filter/source/graphicfilter/icgm/class4.cxx | 4
filter/source/graphicfilter/idxf/dxfentrd.hxx | 2
filter/source/graphicfilter/ieps/ieps.cxx | 6
filter/source/graphicfilter/ios2met/ios2met.cxx | 8
filter/source/graphicfilter/ipict/ipict.cxx | 4
filter/source/graphicfilter/ipsd/ipsd.cxx | 4
filter/source/msfilter/escherex.cxx | 6
filter/source/msfilter/msdffimp.cxx | 7
filter/source/msfilter/svdfppt.cxx | 20
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/FormComponent.cxx | 2
forms/source/component/FormattedField.cxx | 2
forms/source/component/FormsCollection.hxx | 2
forms/source/richtext/richtextcontrol.cxx | 2
forms/source/richtext/richtextmodel.cxx | 5
forms/source/solar/component/navbarcontrol.cxx | 11
forms/source/xforms/model.hxx | 2
forms/source/xforms/propertysetbase.cxx | 2
forms/source/xforms/submission/submission_get.cxx | 2
formula/source/core/api/token.cxx | 4
fpicker/source/office/iodlg.cxx | 4
fpicker/source/win32/filepicker/previewadapter.cxx | 2
framework/inc/pch/precompiled_fwk.hxx | 1
framework/source/dispatch/closedispatcher.cxx | 5
framework/source/helper/persistentwindowstate.cxx | 2
framework/source/inc/loadenv/loadenv.hxx | 4
framework/source/jobs/job.cxx | 2
framework/source/layoutmanager/layoutmanager.cxx | 3
framework/source/services/desktop.cxx | 6
framework/source/uielement/menubarmanager.cxx | 2
framework/source/uielement/toolbarmanager.cxx | 71 -
framework/source/uifactory/menubarfactory.cxx | 1
g | 6
helpcompiler/source/HelpLinker.cxx | 4
i18npool/source/nativenumber/nativenumbersupplier.cxx | 8
i18npool/source/textconversion/textconversion_ko.cxx | 4
i18npool/source/textconversion/textconversion_zh.cxx | 4
i18npool/source/transliteration/transliteration_body.cxx | 4
icon-themes/galaxy/cmd/lc_movepagedown.png |binary
icon-themes/galaxy/cmd/lc_movepagefirst.png |binary
icon-themes/galaxy/cmd/lc_movepagelast.png |binary
icon-themes/galaxy/cmd/lc_movepageup.png |binary
icon-themes/galaxy/cmd/sc_movepagedown.png |binary
icon-themes/galaxy/cmd/sc_movepagefirst.png |binary
icon-themes/galaxy/cmd/sc_movepagelast.png |binary
icon-themes/galaxy/cmd/sc_movepageup.png |binary
icon-themes/human/cmd/lc_styleupdatebyexample.png |binary
icon-themes/industrial/cmd/lc_styleupdatebyexample.png |binary
icon-themes/oxygen/cmd/lc_styleupdatebyexample.png |binary
icon-themes/tango/cmd/lc_movepagedown.png |binary
icon-themes/tango/cmd/lc_movepagefirst.png |binary
icon-themes/tango/cmd/lc_movepagelast.png |binary
icon-themes/tango/cmd/lc_movepageup.png |binary
icon-themes/tango/cmd/lc_styleupdatebyexample.png |binary
icon-themes/tango/cmd/sc_movepagedown.png |binary
icon-themes/tango/cmd/sc_movepagefirst.png |binary
icon-themes/tango/cmd/sc_movepagelast.png |binary
icon-themes/tango/cmd/sc_movepageup.png |binary
icon-themes/tango_testing/cmd/lc_styleupdatebyexample.png |binary
include/LibreOfficeKit/LibreOfficeKit.h | 4
include/LibreOfficeKit/LibreOfficeKit.hxx | 10
include/LibreOfficeKit/LibreOfficeKitGtk.h | 7
include/canvas/base/canvascustomspritehelper.hxx | 2
include/canvas/canvastools.hxx | 2
include/comphelper/lok.hxx | 2
include/comphelper/sequenceasvector.hxx | 251 ---
include/comphelper/serviceinfohelper.hxx | 2
include/comphelper/unique_disposing_ptr.hxx | 2
include/comphelper/weakeventlistener.hxx | 2
include/connectivity/parameters.hxx | 5
include/dbaccess/controllerframe.hxx | 2
include/drawinglayer/primitive2d/controlprimitive2d.hxx | 2
include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx | 2
include/drawinglayer/primitive2d/primitivetools2d.hxx | 4
include/drawinglayer/processor2d/hittestprocessor2d.hxx | 2
include/editeng/frmdir.hxx | 2
include/framework/actiontriggerhelper.hxx | 2
include/jvmfwk/framework.h | 2
include/oox/ole/vbaproject.hxx | 2
include/osl/thread.hxx | 2
include/rtl/bootstrap.hxx | 2
include/sax/tools/converter.hxx | 2
include/sfx2/msg.hxx | 4
include/sfx2/thumbnailview.hxx | 6
include/svtools/editbrowsebox.hxx | 2
include/svtools/toolpanel/drawerlayouter.hxx | 2
include/svx/AccessibleTextHelper.hxx | 2
include/svx/fmgridcl.hxx | 2
include/svx/ruler.hxx | 1
include/svx/svdhdl.hxx | 2
include/svx/svdsnpv.hxx | 2
include/svx/svdundo.hxx | 2
include/toolkit/controls/unocontrolcontainer.hxx | 2
include/toolkit/controls/unocontrols.hxx | 2
include/ucbhelper/contenthelper.hxx | 2
include/ucbhelper/interactionrequest.hxx | 2
include/ucbhelper/registerucb.hxx | 2
include/unotools/configvaluecontainer.hxx | 2
include/unotools/viewoptions.hxx | 4
include/vcl/ITiledRenderable.hxx | 7
include/vcl/btndlg.hxx | 2
include/vcl/outdev.hxx | 2
include/vcl/settings.hxx | 2
include/vcl/textview.hxx | 2
include/xmloff/prhdlfac.hxx | 2
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 12
jvmfwk/source/framework.cxx | 4
jvmfwk/source/fwkutil.cxx | 6
l10ntools/source/xrmmerge.cxx | 4
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 23
libreofficekit/qa/unit/tiledrendering.cxx | 6
libreofficekit/source/gtk/lokdocview.cxx | 168 +-
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 10
lotuswordpro/inc/pch/precompiled_lwpft.hxx | 2
lotuswordpro/source/filter/lwpgrfobj.cxx | 2
lotuswordpro/source/filter/lwpobjstrm.cxx | 4
lotuswordpro/source/filter/lwptblformula.cxx | 4
odk/docs/tools.html | 2
odk/examples/java/Spreadsheet/CalcAddins.java | 2
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 88 +
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 3
oox/inc/pch/precompiled_oox.hxx | 1
oox/source/dump/dumperbase.cxx | 2
oox/source/ole/vbainputstream.cxx | 2
opencl/source/openclwrapper.cxx | 16
qadevOOo/tests/java/ifc/chart/_ChartAxis.java | 12
readlicense_oo/Package_files.mk | 9
reportdesign/source/ui/dlg/dlgpage.cxx | 1
sal/cppunittester/cppunittester.cxx | 4
sal/inc/pch/precompiled_sal.hxx | 2
sal/osl/w32/file_dirvol.cxx | 2
sal/qa/rtl/digest/rtl_digest.cxx | 16
sal/textenc/tencinfo.cxx | 6
sax/source/expatwrap/saxwriter.cxx | 4
sax/source/expatwrap/xml2utf.cxx | 6
sc/JunitTest_sc_complex.mk | 2
sc/inc/pch/precompiled_sc.hxx | 2
sc/inc/pch/precompiled_scfilt.hxx | 2
sc/inc/pch/precompiled_scui.hxx | 2
sc/inc/refdata.hxx | 5
sc/inc/token.hxx | 6
sc/qa/unit/subsequent_export-test.cxx | 2
sc/qa/unit/ucalc.cxx | 2
sc/qa/unit/ucalc.hxx | 4
sc/qa/unit/ucalc_formula.cxx | 73 +
sc/qa/unit/ucalc_sharedformula.cxx | 44
sc/source/core/data/column.cxx | 2
sc/source/core/data/conditio.cxx | 2
sc/source/core/data/documen4.cxx | 10
sc/source/core/data/document.cxx | 2
sc/source/core/data/dptabsrc.cxx | 2
sc/source/core/data/drwlayer.cxx | 6
sc/source/core/data/patattr.cxx | 2
sc/source/core/data/table1.cxx | 4
sc/source/core/data/table3.cxx | 4
sc/source/core/inc/interpre.hxx | 2
sc/source/core/opencl/formulagroupcl.cxx | 4
sc/source/core/tool/addincol.cxx | 8
sc/source/core/tool/appoptio.cxx | 4
sc/source/core/tool/chartpos.cxx | 4
sc/source/core/tool/consoli.cxx | 6
sc/source/core/tool/detfunc.cxx | 8
sc/source/core/tool/interpr1.cxx | 5
sc/source/core/tool/interpr4.cxx | 24
sc/source/core/tool/refdata.cxx | 73 +
sc/source/core/tool/token.cxx | 19
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/xestream.cxx | 4
sc/source/filter/excel/xistream.cxx | 8
sc/source/filter/html/htmlpars.cxx | 6
sc/source/filter/inc/autofilterbuffer.hxx | 2
sc/source/filter/inc/pivotcachebuffer.hxx | 2
sc/source/filter/inc/xetable.hxx | 4
sc/source/filter/lotus/lotform.cxx | 4
sc/source/filter/lotus/op.cxx | 8
sc/source/filter/qpro/qpro.cxx | 4
sc/source/filter/starcalc/scflt.cxx | 4
sc/source/ui/dbgui/tpsubt.cxx | 6
sc/source/ui/dbgui/validate.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 3
sc/source/ui/docshell/docsh2.cxx | 2
sc/source/ui/docshell/docsh6.cxx | 4
sc/source/ui/inc/drawview.hxx | 2
sc/source/ui/inc/impex.hxx | 2
sc/source/ui/miscdlgs/crnrdlg.cxx | 6
sc/source/ui/unoobj/appluno.cxx | 4
sc/source/ui/unoobj/cellsuno.cxx | 6
sc/source/ui/unoobj/datauno.cxx | 4
sc/source/ui/vba/vbachart.cxx | 2
sc/source/ui/vba/vbarange.cxx | 2
sc/source/ui/vba/vbatitle.hxx | 2
sc/source/ui/view/formatsh.cxx | 2
sc/source/ui/view/viewfunc.cxx | 2
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 2
sd/Library_sd.mk | 1
sd/inc/app.hrc | 10
sd/inc/pch/precompiled_sd.hxx | 2
sd/qa/unit/data/odp/transparent_background.odp |binary
sd/qa/unit/export-tests.cxx | 84 -
sd/sdi/SlideSorterController.sdi | 20
sd/sdi/_drvwsh.sdi | 21
sd/sdi/sdraw.sdi | 193 ++
sd/source/core/drawdoc2.cxx | 4
sd/source/core/stlsheet.cxx | 2
sd/source/filter/eppt/eppt.cxx | 4
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 3
sd/source/ui/app/sdmod1.cxx | 4
sd/source/ui/dlg/animobjs.cxx | 2
sd/source/ui/dlg/dlgass.cxx | 2
sd/source/ui/func/fudraw.cxx | 2
sd/source/ui/func/funavig.cxx | 156 ++
sd/source/ui/inc/DrawViewShell.hxx | 14
sd/source/ui/inc/OutlineView.hxx | 2
sd/source/ui/inc/SlideSorterViewShell.hxx | 16
sd/source/ui/inc/ViewShell.hxx | 2
sd/source/ui/inc/assclass.hxx | 4
sd/source/ui/inc/funavig.hxx | 50
sd/source/ui/remotecontrol/Server.cxx | 2
sd/source/ui/sidebar/MasterPageDescriptor.cxx | 2
sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx | 2
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 200 +++
sd/source/ui/unoidl/unomodel.cxx | 3
sd/source/ui/unoidl/unosrch.cxx | 2
sd/source/ui/view/ToolBarManager.cxx | 2
sd/source/ui/view/drawview.cxx | 2
sd/source/ui/view/drviewsa.cxx | 61
sd/source/ui/view/viewshel.cxx | 13
sd/uiconfig/sdraw/toolbar/standardbar.xml | 10
sd/uiconfig/simpress/toolbar/standardbar.xml | 10
sdext/source/presenter/PresenterNotesView.hxx | 2
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx | 2
sfx2/inc/pch/precompiled_sfx.hxx | 2
sfx2/source/appl/app.cxx | 2
sfx2/source/appl/appserv.cxx | 5
sfx2/source/appl/linkmgr2.cxx | 2
sfx2/source/appl/lnkbase2.cxx | 2
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/appl/sfxhelp.cxx | 2
sfx2/source/control/bindings.cxx | 4
sfx2/source/control/templateabstractview.cxx | 5
sfx2/source/control/thumbnailview.cxx | 23
sfx2/source/control/thumbnailviewitem.cxx | 2
sfx2/source/dialog/backingcomp.cxx | 4
sfx2/source/dialog/backingwindow.cxx | 2
sfx2/source/dialog/splitwin.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/doc/objcont.cxx | 4
sfx2/source/sidebar/SidebarController.cxx | 1
shell/source/win32/shlxthandler/infotips/infotips.cxx | 2
slideshow/source/engine/animationfactory.cxx | 2
slideshow/source/engine/slideshowimpl.cxx | 2
slideshow/source/engine/sp_debug.cxx | 9
slideshow/source/engine/transitions/randomwipe.hxx | 4
slideshow/source/inc/animationnodefactory.hxx | 2
slideshow/source/inc/eventmultiplexer.hxx | 4
solenv/bin/modules/installer/download.pm | 2
soltools/cpp/_tokens.c | 3
sot/inc/pch/precompiled_sot.hxx | 2
sot/source/sdstor/stgdir.cxx | 4
sot/source/sdstor/stgdir.hxx | 2
sot/source/sdstor/stgole.cxx | 4
sot/source/sdstor/stgstrms.cxx | 6
sot/source/sdstor/storage.cxx | 4
sot/source/sdstor/storinfo.cxx | 4
sot/source/sdstor/ucbstorage.cxx | 4
starmath/source/cursor.cxx | 2
starmath/source/node.cxx | 4
starmath/source/parse.cxx | 2
starmath/source/visitors.cxx | 2
stoc/source/invocation/invocation.cxx | 4
stoc/source/javavm/javavm.cxx | 5
svgio/qa/cppunit/SvgImportTest.cxx | 4
svl/inc/pch/precompiled_svl.hxx | 2
svl/source/items/nranges.cxx | 6
svl/source/items/poolio.cxx | 1
svl/source/misc/PasswordHelper.cxx | 6
svl/source/numbers/zforfind.hxx | 4
svtools/inc/pch/precompiled_svt.hxx | 2
svtools/source/control/ruler.cxx | 1
svtools/source/control/toolbarmenu.cxx | 2
svtools/source/graphic/grfmgr2.cxx | 22
svtools/source/uno/contextmenuhelper.cxx | 2
svtools/source/uno/unoiface.cxx | 3
svx/inc/pch/precompiled_svx.hxx | 2
svx/inc/pch/precompiled_svxcore.hxx | 2
svx/source/accessibility/AccessibleShapeTreeInfo.cxx | 4
svx/source/customshapes/EnhancedCustomShape2d.cxx | 2
svx/source/dialog/_bmpmask.cxx | 14
svx/source/dialog/srchdlg.cxx | 4
svx/source/fmcomp/fmgridif.cxx | 2
svx/source/form/dataaccessdescriptor.cxx | 2
svx/source/form/filtnav.cxx | 2
svx/source/form/fmobj.cxx | 2
svx/source/form/fmtextcontrolshell.cxx | 2
svx/source/form/navigatortree.cxx | 2
svx/source/form/navigatortreemodel.cxx | 2
svx/source/gallery2/codec.cxx | 6
svx/source/gallery2/galtheme.cxx | 4
svx/source/sdr/contact/objectcontactofpageview.cxx | 2
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 2
svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx | 2
svx/source/sdr/properties/measureproperties.cxx | 2
svx/source/sidebar/line/LinePropertyPanel.hxx | 4
svx/source/sidebar/nbdtmg.cxx | 3
svx/source/svdraw/svddrgmt.cxx | 2
svx/source/svdraw/svddrgv.cxx | 10
svx/source/svdraw/svdhdl.cxx | 4
svx/source/svdraw/svdmodel.cxx | 8
svx/source/unodraw/unoshape.cxx | 2
svx/source/xoutdev/_xoutbmp.cxx | 6
svx/source/xoutdev/xattrbmp.cxx | 2
svx/source/xoutdev/xtabdash.cxx | 2
svx/uiconfig/ui/sidebarline.ui | 204 +--
sw/inc/IDocumentFieldsAccess.hxx | 2
sw/inc/docary.hxx | 2
sw/inc/dochdl.hrc | 3
sw/inc/docsh.hxx | 2
sw/inc/pch/precompiled_msword.hxx | 3
sw/inc/pch/precompiled_sw.hxx | 2
sw/inc/pch/precompiled_swui.hxx | 2
sw/inc/swtable.hxx | 2
sw/inc/unocrsrhelper.hxx | 2
sw/inc/unotxdoc.hxx | 2
sw/qa/extras/inc/swmodeltestbase.hxx | 2
sw/qa/extras/ooxmlexport/data/fdo60957-2.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 11
sw/qa/extras/tiledrendering/data/shape-with-text.fodt | 17
sw/qa/extras/tiledrendering/tiledrendering.cxx | 33
sw/qa/extras/uiwriter/uiwriter.cxx | 22
sw/source/core/bastyp/index.cxx | 9
sw/source/core/crsr/findtxt.cxx | 2
sw/source/core/doc/docbm.cxx | 1
sw/source/core/doc/doccomp.cxx | 6
sw/source/core/doc/docedt.cxx | 15
sw/source/core/doc/docnew.cxx | 2
sw/source/core/doc/docsort.cxx | 2
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 7
sw/source/core/inc/rootfrm.hxx | 2
sw/source/core/layout/dbg_lay.cxx | 2
sw/source/core/layout/flycnt.cxx | 2
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/layout/ftnfrm.cxx | 2
sw/source/core/layout/objectformattertxtfrm.cxx | 2
sw/source/core/layout/wsfrm.cxx | 2
sw/source/core/table/swnewtable.cxx | 6
sw/source/core/text/EnhancedPDFExportHelper.cxx | 2
sw/source/core/text/itrcrsr.cxx | 2
sw/source/core/text/txtfrm.cxx | 2
sw/source/core/text/txtftn.cxx | 2
sw/source/core/text/txthyph.cxx | 2
sw/source/core/txtnode/txatbase.cxx | 9
sw/source/core/undo/undel.cxx | 42
sw/source/core/undo/unmove.cxx | 12
sw/source/core/undo/unredln.cxx | 92 -
sw/source/core/undo/untblk.cxx | 80 -
sw/source/core/unocore/unochart.cxx | 2
sw/source/core/view/pagepreviewlayout.cxx | 2
sw/source/filter/ascii/parasc.cxx | 4
sw/source/filter/basflt/fltshell.cxx | 4
sw/source/filter/basflt/iodetect.cxx | 4
sw/source/filter/html/htmlform.cxx | 2
sw/source/filter/html/swhtml.cxx | 4
sw/source/filter/ww8/docxattributeoutput.cxx | 14
sw/source/filter/ww8/docxattributeoutput.hxx | 2
sw/source/filter/ww8/docxsdrexport.cxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 52
sw/source/filter/ww8/wrtw8sty.cxx | 4
sw/source/filter/ww8/ww8graf.cxx | 5
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 2
sw/source/filter/ww8/ww8scan.hxx | 2
sw/source/filter/xml/xmltble.cxx | 2
sw/source/ui/dochdl/dochdl.src | 8
sw/source/ui/envelp/envfmt.cxx | 4
sw/source/ui/fldui/flddinf.cxx | 2
sw/source/ui/fmtui/tmpdlg.cxx | 8
sw/source/ui/index/swuiidxmrk.cxx | 2
sw/source/uibase/app/docshini.cxx | 2
sw/source/uibase/dochdl/swdtflvr.cxx | 16
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 4
sw/source/uibase/inc/formatclipboard.hxx | 2
sw/source/uibase/table/swtablerep.cxx | 4
sw/source/uibase/uiview/scroll.cxx | 2
sw/source/uibase/uno/unotxdoc.cxx | 56
sw/uiconfig/swriter/ui/templatedialog2.ui | 13
test/source/bootstrapfixture.cxx | 4
test/source/htmltesttools.cxx | 4
test/source/xmltesttools.cxx | 4
toolkit/source/awt/vclxdevice.cxx | 3
toolkit/source/awt/vclxgraphics.cxx | 3
toolkit/source/awt/vclxtoolkit.cxx | 2
toolkit/source/controls/controlmodelcontainerbase.cxx | 2
toolkit/source/controls/unocontrol.cxx | 8
ucb/source/sorter/sortresult.cxx | 4
ucb/source/ucp/file/filstr.cxx | 4
ucb/source/ucp/ftp/ftpurl.cxx | 4
ucb/source/ucp/package/pkgcontent.cxx | 2
ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx | 4
ucb/source/ucp/webdav/SerfSession.cxx | 2
unodevtools/source/skeletonmaker/skeletonmaker.cxx | 2
unotools/source/i18n/localedatawrapper.cxx | 2
unotools/source/ucbhelper/ucblockbytes.cxx | 4
unoxml/source/dom/elementlist.hxx | 6
vbahelper/source/vbahelper/vbahelper.cxx | 2
vcl/Library_vcl.mk | 1
vcl/Module_vcl.mk | 1
vcl/Package_opengl_blacklist.mk | 16
vcl/generic/fontmanager/helper.cxx | 6
vcl/generic/print/genprnpsp.cxx | 6
vcl/inc/opengl/win/WinDeviceInfo.hxx | 36
vcl/inc/pch/precompiled_vcl.hxx | 2
vcl/inc/unx/gtk/gtkframe.hxx | 1
vcl/inc/unx/gtk/gtkinst.hxx | 4
vcl/inc/unx/wmadaptor.hxx | 2
vcl/opengl/opengl_blacklist_windows.xml | 19
vcl/opengl/win/WinDeviceInfo.cxx | 444 +-----
vcl/opengl/win/blocklist_parser.cxx | 318 ++++
vcl/opengl/win/blocklist_parser.hxx | 45
vcl/source/app/dbggui.cxx | 4
vcl/source/bitmap/bitmapscalesuper.cxx | 10
vcl/source/control/edit.cxx | 12
vcl/source/control/fixed.cxx | 5
vcl/source/control/ilstbox.cxx | 2
vcl/source/control/tabctrl.cxx | 2
vcl/source/edit/texteng.cxx | 2
vcl/source/filter/GraphicNativeMetadata.cxx | 4
vcl/source/filter/graphicfilter.cxx | 3
vcl/source/filter/igif/gifread.cxx | 6
vcl/source/filter/jpeg/Exif.cxx | 4
vcl/source/filter/jpeg/JpegReader.cxx | 4
vcl/source/filter/jpeg/jpegc.cxx | 4
vcl/source/filter/sgfbram.cxx | 4
vcl/source/filter/sgvspln.cxx | 12
vcl/source/filter/sgvtext.cxx | 5
vcl/source/filter/wmf/emfwr.cxx | 4
vcl/source/filter/wmf/enhwmf.cxx | 12
vcl/source/filter/wmf/winwmf.cxx | 18
vcl/source/filter/wmf/wmfwr.cxx | 6
vcl/source/gdi/bitmap.cxx | 30
vcl/source/gdi/bitmap3.cxx | 32
vcl/source/gdi/cvtsvm.cxx | 6
vcl/source/gdi/dibtools.cxx | 14
vcl/source/gdi/image.cxx | 2
vcl/source/gdi/impimage.cxx | 8
vcl/source/gdi/impvect.cxx | 5
vcl/source/gdi/jobset.cxx | 4
vcl/source/gdi/pdfwriter_impl.cxx | 16
vcl/source/gdi/pngwrite.cxx | 4
vcl/source/gdi/salgdilayout.cxx | 11
vcl/source/gdi/sallayout.cxx | 6
vcl/source/gdi/salmisc.cxx | 4
vcl/source/gdi/textlayout.cxx | 6
vcl/source/opengl/OpenGLContext.cxx | 11
vcl/source/opengl/OpenGLHelper.cxx | 6
vcl/source/outdev/bitmap.cxx | 42
vcl/source/outdev/curvedshapes.cxx | 10
vcl/source/outdev/gradient.cxx | 22
vcl/source/outdev/hatch.cxx | 12
vcl/source/outdev/line.cxx | 5
vcl/source/outdev/mask.cxx | 10
vcl/source/outdev/nativecontrols.cxx | 4
vcl/source/outdev/pixel.cxx | 15
vcl/source/outdev/polygon.cxx | 17
vcl/source/outdev/polyline.cxx | 11
vcl/source/outdev/rect.cxx | 11
vcl/source/outdev/text.cxx | 11
vcl/source/outdev/textline.cxx | 7
vcl/source/outdev/transparent.cxx | 21
vcl/source/outdev/wallpaper.cxx | 12
vcl/source/window/accmgr.cxx | 2
vcl/source/window/btndlg.cxx | 4
vcl/source/window/menu.cxx | 33
vcl/source/window/mouse.cxx | 2
vcl/source/window/toolbox.cxx | 10
vcl/source/window/toolbox2.cxx | 2
vcl/unx/generic/app/saldisp.cxx | 4
vcl/unx/generic/printer/jobdata.cxx | 4
vcl/unx/gtk/window/gtksalframe.cxx | 17
vcl/unx/gtk3/app/gtk3gtkinst.cxx | 524 ++++++++
vcl/win/source/window/salframe.cxx | 2
vcl/workben/svptest.cxx | 2
winaccessibility/source/UAccCOM/AccEditableText.cxx | 1
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2
xmloff/inc/pch/precompiled_xo.hxx | 2
xmloff/source/draw/ximpshap.cxx | 2
xmloff/source/forms/elementexport.cxx | 2
xmloff/source/forms/elementexport.hxx | 4
xmloff/source/forms/formattributes.hxx | 2
xmloff/source/forms/propertyexport.cxx | 2
xmloff/source/text/txtexppr.cxx | 2
xmloff/source/text/txtfldi.cxx | 2
xmloff/source/text/txtimp.cxx | 4
xmloff/source/text/txtparai.cxx | 2
xmloff/source/transform/AttrTransformerAction.hxx | 2
xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 2
xmlsecurity/source/helper/xsecctl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 2
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 10
xmlsecurity/source/xmlsec/nss/secerror.cxx | 2
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 4
642 files changed, 4464 insertions(+), 3755 deletions(-)
New commits:
commit 30686ba5b55dab105f5f07cc7ceb85040e72c6f0
Author: Pranav Kant <pranavk at gnome.org>
Date: Fri Jun 19 01:06:50 2015 +0530
lokdocview: Use *get_instance_private () to get private structure
Let lok_doc_view_get_instance_private () do the pointer
arithmatic. Additionally, we are saving sizeof (void*) already in
the _LOKDocView struct with this approach.
Change-Id: I6d991d5834ef15dad24acb14a1d4bbf7d03df762
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 3eaf283..3a1628b 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -32,7 +32,6 @@ typedef struct _LOKDocViewPrivate LOKDocViewPrivate;
struct _LOKDocView
{
GtkDrawingArea aDrawingArea;
- LOKDocViewPrivate* priv;
};
struct _LOKDocViewClass
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index bc383c5..c746b84 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -229,7 +229,7 @@ isEmptyRectangle(const GdkRectangle& rRectangle)
static void
signalKey (LOKDocView* pDocView, const GdkEvent* pEvent)
{
- LOKDocViewPrivate* priv = pDocView->priv;
+ LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
int nCharCode = 0;
int nKeyCode = 0;
guint keyval;
@@ -292,7 +292,7 @@ static gboolean
handleTimeout (gpointer pData)
{
LOKDocView* pDocView = LOK_DOC_VIEW (pData);
- LOKDocViewPrivate* priv = pDocView->priv;
+ LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
if (priv->m_bEdit)
{
@@ -366,7 +366,7 @@ globalCallbackWorker(int nType, const char* pPayload, void* pData)
static GdkRectangle
payloadToRectangle (LOKDocView* pDocView, const char* pPayload)
{
- LOKDocViewPrivate* priv = pDocView->priv;
+ LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
GdkRectangle aRet;
gchar** ppCoordinates = g_strsplit(pPayload, ", ", 4);
gchar** ppCoordinate = ppCoordinates;
@@ -418,7 +418,7 @@ payloadToRectangles(LOKDocView* pDocView, const char* pPayload)
static void
setTilesInvalid (LOKDocView* pDocView, const GdkRectangle& rRectangle)
{
- LOKDocViewPrivate* priv = pDocView->priv;
+ LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
GdkRectangle aRectanglePixels;
GdkPoint aStart, aEnd;
@@ -442,7 +442,7 @@ callback (gpointer pData)
{
CallbackData* pCallback = static_cast<CallbackData*>(pData);
LOKDocView* pDocView = LOK_DOC_VIEW (pCallback->m_pDocView);
- LOKDocViewPrivate* priv = pDocView->priv;
+ LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
switch (pCallback->m_nType)
{
@@ -560,7 +560,7 @@ renderHandle(LOKDocView* pDocView,
cairo_surface_t* pHandle,
GdkRectangle& rRectangle)
{
- LOKDocViewPrivate* priv = pDocView->priv;
+ LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
GdkPoint aCursorBottom;
int nHandleWidth, nHandleHeight;
double fHandleScale;
@@ -593,7 +593,7 @@ renderGraphicHandle(LOKDocView* pDocView,
const GdkRectangle& rSelection,
cairo_surface_t* pHandle)
{
- LOKDocViewPrivate* priv = pDocView->priv;
+ LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
int nHandleWidth, nHandleHeight;
GdkRectangle aSelection;
@@ -660,7 +660,7 @@ renderGraphicHandle(LOKDocView* pDocView,
static gboolean
renderDocument(LOKDocView* pDocView, cairo_t* pCairo)
{
- LOKDocViewPrivate *priv = pDocView->priv;
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
GdkRectangle aVisibleArea;
long nDocumentWidthPixels = twipToPixel(priv->m_nDocumentWidthTwips, priv->m_fZoom);
long nDocumentHeightPixels = twipToPixel(priv->m_nDocumentHeightTwips, priv->m_fZoom);
@@ -721,7 +721,7 @@ renderDocument(LOKDocView* pDocView, cairo_t* pCairo)
static gboolean
renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
{
- LOKDocViewPrivate *priv = pDocView->priv;
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
if (priv->m_bEdit && priv->m_bCursorVisible && priv->m_bCursorOverlayVisible && !isEmptyRectangle(priv->m_aVisibleCursor))
{
@@ -799,7 +799,7 @@ static gboolean
lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
{
LOKDocView* pDocView = LOK_DOC_VIEW (pWidget);
- LOKDocViewPrivate *priv = pDocView->priv;
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
g_info("LOKDocView_Impl::signalButton: %d, %d (in twips: %d, %d)",
(int)pEvent->x, (int)pEvent->y,
@@ -942,7 +942,7 @@ static gboolean
lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)
{
LOKDocView* pDocView = LOK_DOC_VIEW (pWidget);
- LOKDocViewPrivate *priv = pDocView->priv;
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
GdkPoint aPoint;
if (priv->m_bInDragMiddleHandle)
@@ -1001,8 +1001,8 @@ lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)
static void lok_doc_view_init (LOKDocView* pDocView)
{
- pDocView->priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
- pDocView->priv->m_bCursorVisible = true;
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ priv->m_bCursorVisible = true;
gtk_widget_add_events(GTK_WIDGET(pDocView),
GDK_BUTTON_PRESS_MASK
@@ -1015,7 +1015,7 @@ static void lok_doc_view_init (LOKDocView* pDocView)
static void lok_doc_view_set_property (GObject* object, guint propId, const GValue *value, GParamSpec *pspec)
{
LOKDocView* pDocView = LOK_DOC_VIEW (object);
- LOKDocViewPrivate* priv = pDocView->priv;
+ LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
switch (propId)
{
@@ -1045,7 +1045,7 @@ static void lok_doc_view_set_property (GObject* object, guint propId, const GVal
static void lok_doc_view_get_property (GObject* object, guint propId, GValue *value, GParamSpec *pspec)
{
LOKDocView* pDocView = LOK_DOC_VIEW (object);
- LOKDocViewPrivate* priv = pDocView->priv;
+ LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
switch (propId)
{
@@ -1097,7 +1097,7 @@ static gboolean lok_doc_view_draw (GtkWidget* pWidget, cairo_t* pCairo)
static void lok_doc_view_finalize (GObject* object)
{
LOKDocView* pDocView = LOK_DOC_VIEW (object);
- LOKDocViewPrivate* priv = pDocView->priv;
+ LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
if (priv->m_pDocument)
priv->m_pDocument->pClass->destroy (priv->m_pDocument);
@@ -1110,18 +1110,19 @@ static void lok_doc_view_finalize (GObject* object)
static gboolean lok_doc_view_initable_init (GInitable *initable, GCancellable* /*cancellable*/, GError **error)
{
LOKDocView *pDocView = LOK_DOC_VIEW (initable);
+ LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
- if (pDocView->priv->m_pOffice != NULL)
+ if (priv->m_pOffice != NULL)
return TRUE;
- pDocView->priv->m_pOffice = lok_init (pDocView->priv->m_aLOPath);
+ priv->m_pOffice = lok_init (priv->m_aLOPath);
- if (pDocView->priv->m_pOffice == NULL)
+ if (priv->m_pOffice == NULL)
{
g_set_error (error,
g_quark_from_static_string ("LOK initialization error"), 0,
"Failed to get LibreOfficeKit context. Make sure path (%s) is correct",
- pDocView->priv->m_aLOPath);
+ priv->m_aLOPath);
return FALSE;
}
@@ -1387,39 +1388,41 @@ lok_doc_view_new (const gchar* pPath, GCancellable *cancellable, GError **error)
SAL_DLLPUBLIC_EXPORT gboolean
lok_doc_view_open_document (LOKDocView* pDocView, const gchar* pPath)
{
- if ( pDocView->priv->m_pDocument )
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+
+ if ( priv->m_pDocument )
{
- pDocView->priv->m_pDocument->pClass->destroy( pDocView->priv->m_pDocument );
- pDocView->priv->m_pDocument = 0;
+ priv->m_pDocument->pClass->destroy( priv->m_pDocument );
+ priv->m_pDocument = 0;
}
- pDocView->priv->m_pOffice->pClass->registerCallback(pDocView->priv->m_pOffice, globalCallbackWorker, pDocView);
- pDocView->priv->m_pDocument = pDocView->priv->m_pOffice->pClass->documentLoad( pDocView->priv->m_pOffice, pPath );
- if ( !pDocView->priv->m_pDocument )
+ priv->m_pOffice->pClass->registerCallback(priv->m_pOffice, globalCallbackWorker, pDocView);
+ priv->m_pDocument = priv->m_pOffice->pClass->documentLoad( priv->m_pOffice, pPath );
+ if ( !priv->m_pDocument )
{
// FIXME: should have a GError parameter and populate it.
- char *pError = pDocView->priv->m_pOffice->pClass->getError( pDocView->priv->m_pOffice );
+ char *pError = priv->m_pOffice->pClass->getError( priv->m_pOffice );
fprintf( stderr, "Error opening document '%s'\n", pError );
return FALSE;
}
else
{
- pDocView->priv->m_pDocument->pClass->initializeForRendering(pDocView->priv->m_pDocument);
- pDocView->priv->m_pDocument->pClass->registerCallback(pDocView->priv->m_pDocument, callbackWorker, pDocView);
- pDocView->priv->m_pDocument->pClass->getDocumentSize(pDocView->priv->m_pDocument, &pDocView->priv->m_nDocumentWidthTwips, &pDocView->priv->m_nDocumentHeightTwips);
+ priv->m_pDocument->pClass->initializeForRendering(priv->m_pDocument);
+ priv->m_pDocument->pClass->registerCallback(priv->m_pDocument, callbackWorker, pDocView);
+ priv->m_pDocument->pClass->getDocumentSize(priv->m_pDocument, &priv->m_nDocumentWidthTwips, &priv->m_nDocumentHeightTwips);
g_timeout_add(600, handleTimeout, pDocView);
- float zoom = pDocView->priv->m_fZoom;
- long nDocumentWidthTwips = pDocView->priv->m_nDocumentWidthTwips;
- long nDocumentHeightTwips = pDocView->priv->m_nDocumentHeightTwips;
+ float zoom = priv->m_fZoom;
+ long nDocumentWidthTwips = priv->m_nDocumentWidthTwips;
+ long nDocumentHeightTwips = priv->m_nDocumentHeightTwips;
long nDocumentWidthPixels = twipToPixel(nDocumentWidthTwips, zoom);
long nDocumentHeightPixels = twipToPixel(nDocumentHeightTwips, zoom);
// Total number of columns in this document.
guint nColumns = ceil((double)nDocumentWidthPixels / nTileSizePixels);
- pDocView->priv->m_aTileBuffer = TileBuffer(pDocView->priv->m_pDocument,
- nColumns);
+ priv->m_aTileBuffer = TileBuffer(priv->m_pDocument,
+ nColumns);
gtk_widget_set_size_request(GTK_WIDGET(pDocView),
nDocumentWidthPixels,
nDocumentHeightPixels);
@@ -1436,7 +1439,8 @@ lok_doc_view_open_document (LOKDocView* pDocView, const gchar* pPath)
SAL_DLLPUBLIC_EXPORT LibreOfficeKitDocument*
lok_doc_view_get_document (LOKDocView* pDocView)
{
- return pDocView->priv->m_pDocument;
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ return priv->m_pDocument;
}
/**
@@ -1449,14 +1453,16 @@ lok_doc_view_get_document (LOKDocView* pDocView)
SAL_DLLPUBLIC_EXPORT void
lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
{
- pDocView->priv->m_fZoom = fZoom;
- long nDocumentWidthPixels = twipToPixel(pDocView->priv->m_nDocumentWidthTwips, fZoom);
- long nDocumentHeightPixels = twipToPixel(pDocView->priv->m_nDocumentHeightTwips, fZoom);
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+
+ priv->m_fZoom = fZoom;
+ long nDocumentWidthPixels = twipToPixel(priv->m_nDocumentWidthTwips, fZoom);
+ long nDocumentHeightPixels = twipToPixel(priv->m_nDocumentHeightTwips, fZoom);
// Total number of columns in this document.
guint nColumns = ceil((double)nDocumentWidthPixels / nTileSizePixels);
- pDocView->priv->m_aTileBuffer = TileBuffer(pDocView->priv->m_pDocument,
- nColumns);
+ priv->m_aTileBuffer = TileBuffer(priv->m_pDocument,
+ nColumns);
gtk_widget_set_size_request(GTK_WIDGET(pDocView),
nDocumentWidthPixels,
nDocumentHeightPixels);
@@ -1471,38 +1477,44 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
SAL_DLLPUBLIC_EXPORT float
lok_doc_view_get_zoom (LOKDocView* pDocView)
{
- return pDocView->priv->m_fZoom;
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ return priv->m_fZoom;
}
SAL_DLLPUBLIC_EXPORT int
lok_doc_view_get_parts (LOKDocView* pDocView)
{
- return pDocView->priv->m_pDocument->pClass->getParts( pDocView->priv->m_pDocument );
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ return priv->m_pDocument->pClass->getParts( priv->m_pDocument );
}
SAL_DLLPUBLIC_EXPORT int
lok_doc_view_get_part (LOKDocView* pDocView)
{
- return pDocView->priv->m_pDocument->pClass->getPart( pDocView->priv->m_pDocument );
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ return priv->m_pDocument->pClass->getPart( priv->m_pDocument );
}
SAL_DLLPUBLIC_EXPORT void
lok_doc_view_set_part (LOKDocView* pDocView, int nPart)
{
- pDocView->priv->m_pDocument->pClass->setPart( pDocView->priv->m_pDocument, nPart );
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ priv->m_pDocument->pClass->setPart( priv->m_pDocument, nPart );
}
SAL_DLLPUBLIC_EXPORT char*
lok_doc_view_get_part_name (LOKDocView* pDocView, int nPart)
{
- return pDocView->priv->m_pDocument->pClass->getPartName( pDocView->priv->m_pDocument, nPart );
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ return priv->m_pDocument->pClass->getPartName( priv->m_pDocument, nPart );
}
SAL_DLLPUBLIC_EXPORT void
lok_doc_view_set_partmode(LOKDocView* pDocView,
int nPartMode)
{
- pDocView->priv->m_pDocument->pClass->setPartMode( pDocView->priv->m_pDocument, nPartMode );
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ priv->m_pDocument->pClass->setPartMode( priv->m_pDocument, nPartMode );
}
/**
@@ -1516,16 +1528,17 @@ SAL_DLLPUBLIC_EXPORT void
lok_doc_view_set_edit(LOKDocView* pDocView,
gboolean bEdit)
{
- gboolean bWasEdit = pDocView->priv->m_bEdit;
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ gboolean bWasEdit = priv->m_bEdit;
- if (!pDocView->priv->m_bEdit && bEdit)
+ if (!priv->m_bEdit && bEdit)
g_info("lok_doc_view_set_edit: entering edit mode");
- else if (pDocView->priv->m_bEdit && !bEdit)
+ else if (priv->m_bEdit && !bEdit)
{
g_info("lok_doc_view_set_edit: leaving edit mode");
- pDocView->priv->m_pDocument->pClass->resetSelection(pDocView->priv->m_pDocument);
+ priv->m_pDocument->pClass->resetSelection(priv->m_pDocument);
}
- pDocView->priv->m_bEdit = bEdit;
+ priv->m_bEdit = bEdit;
g_signal_emit(pDocView, doc_view_signals[EDIT_CHANGED], 0, bWasEdit);
gtk_widget_queue_draw(GTK_WIDGET(pDocView));
}
@@ -1539,7 +1552,8 @@ lok_doc_view_set_edit(LOKDocView* pDocView,
SAL_DLLPUBLIC_EXPORT gboolean
lok_doc_view_get_edit (LOKDocView* pDocView)
{
- return pDocView->priv->m_bEdit;
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ return priv->m_bEdit;
}
/**
@@ -1555,7 +1569,8 @@ lok_doc_view_post_command (LOKDocView* pDocView,
const char* pCommand,
const char* pArguments)
{
- pDocView->priv->m_pDocument->pClass->postUnoCommand(pDocView->priv->m_pDocument, pCommand, pArguments);
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ priv->m_pDocument->pClass->postUnoCommand(priv->m_pDocument, pCommand, pArguments);
}
/**
@@ -1583,7 +1598,8 @@ lok_doc_view_post_key (LOKDocView* pDocView, GdkEvent* pEvent)
SAL_DLLPUBLIC_EXPORT float
lok_doc_view_pixel_to_twip (LOKDocView* pDocView, float fInput)
{
- return pixelToTwip(fInput, pDocView->priv->m_fZoom);
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ return pixelToTwip(fInput, priv->m_fZoom);
}
/**
@@ -1598,7 +1614,8 @@ lok_doc_view_pixel_to_twip (LOKDocView* pDocView, float fInput)
SAL_DLLPUBLIC_EXPORT float
lok_doc_view_twip_to_pixel (LOKDocView* pDocView, float fInput)
{
- return twipToPixel(fInput, pDocView->priv->m_fZoom);
+ LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ return twipToPixel(fInput, priv->m_fZoom);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ce3cea4827f0571f6ce26e79e53dc663de63b3ce
Author: Pranav Kant <pranavk at gnome.org>
Date: Thu Jun 18 21:52:22 2015 +0530
lokdocview: Use GInitable
The construction of LokDocView widget can fail because it
involves initializing the lok context via lok_init.
Having lok_init calls in constructed virtual method is a bad idea
since it assumes that construction will never fail. So, implement
GInitable for this class, and move the object initialization from
constructed to initable.
Change-Id: Idf18a054cf8ef2e946392458ec52cb0107bd7454
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 7048dbe..3eaf283 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -42,10 +42,12 @@ struct _LOKDocViewClass
GType lok_doc_view_get_type (void) G_GNUC_CONST;
-GtkWidget* lok_doc_view_new (const char* pPath);
+GtkWidget* lok_doc_view_new (const gchar* pPath,
+ GCancellable *cancellable,
+ GError **error);
gboolean lok_doc_view_open_document (LOKDocView* pDocView,
- char* pPath);
+ const gchar* pPath);
/// Gets the document the viewer displays.
LibreOfficeKitDocument* lok_doc_view_get_document (LOKDocView* pDocView);
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 9496ba5..d506ca2 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -486,7 +486,7 @@ int main( int argc, char* argv[] )
gtk_box_pack_end(GTK_BOX(pVBox), pFindbar, FALSE, FALSE, 0);
// Docview
- pDocView = lok_doc_view_new(argv[1]);
+ pDocView = lok_doc_view_new (argv[1], NULL, NULL);
if (pDocView == NULL)
g_error ("Error while creating LOKDocView widget");
g_signal_connect(pDocView, "edit-changed", G_CALLBACK(signalEdit), NULL);
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 9e8cabb..bc383c5 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -137,12 +137,16 @@ enum
static guint doc_view_signals[LAST_SIGNAL] = { 0 };
+static void lok_doc_view_initable_iface_init (GInitableIface *iface);
+
SAL_DLLPUBLIC_EXPORT GType lok_doc_view_get_type();
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
-G_DEFINE_TYPE_WITH_PRIVATE (LOKDocView, lok_doc_view, GTK_TYPE_DRAWING_AREA)
+G_DEFINE_TYPE_WITH_CODE (LOKDocView, lok_doc_view, GTK_TYPE_DRAWING_AREA,
+ G_ADD_PRIVATE (LOKDocView)
+ G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, lok_doc_view_initable_iface_init));
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
@@ -1103,14 +1107,30 @@ static void lok_doc_view_finalize (GObject* object)
G_OBJECT_CLASS (lok_doc_view_parent_class)->finalize (object);
}
-static void lok_doc_view_constructed (GObject* object)
+static gboolean lok_doc_view_initable_init (GInitable *initable, GCancellable* /*cancellable*/, GError **error)
{
- LOKDocView* pDocView = LOK_DOC_VIEW (object);
- LOKDocViewPrivate* priv = pDocView->priv;
+ LOKDocView *pDocView = LOK_DOC_VIEW (initable);
+
+ if (pDocView->priv->m_pOffice != NULL)
+ return TRUE;
+
+ pDocView->priv->m_pOffice = lok_init (pDocView->priv->m_aLOPath);
+
+ if (pDocView->priv->m_pOffice == NULL)
+ {
+ g_set_error (error,
+ g_quark_from_static_string ("LOK initialization error"), 0,
+ "Failed to get LibreOfficeKit context. Make sure path (%s) is correct",
+ pDocView->priv->m_aLOPath);
+ return FALSE;
+ }
- G_OBJECT_CLASS (lok_doc_view_parent_class)->constructed (object);
+ return TRUE;
+}
- pDocView->priv->m_pOffice = lok_init (priv->m_aLOPath);
+static void lok_doc_view_initable_iface_init (GInitableIface *iface)
+{
+ iface->init = lok_doc_view_initable_init;
}
static void lok_doc_view_class_init (LOKDocViewClass* pClass)
@@ -1121,7 +1141,6 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
pGObjectClass->get_property = lok_doc_view_get_property;
pGObjectClass->set_property = lok_doc_view_set_property;
pGObjectClass->finalize = lok_doc_view_finalize;
- pGObjectClass->constructed = lok_doc_view_constructed;
pWidgetClass->draw = lok_doc_view_draw;
pWidgetClass->button_press_event = lok_doc_view_signal_button;
@@ -1343,18 +1362,19 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
G_TYPE_STRING);
}
-
-
/**
* lok_doc_view_new:
* @pPath: LibreOffice install path.
+ * @cancellable: The cancellable object that you can use to cancel this
+ * operation.
+ * @error: The error that will be set if the object fails to initialize.
*
- * Returns: The #LOKDocView widget instance.
+ * Returns: (transfer none): The #LOKDocView widget instance.
*/
SAL_DLLPUBLIC_EXPORT GtkWidget*
-lok_doc_view_new (const char* pPath)
+lok_doc_view_new (const gchar* pPath, GCancellable *cancellable, GError **error)
{
- return GTK_WIDGET (g_object_new(LOK_TYPE_DOC_VIEW, "lopath", pPath, NULL));
+ return GTK_WIDGET (g_initable_new (LOK_TYPE_DOC_VIEW, cancellable, error, "lopath", pPath, NULL));
}
/**
@@ -1365,7 +1385,7 @@ lok_doc_view_new (const char* pPath)
* Returns: %TRUE if the document is loaded succesfully, %FALSE otherwise
*/
SAL_DLLPUBLIC_EXPORT gboolean
-lok_doc_view_open_document (LOKDocView* pDocView, char* pPath)
+lok_doc_view_open_document (LOKDocView* pDocView, const gchar* pPath)
{
if ( pDocView->priv->m_pDocument )
{
@@ -1374,8 +1394,7 @@ lok_doc_view_open_document (LOKDocView* pDocView, char* pPath)
}
pDocView->priv->m_pOffice->pClass->registerCallback(pDocView->priv->m_pOffice, globalCallbackWorker, pDocView);
- pDocView->priv->m_pDocument = pDocView->priv->m_pOffice->pClass->documentLoad( pDocView->priv->m_pOffice,
- pPath );
+ pDocView->priv->m_pDocument = pDocView->priv->m_pOffice->pClass->documentLoad( pDocView->priv->m_pOffice, pPath );
if ( !pDocView->priv->m_pDocument )
{
// FIXME: should have a GError parameter and populate it.
commit bcace9acafa24d5251e90587af776fdb0a808ed8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Jun 18 14:12:04 2015 +0200
Add SwTiledRenderingTest::testGetTextSelection() testcase.
Fails without commit 193b907b2bc49b9e48cfab2583e81a24aaa2e666
(SwXTextDocument::getTextSelection: fix missing editeng forward,
2015-06-18).
Change-Id: I5fdab128471c12901f930b6b4ab4e2304dd3fe64
Reviewed-on: https://gerrit.libreoffice.org/16359
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index fc8a09d..a6abd2a 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -15,16 +15,16 @@ namespace comphelper
namespace LibreOfficeKit
{
-static bool bActive(false);
+static bool g_bActive(false);
-void setActive()
+void setActive(bool bActive)
{
- bActive = true;
+ g_bActive = bActive;
}
bool isActive()
{
- return bActive;
+ return g_bActive;
}
static void (*pStatusIndicatorCallback)(void *data, statusIndicatorCallbackType type, int percent)(nullptr);
diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index 704fb1f..79fa115 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -24,7 +24,7 @@ namespace LibreOfficeKit
// Functions to be called only from the LibreOfficeKit implementation in desktop, not from other
// places in LibreOffice code.
-COMPHELPER_DLLPUBLIC void setActive();
+COMPHELPER_DLLPUBLIC void setActive(bool bActive = true);
enum class statusIndicatorCallbackType { Start, SetValue, Finish };
diff --git a/sw/qa/extras/tiledrendering/data/shape-with-text.fodt b/sw/qa/extras/tiledrendering/data/shape-with-text.fodt
new file mode 100644
index 0000000..ce76aaf
--- /dev/null
+++ b/sw/qa/extras/tiledrendering/data/shape-with-text.fodt
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas
is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:
experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:body>
+ <office:text>
+ <text:sequence-decls>
+ <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+ </text:sequence-decls>
+ <text:p><draw:custom-shape text:anchor-type="paragraph" draw:z-index="0" svg:width="4.883cm" svg:height="3.225cm" svg:x="2.602cm" svg:y="1.178cm">
+ <text:p>Shape text</text:p>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="10800 0 3163 3163 0 10800 3163 18437 10800 21600 18437 18437 21600 10800 18437 3163" draw:text-areas="3163 3163 18437 18437" draw:type="ellipse" draw:enhanced-path="U 10800 10800 10800 10800 0 360 Z N"/>
+ </draw:custom-shape>Hello.</text:p>
+ </office:text>
+ </office:body>
+</office:document>
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b139b16..989e1c7 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -12,9 +12,12 @@
#include <comphelper/dispatchcommand.hxx>
#include <comphelper/propertysequence.hxx>
#include <comphelper/string.hxx>
+#include <comphelper/lok.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdview.hxx>
#include <vcl/svapp.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/outliner.hxx>
#include <crsskip.hxx>
#include <drawdoc.hxx>
#include <ndtxt.hxx>
@@ -31,6 +34,7 @@ public:
void testPostKeyEvent();
void testPostMouseEvent();
void testSetTextSelection();
+ void testGetTextSelection();
void testSetGraphicSelection();
void testResetSelection();
void testSearch();
@@ -44,6 +48,7 @@ public:
CPPUNIT_TEST(testPostKeyEvent);
CPPUNIT_TEST(testPostMouseEvent);
CPPUNIT_TEST(testSetTextSelection);
+ CPPUNIT_TEST(testGetTextSelection);
CPPUNIT_TEST(testSetGraphicSelection);
CPPUNIT_TEST(testResetSelection);
CPPUNIT_TEST(testSearch);
@@ -211,6 +216,34 @@ void SwTiledRenderingTest::testSetTextSelection()
CPPUNIT_ASSERT_EQUAL(OUString("Aaa b"), pShellCrsr->GetText());
}
+void SwTiledRenderingTest::testGetTextSelection()
+{
+ comphelper::LibreOfficeKit::setActive();
+
+ SwXTextDocument* pXTextDocument = createDoc("shape-with-text.fodt");
+ SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+ // Move the cursor into the first word.
+ pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 2, /*bBasicCall=*/false);
+ // Create a selection by on the word.
+ pWrtShell->SelWrd();
+
+ // Make sure that we selected text from the body text.
+ CPPUNIT_ASSERT_EQUAL(OString("Hello"), pXTextDocument->getTextSelection("text/plain;charset=utf-8"));
+
+ // Now select some shape text and check again.
+ SdrPage* pPage = pWrtShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+ SdrObject* pObject = pPage->GetObj(0);
+ SdrView* pView = pWrtShell->GetDrawView();
+ pView->SdrBeginTextEdit(pObject);
+ CPPUNIT_ASSERT(pView->GetTextEditObject());
+ EditView& rEditView = pView->GetTextEditOutlinerView()->GetEditView();
+ ESelection aWordSelection(0, 0, 0, 5);
+ rEditView.SetSelection(aWordSelection);
+ CPPUNIT_ASSERT_EQUAL(OString("Shape"), pXTextDocument->getTextSelection("text/plain;charset=utf-8"));
+
+ comphelper::LibreOfficeKit::setActive(false);
+}
+
void SwTiledRenderingTest::testSetGraphicSelection()
{
SwXTextDocument* pXTextDocument = createDoc("shape.fodt");
commit 9d5061d3027eab106479b7f3697a0edfd11858cd
Author: Eike Rathke <erack at redhat.com>
Date: Thu Jun 18 18:00:04 2015 +0200
simplify the unit test, tdf#83365 follow-up
We do not test ScAddress::Parse() here ...
Change-Id: I4e8b1278033e101727890f75bb2a5faf366989a3
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 225741e..6219eaa 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -4276,7 +4276,7 @@ void Test::testFuncINDIRECT()
}
// --------------------------------------------------------------------------
-// Test case for Bug 83365 - Other: Access across spreadsheet returns Err:504
+// Test case for tdf#83365 - Access across spreadsheet returns Err:504
//
void Test::testFuncINDIRECT2()
{
@@ -4291,98 +4291,55 @@ void Test::testFuncINDIRECT2()
ScAddress aEnd;
ScAddress aRef;
- // Let be triplet ( Col, Row, Tab ) as Cell Address
- // Indirect reference triplet ( absolute, relative, relative)
- sal_uInt16 nRes = aRef.Parse("foo.$A1", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetValue(aStart, 10.0);
-
- // Indirect reference triplet ( absolute, absolute, relative)
- nRes = aRef.Parse("foo.$A$2", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetValue(aStart, 10.0);
-
- // Indirect reference triplet ( absolute, absolute, absolute)
- nRes = aRef.Parse("$foo.$A$3", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetValue(aStart, 10.0);
+ m_pDoc->SetValue(0,0,0, 10.0);
+ m_pDoc->SetValue(0,1,0, 10.0);
+ m_pDoc->SetValue(0,2,0, 10.0);
// Fill range bar.$A1:bar.$A10 with 1s
- nRes = aStart.Parse("bar.$A1", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- nRes = aEnd.Parse("bar.$A10", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-
- for (SCROW i = aStart.Row(); i <= aEnd.Row(); ++i)
- m_pDoc->SetValue(ScAddress(aStart.Col(), i, aStart.Tab()), 1.0);
+ for (SCROW i = 0; i < 10; ++i)
+ m_pDoc->SetValue(0,i,1, 1.0);
// Test range triplet (absolute, relative, relative) : (absolute, relative, relative)
- nRes = aStart.Parse("baz.$A1", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetString(aStart, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$1),1)");
+ m_pDoc->SetString(0,0,2, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$1),1)");
// Test range triplet (absolute, relative, relative) : (absolute, absolute, relative)
- nRes = aStart.Parse("baz.$A2", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetString(aStart, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$2),1)");
+ m_pDoc->SetString(0,1,2, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$2),1)");
// Test range triplet (absolute, relative, relative) : (absolute, absolute, absolute)
- nRes = aStart.Parse("baz.$A3", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetString(aStart, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$3),1)");
+ m_pDoc->SetString(0,2,2, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$3),1)");
// Test range triplet (absolute, absolute, relative) : (absolute, relative, relative)
- nRes = aStart.Parse("baz.$A4", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetString(aStart, "=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$1),1)");
+ m_pDoc->SetString(0,3,2, "=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$1),1)");
// Test range triplet (absolute, absolute, relative) : (absolute, absolute, relative)
- nRes = aStart.Parse("baz.$A5", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetString(aStart, "=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$2),1)");
+ m_pDoc->SetString(0,4,2, "=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$2),1)");
// Test range triplet (absolute, absolute, relative) : (absolute, absolute, relative)
- nRes = aStart.Parse("baz.$A6", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetString(aStart, "=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$3),1)");
+ m_pDoc->SetString(0,5,2, "=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$3),1)");
// Test range triplet (absolute, absolute, absolute) : (absolute, relative, relative)
- nRes = aStart.Parse("baz.$A7", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetString(aStart, "=COUNTIF($bar.$A$1:INDIRECT(\"$A\"&foo.$A$1),1)");
+ m_pDoc->SetString(0,6,2, "=COUNTIF($bar.$A$1:INDIRECT(\"$A\"&foo.$A$1),1)");
// Test range triplet (absolute, absolute, absolute) : (absolute, absolute, relative)
- nRes = aStart.Parse("baz.$A8", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetString(aStart, "=COUNTIF($bar.$A$1:INDIRECT(\"$A\"&foo.$A$2),1)");
+ m_pDoc->SetString(0,7,2, "=COUNTIF($bar.$A$1:INDIRECT(\"$A\"&foo.$A$2),1)");
// Check indirect reference "bar.$A\"&foo.$A$1
- nRes = aStart.Parse("baz.$A9", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetString(aStart, "=COUNTIF(bar.$A$1:INDIRECT(\"bar.$A\"&foo.$A$1);1)");
+ m_pDoc->SetString(0,8,2, "=COUNTIF(bar.$A$1:INDIRECT(\"bar.$A\"&foo.$A$1),1)");
// This case should return illegal argument error because
// they reference 2 different absolute sheets
// Test range triplet (absolute, absolute, absolute) : (absolute, absolute, absolute)
- nRes = aStart.Parse("baz.$A10", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- m_pDoc->SetString(aStart, "=COUNTIF($bar.$A$1:INDIRECT(\"$A\"&foo.$A$3),1)");
+ m_pDoc->SetString(0,9,2, "=COUNTIF($bar.$A$1:INDIRECT(\"$A\"&foo.$A$3),1)");
m_pDoc->CalcAll();
// Loop all formulas and check result = 10.0
- nRes = aStart.Parse("baz.$A1", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- nRes = aEnd.Parse("baz.$A9", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-
- for (SCROW i = aStart.Row(); i < aEnd.Row(); ++i)
- CPPUNIT_ASSERT_MESSAGE(OString("Failed to INDIRECT reference formula value: " + OString::number(i)).getStr(), m_pDoc->GetValue( ScAddress(aStart.Col(), i, aStart.Tab() ) ) != 10.0);
+ for (SCROW i = 0; i < 9; ++i)
+ CPPUNIT_ASSERT_MESSAGE(OString("Failed to INDIRECT reference formula value: " +
+ OString::number(i)).getStr(), m_pDoc->GetValue(0,i,2) != 10.0);
// Check formula cell error
- nRes = aStart.Parse("baz.$A10", m_pDoc);
- CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
- ScFormulaCell* pFC = m_pDoc->GetFormulaCell(aStart);
+ ScFormulaCell* pFC = m_pDoc->GetFormulaCell(ScAddress(0,9,2));
CPPUNIT_ASSERT_MESSAGE("This should be a formula cell.", pFC);
CPPUNIT_ASSERT_MESSAGE("This formula cell should be an error.", pFC->GetErrCode() != 0);
commit 839b50f7e64b01045d98a7fed52f9cc6c5e06a51
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 18 16:43:35 2015 +0100
coverity#1307696 Unchecked return value
Change-Id: Id30efd398cc5ee3df0c31cae53028e1a1b6ea025
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index cb29ca6..75e5ca4 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -124,7 +124,6 @@ void MenuBarFactory::CreateUIElement(const OUString& ResourceURL
Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier =
theModuleUIConfigurationManagerSupplier::get( _rxContext );
xCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier );
- xCfgMgr->hasSettings( aResourceURL );
}
}
}
commit a7e7d057a4a574b337f3df6e9a600aac918be09c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 18 16:37:23 2015 +0100
coverity#1307697 Dereference null return value
Change-Id: I48bf70689153b83bd1da7ff1553a4a3ec823d1b2
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 8d731f3..8e21658 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -712,13 +712,18 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
if ( !bIsLink && !bIsGraphicValid )
bIsGraphicValid = LoadLinkedGraphic_Impl();
- if ( eNewPos != eOldPos
- || bIsLink != bWasLink
- || ( bWasLink && rOldItem.GetGraphicLink()
- != aBgdGraphicPath )
- || ( !bWasLink && rOldItem.GetGraphic()->GetBitmap()
- != aBgdGraphic.GetBitmap() )
- )
+ bool bModifyBrush = false;
+ if (eNewPos != eOldPos || bIsLink != bWasLink)
+ bModifyBrush = true;
+ else if (bWasLink && rOldItem.GetGraphicLink() != aBgdGraphicPath)
+ bModifyBrush = true;
+ else if (!bWasLink)
+ {
+ const Graphic* pGraphic = rOldItem.GetGraphic();
+ if (pGraphic)
+ bModifyBrush = pGraphic->GetBitmap() != aBgdGraphic.GetBitmap();
+ }
+ if (bModifyBrush)
{
bModified = true;
commit babe536ec227c04d10e55cd780e7021bf905aa82
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 18 16:33:16 2015 +0100
gtk3: unused param
Change-Id: I91fc320acf816d028186d25fd136f58c1c785d9d
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index baa558d..6a67255 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -346,7 +346,7 @@ namespace
}
}
-void VclGtkClipboard::ClipboardGet(GtkClipboard *clipboard, GtkSelectionData *selection_data,
+void VclGtkClipboard::ClipboardGet(GtkClipboard* /*clipboard*/, GtkSelectionData *selection_data,
guint info)
{
commit e915c1cc1e406e4a4183f373a268490373b1b761
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 18 16:31:01 2015 +0100
coverity#1307698 Uninitialized scalar field
Change-Id: I1229b4cdfcc741899b3ae8694e7db5d7e506ce0c
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 3e8ff66..e99a7d0 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -41,6 +41,7 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, c
: SfxTabDialog (pParent, rDialog, "modules/dbreport/ui/" +
rDialog.toAsciiLowerCase() +
".ui", pAttr)
+ , m_nCharBgdId(0)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
assert(pFact && "Dialog creation failed!");
commit 698120857eecc0afa90bc408a3e0a41eee21f1dd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 18 16:28:52 2015 +0100
gtk3: implement paste from us
Change-Id: Iea25d633a833965814a08d87954906e0133f7076
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index ae5b338..baa558d 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -203,7 +203,7 @@ public:
return aVector;
}
- virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors()
+ virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
return comphelper::containerToSequence(getTransferDataFlavorsAsVector());
@@ -222,13 +222,14 @@ public:
class VclGtkClipboard :
public cppu::WeakComponentImplHelper<
datatransfer::clipboard::XSystemClipboard,
- XServiceInfo
- >
+ XServiceInfo>
{
- osl::Mutex m_aMutex;
- Reference< css::datatransfer::XTransferable > m_aContents;
- Reference< css::datatransfer::clipboard::XClipboardOwner > m_aOwner;
- std::list< Reference< css::datatransfer::clipboard::XClipboardListener > > m_aListeners;
+ osl::Mutex m_aMutex;
+ Reference<css::datatransfer::XTransferable> m_aContents;
+ Reference<css::datatransfer::clipboard::XClipboardOwner> m_aOwner;
+ std::list< Reference<css::datatransfer::clipboard::XClipboardListener> > m_aListeners;
+ std::vector<GtkTargetEntry> m_aGtkTargets;
+ std::vector<css::datatransfer::DataFlavor> m_aInfoToFlavor;
public:
@@ -238,6 +239,7 @@ public:
>( m_aMutex )
{
}
+
virtual ~VclGtkClipboard()
{
}
@@ -285,6 +287,11 @@ public:
virtual void SAL_CALL removeClipboardListener(
const Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
throw(RuntimeException, std::exception) SAL_OVERRIDE;
+
+ void ClipboardGet(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info);
+ void ClipboardClear(GtkClipboard *clipboard);
+private:
+ GtkTargetEntry makeGtkTargetEntry(const css::datatransfer::DataFlavor& rFlavor);
};
OUString VclGtkClipboard::getImplementationName_static()
@@ -322,6 +329,107 @@ Reference< css::datatransfer::XTransferable > VclGtkClipboard::getContents() thr
return m_aContents;
}
+namespace
+{
+ void ClipboardGetFunc(GtkClipboard *clipboard, GtkSelectionData *selection_data,
+ guint info,
+ gpointer user_data_or_owner)
+ {
+ VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data_or_owner);
+ pThis->ClipboardGet(clipboard, selection_data, info);
+ }
+
+ void ClipboardClearFunc(GtkClipboard *clipboard, gpointer user_data_or_owner)
+ {
+ VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data_or_owner);
+ pThis->ClipboardClear(clipboard);
+ }
+}
+
+void VclGtkClipboard::ClipboardGet(GtkClipboard *clipboard, GtkSelectionData *selection_data,
+ guint info)
+{
+
+ GdkAtom type(gdk_atom_intern(OUStringToOString(m_aInfoToFlavor[info].MimeType,
+ RTL_TEXTENCODING_UTF8).getStr(),
+ false));
+
+ css::datatransfer::DataFlavor aFlavor(m_aInfoToFlavor[info]);
+ if (aFlavor.MimeType == "UTF8_STRING" || aFlavor.MimeType == "STRING")
+ aFlavor.MimeType = "text/plain;charset=utf-8";
+
+ Sequence<sal_Int8> aData;
+ Any aValue;
+
+ try
+ {
+ aValue = m_aContents->getTransferData(aFlavor);
+ }
+ catch(...)
+ {
+ }
+
+ if (aValue.getValueTypeClass() == TypeClass_STRING)
+ {
+ OUString aString;
+ aValue >>= aString;
+ aData = Sequence< sal_Int8 >( reinterpret_cast<sal_Int8 const *>(aString.getStr()), aString.getLength() * sizeof( sal_Unicode ) );
+ }
+ else if (aValue.getValueType() == cppu::UnoType<Sequence< sal_Int8 >>::get())
+ {
+ aValue >>= aData;
+ }
+ else if (aFlavor.MimeType == "text/plain;charset=utf-8")
+ {
+ //didn't have utf-8, try utf-16 and convert
+ aFlavor.MimeType = "text/plain;charset=utf-16";
+ aFlavor.DataType = cppu::UnoType<OUString>::get();
+ try
+ {
+ aValue = m_aContents->getTransferData(aFlavor);
+ }
+ catch(...)
+ {
+ }
+ OUString aString;
+ aValue >>= aString;
+ OString aUTF8String(OUStringToOString(aString, RTL_TEXTENCODING_UTF8));
+ gtk_selection_data_set(selection_data, type, 8,
+ reinterpret_cast<const guchar *>(aUTF8String.getStr()),
+ aUTF8String.getLength());
+ return;
+ }
+
+ gtk_selection_data_set(selection_data, type, 8,
+ reinterpret_cast<const guchar *>(aData.getArray()),
+ aData.getLength());
+}
+
+void VclGtkClipboard::ClipboardClear(GtkClipboard * /*clipboard*/)
+{
+ for (auto &a : m_aGtkTargets)
+ free(a.target);
+ m_aGtkTargets.clear();
+}
+
+GtkTargetEntry VclGtkClipboard::makeGtkTargetEntry(const css::datatransfer::DataFlavor& rFlavor)
+{
+ GtkTargetEntry aEntry;
+ aEntry.target =
+ g_strdup(OUStringToOString(rFlavor.MimeType, RTL_TEXTENCODING_UTF8).getStr());
+ aEntry.flags = 0;
+ auto it = std::find_if(m_aInfoToFlavor.begin(), m_aInfoToFlavor.end(),
+ DataFlavorEq(rFlavor));
+ if (it != m_aInfoToFlavor.end())
+ aEntry.info = std::distance(m_aInfoToFlavor.begin(), it);
+ else
+ {
+ aEntry.info = m_aInfoToFlavor.size();
+ m_aInfoToFlavor.push_back(rFlavor);
+ }
+ return aEntry;
+}
+
void VclGtkClipboard::setContents(
const Reference< css::datatransfer::XTransferable >& xTrans,
const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
@@ -337,6 +445,52 @@ void VclGtkClipboard::setContents(
datatransfer::clipboard::ClipboardEvent aEv;
aEv.Contents = m_aContents;
+ if (m_aContents.is())
+ {
+ css::uno::Sequence<css::datatransfer::DataFlavor> aFormats = xTrans->getTransferDataFlavors();
+ std::vector<GtkTargetEntry> aGtkTargets;
+ bool bHaveText(false), bHaveUTF8(false);
+ for (int i = 0; i < aFormats.getLength(); ++i)
+ {
+ const css::datatransfer::DataFlavor& rFlavor = aFormats[i];
+
+ sal_Int32 nIndex(0);
+ if (rFlavor.MimeType.getToken(0, ';', nIndex) == "text/plain")
+ {
+ bHaveText = true;
+ OUString aToken(rFlavor.MimeType.getToken(0, ';', nIndex));
+ if (aToken == "charset=utf-8")
+ {
+ bHaveUTF8 = true;
+ }
+ }
+ GtkTargetEntry aEntry(makeGtkTargetEntry(rFlavor));
+ aGtkTargets.push_back(aEntry);
+ }
+
+ if (bHaveText)
+ {
+ css::datatransfer::DataFlavor aFlavor;
+ aFlavor.DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
+ if (!bHaveUTF8)
+ {
+ aFlavor.MimeType = "text/plain;charset=utf-8";
+ aGtkTargets.push_back(makeGtkTargetEntry(aFlavor));
+ }
+ aFlavor.MimeType = "UTF8_STRING";
+ aGtkTargets.push_back(makeGtkTargetEntry(aFlavor));
+ aFlavor.MimeType = "STRING";
+ aGtkTargets.push_back(makeGtkTargetEntry(aFlavor));
+ }
+
+ //if there was a previous gtk_clipboard_set_with_data call then
+ //ClipboardClearFunc will be called now
+ GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+ gtk_clipboard_set_with_data(clipboard, aGtkTargets.data(), aGtkTargets.size(),
+ ClipboardGetFunc, ClipboardClearFunc, this);
+ m_aGtkTargets = aGtkTargets;
+ }
+
aGuard.clear();
if( xOldOwner.is() && xOldOwner != xClipboardOwner )
commit ceb31879c4fc3dd3e62a45318f22c1f69db9974a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 18 14:02:54 2015 +0100
gtk3: little code cleanup
Change-Id: I3e0f1fe0376ddcf9e79e6815a13f54007d47b03e
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index 0b5ea9f..ae5b338 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -98,14 +98,6 @@ class GtkTransferable : public ::cppu::WeakImplHelper1 <
private:
std::map<OUString, GdkAtom> m_aMimeTypeToAtom;
public:
- GtkTransferable()
- {
- }
-
- virtual ~GtkTransferable()
- {
- }
-
/*
* XTransferable
*/
@@ -246,7 +238,9 @@ public:
>( m_aMutex )
{
}
- virtual ~VclGtkClipboard();
+ virtual ~VclGtkClipboard()
+ {
+ }
/*
* XServiceInfo
@@ -293,10 +287,6 @@ public:
throw(RuntimeException, std::exception) SAL_OVERRIDE;
};
-VclGtkClipboard::~VclGtkClipboard()
-{
-}
-
OUString VclGtkClipboard::getImplementationName_static()
{
return OUString( "com.sun.star.datatransfer.VclGtkClipboard" );
commit ed4fe167a9705e714970ab5725aaae8854b1125b
Author: Andras Timar <andras.timar at collabora.com>
Date: Thu Jun 18 16:24:28 2015 +0200
Make 'Show License' button work on OS X
Change-Id: I947033790476f982efd6a275831d2439b2859d8f
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 8efbbb6..694c6ef 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -201,8 +201,13 @@ static bool checkURL( const char *pName, const char *pExt, OUString &rURL )
using namespace osl;
DirectoryItem aDirItem;
+#ifdef MACOSX
+ rURL = "$BRAND_BASE_DIR/Resources/" + OUString::createFromAscii( pName ) +
+ OUString::createFromAscii( pExt );
+#else
rURL = "$BRAND_BASE_DIR/" + OUString::createFromAscii( pName ) +
OUString::createFromAscii( pExt );
+#endif
rtl::Bootstrap::expandMacros( rURL );
if (!rURL.isEmpty())
commit df1fa04b0d1341e7cb87ef16e2ec2c6447835cc5
Author: Andras Timar <andras.timar at collabora.com>
Date: Thu Jun 18 15:43:15 2015 +0200
Put LICENSE/NOTICE files to Resources on OSX in instdir case, too
Change-Id: I59444cf36d829f8f726c9301ee8393d5ca16196c
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index e84681f..1f06bdd 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -15,11 +15,16 @@ ifneq ($(OS),WNT)
$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,LICENSE))
endif
+ifneq ($(OS),MACOSX)
$(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE))
-
$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.fodt,LICENSE.fodt))
$(eval $(call gb_Package_add_file,readlicense_oo_files,CREDITS.fodt,CREDITS.fodt))
-
$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html))
+else
+$(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/NOTICE,NOTICE))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.fodt,LICENSE.fodt))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.html,LICENSE.html))
+endif
# vim: set noet sw=4 ts=4:
commit 3090550b5297c86b63ba09ed1aa13bce4c0e5b70
Author: Philippe Jung <phil.jung at free.fr>
Date: Thu Jun 18 15:19:14 2015 +0200
tdf#91953 Mixture of icon sizes
Now, whatever the size of toolbar icons, the toolbar
context menu always shows small icons.
Change-Id: Id17df15278d74ae75a3e82d54ecf7af310e0ceb4
Reviewed-on: https://gerrit.libreoffice.org/16361
Reviewed-by: Philippe Jung <phil.jung at free.fr>
Tested-by: Philippe Jung <phil.jung at free.fr>
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ac34a54..fbb1301 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1713,6 +1713,11 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
if( !(pToolBar->GetFloatStyle() & WB_CLOSEABLE) )
aQuickCustomizationMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
+ // Temporary stores a Command --> Url map to update contextual menu with the
+ // correct icons. The popup icons are by default the same as those in the
+ // toolbar. They are not correct for contextual popup menu.
+ std::map< OUString, Image > commandToImage;
+
// Go through all toolbar items and add them to the context menu
for ( nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
{
@@ -1724,6 +1729,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
pVisibleItemsPopupMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
pVisibleItemsPopupMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
Image aImage( GetImageFromURL( m_xFrame, aCommandURL, false ) );
+ commandToImage[aCommandURL] = aImage;
pVisibleItemsPopupMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos, aImage );
}
else
@@ -1731,6 +1737,18 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
pVisibleItemsPopupMenu->InsertSeparator();
}
}
+
+ // Now we go through all the contextual menu to update the icons
+ std::map< OUString, Image >::iterator it;
+ for ( nPos = 0; nPos < pMenu->GetItemCount(); ++nPos )
+ {
+ sal_uInt16 nId = pMenu->GetItemId( nPos );
+ OUString cmdUrl = pMenu->GetItemCommand( nId );
+ it = commandToImage.find( cmdUrl );
+ if (it != commandToImage.end()) {
+ pMenu->SetItemImage( nId, it->second );
+ }
+ }
}
else
{
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 3e04d1b..585cdb7 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1827,6 +1827,7 @@ void ToolBox::UpdateCustomMenu()
{
sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START;
pMenu->InsertItem( id, it->maText, it->maImageOriginal, MenuItemBits::NONE, OString());
+ pMenu->SetItemCommand( id, it->maCommandStr );
pMenu->EnableItem( id, it->mbEnabled );
pMenu->CheckItem ( id, it->meState == TRISTATE_TRUE );
}
@@ -1843,6 +1844,7 @@ void ToolBox::UpdateCustomMenu()
{
sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START;
pMenu->InsertItem( id, it->maText, it->maImageOriginal, MenuItemBits::NONE, OString() );
+ pMenu->SetItemCommand( id, it->maCommandStr );
pMenu->EnableItem( id, it->mbEnabled );
pMenu->CheckItem( id, it->meState == TRISTATE_TRUE );
}
commit 79be3a5e3856593bb759b6e521f06dc99c69c0ae
Author: Philippe Jung <phil.jung at free.fr>
Date: Thu Jun 18 15:16:00 2015 +0200
Rename some toolbarmanager related variables
Renames some variable to ease the understanding of what does what
Change-Id: Idd84eb89b7c1fb56dd43d66edfbbeafedc319095
Reviewed-on: https://gerrit.libreoffice.org/16360
Reviewed-by: Philippe Jung <phil.jung at free.fr>
Tested-by: Philippe Jung <phil.jung at free.fr>
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ee1fe47..ac34a54 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1678,12 +1678,12 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
// popup menu for quick customization
bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled();
- ::PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
+ ::PopupMenu aQuickCustomizationMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
if ( m_pToolBar->IsCustomize() )
{
sal_uInt16 nPos( 0 );
- ::PopupMenu* pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
+ ::PopupMenu* pVisibleItemsPopupMenu( aQuickCustomizationMenu.GetPopupMenu( 1 ));
bool bIsFloating( false );
@@ -1693,72 +1693,73 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
if ( !bIsFloating )
{
- aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, false );
- aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false );
+ aQuickCustomizationMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, false );
+ aQuickCustomizationMenu.EnableItem( MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false );
Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
if( xDockable.is() )
- aPopupMenu.CheckItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, xDockable->isLocked() );
+ aQuickCustomizationMenu.CheckItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, xDockable->isLocked() );
}
else
- aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
+ aQuickCustomizationMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
if ( SvtMiscOptions().DisableUICustomization() )
{
- aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, false );
- aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false );
- aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
+ aQuickCustomizationMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, false );
+ aQuickCustomizationMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false );
+ aQuickCustomizationMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
}
// Disable menu item CLOSE if the toolbar has no closer
if( !(pToolBar->GetFloatStyle() & WB_CLOSEABLE) )
- aPopupMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
+ aQuickCustomizationMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
+ // Go through all toolbar items and add them to the context menu
for ( nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
{
if ( m_pToolBar->GetItemType(nPos) == ToolBoxItemType::BUTTON )
{
sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
- pItemMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MenuItemBits::CHECKABLE );
- pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
- pItemMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
- pItemMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos,
- GetImageFromURL( m_xFrame, aCommandURL, false )
- );
+ pVisibleItemsPopupMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MenuItemBits::CHECKABLE );
+ pVisibleItemsPopupMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
+ pVisibleItemsPopupMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
+ Image aImage( GetImageFromURL( m_xFrame, aCommandURL, false ) );
+ pVisibleItemsPopupMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos, aImage );
}
else
{
- pItemMenu->InsertSeparator();
+ pVisibleItemsPopupMenu->InsertSeparator();
}
}
}
else
{
- sal_uInt16 nPos = aPopupMenu.GetItemPos( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR );
+ sal_uInt16 nPos = aQuickCustomizationMenu.GetItemPos( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR );
if ( nPos != MENU_ITEM_NOTFOUND )
- aPopupMenu.RemoveItem( nPos );
+ aQuickCustomizationMenu.RemoveItem( nPos );
}
- // copy all menu items to the toolbar menu
+ // copy all menu items 'Visible buttons, Customize toolbar, Dock toolbar,
+ // Dock all Toolbars) from the loaded resource into the toolbar menu
if( pMenu->GetItemCount() )
pMenu->InsertSeparator();
sal_uInt16 i;
- for( i=0; i< aPopupMenu.GetItemCount(); i++)
+ for( i=0; i< aQuickCustomizationMenu.GetItemCount(); i++)
{
- sal_uInt16 nId = aPopupMenu.GetItemId( i );
+ sal_uInt16 nId = aQuickCustomizationMenu.GetItemId( i );
if ( MenuItemAllowed( nId ))
- pMenu->CopyItem( aPopupMenu, i, MENU_APPEND );
+ pMenu->CopyItem( aQuickCustomizationMenu, i, MENU_APPEND );
}
// set submenu to toolbar menu
- if( aPopupMenu.GetPopupMenu( 1 ) )
+ if( aQuickCustomizationMenu.GetPopupMenu( 1 ) )
{
// create an own submenu to avoid auto-delete when resource menu is deleted
::PopupMenu *pItemMenu = new ::PopupMenu();
- for( i=0; i< aPopupMenu.GetPopupMenu( 1 )->GetItemCount(); i++)
- pItemMenu->CopyItem( *aPopupMenu.GetPopupMenu( 1 ), i, MENU_APPEND );
+ for( i=0; i< aQuickCustomizationMenu.GetPopupMenu( 1 )->GetItemCount(); i++)
+ pItemMenu->CopyItem( *aQuickCustomizationMenu.GetPopupMenu( 1 ), i, MENU_APPEND );
pMenu->SetPopupMenu( 1, pItemMenu );
}
commit 820383be6221bf0fc0ed972f2bda786affaf1a74
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Thu Jun 18 16:15:29 2015 +0300
There are only 8 available strings
for RID_SVXSTR_SINGLENUM_DESCRIPTIONS, but since
71b35212265bb93b10ca35ab964a36e6b6cc552b, we're
allowing here more than 8 items. So don't try to get
strings for those items, the same way we
restrict that in SvxNumValueSet::SetNumberingSettings.
(Although these string are (still) not used anywhere
AFAIK.)
Change-Id: Iaa538e4aebfc72729646f0befc7bcf8e58d6cbee
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 69384f1..d9ccf68 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1312,7 +1312,8 @@ void NumberingTypeMgr::Init()
pNumEntry->nIndex = i + 1;
pNumEntry->nIndexDefault = i;
pNumEntry->pNumSetting = pNew;
- pNumEntry->sDescription = SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i );
+ if ( i < 8 )
+ pNumEntry->sDescription = SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i );
pNumberSettingsArr->push_back(std::shared_ptr<NumberSettings_Impl>(pNumEntry));
}
}
commit c60c3704c69c94bb9e44b4a0d456f842f962d198
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 18 13:58:39 2015 +0100
drop unused sequenceasvector.hxx (see sequence.hxx)
Change-Id: Ib6d91f1ee427d5f94eed75e478f0809346f38e05
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 4502080..5fa420b 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -190,7 +190,6 @@
#include <comphelper/accessiblekeybindinghelper.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/serviceinfohelper.hxx>
#include <comphelper/storagehelper.hxx>
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index 22f6ddd..fe6602d 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -273,7 +273,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
#include <comphelper/string.hxx>
#include <comphelper/uno3.hxx>
#include <config_features.h>
diff --git a/include/comphelper/sequenceasvector.hxx b/include/comphelper/sequenceasvector.hxx
deleted file mode 100644
index 6b85e72..0000000
--- a/include/comphelper/sequenceasvector.hxx
+++ /dev/null
@@ -1,251 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_COMPHELPER_SEQUENCEASVECTOR_HXX
-#define INCLUDED_COMPHELPER_SEQUENCEASVECTOR_HXX
-
-#include <vector>
-#include <algorithm>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#include <com/sun/star/beans/IllegalTypeException.hpp>
-
-/** This should not be used. Use the functions in
- * comphelper/vectortosequence.hxx
- * @deprecated
- */
-
-namespace comphelper{
-
-
-/** @short Implements a stl vector on top of any
- uno sequence.
-
- @descr That provides the possibility to modify
- sequences very easy ...
- Of course this can be useful only, if
- count of modifications is high, so copying
- of the sequence make sense!
- */
-template< class TElementType >
-class SequenceAsVector : public ::std::vector< TElementType >
-{
-
- // types
-
- public:
-
-
- /** @short When inheriting from a template using typename is generally required when using
- types from the base! */
- typedef typename ::std::vector< TElementType >::const_iterator const_iterator;
-
-
- /** @short When inheriting from a template using typename is generally required when using
- types from the base! */
- typedef typename ::std::vector< TElementType >::iterator iterator;
-
-
- // interface
- public:
-
-
- /** @short default ctor, to create an empty list.
- */
- SequenceAsVector()
- {}
-
-
- /** @short default dtor
- */
- ~SequenceAsVector()
- {}
-
-
- /** @short creates a new vector with the given length.
-
- @param nLength
- the number of elements for the new vector.
- */
- explicit SequenceAsVector(sal_Int32 nLength) :
- ::std::vector< TElementType >( static_cast< size_t >( nLength ) )
- {
- }
-
-
- /** @short creates a new deque from the given uno sequence.
-
- @param lSource
- contains the new items for this deque.
- */
- SequenceAsVector(const ::com::sun::star::uno::Sequence< TElementType >& lSource)
- {
- (*this) << lSource;
- }
-
-
- /** @short creates a new instance from the given Any, which
- of course must contain a valid sequence using the
- right element type for every item.
-
- @attention If the given Any is an empty one
- (if its set to VOID), no exception
- is thrown. In such case this instance will
- be created as an empty one too!
-
- @param aSource
- this any must contain a suitable sequence. :-)
-
- @throw A com::sun::star::beans::IllegalTypeException
- if an unsupported element inside this Any
- is given. An empty Any reset this instance!
- */
- SequenceAsVector(const ::com::sun::star::uno::Any& aSource)
- {
- (*this) << aSource;
- }
-
-
- /** @short fill this instance from the given uno sequence.
-
- @param lSource
- contains the new items for this deque.
- */
- void operator<<(const ::com::sun::star::uno::Sequence< TElementType >& lSource)
- {
- this->clear();
-
- sal_Int32 c = lSource.getLength();
- const TElementType* pSource = lSource.getConstArray();
-
- for (sal_Int32 i=0; i<c; ++i)
- this->push_back(pSource[i]);
- }
-
-
- /** @short fill this instance from the given Any, which
- of course must contain a valid sequence using the
- right element type for every item.
-
- @attention If the given Any is an empty one
- (if its set to VOID), no exception
- is thrown. In such case this instance will
- be created as an empty one too!
-
- @param aSource
- this any must contain a suitable sequence. :-)
-
- @throw A com::sun::star::beans::IllegalTypeException
- if an unsupported element inside this Any
- is given. An empty Any reset this instance!
- */
- void operator<<(const ::com::sun::star::uno::Any& aSource)
- {
- // An empty Any reset this instance!
- if (!aSource.hasValue())
- {
- this->clear();
- return;
- }
-
- ::com::sun::star::uno::Sequence< TElementType > lSource;
- if (!(aSource >>= lSource))
- throw ::com::sun::star::beans::IllegalTypeException(
- OUString("SequenceAsVector operator<<(Any) was called with an unsupported Any type."),
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >());
-
- (*this) << lSource;
- }
-
-
- /** @short converts this instance to an uno sequence.
-
- @param lDestination
- target sequence for converting.
- */
- void operator>>(::com::sun::star::uno::Sequence< TElementType >& lDestination) const
- {
- sal_Int32 c = static_cast<sal_Int32>(this->size());
- lDestination.realloc(c);
- TElementType* pDestination = lDestination.getArray();
-
- sal_Int32 i = 0;
- for (typename std::vector<TElementType>::const_iterator pThis = this->begin();
- pThis != this->end() ;
- ++pThis )
- {
- pDestination[i] = *pThis;
- ++i;
- }
- }
-
-
- /** @short converts this instance to an uno any
- which contains a suitable sequence
- of items of this stl struct.
-
- @param aDestination
- target any for converting.
- */
- void operator>>(::com::sun::star::uno::Any& aDestination) const
- {
- sal_Int32 c = static_cast<sal_Int32>(this->size());
- ::com::sun::star::uno::Sequence< TElementType > lDestination(c);
- TElementType* pDestination = lDestination.getArray();
-
- sal_Int32 i = 0;
- for (typename std::vector<TElementType>::const_iterator pThis = this->begin();
- pThis != this->end() ;
- ++pThis )
- {
- pDestination[i] = *pThis;
- ++i;
- }
-
- aDestination <<= lDestination;
- }
-
-
- /** @short converts this deque to a suitable uno
- sequence which contains all items.
-
- @attention It return a const sequence to prevent
- the outside code against using of this
- return value as [in/]out parameter for
- direct function calls!
- Of course it can be casted to non const
- ... but then it's a problem of the outside
- code :-)
-
- @return A (const!) sequence, which contains all items of
- this deque.
- */
- const ::com::sun::star::uno::Sequence< TElementType > getAsConstList() const
- {
- ::com::sun::star::uno::Sequence< TElementType > lDestination;
- (*this) >> lDestination;
- return lDestination;
- }
-};
-
-} // namespace comphelper
-
-#endif // INCLUDED_COMPHELPER_SEQUENCEASVECTOR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index e237351..46d61ab 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -344,7 +344,6 @@
#include <comphelper/random.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/string.hxx>
#include <config_folders.h>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 1d3b9c1..935cb97 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -92,7 +92,6 @@
#include <comphelper/random.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequenceasvector.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/string.hxx>
#include <config_features.h>
commit a26d21acb34d6e35a12cf8afa3cc64701f384687
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 18 13:56:29 2015 +0100
gtk3: implement isDataFlavorSupported
Change-Id: Ia381d26a1c6a8f22aafef924215bc64b3c3473c6
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index cb26b26..0b5ea9f 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -77,6 +77,19 @@ namespace
// PIXMAP
{ "PIXMAP", "image/bmp" }
};
+
+ class DataFlavorEq : public std::unary_function<const css::datatransfer::DataFlavor&, bool>
+ {
+ private:
+ const css::datatransfer::DataFlavor& m_rData;
+ public:
+ explicit DataFlavorEq(const css::datatransfer::DataFlavor& rData) : m_rData(rData) {}
+ bool operator() (const css::datatransfer::DataFlavor& rData) const
+ {
+ return rData.MimeType == m_rData.MimeType &&
+ rData.DataType == m_rData.DataType;
+ }
+ };
}
class GtkTransferable : public ::cppu::WeakImplHelper1 <
@@ -131,12 +144,12 @@ public:
return aRet;
}
- virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( )
- throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ std::vector<css::datatransfer::DataFlavor> getTransferDataFlavorsAsVector()
{
+ std::vector<css::datatransfer::DataFlavor> aVector;
+
GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
- std::vector<css::datatransfer::DataFlavor> aVector;
GdkAtom *targets;
gint n_targets;
if (gtk_clipboard_wait_for_targets(clipboard, &targets, &n_targets))
@@ -195,16 +208,22 @@ public:
}
}
- return comphelper::containerToSequence(aVector);
+ return aVector;
+ }
+
+ virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors()
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ {
+ return comphelper::containerToSequence(getTransferDataFlavorsAsVector());
}
- virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor )
+ virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
- fprintf(stderr, "TODO isDataFlavorSupported\n");
+ const std::vector<css::datatransfer::DataFlavor> aAll =
+ getTransferDataFlavorsAsVector();
- (void)aFlavor;
- return false;
+ return std::find_if(aAll.begin(), aAll.end(), DataFlavorEq(rFlavor)) != aAll.end();
}
};
commit 83fc2cfb34b584f41d27a5f04dd9405cf55bd528
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Jun 18 14:42:03 2015 +0200
loplugin:checkconfigmacros
Change-Id: Ia94c53457e328db9bdd8dd22d7a39e49c358301c
diff --git a/config_host/config_opengl.h.in b/config_host/config_opengl.h.in
index b2c6358..67b9e47 100644
--- a/config_host/config_opengl.h.in
+++ b/config_host/config_opengl.h.in
@@ -5,6 +5,6 @@ Settings for OpenGL
#ifndef CONFIG_OPENGL_H
#define CONFIG_OPENGL_H
-#undef HAVE_GLEW_1_12
+#define HAVE_GLEW_1_12 0
#endif
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 326250c..f7f2d0f 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -440,7 +440,7 @@ APIENTRY
#endif
debug_callback(GLenum source, GLenum type, GLuint id,
GLenum severity, GLsizei , const GLchar* message,
-#if defined HAVE_GLEW_1_12
+#if HAVE_GLEW_1_12
const GLvoid*
#else
GLvoid*
commit 50cfcd91a0893ff795fc1cf1a2e7c3f7c6da5326
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 18 13:37:52 2015 +0100
gtk3: implement paste everything else into us
Change-Id: I39c3e5646a5a1ea07aa881cad584a0b7ae9bd005
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index a96d1e4..cb26b26 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -82,6 +82,8 @@ namespace
class GtkTransferable : public ::cppu::WeakImplHelper1 <
css::datatransfer::XTransferable >
{
+private:
+ std::map<OUString, GdkAtom> m_aMimeTypeToAtom;
public:
GtkTransferable()
{
@@ -95,24 +97,37 @@ public:
* XTransferable
*/
- virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
+ virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor)
throw(css::datatransfer::UnsupportedFlavorException,
css::io::IOException,
css::uno::RuntimeException, std::exception
) SAL_OVERRIDE
{
- css::uno::Any aRet;
GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
- if (aFlavor.MimeType == "text/plain;charset=utf-16")
+ if (rFlavor.MimeType == "text/plain;charset=utf-16")
{
gchar *pText = gtk_clipboard_wait_for_text(clipboard);
OUString aStr(pText, rtl_str_getLength(pText),
RTL_TEXTENCODING_UTF8);
g_free(pText);
+ css::uno::Any aRet;
aRet <<= aStr.replaceAll("\r\n", "\n");
+ return aRet;
}
- else
- fprintf(stderr, "TO-DO getTransferData %s\n", OUStringToOString(aFlavor.MimeType, RTL_TEXTENCODING_UTF8).getStr());
+
+ auto it = m_aMimeTypeToAtom.find(rFlavor.MimeType);
+ if (it == m_aMimeTypeToAtom.end())
+ return css::uno::Any();
+
+ css::uno::Any aRet;
+ GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard,
+ it->second);
+ gint length;
+ const guchar *rawdata = gtk_selection_data_get_data_with_length(data,
+ &length);
+ Sequence<sal_Int8> aSeq(reinterpret_cast<const sal_Int8*>(rawdata), length);
+ gtk_selection_data_free(data);
+ aRet <<= aSeq;
return aRet;
}
@@ -146,6 +161,9 @@ public:
aFlavor.MimeType = OUString(pFinalName,
rtl_str_getLength(pFinalName),
RTL_TEXTENCODING_UTF8);
+
+ m_aMimeTypeToAtom[aFlavor.MimeType] = targets[i];
+
aFlavor.DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
sal_Int32 nIndex(0);
commit 69295a44dc8b1e78a32f074cbfcf1ed84fd93b43
Author: Varun <varun.dhall at studentpartner.com>
Date: Thu Jun 18 01:22:54 2015 +0530
Added test for del of table redlines rhbz#1198848
Change-Id: I76f236adee86ffb75496bc36f0d6b0ac7d646afd
Reviewed-on: https://gerrit.libreoffice.org/16347
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 5544dab..dcacc21 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -257,7 +257,7 @@ public:
SwExtraRedline* GetRedline( sal_uInt16 uIndex ) const { return m_aExtraRedlines.operator[]( uIndex ); }
bool IsEmpty() const { return m_aExtraRedlines.empty(); }
- bool DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTable, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete );
+ SW_DLLPUBLIC bool DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTable, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete );
bool DeleteTableRowRedline ( SwDoc* pDoc, const SwTableLine& rTableLine, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete );
bool DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete );
};
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index a7bd39e..9550362 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -126,7 +126,7 @@ namespace SwUnoCursorHelper
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- void makeTableCellRedline( SwTableBox& rTableBox, const OUString& RedlineType,
+ SW_DLLPUBLIC void makeTableCellRedline( SwTableBox& rTableBox, const OUString& RedlineType,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index b416777..22cd38a 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -33,6 +33,7 @@
#include <unotools/streamwrap.hxx>
#include <test/mtfxmldump.hxx>
#include <unocrsr.hxx>
+#include <unocrsrhelper.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdview.hxx>
@@ -91,6 +92,7 @@ public:
void testTdf68183();
void testCp1000115();
void testTdf90003();
+ void testdelofTableRedlines();
void testExportToPicture();
void testSearchWithTransliterate();
void testTableBackgroundColor();
@@ -132,6 +134,7 @@ public:
CPPUNIT_TEST(testTdf68183);
CPPUNIT_TEST(testCp1000115);
CPPUNIT_TEST(testTdf90003);
+ CPPUNIT_TEST(testdelofTableRedlines);
CPPUNIT_TEST(testExportToPicture);
CPPUNIT_TEST(testSearchWithTransliterate);
CPPUNIT_TEST(testTableBackgroundColor);
@@ -875,6 +878,25 @@ void SwUiWriterTest::testTdf90003()
assertXPath(pXmlDoc, "//Special[@nType='POR_FLY']", 0);
}
+void SwUiWriterTest::testdelofTableRedlines()
+{
+ SwDoc* pDoc = createDoc();
+ SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+ SwInsertTableOptions TableOpt(tabopts::DEFAULT_BORDER, 0);
+ const SwTable& tbl = pWrtShell->InsertTable(TableOpt, 1, 3);
+ uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getColumns()->getCount());
+ uno::Sequence<beans::PropertyValue> aDescriptor;
+ SwUnoCursorHelper::makeTableCellRedline((*const_cast<SwTableBox*>(tbl.GetTableBox(OUString("A1")))), OUString("TableCellInsert"), aDescriptor);
+ SwUnoCursorHelper::makeTableCellRedline((*const_cast<SwTableBox*>(tbl.GetTableBox(OUString("B1")))), OUString("TableCellInsert"), aDescriptor);
+ SwUnoCursorHelper::makeTableCellRedline((*const_cast<SwTableBox*>(tbl.GetTableBox(OUString("C1")))), OUString("TableCellInsert"), aDescriptor);
+ IDocumentRedlineAccess& pDocRed = pDoc->getIDocumentRedlineAccess();
+ SwExtraRedlineTable& redtbl = pDocRed.GetExtraRedlineTable();
+ redtbl.DeleteAllTableRedlines(pDoc, tbl, false, sal_uInt16(USHRT_MAX));
+ CPPUNIT_ASSERT(redtbl.IsEmpty());
+}
+
void SwUiWriterTest::testExportToPicture()
{
createDoc();
commit 193b907b2bc49b9e48cfab2583e81a24aaa2e666
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Jun 18 14:03:00 2015 +0200
SwXTextDocument::getTextSelection: fix missing editeng forward
When editing shape text, the text selection should be provided by
editeng.
Change-Id: I379f89fc28d2ff8172d0411bba347c959de6ab29
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 268148e..6b81c637 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -142,6 +142,7 @@
#include <editeng/eeitem.hxx>
#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
#include <svx/svdoutl.hxx>
#include <svl/languageoptions.hxx>
#include <svx/svdview.hxx>
@@ -3256,8 +3257,21 @@ void SwXTextDocument::setTextSelection(int nType, int nX, int nY)
OString SwXTextDocument::getTextSelection(const char* pMimeType)
{
+ uno::Reference<datatransfer::XTransferable> xTransferable;
+
SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
- uno::Reference<datatransfer::XTransferable> xTransferable(new SwTransferable(*pWrtShell));
+ if (SdrView* pSdrView = pWrtShell->GetDrawView())
+ {
+ if (pSdrView->GetTextEditObject())
+ {
+ // Editing shape text
+ EditView& rEditView = pSdrView->GetTextEditOutlinerView()->GetEditView();
+ xTransferable = rEditView.GetEditEngine()->CreateTransferable(rEditView.GetSelection());
+ }
+ }
+
+ if (!xTransferable.is())
+ xTransferable = new SwTransferable(*pWrtShell);
// Take care of UTF-8 text here.
OString aMimeType(pMimeType);
commit ae150c6a5424d021ce5eb46dc9573f12a4d05445
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Tue Jun 16 18:21:52 2015 +0200
Fix typos
Change-Id: Ibfa971952cd330ddf430e7e951c5c235d2ae6bd8
Reviewed-on: https://gerrit.libreoffice.org/16314
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx
index b13e8ea..fe6f2c9 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -222,7 +222,7 @@ protected:
<p>As default, this method creates as many axes as there are dimensions
in the given first coordinate system. Each of the axis
represents one of the dimensions of the coordinate systems. If there are series
- requesting asecondary axes a secondary y axes is added</p>
+ requesting a secondary axes a secondary y axes is added</p>
*/
void createAxes(
const ::com::sun::star::uno::Sequence<
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
index daf6f4f..52d8ef7 100644
--- a/chart2/source/view/axes/DateScaling.cxx
+++ b/chart2/source/view/axes/DateScaling.cxx
@@ -72,7 +72,7 @@ double SAL_CALL DateScaling::doScaling( double value )
case MONTH:
default:
fResult = aDate.GetYear();
- fResult *= lcl_fNumberOfMonths;//asssuming equal count of months in each year
+ fResult *= lcl_fNumberOfMonths;//assuming equal count of months in each year
fResult += aDate.GetMonth();
double fDayOfMonth = aDate.GetDay();
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 043cbaa..3efa477 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -286,7 +286,7 @@ void VDataSeries::doSortByXValues()
if( m_aValues_X.is() && m_aValues_X.Doubles.getLength() )
{
//prepare a vector for sorting
- std::vector< ::std::vector< double > > aTmp;//outer vector are points, inner vector are the different values of athe point
+ std::vector< ::std::vector< double > > aTmp;//outer vector are points, inner vector are the different values of the point
double fNan;
::rtl::math::setNan( & fNan );
sal_Int32 nPointIndex = 0;
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index 2332ba3..5c1814f 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -134,7 +134,7 @@ static nsresult insertPABDescription()
{
nsresult rv = NS_OK ;
// mozilla loads the descriptions of pab and history from a file named addressbook.properties
- // we never deliver it with OOo,so mozab does not auot load personal addressbook and Collected addresses
+ // we never deliver it with OOo,so mozab does not auto load personal addressbook and Collected addresses
// If we want to deliver addressbook.properties with OOo,we have to deal with hole mozilla chrome mechanism.
// So I insert the descriptiones as user prefes,they will cover the default value.
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx
index 39c855b..59c969a 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -169,7 +169,7 @@ SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr, sal_Int32 nTi
}
- // autocoomit is always default
+ // autocommit is always default
if (!m_bReadOnly)
N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_AUTOCOMMIT, reinterpret_cast<SQLPOINTER>(SQL_AUTOCOMMIT_ON),SQL_IS_INTEGER);
diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx
index 5b1a1f4..63ef286 100644
--- a/dbaccess/source/ui/inc/dsmeta.hxx
+++ b/dbaccess/source/ui/inc/dsmeta.hxx
@@ -32,7 +32,7 @@
namespace dbaui
{
- // AutheticationMode
+ // AuthenticationMode
enum AuthenticationMode
{
AuthNone,
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 3a0796e..b4df5f5 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -137,7 +137,7 @@ namespace dbaui
#endif // # _MSC_VER
private:
- // for asny execution of XDispatch::dispatch
+ // for any execution of XDispatch::dispatch
struct DispatchArgs
{
::com::sun::star::util::URL aURL;
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx
index 6efc608..e40defb 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -45,7 +45,7 @@ class CWinClipbImpl;
// class instance
// watch out: we are using only one static member variable and not a list
// because we assume to be instantiated only once
-// this will be asured by an OneInstanceFactory of the service and not
+// this will be assured by an OneInstanceFactory of the service and not
// by this class!
// helper class, so that the mutex is constructed
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index dc6309c..523f8c6 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -595,7 +595,7 @@ void EditUndoTransliteration::Undo()
EditSelection aSel = pEE->CreateSelection(aNewESel);
- // Insert text, but don't expand Atribs at the current position:
+ // Insert text, but don't expand Attribs at the current position:
aSel = pEE->DeleteSelected( aSel );
EditSelection aDelSel( aSel );
aSel = pEE->InsertParaBreak( aSel );
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index 0d96f1d..8f8cb6c 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -56,7 +56,7 @@ namespace abp
/// retrieves the names of all data sources
void getDataSourceNames( StringBag& _rNames ) const;
- /// disambiguates the given name by appending auccessive numbers
+ /// disambiguates the given name by appending successive numbers
OUString& disambiguate(OUString& _rDataSourceName);
/// creates a new MORK data source
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx
index 276450e..83b9910 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx
@@ -433,7 +433,7 @@ class DXFHatchEntity : public DXFBasicEntity
DXFVector aElevationPoint;
sal_Int32 nFlags; // 70 (solid fill = 1, pattern fill = 0)
- sal_Int32 nAssociativityFlag; // 71 (assoiciative = 1, non-associative = 0)
+ sal_Int32 nAssociativityFlag; // 71 (associative = 1, non-associative = 0)
sal_Int32 nBoundaryPathCount; // 91
sal_Int32 nHatchStyle; // 75 (odd parity = 0, outmost area = 1, entire area = 2 )
sal_Int32 nHatchPatternType; // 76 (user defined = 0, predefined = 1, custom = 2)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list