[Libreoffice-commits] core.git: compilerplugins/clang include/svtools include/vcl sc/qa svtools/source svx/source vcl/inc vcl/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jan 31 18:38:03 UTC 2020
compilerplugins/clang/singlevalfields.could-be-bool.results | 41 -
compilerplugins/clang/singlevalfields.results | 357 ++++++------
include/svtools/valueset.hxx | 5
include/vcl/toolbox.hxx | 1
include/vcl/treelistbox.hxx | 1
sc/qa/extras/check_data_pilot_table.cxx | 12
svtools/source/control/valueset.cxx | 86 --
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 5
svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 3
svx/source/tbxctrls/layctrl.cxx | 8
vcl/inc/svimpbox.hxx | 3
vcl/inc/wizdlg.hxx | 1
vcl/source/control/imivctl.hxx | 1
vcl/source/control/imivctl1.cxx | 5
vcl/source/control/roadmapwizard.cxx | 2
vcl/source/control/wizardmachine.cxx | 52 -
vcl/source/treelist/svimpbox.cxx | 20
vcl/source/treelist/svtabbx.cxx | 3
vcl/source/treelist/treelistbox.cxx | 5
vcl/source/window/toolbox.cxx | 161 +----
vcl/source/window/toolbox2.cxx | 6
21 files changed, 298 insertions(+), 480 deletions(-)
New commits:
commit c599e23a92310916d4e7f09c5aaf354d63973d0b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Jan 31 12:31:11 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jan 31 19:37:29 2020 +0100
loplugin:singlevalfields
Change-Id: I77ccf3f36363e182a644b98cdf720f1381a5cceb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87766
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/singlevalfields.could-be-bool.results b/compilerplugins/clang/singlevalfields.could-be-bool.results
index dc2692b082bf..bf3deb0e247a 100644
--- a/compilerplugins/clang/singlevalfields.could-be-bool.results
+++ b/compilerplugins/clang/singlevalfields.could-be-bool.results
@@ -1,7 +1,7 @@
chart2/source/view/inc/PlottingPositionHelper.hxx:206
chart::PolarPlottingPositionHelper m_fRadiusOffset
double
-connectivity/source/inc/dbase/dindexnode.hxx:125
+connectivity/source/inc/dbase/dindexnode.hxx:122
connectivity::dbase::ONDXPage bNoDelete
unsigned int
cui/source/inc/cfg.hxx:232
@@ -11,15 +11,15 @@ dbaccess/source/ui/inc/tabletree.hxx:149
dbaui::TableTreeListBox m_nTextColumn
int
desktop/source/app/main.c:29
- /media/disk2/libo4/desktop/source/app/main.c g_Exiting
+ /media/disk2/libo7/desktop/source/app/main.c g_Exiting
int
-editeng/source/misc/hangulhanja.cxx:79
+editeng/source/misc/hangulhanja.cxx:78
editeng::HangulHanjaConversion_Impl m_eConvType
class HangulHanjaConversion::ConversionType
-editeng/source/misc/svxacorr.cxx:239
+editeng/source/misc/svxacorr.cxx:233
GetIgnoreTranslWrapper bIsInit
int
-filter/source/graphicfilter/eps/eps.cxx:144
+filter/source/graphicfilter/eps/eps.cxx:140
(anonymous namespace)::PSWriter nNextChrSetId
sal_uInt8
include/opencl/openclwrapper.hxx:46
@@ -37,10 +37,10 @@ include/vbahelper/vbapagesetupbase.hxx:50
include/vcl/dialog.hxx:48
Dialog mnMousePositioned
long
-include/vcl/headbar.hxx:211
+include/vcl/headbar.hxx:208
HeaderBar mnBorderOff1
long
-include/vcl/headbar.hxx:212
+include/vcl/headbar.hxx:209
HeaderBar mnBorderOff2
long
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:191
@@ -49,7 +49,7 @@ jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:191
libreofficekit/source/gtk/tilebuffer.hxx:229
LOEvent m_nSetGraphicSelectionType
int
-sal/rtl/cipher.cxx:112
+sal/rtl/cipher.cxx:113
(anonymous namespace)::Cipher_Impl m_algorithm
rtlCipherAlgorithm
sc/source/filter/inc/stylesbuffer.hxx:290
@@ -58,22 +58,31 @@ sc/source/filter/inc/stylesbuffer.hxx:290
sc/source/filter/inc/stylesbuffer.hxx:292
oox::xls::ApiAlignmentData mnVerJustifyMethod
sal_Int32
-sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1067
+sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1084
(anonymous namespace)::ScPagePreviewCountData nHeaders
long
-sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1068
+sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1085
(anonymous namespace)::ScPagePreviewCountData nTables
long
-sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1070
+sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1087
(anonymous namespace)::ScPagePreviewCountData nFooters
long
sc/source/ui/vba/vbahyperlink.hxx:83
ScVbaHyperlink mnType
long
-sd/qa/unit/tiledrendering/tiledrendering.cxx:958
+sd/qa/unit/tiledrendering/tiledrendering.cxx:959
(anonymous namespace)::ViewCallback m_nPart
int
-svx/source/inc/cell.hxx:205
+soltools/cpp/_tokens.c:35
+ /media/disk2/libo7/soltools/cpp/_tokens.c EBCDIC_ExternTokenDetected
+ int
+soltools/cpp/_tokens.c:36
+ /media/disk2/libo7/soltools/cpp/_tokens.c EBCDIC_StartTokenDetected
+ int
+soltools/cpp/cpp.h:121
+ includelist always
+ char
+svx/source/inc/cell.hxx:204
sdr::table::Cell mnCellContentType
css::table::CellContentType
svx/source/table/tablertfimporter.cxx:57
@@ -101,14 +110,14 @@ vcl/unx/generic/app/saldata.cxx:502
X11SalData::XError bOnce
int
vcl/unx/generic/app/sm.cxx:184
- /media/disk2/libo4/vcl/unx/generic/app/sm.cxx nSmDel
+ /media/disk2/libo7/vcl/unx/generic/app/sm.cxx nSmDel
int
vcl/workben/icontest.cxx:147
(anonymous namespace)::IconTestApp nRet
int
workdir/LexTarget/l10ntools/source/cfglex.cxx:2293
- /media/disk2/libo4/workdir/LexTarget/l10ntools/source/cfglex.cxx bText
+ /media/disk2/libo7/workdir/LexTarget/l10ntools/source/cfglex.cxx bText
int
-writerfilter/source/dmapper/PageBordersHandler.hxx:54
+writerfilter/source/dmapper/PageBordersHandler.hxx:53
writerfilter::dmapper::PageBordersHandler m_eOffsetFrom
class SectionPropertyMap::BorderOffsetFrom
diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results
index 1ed6665a3dc1..66ba809a0ec6 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -4,7 +4,7 @@ avmedia/inc/mediacontrol.hxx:74
avmedia/source/framework/soundhandler.hxx:118
avmedia::SoundHandler m_aUpdateIdle
avmedia SoundHandler Update
-basctl/source/basicide/baside2.hxx:88
+basctl/source/basicide/baside2.hxx:86
basctl::EditorWindow aHighlighter
0
basctl/source/inc/dlged.hxx:132
@@ -25,7 +25,7 @@ binaryurp/source/writerstate.hxx:45
bridges/inc/bridge.hxx:90
bridges::cpp_uno::shared::Bridge nRef
1
-bridges/inc/cppinterfaceproxy.hxx:90
+bridges/inc/cppinterfaceproxy.hxx:85
bridges::cpp_uno::shared::CppInterfaceProxy nRef
1
bridges/inc/unointerfaceproxy.hxx:86
@@ -37,7 +37,7 @@ bridges/source/jni_uno/jni_bridge.h:53
bridges/source/jni_uno/jni_uno2java.cxx:391
jni_uno::(anonymous namespace)::UNO_proxy m_ref
1
-chart2/source/controller/dialogs/DataBrowser.cxx:208
+chart2/source/controller/dialogs/DataBrowser.cxx:209
chart::impl::SeriesHeader m_aUpdateDataTimer
UpdateDataTimer
chart2/source/controller/inc/ChartController.hxx:382
@@ -106,7 +106,7 @@ cui/source/inc/linkdlg.hxx:46
cui/source/inc/thesdlg.hxx:32
SvxThesaurusDialog m_aModifyIdle
cui SvxThesaurusDialog LookUp Modify
-cui/source/options/optgdlg.cxx:1233
+cui/source/options/optgdlg.cxx:1237
LanguageConfig_Impl aLanguageOptions
0
cui/source/options/optjava.hxx:60
@@ -115,55 +115,52 @@ cui/source/options/optjava.hxx:60
dbaccess/source/ui/inc/directsql.hxx:64
dbaui::DirectSQLDialog m_aHighlighter
1
-desktop/inc/lib/init.hxx:143
- desktop::CallbackFlushHandler m_bEventLatch
- 0
-desktop/source/app/app.cxx:509
+desktop/source/app/app.cxx:490
desktop::Desktop::Init bTryHardOfficeconfigBroken
0
desktop/source/app/cmdlineargs.hxx:137
desktop::CommandLineArgs m_quickstart
0
-drawinglayer/source/primitive2d/sceneprimitive2d.cxx:372
+drawinglayer/source/primitive2d/sceneprimitive2d.cxx:370
drawinglayer::primitive2d::ScenePrimitive2D::create2DDecomposition bMultithreadAllowed
0
-drawinglayer/source/primitive2d/sceneprimitive2d.cxx:476
+drawinglayer/source/primitive2d/sceneprimitive2d.cxx:474
drawinglayer::primitive2d::ScenePrimitive2D::create2DDecomposition bAddOutlineToCreated3DSceneRepresentation
0
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx:332
drawinglayer::impBufferDevice::paint bDoSaveForVisualControl
0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:943
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:942
drawinglayer::processor2d::VclMetafileProcessor2D::processGraphicPrimitive2D bSuppressPDFExtOutDevDataSupport
0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1275
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:1274
drawinglayer::processor2d::VclMetafileProcessor2D::processTextHierarchyParagraphPrimitive2D bSuppressPDFExtOutDevDataSupport
0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2042
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2041
drawinglayer::processor2d::VclMetafileProcessor2D::processUnifiedTransparencePrimitive2D bForceToMetafile
0
-drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2136
+drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx:2135
drawinglayer::processor2d::VclMetafileProcessor2D::processTransparencePrimitive2D bForceToBigTransparentVDev
0
drawinglayer/source/tools/converters.cxx:91
drawinglayer::convertToBitmapEx bDoSaveForVisualControl
0
-editeng/source/editeng/impedit.hxx:476
+editeng/source/editeng/impedit.hxx:470
ImpEditEngine nBigTextObjectStart
20
-emfio/source/reader/emfreader.cxx:1497
+emfio/source/reader/emfreader.cxx:1495
emfio::EmfReader::ReadEnhWMF bDoSaveForVisualControl
0
-extensions/source/bibliography/bibcont.hxx:70
+extensions/source/bibliography/bibcont.hxx:69
BibBookContainer aIdle
extensions BibBookContainer Split Idle
-filter/source/msfilter/msdffimp.cxx:2714
+filter/source/msfilter/msdffimp.cxx:2690
DffPropertyReader::ApplyAttributes bCheckShadow
0
filter/source/msfilter/viscache.hxx:30
Impl_OlePres nFormat
3
-framework/source/services/autorecovery.cxx:396
+framework/source/services/autorecovery.cxx:397
(anonymous namespace)::AutoRecovery m_aTimer
Auto save timer
framework/source/uiconfiguration/imagemanagerimpl.hxx:173
@@ -173,19 +170,19 @@ helpcompiler/inc/BasCodeTagger.hxx:29
BasicCodeTagger m_Highlighter
0
i18npool/source/localedata/localedata.cxx:52
- /media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_EN
+ /media/disk2/libo7/i18npool/source/localedata/localedata.cxx lcl_DATA_EN
localedata_en
i18npool/source/localedata/localedata.cxx:53
- /media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_ES
+ /media/disk2/libo7/i18npool/source/localedata/localedata.cxx lcl_DATA_ES
localedata_es
i18npool/source/localedata/localedata.cxx:54
- /media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_EURO
+ /media/disk2/libo7/i18npool/source/localedata/localedata.cxx lcl_DATA_EURO
localedata_euro
i18npool/source/localedata/localedata.cxx:55
- /media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_OTHERS
+ /media/disk2/libo7/i18npool/source/localedata/localedata.cxx lcl_DATA_OTHERS
localedata_others
-idlc/source/idlccompile.cxx:50
- /media/disk2/libo4/idlc/source/idlccompile.cxx yydebug
+idlc/source/idlccompile.cxx:51
+ /media/disk2/libo7/idlc/source/idlccompile.cxx yydebug
0
include/basegfx/pixel/bpixel.hxx:42
basegfx::BPixel::(anonymous union)::(anonymous) mnValue
@@ -271,6 +268,12 @@ include/svtools/svparser.hxx:74
include/svtools/tabbar.hxx:323
TabBar mnOffY
0
+include/svtools/valueset.hxx:227
+ ValueSet mbSelection
+ 0
+include/svtools/valueset.hxx:233
+ ValueSet mbFullMode
+ 1
include/svx/ctredlin.hxx:91
SvxRedlinTable aDaTiFirst
0
@@ -298,25 +301,16 @@ include/svx/deflt3d.hxx:53
include/svx/deflt3d.hxx:54
E3dDefaultAttributes bDefaultExtrudeSmoothFrontBack
0
-include/svx/dialcontrol.hxx:111
- svx::DialControl::DialControl_Impl mpLinkField
- 0
-include/svx/dialcontrol.hxx:112
- svx::DialControl::DialControl_Impl mnLinkedFieldValueMultiplyer
- 0
-include/svx/dialcontrol.hxx:119
- svx::DialControl::DialControl_Impl mbNoRot
- 0
include/svx/fillctrl.hxx:53
SvxFillToolBoxControl mpFillControl
0
-include/svx/fontwork.hxx:96
+include/svx/fontwork.hxx:77
SvxFontWorkDialog aInputIdle
SvxFontWorkDialog Input
include/svx/graphctl.hxx:53
GraphCtrl aUpdateIdle
svx GraphCtrl Update
-include/svx/numvset.hxx:127
+include/svx/numvset.hxx:89
SvxBmpNumValueSet aFormatIdle
SvxBmpNumValueSet FormatIdle
include/svx/svdcrtv.hxx:50
@@ -346,43 +340,25 @@ include/vcl/settings.hxx:146
include/vcl/settings.hxx:147
DialogStyle action_area_border
5
-include/vcl/slider.hxx:40
+include/vcl/slider.hxx:39
Slider mnChannelPixOffset
0
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:26
- GtvRenderingArgs m_bEnableTiledAnnotations
- 0
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:27
- GtvRenderingArgs m_bUnipoll
- 0
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:30
- GtvRenderingArgs m_bHidePageShadow
- 0
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:31
- GtvRenderingArgs m_bHideWhiteSpace
+include/vcl/toolbox.hxx:128
+ ToolBox mbSelection
0
+io/qa/textinputstream.cxx:97
+ (anonymous namespace)::Input open_
+ 1
libreofficekit/source/gtk/lokdocview.cxx:86
(anonymous namespace)::LOKDocViewPrivateImpl m_bIsLoading
0
-libreofficekit/source/gtk/tilebuffer.hxx:71
- Tile valid
- 0
-libreofficekit/source/gtk/tilebuffer.hxx:80
- Tile m_pBuffer
- 0
-odk/source/unoapploader/unx/unoapploader.c:39
- /media/disk2/libo4/odk/source/unoapploader/unx/unoapploader.c PATHSEPARATOR
- :
-odk/source/unoapploader/unx/unoapploader.c:81
- main ENVVARNAME
- LD_LIBRARY_PATH
oox/source/core/contexthandler2.cxx:36
oox::core::ElementInfo maChars
0
-opencl/source/opencl_device.cxx:52
+opencl/source/opencl_device.cxx:53
(anonymous namespace)::LibreOfficeDeviceEvaluationIO inputSize
15360
-opencl/source/opencl_device.cxx:53
+opencl/source/opencl_device.cxx:54
(anonymous namespace)::LibreOfficeDeviceEvaluationIO outputSize
15360
package/inc/ZipFile.hxx:61
@@ -401,7 +377,7 @@ sal/osl/unx/sockimpl.hxx:39
oslSocketImpl m_bIsInShutdown
1
sal/qa/osl/condition/osl_Condition_Const.h:41
- /media/disk2/libo4/sal/qa/osl/condition/osl_Condition.cxx aTestCon
+ /media/disk2/libo7/sal/qa/osl/condition/osl_Condition.cxx aTestCon
testcondition
sal/qa/osl/file/osl_File_Const.h:128
extern aCanURL3
@@ -467,36 +443,33 @@ sal/qa/rtl/process/rtl_Process_Const.h:33
extern suParam3
-process
sal/qa/rtl/strings/test_ostring_stringliterals.cxx:22
- /media/disk2/libo4/sal/qa/rtl/strings/test_ostring_stringliterals.cxx rtl_string_unittest_non_const_literal_function
+ /media/disk2/libo7/sal/qa/rtl/strings/test_ostring_stringliterals.cxx rtl_string_unittest_non_const_literal_function
0
sax/source/tools/fastserializer.hxx:231
sax_fastparser::FastSaxSerializer mbXescape
1
-sc/inc/compiler.hxx:110
+sc/inc/compiler.hxx:113
ScRawToken::(anonymous union)::(anonymous) eInForceArray
0
-sc/inc/dpfilteredcache.hxx:93
- ScDPFilteredCache::Criterion mpFilter
- 0
sc/inc/drwlayer.hxx:219
- /media/disk2/libo4/sc/source/core/data/drwlayer.cxx bDrawIsInUndo
+ /media/disk2/libo7/sc/source/core/data/drwlayer.cxx bDrawIsInUndo
0
sc/inc/global.hxx:917
- /media/disk2/libo4/sc/source/core/data/global.cxx pScActiveViewShell
+ /media/disk2/libo7/sc/source/core/data/global.cxx pScActiveViewShell
0
sc/inc/global.hxx:918
- /media/disk2/libo4/sc/source/core/data/global.cxx nScClickMouseModifier
+ /media/disk2/libo7/sc/source/core/data/global.cxx nScClickMouseModifier
0
sc/inc/global.hxx:919
- /media/disk2/libo4/sc/source/core/data/global.cxx nScFillModeMouseModifier
+ /media/disk2/libo7/sc/source/core/data/global.cxx nScFillModeMouseModifier
0
sc/inc/listenercontext.hxx:46
sc::EndListeningContext maSet
0
-sc/inc/markmulti.hxx:80
+sc/inc/markmulti.hxx:81
ScMultiSelIter aMarkArrayIter
0
-sc/inc/refdata.hxx:37
+sc/inc/refdata.hxx:39
ScSingleRefData::(anonymous) mnFlagValue
0
sc/inc/scmod.hxx:83
@@ -508,23 +481,29 @@ sc/inc/scmod.hxx:84
sc/inc/table.hxx:180
ScTable mpRowHeights
0
+sc/qa/extras/check_data_pilot_field.cxx:62
+ sc_apitest::CheckDataPilotField mMaxFieldIndex
+ 6
+sc/qa/extras/check_data_pilot_table.cxx:67
+ sc_apitest::CheckDataPilotTable mMaxFieldIndex
+ 6
sc/qa/unit/screenshots/screenshots.cxx:40
ScScreenshotTest mCsv
some, strings, here, separated, by, commas
sc/qa/unit/ucalc.hxx:42
Test::RangeNameDef mnIndex
1
-sc/source/core/data/documentimport.cxx:632
+sc/source/core/data/documentimport.cxx:633
(anonymous namespace)::CellStoreInitializer::Impl maAttrs
1048576
sc/source/core/inc/parclass.hxx:94
ScParameterClassification::RunData bHasForceArray
1
sc/source/core/tool/scmatrix.cxx:350
- /media/disk2/libo4/sc/source/core/tool/scmatrix.cxx bElementsMaxFetched
+ /media/disk2/libo7/sc/source/core/tool/scmatrix.cxx bElementsMaxFetched
1
sc/source/filter/inc/extlstcontext.hxx:20
- /media/disk2/libo4/sc/source/filter/oox/condformatbuffer.cxx rStyleIdx
+ /media/disk2/libo7/sc/source/filter/oox/condformatbuffer.cxx rStyleIdx
0
sc/source/filter/inc/orcusinterface.hxx:179
ScOrcusConditionalFormat meEntryType
@@ -553,17 +532,14 @@ sc/source/ui/inc/checklistmenu.hxx:157
sc/source/ui/inc/conflictsdlg.hxx:120
ScConflictsDlg maSelectionIdle
ScConflictsDlg SelectionIdle
-sc/source/ui/inc/retypepassdlg.hxx:86
- ScRetypePassDlg mpDocItem
- 0
sc/source/ui/inc/viewdata.hxx:290
ScViewData aLogicMode
0
sc/source/ui/inc/viewfunc.hxx:376
- /media/disk2/libo4/sc/source/ui/view/viewfun4.cxx bPasteIsDrop
+ /media/disk2/libo7/sc/source/ui/view/viewfun4.cxx bPasteIsDrop
0
sc/source/ui/inc/viewfunc.hxx:377
- /media/disk2/libo4/sc/source/ui/view/viewfun7.cxx bPasteIsMove
+ /media/disk2/libo7/sc/source/ui/view/viewfun7.cxx bPasteIsMove
0
sd/inc/sdpptwrp.hxx:44
SdPPTFilter pBas
@@ -604,7 +580,7 @@ sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx:45
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx:92
sd::slidesorter::controller::Animator maIdle
sd slidesorter controller Animator
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:59
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:60
(anonymous namespace)::StringEmitContext m_aBuf
256
sfx2/inc/autoredactdialog.hxx:104
@@ -628,9 +604,36 @@ sfx2/source/appl/newhelp.hxx:422
sfx2/source/control/itemdel.cxx:31
SfxItemDisruptor_Impl m_Idle
sfx SfxItemDisruptor_Impl::Delete
-slideshow/source/engine/slideshowimpl.cxx:486
+slideshow/source/engine/slideshowimpl.cxx:462
(anonymous namespace)::SlideShowImpl maFrameSynchronization
0.02
+soltools/cpp/_cpp.c:31
+ /media/disk2/libo7/soltools/cpp/_cpp.c nerrs
+ 1
+soltools/cpp/_eval.c:734
+ tokval cvlen
+ 20
+soltools/cpp/_macro.c:168
+ doadefine onestr
+ 1
+soltools/cpp/cpp.h:120
+ includelist deleted
+ 1
+soltools/mkdepend/def.h:116
+ inclist i_notified
+ 1
+soltools/mkdepend/def.h:118
+ inclist i_searched
+ 1
+soltools/mkdepend/def.h:185
+ /media/disk2/libo7/soltools/mkdepend/main.c printed
+ 0
+soltools/mkdepend/def.h:185
+ /media/disk2/libo7/soltools/mkdepend/pr.c printed
+ 1
+soltools/mkdepend/def.h:189
+ /media/disk2/libo7/soltools/mkdepend/main.c show_where_not
+ 0
starmath/inc/edit.hxx:54
SmEditWindow aModifyIdle
SmEditWindow ModifyIdle
@@ -670,9 +673,15 @@ svx/source/dialog/contimp.hxx:71
svx/source/sdr/contact/viewcontactofsdrpage.cxx:105
sdr::contact::ViewContactOfPageShadow::createViewIndependentPrimitive2DSequence bUseOldPageShadow
0
-svx/source/sidebar/media/MediaPlaybackPanel.hxx:66
+svx/source/sidebar/media/MediaPlaybackPanel.hxx:64
svx::sidebar::MediaPlaybackPanel maIdle
MediaPlaybackPanel
+svx/source/sidebar/text/TextCharacterSpacingControl.hxx:43
+ svx::TextCharacterSpacingControl mnId
+ 10018
+svx/source/tbxctrls/layctrl.cxx:404
+ (anonymous namespace)::ColumnsWidget nWidth
+ 5
svx/source/unodraw/recoveryui.cxx:68
(anonymous namespace)::RecoveryUI m_pParentWindow
0
@@ -682,17 +691,17 @@ sw/inc/authfld.hxx:151
sw/inc/authfld.hxx:152
SwAuthorityField m_nTempSequencePosRLHidden
-1
-sw/inc/checkit.hxx:36
- /media/disk2/libo4/sw/source/core/bastyp/init.cxx pCheckIt
+sw/inc/checkit.hxx:35
+ /media/disk2/libo7/sw/source/core/bastyp/init.cxx pCheckIt
0
sw/inc/dbgoutsw.hxx:50
- /media/disk2/libo4/sw/source/core/doc/dbgoutsw.cxx bDbgOutStdErr
+ /media/disk2/libo7/sw/source/core/doc/dbgoutsw.cxx bDbgOutStdErr
0
sw/inc/dbgoutsw.hxx:51
- /media/disk2/libo4/sw/source/core/doc/dbgoutsw.cxx bDbgOutPrintAttrSet
+ /media/disk2/libo7/sw/source/core/doc/dbgoutsw.cxx bDbgOutPrintAttrSet
0
sw/inc/ftninfo.hxx:46
- SwEndNoteInfo aFormat
+ SwEndNoteInfo m_aFormat
4
sw/inc/hints.hxx:230
SwAttrSetChg m_bDelSet
@@ -704,16 +713,16 @@ sw/inc/modcfg.hxx:211
SwModuleOptions m_aWebTableConfig
1
sw/inc/swmodule.hxx:266
- /media/disk2/libo4/sw/source/uibase/app/swmodule.cxx g_bNoInterrupt
- 0
-sw/inc/swmodule.hxx:266
- /media/disk2/libo4/sw/source/core/frmedt/feshview.cxx g_bNoInterrupt
+ /media/disk2/libo7/sw/source/uibase/docvw/edtdd.cxx g_bNoInterrupt
0
sw/inc/swmodule.hxx:266
- /media/disk2/libo4/sw/source/uibase/ribbar/conform.cxx g_bNoInterrupt
+ /media/disk2/libo7/sw/source/uibase/ribbar/conform.cxx g_bNoInterrupt
1
sw/inc/swmodule.hxx:266
- /media/disk2/libo4/sw/source/uibase/docvw/edtdd.cxx g_bNoInterrupt
+ /media/disk2/libo7/sw/source/core/frmedt/feshview.cxx g_bNoInterrupt
+ 0
+sw/inc/swmodule.hxx:266
+ /media/disk2/libo7/sw/source/uibase/app/swmodule.cxx g_bNoInterrupt
0
sw/inc/view.hxx:191
SwView m_pHScrollbar
@@ -721,12 +730,12 @@ sw/inc/view.hxx:191
sw/inc/view.hxx:192
SwView m_pVScrollbar
0
-sw/inc/view.hxx:697
- /media/disk2/libo4/sw/source/uibase/uiview/viewport.cxx bDocSzUpdated
- 0
-sw/inc/view.hxx:697
- /media/disk2/libo4/sw/source/uibase/uiview/view.cxx bDocSzUpdated
+sw/inc/view.hxx:698
+ /media/disk2/libo7/sw/source/uibase/uiview/view.cxx bDocSzUpdated
1
+sw/inc/view.hxx:698
+ /media/disk2/libo7/sw/source/uibase/uiview/viewport.cxx bDocSzUpdated
+ 0
sw/inc/viewopt.hxx:188
SwViewOption m_bTest10
0
@@ -740,28 +749,31 @@ sw/source/core/docnode/threadmanager.hxx:125
ThreadManager maStartNewThreadIdle
SW ThreadManager StartNewThreadIdle
sw/source/core/inc/blink.hxx:89
- /media/disk2/libo4/sw/source/core/text/blink.cxx pBlink
+ /media/disk2/libo7/sw/source/core/text/blink.cxx pBlink
0
sw/source/core/inc/DocumentTimerManager.hxx:76
sw::DocumentTimerManager m_aFireIdleJobsTimer
sw::DocumentTimerManager m_aFireIdleJobsTimer
sw/source/core/inc/fntcache.hxx:60
- /media/disk2/libo4/sw/source/core/txtnode/fntcache.cxx pFntCache
+ /media/disk2/libo7/sw/source/core/txtnode/fntcache.cxx pFntCache
0
sw/source/core/inc/fntcache.hxx:61
- /media/disk2/libo4/sw/source/core/txtnode/fntcache.cxx pLastFont
+ /media/disk2/libo7/sw/source/core/txtnode/fntcache.cxx pLastFont
0
sw/source/core/inc/frmtool.hxx:144
- /media/disk2/libo4/sw/source/core/layout/frmtool.cxx bDontCreateObjects
+ /media/disk2/libo7/sw/source/core/layout/frmtool.cxx bDontCreateObjects
0
sw/source/core/inc/frmtool.hxx:147
- /media/disk2/libo4/sw/source/core/layout/frmtool.cxx bSetCompletePaintOnInvalidate
+ /media/disk2/libo7/sw/source/core/layout/frmtool.cxx bSetCompletePaintOnInvalidate
+ 0
+sw/source/core/inc/noteurl.hxx:28
+ /media/disk2/libo7/sw/source/core/text/noteurl.cxx pNoteURL
0
sw/source/core/inc/swfntcch.hxx:43
- /media/disk2/libo4/sw/source/core/txtnode/swfntcch.cxx pSwFontCache
+ /media/disk2/libo7/sw/source/core/txtnode/swfntcch.cxx pSwFontCache
0
sw/source/core/inc/txtfly.hxx:44
- /media/disk2/libo4/sw/source/core/text/txtinit.cxx pContourCache
+ /media/disk2/libo7/sw/source/core/text/txtinit.cxx pContourCache
0
sw/source/core/inc/UndoSort.hxx:38
SwSortUndoElement::(anonymous union)::(anonymous) nID
@@ -776,7 +788,7 @@ sw/source/core/ole/ndole.cxx:1086
SwOLEObj::tryToGetChartContentAsPrimitive2DSequence bAsynchronousLoadingAllowed
0
sw/source/core/text/pordrop.hxx:30
- /media/disk2/libo4/sw/source/core/text/txtinit.cxx pDropCapCache
+ /media/disk2/libo7/sw/source/core/text/txtinit.cxx pDropCapCache
0
sw/source/filter/inc/rtf.hxx:30
RTFSurround::(anonymous union)::(anonymous) nJunk
@@ -796,79 +808,79 @@ sw/source/filter/ww8/ww8par3.cxx:376
sw/source/filter/ww8/ww8par3.cxx:377
(anonymous namespace)::WW8LVL bV6
1
-sw/source/filter/ww8/ww8par5.cxx:1576
+sw/source/filter/ww8/ww8par5.cxx:1568
SwWW8ImplReader::Read_F_DocInfo aName10
-sw/source/filter/ww8/ww8par5.cxx:1577
+sw/source/filter/ww8/ww8par5.cxx:1569
SwWW8ImplReader::Read_F_DocInfo aName11
TITEL
-sw/source/filter/ww8/ww8par5.cxx:1579
+sw/source/filter/ww8/ww8par5.cxx:1571
SwWW8ImplReader::Read_F_DocInfo aName12
TITRE
-sw/source/filter/ww8/ww8par5.cxx:1581
+sw/source/filter/ww8/ww8par5.cxx:1573
SwWW8ImplReader::Read_F_DocInfo aName13
TITLE
-sw/source/filter/ww8/ww8par5.cxx:1583
+sw/source/filter/ww8/ww8par5.cxx:1575
SwWW8ImplReader::Read_F_DocInfo aName14
TITRO
-sw/source/filter/ww8/ww8par5.cxx:1585
+sw/source/filter/ww8/ww8par5.cxx:1577
SwWW8ImplReader::Read_F_DocInfo aName20
-sw/source/filter/ww8/ww8par5.cxx:1586
+sw/source/filter/ww8/ww8par5.cxx:1578
SwWW8ImplReader::Read_F_DocInfo aName21
ERSTELLDATUM
-sw/source/filter/ww8/ww8par5.cxx:1588
+sw/source/filter/ww8/ww8par5.cxx:1580
SwWW8ImplReader::Read_F_DocInfo aName22
CRÉÉ
-sw/source/filter/ww8/ww8par5.cxx:1590
+sw/source/filter/ww8/ww8par5.cxx:1582
SwWW8ImplReader::Read_F_DocInfo aName23
CREATED
-sw/source/filter/ww8/ww8par5.cxx:1592
+sw/source/filter/ww8/ww8par5.cxx:1584
SwWW8ImplReader::Read_F_DocInfo aName24
CREADO
-sw/source/filter/ww8/ww8par5.cxx:1594
+sw/source/filter/ww8/ww8par5.cxx:1586
SwWW8ImplReader::Read_F_DocInfo aName30
-sw/source/filter/ww8/ww8par5.cxx:1595
+sw/source/filter/ww8/ww8par5.cxx:1587
SwWW8ImplReader::Read_F_DocInfo aName31
ZULETZTGESPEICHERTZEIT
-sw/source/filter/ww8/ww8par5.cxx:1597
+sw/source/filter/ww8/ww8par5.cxx:1589
SwWW8ImplReader::Read_F_DocInfo aName32
DERNIERENREGISTREMENT
-sw/source/filter/ww8/ww8par5.cxx:1599
+sw/source/filter/ww8/ww8par5.cxx:1591
SwWW8ImplReader::Read_F_DocInfo aName33
SAVED
-sw/source/filter/ww8/ww8par5.cxx:1601
+sw/source/filter/ww8/ww8par5.cxx:1593
SwWW8ImplReader::Read_F_DocInfo aName34
MODIFICADO
-sw/source/filter/ww8/ww8par5.cxx:1603
+sw/source/filter/ww8/ww8par5.cxx:1595
SwWW8ImplReader::Read_F_DocInfo aName40
-sw/source/filter/ww8/ww8par5.cxx:1604
+sw/source/filter/ww8/ww8par5.cxx:1596
SwWW8ImplReader::Read_F_DocInfo aName41
ZULETZTGEDRUCKT
-sw/source/filter/ww8/ww8par5.cxx:1606
+sw/source/filter/ww8/ww8par5.cxx:1598
SwWW8ImplReader::Read_F_DocInfo aName42
DERNIÈREIMPRESSION
-sw/source/filter/ww8/ww8par5.cxx:1608
+sw/source/filter/ww8/ww8par5.cxx:1600
SwWW8ImplReader::Read_F_DocInfo aName43
LASTPRINTED
-sw/source/filter/ww8/ww8par5.cxx:1610
+sw/source/filter/ww8/ww8par5.cxx:1602
SwWW8ImplReader::Read_F_DocInfo aName44
HUPS PUPS
-sw/source/filter/ww8/ww8par5.cxx:1612
+sw/source/filter/ww8/ww8par5.cxx:1604
SwWW8ImplReader::Read_F_DocInfo aName50
-sw/source/filter/ww8/ww8par5.cxx:1613
+sw/source/filter/ww8/ww8par5.cxx:1605
SwWW8ImplReader::Read_F_DocInfo aName51
ÜBERARBEITUNGSNUMMER
-sw/source/filter/ww8/ww8par5.cxx:1615
+sw/source/filter/ww8/ww8par5.cxx:1607
SwWW8ImplReader::Read_F_DocInfo aName52
NUMÉRODEREVISION
-sw/source/filter/ww8/ww8par5.cxx:1617
+sw/source/filter/ww8/ww8par5.cxx:1609
SwWW8ImplReader::Read_F_DocInfo aName53
REVISIONNUMBER
-sw/source/filter/ww8/ww8par5.cxx:1619
+sw/source/filter/ww8/ww8par5.cxx:1611
SwWW8ImplReader::Read_F_DocInfo aName54
SNUBBEL BUBBEL
sw/source/filter/ww8/ww8par.hxx:663
@@ -902,19 +914,19 @@ sw/source/ui/envelp/labfmt.hxx:69
SwLabFormatPage aPreviewIdle
SwLabFormatPage Preview
sw/source/uibase/inc/edtdd.hxx:15
- /media/disk2/libo4/sw/source/uibase/docvw/edtwin.cxx g_bExecuteDrag
+ /media/disk2/libo7/sw/source/uibase/docvw/edtwin.cxx g_bExecuteDrag
0
sw/source/uibase/inc/edtwin.hxx:294
- /media/disk2/libo4/sw/source/uibase/docvw/edtdd.cxx g_bFrameDrag
+ /media/disk2/libo7/sw/source/uibase/docvw/edtdd.cxx g_bFrameDrag
0
sw/source/uibase/inc/edtwin.hxx:295
- /media/disk2/libo4/sw/source/uibase/docvw/edtwin.cxx g_bDDTimerStarted
+ /media/disk2/libo7/sw/source/uibase/docvw/edtwin.cxx g_bDDTimerStarted
0
sw/source/uibase/inc/edtwin.hxx:297
- /media/disk2/libo4/sw/source/uibase/docvw/edtwin.cxx g_bDDINetAttr
+ /media/disk2/libo7/sw/source/uibase/docvw/edtwin.cxx g_bDDINetAttr
0
sw/source/uibase/inc/edtwin.hxx:297
- /media/disk2/libo4/sw/source/uibase/dochdl/swdtflvr.cxx g_bDDINetAttr
+ /media/disk2/libo7/sw/source/uibase/dochdl/swdtflvr.cxx g_bDDINetAttr
1
sw/source/uibase/inc/instable.hxx:44
SwInsTableDlg minTableIndexInLb
@@ -955,11 +967,14 @@ vcl/inc/salprn.hxx:44
vcl/inc/salwtype.hxx:157
SalWheelMouseEvent mbDeltaIsPixel
0
-vcl/inc/svdata.hxx:271
+vcl/inc/svdata.hxx:278
ImplSVNWFData mbMenuBarDockingAreaCommonBG
0
-vcl/inc/svimpbox.hxx:142
- SvImpLBox m_bIsCellFocusEnabled
+vcl/inc/svimpbox.hxx:134
+ SvImpLBox m_nCurTabPos
+ 1
+vcl/inc/wizdlg.hxx:77
+ vcl::RoadmapWizard meViewAlign
0
vcl/source/bitmap/BitmapTools.cxx:1053
vcl::bitmap::get_unpremultiply_table inited
@@ -967,26 +982,20 @@ vcl/source/bitmap/BitmapTools.cxx:1053
vcl/source/bitmap/BitmapTools.cxx:1069
vcl::bitmap::get_premultiply_table inited
1
-vcl/source/control/imivctl.hxx:117
+vcl/source/control/imivctl.hxx:120
SvxIconChoiceCtrl_Impl aAutoArrangeIdle
svtools contnr SvxIconChoiceCtrl_Impl AutoArrange
-vcl/source/control/imivctl.hxx:118
+vcl/source/control/imivctl.hxx:121
SvxIconChoiceCtrl_Impl aDocRectChangedIdle
svtools contnr SvxIconChoiceCtrl_Impl DocRectChanged
-vcl/source/control/imivctl.hxx:119
+vcl/source/control/imivctl.hxx:122
SvxIconChoiceCtrl_Impl aVisRectChangedIdle
svtools contnr SvxIconChoiceCtrl_Impl VisRectChanged
-vcl/source/control/imivctl.hxx:120
+vcl/source/control/imivctl.hxx:123
SvxIconChoiceCtrl_Impl aCallSelectHdlIdle
svtools contnr SvxIconChoiceCtrl_Impl CallSelectHdl
-vcl/source/control/imivctl.hxx:142
- SvxIconChoiceCtrl_Impl pDDDev
- 0
-vcl/source/control/imivctl.hxx:144
- SvxIconChoiceCtrl_Impl pDDTempDev
- 0
vcl/source/control/imivctl.hxx:145
- SvxIconChoiceCtrl_Impl pEntryPaintDev
+ SvxIconChoiceCtrl_Impl pDDBufDev
0
vcl/source/control/roadmapwizard.cxx:59
vcl::RoadmapWizardImpl pRoadmap
@@ -1003,64 +1012,70 @@ vcl/source/filter/jpeg/transupp.h:130
vcl/source/filter/jpeg/transupp.h:131
(anonymous) crop
0
+vcl/source/filter/jpeg/transupp.h:147
+ (anonymous) crop_xoffset
+ 0
+vcl/source/filter/jpeg/transupp.h:149
+ (anonymous) crop_yoffset
+ 0
vcl/source/font/font.cxx:540
(anonymous namespace)::WeightSearchEntry weight
5
vcl/source/fontsubset/ttcr.cxx:347
vcl::(anonymous namespace)::tdata_post ptr
0
-vcl/source/gdi/dibtools.cxx:52
+vcl/source/gdi/dibtools.cxx:53
(anonymous namespace)::CIEXYZ aXyzX
0
-vcl/source/gdi/dibtools.cxx:53
+vcl/source/gdi/dibtools.cxx:54
(anonymous namespace)::CIEXYZ aXyzY
0
-vcl/source/gdi/dibtools.cxx:54
+vcl/source/gdi/dibtools.cxx:55
(anonymous namespace)::CIEXYZ aXyzZ
0
-vcl/source/gdi/dibtools.cxx:107
+vcl/source/gdi/dibtools.cxx:108
(anonymous namespace)::DIBV5Header nV5RedMask
0
-vcl/source/gdi/dibtools.cxx:108
+vcl/source/gdi/dibtools.cxx:109
(anonymous namespace)::DIBV5Header nV5GreenMask
0
-vcl/source/gdi/dibtools.cxx:109
+vcl/source/gdi/dibtools.cxx:110
(anonymous namespace)::DIBV5Header nV5BlueMask
0
-vcl/source/gdi/dibtools.cxx:110
+vcl/source/gdi/dibtools.cxx:111
(anonymous namespace)::DIBV5Header nV5AlphaMask
0
-vcl/source/gdi/dibtools.cxx:113
+vcl/source/gdi/dibtools.cxx:114
(anonymous namespace)::DIBV5Header nV5GammaRed
0
-vcl/source/gdi/dibtools.cxx:114
+vcl/source/gdi/dibtools.cxx:115
(anonymous namespace)::DIBV5Header nV5GammaGreen
0
-vcl/source/gdi/dibtools.cxx:115
+vcl/source/gdi/dibtools.cxx:116
(anonymous namespace)::DIBV5Header nV5GammaBlue
0
-vcl/source/gdi/dibtools.cxx:117
+vcl/source/gdi/dibtools.cxx:118
(anonymous namespace)::DIBV5Header nV5ProfileData
0
-vcl/source/gdi/dibtools.cxx:118
+vcl/source/gdi/dibtools.cxx:119
(anonymous namespace)::DIBV5Header nV5ProfileSize
0
-vcl/source/gdi/dibtools.cxx:119
+vcl/source/gdi/dibtools.cxx:120
(anonymous namespace)::DIBV5Header nV5Reserved
0
-vcl/source/gdi/pdfwriter_impl.hxx:746
+vcl/source/gdi/pdfwriter_impl.hxx:735
vcl::PDFWriterImpl m_DocDigest
0
vcl/unx/gtk3/a11y/gtk3atkutil.cxx:700
ooo_atk_util_ensure_event_listener bInited
1
-vcl/unx/gtk3/gtk3gtkinst.cxx:12506
+vcl/unx/gtk3/gtk3gtkinst.cxx:12901
(anonymous namespace)::ensure_intercept_drawing_area_accessibility bDone
1
workdir/LexTarget/l10ntools/source/xrmlex.cxx:706
- /media/disk2/libo4/workdir/LexTarget/l10ntools/source/xrmlex.cxx bText
+ /media/disk2/libo7/workdir/LexTarget/l10ntools/source/xrmlex.cxx bText
0
-writerfilter/source/dmapper/DomainMapper_Impl.hxx:136
+writerfilter/source/dmapper/DomainMapper_Impl.hxx:155
writerfilter::dmapper::FieldParagraph m_bRemove
0
writerfilter/source/dmapper/SettingsTable.cxx:263
@@ -1082,5 +1097,5 @@ writerfilter/source/rtftok/rtftokenizer.hxx:75
writerfilter::rtftok::RTFTokenizer s_bMathControlWordsSorted
1
xmloff/source/text/XMLIndexTemplateContext.hxx:57
- /media/disk2/libo4/xmloff/source/text/XMLIndexTemplateContext.cxx aLevelNameTableMap
+ /media/disk2/libo7/xmloff/source/text/XMLIndexTemplateContext.cxx aLevelNameTableMap
0
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index cb0a4b501acd..221798c2aa4d 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -224,13 +224,11 @@ private:
bool mbFormat : 1;
bool mbHighlight : 1;
- bool mbSelection : 1;
bool mbNoSelection : 1;
bool mbDrawSelection : 1;
bool mbBlackSel : 1;
bool mbDoubleSel : 1;
bool mbScroll : 1;
- bool mbFullMode : 1;
bool mbEdgeBlending : 1;
bool mbHasVisibleItems : 1;
@@ -260,7 +258,7 @@ private:
SVT_DLLPRIVATE tools::Rectangle ImplGetItemRect( size_t nPos ) const;
SVT_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue );
SVT_DLLPRIVATE bool ImplHasAccessibleListeners();
- SVT_DLLPRIVATE void ImplTracking( const Point& rPos, bool bRepeat );
+ SVT_DLLPRIVATE void ImplTracking( const Point& rPos );
SVT_DLLPRIVATE void ImplEndTracking( const Point& rPos, bool bCancel );
DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar*, void );
DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer*, void );
@@ -279,7 +277,6 @@ public:
virtual void dispose() override;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
- virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
virtual void MouseMove( const MouseEvent& rMEvt ) override;
virtual void Tracking( const TrackingEvent& rMEvt ) override;
virtual void KeyInput( const KeyEvent& rKEvt ) override;
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index a7a9f0598c07..a0ec7f897fe1 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -125,7 +125,6 @@ private:
ImplToolItems::size_type mnDockLines;
sal_uInt16 mnMouseModifier;
bool mbDrag:1,
- mbSelection:1,
mbUpper:1,
mbLower:1,
mbIn:1,
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index faf89ec8e05a..b0a2c87cbc6a 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -544,7 +544,6 @@ protected:
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
- sal_uInt16 GetCurrentTabPos() const;
void CallImplEventListeners(VclEventId nEvent, void* pData);
void ImplEditEntry( SvTreeListEntry* pEntry );
diff --git a/sc/qa/extras/check_data_pilot_table.cxx b/sc/qa/extras/check_data_pilot_table.cxx
index 79fcd14c66ca..f13768ffbc87 100644
--- a/sc/qa/extras/check_data_pilot_table.cxx
+++ b/sc/qa/extras/check_data_pilot_table.cxx
@@ -64,7 +64,7 @@ public:
private:
uno::Reference<lang::XComponent> mxComponent;
uno::Reference<uno::XInterface> mxObject;
- int mMaxFieldIndex = 6;
+ static constexpr int MAX_FIELD_INDEX = 6;
};
CheckDataPilotTable::CheckDataPilotTable()
@@ -89,8 +89,8 @@ uno::Reference< uno::XInterface > CheckDataPilotTable::init()
sCellRangeAdress.Sheet = 0;
sCellRangeAdress.StartColumn = 1;
sCellRangeAdress.StartRow = 0;
- sCellRangeAdress.EndColumn = mMaxFieldIndex-1;
- sCellRangeAdress.EndRow = mMaxFieldIndex - 1;
+ sCellRangeAdress.EndColumn = MAX_FIELD_INDEX-1;
+ sCellRangeAdress.EndRow = MAX_FIELD_INDEX - 1;
// position of the data pilot table
table::CellAddress sCellAdress;
@@ -112,7 +112,7 @@ uno::Reference< uno::XInterface > CheckDataPilotTable::init()
CPPUNIT_ASSERT(aAny2 >>= oSheet2);
//Filling a table
- for (int i = 1; i < mMaxFieldIndex; i++)
+ for (int i = 1; i < MAX_FIELD_INDEX; i++)
{
oSheet->getCellByPosition(i, 0)->setFormula("Col" + OUString::number(i));
oSheet->getCellByPosition(0, i)->setFormula("Row" + OUString::number(i));
@@ -120,9 +120,9 @@ uno::Reference< uno::XInterface > CheckDataPilotTable::init()
oSheet2->getCellByPosition(0, i)->setFormula("Row" + OUString::number(i));
}
- for (int i = 1; i < mMaxFieldIndex; i++)
+ for (int i = 1; i < MAX_FIELD_INDEX; i++)
{
- for (int j = 1; j < mMaxFieldIndex; j++)
+ for (int j = 1; j < MAX_FIELD_INDEX; j++)
{
oSheet->getCellByPosition(i, j)->setValue(i * (j + 1));
oSheet2->getCellByPosition(i, j)->setValue(i * (j + 2));
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index e6c39c91e54c..791a10ca1d4f 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -87,13 +87,11 @@ ValueSet::ValueSet( vcl::Window* pParent, WinBits nWinStyle ) :
mnFrameStyle = DrawFrameStyle::NONE;
mbFormat = true;
mbHighlight = false;
- mbSelection = false;
mbNoSelection = true;
mbDrawSelection = true;
mbBlackSel = false;
mbDoubleSel = false;
mbScroll = false;
- mbFullMode = true;
mbEdgeBlending = false;
mbHasVisibleItems = false;
@@ -545,20 +543,10 @@ void ValueSet::Format(vcl::RenderContext& rRenderContext)
}
// calculate offsets
- long nStartX;
- long nStartY;
- if (mbFullMode)
- {
- long nAllItemWidth = (mnItemWidth * mnCols) + nColSpace;
- long nAllItemHeight = (mnItemHeight * mnVisLines) + nNoneHeight + nLineSpace;
- nStartX = (aWinSize.Width() - nScrBarWidth - nAllItemWidth) / 2;
- nStartY = (aWinSize.Height() - nAllItemHeight) / 2;
- }
- else
- {
- nStartX = 0;
- nStartY = 0;
- }
+ long nAllItemWidth = (mnItemWidth * mnCols) + nColSpace;
+ long nAllItemHeight = (mnItemHeight * mnVisLines) + nNoneHeight + nLineSpace;
+ long nStartX = (aWinSize.Width() - nScrBarWidth - nAllItemWidth) / 2;
+ long nStartY = (aWinSize.Height() - nAllItemHeight) / 2;
// calculate and draw items
rRenderContext.SetLineColor();
@@ -593,15 +581,6 @@ void ValueSet::Format(vcl::RenderContext& rRenderContext)
maItemListRect.SetRight( x + mnCols * (mnItemWidth + mnSpacing) - mnSpacing - 1 );
maItemListRect.SetBottom( y + mnVisLines * (mnItemHeight + mnSpacing) - mnSpacing - 1 );
- if (!mbFullMode)
- {
- // If want also draw parts of items in the last line,
- // then we add one more line if parts of these line are
- // visible
- if (y + (mnVisLines * (mnItemHeight + mnSpacing)) < aWinSize.Height())
- nLastItem += mnCols;
- maItemListRect.SetBottom( aWinSize.Height() - y );
- }
for (size_t i = 0; i < nItemCount; i++)
{
ValueSetItem* pItem = mItemList[i].get();
@@ -1012,21 +991,11 @@ IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar, void )
IMPL_LINK_NOARG(ValueSet, ImplTimerHdl, Timer *, void)
{
- ImplTracking( GetPointerPosPixel(), true );
+ ImplTracking( GetPointerPosPixel() );
}
-void ValueSet::ImplTracking( const Point& rPos, bool bRepeat )
+void ValueSet::ImplTracking( const Point& rPos )
{
- if ( bRepeat || mbSelection )
- {
- if ( ImplScroll( rPos ) && mbSelection )
- {
- maTimer.SetInvokeHandler( LINK( this, ValueSet, ImplTimerHdl ) );
- maTimer.SetTimeout( MouseSettings::GetScrollRepeat() );
- maTimer.Start();
- }
- }
-
ValueSetItem* pItem = ImplGetItem( ImplGetItem( rPos ) );
if ( pItem )
{
@@ -1057,17 +1026,15 @@ void ValueSet::ImplEndTracking( const Point& rPos, bool bCancel )
if ( pItem )
{
SelectItem( pItem->mnId );
- if ( !mbSelection && !(GetStyle() & WB_NOPOINTERFOCUS) )
+ if ( !(GetStyle() & WB_NOPOINTERFOCUS) )
GrabFocus();
mbHighlight = false;
- mbSelection = false;
Select();
}
else
{
ImplHighlightItem( mnSelItemId, false );
mbHighlight = false;
- mbSelection = false;
}
}
@@ -1076,51 +1043,28 @@ void ValueSet::MouseButtonDown( const MouseEvent& rMouseEvent )
if ( rMouseEvent.IsLeft() )
{
ValueSetItem* pItem = ImplGetItem( ImplGetItem( rMouseEvent.GetPosPixel() ) );
- if ( mbSelection )
+ if ( pItem && !rMouseEvent.IsMod2() )
{
- mbHighlight = true;
- if ( pItem )
+ if ( rMouseEvent.GetClicks() == 1 )
{
+ mbHighlight = true;
mnHighItemId = mnSelItemId;
ImplHighlightItem( pItem->mnId );
+ StartTracking( StartTrackingFlags::ScrollRepeat );
}
return;
}
- else
- {
- if ( pItem && !rMouseEvent.IsMod2() )
- {
- if ( rMouseEvent.GetClicks() == 1 )
- {
- mbHighlight = true;
- mnHighItemId = mnSelItemId;
- ImplHighlightItem( pItem->mnId );
- StartTracking( StartTrackingFlags::ScrollRepeat );
- }
-
- return;
- }
- }
}
Control::MouseButtonDown( rMouseEvent );
}
-void ValueSet::MouseButtonUp( const MouseEvent& rMouseEvent )
-{
- // because of SelectionMode
- if ( rMouseEvent.IsLeft() && mbSelection )
- ImplEndTracking( rMouseEvent.GetPosPixel(), false );
- else
- Control::MouseButtonUp( rMouseEvent );
-}
-
void ValueSet::MouseMove( const MouseEvent& rMouseEvent )
{
// because of SelectionMode
- if ( mbSelection || (GetStyle() & WB_MENUSTYLEVALUESET) || (GetStyle() & WB_FLATVALUESET))
- ImplTracking( rMouseEvent.GetPosPixel(), false );
+ if ( (GetStyle() & WB_MENUSTYLEVALUESET) || (GetStyle() & WB_FLATVALUESET))
+ ImplTracking( rMouseEvent.GetPosPixel() );
Control::MouseMove( rMouseEvent );
}
@@ -1131,7 +1075,7 @@ void ValueSet::Tracking( const TrackingEvent& rTrackingEvent )
if ( rTrackingEvent.IsTrackingEnded() )
ImplEndTracking( aMousePos, rTrackingEvent.IsTrackingCanceled() );
else
- ImplTracking( aMousePos, rTrackingEvent.IsTrackingRepeat() );
+ ImplTracking( aMousePos );
}
void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
@@ -1803,7 +1747,6 @@ void ValueSet::SetNoSelection()
{
mbNoSelection = true;
mbHighlight = false;
- mbSelection = false;
if (IsReallyVisible() && IsUpdateMode())
Invalidate();
@@ -1960,7 +1903,6 @@ void ValueSet::EndSelection()
ImplHighlightItem( mnSelItemId );
mbHighlight = false;
}
- mbSelection = false;
}
void ValueSet::SetFormat()
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index b04dd42caabb..bf3a99892684 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -43,7 +43,6 @@ namespace svx {
TextCharacterSpacingControl::TextCharacterSpacingControl(TextCharacterSpacingPopup* pControl, weld::Widget* pParent)
: WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/textcharacterspacingcontrol.ui", "TextCharacterSpacingControl")
- , mnId(SID_ATTR_CHAR_KERNING)
, mnCustomKern(0)
, mnLastCus(SPACING_NOCUSTOM)
, mxEditKerning(m_xBuilder->weld_metric_spin_button("kerning", FieldUnit::POINT))
@@ -190,10 +189,10 @@ IMPL_LINK_NOARG(TextCharacterSpacingControl, KerningModifyHdl, weld::MetricSpinB
ExecuteCharacterSpacing(mnCustomKern, false);
}
-MapUnit TextCharacterSpacingControl::GetCoreMetric() const
+MapUnit TextCharacterSpacingControl::GetCoreMetric()
{
SfxItemPool &rPool = SfxGetpApp()->GetPool();
- sal_uInt16 nWhich = rPool.GetWhich(mnId);
+ sal_uInt16 nWhich = rPool.GetWhich(SID_ATTR_CHAR_KERNING);
return rPool.GetMetric(nWhich);
}
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
index 22b5e63141ae..f5ff964f0c85 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
@@ -40,7 +40,6 @@ public:
virtual ~TextCharacterSpacingControl() override;
private:
- sal_uInt16 mnId;
long mnCustomKern;
short mnLastCus;
@@ -60,7 +59,7 @@ private:
DECL_LINK(PredefinedValuesHdl, weld::Button&, void);
DECL_LINK(KerningModifyHdl, weld::MetricSpinButton&, void);
- MapUnit GetCoreMetric() const;
+ static MapUnit GetCoreMetric();
};
}
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 3d7f57d60db9..0e7691017ad3 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -392,6 +392,8 @@ namespace {
class ColumnsWidget final : public weld::CustomWidgetController
{
private:
+ static constexpr long WIDTH = 5;
+
rtl::Reference<SvxColumnsToolBoxControl> mxControl;
weld::SpinButton& mrSpinButton;
@@ -401,7 +403,6 @@ private:
::Color aHighlightFillColor;
::Color aFaceColor;
long nCol;
- long nWidth;
long nMX;
bool m_bMod1;
@@ -455,7 +456,6 @@ ColumnsWidget::ColumnsWidget(SvxColumnsToolBoxControl* pControl, weld::SpinButto
: mxControl(pControl)
, mrSpinButton(rSpinButton)
, nCol(1)
- , nWidth(5)
, nMX(0)
, m_bMod1(false)
{
@@ -488,7 +488,7 @@ void ColumnsWidget::SetDrawingArea(weld::DrawingArea* pDrawingArea)
OutputDevice& rDevice = pDrawingArea->get_ref_device();
Size aLogicSize = rDevice.LogicToPixel( Size( 95, 155 ), MapMode( MapUnit::Map10thMM ) );
nMX = aLogicSize.Width();
- Size aSize(nMX*nWidth-1, aLogicSize.Height());
+ Size aSize(nMX*WIDTH-1, aLogicSize.Height());
pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
CustomWidgetController::SetDrawingArea(pDrawingArea);
SetOutputSizePixel(aSize);
@@ -607,7 +607,7 @@ void ColumnsWidget::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
long nLineWidth;
Size aSize(GetOutputSizePixel());
- for (i = 0; i < nWidth; i++)
+ for (i = 0; i < WIDTH; i++)
{
if (i < nCol)
{
diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx
index 856f0ea74ae8..9f3f12505899 100644
--- a/vcl/inc/svimpbox.hxx
+++ b/vcl/inc/svimpbox.hxx
@@ -131,7 +131,6 @@ private:
long m_nNodeBmpWidth;
long m_nMostRight;
short m_nHorSBarHeight, m_nVerSBarWidth;
- sal_uInt16 m_nCurTabPos;
bool m_bUpdateMode : 1;
bool m_bAsyncBeginDrag : 1;
@@ -331,8 +330,6 @@ public:
void ShowFocusRect( const SvTreeListEntry* pEntry );
void CallEventListeners( VclEventId nEvent, void* pData = nullptr );
- sal_uInt16 GetCurrentTabPos() const { return m_nCurTabPos; }
-
bool IsSelectable( const SvTreeListEntry* pEntry );
void SetForceMakeVisible(bool bEnable) { mbForceMakeVisible = bEnable; }
};
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index 9bb9f77abb38..dbda04a66da8 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -74,7 +74,6 @@ namespace vcl
VclPtr<PushButton> mpNextBtn;
VclPtr<vcl::Window> mpViewWindow;
sal_uInt16 mnCurLevel;
- WindowAlign meViewAlign;
sal_Int16 mnLeftAlignCount;
bool mbEmptyViewMargin;
diff --git a/vcl/source/control/imivctl.hxx b/vcl/source/control/imivctl.hxx
index a2765a95aea9..54a95ce42a1b 100644
--- a/vcl/source/control/imivctl.hxx
+++ b/vcl/source/control/imivctl.hxx
@@ -142,7 +142,6 @@ class SvxIconChoiceCtrl_Impl
SvxIconChoiceCtrlEntry* pHead = nullptr; // top left entry
SvxIconChoiceCtrlEntry* pCursor;
SvxIconChoiceCtrlEntry* pHdlEntry;
- VclPtr<VirtualDevice> pDDBufDev;
SvxIconChoiceCtrlEntry* pAnchor; // for selection
LocalFocus aFocus; // Data for focusrect
::vcl::AccessibleFactoryAccess aAccFactory;
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index e268d15cf633..9a762d64fbeb 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -64,7 +64,7 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
pView(pCurView), nMaxVirtWidth(DEFAULT_MAX_VIRT_WIDTH), nMaxVirtHeight(DEFAULT_MAX_VIRT_HEIGHT),
nFlags(IconChoiceFlags::NONE), nUserEventAdjustScrBars(nullptr),
pCurHighlightFrame(nullptr), bHighlightFramePressed(false), pHead(nullptr), pCursor(nullptr),
- pHdlEntry(nullptr), pDDBufDev(nullptr),
+ pHdlEntry(nullptr),
pAnchor(nullptr), eTextMode(SvxIconChoiceCtrlTextMode::Short),
eSelectionMode(SelectionMode::Multiple), ePositionMode(SvxIconChoiceCtrlPositionMode::Free),
bUpdateMode(true)
@@ -110,7 +110,6 @@ SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl()
CancelUserEvents();
pImpCursor.reset();
pGridMap.reset();
- pDDBufDev.disposeAndClear();
ClearSelectedRectList();
m_pColumns.reset();
aVerSBar.disposeAndClear();
@@ -183,7 +182,6 @@ IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar, v
void SvxIconChoiceCtrl_Impl::FontModified()
{
- pDDBufDev.disposeAndClear();
SetDefaultTextSize();
ShowCursor( false );
ShowCursor( true );
@@ -1860,7 +1858,6 @@ void SvxIconChoiceCtrl_Impl::ShowCursor( bool bShow )
void SvxIconChoiceCtrl_Impl::HideDDIcon()
{
pView->Update();
- pDDBufDev = nullptr;
}
bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd )
diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx
index f4a35bb7861a..bd3078e52c8a 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -137,7 +137,6 @@ namespace vcl
mpNextBtn = nullptr;
mpViewWindow = nullptr;
mnCurLevel = 0;
- meViewAlign = WindowAlign::Left;
mbEmptyViewMargin = false;
mnLeftAlignCount = 0;
@@ -159,7 +158,6 @@ namespace vcl
m_xRoadmapImpl->pRoadmap->SetSizePixel( aRoadmapSize );
mpViewWindow = m_xRoadmapImpl->pRoadmap;
- meViewAlign = WindowAlign::Left;
m_xRoadmapImpl->pRoadmap->Show();
}
diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index 4971a5c53bb7..6a119d85118b 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -107,14 +107,8 @@ namespace vcl
if ( mpViewWindow && mpViewWindow->IsVisible() )
{
Size aViewSize = mpViewWindow->GetSizePixel();
- if ( meViewAlign == WindowAlign::Top )
- rSize.AdjustHeight(aViewSize.Height() );
- else if ( meViewAlign == WindowAlign::Left )
- rSize.AdjustWidth(aViewSize.Width() );
- else if ( meViewAlign == WindowAlign::Bottom )
- rSize.AdjustHeight(aViewSize.Height() );
- else if ( meViewAlign == WindowAlign::Right )
- rSize.AdjustWidth(aViewSize.Width() );
+ // align left
+ rSize.AdjustWidth(aViewSize.Width() );
}
if (nBarWidth > rSize.Width())
@@ -202,14 +196,7 @@ namespace vcl
long nViewHeight = 0;
long nDlgHeight = nOffY;
PosSizeFlags nViewPosFlags = PosSizeFlags::Pos;
- if ( meViewAlign == WindowAlign::Top )
- {
- nViewOffX = WIZARDDIALOG_VIEW_DLGOFFSET_X;
- nViewOffY = WIZARDDIALOG_VIEW_DLGOFFSET_Y;
- nViewWidth = aDlgSize.Width()-(WIZARDDIALOG_VIEW_DLGOFFSET_X*2);
- nViewPosFlags |= PosSizeFlags::Width;
- }
- else if ( meViewAlign == WindowAlign::Left )
+ // align left
{
if ( mbEmptyViewMargin )
{
@@ -225,20 +212,6 @@ namespace vcl
}
nViewPosFlags |= PosSizeFlags::Height;
}
- else if ( meViewAlign == WindowAlign::Bottom )
- {
- nViewOffX = WIZARDDIALOG_VIEW_DLGOFFSET_X;
- nViewOffY = nDlgHeight-mpViewWindow->GetSizePixel().Height()-WIZARDDIALOG_VIEW_DLGOFFSET_Y;
- nViewWidth = aDlgSize.Width()-(WIZARDDIALOG_VIEW_DLGOFFSET_X*2);
- nViewPosFlags |= PosSizeFlags::Width;
- }
- else if ( meViewAlign == WindowAlign::Right )
- {
- nViewOffX = aDlgSize.Width()-mpViewWindow->GetSizePixel().Width()-WIZARDDIALOG_VIEW_DLGOFFSET_X;
- nViewOffY = WIZARDDIALOG_VIEW_DLGOFFSET_Y;
- nViewHeight = nDlgHeight-(WIZARDDIALOG_VIEW_DLGOFFSET_Y*2);
- nViewPosFlags |= PosSizeFlags::Height;
- }
mpViewWindow->setPosSizePixel( nViewOffX, nViewOffY,
nViewWidth, nViewHeight,
nViewPosFlags );
@@ -284,21 +257,10 @@ namespace vcl
if ( mpViewWindow && mpViewWindow->IsVisible() )
{
Size aViewSize = mpViewWindow->GetSizePixel();
- if ( meViewAlign == WindowAlign::Top )
- {
- nOffY += aViewSize.Height()+WIZARDDIALOG_VIEW_DLGOFFSET_Y;
- aDlgSize.AdjustHeight( -(aViewSize.Height()+WIZARDDIALOG_VIEW_DLGOFFSET_Y) );
- }
- else if ( meViewAlign == WindowAlign::Left )
- {
- long nViewOffset = mbEmptyViewMargin ? 0 : WIZARDDIALOG_VIEW_DLGOFFSET_X;
- nOffX += aViewSize.Width() + nViewOffset;
- aDlgSize.AdjustWidth( -nOffX );
- }
- else if ( meViewAlign == WindowAlign::Bottom )
- aDlgSize.AdjustHeight( -(aViewSize.Height()+WIZARDDIALOG_VIEW_DLGOFFSET_Y) );
- else if ( meViewAlign == WindowAlign::Right )
- aDlgSize.AdjustWidth( -(aViewSize.Width()+WIZARDDIALOG_VIEW_DLGOFFSET_X) );
+ // align left
+ long nViewOffset = mbEmptyViewMargin ? 0 : WIZARDDIALOG_VIEW_DLGOFFSET_X;
+ nOffX += aViewSize.Width() + nViewOffset;
+ aDlgSize.AdjustWidth( -nOffX );
}
Point aPos( nOffX, nOffY );
mpCurTabPage->SetPosSizePixel( aPos, aDlgSize );
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 6ae3daf0346c..56d1e893d24d 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -97,7 +97,6 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits nWinS
m_pActiveTab = nullptr;
m_nFlags = LBoxFlags::NONE;
- m_nCurTabPos = FIRST_ENTRY_TAB;
m_aEditIdle.SetPriority( TaskPriority::LOWEST );
m_aEditIdle.SetInvokeHandler( LINK(this,SvImpLBox,EditTimerCall) );
@@ -217,14 +216,9 @@ void SvImpLBox::UpdateContextBmpWidthMax( SvTreeListEntry const * pEntry )
void SvImpLBox::CalcCellFocusRect( tools::Rectangle& rRect )
{
- if ( m_nCurTabPos > FIRST_ENTRY_TAB )
+ if (m_pCursor->ItemCount() > o3tl::make_unsigned(FIRST_ENTRY_TAB+1))
{
- SvLBoxItem& rItem = m_pCursor->GetItem( m_nCurTabPos );
- rRect.SetLeft( m_pView->GetTab( m_pCursor, &rItem )->GetPos() );
- }
- if (m_pCursor->ItemCount() > o3tl::make_unsigned(m_nCurTabPos+1))
- {
- SvLBoxItem& rNextItem = m_pCursor->GetItem( m_nCurTabPos + 1 );
+ SvLBoxItem& rNextItem = m_pCursor->GetItem( FIRST_ENTRY_TAB + 1 );
long nRight = m_pView->GetTab( m_pCursor, &rNextItem )->GetPos() - 1;
if ( nRight < rRect.Right() )
rRect.SetRight( nRight );
@@ -1990,9 +1984,6 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
if( !m_pCursor )
m_pCursor = m_pStartEntry;
SvTreeListEntry* pEntry = GetEntry( aPos );
- if ( pEntry != m_pCursor )
- // new entry selected -> reset current tab position to first tab
- m_nCurTabPos = FIRST_ENTRY_TAB;
m_nFlags &= ~LBoxFlags::Filling;
m_pView->GrabFocus();
//fdo#82270 Grabbing focus can invalidate the entries, re-fetch
@@ -2177,9 +2168,6 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
pNewCursor = m_pView->PrevVisible(pNewCursor);
} while( pNewCursor && !IsSelectable(pNewCursor) );
- if ( pNewCursor )
- // new entry selected -> reset current tab position to first tab
- m_nCurTabPos = FIRST_ENTRY_TAB;
// if there is no next entry, take the current one
// this ensures that in case of _one_ entry in the list, this entry is selected when pressing
// the cursor key
@@ -2202,10 +2190,6 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
pNewCursor = m_pView->NextVisible(pNewCursor);
} while( pNewCursor && !IsSelectable(pNewCursor) );
- if ( pNewCursor )
- // new entry selected -> reset current tab position to first tab
- m_nCurTabPos = FIRST_ENTRY_TAB;
-
// if there is no next entry, take the current one
// this ensures that in case of _one_ entry in the list, this entry is selected when pressing
// the cursor key
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index f573dbd2bd8a..ab4e5ba70fa1 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -626,8 +626,7 @@ sal_Int32 SvHeaderTabListBox::GetCurrRow() const
sal_uInt16 SvHeaderTabListBox::GetCurrColumn() const
{
- sal_uInt16 nPos = GetCurrentTabPos() - 1;
- return nPos;
+ return 0;
}
OUString SvHeaderTabListBox::GetRowDescription( sal_Int32 _nRow ) const
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index 901fed2ba4d8..e10cc0e4f104 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -3529,11 +3529,6 @@ void SvTreeListBox::InitSettings()
pCheckButtonData->SetDefaultImages(this);
}
-sal_uInt16 SvTreeListBox::GetCurrentTabPos() const
-{
- return pImpl->GetCurrentTabPos();
-}
-
VclPtr<PopupMenu> SvTreeListBox::CreateContextMenu()
{
return nullptr;
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 8db0cb65d6e8..339c81130d92 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1119,7 +1119,6 @@ void ToolBox::ImplInitToolBoxData()
mnDockLines = 0;
mnMouseModifier = 0;
mbDrag = false;
- mbSelection = false;
mbUpper = false;
mbLower = false;
mbIn = false;
@@ -2953,20 +2952,14 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel )
mpData->maDropdownTimer.Stop();
}
- if ( mbDrag || mbSelection )
+ if ( mbDrag )
{
- // set mouse data if in selection mode, as then
- // the MouseButtonDown handler cannot be called
- if ( mbSelection )
- mnMouseModifier = rMEvt.GetModifier();
-
Deactivate();
if ( mbDrag )
mbDrag = false;
else
{
- mbSelection = false;
if ( mnCurPos == ITEM_NOTFOUND )
return true;
}
@@ -3085,58 +3078,6 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt )
if( bFocusWindowIsAToolBoxChild || (pFocusWin && pFocusWin->ImplGetWindowImpl()->mbToolBox && pFocusWin != this) )
bDrawHotSpot = false;
- if ( mbSelection && bDrawHotSpot )
- {
- ImplToolItems::size_type i = 0;
- ImplToolItems::size_type nNewPos = ITEM_NOTFOUND;
-
- // search the item that has been clicked
- for (auto const& item : mpData->m_aItems)
- {
- // if the mouse position is in this item,
- // we can stop the search
- if ( item.maRect.IsInside( aMousePos ) )
- {
- // select it if it is a button
- if ( item.meType == ToolBoxItemType::BUTTON )
- {
- // if button is disabled, do not
- // change it
- if ( !item.mbEnabled || item.mbShowWindow )
- nNewPos = mnCurPos;
- else
- nNewPos = i;
- }
- break;
- }
- ++i;
- }
-
- // was a new entry selected?
- // don't change selection if keyboard selection is active and
- // mouse leaves the toolbox
- if ( nNewPos != mnCurPos && !( HasFocus() && nNewPos == ITEM_NOTFOUND ) )
- {
- if ( mnCurPos != ITEM_NOTFOUND )
- {
- InvalidateItem(mnCurPos);
- CallEventListeners( VclEventId::ToolboxHighlightOff, reinterpret_cast< void* >( mnCurPos ) );
- }
-
- mnCurPos = nNewPos;
- if ( mnCurPos != ITEM_NOTFOUND )
- {
- mnCurItemId = mnHighItemId = mpData->m_aItems[mnCurPos].mnId;
- InvalidateItem(mnCurPos);
- }
- else
- mnCurItemId = mnHighItemId = 0;
-
- Highlight();
- }
- return;
- }
-
if ( mbDragging )
{
ImplTBDragMgr* pMgr = ImplGetTBDragMgr();
@@ -3311,72 +3252,64 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
if ( mpData->m_aItems[nNewPos].mnBits & ToolBoxItemBits::REPEAT )
nTrackFlags |= StartTrackingFlags::ButtonRepeat;
- if ( mbSelection )
+ // update bDrag here, as it is evaluated in the EndSelection
+ mbDrag = true;
+
+ // on double-click: only call the handler, but do so before the button
+ // is hit, as in the handler dragging
+ // can be terminated
+ if ( rMEvt.GetClicks() == 2 )
+ DoubleClick();
+
+ if ( mbDrag )
{
InvalidateItem(mnCurPos);
Highlight();
}
- else
- {
- // update bDrag here, as it is evaluated in the EndSelection
- mbDrag = true;
-
- // on double-click: only call the handler, but do so before the button
- // is hit, as in the handler dragging
- // can be terminated
- if ( rMEvt.GetClicks() == 2 )
- DoubleClick();
- if ( mbDrag )
+ // was dropdown arrow pressed
+ if( mpData->m_aItems[nNewPos].mnBits & ToolBoxItemBits::DROPDOWN )
+ {
+ if( ( (mpData->m_aItems[nNewPos].mnBits & ToolBoxItemBits::DROPDOWNONLY) == ToolBoxItemBits::DROPDOWNONLY)
+ || mpData->m_aItems[nNewPos].GetDropDownRect( mbHorz ).IsInside( aMousePos ))
{
- InvalidateItem(mnCurPos);
- Highlight();
- }
+ // dropdownonly always triggers the dropdown handler, over the whole button area
- // was dropdown arrow pressed
- if( mpData->m_aItems[nNewPos].mnBits & ToolBoxItemBits::DROPDOWN )
- {
- if( ( (mpData->m_aItems[nNewPos].mnBits & ToolBoxItemBits::DROPDOWNONLY) == ToolBoxItemBits::DROPDOWNONLY)
- || mpData->m_aItems[nNewPos].GetDropDownRect( mbHorz ).IsInside( aMousePos ))
- {
- // dropdownonly always triggers the dropdown handler, over the whole button area
+ // the drop down arrow should not trigger the item action
+ mpData->mbDropDownByKeyboard = false;
+ mpData->maDropdownClickHdl.Call( this );
- // the drop down arrow should not trigger the item action
- mpData->mbDropDownByKeyboard = false;
- mpData->maDropdownClickHdl.Call( this );
+ // do not reset data if the dropdown handler opened a floating window
+ // see ImplFloatControl()
+ if( !mpFloatWin )
+ {
+ // no floater was opened
+ Deactivate();
+ InvalidateItem(mnCurPos);
- // do not reset data if the dropdown handler opened a floating window
- // see ImplFloatControl()
- if( !mpFloatWin )
- {
- // no floater was opened
- Deactivate();
- InvalidateItem(mnCurPos);
-
- mnCurPos = ITEM_NOTFOUND;
- mnCurItemId = 0;
- mnDownItemId = 0;
- mnMouseModifier = 0;
- mnHighItemId = 0;
- }
- return;
+ mnCurPos = ITEM_NOTFOUND;
+ mnCurItemId = 0;
+ mnDownItemId = 0;
+ mnMouseModifier = 0;
+ mnHighItemId = 0;
}
- else // activate long click timer
- mpData->maDropdownTimer.Start();
+ return;
}
+ else // activate long click timer
+ mpData->maDropdownTimer.Start();
+ }
- // call Click handler
- if ( rMEvt.GetClicks() != 2 )
- Click();
+ // call Click handler
+ if ( rMEvt.GetClicks() != 2 )
+ Click();
- // also call Select handler at repeat
- if ( nTrackFlags & StartTrackingFlags::ButtonRepeat )
- Select();
+ // also call Select handler at repeat
+ if ( nTrackFlags & StartTrackingFlags::ButtonRepeat )
+ Select();
- // if the actions was not aborted in Click handler
- if ( mbDrag )
- StartTracking( nTrackFlags );
- }
+ // if the actions was not aborted in Click handler
+ if ( mbDrag )
+ StartTracking( nTrackFlags );
// if mouse was clicked over an item we
// can abort here
@@ -3449,7 +3382,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
Click();
}
- if ( !mbDrag && !mbSelection && (mnCurPos == ITEM_NOTFOUND) )
+ if ( !mbDrag && (mnCurPos == ITEM_NOTFOUND) )
DockingWindow::MouseButtonDown( rMEvt );
}
@@ -4700,8 +4633,6 @@ void ToolBox::ImplChangeHighlight( ImplToolItem const * pItem, bool bNoGrabFocus
mnHighItemId = pItem->mnId;
InvalidateItem(aPos);
- if( mbSelection )
- mnCurPos = aPos;
ImplShowFocus();
if( pItem->mpWindow )
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 2db4448a4f5d..75bf5cc95a86 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1086,11 +1086,10 @@ vcl::Window* ToolBox::GetItemWindow( sal_uInt16 nItemId ) const
void ToolBox::EndSelection()
{
- if ( mbDrag || mbSelection )
+ if ( mbDrag )
{
// reset
mbDrag = false;
- mbSelection = false;
if (mnCurPos != ITEM_NOTFOUND)
InvalidateItem(mnCurPos);
EndTracking();
@@ -1130,10 +1129,9 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown )
}
}
- if ( mbDrag || mbSelection )
+ if ( mbDrag )
{
mbDrag = false;
- mbSelection = false;
EndTracking();
if (IsMouseCaptured())
ReleaseMouse();
More information about the Libreoffice-commits
mailing list