From 5b374877b573cf716123a0d0c04a84ccc91e8c86 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 16 Nov 2019 13:49:37 +0200 Subject: loplugin:singlevalfields Change-Id: I31fd6b251dee9d1ee1a9ac59964034d0136e1f3e Reviewed-on: https://gerrit.libreoffice.org/82978 Tested-by: Jenkins Reviewed-by: Noel Grandin --- .../source/extended/accessibletablistboxtable.cxx | 56 +---- .../clang/singlevalfields.could-be-bool.results | 18 +- compilerplugins/clang/singlevalfields.py | 2 +- compilerplugins/clang/singlevalfields.results | 280 +++++++++++---------- include/vcl/svtabbx.hxx | 2 - include/vcl/treelistbox.hxx | 2 - vcl/inc/svimpbox.hxx | 3 - vcl/source/treelist/svimpbox.cxx | 1 - vcl/source/treelist/svtabbx.cxx | 45 +--- vcl/source/treelist/treelistbox.cxx | 10 +- 10 files changed, 171 insertions(+), 248 deletions(-) diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 20548bab8b6a..0ae2fa008a92 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -105,29 +105,8 @@ namespace accessibility Reference< XAccessible > xChild = m_pTabListBox->CreateAccessibleCell( nRow, nCol ); uno::Any aOldValue, aNewValue; - - if ( m_pTabListBox->IsTransientChildrenDisabled() ) - { - aNewValue <<= AccessibleStateType::FOCUSED; - TriState eState = TRISTATE_INDET; - if ( m_pTabListBox->IsCellCheckBox( nRow, nCol, eState ) ) - { - AccessibleCheckBoxCell* pCell = - static_cast< AccessibleCheckBoxCell* >( xChild.get() ); - pCell->commitEvent( AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue ); - } - else - { - AccessibleBrowseBoxTableCell* pCell = - static_cast< AccessibleBrowseBoxTableCell* >( xChild.get() ); - pCell->commitEvent( AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue ); - } - } - else - { - aNewValue <<= xChild; - commitEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aNewValue, aOldValue ); - } + aNewValue <<= xChild; + commitEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aNewValue, aOldValue ); } } break; @@ -215,37 +194,6 @@ namespace accessibility case VclEventId::TableCellNameChanged : { - if ( m_pTabListBox->IsTransientChildrenDisabled() ) - { - commitEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); - TabListBoxEventData* pData = static_cast< TabListBoxEventData* >( rVclWindowEvent.GetData() ); - SvTreeListEntry* pEntry = pData != nullptr ? pData->m_pEntry : nullptr; - if ( pEntry ) - { - sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry ); - sal_uInt16 nCol = pData->m_nColumn; - Reference< XAccessible > xChild = - m_pTabListBox->CreateAccessibleCell( nRow, nCol ); - uno::Any aOldValue, aNewValue; - aOldValue <<= pData->m_sOldText; - OUString sNewText( m_pTabListBox->GetCellText( nRow, nCol ) ); - aNewValue <<= sNewText; - TriState eState = TRISTATE_INDET; - - if ( m_pTabListBox->IsCellCheckBox( nRow, nCol, eState ) ) - { - AccessibleCheckBoxCell* pCell = - static_cast< AccessibleCheckBoxCell* >( xChild.get() ); - pCell->commitEvent( AccessibleEventId::NAME_CHANGED, aNewValue, aOldValue ); - } - else - { - AccessibleBrowseBoxTableCell* pCell = - static_cast< AccessibleBrowseBoxTableCell* >( xChild.get() ); - pCell->nameChanged( sNewText, pData->m_sOldText ); - } - } - } break; } default: break; diff --git a/compilerplugins/clang/singlevalfields.could-be-bool.results b/compilerplugins/clang/singlevalfields.could-be-bool.results index 26ab650d1206..8009a02ee3bc 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:125 connectivity::dbase::ONDXPage bNoDelete unsigned int -cui/source/inc/cfg.hxx:231 +cui/source/inc/cfg.hxx:232 SvxConfigEntry nId sal_uInt16 dbaccess/source/ui/inc/tabletree.hxx:149 dbaui::TableTreeListBox m_nTextColumn int desktop/source/app/main.c:29 - /media/disk2/libo7/desktop/source/app/main.c g_Exiting + /media/disk2/libo4/desktop/source/app/main.c g_Exiting int editeng/source/misc/hangulhanja.cxx:79 editeng::HangulHanjaConversion_Impl m_eConvType @@ -37,16 +37,16 @@ include/vbahelper/vbapagesetupbase.hxx:50 include/vcl/dialog.hxx:48 Dialog mnMousePositioned long -include/vcl/headbar.hxx:213 +include/vcl/headbar.hxx:211 HeaderBar mnBorderOff1 long -include/vcl/headbar.hxx:214 +include/vcl/headbar.hxx:212 HeaderBar mnBorderOff2 long jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:191 (anonymous) g_bInGetJavaVM sig_atomic_t -libreofficekit/source/gtk/tilebuffer.hxx:219 +libreofficekit/source/gtk/tilebuffer.hxx:229 LOEvent m_nSetGraphicSelectionType int sal/rtl/cipher.cxx:110 @@ -74,10 +74,10 @@ sd/qa/unit/tiledrendering/tiledrendering.cxx:956 ViewCallback m_nPart int soltools/cpp/_tokens.c:35 - /media/disk2/libo7/soltools/cpp/_tokens.c EBCDIC_ExternTokenDetected + /media/disk2/libo4/soltools/cpp/_tokens.c EBCDIC_ExternTokenDetected int soltools/cpp/_tokens.c:36 - /media/disk2/libo7/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 - /media/disk2/libo7/vcl/unx/generic/app/sm.cxx nSmDel + /media/disk2/libo4/vcl/unx/generic/app/sm.cxx nSmDel int vcl/workben/icontest.cxx:145 IconTestApp nRet int workdir/LexTarget/l10ntools/source/cfglex.cxx:2293 - /media/disk2/libo7/workdir/LexTarget/l10ntools/source/cfglex.cxx bText + /media/disk2/libo4/workdir/LexTarget/l10ntools/source/cfglex.cxx bText int writerfilter/source/dmapper/PageBordersHandler.hxx:54 writerfilter::dmapper::PageBordersHandler m_eOffsetFrom diff --git a/compilerplugins/clang/singlevalfields.py b/compilerplugins/clang/singlevalfields.py index 7d42a0f6bbc6..3b9577b87263 100755 --- a/compilerplugins/clang/singlevalfields.py +++ b/compilerplugins/clang/singlevalfields.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 import sys import re diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results index 6f557d352558..b4c26ff6d892 100644 --- a/compilerplugins/clang/singlevalfields.results +++ b/compilerplugins/clang/singlevalfields.results @@ -37,7 +37,7 @@ bridges/source/jni_uno/jni_bridge.h:53 bridges/source/jni_uno/jni_uno2java.cxx:389 jni_uno::UNO_proxy m_ref 1 -chart2/source/controller/dialogs/DataBrowser.cxx:211 +chart2/source/controller/dialogs/DataBrowser.cxx:209 chart::impl::SeriesHeader m_aUpdateDataTimer UpdateDataTimer chart2/source/controller/inc/ChartController.hxx:382 @@ -58,21 +58,6 @@ chart2/source/model/main/DataPoint.hxx:108 comphelper/source/misc/threadpool.cxx:39 comphelper gbIsWorkerThread 1 -connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx:43 - connectivity::mysqlc::MySqlFieldInfo length - 0 -connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx:44 - connectivity::mysqlc::MySqlFieldInfo type - 0 -connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx:45 - connectivity::mysqlc::MySqlFieldInfo mysql_type - 0 -connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx:46 - connectivity::mysqlc::MySqlFieldInfo charsetNumber - 0 -connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx:47 - connectivity::mysqlc::MySqlFieldInfo flags - 0 connectivity/source/inc/dbase/DIndexIter.hxx:36 connectivity::dbase::OIndexIterator m_pOperator 0 @@ -112,7 +97,7 @@ cppu/source/uno/copy.hxx:39 cui/source/inc/acccfg.hxx:96 SfxAcceleratorConfigPage m_aUpdateDataTimer UpdateDataTimer -cui/source/inc/cfg.hxx:357 +cui/source/inc/cfg.hxx:372 SvxConfigPage m_aUpdateDataTimer UpdateDataTimer cui/source/inc/linkdlg.hxx:46 @@ -181,32 +166,32 @@ filter/source/msfilter/msdffimp.cxx:2704 filter/source/msfilter/viscache.hxx:30 Impl_OlePres nFormat 3 -fpicker/source/office/commonpicker.hxx:66 - svt::OCommonPicker m_pDlg +fpicker/source/office/iodlgimp.hxx:158 + SvtExpFileDlg_Impl m_bNeedDelayedFilterExecute 0 -framework/source/services/autorecovery.cxx:391 +framework/source/services/autorecovery.cxx:392 (anonymous namespace)::AutoRecovery m_aTimer Auto save timer -framework/source/uiconfiguration/imagemanagerimpl.hxx:182 +framework/source/uiconfiguration/imagemanagerimpl.hxx:173 framework::ImageManagerImpl m_aResourceString private:resource/images/moduleimages helpcompiler/inc/BasCodeTagger.hxx:29 BasicCodeTagger m_Highlighter 0 -i18npool/source/localedata/localedata.cxx:51 - /media/disk2/libo7/i18npool/source/localedata/localedata.cxx lcl_DATA_EN - localedata_en i18npool/source/localedata/localedata.cxx:52 - /media/disk2/libo7/i18npool/source/localedata/localedata.cxx lcl_DATA_ES - localedata_es + /media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_EN + localedata_en i18npool/source/localedata/localedata.cxx:53 - /media/disk2/libo7/i18npool/source/localedata/localedata.cxx lcl_DATA_EURO - localedata_euro + /media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_ES + localedata_es i18npool/source/localedata/localedata.cxx:54 - /media/disk2/libo7/i18npool/source/localedata/localedata.cxx lcl_DATA_OTHERS + /media/disk2/libo4/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 localedata_others idlc/source/idlccompile.cxx:50 - /media/disk2/libo7/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 @@ -247,7 +232,7 @@ include/filter/msfilter/dffpropset.hxx:35 include/i18nutil/casefolding.hxx:57 i18nutil::Mapping nmap 0 -include/o3tl/cow_wrapper.hxx:198 +include/o3tl/cow_wrapper.hxx:204 o3tl::cow_wrapper::impl_t m_ref_count 1 include/o3tl/vector_pool.hxx:93 @@ -280,6 +265,15 @@ include/sfx2/templatedlg.hxx:123 include/svtools/filechangedchecker.hxx:31 FileChangedChecker mIdle SVTools FileChangedChecker Idle +include/svtools/inettbc.hxx:46 + SvtURLBox bOnlyDirectories + 0 +include/svtools/inettbc.hxx:48 + SvtURLBox bNoSelection + 0 +include/svtools/inettbc.hxx:49 + SvtURLBox bIsAutoCompleteEnabled + 1 include/svtools/svparser.hxx:55 SvParser pImplData 0 @@ -292,6 +286,9 @@ include/svtools/svparser.hxx:74 include/svtools/tabbar.hxx:323 TabBar mnOffY 0 +include/svx/colorbox.hxx:41 + SvxColorListBox m_bShowNoneButton + 0 include/svx/ctredlin.hxx:74 SvxRedlinTable aDaTiFirst 0 @@ -331,7 +328,7 @@ include/svx/dialcontrol.hxx:119 include/svx/fillctrl.hxx:53 SvxFillToolBoxControl mpFillControl 0 -include/svx/fontwork.hxx:97 +include/svx/fontwork.hxx:96 SvxFontWorkDialog aInputIdle SvxFontWorkDialog Input include/svx/graphctl.hxx:53 @@ -355,12 +352,6 @@ include/svx/svdmark.hxx:144 include/svx/svdmrkv.hxx:110 SdrMarkView mnFrameHandlesLimit 50 -include/vcl/ITiledRenderable.hxx:47 - vcl::ITiledRenderable mnTilePixelWidth - 256 -include/vcl/ITiledRenderable.hxx:47 - vcl::ITiledRenderable mnTilePixelHeight - 256 include/vcl/opengl/OpenGLContext.hxx:48 OpenGLCapabilitySwitch mbLimitedShaderRegisters 0 @@ -380,7 +371,7 @@ libreofficekit/source/gtk/lokdocview.cxx:84 LOKDocViewPrivateImpl m_bIsLoading 0 odk/source/unoapploader/unx/unoapploader.c:39 - /media/disk2/libo7/odk/source/unoapploader/unx/unoapploader.c PATHSEPARATOR + /media/disk2/libo4/odk/source/unoapploader/unx/unoapploader.c PATHSEPARATOR : odk/source/unoapploader/unx/unoapploader.c:81 main ENVVARNAME @@ -406,11 +397,14 @@ pyuno/source/module/pyuno_gc.cxx:30 pyuno/source/module/pyuno_impl.hxx:311 pyuno::RuntimeCargo valid 1 +sal/osl/unx/signal.cxx:81 + (anonymous namespace)::SignalAction Action + 1 sal/osl/unx/sockimpl.hxx:39 oslSocketImpl m_bIsInShutdown 1 sal/qa/osl/condition/osl_Condition_Const.h:41 - /media/disk2/libo7/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:114 extern aCanURL3 @@ -469,6 +463,21 @@ sal/qa/osl/process/osl_Thread.cxx:318 sal/qa/osl/process/osl_Thread.cxx:359 OAddThread m_aFlag 0 +sal/qa/rtl/process/rtl_Process_Const.h:30 + extern suParam0 + -join +sal/qa/rtl/process/rtl_Process_Const.h:31 + extern suParam1 + -with +sal/qa/rtl/process/rtl_Process_Const.h:32 + extern suParam2 + -child +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 + 0 sax/source/tools/fastserializer.hxx:231 sax_fastparser::FastSaxSerializer mbXescape 1 @@ -485,21 +494,21 @@ sc/inc/dpfilteredcache.hxx:93 ScDPFilteredCache::Criterion mpFilter 0 sc/inc/drwlayer.hxx:219 - /media/disk2/libo7/sc/source/core/data/drwlayer.cxx bDrawIsInUndo + /media/disk2/libo4/sc/source/core/data/drwlayer.cxx bDrawIsInUndo 0 sc/inc/global.hxx:917 - /media/disk2/libo7/sc/source/core/data/global.cxx pScActiveViewShell + /media/disk2/libo4/sc/source/core/data/global.cxx pScActiveViewShell 0 sc/inc/global.hxx:918 - /media/disk2/libo7/sc/source/core/data/global.cxx nScClickMouseModifier + /media/disk2/libo4/sc/source/core/data/global.cxx nScClickMouseModifier 0 sc/inc/global.hxx:919 - /media/disk2/libo7/sc/source/core/data/global.cxx nScFillModeMouseModifier + /media/disk2/libo4/sc/source/core/data/global.cxx nScFillModeMouseModifier 0 sc/inc/listenercontext.hxx:46 sc::EndListeningContext maSet 0 -sc/inc/markmulti.hxx:78 +sc/inc/markmulti.hxx:80 ScMultiSelIter aMarkArrayIter 0 sc/inc/refdata.hxx:37 @@ -527,10 +536,10 @@ sc/source/core/inc/parclass.hxx:94 ScParameterClassification::RunData bHasForceArray 1 sc/source/core/tool/scmatrix.cxx:346 - /media/disk2/libo7/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 - /media/disk2/libo7/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 @@ -562,14 +571,14 @@ sc/source/ui/inc/conflictsdlg.hxx:124 sc/source/ui/inc/retypepassdlg.hxx:86 ScRetypePassDlg mpDocItem 0 -sc/source/ui/inc/viewdata.hxx:291 +sc/source/ui/inc/viewdata.hxx:292 ScViewData aLogicMode 0 sc/source/ui/inc/viewfunc.hxx:376 - /media/disk2/libo7/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 - /media/disk2/libo7/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 @@ -610,7 +619,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:58 StringEmitContext m_aBuf 256 sfx2/inc/autoredactdialog.hxx:108 @@ -635,7 +644,7 @@ slideshow/source/engine/slideshowimpl.cxx:486 (anonymous namespace)::SlideShowImpl maFrameSynchronization 0.02 soltools/cpp/_cpp.c:31 - /media/disk2/libo7/soltools/cpp/_cpp.c nerrs + /media/disk2/libo4/soltools/cpp/_cpp.c nerrs 1 soltools/cpp/_eval.c:734 tokval cvlen @@ -653,13 +662,13 @@ 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 + /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 - /media/disk2/libo7/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 @@ -709,20 +718,20 @@ svx/source/sidebar/media/MediaPlaybackPanel.hxx:66 svx/source/unodraw/recoveryui.cxx:68 (anonymous namespace)::RecoveryUI m_pParentWindow 0 -sw/inc/authfld.hxx:151 +sw/inc/authfld.hxx:150 SwAuthorityField m_nTempSequencePos -1 -sw/inc/authfld.hxx:152 +sw/inc/authfld.hxx:151 SwAuthorityField m_nTempSequencePosRLHidden -1 sw/inc/checkit.hxx:36 - /media/disk2/libo7/sw/source/core/bastyp/init.cxx pCheckIt + /media/disk2/libo4/sw/source/core/bastyp/init.cxx pCheckIt 0 sw/inc/dbgoutsw.hxx:50 - /media/disk2/libo7/sw/source/core/doc/dbgoutsw.cxx bDbgOutStdErr + /media/disk2/libo4/sw/source/core/doc/dbgoutsw.cxx bDbgOutStdErr 0 sw/inc/dbgoutsw.hxx:51 - /media/disk2/libo7/sw/source/core/doc/dbgoutsw.cxx bDbgOutPrintAttrSet + /media/disk2/libo4/sw/source/core/doc/dbgoutsw.cxx bDbgOutPrintAttrSet 0 sw/inc/ftninfo.hxx:46 SwEndNoteInfo aFormat @@ -737,16 +746,16 @@ sw/inc/modcfg.hxx:211 SwModuleOptions m_aWebTableConfig 1 sw/inc/swmodule.hxx:266 - /media/disk2/libo7/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 - /media/disk2/libo7/sw/source/uibase/ribbar/conform.cxx g_bNoInterrupt - 1 -sw/inc/swmodule.hxx:266 - /media/disk2/libo7/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 - /media/disk2/libo7/sw/source/uibase/app/swmodule.cxx g_bNoInterrupt + /media/disk2/libo4/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 0 sw/inc/view.hxx:191 SwView m_pHScrollbar @@ -755,55 +764,55 @@ sw/inc/view.hxx:192 SwView m_pVScrollbar 0 sw/inc/view.hxx:697 - /media/disk2/libo7/sw/source/uibase/uiview/view.cxx bDocSzUpdated - 1 -sw/inc/view.hxx:697 - /media/disk2/libo7/sw/source/uibase/uiview/viewport.cxx bDocSzUpdated + /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 + 1 sw/inc/viewopt.hxx:188 SwViewOption m_bTest10 0 sw/source/core/bastyp/calc.cxx:94 CalcOp eOp 0 -sw/source/core/doc/docredln.cxx:71 +sw/source/core/doc/docredln.cxx:64 sw_DebugRedline nWatch 0 sw/source/core/docnode/threadmanager.hxx:125 ThreadManager maStartNewThreadIdle SW ThreadManager StartNewThreadIdle sw/source/core/inc/blink.hxx:89 - /media/disk2/libo7/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 - /media/disk2/libo7/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 - /media/disk2/libo7/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 - /media/disk2/libo7/sw/source/core/layout/frmtool.cxx bDontCreateObjects + /media/disk2/libo4/sw/source/core/layout/frmtool.cxx bDontCreateObjects 0 sw/source/core/inc/frmtool.hxx:147 - /media/disk2/libo7/sw/source/core/layout/frmtool.cxx bSetCompletePaintOnInvalidate + /media/disk2/libo4/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 + /media/disk2/libo4/sw/source/core/text/noteurl.cxx pNoteURL 0 sw/source/core/inc/swfntcch.hxx:43 - /media/disk2/libo7/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 - /media/disk2/libo7/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 4294967295 -sw/source/core/inc/UndoSplitMove.hxx:58 - SwUndoMove m_bJoinPrev +sw/source/core/inc/UndoSplitMove.hxx:57 + SwUndoMove m_bJoinNext 0 sw/source/core/layout/flylay.cxx:305 SwFlyFreeFrame::supportsAutoContour bOverrideHandleContourToAlwaysOff @@ -812,108 +821,108 @@ sw/source/core/ole/ndole.cxx:1073 SwOLEObj::tryToGetChartContentAsPrimitive2DSequence bAsynchronousLoadingAllowed 0 sw/source/core/text/pordrop.hxx:30 - /media/disk2/libo7/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 0 -sw/source/filter/ww8/ww8par3.cxx:335 +sw/source/filter/ww8/ww8par3.cxx:336 WW8LST bSimpleList 1 -sw/source/filter/ww8/ww8par3.cxx:336 +sw/source/filter/ww8/ww8par3.cxx:337 WW8LST bRestartHdn 1 -sw/source/filter/ww8/ww8par3.cxx:368 +sw/source/filter/ww8/ww8par3.cxx:369 WW8LVL bV6Prev 1 -sw/source/filter/ww8/ww8par3.cxx:369 +sw/source/filter/ww8/ww8par3.cxx:370 WW8LVL bV6PrSp 1 -sw/source/filter/ww8/ww8par3.cxx:370 +sw/source/filter/ww8/ww8par3.cxx:371 WW8LVL bV6 1 -sw/source/filter/ww8/ww8par5.cxx:1548 +sw/source/filter/ww8/ww8par5.cxx:1580 SwWW8ImplReader::Read_F_DocInfo aName10  -sw/source/filter/ww8/ww8par5.cxx:1549 +sw/source/filter/ww8/ww8par5.cxx:1581 SwWW8ImplReader::Read_F_DocInfo aName11 TITEL -sw/source/filter/ww8/ww8par5.cxx:1551 +sw/source/filter/ww8/ww8par5.cxx:1583 SwWW8ImplReader::Read_F_DocInfo aName12 TITRE -sw/source/filter/ww8/ww8par5.cxx:1553 +sw/source/filter/ww8/ww8par5.cxx:1585 SwWW8ImplReader::Read_F_DocInfo aName13 TITLE -sw/source/filter/ww8/ww8par5.cxx:1555 +sw/source/filter/ww8/ww8par5.cxx:1587 SwWW8ImplReader::Read_F_DocInfo aName14 TITRO -sw/source/filter/ww8/ww8par5.cxx:1557 +sw/source/filter/ww8/ww8par5.cxx:1589 SwWW8ImplReader::Read_F_DocInfo aName20  -sw/source/filter/ww8/ww8par5.cxx:1558 +sw/source/filter/ww8/ww8par5.cxx:1590 SwWW8ImplReader::Read_F_DocInfo aName21 ERSTELLDATUM -sw/source/filter/ww8/ww8par5.cxx:1560 +sw/source/filter/ww8/ww8par5.cxx:1592 SwWW8ImplReader::Read_F_DocInfo aName22 CRÉÉ -sw/source/filter/ww8/ww8par5.cxx:1562 +sw/source/filter/ww8/ww8par5.cxx:1594 SwWW8ImplReader::Read_F_DocInfo aName23 CREATED -sw/source/filter/ww8/ww8par5.cxx:1564 +sw/source/filter/ww8/ww8par5.cxx:1596 SwWW8ImplReader::Read_F_DocInfo aName24 CREADO -sw/source/filter/ww8/ww8par5.cxx:1566 +sw/source/filter/ww8/ww8par5.cxx:1598 SwWW8ImplReader::Read_F_DocInfo aName30  -sw/source/filter/ww8/ww8par5.cxx:1567 +sw/source/filter/ww8/ww8par5.cxx:1599 SwWW8ImplReader::Read_F_DocInfo aName31 ZULETZTGESPEICHERTZEIT -sw/source/filter/ww8/ww8par5.cxx:1569 +sw/source/filter/ww8/ww8par5.cxx:1601 SwWW8ImplReader::Read_F_DocInfo aName32 DERNIERENREGISTREMENT -sw/source/filter/ww8/ww8par5.cxx:1571 +sw/source/filter/ww8/ww8par5.cxx:1603 SwWW8ImplReader::Read_F_DocInfo aName33 SAVED -sw/source/filter/ww8/ww8par5.cxx:1573 +sw/source/filter/ww8/ww8par5.cxx:1605 SwWW8ImplReader::Read_F_DocInfo aName34 MODIFICADO -sw/source/filter/ww8/ww8par5.cxx:1575 +sw/source/filter/ww8/ww8par5.cxx:1607 SwWW8ImplReader::Read_F_DocInfo aName40  -sw/source/filter/ww8/ww8par5.cxx:1576 +sw/source/filter/ww8/ww8par5.cxx:1608 SwWW8ImplReader::Read_F_DocInfo aName41 ZULETZTGEDRUCKT -sw/source/filter/ww8/ww8par5.cxx:1578 +sw/source/filter/ww8/ww8par5.cxx:1610 SwWW8ImplReader::Read_F_DocInfo aName42 DERNIÈREIMPRESSION -sw/source/filter/ww8/ww8par5.cxx:1580 +sw/source/filter/ww8/ww8par5.cxx:1612 SwWW8ImplReader::Read_F_DocInfo aName43 LASTPRINTED -sw/source/filter/ww8/ww8par5.cxx:1582 +sw/source/filter/ww8/ww8par5.cxx:1614 SwWW8ImplReader::Read_F_DocInfo aName44 HUPS PUPS -sw/source/filter/ww8/ww8par5.cxx:1584 +sw/source/filter/ww8/ww8par5.cxx:1616 SwWW8ImplReader::Read_F_DocInfo aName50  -sw/source/filter/ww8/ww8par5.cxx:1585 +sw/source/filter/ww8/ww8par5.cxx:1617 SwWW8ImplReader::Read_F_DocInfo aName51 ÜBERARBEITUNGSNUMMER -sw/source/filter/ww8/ww8par5.cxx:1587 +sw/source/filter/ww8/ww8par5.cxx:1619 SwWW8ImplReader::Read_F_DocInfo aName52 NUMÉRODEREVISION -sw/source/filter/ww8/ww8par5.cxx:1589 +sw/source/filter/ww8/ww8par5.cxx:1621 SwWW8ImplReader::Read_F_DocInfo aName53 REVISIONNUMBER -sw/source/filter/ww8/ww8par5.cxx:1591 +sw/source/filter/ww8/ww8par5.cxx:1623 SwWW8ImplReader::Read_F_DocInfo aName54 SNUBBEL BUBBEL -sw/source/filter/ww8/ww8par.hxx:662 +sw/source/filter/ww8/ww8par.hxx:664 WW8FormulaControl mfUnknown 0 -sw/source/filter/ww8/ww8par.hxx:669 +sw/source/filter/ww8/ww8par.hxx:671 WW8FormulaControl mhpsCheckBox 20 -sw/source/filter/ww8/ww8par.hxx:1026 +sw/source/filter/ww8/ww8par.hxx:1028 WW8TabBandDesc bCantSplit90 0 sw/source/filter/ww8/ww8scan.hxx:1158 @@ -938,19 +947,19 @@ sw/source/ui/envelp/labfmt.hxx:69 SwLabFormatPage aPreviewIdle SwLabFormatPage Preview sw/source/uibase/inc/edtdd.hxx:15 - /media/disk2/libo7/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:295 - /media/disk2/libo7/sw/source/uibase/docvw/edtdd.cxx g_bFrameDrag +sw/source/uibase/inc/edtwin.hxx:294 + /media/disk2/libo4/sw/source/uibase/docvw/edtdd.cxx g_bFrameDrag 0 -sw/source/uibase/inc/edtwin.hxx:296 - /media/disk2/libo7/sw/source/uibase/docvw/edtwin.cxx g_bDDTimerStarted +sw/source/uibase/inc/edtwin.hxx:295 + /media/disk2/libo4/sw/source/uibase/docvw/edtwin.cxx g_bDDTimerStarted 0 -sw/source/uibase/inc/edtwin.hxx:298 - /media/disk2/libo7/sw/source/uibase/docvw/edtwin.cxx g_bDDINetAttr +sw/source/uibase/inc/edtwin.hxx:297 + /media/disk2/libo4/sw/source/uibase/docvw/edtwin.cxx g_bDDINetAttr 0 -sw/source/uibase/inc/edtwin.hxx:298 - /media/disk2/libo7/sw/source/uibase/dochdl/swdtflvr.cxx g_bDDINetAttr +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 @@ -994,6 +1003,9 @@ vcl/inc/salwtype.hxx:157 vcl/inc/svdata.hxx:271 ImplSVNWFData mbMenuBarDockingAreaCommonBG 0 +vcl/inc/svimpbox.hxx:143 + SvImpLBox m_bAreChildrenTransient + 1 vcl/source/bitmap/BitmapTools.cxx:1053 vcl::bitmap::get_unpremultiply_table inited 1 @@ -1081,16 +1093,22 @@ vcl/source/gdi/dibtools.cxx:119 vcl/source/gdi/pdfwriter_impl.hxx:746 vcl::PDFWriterImpl m_DocDigest 0 -vcl/unx/gtk3/a11y/gtk3atkutil.cxx:704 +vcl/source/treelist/treelistbox.cxx:347 + SvTreeListBoxImpl m_bIsEmptyTextAllowed + 1 +vcl/unx/gtk3/a11y/gtk3atkutil.cxx:700 ooo_atk_util_ensure_event_listener bInited 1 -vcl/unx/gtk3/gtk3gtkinst.cxx:11668 +vcl/unx/gtk3/gtk3gtkinst.cxx:12289 (anonymous namespace)::ensure_intercept_drawing_area_accessibility bDone 1 workdir/LexTarget/l10ntools/source/xrmlex.cxx:706 - /media/disk2/libo7/workdir/LexTarget/l10ntools/source/xrmlex.cxx bText + /media/disk2/libo4/workdir/LexTarget/l10ntools/source/xrmlex.cxx bText + 0 +writerfilter/source/dmapper/DomainMapper_Impl.hxx:136 + writerfilter::dmapper::FieldParagraph m_bRemove 0 -writerfilter/source/dmapper/SettingsTable.cxx:256 +writerfilter/source/dmapper/SettingsTable.cxx:258 writerfilter::dmapper::SettingsTable_Impl m_pThemeFontLangProps 3 writerfilter/source/rtftok/rtfdocumentimpl.hxx:871 @@ -1109,5 +1127,5 @@ writerfilter/source/rtftok/rtftokenizer.hxx:75 writerfilter::rtftok::RTFTokenizer s_bMathControlWordsSorted 1 xmloff/source/text/XMLIndexTemplateContext.hxx:57 - /media/disk2/libo7/xmloff/source/text/XMLIndexTemplateContext.cxx aLevelNameTableMap + /media/disk2/libo4/xmloff/source/text/XMLIndexTemplateContext.cxx aLevelNameTableMap 0 diff --git a/include/vcl/svtabbx.hxx b/include/vcl/svtabbx.hxx index fda6c2a28c35..d97146806b6a 100644 --- a/include/vcl/svtabbx.hxx +++ b/include/vcl/svtabbx.hxx @@ -141,8 +141,6 @@ public: // Accessible ------------------------------------------------------------- - bool IsTransientChildrenDisabled() const { return !AreChildrenTransient(); } - bool IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState ); /** @return The count of the rows. */ diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx index 0f47b402dc91..ecb1ce8029af 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -545,8 +545,6 @@ protected: void ImplEditEntry( SvTreeListEntry* pEntry ); - bool AreChildrenTransient() const; - void AdjustEntryHeightAndRecalc(); public: diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx index 0ba5517671cf..081f7351b218 100644 --- a/vcl/inc/svimpbox.hxx +++ b/vcl/inc/svimpbox.hxx @@ -140,7 +140,6 @@ private: bool m_bSubLstOpDblClick : 1; // open/close sublist with mouse double click, defaulted with true bool m_bContextMenuHandling : 1; bool m_bIsCellFocusEnabled : 1; - bool m_bAreChildrenTransient; bool mbForceMakeVisible; Point m_aEditClickPos; @@ -201,8 +200,6 @@ private: void CalcCellFocusRect( SvTreeListEntry const * pEntry, tools::Rectangle& rRect ); - bool AreChildrenTransient() const { return m_bAreChildrenTransient; } - void ExpandAll(); void CollapseTo(SvTreeListEntry* pParentToCollapse); diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index e2dca323dd26..7e2ce1cb086b 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -49,7 +49,6 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits nWinS : m_aHorSBar(VclPtr::Create(pLBView, WB_DRAG | WB_HSCROLL)) , m_aScrBarBox(VclPtr::Create(pLBView)) , m_aFctSet(this, pLBView) - , m_bAreChildrenTransient(true) , mbForceMakeVisible (false) , m_aVerSBar(VclPtr::Create(pLBView, WB_DRAG | WB_VSCROLL)) , m_aOutputSize(0, 0) diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx index c7e17fe66f4b..19d404594436 100644 --- a/vcl/source/treelist/svtabbx.cxx +++ b/vcl/source/treelist/svtabbx.cxx @@ -773,39 +773,16 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nR OSL_ENSURE( m_pAccessible, "Invalid call: Accessible is null" ); Reference< XAccessible > xChild; - sal_Int32 nIndex = -1; - if ( !AreChildrenTransient() ) - { - const sal_uInt16 nColumnCount = GetColumnCount(); - - // first call? -> initial list - if ( m_aAccessibleChildren.empty() ) - { - sal_Int32 nCount = ( GetRowCount() + 1 ) * nColumnCount; - m_aAccessibleChildren.assign( nCount, Reference< XAccessible >() ); - } - - nIndex = ( _nRow * nColumnCount ) + _nColumnPos + nColumnCount; - xChild = m_aAccessibleChildren[ nIndex ]; - } - - if ( !xChild.is() ) - { - TriState eState = TRISTATE_INDET; - bool bIsCheckBox = IsCellCheckBox( _nRow, _nColumnPos, eState ); - if ( bIsCheckBox ) - xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleCheckBoxCell( + TriState eState = TRISTATE_INDET; + bool bIsCheckBox = IsCellCheckBox( _nRow, _nColumnPos, eState ); + if ( bIsCheckBox ) + xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleCheckBoxCell( m_pAccessible->getHeaderBar(), *this, nullptr, _nRow, _nColumnPos, eState, false ); - else - xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell( + else + xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell( m_pAccessible->getHeaderBar(), *this, nullptr, _nRow, _nColumnPos, OFFSET_NONE ); - // insert into list - if ( !AreChildrenTransient() ) - m_aAccessibleChildren[ nIndex ] = xChild; - } - return xChild; } @@ -821,9 +798,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_u if ( m_aAccessibleChildren.empty() ) { const sal_uInt16 nColumnCount = GetColumnCount(); - sal_Int32 nCount = AreChildrenTransient() ? - nColumnCount : ( GetRowCount() + 1 ) * nColumnCount; - m_aAccessibleChildren.assign( nCount, Reference< XAccessible >() ); + m_aAccessibleChildren.assign( nColumnCount, Reference< XAccessible >() ); } // get header @@ -972,8 +947,7 @@ void SvHeaderTabListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper if ( _eType == ::vcl::BBTYPE_TABLE ) { - if ( AreChildrenTransient() ) - _rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS ); + _rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS ); _rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE ); } break; @@ -1009,8 +983,7 @@ void SvHeaderTabListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper void SvHeaderTabListBox::FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const { _rStateSet.AddState( AccessibleStateType::SELECTABLE ); - if ( AreChildrenTransient() ) - _rStateSet.AddState( AccessibleStateType::TRANSIENT ); + _rStateSet.AddState( AccessibleStateType::TRANSIENT ); if ( IsCellVisible( _nRow, _nColumn ) ) { diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index aa56db5b718f..20a754e3866f 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -344,7 +344,6 @@ int SvLBoxItem::CalcWidth(const SvTreeListBox* /*pView*/) const struct SvTreeListBoxImpl { - bool m_bIsEmptyTextAllowed:1; bool m_bEntryMnemonicsEnabled:1; bool m_bDoingQuickSelection:1; @@ -352,7 +351,6 @@ struct SvTreeListBoxImpl vcl::QuickSelectionEngine m_aQuickSelectionEngine; explicit SvTreeListBoxImpl(SvTreeListBox& _rBox) : - m_bIsEmptyTextAllowed(true), m_bEntryMnemonicsEnabled(false), m_bDoingQuickSelection(false), m_aMnemonicEngine(_rBox), @@ -912,8 +910,7 @@ IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl, SvInplaceEdit2&, void) aStr = pEdCtrl->GetText(); else aStr = pEdCtrl->GetSavedValue(); - if ( mpImpl->m_bIsEmptyTextAllowed || !aStr.isEmpty() ) - EditedText( aStr ); + EditedText( aStr ); // Hide may only be called after the new text was put into the entry, so // that we don't call the selection handler in the GetFocus of the listbox // with the old entry text. @@ -2487,11 +2484,6 @@ void SvTreeListBox::ImplEditEntry( SvTreeListEntry* pEntry ) } } -bool SvTreeListBox::AreChildrenTransient() const -{ - return pImpl->AreChildrenTransient(); -} - void SvTreeListBox::EditedText( const OUString& rStr ) { -- cgit