[Libreoffice-commits] core.git: 142 commits - accessibility/source avmedia/source basctl/source basegfx/test basic/qa basic/source bin/update_pch canvas/source chart2/source cli_ure/source comphelper/source compilerplugins/clang config_host/config_dbus.h.in config_host/config_gio.h.in config_host/config_vclplug.h.in config_host.mk.in configmgr/source configure.ac connectivity/inc connectivity/source cppuhelper/source cui/source cui/uiconfig dbaccess/qa dbaccess/source desktop/qa desktop/source drawinglayer/source dtrans/source dtrans/test editeng/source embeddedobj/source embeddedobj/test extensions/source external/harfbuzz external/jpeg external/jpeg-turbo filter/source formula/source fpicker/source framework/source helpcompiler/inc helpcompiler/source helpcontent2 i18nlangtag/source i18npool/qa i18npool/source icon-themes/galaxy icon-themes/tango idlc/source idl/inc idl/source include/comphelper include/connectivity include/editeng include/osl include/prewin.h include/rtl include/sal include/sf x2 include/svtools include/svx include/tools include/unotools include/vcl include/xmloff javaunohelper/com jurt/com jurt/source jvmfwk/plugins jvmfwk/source l10ntools/inc l10ntools/source lingucomponent/source linguistic/source odk/CustomTarget_allheaders.mk odk/source offapi/com officecfg/registry onlineupdate/source oox/qa opencl/source postprocess/qa pyuno/source reportdesign/source RepositoryExternal.mk Repository.mk ridljar/com rsc/source sal/cppunittester salhelper/source sal/osl sal/qa sal/workben sc/inc scp2/InstallModule_gnome.mk scp2/InstallModule_ooo.mk scp2/InstallModule_quickstart.mk scp2/source sc/qa scripting/java sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk sdext/source sd/qa sd/sdi sd/source sd/uiconfig sfx2/Library_sfx.mk sfx2/source shell/source slideshow/source solenv/bin solenv/gbuild solenv/inc soltools/cpp soltools/mkdepend sot/inc sot/source starmath/inc starmath/source stoc/source svgio/inc svgio/qa svgio/source svl/qa svl/source svtools/source svx/inc svx/sdi svx/source sw/inc sw/qa sw/sdi sw/source sw/uiconfig sw/UIConfig_swriter.mk sysui/desktop toolkit/source tools/qa tools/source ucb/source uui/source vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_gtk.mk vcl/opengl vcl/qa vcl/README vcl/source vcl/unx vcl/win wizards/com writerfilter/source xmerge/source xmlhelp/source xmloff/source xmlscript/source xmlsecurity/inc xmlsecurity/source xmlsecurity/workben
Chris Sherlock
chris.sherlock79 at gmail.com
Sat Feb 20 14:32:33 UTC 2016
Repository.mk | 8
RepositoryExternal.mk | 16
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 2
accessibility/source/standard/vclxaccessiblebox.cxx | 4
avmedia/source/inc/mediamisc.hxx | 2
avmedia/source/vlc/wrapper/SymbolLoader.hxx | 2
avmedia/source/vlc/wrapper/Types.hxx | 2
basctl/source/basicide/baside3.cxx | 2
basegfx/test/basegfx3d.cxx | 40
basegfx/test/basegfxtools.cxx | 5
basegfx/test/genericclipper.cxx | 2
basic/qa/cppunit/test_vba.cxx | 2
basic/qa/vba_tests/format.vb | 4
basic/source/comp/dim.cxx | 27
basic/source/comp/exprnode.cxx | 12
basic/source/comp/exprtree.cxx | 34
basic/source/comp/parser.cxx | 2
basic/source/inc/expr.hxx | 11
basic/source/inc/parser.hxx | 2
basic/source/runtime/dllmgr-none.cxx | 2
basic/source/runtime/dllmgr-x64.cxx | 2
basic/source/runtime/dllmgr-x86.cxx | 2
basic/source/runtime/methods.cxx | 6
basic/source/runtime/methods1.cxx | 6
basic/source/sbx/sbxdec.hxx | 2
bin/update_pch | 4
canvas/source/cairo/cairo_services.cxx | 2
canvas/source/opengl/ogl_spritedevicehelper.cxx | 2
canvas/source/tools/elapsedtime.cxx | 4
chart2/source/controller/accessibility/AccessibleBase.cxx | 1
chart2/source/controller/main/ObjectHierarchy.cxx | 1
chart2/source/view/charttypes/GL3DBarChart.cxx | 2
cli_ure/source/native/path.cxx | 2
comphelper/source/eventattachermgr/eventattachermgr.cxx | 2
comphelper/source/misc/mimeconfighelper.cxx | 2
compilerplugins/clang/plugin.cxx | 1
compilerplugins/clang/unusedfields.cxx | 89 ++
compilerplugins/clang/unusedfields.py | 60 +
config_host.mk.in | 1
config_host/config_dbus.h.in | 17
config_host/config_gio.h.in | 17
config_host/config_vclplug.h.in | 1
configmgr/source/components.cxx | 4
configmgr/source/writemodfile.cxx | 2
configmgr/source/writemodfile.hxx | 2
configure.ac | 69 -
connectivity/inc/pch/precompiled_ado.hxx | 2
connectivity/source/drivers/evoab2/EApi.cxx | 27
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 2
connectivity/source/drivers/odbc/OFunctions.cxx | 2
cppuhelper/source/findsofficepath.c | 2
cui/source/customize/macropg.cxx | 1
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/options/optgdlg.cxx | 12
cui/source/options/optmemory.cxx | 2
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/autocdlg.cxx | 2
cui/source/tabpages/chardlg.cxx | 2
cui/source/tabpages/tpgradnt.cxx | 2
cui/source/tabpages/tphatch.cxx | 2
cui/uiconfig/ui/distributionpage.ui | 2
dbaccess/qa/extras/dialog-save.cxx | 2
dbaccess/qa/extras/empty-stdlib-save.cxx | 2
dbaccess/qa/extras/macros-test.cxx | 2
dbaccess/qa/extras/nolib-save.cxx | 2
dbaccess/source/core/dataaccess/documentcontainer.cxx | 7
dbaccess/source/ui/app/AppControllerDnD.cxx | 1
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2
dbaccess/source/ui/dlg/ConnectionPage.cxx | 2
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 1
dbaccess/source/ui/dlg/adodatalinks.cxx | 2
dbaccess/source/ui/dlg/odbcconfig.cxx | 2
dbaccess/source/ui/dlg/odbcconfig.hxx | 4
dbaccess/source/ui/relationdesign/RelationController.cxx | 1
desktop/qa/data/sheets.ods |binary
desktop/qa/desktop_lib/test_desktop_lib.cxx | 112 ++
desktop/source/app/app.cxx | 10
desktop/source/app/officeipcthread.cxx | 2
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 6
desktop/source/deployment/misc/dp_misc.cxx | 12
desktop/source/deployment/misc/lockfile.cxx | 4
drawinglayer/source/primitive2d/baseprimitive2d.cxx | 1
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 6
dtrans/source/cnttype/wbench/testcnttype.cxx | 2
dtrans/source/win32/workbench/test_wincb.cxx | 2
dtrans/source/win32/workbench/testmarshal.cxx | 2
dtrans/test/win32/dnd/transferable.hxx | 2
editeng/source/editeng/editview.cxx | 4
editeng/source/editeng/impedit.cxx | 22
editeng/source/editeng/impedit.hxx | 4
editeng/source/outliner/outlvw.cxx | 4
editeng/source/outliner/paralist.cxx | 2
embeddedobj/source/inc/oleembobj.hxx | 18
embeddedobj/source/msole/oleembed.cxx | 18
embeddedobj/source/msole/olemisc.cxx | 10
embeddedobj/source/msole/olepersist.cxx | 22
embeddedobj/source/msole/oleregister.cxx | 4
embeddedobj/source/msole/olevisual.cxx | 8
embeddedobj/source/msole/xdialogcreator.cxx | 6
embeddedobj/test/Container1/nativelib/nativeview.c | 6
extensions/source/abpilot/typeselectionpage.cxx | 2
extensions/source/config/ldap/ldapaccess.cxx | 14
extensions/source/config/ldap/ldapaccess.hxx | 2
extensions/source/propctrlr/eventhandler.cxx | 1
extensions/source/propctrlr/propertycomposer.cxx | 1
extensions/source/scanner/scanwin.cxx | 2
extensions/source/update/check/download.cxx | 2
extensions/source/update/check/updatecheck.cxx | 12
extensions/source/update/check/updatecheckconfig.cxx | 6
external/harfbuzz/ExternalProject_harfbuzz.mk | 1
external/jpeg-turbo/ExternalProject_jpeg-turbo.mk | 2
external/jpeg/configs/jconfig.h | 2
filter/source/graphicfilter/ieps/ieps.cxx | 6
formula/source/core/api/FormulaCompiler.cxx | 5
formula/source/core/api/token.cxx | 2
fpicker/source/office/iodlg.cxx | 2
fpicker/source/win32/filepicker/workbench/Test_fps.cxx | 2
fpicker/source/win32/folderpicker/workbench/Test_fops.cxx | 2
framework/source/classes/menumanager.cxx | 46 -
framework/source/fwi/helper/networkdomain.cxx | 2
framework/source/helper/titlebarupdate.cxx | 2
framework/source/uielement/menubarmanager.cxx | 26
framework/source/uielement/newmenucontroller.cxx | 11
framework/source/uielement/popuptoolbarcontroller.cxx | 13
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 2
helpcompiler/inc/HelpCompiler.hxx | 2
helpcompiler/source/HelpCompiler.cxx | 2
helpcompiler/source/HelpLinker.cxx | 10
helpcontent2 | 2
i18nlangtag/source/isolang/insys.cxx | 2
i18npool/qa/cppunit/test_textsearch.cxx | 121 ++-
i18npool/source/search/textsearch.cxx | 401 +++++++++-
i18npool/source/search/textsearch.hxx | 14
icon-themes/galaxy/cmd/bg/lc_backcolor.png |binary
icon-themes/galaxy/cmd/lc_dataranges.png |binary
icon-themes/galaxy/cmd/lc_dataranges.xcf.bz2 |binary
icon-themes/galaxy/cmd/lc_deletepage.png |binary
icon-themes/galaxy/cmd/lc_deletepage.xcf.bz2 |binary
icon-themes/galaxy/cmd/lc_diagramarea.png |binary
icon-themes/galaxy/cmd/lc_diagramarea.xcf |binary
icon-themes/galaxy/cmd/lc_diagramaxisz.png |binary
icon-themes/galaxy/cmd/lc_diagramaxisz.xcf.bz2 |binary
icon-themes/galaxy/cmd/lc_extrusion3dcolor.png |binary
icon-themes/galaxy/cmd/lc_freezepanes.png |binary
icon-themes/galaxy/cmd/lc_freezepanes.xcf |binary
icon-themes/galaxy/cmd/lc_graphicfilterposter.png |binary
icon-themes/galaxy/cmd/lc_insertdraw.png |binary
icon-themes/galaxy/cmd/lc_insertendnote.png |binary
icon-themes/galaxy/cmd/lc_insertendnote.xcf.bz2 |binary
icon-themes/galaxy/cmd/lc_insertgraphic.png |binary
icon-themes/galaxy/cmd/lc_insertmenutitles.png |binary
icon-themes/galaxy/cmd/lc_insertmenutitles.xcf.bz2 |binary
icon-themes/galaxy/cmd/lc_insertpagebreak.png |binary
icon-themes/galaxy/cmd/lc_insertpagebreak.xcf.bz2 |binary
icon-themes/galaxy/cmd/lc_legend.png |binary
icon-themes/galaxy/cmd/lc_legend.xcf.bz2 |binary
icon-themes/galaxy/cmd/lc_presentationcurrentslide.png |binary
icon-themes/galaxy/cmd/lc_presentationcurrentslide.xcf.bz2 |binary
icon-themes/galaxy/cmd/lc_resetattributes.png |binary
icon-themes/galaxy/cmd/lc_resetattributes.xcf.bz2 |binary
icon-themes/galaxy/cmd/lc_slidemasterpage.png |binary
icon-themes/galaxy/cmd/lc_splitwindow.png |binary
icon-themes/galaxy/cmd/lc_splitwindow.xcf.bz2 |binary
icon-themes/galaxy/cmd/lc_styleupdatebyexample.png |binary
icon-themes/galaxy/cmd/lc_styleupdatebyexample.xcf.bz2 |binary
icon-themes/galaxy/cmd/lc_togglesheetgrid.png |binary
icon-themes/galaxy/cmd/lc_togglesheetgrid.xcf.bz2 |binary
icon-themes/galaxy/links.txt | 5
icon-themes/tango/links.txt | 2
idl/inc/lex.hxx | 58 -
idl/inc/object.hxx | 1
idl/inc/parser.hxx | 42 -
idl/inc/types.hxx | 3
idl/source/prj/parser.cxx | 180 ++--
idlc/source/options.cxx | 6
include/comphelper/mimeconfighelper.hxx | 2
include/connectivity/odbc.hxx | 2
include/editeng/editview.hxx | 2
include/editeng/outliner.hxx | 6
include/osl/interlck.h | 2
include/prewin.h | 2
include/rtl/uuid.h | 2
include/sal/mathconf.h | 2
include/sfx2/app.hxx | 4
include/sfx2/classificationhelper.hxx | 45 +
include/sfx2/infobar.hxx | 16
include/sfx2/lnkbase.hxx | 2
include/sfx2/objsh.hxx | 2
include/sfx2/sfx.hrc | 1
include/sfx2/viewfrm.hxx | 11
include/svtools/autocmpledit.hxx | 2
include/svtools/inettbc.hxx | 3
include/svx/fmgridcl.hxx | 11
include/svx/svdmodel.hxx | 4
include/tools/lineend.hxx | 2
include/tools/pathutils.hxx | 2
include/tools/solar.h | 2
include/unotools/textsearch.hxx | 30
include/vcl/bitmap.hxx | 2
include/vcl/edit.hxx | 11
include/vcl/graphicfilter.hxx | 2
include/vcl/help.hxx | 31
include/vcl/lstbox.hxx | 4
include/vcl/salnativewidgets.hxx | 6
include/vcl/settings.hxx | 14
include/vcl/svapp.hxx | 6
include/vcl/sysdata.hxx | 16
include/vcl/toolbox.hxx | 3
include/xmloff/xmltoken.hxx | 1
javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 27
javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java | 3
javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java | 11
javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java | 6
javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 13
javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java | 89 ++
jurt/com/sun/star/lib/connections/socket/socketAcceptor.java | 7
jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c | 10
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 6
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 10
jvmfwk/source/elements.cxx | 2
jvmfwk/source/elements.hxx | 2
jvmfwk/source/framework.cxx | 2
jvmfwk/source/fwkutil.cxx | 4
l10ntools/inc/export.hxx | 2
l10ntools/source/helpmerge.cxx | 2
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 8
lingucomponent/source/languageguessing/guesslang.cxx | 2
lingucomponent/source/lingutil/lingutil.cxx | 4
lingucomponent/source/lingutil/lingutil.hxx | 2
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 2
linguistic/source/spelldta.cxx | 2
odk/CustomTarget_allheaders.mk | 8
odk/source/com/sun/star/lib/loader/Loader.java | 4
offapi/com/sun/star/office/XAnnotation.idl | 3
offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl | 16
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 16
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 28
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 8
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 8
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 14
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 8
onlineupdate/source/libmar/sign/mar_sign.c | 4
onlineupdate/source/libmar/sign/nss_secutil.c | 2
onlineupdate/source/libmar/src/mar.h | 2
onlineupdate/source/libmar/src/mar_create.c | 2
onlineupdate/source/libmar/src/mar_extract.c | 6
onlineupdate/source/libmar/src/mar_private.h | 2
onlineupdate/source/libmar/src/mar_read.c | 4
onlineupdate/source/libmar/tool/mar.c | 20
onlineupdate/source/libmar/verify/cryptox.c | 2
onlineupdate/source/libmar/verify/mar_verify.c | 2
onlineupdate/source/update/common/pathhash.cxx | 2
onlineupdate/source/update/common/readstrings.cxx | 2
onlineupdate/source/update/common/readstrings.h | 2
onlineupdate/source/update/common/uachelper.cxx | 2
onlineupdate/source/update/common/updatedefines.h | 2
onlineupdate/source/update/common/updatehelper.cxx | 2
onlineupdate/source/update/common/updatelogging.cxx | 2
onlineupdate/source/update/common/win_dirent.h | 2
onlineupdate/source/update/src/mar.h | 2
onlineupdate/source/update/src/mar_create.c | 2
onlineupdate/source/update/src/mar_extract.c | 6
onlineupdate/source/update/src/mar_private.h | 2
onlineupdate/source/update/src/mar_read.c | 4
onlineupdate/source/update/updater/archivereader.cxx | 6
onlineupdate/source/update/updater/archivereader.h | 2
onlineupdate/source/update/updater/bspatch.cxx | 4
onlineupdate/source/update/updater/loaddlls.cxx | 2
onlineupdate/source/update/updater/nsWindowsRestart.cxx | 2
onlineupdate/source/update/updater/progressui.h | 4
onlineupdate/source/update/updater/progressui_null.cxx | 4
onlineupdate/source/update/updater/progressui_win.cxx | 2
onlineupdate/source/update/updater/updater.cxx | 74 -
onlineupdate/source/update/updater/win_dirent.cxx | 2
onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx | 12
onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.h | 6
oox/qa/unit/vba_encryption.cxx | 1
opencl/source/openclconfig.cxx | 2
postprocess/qa/services.cxx | 6
pyuno/source/loader/pyuno_loader.cxx | 2
reportdesign/source/filter/xml/xmlExport.cxx | 1
reportdesign/source/ui/inspection/GeometryHandler.cxx | 1
ridljar/com/sun/star/uno/IBridge.java | 3
ridljar/com/sun/star/uno/ITypeDescription.java | 9
ridljar/com/sun/star/uno/UnoRuntime.java | 11
rsc/source/rscpp/cpp.h | 2
rsc/source/rscpp/cpp3.c | 2
rsc/source/tools/rsctools.cxx | 2
sal/cppunittester/cppunittester.cxx | 4
sal/osl/unx/tempfile.cxx | 14
sal/qa/osl/file/osl_File.cxx | 34
sal/qa/osl/file/osl_File_Const.h | 2
sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx | 6
sal/qa/osl/module/osl_Module.cxx | 2
sal/qa/osl/module/osl_Module_Const.h | 5
sal/qa/osl/process/osl_Thread.cxx | 52 -
sal/qa/osl/process/osl_process.cxx | 10
sal/qa/osl/process/osl_process_child.cxx | 6
sal/qa/osl/security/osl_Security.cxx | 6
sal/qa/osl/security/osl_Security_Const.h | 2
sal/qa/osl/setthreadname/test-setthreadname.cxx | 2
sal/qa/rtl/cipher/rtl_cipher.cxx | 80 -
sal/qa/rtl/crc32/rtl_crc32.cxx | 8
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 13
sal/qa/rtl/process/rtl_Process.cxx | 4
sal/qa/rtl/uuid/rtl_Uuid.cxx | 2
sal/workben/t_ojp_exe.cxx | 4
sal/workben/t_osl_getVolInfo.cxx | 2
sal/workben/t_osl_joinProcess.cxx | 2
sal/workben/testfile.cxx | 8
sal/workben/testproc.cxx | 2
salhelper/source/simplereferenceobject.cxx | 4
sc/UIConfig_scalc.mk | 1
sc/inc/attrib.hxx | 13
sc/inc/callform.hxx | 2
sc/inc/chartarr.hxx | 1
sc/inc/column.hxx | 2
sc/inc/compare.hxx | 9
sc/inc/docoptio.hxx | 6
sc/inc/document.hxx | 2
sc/inc/formulacell.hxx | 1
sc/inc/optuno.hxx | 1
sc/inc/queryparam.hxx | 3
sc/inc/sc.hrc | 2
sc/inc/scmatrix.hxx | 10
sc/inc/table.hxx | 2
sc/inc/unonames.hxx | 2
sc/qa/unit/data/contentCSV/numberFormat.csv | 2
sc/qa/unit/data/ods/formats.ods |binary
sc/qa/unit/helper/debughelper.hxx | 2
sc/qa/unit/helper/qahelper.cxx | 2
sc/qa/unit/subsequent_export-test.cxx | 4
sc/qa/unit/subsequent_filters-test.cxx | 8
sc/qa/unit/ucalc_formula.cxx | 2
sc/sdi/scalc.sdi | 33
sc/sdi/tabvwsh.sdi | 2
sc/source/core/data/column2.cxx | 35
sc/source/core/data/dociter.cxx | 5
sc/source/core/data/documen8.cxx | 4
sc/source/core/data/dpcache.cxx | 4
sc/source/core/data/formulacell.cxx | 4
sc/source/core/data/table1.cxx | 4
sc/source/core/data/table3.cxx | 4
sc/source/core/inc/interpre.hxx | 15
sc/source/core/tool/chartarr.cxx | 9
sc/source/core/tool/compare.cxx | 12
sc/source/core/tool/docoptio.cxx | 13
sc/source/core/tool/doubleref.cxx | 2
sc/source/core/tool/interpr1.cxx | 75 +
sc/source/core/tool/queryparam.cxx | 15
sc/source/filter/excel/impop.cxx | 2
sc/source/filter/inc/addressconverter.hxx | 77 +
sc/source/filter/inc/formulabase.hxx | 4
sc/source/filter/inc/formulabuffer.hxx | 15
sc/source/filter/inc/formulaparser.hxx | 9
sc/source/filter/inc/orcusinterface.hxx | 2
sc/source/filter/inc/sheetdatabuffer.hxx | 14
sc/source/filter/inc/worksheethelper.hxx | 22
sc/source/filter/oox/addressconverter.cxx | 74 +
sc/source/filter/oox/condformatbuffer.cxx | 10
sc/source/filter/oox/excelchartconverter.cxx | 2
sc/source/filter/oox/formulabase.cxx | 5
sc/source/filter/oox/formulabuffer.cxx | 45 +
sc/source/filter/oox/formulaparser.cxx | 54 +
sc/source/filter/oox/pivotcachebuffer.cxx | 4
sc/source/filter/oox/sheetdatabuffer.cxx | 61 +
sc/source/filter/oox/sheetdatacontext.cxx | 19
sc/source/filter/oox/worksheetfragment.cxx | 2
sc/source/filter/oox/worksheethelper.cxx | 70 +
sc/source/filter/orcus/interface.cxx | 4
sc/source/filter/orcus/orcusfiltersimpl.cxx | 2
sc/source/filter/xml/XMLCalculationSettingsContext.cxx | 19
sc/source/filter/xml/XMLCalculationSettingsContext.hxx | 3
sc/source/filter/xml/XMLExportDataPilot.cxx | 29
sc/source/filter/xml/XMLExportDataPilot.hxx | 6
sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 29
sc/source/filter/xml/xmlexprt.cxx | 12
sc/source/filter/xml/xmlexprt.hxx | 1
sc/source/filter/xml/xmlfilti.cxx | 24
sc/source/filter/xml/xmlfilti.hxx | 10
sc/source/filter/xml/xmlimprt.cxx | 6
sc/source/filter/xml/xmlimprt.hxx | 3
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 6
sc/source/ui/Accessibility/AccessibleText.cxx | 6
sc/source/ui/app/inputhdl.cxx | 16
sc/source/ui/app/inputwin.cxx | 7
sc/source/ui/app/scmod.cxx | 1
sc/source/ui/cctrl/checklistmenu.cxx | 30
sc/source/ui/dbgui/filtdlg.cxx | 2
sc/source/ui/dbgui/foptmgr.cxx | 2
sc/source/ui/dbgui/pfiltdlg.cxx | 4
sc/source/ui/dbgui/sfiltdlg.cxx | 3
sc/source/ui/docshell/datastream.cxx | 2
sc/source/ui/docshell/docsh4.cxx | 2
sc/source/ui/docshell/externalrefmgr.cxx | 54 -
sc/source/ui/inc/docsh.hxx | 2
sc/source/ui/inc/tabview.hxx | 4
sc/source/ui/inc/tpusrlst.hxx | 1
sc/source/ui/optdlg/tpusrlst.cxx | 2
sc/source/ui/unoobj/datauno.cxx | 5
sc/source/ui/unoobj/docuno.cxx | 2
sc/source/ui/unoobj/optuno.cxx | 7
sc/source/ui/view/gridwin.cxx | 4
sc/source/ui/view/select.cxx | 4
sc/source/ui/view/tabview.cxx | 114 +-
sc/source/ui/view/tabview4.cxx | 6
sc/source/ui/view/tabvwsh3.cxx | 10
sc/source/ui/view/viewdata.cxx | 4
sc/uiconfig/scalc/menubar/menubar.xml | 7
sc/uiconfig/scalc/popupmenu/freezepanes.xml | 13
scp2/InstallModule_gnome.mk | 1
scp2/InstallModule_ooo.mk | 10
scp2/InstallModule_quickstart.mk | 2
scp2/source/gnome/file_gnome.scp | 3
scp2/source/gnome/module_gnome.scp | 3
scp2/source/ooo/file_ooo.scp | 48 -
scp2/source/ooo/module_ooo.scp | 3
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 2
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java | 9
sd/qa/unit/tiledrendering/tiledrendering.cxx | 14
sd/sdi/sdraw.sdi | 18
sd/source/core/annotations/Annotation.cxx | 22
sd/source/helper/simplereferencecomponent.cxx | 8
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/annotations/annotationtag.cxx | 8
sd/source/ui/inc/present.hxx | 1
sd/source/ui/remotecontrol/BluetoothServer.hxx | 4
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx | 2
sd/source/ui/remotecontrol/DiscoveryService.cxx | 4
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 1
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 17
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx | 6
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 7
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 12
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 7
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 44 -
sd/source/ui/slidesorter/view/SlsToolTip.cxx | 5
sd/source/ui/view/drviews7.cxx | 2
sd/source/ui/view/viewoverlaymanager.cxx | 12
sd/uiconfig/simpress/menubar/menubar.xml | 5
sdext/source/pdfimport/filterdet.cxx | 31
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 2
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4
sfx2/Library_sfx.mk | 1
sfx2/source/appl/appdde.cxx | 16
sfx2/source/appl/impldde.cxx | 2
sfx2/source/appl/lnkbase2.cxx | 4
sfx2/source/appl/shutdownicon.cxx | 8
sfx2/source/appl/shutdownicon.hxx | 2
sfx2/source/appl/shutdowniconunx.cxx | 12
sfx2/source/dialog/filedlghelper.cxx | 6
sfx2/source/dialog/infobar.cxx | 67 +
sfx2/source/dialog/mailmodel.cxx | 2
sfx2/source/doc/graphhelp.cxx | 6
sfx2/source/doc/graphhelp.hxx | 2
sfx2/source/doc/sfxacldetect.cxx | 2
sfx2/source/doc/syspath.cxx | 4
sfx2/source/doc/syspathw32.cxx | 4
sfx2/source/inc/workwin.hxx | 4
sfx2/source/view/classificationhelper.cxx | 153 +++
sfx2/source/view/impviewframe.hxx | 3
sfx2/source/view/view.src | 5
sfx2/source/view/viewfrm.cxx | 26
shell/source/backends/localebe/localebackend.cxx | 8
shell/source/tools/lngconvex/lngconvex.cxx | 8
shell/source/win32/workbench/TestSysShExec.cxx | 2
slideshow/source/engine/color.cxx | 12
slideshow/source/inc/hslcolor.hxx | 2
solenv/bin/mkdocs.sh | 2
solenv/bin/modules/installer/control.pm | 2
solenv/gbuild/AutoInstall.mk | 78 -
solenv/gbuild/gen-autoinstall.py | 81 ++
solenv/inc/doxygen.cfg | 2
soltools/cpp/_unix.c | 4
soltools/mkdepend/collectdircontent.cxx | 4
soltools/mkdepend/collectdircontent.hxx | 2
soltools/mkdepend/main.c | 2
sot/inc/sysformats.hxx | 2
sot/source/base/formats.cxx | 2
starmath/inc/ElementsDockingWindow.hxx | 6
starmath/inc/pch/precompiled_sm.hxx | 1
starmath/inc/rect.hxx | 2
starmath/inc/starmath.hrc | 1
starmath/source/ElementsDockingWindow.cxx | 10
starmath/source/accessibility.cxx | 8
starmath/source/cfgitem.cxx | 44 -
starmath/source/commands.src | 1
starmath/source/dialog.cxx | 2
starmath/source/mathmlexport.cxx | 2
starmath/source/node.cxx | 24
starmath/source/parse.cxx | 18
starmath/source/unomodel.cxx | 20
starmath/source/view.cxx | 2
stoc/source/javavm/javavm.cxx | 9
stoc/source/typeconv/convert.cxx | 2
svgio/inc/svgio/svgreader/svgstyleattributes.hxx | 2
svgio/inc/svgio/svgreader/svgtools.hxx | 5
svgio/inc/svgio/svgreader/svgtspannode.hxx | 2
svgio/qa/cppunit/SvgImportTest.cxx | 34
svgio/qa/cppunit/data/FontsizeRelative.svg | 5
svgio/qa/cppunit/data/tdf97941.svg | 6
svgio/source/svgreader/svgstyleattributes.cxx | 43 -
svgio/source/svgreader/svgsvgnode.cxx | 4
svgio/source/svgreader/svgtools.cxx | 4
svgio/source/svgreader/svgtspannode.cxx | 5
svl/qa/unit/svl.cxx | 2
svl/qa/unit/test_URIHelper.cxx | 2
svl/source/config/languageoptions.cxx | 4
svl/source/items/stylepool.cxx | 3
svl/source/svdde/ddedata.cxx | 4
svtools/source/brwbox/datwin.cxx | 11
svtools/source/brwbox/datwin.hxx | 2
svtools/source/control/autocmpledit.cxx | 5
svtools/source/control/inettbc.cxx | 11
svtools/source/dialogs/insdlg.cxx | 2
svtools/source/misc/imagemgr.cxx | 2
svtools/source/misc/transfer.cxx | 6
svtools/source/table/tabledatawindow.cxx | 16
svtools/source/table/tabledatawindow.hxx | 3
svtools/source/uno/fpicker.cxx | 2
svx/inc/pch/precompiled_svx.hxx | 2
svx/sdi/svx.sdi | 17
svx/sdi/svxitems.sdi | 2
svx/source/dialog/rlrcitem.cxx | 20
svx/source/engine3d/scene3d.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/form/tabwin.cxx | 11
svx/source/gengal/gengal.cxx | 2
svx/source/inc/tabwin.hxx | 7
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 2
svx/source/sdr/properties/emptyproperties.cxx | 28
svx/source/sdr/properties/groupproperties.cxx | 20
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 8
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdotext.cxx | 2
svx/source/tbxctrls/tbxcolorupdate.cxx | 3
svx/source/unodraw/recoveryui.cxx | 6
sw/UIConfig_swriter.mk | 1
sw/inc/PostItMgr.hxx | 2
sw/inc/accmap.hxx | 2
sw/inc/docsh.hxx | 2
sw/inc/node.hxx | 2
sw/inc/numrule.hxx | 2
sw/inc/view.hxx | 2
sw/qa/core/layout-test.cxx | 2
sw/qa/core/macros-test.cxx | 6
sw/qa/extras/globalfilter/globalfilter.cxx | 6
sw/qa/extras/odfimport/odfimport.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 2
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2
sw/qa/extras/rtfimport/rtfimport.cxx | 18
sw/sdi/viewsh.sdi | 5
sw/source/core/access/accmap.cxx | 4
sw/source/core/access/accpara.cxx | 4
sw/source/core/access/accpara.hxx | 2
sw/source/core/doc/DocumentContentOperationsManager.cxx | 23
sw/source/core/doc/doc.cxx | 2
sw/source/core/inc/UndoDelete.hxx | 1
sw/source/core/inc/UndoSort.hxx | 1
sw/source/core/text/pormulti.cxx | 1
sw/source/core/text/pormulti.hxx | 4
sw/source/core/txtnode/fntcache.cxx | 4
sw/source/core/undo/undel.cxx | 2
sw/source/core/undo/unsort.cxx | 4
sw/source/core/view/viewsh.cxx | 2
sw/source/filter/basflt/fltshell.cxx | 6
sw/source/filter/html/swhtml.cxx | 2
sw/source/filter/html/swhtml.hxx | 1
sw/source/filter/inc/fltshell.hxx | 3
sw/source/filter/ww8/wrtw8sty.cxx | 4
sw/source/filter/ww8/ww8par5.cxx | 2
sw/source/ui/fldui/fldref.cxx | 129 ++-
sw/source/ui/fldui/fldref.hxx | 8
sw/source/ui/misc/bookmark.cxx | 5
sw/source/ui/vba/vbasystem.cxx | 8
sw/source/uibase/app/docsh2.cxx | 2
sw/source/uibase/cctrl/swlbox.cxx | 16
sw/source/uibase/dbui/dbmgr.cxx | 6
sw/source/uibase/docvw/PostItMgr.cxx | 4
sw/source/uibase/docvw/SidebarWin.cxx | 5
sw/source/uibase/docvw/edtwin.cxx | 9
sw/source/uibase/docvw/romenu.cxx | 4
sw/source/uibase/envelp/envimg.cxx | 2
sw/source/uibase/inc/swlbox.hxx | 5
sw/source/uibase/shells/grfsh.cxx | 4
sw/source/uibase/uiview/uivwimp.cxx | 2
sw/source/uibase/uiview/view.cxx | 2
sw/source/uibase/uiview/view2.cxx | 2
sw/source/uibase/uiview/viewstat.cxx | 7
sw/source/uibase/uno/unotxdoc.cxx | 2
sw/source/uibase/utlui/initui.cxx | 2
sw/uiconfig/swriter/menubar/menubar.xml | 6
sw/uiconfig/swriter/toolbar/drawbar.xml | 6
sw/uiconfig/swriter/toolbar/linesbar.xml | 24
sw/uiconfig/swriter/ui/fldrefpage.ui | 167 ++--
sysui/desktop/menus/draw.desktop | 4
toolkit/source/awt/vclxsystemdependentwindow.cxx | 10
toolkit/source/awt/vclxtoolkit.cxx | 8
toolkit/source/awt/vclxtopwindow.cxx | 10
toolkit/source/awt/vclxwindow1.cxx | 4
toolkit/source/helper/formpdfexport.cxx | 1
tools/qa/cppunit/test_pathutils.cxx | 2
tools/source/datetime/tdate.cxx | 4
tools/source/datetime/ttime.cxx | 8
tools/source/generic/config.cxx | 4
tools/source/inet/inetmime.cxx | 8
tools/source/misc/pathutils.cxx | 2
tools/source/stream/strmsys.cxx | 2
tools/source/stream/strmwnt.cxx | 2
ucb/source/ucp/file/filtask.hxx | 2
ucb/source/ucp/file/prov.cxx | 2
ucb/source/ucp/file/shell.cxx | 2
uui/source/openlocked.cxx | 2
vcl/Library_vcl.mk | 6
vcl/Library_vclplug_gtk.mk | 6
vcl/README | 3
vcl/inc/fontselect.hxx | 4
vcl/inc/graphite_layout.hxx | 2
vcl/inc/graphite_static.hxx | 2
vcl/inc/listbox.hxx | 21
vcl/inc/pch/precompiled_vcl.hxx | 2
vcl/inc/salframe.hxx | 21
vcl/inc/sallayout.hxx | 7
vcl/inc/sft.hxx | 2
vcl/inc/spin.hxx | 9
vcl/inc/svdata.hxx | 2
vcl/inc/svsys.h | 2
vcl/inc/unx/fontmanager.hxx | 6
vcl/inc/unx/gtk/gtkframe.hxx | 8
vcl/inc/unx/gtk/gtksalmenu.hxx | 7
vcl/inc/unx/salinst.h | 2
vcl/inc/win/svsys.h | 2
vcl/opengl/salbmp.cxx | 12
vcl/qa/cppunit/BitmapTest.cxx | 2
vcl/qa/cppunit/complextext.cxx | 6
vcl/qa/cppunit/timer.cxx | 2
vcl/source/app/help.cxx | 36
vcl/source/app/settings.cxx | 6
vcl/source/app/svapp.cxx | 11
vcl/source/app/svmain.cxx | 13
vcl/source/control/button.cxx | 2
vcl/source/control/combobox.cxx | 44 -
vcl/source/control/edit.cxx | 34
vcl/source/control/imp_listbox.cxx | 19
vcl/source/control/listbox.cxx | 16
vcl/source/control/scrbar.cxx | 32
vcl/source/control/spinfld.cxx | 107 +-
vcl/source/control/tabctrl.cxx | 2
vcl/source/filter/graphicfilter.cxx | 2
vcl/source/filter/sgvtext.cxx | 6
vcl/source/font/fontselect.cxx | 2
vcl/source/fontsubset/sft.cxx | 2
vcl/source/gdi/pdfwriter_impl.hxx | 2
vcl/source/glyphs/graphite_features.cxx | 2
vcl/source/glyphs/graphite_layout.cxx | 2
vcl/source/opengl/OpenGLContext.cxx | 20
vcl/source/window/dialog.cxx | 6
vcl/source/window/layout.cxx | 2
vcl/source/window/mouse.cxx | 2
vcl/source/window/syschild.cxx | 2
vcl/source/window/toolbox.cxx | 23
vcl/source/window/window.cxx | 6
vcl/unx/generic/app/salinst.cxx | 9
vcl/unx/generic/fontmanager/fontconfig.cxx | 8
vcl/unx/generic/fontmanager/fontmanager.cxx | 25
vcl/unx/generic/glyphs/gcach_layout.cxx | 2
vcl/unx/generic/window/screensaverinhibitor.cxx | 14
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 2
vcl/unx/gtk/gtkinst.cxx | 8
vcl/unx/gtk/gtksalframe.cxx | 10
vcl/unx/gtk/gtksys.cxx | 7
vcl/unx/gtk3/gtk3gtkframe.cxx | 139 ++-
vcl/unx/kde4/KDESalInstance.cxx | 8
vcl/unx/kde4/KDESalInstance.hxx | 2
vcl/win/gdi/salnativewidgets-luna.cxx | 36
wizards/com/sun/star/wizards/form/FormDocument.java | 2
wizards/com/sun/star/wizards/form/StyleApplier.java | 10
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 2
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 3
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 3
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java | 2
xmlhelp/source/cxxhelp/inc/qe/Query.hxx | 70 -
xmlhelp/source/cxxhelp/provider/databases.cxx | 9
xmlhelp/source/cxxhelp/provider/databases.hxx | 1
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 1
xmlhelp/source/cxxhelp/qe/DocGenerator.cxx | 1
xmloff/source/core/xmltoken.cxx | 1
xmloff/source/draw/sdxmlexp.cxx | 12
xmloff/source/draw/ximppage.cxx | 7
xmloff/source/forms/formattributes.hxx | 1
xmlscript/source/xml_helper/xml_impctx.cxx | 10
xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 2
xmlsecurity/source/dialogs/resourcemanager.cxx | 2
xmlsecurity/workben/signaturetest.cxx | 2
703 files changed, 4625 insertions(+), 2565 deletions(-)
New commits:
commit 1acf8bb1d82414d1fb97adfe6eebfc27a9cd4ae0
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun Feb 21 00:39:30 2016 +1100
vcl: README update - generic was moved some time ago to unx
Change-Id: I463db3f1e0d00fba6e2b83d2e29d381e7df4bd25
diff --git a/vcl/README b/vcl/README
index c162b15..ebf8ee4 100644
--- a/vcl/README
+++ b/vcl/README
@@ -8,9 +8,6 @@ source/
inc/
+ cross-platform abstraction headers
-generic/
- + shared helper code for *some* of the backends, actually built into vcl.
-
headless/
+ a backend renderer that draws to bitmaps
commit 7967e5e51e5210b8c3d3dc63502bd7d875eb36b7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Feb 20 09:29:08 2016 +0100
use O(n) algorithm to change all autofilter entries
Change-Id: Iae80c0c23b15a9c2ba0cd4913d6e22dc4c3a1816
Reviewed-on: https://gerrit.libreoffice.org/22516
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 553babd..865fb7b 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1131,13 +1131,30 @@ void ScCheckListMenuWindow::packWindow()
void ScCheckListMenuWindow::setAllMemberState(bool bSet)
{
size_t n = maMembers.size();
- OUString aLabel;
+ std::set<SvTreeListEntry*> maParents;
for (size_t i = 0; i < n; ++i)
{
- aLabel = maMembers[i].maName;
- if (aLabel.isEmpty())
- aLabel = ScGlobal::GetRscString(STR_EMPTYDATA);
- maChecks->ShowCheckEntry( aLabel, maMembers[i].mpParent, true, bSet);
+ maParents.insert(maMembers[i].mpParent);
+ }
+ for (auto itr = maParents.begin(), itrEnd = maParents.end(); itr != itrEnd; ++itr)
+ {
+ if (!(*itr))
+ {
+ sal_uInt16 nCount = maChecks->GetEntryCount();
+ for( sal_uInt16 i = 0; i < nCount; ++i)
+ {
+ SvTreeListEntry* pEntry = maChecks->GetEntry(i);
+ maChecks->CheckEntry(pEntry, bSet);
+ }
+ }
+ else
+ {
+ SvTreeListEntries& rEntries = (*itr)->GetChildEntries();
+ for (auto it = rEntries.begin(), itEnd = rEntries.end(); it != itEnd; ++ it)
+ {
+ maChecks->CheckEntry(*itr, bSet);
+ }
+ }
}
if (!maConfig.mbAllowEmptySet)
commit 7381cef88cccd2b35a83cd4842c73e4e69a47547
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Feb 20 09:04:53 2016 +0100
use calc brace style
Change-Id: I96d05359308f38d6952137bc0b326505bba47c89
Reviewed-on: https://gerrit.libreoffice.org/22515
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index bf1e638..553babd 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1132,7 +1132,8 @@ void ScCheckListMenuWindow::setAllMemberState(bool bSet)
{
size_t n = maMembers.size();
OUString aLabel;
- for (size_t i = 0; i < n; ++i) {
+ for (size_t i = 0; i < n; ++i)
+ {
aLabel = maMembers[i].maName;
if (aLabel.isEmpty())
aLabel = ScGlobal::GetRscString(STR_EMPTYDATA);
commit 1684e347cd16ce91ecf27d94691b185a0110cc34
Author: Eike Rathke <erack at redhat.com>
Date: Sat Feb 20 01:20:12 2016 +0100
add missing IsFormulaWildcardsEnabled() calls, tdf#72196
Change-Id: Ia684cfe93c6a0e71a0fbbe22974501bf610e9190
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a444491..26b7f10 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8512,9 +8512,8 @@ bool ScInterpreter::MayBeRegExp( const OUString& rStr, const ScDocument* pDoc, b
bool ScInterpreter::MayBeWildcard( const OUString& rStr, const ScDocument* pDoc )
{
- /* TODO: doc options will need a new enum (or a second bool that takes
- * precedence over regex?) */
- (void)pDoc;
+ if ( pDoc && !pDoc->GetDocOptions().IsFormulaWildcardsEnabled() )
+ return false;
// Wildcards without '~' escape, if there are no wildcards then an escaped
// character does not make sense.
@@ -8537,8 +8536,7 @@ utl::SearchParam::SearchType ScInterpreter::DetectSearchType( const OUString& rS
{
if (pDoc)
{
- bool bWildcardEnabled = false; /* TODO: obtain doc option */
- if (bWildcardEnabled)
+ if (pDoc->GetDocOptions().IsFormulaWildcardsEnabled())
return MayBeWildcard( rStr, nullptr) ? utl::SearchParam::SRCH_WILDCARD : utl::SearchParam::SRCH_NORMAL;
if (pDoc->GetDocOptions().IsFormulaRegexEnabled())
return MayBeRegExp( rStr, nullptr) ? utl::SearchParam::SRCH_REGEXP : utl::SearchParam::SRCH_NORMAL;
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 0ac4315..4d7e2d5 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1115,6 +1115,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
|| rOldOpt.IsMatchWholeCell() != rNewOpt.IsMatchWholeCell()
|| rOldOpt.GetYear2000() != rNewOpt.GetYear2000()
|| rOldOpt.IsFormulaRegexEnabled() != rNewOpt.IsFormulaRegexEnabled()
+ || rOldOpt.IsFormulaWildcardsEnabled() != rNewOpt.IsFormulaWildcardsEnabled()
);
pDoc->SetDocOptions( rNewOpt );
pDocSh->SetDocumentModified();
commit 59a175b692fd26200bf2dfbe411a969eef3e00f5
Author: Eike Rathke <erack at redhat.com>
Date: Fri Feb 19 13:20:09 2016 +0100
read ODF table:use-wildcards, tdf#72196
Change-Id: I37dc8d6c75378fabda88930f6cc3f0508587207c
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index 4110b5e..b99b58e 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -89,9 +89,15 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r
}
else if (IsXMLToken(aLocalName, XML_USE_REGULAR_EXPRESSIONS))
{
- if (IsXMLToken(sValue, XML_FALSE))
+ // Overwrite only the default (regex true) value, not wildcard.
+ if (eSearchType == utl::SearchParam::SRCH_REGEXP && IsXMLToken(sValue, XML_FALSE))
eSearchType = utl::SearchParam::SRCH_NORMAL;
}
+ else if (IsXMLToken(aLocalName, XML_USE_WILDCARDS))
+ {
+ if (IsXMLToken(sValue, XML_TRUE))
+ eSearchType = utl::SearchParam::SRCH_WILDCARD;
+ }
}
}
}
commit ef02de2698d90fd874bddf3146165cbe85487bc5
Author: Eike Rathke <erack at redhat.com>
Date: Sat Feb 20 00:36:03 2016 +0100
write ODF table:use-wildcards to calculation settings, tdf#72196
Change-Id: I36d23c891b9ba85f0b0352d2314f092d7e9113eb
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 508f8c2..bcff585 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3749,6 +3749,9 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads
bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(SC_UNO_LOOKUPLABELS) ));
bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(SC_UNO_MATCHWHOLE) ));
bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(SC_UNO_REGEXENABLED) ));
+ bool bUseWildcards (::cppu::any2bool( xPropertySet->getPropertyValue(SC_UNO_WILDCARDSENABLED) ));
+ if (bUseWildcards && bUseRegularExpressions)
+ bUseRegularExpressions = false; // mutually exclusive, wildcards take precedence
bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(SC_UNO_ITERENABLED) ));
sal_uInt16 nYear2000 (pDoc ? pDoc->GetDocOptions().GetYear2000() : 0);
sal_Int32 nIterationCount(100);
@@ -3758,8 +3761,9 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads
util::Date aNullDate;
xPropertySet->getPropertyValue( SC_UNO_NULLDATE ) >>= aNullDate;
if (bCalcAsShown || bIgnoreCase || !bLookUpLabels || !bMatchWholeCell || !bUseRegularExpressions ||
- bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001) ||
- aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 || nYear2000 != 1930)
+ bUseWildcards ||
+ bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001) ||
+ aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 || nYear2000 != 1930)
{
if (bIgnoreCase)
AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_FALSE);
@@ -3771,6 +3775,8 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads
AddAttribute(XML_NAMESPACE_TABLE, XML_AUTOMATIC_FIND_LABELS, XML_FALSE);
if (!bUseRegularExpressions)
AddAttribute(XML_NAMESPACE_TABLE, XML_USE_REGULAR_EXPRESSIONS, XML_FALSE);
+ if (bUseWildcards)
+ AddAttribute(XML_NAMESPACE_TABLE, XML_USE_WILDCARDS, XML_TRUE);
if (nYear2000 != 1930)
{
OUStringBuffer sBuffer;
commit 20fec9becf33e51a1d3ae8afcd52e4d65b343b7a
Author: Eike Rathke <erack at redhat.com>
Date: Sat Feb 20 00:33:01 2016 +0100
import Wildcards at ScXMLCalculationSettingsContext, tdf#72196
Change-Id: Ic0031052a488581ad8627375993c275bc635ed8a
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index 836d530..4110b5e 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -131,8 +131,10 @@ void ScXMLCalculationSettingsContext::EndElement()
xPropertySet->setPropertyValue( SC_UNO_IGNORECASE, uno::makeAny(bIgnoreCase) );
xPropertySet->setPropertyValue( SC_UNO_LOOKUPLABELS, uno::makeAny(bLookUpLabels) );
xPropertySet->setPropertyValue( SC_UNO_MATCHWHOLE, uno::makeAny(bMatchWholeCell) );
- xPropertySet->setPropertyValue( SC_UNO_REGEXENABLED,
- uno::makeAny(eSearchType == utl::SearchParam::SRCH_REGEXP) );
+ bool bWildcards, bRegex;
+ utl::SearchParam::ConvertToBool( eSearchType, bWildcards, bRegex);
+ xPropertySet->setPropertyValue( SC_UNO_REGEXENABLED, uno::makeAny(bRegex) );
+ xPropertySet->setPropertyValue( SC_UNO_WILDCARDSENABLED, uno::makeAny(bWildcards) );
xPropertySet->setPropertyValue( SC_UNO_ITERENABLED, uno::makeAny(bIsIterationEnabled) );
xPropertySet->setPropertyValue( SC_UNO_ITERCOUNT, uno::makeAny(nIterationCount) );
xPropertySet->setPropertyValue( SC_UNO_ITEREPSILON, uno::makeAny(fIterationEpsilon) );
commit 9f0fa7e5316509d73e3384a3b23b61a8a2d27f7c
Author: Eike Rathke <erack at redhat.com>
Date: Sat Feb 20 00:23:31 2016 +0100
add Wildcards UNO API implementation, tdf#72196
Change-Id: I3dbca9661b55596484ac77f92243fd463fa01ec9
diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx
index d2d2bce..b75fb3c 100644
--- a/sc/inc/optuno.hxx
+++ b/sc/inc/optuno.hxx
@@ -35,6 +35,7 @@
#define PROP_UNO_SPELLONLINE 10
#define PROP_UNO_STANDARDDEC 11
#define PROP_UNO_REGEXENABLED 12
+#define PROP_UNO_WILDCARDSENABLED 13
class ScDocOptionsHelper
{
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 5939895..c031789 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -278,6 +278,7 @@
#define SC_UNONAME_ISUSER "IsUserDefined"
#define SC_UNONAME_ISNATIVE "IsNative"
#define SC_UNONAME_REGEXP "RegularExpressions"
+#define SC_UNONAME_WILDCARDS "Wildcards"
#define SC_UNONAME_SAVEOUT "SaveOutputPosition"
#define SC_UNONAME_SKIPDUP "SkipDuplicates"
#define SC_UNONAME_SRCOBJ "SourceObject"
@@ -498,6 +499,7 @@
#define SC_UNO_SPELLONLINE "SpellOnline"
#define SC_UNO_STANDARDDEC "StandardDecimals"
#define SC_UNO_REGEXENABLED "RegularExpressions"
+#define SC_UNO_WILDCARDSENABLED "Wildcards"
#define SC_UNO_BASICLIBRARIES "BasicLibraries"
#define SC_UNO_DIALOGLIBRARIES "DialogLibraries"
#define SC_UNO_RUNTIMEUID "RuntimeUID"
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 7620b63..cdb8682 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -158,6 +158,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap()
{OUString(SC_UNO_SPELLONLINE), PROP_UNO_SPELLONLINE, cppu::UnoType<bool>::get(), 0, 0},
{OUString(SC_UNO_STANDARDDEC), PROP_UNO_STANDARDDEC, cppu::UnoType<sal_Int16>::get(), 0, 0},
{OUString(SC_UNO_REGEXENABLED), PROP_UNO_REGEXENABLED, cppu::UnoType<bool>::get(), 0, 0},
+ {OUString(SC_UNO_WILDCARDSENABLED), PROP_UNO_WILDCARDSENABLED, cppu::UnoType<bool>::get(), 0, 0},
{OUString(SC_UNO_RUNTIMEUID), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0},
{OUString(SC_UNO_HASVALIDSIGNATURES), 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0},
{OUString(SC_UNO_ISLOADED), 0, cppu::UnoType<bool>::get(), 0, 0},
@@ -2102,6 +2103,7 @@ void SAL_CALL ScModelObj::setPropertyValue(
// done...
if ( aString == SC_UNO_IGNORECASE ||
aString == SC_UNONAME_REGEXP ||
+ aString == SC_UNONAME_WILDCARDS ||
aString == SC_UNO_LOOKUPLABELS )
bHardRecalc = false;
}
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index b158b0e..a78d618 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -44,6 +44,7 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap()
{OUString(SC_UNO_SPELLONLINE), PROP_UNO_SPELLONLINE , cppu::UnoType<bool>::get(), 0, 0},
{OUString(SC_UNO_STANDARDDEC), PROP_UNO_STANDARDDEC , cppu::UnoType<sal_Int16>::get(), 0, 0},
{OUString(SC_UNO_REGEXENABLED), PROP_UNO_REGEXENABLED, cppu::UnoType<bool>::get(), 0, 0},
+ {OUString(SC_UNO_WILDCARDSENABLED), PROP_UNO_WILDCARDSENABLED, cppu::UnoType<bool>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
return aMap;
@@ -116,6 +117,9 @@ bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions,
case PROP_UNO_REGEXENABLED:
rOptions.SetFormulaRegexEnabled( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
break;
+ case PROP_UNO_WILDCARDSENABLED:
+ rOptions.SetFormulaWildcardsEnabled( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
+ break;
default:;
}
return true;
@@ -173,6 +177,9 @@ uno::Any ScDocOptionsHelper::getPropertyValue(
case PROP_UNO_REGEXENABLED:
ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsFormulaRegexEnabled() );
break;
+ case PROP_UNO_WILDCARDSENABLED:
+ ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsFormulaWildcardsEnabled() );
+ break;
default:;
}
return aRet;
commit 91dd7a67d1b64d56fc00b19db102731a91f220f7
Author: Eike Rathke <erack at redhat.com>
Date: Sat Feb 20 00:14:54 2016 +0100
add FormulaWildcardsEnabled to ScDocOptions, tdf#72196
Currently as raw bool values matching the configuration values.
Will need a precedence handling.
Change-Id: I1a65b4dc0af54bd39474a2ca329bee1ea0337a9f
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 4b17935..cd7effa 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -46,6 +46,7 @@ class SC_DLLPUBLIC ScDocOptions
bool bDoAutoSpell; ///< auto-spelling
bool bLookUpColRowNames; ///< determine column-/row titles automagically
bool bFormulaRegexEnabled; ///< regular expressions in formulas enabled
+ bool bFormulaWildcardsEnabled;///< wildcards in formulas enabled
bool bWriteCalcConfig; ///< (subset of) Calc config will be written to user's profile
public:
ScDocOptions();
@@ -92,6 +93,9 @@ public:
void SetFormulaRegexEnabled( bool bVal ) { bFormulaRegexEnabled = bVal; }
bool IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; }
+ void SetFormulaWildcardsEnabled( bool bVal ) { bFormulaWildcardsEnabled = bVal; }
+ bool IsFormulaWildcardsEnabled() const { return bFormulaWildcardsEnabled; }
+
void SetWriteCalcConfig( bool bVal ) { bWriteCalcConfig = bVal; }
bool IsWriteCalcConfig() const { return bWriteCalcConfig; }
};
@@ -113,6 +117,7 @@ inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
bDoAutoSpell = rCpy.bDoAutoSpell;
bLookUpColRowNames = rCpy.bLookUpColRowNames;
bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled;
+ bFormulaWildcardsEnabled = rCpy.bFormulaWildcardsEnabled;
bWriteCalcConfig = rCpy.bWriteCalcConfig;
return *this;
@@ -136,6 +141,7 @@ inline bool ScDocOptions::operator==( const ScDocOptions& rOpt ) const
&& rOpt.bDoAutoSpell == bDoAutoSpell
&& rOpt.bLookUpColRowNames == bLookUpColRowNames
&& rOpt.bFormulaRegexEnabled == bFormulaRegexEnabled
+ && rOpt.bFormulaWildcardsEnabled == bFormulaWildcardsEnabled
&& rOpt.bWriteCalcConfig == bWriteCalcConfig
);
}
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index e688752..8b9bcaa 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -71,6 +71,7 @@ ScDocOptions::ScDocOptions( const ScDocOptions& rCpy )
bDoAutoSpell( rCpy.bDoAutoSpell ),
bLookUpColRowNames( rCpy.bLookUpColRowNames ),
bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled ),
+ bFormulaWildcardsEnabled( rCpy.bFormulaWildcardsEnabled ),
bWriteCalcConfig( rCpy.bWriteCalcConfig )
{
}
@@ -96,6 +97,7 @@ void ScDocOptions::ResetDocOptions()
bDoAutoSpell = false;
bLookUpColRowNames = true;
bFormulaRegexEnabled= true;
+ bFormulaWildcardsEnabled= false;
bWriteCalcConfig = true;
}
@@ -147,7 +149,8 @@ SfxPoolItem* ScTpCalcItem::Clone( SfxItemPool * ) const
#define SCCALCOPT_SEARCHCRIT 9
#define SCCALCOPT_FINDLABEL 10
#define SCCALCOPT_REGEX 11
-#define SCCALCOPT_COUNT 12
+#define SCCALCOPT_WILDCARDS 12
+#define SCCALCOPT_COUNT 13
#define CFGPATH_DOCLAYOUT "Office.Calc/Layout/Other"
@@ -170,6 +173,7 @@ Sequence<OUString> ScDocCfg::GetCalcPropertyNames()
"Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT
"Other/FindLabel", // SCCALCOPT_FINDLABEL
"Other/RegularExpressions", // SCCALCOPT_REGEX
+ "Other/Wildcards", // SCCALCOPT_WILDCARDS
};
Sequence<OUString> aNames(SCCALCOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -262,6 +266,9 @@ ScDocCfg::ScDocCfg() :
case SCCALCOPT_REGEX :
SetFormulaRegexEnabled( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
break;
+ case SCCALCOPT_WILDCARDS :
+ SetFormulaWildcardsEnabled( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
+ break;
}
}
}
@@ -345,6 +352,10 @@ IMPL_LINK_NOARG_TYPED(ScDocCfg, CalcCommitHdl, ScLinkConfigItem&, void)
break;
case SCCALCOPT_REGEX :
ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], IsFormulaRegexEnabled() );
+ break;
+ case SCCALCOPT_WILDCARDS :
+ ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], IsFormulaWildcardsEnabled() );
+ break;
}
}
aCalcItem.PutProperties(aNames, aValues);
commit ec3bc95a1cc8283867d2d4df4aa1268588ccaedf
Author: Eike Rathke <erack at redhat.com>
Date: Fri Feb 19 22:22:27 2016 +0100
add Wildcards configuration option, tdf#72196
Currently defaulted to false to not interfere with RegularExpressions
true default, we should switch RegularExpressions to false and Wildcards
to true instead.
Change-Id: I06dd2fd074089629f19a06f3eb65413bdca5d9e0
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 8e1200e..e2006aa 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1308,6 +1308,14 @@
</info>
<value>true</value>
</prop>
+ <prop oor:name="Wildcards" oor:type="xs:boolean" oor:nillable="false">
+ <!-- UIHints: Tools - Options Spreadsheet Calculate [Check box] Enable wildcards in formulas -->
+ <info>
+ <desc>Specifies whether the calculation uses wildcards in formulas, e.g. for functions which look up sheet contents.</desc>
+ <label>Enable wildcards in formulas</label>
+ </info>
+ <value>false</value>
+ </prop>
<prop oor:name="FormulaSyntax" oor:type="xs:int">
<!-- UIHints: Tools - Options Spreadsheet Calculate -->
<!-- This node is deprecated, but we still need to keep it for migration purposes. -->
commit da6d813222e81470fac38282d1cebd1f858ba925
Author: Eike Rathke <erack at redhat.com>
Date: Fri Feb 19 13:41:47 2016 +0100
add [optional, property] boolean Wildcards, tdf#72196
Change-Id: I7105bdeafe6a1b8bf24e88f7a00d5eb3d23df15a
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
index dca11f4..bdb784e4 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
@@ -124,6 +124,10 @@ published service SpreadsheetDocumentSettings
/** specifies whether regular expressions in formulas are enabled,
e.g., for functions which look up spreadsheet contents.
+
+ <p>RegularExpressions and Wildcards are mutually exclusive, only
+ one can have the value `TRUE`. Internally, if both are true then
+ Wildcards takes precedence over RegularExpressions.</p>
*/
[property] boolean RegularExpressions;
@@ -208,6 +212,18 @@ published service SpreadsheetDocumentSettings
*/
[readonly,optional, property] boolean IsRecordChangesProtected;
+
+ /** specifies whether wildcards in formulas are enabled,
+ e.g., for functions which look up spreadsheet contents.
+
+ <p>Wildcards and RegularExpressions are mutually exclusive, only
+ one can have the value `TRUE`. Internally, if both are true then
+ Wildcards takes precedence over RegularExpressions.</p>
+
+ @since LibreOffice 5.2
+ */
+ [optional, property] boolean Wildcards;
+
};
commit fb3f66c20f79f178ba0f53b850ed0af0d1c5b2ff
Author: Eike Rathke <erack at redhat.com>
Date: Fri Feb 19 12:33:47 2016 +0100
add ConvertToSearchType() ConvertToBool(), tdf#72196
Change-Id: Iaab31cd6afe5cedccd4f79b142aa1ecee8a6e8d4
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 7ddfbf0..67c440a 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -49,6 +49,36 @@ class UNOTOOLS_DLLPUBLIC SearchParam
public:
enum SearchType{ SRCH_NORMAL, SRCH_REGEXP, SRCH_LEVDIST, SRCH_WILDCARD };
+ /** Convert configuration and document boolean settings to SearchType.
+ If bWildcard is true it takes precedence over bRegExp.
+ */
+ static SearchType ConvertToSearchType( bool bWildcard, bool bRegExp )
+ {
+ return bWildcard ? SRCH_WILDCARD : (bRegExp ? SRCH_REGEXP : SRCH_NORMAL);
+ }
+
+ /** Convert SearchType to configuration and document boolean settings.
+ */
+ static void ConvertToBool( const SearchType eSearchType, bool& rbWildcard, bool& rbRegExp )
+ {
+ switch (eSearchType)
+ {
+ case SRCH_WILDCARD:
+ rbWildcard = true;
+ rbRegExp = false;
+ break;
+ case SRCH_REGEXP:
+ rbWildcard = false;
+ rbRegExp = true;
+ break;
+ default:
+ // SRCH_LEVDIST is not a persistent setting.
+ rbWildcard = false;
+ rbRegExp = false;
+ break;
+ }
+ }
+
private:
OUString sSrchStr; // the search string
OUString sReplaceStr; // the replace string
commit 4bc2e84c8bf9ff685ecb00b1bf782eae9ee93e8d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 19 16:36:07 2016 +0000
no need for two triggerColumnContextMenu
Change-Id: I7c16f510fa998b63c9e845414cb01e3acdd8a3bb
Reviewed-on: https://gerrit.libreoffice.org/22509
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index a654599..c2b1173 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -37,21 +37,14 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FmGridHeader
protected:
FmGridHeaderData* m_pImpl;
- // trigger context menu execution
- void triggerColumnContextMenu( const ::Point& _rPreferredPos );
-
public:
FmGridHeader( BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG );
virtual ~FmGridHeader();
virtual void dispose() override;
public:
- struct AccessControl { friend class FmGridControl; private: AccessControl() { } };
-
- inline void triggerColumnContextMenu( const ::Point& _rPreferredPos, const AccessControl& )
- {
- triggerColumnContextMenu( _rPreferredPos );
- }
+ // trigger context menu execution
+ void triggerColumnContextMenu( const ::Point& _rPreferredPos );
protected:
virtual void Command( const CommandEvent& rCEvt ) override;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index ddd6a70..75ffd75 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1030,7 +1030,7 @@ void FmGridControl::Command(const CommandEvent& _rEvt)
::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) );
Point aRelativePos( pMyHeader->ScreenToOutputPixel( OutputToScreenPixel( aColRect.TopCenter() ) ) );
- pMyHeader->triggerColumnContextMenu( aRelativePos, FmGridHeader::AccessControl() );
+ pMyHeader->triggerColumnContextMenu(aRelativePos);
// handled
return;
commit fabc45a6a902c8988eff087831f8b2f84ea8ae6c
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Feb 19 17:32:48 2016 +0100
sw: tdf#63022 fix drag-and-drop of text in same paragraph
SplitNode() inserts new node before the existing one, so pEndTextNd and
aRg.aEnd point one node too far.
Change-Id: I6cea44fafd9d2b47e77e76892a260c5a8c6849fc
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 750dcbe..334e72c 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4264,18 +4264,16 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
rPam.Move( fnMoveBackward, fnGoContent );
if( bChg )
rPam.Exchange();
-
- aRg.aEnd = pEnd->nNode;
- pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
}
else if( rPos == *pEnd )
{
// The end was also moved
pEnd->nNode--;
pEnd->nContent.Assign( pDestTextNd, nContentEnd );
- aRg.aEnd = pEnd->nNode;
- pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
}
+ // tdf#63022 always reset pEndTextNd after SplitNode
+ aRg.aEnd = pEnd->nNode;
+ pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
}
NUMRULE_STATE
commit f2984e95740cfbb9c74574f2a1225af3411d4901
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 19 11:59:32 2016 +0000
always support packagekit if dbus is enabled
Change-Id: I8eb169d33fcb0217989b180aa0c4c0110875be32
Reviewed-on: https://gerrit.libreoffice.org/22503
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index fd20bfd..d0ee166 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2537,12 +2537,6 @@ $(call gb_LinkTarget_set_include,$(1),\
$(DBUS_CFLAGS) \
)
-ifeq ($(ENABLE_PACKAGEKIT),TRUE)
-$(call gb_LinkTarget_add_defs,$(1),\
- -DENABLE_PACKAGEKIT \
-)
-endif # ENABLE_PACKAGEKIT
-
$(call gb_LinkTarget_add_libs,$(1),\
$(DBUS_LIBS) \
)
diff --git a/config_host.mk.in b/config_host.mk.in
index 2721820..6170227 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -157,7 +157,6 @@ export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@
export ENABLE_OOENV=@ENABLE_OOENV@
export ENABLE_OPENGL=@ENABLE_OPENGL@
export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
-export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
export ENABLE_PCH=@ENABLE_PCH@
export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
export ENABLE_RANDR=@ENABLE_RANDR@
diff --git a/configure.ac b/configure.ac
index c6a9b7d..b6f6f37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1216,15 +1216,9 @@ AC_ARG_ENABLE(cairo-canvas,
AC_ARG_ENABLE(dbus,
AS_HELP_STRING([--disable-dbus],
[Determines whether to enable features that depend on dbus.
- e.g. Presentation mode screensaver control, bluetooth presentation control]),
+ e.g. Presentation mode screensaver control, bluetooth presentation control, automatic font install]),
,enable_dbus=yes)
-AC_ARG_ENABLE(packagekit,
- AS_HELP_STRING([--enable-packagekit],
- [Determines whether to enable features using packagekit.
- Right now that is auto font install]),
-,)
-
AC_ARG_ENABLE(sdremote,
AS_HELP_STRING([--disable-sdremote],
[Determines whether to enable Impress remote control (i.e. the server component).]),
@@ -10052,20 +10046,6 @@ AC_SUBST(ENABLE_DBUS)
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
-AC_MSG_CHECKING([whether to enable font install via packagekit])
-if test "$ENABLE_DBUS" = "TRUE"; then
- if test -n "$enable_packagekit" -a "$enable_packagekit" != "no"; then
- ENABLE_PACKAGEKIT=TRUE
- AC_MSG_RESULT([yes])
- else
- ENABLE_PACKAGEKIT=
- AC_MSG_RESULT([no])
- fi
-else
- AC_MSG_RESULT([no, dbus disabled.])
-fi
-AC_SUBST(ENABLE_PACKAGEKIT)
-
AC_MSG_CHECKING([whether to enable Impress remote control])
if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
AC_MSG_RESULT([yes])
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index d365800..1ffe504 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -317,12 +317,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
static bool addFontconfigDir(const OString& rDirectory);
std::set<OString> m_aPreviousLangSupportRequests;
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
std::vector<OString> m_aCurrentRequests;
#endif
Timer m_aFontInstallerTimer;
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void );
#endif
PrintFontManager();
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 8def362..aff2848 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -37,7 +37,7 @@ using namespace psp;
#include <ft2build.h>
#include <fontconfig/fcfreetype.h>
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
#include <dbus/dbus-glib.h>
#endif
@@ -877,7 +877,7 @@ namespace
return LanguageTag(OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8));
}
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
guint get_xid_for_dbus()
{
const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? nullptr : Application::GetActiveTopWindow();
@@ -887,7 +887,7 @@ namespace
#endif
}
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
{
guint xid = get_xid_for_dbus();
@@ -1098,7 +1098,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
}
}
OUString sStillMissing(pRemainingCodes.get(), nRemainingLen);
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
if (get_xid_for_dbus())
{
if (sStillMissing == rMissingCodes) //replaced nothing
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index b2525ac..8089eae 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -674,7 +674,7 @@ PrintFontManager::PrintFontManager()
}
}
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
m_aFontInstallerTimer.SetTimeoutHdl(LINK(this, PrintFontManager, autoInstallFontLangSupport));
m_aFontInstallerTimer.SetTimeout(5000);
#endif
commit 67b14461bfcf4847b83b17535dde9b3efa2ed762
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Feb 19 16:35:23 2016 +0100
sfx classification: give access to document header/footer and watermark
Change-Id: I07e22f16cfa0229f609e7fc406e98e9f0c843153
diff --git a/include/sfx2/classificationhelper.hxx b/include/sfx2/classificationhelper.hxx
index c62ffac..613d35e 100644
--- a/include/sfx2/classificationhelper.hxx
+++ b/include/sfx2/classificationhelper.hxx
@@ -37,6 +37,7 @@ public:
/// If GetImpactLevelColor() will return something meaningful.
bool HasImpactLevel();
basegfx::BColor GetImpactLevelColor();
+ OUString GetDocumentWatermark();
};
#endif
diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx
index 9270c46..d062eac 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -141,4 +141,13 @@ basegfx::BColor SfxClassificationHelper::GetImpactLevelColor()
return aRet;
}
+OUString SfxClassificationHelper::GetDocumentWatermark()
+{
+ std::map<OUString, OUString>::iterator it = m_pImpl->m_aLabels.find("urn:bails:IntellectualProperty:Marking:document-watermark");
+ if (it != m_pImpl->m_aLabels.end())
+ return it->second;
+
+ return OUString();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 538cf0c496f509f8fa7efa2bc61bfb5e8878d097
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 19 11:16:57 2016 +0000
move dbus config into its own config header
Change-Id: I5b0734a30dee323d41270de06f6a02fd676155c9
Reviewed-on: https://gerrit.libreoffice.org/22502
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b3b06db..fd20bfd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2537,10 +2537,6 @@ $(call gb_LinkTarget_set_include,$(1),\
$(DBUS_CFLAGS) \
)
-$(call gb_LinkTarget_add_defs,$(1),\
- -DENABLE_DBUS \
-)
-
ifeq ($(ENABLE_PACKAGEKIT),TRUE)
$(call gb_LinkTarget_add_defs,$(1),\
-DENABLE_PACKAGEKIT \
diff --git a/config_host/config_dbus.h.in b/config_host/config_dbus.h.in
new file mode 100644
index 0000000..44cbf8a
--- /dev/null
+++ b/config_host/config_dbus.h.in
@@ -0,0 +1,17 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_CONFIG_DBUS_H
+#define INCLUDED_CONFIG_DBUS_H
+
+#define ENABLE_DBUS 0
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/config_host/config_gio.h.in b/config_host/config_gio.h.in
index 1c0c440..a2d880e 100644
--- a/config_host/config_gio.h.in
+++ b/config_host/config_gio.h.in
@@ -1,12 +1,17 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
-Settings for gio header file dection
-
-*/
-
-#ifndef CONFIG_GIO_H
-#define CONFIG_GIO_H
+#ifndef INCLUDED_CONFIG_GIO_H
+#define INCLUDED_CONFIG_GIO_H
#define ENABLE_GIO 0
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index 5993c11..c6a9b7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10040,6 +10040,7 @@ if test "$test_dbus" = "yes"; then
ENABLE_DBUS="TRUE"
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.70)
+ AC_DEFINE(ENABLE_DBUS)
DBUS_CFLAGS=$(printf '%s' "$DBUS_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
FilterLibs "${DBUS_LIBS}"
DBUS_LIBS="${filteredlibs}"
@@ -12849,6 +12850,7 @@ AC_CONFIG_HEADERS([config_host/config_eot.h])
AC_CONFIG_HEADERS([config_host/config_extension_update.h])
AC_CONFIG_HEADERS([config_host/config_cairo_canvas.h])
AC_CONFIG_HEADERS([config_host/config_cups.h])
+AC_CONFIG_HEADERS([config_host/config_dbus.h])
AC_CONFIG_HEADERS([config_host/config_features.h])
AC_CONFIG_HEADERS([config_host/config_folders.h])
AC_CONFIG_HEADERS([config_host/config_gcc.h])
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx b/sd/source/ui/remotecontrol/BluetoothServer.hxx
index ac0fe3c..8ec485d 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.hxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx
@@ -13,7 +13,9 @@
#include <memory>
#include <vector>
-#if (defined(LINUX) && !defined(__FreeBSD_kernel__)) && defined(ENABLE_DBUS)
+#include <config_dbus.h>
+
+#if (defined(LINUX) && !defined(__FreeBSD_kernel__)) && ENABLE_DBUS
# define LINUX_BLUETOOTH
#endif
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 3270175..2c0db54 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -44,12 +44,6 @@ $(eval $(call gb_Library_set_include,vcl,\
$(if $(filter WNT,$(OS)),-I$(SRCDIR)/vcl/inc/glyphy/demo) \
))
-ifeq ($(ENABLE_DBUS),TRUE)
-$(eval $(call gb_Library_add_defs,vclplug_gen,\
- -DENABLE_DBUS \
-))
-endif
-
$(eval $(call gb_Library_add_defs,vcl,\
-DVCL_DLLIMPLEMENTATION \
-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\" \
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 8a61131..c32a127 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -30,12 +30,6 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\
-DVCLPLUG_GTK_IMPLEMENTATION \
))
-ifeq ($(ENABLE_DBUS),TRUE)
-$(eval $(call gb_Library_add_defs,vclplug_gtk,\
- -DENABLE_DBUS \
-))
-endif
-
$(eval $(call gb_Library_use_custom_headers,vclplug_gtk,\
officecfg/registry \
))
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 1fdf273..d365800 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -35,6 +35,8 @@
#include <vector>
+#include "config_dbus.h"
+
#define ATOM_FAMILYNAME 2
#define ATOM_PSNAME 3
@@ -315,12 +317,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
static bool addFontconfigDir(const OString& rDirectory);
std::set<OString> m_aPreviousLangSupportRequests;
-#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
std::vector<OString> m_aCurrentRequests;
#endif
Timer m_aFontInstallerTimer;
-#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void );
#endif
PrintFontManager();
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 93aac14..ed34e3e 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -47,6 +47,7 @@
#include <list>
#include <vector>
+#include <config_dbus.h>
#include <config_gio.h>
#include "headless/svpgdi.hxx"
@@ -224,7 +225,7 @@ class GtkSalFrame : public SalFrame
SalMenu* m_pSalMenu;
-#if defined(ENABLE_DBUS) && ENABLE_GIO
+#if ENABLE_DBUS && ENABLE_GIO
public:
void EnsureDbusMenuSynced();
private:
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 3e827ff..405c635 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -10,6 +10,7 @@
#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
#define INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
+#include <config_dbus.h>
#include <config_gio.h>
#include <vector>
@@ -20,7 +21,7 @@
#include <unx/salmenu.h>
#include <unx/gtk/gtkframe.hxx>
-#if defined(ENABLE_DBUS) && ENABLE_GIO && \
+#if ENABLE_DBUS && ENABLE_GIO && \
(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 36)
# define ENABLE_GMENU_INTEGRATION
# include <unx/gtk/glomenu.h>
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index edd303c..8def362 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -37,7 +37,7 @@ using namespace psp;
#include <ft2build.h>
#include <fontconfig/fcfreetype.h>
-#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
#include <dbus/dbus-glib.h>
#endif
@@ -877,7 +877,7 @@ namespace
return LanguageTag(OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8));
}
-#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
guint get_xid_for_dbus()
{
const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? nullptr : Application::GetActiveTopWindow();
@@ -887,7 +887,7 @@ namespace
#endif
}
-#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
{
guint xid = get_xid_for_dbus();
@@ -1098,7 +1098,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
}
}
OUString sStillMissing(pRemainingCodes.get(), nRemainingLen);
-#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
if (get_xid_for_dbus())
{
if (sStillMissing == rMissingCodes) //replaced nothing
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index d8863a4..b2525ac 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -674,7 +674,7 @@ PrintFontManager::PrintFontManager()
}
}
-#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
m_aFontInstallerTimer.SetTimeoutHdl(LINK(this, PrintFontManager, autoInstallFontLangSupport));
m_aFontInstallerTimer.SetTimeout(5000);
#endif
diff --git a/vcl/unx/generic/window/screensaverinhibitor.cxx b/vcl/unx/generic/window/screensaverinhibitor.cxx
index ca4cecc..3c20323 100644
--- a/vcl/unx/generic/window/screensaverinhibitor.cxx
+++ b/vcl/unx/generic/window/screensaverinhibitor.cxx
@@ -15,7 +15,9 @@
#include <X11/Xlib.h>
#include <postx.h>
-#ifdef ENABLE_DBUS
+#include <config_dbus.h>
+
+#if ENABLE_DBUS
#include <dbus/dbus-glib.h>
#define FDO_DBUS_SERVICE "org.freedesktop.ScreenSaver"
@@ -64,7 +66,7 @@ void ScreenSaverInhibitor::inhibit( bool bInhibit, const OUString& sReason,
}
}
-#ifdef ENABLE_DBUS
+#if ENABLE_DBUS
void dbusInhibit( bool bInhibit,
const gchar* service, const gchar* path, const gchar* interface,
std::function<bool( DBusGProxy*, guint&, GError*& )> fInhibit,
@@ -135,7 +137,7 @@ void dbusInhibit( bool bInhibit,
void ScreenSaverInhibitor::inhibitFDO( bool bInhibit, const char* appname, const char* reason )
{
-#ifdef ENABLE_DBUS
+#if ENABLE_DBUS
dbusInhibit( bInhibit,
FDO_DBUS_SERVICE, FDO_DBUS_PATH, FDO_DBUS_INTERFACE,
[appname, reason] ( DBusGProxy *proxy, guint& nCookie, GError*& error ) -> bool {
@@ -165,7 +167,7 @@ void ScreenSaverInhibitor::inhibitFDO( bool bInhibit, const char* appname, const
void ScreenSaverInhibitor::inhibitFDOPM( bool bInhibit, const char* appname, const char* reason )
{
-#ifdef ENABLE_DBUS
+#if ENABLE_DBUS
dbusInhibit( bInhibit,
FDOPM_DBUS_SERVICE, FDOPM_DBUS_PATH, FDOPM_DBUS_INTERFACE,
[appname, reason] ( DBusGProxy *proxy, guint& nCookie, GError*& error ) -> bool {
@@ -195,7 +197,7 @@ void ScreenSaverInhibitor::inhibitFDOPM( bool bInhibit, const char* appname, con
void ScreenSaverInhibitor::inhibitGSM( bool bInhibit, const char* appname, const char* reason, const unsigned int xid )
{
-#ifdef ENABLE_DBUS
+#if ENABLE_DBUS
dbusInhibit( bInhibit,
GSM_DBUS_SERVICE, GSM_DBUS_PATH, GSM_DBUS_INTERFACE,
[appname, reason, xid] ( DBusGProxy *proxy, guint& nCookie, GError*& error ) -> bool {
@@ -228,7 +230,7 @@ void ScreenSaverInhibitor::inhibitGSM( bool bInhibit, const char* appname, const
void ScreenSaverInhibitor::inhibitMSM( bool bInhibit, const char* appname, const char* reason, const unsigned int xid )
{
-#ifdef ENABLE_DBUS
+#if ENABLE_DBUS
dbusInhibit( bInhibit,
MSM_DBUS_SERVICE, MSM_DBUS_PATH, MSM_DBUS_INTERFACE,
[appname, reason, xid] ( DBusGProxy *proxy, guint& nCookie, GError*& error ) -> bool {
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index fcd05b0..3c16a96 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -42,7 +42,7 @@
#include <config_gio.h>
#include <unx/x11/xlimits.hxx>
-#if defined(ENABLE_DBUS) && ENABLE_GIO
+#if ENABLE_DBUS && ENABLE_GIO
# include <unx/gtk/gtksalmenu.hxx>
#endif
#if defined ENABLE_GMENU_INTEGRATION // defined in gtksalmenu.hxx above
@@ -437,7 +437,7 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
m_bDefaultPos = true;
m_bDefaultSize = ( (nStyle & SalFrameStyleFlags::SIZEABLE) && ! pParent );
m_bWindowIsGtkPlug = false;
-#if defined(ENABLE_DBUS) && ENABLE_GIO
+#if ENABLE_DBUS && ENABLE_GIO
m_pLastSyncedDbusMenu = nullptr;
#endif
Init( pParent, nStyle );
@@ -453,7 +453,7 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
GetGenericData()->ErrorTrapPush();
m_bDefaultPos = true;
m_bDefaultSize = true;
-#if defined(ENABLE_DBUS) && ENABLE_GIO
+#if ENABLE_DBUS && ENABLE_GIO
m_pLastSyncedDbusMenu = nullptr;
#endif
Init( pSysData );
@@ -493,7 +493,7 @@ static void ObjectDestroyedNotify( gpointer data )
}
}
-#if defined(ENABLE_DBUS) && ENABLE_GIO
+#if ENABLE_DBUS && ENABLE_GIO
void GtkSalFrame::EnsureDbusMenuSynced()
{
GtkSalMenu* pSalMenu = static_cast<GtkSalMenu*>(GetMenu());
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 6d02b81..c125ec5 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -40,7 +40,7 @@
#include <config_gio.h>
-#if defined(ENABLE_DBUS) && ENABLE_GIO
+#if ENABLE_DBUS && ENABLE_GIO
# include <unx/gtk/gtksalmenu.hxx>
#endif
#if defined ENABLE_GMENU_INTEGRATION // defined in gtksalmenu.hxx above
@@ -463,7 +463,7 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
m_bDefaultPos = true;
m_bDefaultSize = ( (nStyle & SalFrameStyleFlags::SIZEABLE) && ! pParent );
m_bWindowIsGtkPlug = false;
-#if defined(ENABLE_DBUS) && ENABLE_GIO
+#if ENABLE_DBUS && ENABLE_GIO
m_pLastSyncedDbusMenu = nullptr;
#endif
Init( pParent, nStyle );
@@ -479,7 +479,7 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
GetGenericData()->ErrorTrapPush();
m_bDefaultPos = true;
m_bDefaultSize = true;
-#if defined(ENABLE_DBUS) && ENABLE_GIO
+#if ENABLE_DBUS && ENABLE_GIO
m_pLastSyncedDbusMenu = nullptr;
#endif
Init( pSysData );
@@ -496,7 +496,7 @@ static void ObjectDestroyedNotify( gpointer data )
}
}
-#if defined(ENABLE_DBUS) && ENABLE_GIO
+#if ENABLE_DBUS && ENABLE_GIO
void GtkSalFrame::EnsureDbusMenuSynced()
{
GtkSalMenu* pSalMenu = static_cast<GtkSalMenu*>(GetMenu());
commit 26912eea7521dd2b84bfac56b322cf0f8b142450
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Feb 19 14:34:44 2016 +0100
sd: replace boost::bind with C++11 lambdas and for loops
Change-Id: I4de92df1848a1c00e71d4cdb5638b73c3b76f282
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index a4c6734..2dd7db8 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -20,7 +20,6 @@
#include "controller/SlsAnimator.hxx"
#include "view/SlideSorterView.hxx"
#include "View.hxx"
-#include <boost/bind.hpp>
namespace sd { namespace slidesorter { namespace controller {
@@ -132,10 +131,8 @@ void Animator::RemoveAnimation (const Animator::AnimationId nId)
const AnimationList::iterator iAnimation (::std::find_if(
maAnimations.begin(),
maAnimations.end(),
- ::boost::bind(
- ::std::equal_to<Animator::AnimationId>(),
- nId,
- ::boost::bind(&Animation::mnAnimationId, _1))));
+ [nId] (std::shared_ptr<Animation> const& pAnim)
+ { return nId == pAnim->mnAnimationId; }));
if (iAnimation != maAnimations.end())
{
OSL_ASSERT((*iAnimation)->mnAnimationId == nId);
@@ -156,12 +153,10 @@ void Animator::RemoveAnimation (const Animator::AnimationId nId)
void Animator::RemoveAllAnimations()
{
- ::std::for_each(
- maAnimations.begin(),
- maAnimations.end(),
- ::boost::bind(
- &Animation::Expire,
- _1));
+ for (auto const& it : maAnimations)
+ {
+ it->Expire();
+ }
maAnimations.clear();
mnNextAnimationId = 0;
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index e6068f5..49127da 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -36,7 +36,6 @@
#include "app.hrc"
#include "sdtreelb.hxx"
#include <sfx2/bindings.hxx>
-#include <boost/bind.hpp>
namespace sd { namespace slidesorter { namespace controller {
@@ -95,8 +94,9 @@ void DragAndDropContext::UpdatePosition (
bool bDoAutoScroll = bAllowAutoScroll
&& mpTargetSlideSorter->GetController().GetScrollBarManager().AutoScroll(
rMousePosition,
- ::boost::bind(
- &DragAndDropContext::UpdatePosition, this, rMousePosition, eMode, false));
+ [this, eMode, &rMousePosition] () {
+ return this->UpdatePosition(rMousePosition, eMode, false);
+ });
if (!bDoAutoScroll)
{
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 9758214..6c2396e 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -62,7 +62,6 @@
#include <svx/svdpagv.hxx>
#include <vcl/msgbox.hxx>
#include <svx/svxids.hrc>
-#include <boost/bind.hpp>
#include <boost/optional.hpp>
namespace {
@@ -1386,11 +1385,7 @@ void MultiSelectionModeHandler::UpdatePosition (
bool bDoAutoScroll = bAllowAutoScroll && mrSlideSorter.GetController().GetScrollBarManager().AutoScroll(
rMousePosition,
- ::boost::bind(
- &MultiSelectionModeHandler::UpdatePosition,
- this,
- rMousePosition,
- false));
+ [this, &rMousePosition] () { return this->UpdatePosition(rMousePosition, false); });
if (!bDoAutoScroll)
UpdateModelPosition(aMouseModelPosition);
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 0a2a382..a839bdca 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -87,7 +87,6 @@
#include <com/sun/star/drawing/XDrawPages.hpp>
#include <vcl/svapp.hxx>
-#include <boost/bind.hpp>
#include <memory>
using namespace ::com::sun::star;
@@ -1137,13 +1136,10 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest)
// Set the selection to the pages in aPagesToSelect.
PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector());
rSelector.DeselectAllPages();
- ::std::for_each (
- aPagesToSelect.begin(),
- aPagesToSelect.end(),
- ::boost::bind(
- static_cast<void (PageSelector::*)(const SdPage*)>(&PageSelector::SelectPage),
- ::boost::ref(rSelector),
- _1));
+ for (auto const& it: aPagesToSelect)
+ {
+ rSelector.SelectPage(it);
+ }
}
void SlotManager::ChangeSlideExclusionState (
commit db98187505c4eb95c0f815ee2646334b08445e21
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Feb 19 14:13:01 2016 +0100
sd: replace boost::bind with C++11 lambdas
Change-Id: Ib5837a056ea4131432c7b167b264019d4e32c2c8
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index c5d118635..365b73b 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -27,7 +27,6 @@
#include <memory>
#include <set>
-#include <boost/bind.hpp>
namespace sd { namespace slidesorter { namespace view {
@@ -258,10 +257,8 @@ InsertAnimator::Implementation::RunContainer::const_iterator
return std::find_if(
maRuns.begin(),
maRuns.end(),
- ::boost::bind(
- ::std::equal_to<sal_Int32>(),
- ::boost::bind(&PageObjectRun::mnRunIndex, _1),
- nRunIndex));
+ [nRunIndex] (std::shared_ptr<PageObjectRun> const& rRun)
+ { return rRun->mnRunIndex == nRunIndex; });
}
void InsertAnimator::Implementation::AddRun (const std::shared_ptr<PageObjectRun>& rRun)
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index 030d547..84de2c9 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -25,7 +25,6 @@
#include <tools/gen.hxx>
#include <tools/fract.hxx>
-#include <boost/bind.hpp>
#include <boost/noncopyable.hpp>
#include <functional>
@@ -260,12 +259,13 @@ void LayeredDevice::RemovePainter (
void LayeredDevice::Repaint (const vcl::Region& rRepaintRegion)
{
// Validate the contents of all layers (that have their own devices.)
- ::std::for_each(
- mpLayers->begin(),
- mpLayers->end(),
- ::boost::bind(&Layer::Validate, _1, mpTargetWindow->GetMapMode()));
+ for (auto const& it : *mpLayers)
+ {
+ it->Validate(mpTargetWindow->GetMapMode());
+ }
- ForAllRectangles(rRepaintRegion, ::boost::bind(&LayeredDevice::RepaintRectangle, this, _1));
+ ForAllRectangles(rRepaintRegion,
+ [this] (Rectangle const& r) { this->RepaintRectangle(r); });
}
void LayeredDevice::RepaintRectangle (const Rectangle& rRepaintRectangle)
@@ -283,11 +283,10 @@ void LayeredDevice::RepaintRectangle (const Rectangle& rRepaintRectangle)
// due to synchronous paints) and then copy that into the target
// device.
mpBackBuffer->SetMapMode(mpTargetWindow->GetMapMode());
- ::std::for_each(
- mpLayers->begin(),
- mpLayers->end(),
- ::boost::bind(&Layer::Repaint, _1, ::boost::ref(*mpBackBuffer), rRepaintRectangle));
-
+ for (auto const& it : *mpLayers)
+ {
+ it->Repaint(*mpBackBuffer, rRepaintRectangle);
+ }
DeviceCopy(*mpTargetWindow, *mpBackBuffer, rRepaintRectangle);
}
}
@@ -296,12 +295,18 @@ void LayeredDevice::Resize()
{
const Size aSize (mpTargetWindow->GetSizePixel());
mpBackBuffer->SetOutputSizePixel(aSize);
- ::std::for_each(mpLayers->begin(), mpLayers->end(), ::boost::bind(&Layer::Resize, _1, aSize));
+ for (auto const& it : *mpLayers)
+ {
+ it->Resize(aSize);
+ }
}
void LayeredDevice::Dispose()
{
- ::std::for_each(mpLayers->begin(), mpLayers->end(), ::boost::bind(&Layer::Dispose, _1));
+ for (auto const& it : *mpLayers)
+ {
+ it->Dispose();
+ }
mpLayers->clear();
}
@@ -414,7 +419,7 @@ void Layer::Validate (const MapMode& rMapMode)
mpLayerDevice->SetMapMode(rMapMode);
ForAllRectangles(
aRegion,
- ::boost::bind(&Layer::ValidateRectangle, this, _1));
+ [this] (Rectangle const& r) { return this->ValidateRectangle(r); });
}
}
@@ -447,13 +452,10 @@ void Layer::Repaint (
}
else
{
- ::std::for_each(
- maPainters.begin(),
- maPainters.end(),
- ::boost::bind(&ILayerPainter::Paint,
- _1,
- ::boost::ref(rTargetDevice),
- rRepaintRectangle));
+ for (auto const& it : maPainters)
+ {
+ it->Paint(rTargetDevice, rRepaintRectangle);
+ }
}
}
commit 9db28f9ac11eba143169773012e87216a419fe84
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Feb 19 13:14:09 2016 +0100
svx: these look like they should be assert()
Change-Id: Icb70e87edd1a864da4ecb3931de9c402a115aaa5
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index e97d3e49..d44826f 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -34,7 +34,7 @@ namespace sdr
SfxItemSet* EmptyProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
// Basic implementation; Basic object has NO attributes
- SAL_WARN("svx.sdr", "EmptyProperties::CreateObjectSpecificItemSet() should never be called");
+ assert(!"EmptyProperties::CreateObjectSpecificItemSet() should never be called");
return new SfxItemSet(rPool);
}
@@ -73,66 +73,66 @@ namespace sdr
const_cast<EmptyProperties*>(this)->mpEmptyItemSet = const_cast<EmptyProperties*>(this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool());
}
- SAL_WARN_IF(!mpEmptyItemSet, "svx.sdr", "Could not create an SfxItemSet(!)");
- SAL_WARN("svx.sdr", "EmptyProperties::GetObjectItemSet() should never be called (!)");
+ assert(mpEmptyItemSet);
+ assert(!"EmptyProperties::GetObjectItemSet() should never be called");
return *mpEmptyItemSet;
}
void EmptyProperties::SetObjectItem(const SfxPoolItem& /*rItem*/)
{
- SAL_WARN("svx.sdr", "EmptyProperties::SetObjectItem() should never be called (!)");
+ assert(!"EmptyProperties::SetObjectItem() should never be called");
}
void EmptyProperties::SetObjectItemDirect(const SfxPoolItem& /*rItem*/)
{
- SAL_WARN("svx.sdr", "EmptyProperties::SetObjectItemDirect() should never be called (!)");
+ assert(!"EmptyProperties::SetObjectItemDirect() should never be called");
}
void EmptyProperties::ClearObjectItem(const sal_uInt16 /*nWhich*/)
{
- SAL_WARN("svx.sdr", "EmptyProperties::ClearObjectItem() should never be called (!)");
+ assert(!"EmptyProperties::ClearObjectItem() should never be called");
}
void EmptyProperties::ClearObjectItemDirect(const sal_uInt16 /*nWhich*/)
{
- SAL_WARN("svx.sdr", "EmptyProperties::ClearObjectItemDirect() should never be called (!)");
+ assert(!"EmptyProperties::ClearObjectItemDirect() should never be called");
}
void EmptyProperties::SetObjectItemSet(const SfxItemSet& /*rSet*/)
{
- SAL_WARN("svx.sdr", "EmptyProperties::SetObjectItemSet() should never be called (!)");
+ assert(!"EmptyProperties::SetObjectItemSet() should never be called");
}
void EmptyProperties::ItemSetChanged(const SfxItemSet& /*rSet*/)
{
- SAL_WARN("svx.sdr", "EmptyProperties::ItemSetChanged() should never be called (!)");
+ assert(!"EmptyProperties::ItemSetChanged() should never be called");
}
bool EmptyProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
{
- SAL_WARN("svx.sdr", "EmptyProperties::AllowItemChange() should never be called (!)");
+ assert(!"EmptyProperties::AllowItemChange() should never be called");
return true;
}
void EmptyProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
{
- SAL_WARN("svx.sdr", "EmptyProperties::ItemChange() should never be called (!)");
+ assert(!"EmptyProperties::ItemChange() should never be called");
}
void EmptyProperties::PostItemChange(const sal_uInt16 /*nWhich*/)
{
- SAL_WARN("svx.sdr", "EmptyProperties::PostItemChange() should never be called (!)");
+ assert(!"EmptyProperties::PostItemChange() should never be called");
}
void EmptyProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
{
- SAL_WARN("svx.sdr", "EmptyProperties::SetStyleSheet() should never be called (!)");
+ assert(!"EmptyProperties::SetStyleSheet() should never be called");
}
SfxStyleSheet* EmptyProperties::GetStyleSheet() const
{
- SAL_WARN("svx.sdr", "EmptyProperties::GetStyleSheet() should never be called (!)");
+ assert(!"EmptyProperties::GetStyleSheet() should never be called");
return nullptr;
}
} // end of namespace properties
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 0227321..00932e8 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -61,7 +61,7 @@ namespace sdr
const SfxItemSet& GroupProperties::GetObjectItemSet() const
{
- SAL_WARN("svx.sdr", "GroupProperties::GetObjectItemSet() should never be called (!)");
+ assert(!"GroupProperties::GetObjectItemSet() should never be called");
return DefaultProperties::GetObjectItemSet();
}
@@ -133,22 +133,22 @@ namespace sdr
void GroupProperties::SetObjectItem(const SfxPoolItem& /*rItem*/)
{
- SAL_WARN("svx.sdr", "GroupProperties::SetObjectItem() should never be called (!)");
+ assert(!"GroupProperties::SetObjectItem() should never be called");
}
void GroupProperties::SetObjectItemDirect(const SfxPoolItem& /*rItem*/)
{
- SAL_WARN("svx.sdr", "GroupProperties::SetObjectItemDirect() should never be called (!)");
+ assert(!"GroupProperties::SetObjectItemDirect() should never be called");
}
void GroupProperties::ClearObjectItem(const sal_uInt16 /*nWhich*/)
{
- SAL_WARN("svx.sdr", "GroupProperties::ClearObjectItem() should never be called (!)");
+ assert(!"GroupProperties::ClearObjectItem() should never be called");
}
void GroupProperties::ClearObjectItemDirect(const sal_uInt16 /*nWhich*/)
{
- SAL_WARN("svx.sdr", "GroupProperties::ClearObjectItemDirect() should never be called (!)");
+ assert(!"GroupProperties::ClearObjectItemDirect() should never be called");
}
void GroupProperties::SetMergedItem(const SfxPoolItem& rItem)
@@ -175,28 +175,28 @@ namespace sdr
void GroupProperties::SetObjectItemSet(const SfxItemSet& /*rSet*/)
{
- SAL_WARN("svx.sdr", "GroupProperties::SetObjectItemSet() should never be called (!)");
+ assert(!"GroupProperties::SetObjectItemSet() should never be called");
}
void GroupProperties::ItemSetChanged(const SfxItemSet& /*rSet*/)
{
- SAL_WARN("svx.sdr", "GroupProperties::ItemSetChanged() should never be called (!)");
+ assert(!"GroupProperties::ItemSetChanged() should never be called");
}
bool GroupProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
{
- SAL_WARN("svx.sdr", "GroupProperties::AllowItemChange() should never be called (!)");
+ assert(!"GroupProperties::AllowItemChange() should never be called");
return false;
}
void GroupProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
{
- SAL_WARN("svx.sdr", "GroupProperties::ItemChange() should never be called (!)");
+ assert(!"GroupProperties::ItemChange() should never be called");
}
void GroupProperties::PostItemChange(const sal_uInt16 /*nWhich*/)
{
- SAL_WARN("svx.sdr", "GroupProperties::PostItemChange() should never be called (!)");
+ assert(!"GroupProperties::PostItemChange() should never be called");
}
SfxStyleSheet* GroupProperties::GetStyleSheet() const
commit ad627912b5390ca46dde34815add876b0ae24bab
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 19 11:10:01 2016 +0000
move gio config into its own separate config header
Change-Id: I25ca238931da039c244c2af6171d69c9875f95ff
Reviewed-on: https://gerrit.libreoffice.org/22501
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8ef7074..b3b06db 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2446,10 +2446,6 @@ $(call gb_LinkTarget_set_include,$(1),\
$(GIO_CFLAGS) \
)
-$(call gb_LinkTarget_add_defs,$(1),\
- -DENABLE_GIO \
-)
-
$(call gb_LinkTarget_add_libs,$(1),$(GIO_LIBS))
endef
diff --git a/config_host/config_gio.h.in b/config_host/config_gio.h.in
new file mode 100644
index 0000000..1c0c440
--- /dev/null
+++ b/config_host/config_gio.h.in
@@ -0,0 +1,12 @@
+/*
+
+Settings for gio header file dection
+
+*/
+
+#ifndef CONFIG_GIO_H
+#define CONFIG_GIO_H
+
+#define ENABLE_GIO 0
+
+#endif
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in
index ae17474..12d90ee 100644
--- a/config_host/config_vclplug.h.in
+++ b/config_host/config_vclplug.h.in
@@ -10,6 +10,5 @@ Settings about which X11 desktops have support enabled.
#define ENABLE_GTK 0
#define ENABLE_KDE4 0
#define ENABLE_TDE 0
-#define ENABLE_GIO 0
#endif
diff --git a/configure.ac b/configure.ac
index daa1810..5993c11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12852,6 +12852,7 @@ AC_CONFIG_HEADERS([config_host/config_cups.h])
AC_CONFIG_HEADERS([config_host/config_features.h])
AC_CONFIG_HEADERS([config_host/config_folders.h])
AC_CONFIG_HEADERS([config_host/config_gcc.h])
+AC_CONFIG_HEADERS([config_host/config_gio.h])
AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.h])
AC_CONFIG_HEADERS([config_host/config_java.h])
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
index a2d1c88..ac3a1fd 100644
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/gnome))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
- ENABLE_GIO \
ENABLE_GTK \
))
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index f64ad42..3f4b8f5 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -16,8 +16,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "macros.inc"
+#include "config_gio.h"
-#if defined ENABLE_GIO
+#if ENABLE_GIO
File gid_File_Share_Registry_Gnome_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 08d9efe..e1c5862 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -17,6 +17,7 @@
*/
#include "macros.inc"
+#include "config_gio.h"
#include "AutoInstall/gnome"
@@ -27,7 +28,7 @@ Module gid_Module_Optional_Gnome
MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
Styles = ();
Files = (auto_gnome_ALL,
-#if defined ENABLE_GIO
+#if ENABLE_GIO
gid_File_Share_Registry_Gnome_Xcd,
#endif
gid_File_Bin_Gnome_Open_Url
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index ceaacfb..f8c84d4 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -32,7 +32,9 @@
#include "app.hrc"
#include "shutdownicon.hxx"
-#ifdef ENABLE_GIO
+#include <config_gio.h>
+
+#if ENABLE_GIO
#include <gio/gio.h>
#endif
@@ -59,7 +61,7 @@ static GtkStatusIcon* pTrayIcon;
static GtkWidget *pExitMenuItem = nullptr;
static GtkWidget *pOpenMenuItem = nullptr;
static GtkWidget *pDisableMenuItem = nullptr;
-#ifdef ENABLE_GIO
+#if ENABLE_GIO
GFileMonitor* pMonitor = nullptr;
#endif
@@ -293,7 +295,7 @@ static gboolean display_menu_cb( GtkWidget *,
return sal_True;
}
-#ifdef ENABLE_GIO
+#if ENABLE_GIO
/*
* If the quickstarter is running, then LibreOffice is
* upgraded, then the old quickstarter is still running, but is now unreliable
@@ -353,7 +355,7 @@ void plugin_init_sys_tray()
pShutdownIcon->SetVeto( true );
ShutdownIcon::addTerminateListener();
-#ifdef ENABLE_GIO
+#if ENABLE_GIO
GFile* pFile = nullptr;
OUString sLibraryFileUrl;
if (osl::Module::getUrlFromAddress(plugin_init_sys_tray, sLibraryFileUrl))
@@ -374,7 +376,7 @@ void plugin_shutdown_sys_tray()
if( !pTrayIcon )
return;
-#ifdef ENABLE_GIO
+#if ENABLE_GIO
if (pMonitor)
{
g_signal_handlers_disconnect_by_func(pMonitor,
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 10b0ecf..93aac14 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -47,7 +47,7 @@
#include <list>
#include <vector>
-#include <config_vclplug.h>
+#include <config_gio.h>
#include "headless/svpgdi.hxx"
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 8df2c1d..3e827ff 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
#define INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
-#include <config_vclplug.h>
+#include <config_gio.h>
#include <vector>
#if ENABLE_GIO
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 313af1e..88c4205 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -23,7 +23,7 @@
#undef _LINUX_SOURCE_COMPAT
#endif
-#include <config_vclplug.h>
+#include <config_gio.h>
#include <com/sun/star/awt/Toolkit.hpp>
#include <com/sun/star/frame/Desktop.hpp>
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 4aebe6a..fa6fe19 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -23,7 +23,7 @@
#undef _LINUX_SOURCE_COMPAT
#endif
-#include <config_vclplug.h>
+#include <config_gio.h>
#include <com/sun/star/awt/Toolkit.hpp>
#include <com/sun/star/frame/Desktop.hpp>
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index ff1c9e6..fcd05b0 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -39,7 +39,7 @@
#include <vcl/settings.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
-#include <config_vclplug.h>
+#include <config_gio.h>
#include <unx/x11/xlimits.hxx>
#if defined(ENABLE_DBUS) && ENABLE_GIO
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index f16676c..6d02b81 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -38,7 +38,7 @@
#include <vcl/window.hxx>
#include <vcl/settings.hxx>
-#include <config_vclplug.h>
+#include <config_gio.h>
#if defined(ENABLE_DBUS) && ENABLE_GIO
# include <unx/gtk/gtksalmenu.hxx>
commit aa7ceb44cf018d092ce09bb1572d7ce4876be513
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Fri Feb 19 02:26:25 2016 +0400
Fix incorrect icon reference in Distribution dialog
Change-Id: I2b296f06800b5ae29a61cdae7b00961a6b502b66
Reviewed-on: https://gerrit.libreoffice.org/22492
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/uiconfig/ui/distributionpage.ui b/cui/uiconfig/ui/distributionpage.ui
index 9d29749..c278b2f 100644
--- a/cui/uiconfig/ui/distributionpage.ui
+++ b/cui/uiconfig/ui/distributionpage.ui
@@ -144,7 +144,7 @@
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="pixbuf">svx/res/dsth_cen.png</property>
+ <property name="pixbuf">svx/res/dsth_dst.png</property>
</object>
<packing>
<property name="left_attach">3</property>
commit 9829d866468cf4f1b69fc74131fb3ad711645289
Author: Gulsah Kose <gulsah.1004 at gmail.com>
Date: Thu Feb 18 16:21:01 2016 +0200
tdf#89646 Implement "uno:LineToolbox" command into writer.
Change-Id: Ifd50d16a87f8b9197f80a3b1c9de1803adfd462f
Signed-off-by: Gulsah Kose <gulsah.1004 at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/22479
Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
Tested-by: Maxim Monastirsky <momonasmon at gmail.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index d75f825..0d54ece 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1131,14 +1131,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:LineToolbox" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Curve</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:ConnectorLineArrows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Straight Connector with Arrows</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 61445ba..24dc9ba 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4318,6 +4318,14 @@
<value>7</value>
</prop>
</node>
+ <node oor:name=".uno:LineToolbox" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Curve</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:Freeline" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Freeform Line, Filled</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index a5bc600..7ae2339c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -152,6 +152,20 @@
<value>false</value>
</prop>
</node>
+ <node oor:name="private:resource/toolbar/linesbar" oor:op="replace">
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Lines</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
<node oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>0,1</value>
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index e6d6731..98842f2 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -2600,24 +2600,6 @@ SfxVoidItem LineTo SID_LINETO
GroupId = GID_DRAWING;
]
-SfxVoidItem LineToolbox SID_DRAWTBX_LINES
-
-[
- AutoUpdate = FALSE,
- FastCall = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
-
-
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- ToolBoxConfig = TRUE,
- GroupId = GID_DRAWING;
-]
-
SfxVoidItem ManageLinks SID_MANAGE_LINKS
()
[
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index b220975..169c086 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -72,6 +72,23 @@ SfxVoidItem AddTable SID_FM_ADDTABLE
GroupId = GID_TABLE;
]
+SfxVoidItem LineToolbox SID_DRAWTBX_LINES
+
+[
+ AutoUpdate = FALSE,
+ FastCall = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_DRAWING;
+]
SfxVoidItem AlignCenter SID_OBJECT_ALIGN_CENTER
()
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index e34bbef..1457d21 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/swriter,\
sw/uiconfig/swriter/toolbar/graffilterbar \
sw/uiconfig/swriter/toolbar/graphicobjectbar \
sw/uiconfig/swriter/toolbar/insertbar \
+ sw/uiconfig/swriter/toolbar/linesbar \
sw/uiconfig/swriter/toolbar/mediaobjectbar \
sw/uiconfig/swriter/toolbar/moreformcontrols \
sw/uiconfig/swriter/toolbar/navigationobjectbar \
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 30dd84d..370e460 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -38,6 +38,11 @@ interface ListInText
interface TextEditView : BaseTextEditView
{
// Slots, which are not needed in the WebDocShell
+ SID_DRAWTBX_LINES
+ [
+ StateMethod = GetState ;
+ ]
+
FN_INSERT_OBJ_CTRL
[
StateMethod = GetState ;
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 77dfe15..884f047 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -86,6 +86,11 @@ void SwView::GetState(SfxItemSet &rSet)
}
break;
+ case SID_DRAWTBX_LINES:
+ if ( bWeb )
+ rSet.DisableItem(nWhich);
+ break;
+
case SID_INSERT_GRAPHIC:
if( m_pWrtShell->CursorInsideInputField() )
{
diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml
index b025ff5..52986b5 100644
--- a/sw/uiconfig/swriter/toolbar/drawbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawbar.xml
@@ -21,11 +21,11 @@
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineToolbox"/>
<toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="10397"/>
+ <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="10397" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:BezierFill" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="10395"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="10395" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swriter/toolbar/linesbar.xml b/sw/uiconfig/swriter/toolbar/linesbar.xml
new file mode 100644
index 0000000..74976c9
--- /dev/null
+++ b/sw/uiconfig/swriter/toolbar/linesbar.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 .
+-->
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled"/>
+ <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled"/>
+</toolbar:toolbar>
commit 75da70ccbf7946d3c8de2572d98c2f9cf534b751
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Feb 19 17:31:12 2016 +0900
starmath: Avoid C-style cast
Change-Id: I96efea344dc4ec5c1f20060bb51ea5e853113c9c
Reviewed-on: https://gerrit.libreoffice.org/22497
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 1b61f14..06a46ef 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -265,7 +265,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getForeground()
if (!pWin)
throw RuntimeException();
- return (sal_Int32) pWin->GetTextColor().GetColor();
+ return static_cast<sal_Int32>(pWin->GetTextColor().GetColor());
}
sal_Int32 SAL_CALL SmGraphicAccessible::getBackground()
@@ -281,7 +281,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getBackground()
nCol = pWin->GetSettings().GetStyleSettings().GetWindowColor().GetColor();
else
nCol = aWall.GetColor().GetColor();
- return (sal_Int32) nCol;
+ return static_cast<sal_Int32>(nCol);
}
sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleChildCount()
@@ -1743,7 +1743,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getForeground()
if (!pWin)
throw RuntimeException();
- return (sal_Int32) pWin->GetTextColor().GetColor();
+ return static_cast<sal_Int32>(pWin->GetTextColor().GetColor());
}
sal_Int32 SAL_CALL SmEditAccessible::getBackground()
@@ -1759,7 +1759,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getBackground()
nCol = pWin->GetSettings().GetStyleSettings().GetWindowColor().GetColor();
else
nCol = aWall.GetColor().GetColor();
- return (sal_Int32) nCol;
+ return static_cast<sal_Int32>(nCol);
}
// XAccessibleContext
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index dc70029..75b2c63 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -158,11 +158,11 @@ SmFontFormat::SmFontFormat()
SmFontFormat::SmFontFormat( const vcl::Font &rFont )
{
aName = rFont.GetFamilyName();
- nCharSet = (sal_Int16) rFont.GetCharSet();
- nFamily = (sal_Int16) rFont.GetFamilyType();
- nPitch = (sal_Int16) rFont.GetPitch();
- nWeight = (sal_Int16) rFont.GetWeight();
- nItalic = (sal_Int16) rFont.GetItalic();
+ nCharSet = static_cast<sal_Int16>(rFont.GetCharSet());
+ nFamily = static_cast<sal_Int16>(rFont.GetFamilyType());
+ nPitch = static_cast<sal_Int16>(rFont.GetPitch());
+ nWeight = static_cast<sal_Int16>(rFont.GetWeight());
+ nItalic = static_cast<sal_Int16>(rFont.GetItalic());
}
@@ -170,11 +170,11 @@ const vcl::Font SmFontFormat::GetFont() const
{
vcl::Font aRes;
aRes.SetFamilyName( aName );
- aRes.SetCharSet( (rtl_TextEncoding) nCharSet );
- aRes.SetFamily( (FontFamily) nFamily );
- aRes.SetPitch( (FontPitch) nPitch );
- aRes.SetWeight( (FontWeight) nWeight );
- aRes.SetItalic( (FontItalic) nItalic );
+ aRes.SetCharSet( static_cast<rtl_TextEncoding>(nCharSet) );
+ aRes.SetFamily( static_cast<FontFamily>(nFamily) );
+ aRes.SetPitch( static_cast<FontPitch>(nPitch) );
+ aRes.SetWeight( static_cast<FontWeight>(nWeight) );
+ aRes.SetItalic( static_cast<FontItalic>(nItalic) );
return aRes;
}
@@ -695,27 +695,27 @@ void SmMathConfig::SaveFontFormatList()
// CharSet
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (sal_Int16) aFntFmt.nCharSet; // 6.0 file-format GetSOStoreTextEncoding not needed
+ pVal->Value <<= static_cast<sal_Int16>(aFntFmt.nCharSet); // 6.0 file-format GetSOStoreTextEncoding not needed
pVal++;
// Family
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (sal_Int16) aFntFmt.nFamily;
+ pVal->Value <<= static_cast<sal_Int16>(aFntFmt.nFamily);
pVal++;
// Pitch
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (sal_Int16) aFntFmt.nPitch;
+ pVal->Value <<= static_cast<sal_Int16>(aFntFmt.nPitch);
pVal++;
// Weight
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (sal_Int16) aFntFmt.nWeight;
+ pVal->Value <<= static_cast<sal_Int16>(aFntFmt.nWeight);
pVal++;
// Italic
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (sal_Int16) aFntFmt.nItalic;
+ pVal->Value <<= static_cast<sal_Int16>(aFntFmt.nItalic);
pVal++;
}
OSL_ENSURE( sal::static_int_cast<size_t>(pVal - pValues) == nCount * nSymbolProps, "properties missing" );
@@ -911,21 +911,21 @@ void SmMathConfig::SaveFormat()
// StandardFormat/Textmode
*pValue++ <<= pFormat->IsTextmode();
// StandardFormat/GreekCharStyle
- *pValue++ <<= (sal_Int16) pFormat->GetGreekCharStyle();
+ *pValue++ <<= static_cast<sal_Int16>(pFormat->GetGreekCharStyle());
// StandardFormat/ScaleNormalBracket
*pValue++ <<= pFormat->IsScaleNormalBrackets();
// StandardFormat/HorizontalAlignment
- *pValue++ <<= (sal_Int16) pFormat->GetHorAlign();
+ *pValue++ <<= static_cast<sal_Int16>(pFormat->GetHorAlign());
// StandardFormat/BaseSize
- *pValue++ <<= (sal_Int16) SmRoundFraction( Sm100th_mmToPts(
- pFormat->GetBaseSize().Height() ) );
+ *pValue++ <<= static_cast<sal_Int16>(SmRoundFraction( Sm100th_mmToPts(
+ pFormat->GetBaseSize().Height() ) ));
sal_uInt16 i;
for (i = SIZ_BEGIN; i <= SIZ_END; ++i)
- *pValue++ <<= (sal_Int16) pFormat->GetRelSize( i );
+ *pValue++ <<= static_cast<sal_Int16>(pFormat->GetRelSize( i ));
for (i = DIS_BEGIN; i <= DIS_END; ++i)
- *pValue++ <<= (sal_Int16) pFormat->GetDistance( i );
+ *pValue++ <<= static_cast<sal_Int16>(pFormat->GetDistance( i ));
for (i = FNT_BEGIN; i < FNT_END; ++i)
{
@@ -1162,7 +1162,7 @@ void SmMathConfig::ItemSetToConfig(const SfxItemSet &rSet)
bool bVal;
if (rSet.GetItemState(SID_PRINTSIZE, true, &pItem) == SfxItemState::SET)
{ nU16 = static_cast<const SfxUInt16Item *>(pItem)->GetValue();
- SetPrintSize( (SmPrintSize) nU16 );
+ SetPrintSize( static_cast<SmPrintSize>(nU16) );
}
if (rSet.GetItemState(SID_PRINTZOOM, true, &pItem) == SfxItemState::SET)
{ nU16 = static_cast<const SfxUInt16Item *>(pItem)->GetValue();
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index b022c3a..b80af3f 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -86,7 +86,7 @@ sal_Unicode ConvertMathToMathML( sal_Unicode cChar )
if (IsInPrivateUseArea( cChar ))
{
SAL_WARN("starmath", "Error: private use area characters should no longer be in use!" );
- cRes = (sal_Unicode) '@'; // just some character that should easily be notice as odd in the context
+ cRes = sal_Unicode('@'); // just some character that should easily be notice as odd in the context
}
return cRes;
}
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 7c16927..8bd1ca8 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1158,12 +1158,12 @@ bool IsPointInLine(const Point &rPoint1,
double fLambda;
if (labs(rHeading2.X()) > labs(rHeading2.Y()))
{
- fLambda = (rPoint1.X() - rPoint2.X()) / (double) rHeading2.X();
+ fLambda = (rPoint1.X() - rPoint2.X()) / static_cast<double>(rHeading2.X());
bRes = fabs(rPoint1.Y() - (rPoint2.Y() + fLambda * rHeading2.Y())) < eps;
}
else
{
- fLambda = (rPoint1.Y() - rPoint2.Y()) / (double) rHeading2.Y();
+ fLambda = (rPoint1.Y() - rPoint2.Y()) / static_cast<double>(rHeading2.Y());
bRes = fabs(rPoint1.X() - (rPoint2.X() + fLambda * rHeading2.X())) < eps;
}
@@ -2595,7 +2595,7 @@ SmMathSymbolNode::SmMathSymbolNode(const SmToken &rNodeToken)
: SmSpecialNode(NMATH, rNodeToken, FNT_MATH)
{
sal_Unicode cChar = GetToken().cMathChar;
- if ((sal_Unicode) '\0' != cChar)
+ if (sal_Unicode('\0') != cChar)
SetText(OUString(cChar));
}
@@ -2815,7 +2815,7 @@ static bool lcl_IsFromGreekSymbolSet( const OUString &rTokenText )
bool bRes = false;
// valid symbol name needs to have a '%' at pos 0 and at least an additional char
- if (rTokenText.getLength() > 2 && rTokenText[0] == (sal_Unicode)'%')
+ if (rTokenText.getLength() > 2 && rTokenText[0] == sal_Unicode('%'))
{
OUString aName( rTokenText.copy(1) );
SmSym *pSymbol = SM_MOD()->GetSymbolManager().GetSymbolByName( aName );
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 07cf724..1fa7fe4 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -387,9 +387,9 @@ static sal_Int16 lcl_AnyToINT16(const uno::Any& rAny)
sal_Int16 nRet = 0;
if( eType == uno::TypeClass_DOUBLE )
- nRet = (sal_Int16)*static_cast<double const *>(rAny.getValue());
+ nRet = static_cast<sal_Int16>(*static_cast<double const *>(rAny.getValue()));
else if( eType == uno::TypeClass_FLOAT )
- nRet = (sal_Int16)*static_cast<float const *>(rAny.getValue());
+ nRet = static_cast<sal_Int16>(*static_cast<float const *>(rAny.getValue()));
else
rAny >>= nRet;
return nRet;
@@ -768,7 +768,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
case HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS :
case HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS :
case HANDLE_RELATIVE_FONT_HEIGHT_LIMITS :
- *pValue <<= (sal_Int16) aFormat.GetRelSize((*ppEntries)->mnMemberId);
+ *pValue <<= static_cast<sal_Int16>(aFormat.GetRelSize((*ppEntries)->mnMemberId));
break;
case HANDLE_IS_TEXT_MODE :
@@ -779,12 +779,12 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
break;
case HANDLE_GREEK_CHAR_STYLE :
- *pValue <<= (sal_Int16)aFormat.GetGreekCharStyle();
+ *pValue <<= static_cast<sal_Int16>(aFormat.GetGreekCharStyle());
break;
case HANDLE_ALIGNMENT :
// SmHorAlign uses the same values as HorizontalAlignment
- *pValue <<= (sal_Int16)aFormat.GetHorAlign();
+ *pValue <<= static_cast<sal_Int16>(aFormat.GetHorAlign());
break;
case HANDLE_RELATIVE_SPACING :
@@ -811,7 +811,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
case HANDLE_RIGHT_MARGIN :
case HANDLE_TOP_MARGIN :
case HANDLE_BOTTOM_MARGIN :
- *pValue <<= (sal_Int16)aFormat.GetDistance((*ppEntries)->mnMemberId);
+ *pValue <<= static_cast<sal_Int16>(aFormat.GetDistance((*ppEntries)->mnMemberId));
break;
case HANDLE_IS_SCALE_ALL_BRACKETS :
{
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index f247fa8..2808448 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -146,7 +146,7 @@ void SmGraphicWindow::ApplyColorConfigValues(const svtools::ColorConfig &rColorC
#if OSL_DEBUG_LEVEL > 1
// ColorData nVal = rColorCfg.GetColorValue(svtools::DOCCOLOR).nColor;
#endif
- SetBackground(Color( (ColorData) rColorCfg.GetColorValue(svtools::DOCCOLOR).nColor));
+ SetBackground(Color(static_cast<ColorData>(rColorCfg.GetColorValue(svtools::DOCCOLOR).nColor)));
}
commit 778e9a65bf5af07c4caeff969a0324e43a78e66b
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 19 10:52:20 2016 +0200
new loplugin: find write-only fields
Change-Id: I0f83939babacf92485420ee63f290a297d7cb717
Reviewed-on: https://gerrit.libreoffice.org/22498
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 9beca11..c11c6ecc 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -104,6 +104,7 @@ class ParentBuilder
bool VisitFunctionDecl( const FunctionDecl* function );
bool VisitObjCMethodDecl( const ObjCMethodDecl* method );
void walk( const Stmt* stmt );
+ bool shouldVisitTemplateInstantiations () const { return true; }
unordered_map< const Stmt*, const Stmt* >* parents;
};
diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx
index f7d7610..2667485 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -16,7 +16,11 @@
#include "compat.hxx"
/**
-Dump a list of calls to methods, and a list of field definitions.
+This performs two analyses:
+ (1) look for unused fields
+ (2) look for fields that are write-only
+
+We dmp a list of calls to methods, and a list of field definitions.
Then we will post-process the 2 lists and find the set of unused methods.
Be warned that it produces around 5G of log file.
@@ -24,7 +28,7 @@ Be warned that it produces around 5G of log file.
The process goes something like this:
$ make check
$ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unusedfields' check
- $ ./compilerplugins/clang/unusedfields.py unusedfields.log > result.txt
+ $ ./compilerplugins/clang/unusedfields.py unusedfields.log
and then
$ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='unusedfieldsremove' $dir; done
@@ -58,6 +62,7 @@ struct MyFieldInfo
// try to limit the voluminous output a little
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list