[Libreoffice-commits] core.git: compilerplugins/clang include/vcl vcl/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Feb 27 07:29:33 UTC 2020
compilerplugins/clang/singlevalfields.could-be-bool.results | 12
compilerplugins/clang/singlevalfields.results | 148 ++++++------
include/vcl/field.hxx | 3
include/vcl/quickselectionengine.hxx | 1
vcl/source/control/field.cxx | 3
vcl/source/control/quickselectionengine.cxx | 87 +++----
6 files changed, 129 insertions(+), 125 deletions(-)
New commits:
commit 95234b33bbf7793ff5f0c65fec9db6caebc6a94d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Feb 26 20:01:27 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Feb 27 08:29:00 2020 +0100
loplugin:singlevalfields
Change-Id: I3aa19805fab937cd9516ce8127753a0f599c73c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89611
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 096e5431b48a..0f39baf9354b 100644
--- a/compilerplugins/clang/singlevalfields.could-be-bool.results
+++ b/compilerplugins/clang/singlevalfields.could-be-bool.results
@@ -4,14 +4,14 @@ chart2/source/view/inc/PlottingPositionHelper.hxx:206
connectivity/source/inc/dbase/dindexnode.hxx:122
connectivity::dbase::ONDXPage bNoDelete
unsigned int
-cui/source/inc/cfg.hxx:232
+cui/source/inc/cfg.hxx:233
SvxConfigEntry nId
sal_uInt16
dbaccess/source/ui/inc/tabletree.hxx:149
dbaui::TableTreeListBox m_nTextColumn
int
desktop/source/app/main.c:29
- /home/noel/libo2/desktop/source/app/main.c g_Exiting
+ /media/disk2/libo4/desktop/source/app/main.c g_Exiting
int
editeng/source/misc/hangulhanja.cxx:78
editeng::HangulHanjaConversion_Impl m_eConvType
@@ -74,10 +74,10 @@ sd/qa/unit/tiledrendering/tiledrendering.cxx:959
(anonymous namespace)::ViewCallback m_nPart
int
soltools/cpp/_tokens.c:35
- /home/noel/libo2/soltools/cpp/_tokens.c EBCDIC_ExternTokenDetected
+ /media/disk2/libo4/soltools/cpp/_tokens.c EBCDIC_ExternTokenDetected
int
soltools/cpp/_tokens.c:36
- /home/noel/libo2/soltools/cpp/_tokens.c EBCDIC_StartTokenDetected
+ /media/disk2/libo4/soltools/cpp/_tokens.c EBCDIC_StartTokenDetected
int
soltools/cpp/cpp.h:121
includelist always
@@ -110,13 +110,13 @@ vcl/unx/generic/app/saldata.cxx:502
X11SalData::XError bOnce
int
vcl/unx/generic/app/sm.cxx:184
- /home/noel/libo2/vcl/unx/generic/app/sm.cxx nSmDel
+ /media/disk2/libo4/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
- /home/noel/libo2/workdir/LexTarget/l10ntools/source/cfglex.cxx bText
+ /media/disk2/libo4/workdir/LexTarget/l10ntools/source/cfglex.cxx bText
int
writerfilter/source/dmapper/PageBordersHandler.hxx:51
writerfilter::dmapper::PageBordersHandler m_eOffsetFrom
diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results
index 3f00bed44f28..e1401dc69377 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -112,7 +112,7 @@ cppu/source/uno/copy.hxx:39
cui/source/inc/acccfg.hxx:97
SfxAcceleratorConfigPage m_aUpdateDataTimer
UpdateDataTimer
-cui/source/inc/cfg.hxx:374
+cui/source/inc/cfg.hxx:375
SvxConfigPage m_aUpdateDataTimer
UpdateDataTimer
cui/source/inc/linkdlg.hxx:46
@@ -130,7 +130,7 @@ cui/source/options/optjava.hxx:60
dbaccess/source/ui/inc/directsql.hxx:64
dbaui::DirectSQLDialog m_aHighlighter
1
-desktop/source/app/app.cxx:490
+desktop/source/app/app.cxx:491
desktop::Desktop::Init bTryHardOfficeconfigBroken
0
desktop/source/app/cmdlineargs.hxx:137
@@ -185,19 +185,19 @@ helpcompiler/inc/BasCodeTagger.hxx:29
BasicCodeTagger m_Highlighter
0
i18npool/source/localedata/localedata.cxx:52
- /home/noel/libo2/i18npool/source/localedata/localedata.cxx lcl_DATA_EN
+ /media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_EN
localedata_en
i18npool/source/localedata/localedata.cxx:53
- /home/noel/libo2/i18npool/source/localedata/localedata.cxx lcl_DATA_ES
+ /media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_ES
localedata_es
i18npool/source/localedata/localedata.cxx:54
- /home/noel/libo2/i18npool/source/localedata/localedata.cxx lcl_DATA_EURO
+ /media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_EURO
localedata_euro
i18npool/source/localedata/localedata.cxx:55
- /home/noel/libo2/i18npool/source/localedata/localedata.cxx lcl_DATA_OTHERS
+ /media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_OTHERS
localedata_others
idlc/source/idlccompile.cxx:51
- /home/noel/libo2/idlc/source/idlccompile.cxx yydebug
+ /media/disk2/libo4/idlc/source/idlccompile.cxx yydebug
0
include/basegfx/pixel/bpixel.hxx:42
basegfx::BPixel::(anonymous union)::(anonymous) mnValue
@@ -271,9 +271,6 @@ include/svtools/svparser.hxx:74
include/svtools/tabbar.hxx:323
TabBar mnOffY
0
-include/svtools/valueset.hxx:219
- ValueSet mnSpacing
- 0
include/svx/ctredlin.hxx:91
SvxRedlinTable aDaTiFirst
0
@@ -325,9 +322,15 @@ include/svx/svdmark.hxx:144
include/svx/svdmrkv.hxx:110
SdrMarkView mnFrameHandlesLimit
50
+include/vcl/field.hxx:185
+ NumericFormatter mbShowTrailingZeros
+ 1
include/vcl/opengl/OpenGLContext.hxx:48
OpenGLCapabilitySwitch mbLimitedShaderRegisters
0
+include/vcl/quickselectionengine.hxx:79
+ vcl::QuickSelectionEngine bEnabled
+ 1
include/vcl/settings.hxx:145
DialogStyle content_area_border
2
@@ -337,9 +340,18 @@ include/vcl/settings.hxx:146
include/vcl/settings.hxx:147
DialogStyle action_area_border
5
+io/qa/textinputstream.cxx:97
+ (anonymous namespace)::Input open_
+ 1
libreofficekit/source/gtk/lokdocview.cxx:86
(anonymous namespace)::LOKDocViewPrivateImpl m_bIsLoading
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
@@ -365,7 +377,7 @@ sal/osl/unx/sockimpl.hxx:39
oslSocketImpl m_bIsInShutdown
1
sal/qa/osl/condition/osl_Condition_Const.h:41
- /home/noel/libo2/sal/qa/osl/condition/osl_Condition.cxx aTestCon
+ /media/disk2/libo4/sal/qa/osl/condition/osl_Condition.cxx aTestCon
testcondition
sal/qa/osl/file/osl_File_Const.h:128
extern aCanURL3
@@ -431,7 +443,7 @@ sal/qa/rtl/process/rtl_Process_Const.h:33
extern suParam3
-process
sal/qa/rtl/strings/test_ostring_stringliterals.cxx:22
- /home/noel/libo2/sal/qa/rtl/strings/test_ostring_stringliterals.cxx rtl_string_unittest_non_const_literal_function
+ /media/disk2/libo4/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
@@ -440,16 +452,16 @@ sc/inc/compiler.hxx:113
ScRawToken::(anonymous union)::(anonymous) eInForceArray
0
sc/inc/drwlayer.hxx:219
- /home/noel/libo2/sc/source/core/data/drwlayer.cxx bDrawIsInUndo
+ /media/disk2/libo4/sc/source/core/data/drwlayer.cxx bDrawIsInUndo
0
-sc/inc/global.hxx:917
- /home/noel/libo2/sc/source/core/data/global.cxx pScActiveViewShell
+sc/inc/global.hxx:914
+ /media/disk2/libo4/sc/source/core/data/global.cxx pScActiveViewShell
0
-sc/inc/global.hxx:918
- /home/noel/libo2/sc/source/core/data/global.cxx nScClickMouseModifier
+sc/inc/global.hxx:915
+ /media/disk2/libo4/sc/source/core/data/global.cxx nScClickMouseModifier
0
-sc/inc/global.hxx:919
- /home/noel/libo2/sc/source/core/data/global.cxx nScFillModeMouseModifier
+sc/inc/global.hxx:916
+ /media/disk2/libo4/sc/source/core/data/global.cxx nScFillModeMouseModifier
0
sc/inc/markmulti.hxx:81
ScMultiSelIter aMarkArrayIter
@@ -466,6 +478,9 @@ 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/unit/screenshots/screenshots.cxx:40
ScScreenshotTest mCsv
some, strings, here, separated, by, commas
@@ -479,10 +494,10 @@ sc/source/core/inc/parclass.hxx:94
ScParameterClassification::RunData bHasForceArray
1
sc/source/core/tool/scmatrix.cxx:350
- /home/noel/libo2/sc/source/core/tool/scmatrix.cxx bElementsMaxFetched
+ /media/disk2/libo4/sc/source/core/tool/scmatrix.cxx bElementsMaxFetched
1
sc/source/filter/inc/extlstcontext.hxx:20
- /home/noel/libo2/sc/source/filter/oox/condformatbuffer.cxx rStyleIdx
+ /media/disk2/libo4/sc/source/filter/oox/condformatbuffer.cxx rStyleIdx
0
sc/source/filter/inc/orcusinterface.hxx:179
ScOrcusConditionalFormat meEntryType
@@ -515,10 +530,10 @@ sc/source/ui/inc/viewdata.hxx:290
ScViewData aLogicMode
0
sc/source/ui/inc/viewfunc.hxx:376
- /home/noel/libo2/sc/source/ui/view/viewfun4.cxx bPasteIsDrop
+ /media/disk2/libo4/sc/source/ui/view/viewfun4.cxx bPasteIsDrop
0
sc/source/ui/inc/viewfunc.hxx:377
- /home/noel/libo2/sc/source/ui/view/viewfun7.cxx bPasteIsMove
+ /media/disk2/libo4/sc/source/ui/view/viewfun7.cxx bPasteIsMove
0
sd/inc/sdpptwrp.hxx:44
SdPPTFilter pBas
@@ -587,7 +602,7 @@ slideshow/source/engine/slideshowimpl.cxx:462
(anonymous namespace)::SlideShowImpl maFrameSynchronization
0.02
soltools/cpp/_cpp.c:31
- /home/noel/libo2/soltools/cpp/_cpp.c nerrs
+ /media/disk2/libo4/soltools/cpp/_cpp.c nerrs
1
soltools/cpp/_eval.c:734
tokval cvlen
@@ -605,13 +620,13 @@ soltools/mkdepend/def.h:118
inclist i_searched
1
soltools/mkdepend/def.h:185
- /home/noel/libo2/soltools/mkdepend/main.c printed
- 0
-soltools/mkdepend/def.h:185
- /home/noel/libo2/soltools/mkdepend/pr.c printed
+ /media/disk2/libo4/soltools/mkdepend/pr.c printed
1
+soltools/mkdepend/def.h:185
+ /media/disk2/libo4/soltools/mkdepend/main.c printed
+ 0
soltools/mkdepend/def.h:189
- /home/noel/libo2/soltools/mkdepend/main.c show_where_not
+ /media/disk2/libo4/soltools/mkdepend/main.c show_where_not
0
starmath/inc/edit.hxx:54
SmEditWindow aModifyIdle
@@ -640,9 +655,6 @@ svgio/source/svgreader/svgdocumenthandler.cxx:82
svl/source/crypto/cryptosign.cxx:153
(anonymous namespace)::TimeStampReq extensions
0
-svtools/source/control/valueimp.hxx:62
- ValueSetItem mpData
- 0
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx:44
sdr::overlay::OverlayManagerBuffered maBufferIdle
sdr overlay OverlayManagerBuffered Idle
@@ -652,7 +664,7 @@ svx/source/dialog/contimp.hxx:70
svx/source/dialog/contimp.hxx:71
SvxSuperContourDlg aCreateIdle
SvxSuperContourDlg CreateIdle
-svx/source/sdr/contact/viewcontactofsdrpage.cxx:105
+svx/source/sdr/contact/viewcontactofsdrpage.cxx:103
sdr::contact::ViewContactOfPageShadow::createViewIndependentPrimitive2DSequence bUseOldPageShadow
0
svx/source/sidebar/media/MediaPlaybackPanel.hxx:62
@@ -668,13 +680,13 @@ sw/inc/authfld.hxx:152
SwAuthorityField m_nTempSequencePosRLHidden
-1
sw/inc/checkit.hxx:35
- /home/noel/libo2/sw/source/core/bastyp/init.cxx pCheckIt
+ /media/disk2/libo4/sw/source/core/bastyp/init.cxx pCheckIt
0
sw/inc/dbgoutsw.hxx:50
- /home/noel/libo2/sw/source/core/doc/dbgoutsw.cxx bDbgOutStdErr
+ /media/disk2/libo4/sw/source/core/doc/dbgoutsw.cxx bDbgOutStdErr
0
sw/inc/dbgoutsw.hxx:51
- /home/noel/libo2/sw/source/core/doc/dbgoutsw.cxx bDbgOutPrintAttrSet
+ /media/disk2/libo4/sw/source/core/doc/dbgoutsw.cxx bDbgOutPrintAttrSet
0
sw/inc/ftninfo.hxx:46
SwEndNoteInfo m_aFormat
@@ -689,16 +701,16 @@ sw/inc/modcfg.hxx:211
SwModuleOptions m_aWebTableConfig
1
sw/inc/swmodule.hxx:266
- /home/noel/libo2/sw/source/uibase/docvw/edtdd.cxx g_bNoInterrupt
+ /media/disk2/libo4/sw/source/uibase/app/swmodule.cxx g_bNoInterrupt
0
sw/inc/swmodule.hxx:266
- /home/noel/libo2/sw/source/core/frmedt/feshview.cxx g_bNoInterrupt
+ /media/disk2/libo4/sw/source/core/frmedt/feshview.cxx g_bNoInterrupt
0
sw/inc/swmodule.hxx:266
- /home/noel/libo2/sw/source/uibase/ribbar/conform.cxx g_bNoInterrupt
+ /media/disk2/libo4/sw/source/uibase/ribbar/conform.cxx g_bNoInterrupt
1
sw/inc/swmodule.hxx:266
- /home/noel/libo2/sw/source/uibase/app/swmodule.cxx g_bNoInterrupt
+ /media/disk2/libo4/sw/source/uibase/docvw/edtdd.cxx g_bNoInterrupt
0
sw/inc/view.hxx:191
SwView m_pHScrollbar
@@ -707,10 +719,10 @@ sw/inc/view.hxx:192
SwView m_pVScrollbar
0
sw/inc/view.hxx:698
- /home/noel/libo2/sw/source/uibase/uiview/viewport.cxx bDocSzUpdated
+ /media/disk2/libo4/sw/source/uibase/uiview/viewport.cxx bDocSzUpdated
0
sw/inc/view.hxx:698
- /home/noel/libo2/sw/source/uibase/uiview/view.cxx bDocSzUpdated
+ /media/disk2/libo4/sw/source/uibase/uiview/view.cxx bDocSzUpdated
1
sw/inc/viewopt.hxx:189
SwViewOption m_bTest10
@@ -725,31 +737,31 @@ sw/source/core/docnode/threadmanager.hxx:125
ThreadManager maStartNewThreadIdle
SW ThreadManager StartNewThreadIdle
sw/source/core/inc/blink.hxx:89
- /home/noel/libo2/sw/source/core/text/blink.cxx pBlink
+ /media/disk2/libo4/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
- /home/noel/libo2/sw/source/core/txtnode/fntcache.cxx pFntCache
+ /media/disk2/libo4/sw/source/core/txtnode/fntcache.cxx pFntCache
0
sw/source/core/inc/fntcache.hxx:61
- /home/noel/libo2/sw/source/core/txtnode/fntcache.cxx pLastFont
+ /media/disk2/libo4/sw/source/core/txtnode/fntcache.cxx pLastFont
0
-sw/source/core/inc/frmtool.hxx:144
- /home/noel/libo2/sw/source/core/layout/frmtool.cxx bDontCreateObjects
+sw/source/core/inc/frmtool.hxx:153
+ /media/disk2/libo4/sw/source/core/layout/frmtool.cxx bDontCreateObjects
0
-sw/source/core/inc/frmtool.hxx:147
- /home/noel/libo2/sw/source/core/layout/frmtool.cxx bSetCompletePaintOnInvalidate
+sw/source/core/inc/frmtool.hxx:156
+ /media/disk2/libo4/sw/source/core/layout/frmtool.cxx bSetCompletePaintOnInvalidate
0
sw/source/core/inc/noteurl.hxx:28
- /home/noel/libo2/sw/source/core/text/noteurl.cxx pNoteURL
+ /media/disk2/libo4/sw/source/core/text/noteurl.cxx pNoteURL
0
sw/source/core/inc/swfntcch.hxx:43
- /home/noel/libo2/sw/source/core/txtnode/swfntcch.cxx pSwFontCache
+ /media/disk2/libo4/sw/source/core/txtnode/swfntcch.cxx pSwFontCache
0
sw/source/core/inc/txtfly.hxx:44
- /home/noel/libo2/sw/source/core/text/txtinit.cxx pContourCache
+ /media/disk2/libo4/sw/source/core/text/txtinit.cxx pContourCache
0
sw/source/core/inc/UndoSort.hxx:38
SwSortUndoElement::(anonymous union)::(anonymous) nID
@@ -764,7 +776,7 @@ sw/source/core/ole/ndole.cxx:1086
SwOLEObj::tryToGetChartContentAsPrimitive2DSequence bAsynchronousLoadingAllowed
0
sw/source/core/text/pordrop.hxx:30
- /home/noel/libo2/sw/source/core/text/txtinit.cxx pDropCapCache
+ /media/disk2/libo4/sw/source/core/text/txtinit.cxx pDropCapCache
0
sw/source/filter/inc/rtf.hxx:30
RTFSurround::(anonymous union)::(anonymous) nJunk
@@ -890,20 +902,20 @@ sw/source/ui/envelp/labfmt.hxx:69
SwLabFormatPage aPreviewIdle
SwLabFormatPage Preview
sw/source/uibase/inc/edtdd.hxx:15
- /home/noel/libo2/sw/source/uibase/docvw/edtwin.cxx g_bExecuteDrag
+ /media/disk2/libo4/sw/source/uibase/docvw/edtwin.cxx g_bExecuteDrag
0
sw/source/uibase/inc/edtwin.hxx:294
- /home/noel/libo2/sw/source/uibase/docvw/edtdd.cxx g_bFrameDrag
+ /media/disk2/libo4/sw/source/uibase/docvw/edtdd.cxx g_bFrameDrag
0
sw/source/uibase/inc/edtwin.hxx:295
- /home/noel/libo2/sw/source/uibase/docvw/edtwin.cxx g_bDDTimerStarted
+ /media/disk2/libo4/sw/source/uibase/docvw/edtwin.cxx g_bDDTimerStarted
0
sw/source/uibase/inc/edtwin.hxx:297
- /home/noel/libo2/sw/source/uibase/dochdl/swdtflvr.cxx g_bDDINetAttr
- 1
-sw/source/uibase/inc/edtwin.hxx:297
- /home/noel/libo2/sw/source/uibase/docvw/edtwin.cxx g_bDDINetAttr
+ /media/disk2/libo4/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
+ 1
sw/source/uibase/inc/instable.hxx:44
SwInsTableDlg minTableIndexInLb
1
@@ -922,7 +934,10 @@ sw/source/uibase/inc/unotools.hxx:45
unotools/source/config/saveopt.cxx:82
(anonymous namespace)::SvtSaveOptions_Impl bROUserAutoSave
0
-vcl/headless/svpgdi.cxx:1327
+vcl/headless/svpgdi.cxx:471
+ (anonymous) nMinimalSquareSizeToBuffer
+ 4096
+vcl/headless/svpgdi.cxx:1493
SvpSalGraphics::drawPolyLine bDoDirectCairoStroke
1
vcl/inc/canvasbitmap.hxx:55
@@ -1036,17 +1051,20 @@ vcl/source/gdi/dibtools.cxx:120
vcl/source/gdi/pdfwriter_impl.hxx:735
vcl::PDFWriterImpl m_DocDigest
0
+vcl/source/outdev/bitmap.cxx:1217
+ OutputDevice::DrawTransformedBitmapEx bAllowPreferDirectPaint
+ 1
vcl/unx/gtk3/a11y/gtk3atkutil.cxx:700
ooo_atk_util_ensure_event_listener bInited
1
-vcl/unx/gtk3/gtk3gtkinst.cxx:13120
+vcl/unx/gtk3/gtk3gtkinst.cxx:13155
(anonymous namespace)::ensure_intercept_drawing_area_accessibility bDone
1
-vcl/unx/gtk3/gtk3gtkinst.cxx:13148
+vcl/unx/gtk3/gtk3gtkinst.cxx:13183
(anonymous namespace)::ensure_disable_ctrl_page_up_down_bindings bDone
1
workdir/LexTarget/l10ntools/source/xrmlex.cxx:706
- /home/noel/libo2/workdir/LexTarget/l10ntools/source/xrmlex.cxx bText
+ /media/disk2/libo4/workdir/LexTarget/l10ntools/source/xrmlex.cxx bText
0
writerfilter/source/dmapper/DomainMapper_Impl.hxx:148
writerfilter::dmapper::FieldParagraph m_bRemove
@@ -1070,5 +1088,5 @@ writerfilter/source/rtftok/rtftokenizer.hxx:75
writerfilter::rtftok::RTFTokenizer s_bMathControlWordsSorted
1
xmloff/source/text/XMLIndexTemplateContext.hxx:57
- /home/noel/libo2/xmloff/source/text/XMLIndexTemplateContext.cxx aLevelNameTableMap
+ /media/disk2/libo4/xmloff/source/text/XMLIndexTemplateContext.cxx aLevelNameTableMap
0
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 8a1a0cafa571..9260859874f0 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -142,8 +142,6 @@ public:
void SetUseThousandSep( bool b );
bool IsUseThousandSep() const { return mbThousandSep; }
- bool IsShowTrailingZeros() const { return mbShowTrailingZeros; }
-
void SetUserValue( sal_Int64 nNewValue );
virtual void SetValue( sal_Int64 nNewValue );
sal_Int64 GetValue() const;
@@ -182,7 +180,6 @@ protected:
private:
sal_uInt16 mnDecimalDigits;
bool mbThousandSep;
- bool mbShowTrailingZeros;
};
diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx
index 712dc6417d1c..87e1d09a92d5 100644
--- a/include/vcl/quickselectionengine.hxx
+++ b/include/vcl/quickselectionengine.hxx
@@ -76,7 +76,6 @@ namespace vcl
private:
::std::unique_ptr< QuickSelectionEngine_Data > m_pData;
- bool bEnabled;
private:
QuickSelectionEngine( const QuickSelectionEngine& ) = delete;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 3f5ba183f9c0..9d5cb9ca08f5 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -551,7 +551,6 @@ NumericFormatter::NumericFormatter(Edit* pEdit)
, mnLast(mnMax)
, mnDecimalDigits(0)
, mbThousandSep(true)
- , mbShowTrailingZeros(true)
{
ReformatAll();
}
@@ -594,7 +593,7 @@ void NumericFormatter::SetValue( sal_Int64 nNewValue )
OUString NumericFormatter::CreateFieldText( sal_Int64 nValue ) const
{
- return ImplGetLocaleDataWrapper().getNum( nValue, GetDecimalDigits(), IsUseThousandSep(), IsShowTrailingZeros() );
+ return ImplGetLocaleDataWrapper().getNum( nValue, GetDecimalDigits(), IsUseThousandSep(), /*ShowTrailingZeros*/true );
}
void NumericFormatter::ImplSetUserValue( sal_Int64 nNewValue, Selection const * pNewSelection )
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index d5434108582a..e3b060896d5e 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -97,8 +97,7 @@ namespace vcl
}
QuickSelectionEngine::QuickSelectionEngine( ISearchableStringList& _entryList )
- :m_pData( new QuickSelectionEngine_Data( _entryList ) ),
- bEnabled( true )
+ :m_pData( new QuickSelectionEngine_Data( _entryList ) )
{
}
@@ -108,61 +107,53 @@ namespace vcl
bool QuickSelectionEngine::HandleKeyEvent( const KeyEvent& _keyEvent )
{
- if( bEnabled )
+ sal_Unicode c = _keyEvent.GetCharCode();
+
+ if ( ( c >= 32 ) && ( c != 127 ) && !_keyEvent.GetKeyCode().IsMod2() )
{
- sal_Unicode c = _keyEvent.GetCharCode();
+ m_pData->sCurrentSearchString += OUStringChar(c);
+ SAL_INFO( "vcl", "QuickSelectionEngine::HandleKeyEvent: searching for " << m_pData->sCurrentSearchString );
- if ( ( c >= 32 ) && ( c != 127 ) && !_keyEvent.GetKeyCode().IsMod2() )
+ if ( m_pData->sCurrentSearchString.getLength() == 1 )
+ { // first character in the search -> remember
+ m_pData->aSingleSearchChar = c;
+ }
+ else if ( m_pData->sCurrentSearchString.getLength() > 1 )
{
- m_pData->sCurrentSearchString += OUStringChar(c);
- SAL_INFO( "vcl", "QuickSelectionEngine::HandleKeyEvent: searching for " << m_pData->sCurrentSearchString );
-
- if ( m_pData->sCurrentSearchString.getLength() == 1 )
- { // first character in the search -> remember
- m_pData->aSingleSearchChar = c;
- }
- else if ( m_pData->sCurrentSearchString.getLength() > 1 )
- {
- if ( !!m_pData->aSingleSearchChar && ( *m_pData->aSingleSearchChar != c ) )
- // we already have a "single char", but the current one is different -> reset
- m_pData->aSingleSearchChar.reset();
- }
-
- OUString aSearchTemp( m_pData->sCurrentSearchString );
-
- StringEntryIdentifier pMatchingEntry = findMatchingEntry( aSearchTemp, *m_pData );
- SAL_INFO( "vcl", "QuickSelectionEngine::HandleKeyEvent: found " << pMatchingEntry );
- if ( !pMatchingEntry && (aSearchTemp.getLength() > 1) && !!m_pData->aSingleSearchChar )
- {
- // if there's only one letter in the search string, use a different search mode
- aSearchTemp = OUString(*m_pData->aSingleSearchChar);
- pMatchingEntry = findMatchingEntry( aSearchTemp, *m_pData );
- }
-
- if ( pMatchingEntry )
- {
- m_pData->rEntryList.SelectEntry( pMatchingEntry );
- m_pData->aSearchTimeout.Start();
- }
- else
- {
- lcl_reset( *m_pData );
- }
-
- return true;
+ if ( !!m_pData->aSingleSearchChar && ( *m_pData->aSingleSearchChar != c ) )
+ // we already have a "single char", but the current one is different -> reset
+ m_pData->aSingleSearchChar.reset();
}
- return false;
- }
- else
- {
- return false;
+
+ OUString aSearchTemp( m_pData->sCurrentSearchString );
+
+ StringEntryIdentifier pMatchingEntry = findMatchingEntry( aSearchTemp, *m_pData );
+ SAL_INFO( "vcl", "QuickSelectionEngine::HandleKeyEvent: found " << pMatchingEntry );
+ if ( !pMatchingEntry && (aSearchTemp.getLength() > 1) && !!m_pData->aSingleSearchChar )
+ {
+ // if there's only one letter in the search string, use a different search mode
+ aSearchTemp = OUString(*m_pData->aSingleSearchChar);
+ pMatchingEntry = findMatchingEntry( aSearchTemp, *m_pData );
+ }
+
+ if ( pMatchingEntry )
+ {
+ m_pData->rEntryList.SelectEntry( pMatchingEntry );
+ m_pData->aSearchTimeout.Start();
+ }
+ else
+ {
+ lcl_reset( *m_pData );
+ }
+
+ return true;
}
+ return false;
}
void QuickSelectionEngine::Reset()
{
- if( bEnabled )
- lcl_reset( *m_pData );
+ lcl_reset( *m_pData );
}
} // namespace vcl
More information about the Libreoffice-commits
mailing list