summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compilerplugins/clang/unusedfields.cxx16
-rw-r--r--compilerplugins/clang/unusedfields.only-used-in-constructor.results44
-rw-r--r--compilerplugins/clang/unusedfields.readonly.results66
-rw-r--r--compilerplugins/clang/unusedfields.untouched.results54
-rw-r--r--compilerplugins/clang/unusedfields.writeonly.results50
-rw-r--r--emfio/inc/wmfreader.hxx1
-rw-r--r--emfio/source/reader/wmfreader.cxx3
-rw-r--r--include/svx/colorbox.hxx2
-rw-r--r--include/svx/fntctrl.hxx2
-rw-r--r--include/vcl/window.hxx3
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx2
-rw-r--r--sfx2/inc/bitset.hxx1
-rw-r--r--sfx2/source/bastyp/bitset.cxx3
-rw-r--r--svx/source/dialog/fntctrl.cxx6
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx24
-rw-r--r--vcl/inc/window.h1
-rw-r--r--vcl/source/window/dndeventdispatcher.cxx16
-rw-r--r--vcl/source/window/window.cxx1
-rw-r--r--vcl/source/window/window2.cxx13
19 files changed, 134 insertions, 174 deletions
diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx
index 159d8544b635..8dca2f549933 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -524,13 +524,16 @@ void UnusedFields::checkWriteOnly(const FieldDecl* fieldDecl, const Expr* member
}
else if (op == UO_AddrOf || op == UO_Deref
|| op == UO_Plus || op == UO_Minus
- || op == UO_Not || op == UO_LNot
- || op == UO_PreInc || op == UO_PostInc
- || op == UO_PreDec || op == UO_PostDec)
+ || op == UO_Not || op == UO_LNot)
{
bPotentiallyReadFrom = true;
break;
}
+ /* The following are technically reads, but from a code-sense they're more of a write/modify, so
+ ignore them to find interesting fields that only modified, not usefully read:
+ UO_PreInc / UO_PostInc / UO_PreDec / UO_PostDec
+ But we still walk up in case the result of the expression is used in a read sense.
+ */
walkupUp();
}
else if (auto caseStmt = dyn_cast<CaseStmt>(parent))
@@ -651,7 +654,14 @@ void UnusedFields::checkWriteOnly(const FieldDecl* fieldDecl, const Expr* member
MyFieldInfo fieldInfo = niceName(fieldDecl);
if (bPotentiallyReadFrom)
+ {
readFromSet.insert(fieldInfo);
+ if (fieldInfo.fieldName == "nNextElementNumber")
+ {
+ parent->dump();
+ memberExpr->dump();
+ }
+ }
}
void UnusedFields::checkReadOnly(const FieldDecl* fieldDecl, const Expr* memberExpr)
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 4a6acd1bc740..f6a684c5ea75 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -196,7 +196,7 @@ include/LibreOfficeKit/LibreOfficeKitGtk.h:33
_LOKDocView aDrawingArea GtkDrawingArea
include/LibreOfficeKit/LibreOfficeKitGtk.h:38
_LOKDocViewClass parent_class GtkDrawingAreaClass
-include/oox/export/shapes.hxx:122
+include/oox/export/shapes.hxx:123
oox::drawingml::ShapeExport maShapeMap oox::drawingml::ShapeExport::ShapeHashMap
include/registry/registry.hxx:35
Registry_Api acquire void (*)(RegHandle)
@@ -216,8 +216,6 @@ include/svx/itemwin.hxx:34
SvxLineBox aDelayTimer class Timer
include/xmloff/shapeimport.hxx:140
SdXML3DLightContext mbSpecular _Bool
-include/xmloff/XMLTextMasterPageContext.hxx:34
- XMLTextMasterPageContext sIsPhysical const class rtl::OUString
jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:102
jfw_plugin::SunVersion usVersion class rtl::OUString
libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:35
@@ -314,15 +312,15 @@ sc/inc/compiler.hxx:264
ScCompiler::AddInMap pUpper const char *
sc/inc/formulalogger.hxx:42
sc::FormulaLogger maMessages std::vector<OUString>
-sc/inc/interpretercontext.hxx:23
+sc/inc/interpretercontext.hxx:31
ScInterpreterContext mrDoc const class ScDocument &
-sc/inc/token.hxx:399
+sc/inc/token.hxx:397
SingleDoubleRefModifier aDub struct ScComplexRefData
sc/qa/unit/ucalc_column.cxx:104
aInputs aName const char *
-sc/source/core/data/document.cxx:1248
+sc/source/core/data/document.cxx:1251
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1249
+sc/source/core/data/document.cxx:1252
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast
sc/source/filter/inc/htmlpars.hxx:614
ScHTMLQueryParser mnUnusedId ScHTMLTableId
@@ -372,8 +370,6 @@ sc/source/ui/inc/msgpool.hxx:46
ScMessagePool aCondFormatDlgItem class ScCondFormatDlgItem
sc/source/ui/inc/notemark.hxx:43
ScNoteMarker m_aTimer class Timer
-sc/source/ui/inc/sortkeydlg.hxx:46
- ScSortKeyWindow m_nItemHeight sal_Int32
sccomp/source/solver/DifferentialEvolution.hxx:35
DifferentialEvolutionAlgorithm maRandomDevice std::random_device
sccomp/source/solver/ParticelSwarmOptimization.hxx:56
@@ -394,7 +390,7 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:36
sd::ZeroconfService port uint
sd/source/ui/table/TableDesignPane.hxx:106
sd::TableDesignPane aImpl class sd::TableDesignWidget
-sd/source/ui/view/DocumentRenderer.cxx:1321
+sd/source/ui/view/DocumentRenderer.cxx:1322
sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
sd/source/ui/view/viewshel.cxx:1215
sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
@@ -472,12 +468,10 @@ svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1091
(anonymous namespace)::ExpressionGrammar::definition modifierReference ::boost::spirit::rule<ScannerT>
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1092
(anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::rule<ScannerT>
-svx/source/dialog/framelinkarray.cxx:377
+svx/source/dialog/framelinkarray.cxx:376
svx::frame::MergedCellIterator mnFirstRow size_t
svx/source/dialog/imapwnd.hxx:78
IMapWindow maItemInfos struct SfxItemInfo [1]
-svx/source/dialog/orienthelper.cxx:36
- svx::OrientationHelper_Impl mrCtrlDial class svx::DialControl &
svx/source/gallery2/galbrws2.cxx:116
(anonymous namespace)::GalleryThemePopup maBuilder class VclBuilder
svx/source/stbctrls/pszctrl.cxx:93
@@ -488,15 +482,13 @@ svx/source/stbctrls/zoomctrl.cxx:55
ZoomPopup_Impl m_aBuilder class VclBuilder
svx/source/svdraw/svdcrtv.cxx:49
ImplConnectMarkerOverlay maObjects sdr::overlay::OverlayObjectList
-svx/source/svdraw/svdopath.cxx:93
- ImpSdrPathDragData bIsPrevControl _Bool
svx/source/xml/xmleohlp.cxx:71
OutputStorageWrapper_Impl aTempFile class utl::TempFile
sw/inc/unosett.hxx:144
SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
sw/qa/core/test_ToxTextGenerator.cxx:134
ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter.cxx:3995
+sw/qa/extras/uiwriter/uiwriter.cxx:4001
IdleTask maIdle class Idle
sw/source/core/crsr/crbm.cxx:64
(anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
@@ -506,7 +498,7 @@ sw/source/core/layout/dbg_lay.cxx:169
SwImplEnterLeave nAction enum DbgAction
sw/source/core/text/inftxt.hxx:683
SwTextSlot aText class rtl::OUString
-sw/source/core/text/porfld.cxx:142
+sw/source/core/text/porfld.cxx:141
SwFieldSlot aText class rtl::OUString
sw/source/filter/html/htmlcss1.cxx:77
SwCSS1ItemIds nFormatBreak sal_uInt16
@@ -522,7 +514,7 @@ sw/source/uibase/inc/chrdlg.hxx:43
SwCharDlg m_nCharUrlId sal_uInt16
sw/source/uibase/inc/chrdlg.hxx:45
SwCharDlg m_nCharBrdId sal_uInt16
-sw/source/uibase/inc/cption.hxx:56
+sw/source/uibase/inc/cption.hxx:44
SwCaptionDialog m_aTextFilter class TextFilterAutoConvert
sw/source/uibase/inc/glossary.hxx:95
SwGlossaryDlg m_aNoSpaceFilter class TextFilter
@@ -530,6 +522,8 @@ sw/source/uibase/inc/olmenu.hxx:77
SwSpellPopup m_aBuilder class VclBuilder
sw/source/uibase/inc/olmenu.hxx:86
SwSpellPopup m_nLangParaMenuId sal_uInt16
+sw/source/uibase/inc/optload.hxx:186
+ SwCaptionOptPage m_aTextFilter class TextFilterAutoConvert
sw/source/uibase/inc/regionsw.hxx:256
SwInsertSectionTabDialog m_nNotePageId sal_uInt16
sw/source/uibase/inc/regionsw.hxx:276
@@ -564,6 +558,12 @@ vcl/inc/opengl/RenderList.hxx:30
Vertex lineData glm::vec4
vcl/inc/opengl/zone.hxx:46
OpenGLVCLContextZone aZone class OpenGLZone
+vcl/inc/qt5/Qt5Menu.hxx:74
+ Qt5MenuItem mbVisible _Bool
+vcl/inc/qt5/Qt5Object.hxx:34
+ Qt5Object m_aSystemData struct SystemEnvData
+vcl/inc/qt5/Qt5Object.hxx:36
+ Qt5Object m_pParent class Qt5Frame *
vcl/inc/salmenu.hxx:42
SalMenuButtonItem mnId sal_uInt16
vcl/inc/salmenu.hxx:43
@@ -584,15 +584,13 @@ vcl/inc/unx/i18n_ic.hxx:46
SalI18N_InputContext maSwitchIMCallback XIMCallback
vcl/inc/unx/i18n_ic.hxx:47
SalI18N_InputContext maDestroyCallback XIMCallback
-vcl/inc/unx/i18n_xkb.hxx:32
- SalI18N_KeyboardExtension mnErrorBase int
-vcl/source/app/salvtables.cxx:1249
+vcl/source/app/salvtables.cxx:1344
SalInstanceEntry m_aTextFilter class SalInstanceEntry::WeldTextFilter
vcl/source/gdi/jobset.cxx:34
ImplOldJobSetupData cDeviceName char [32]
vcl/source/gdi/jobset.cxx:35
ImplOldJobSetupData cPortName char [32]
-vcl/unx/gtk3/gtk3gtkinst.cxx:2166
+vcl/unx/gtk3/gtk3gtkinst.cxx:2221
CrippledViewport viewport GtkViewport
vcl/unx/gtk/a11y/atkhypertext.cxx:29
(anonymous) atk_hyper_link AtkHyperlink
@@ -606,8 +604,6 @@ vcl/unx/gtk/glomenu.cxx:20
GLOMenu parent_instance GMenuModel
writerfilter/source/dmapper/PropertyMap.hxx:198
writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
-xmloff/source/draw/ximpstyl.hxx:144
- SdXMLPresentationPageLayoutContext msName class rtl::OUString
xmloff/source/text/XMLTextListBlockContext.hxx:35
XMLTextListBlockContext msListStyleName class rtl::OUString
xmloff/source/text/XMLTextListBlockContext.hxx:41
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index bdef9f1e915a..6fe680af3a7b 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -52,7 +52,7 @@ bridges/source/jni_uno/jni_java2uno.cxx:150
jni_uno::largest p void *
bridges/source/jni_uno/jni_java2uno.cxx:151
jni_uno::largest a uno_Any
-chart2/source/model/main/DataPoint.hxx:107
+chart2/source/model/main/DataPoint.hxx:108
chart::DataPoint m_bNoParentPropAllowed _Bool
connectivity/source/drivers/evoab2/EApi.h:125
(anonymous) po char *
@@ -242,7 +242,7 @@ framework/inc/xml/menudocumenthandler.hxx:160
framework::OReadMenuHandler m_bMenuPopupMode _Bool
framework/inc/xml/menudocumenthandler.hxx:190
framework::OReadMenuPopupHandler m_bMenuMode _Bool
-framework/source/fwe/classes/addonsoptions.cxx:299
+framework/source/fwe/classes/addonsoptions.cxx:301
framework::AddonsOptions_Impl m_aEmptyAddonToolBar Sequence<Sequence<struct com::sun::star::beans::PropertyValue> >
i18npool/inc/textconversion.hxx:80
i18npool::(anonymous) code sal_Unicode
@@ -314,20 +314,12 @@ include/svl/ondemand.hxx:58
OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
include/svtools/editsyntaxhighlighter.hxx:33
MultiLineEditSyntaxHighlight m_aColorConfig svtools::ColorConfig
-include/svtools/valueset.hxx:440
- SvtValueSet maSelectHdl Link<class SvtValueSet *, void>
-include/svx/dialcontrol.hxx:164
- svx::SvxDialControl m_aText class rtl::OUString
-include/svx/dialcontrol.hxx:207
- svx::SvxDialControl::DialControl_Impl maModifyHdl Link<class svx::SvxDialControl *, void>
-include/svx/paraprev.hxx:118
- ParaPrevWindow nFirstLineOfst short
-include/svx/paraprev.hxx:120
- ParaPrevWindow nUpper sal_uInt16
-include/svx/paraprev.hxx:121
- ParaPrevWindow nLower sal_uInt16
-include/svx/paraprev.hxx:127
- ParaPrevWindow eLine enum SvxPrevLineSpace
+include/svx/colorbox.hxx:105
+ ColorListBox m_nSlotId sal_uInt16
+include/svx/colorbox.hxx:106
+ ColorListBox m_bShowNoneButton _Bool
+include/svx/fntctrl.hxx:93
+ FontPrevWindow maText class rtl::OUString
include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:51
sdr::overlay::OverlayAnimatedBitmapEx mbOverlayState _Bool
include/svx/sdr/overlay/overlaymanager.hxx:73
@@ -340,18 +332,6 @@ include/svx/svdoedge.hxx:161
SdrEdgeObj mbBoundRectCalculationRunning _Bool
include/svx/svdpntv.hxx:170
SdrPaintView maDrawinglayerOpt class SvtOptionsDrawinglayer
-include/svx/swframeexample.hxx:119
- SwFrameExample nWrap css::text::WrapTextMode
-include/svx/swframeexample.hxx:121
- SwFrameExample bTrans _Bool
-include/test/sheet/xdatapilottable.hxx:31
- apitest::XDataPilotTable xCellForChange css::uno::Reference<css::table::XCell>
-include/test/sheet/xdatapilottable.hxx:32
- apitest::XDataPilotTable xCellForCheck css::uno::Reference<css::table::XCell>
-include/test/sheet/xnamedranges.hxx:38
- apitest::XNamedRanges xSheet css::uno::Reference<css::sheet::XSpreadsheet>
-include/test/sheet/xspreadsheets2.hxx:46
- apitest::XSpreadsheets2 xDocument css::uno::Reference<css::sheet::XSpreadsheetDocument>
include/unoidl/unoidl.hxx:443
unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /home/noel/libo/include/unoidl/unoidl.hxx:443:5)
include/unoidl/unoidl.hxx:444
@@ -442,6 +422,8 @@ sc/inc/formulagroup.hxx:39
sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **
sc/inc/reordermap.hxx:21
sc::ColRowReorderMapType maData sc::ColRowReorderMapType::DataType
+sc/qa/extras/anchor.cxx:53
+ sc_apitest::ScAnchorTest mxComponent uno::Reference<lang::XComponent>
sc/source/core/inc/adiasync.hxx:41
ScAddInAsync::(anonymous) pStr class rtl::OUString *
sc/source/core/inc/interpre.hxx:105
@@ -588,9 +570,9 @@ sw/inc/swevent.hxx:71
SwCallMouseEvent::(anonymous union)::(anonymous) pFormat const class SwFrameFormat *
sw/source/core/access/accfrmobjmap.hxx:100
SwAccessibleChildMap maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/doc/swstylemanager.cxx:58
- SwStyleManager aAutoCharPool class StylePool
sw/source/core/doc/swstylemanager.cxx:59
+ SwStyleManager aAutoCharPool class StylePool
+sw/source/core/doc/swstylemanager.cxx:60
SwStyleManager aAutoParaPool class StylePool
sw/source/core/doc/tblrwcl.cxx:83
CpyTabFrame::(anonymous) nSize SwTwips
@@ -616,18 +598,8 @@ sw/source/uibase/inc/fldmgr.hxx:77
SwInsertField_Data m_aDBDataSource css::uno::Any
sw/source/uibase/inc/labimg.hxx:49
SwLabItem m_aBin class rtl::OUString
-sw/source/uibase/inc/numprevw.hxx:31
- NumberingPreview pActNum const class SwNumRule *
-sw/source/uibase/inc/numprevw.hxx:33
- NumberingPreview nPageWidth long
-sw/source/uibase/inc/numprevw.hxx:34
- NumberingPreview pOutlineNames const class rtl::OUString *
-sw/source/uibase/inc/numprevw.hxx:35
- NumberingPreview bPosition _Bool
-sw/source/uibase/inc/optload.hxx:94
+sw/source/uibase/inc/optload.hxx:107
CaptionComboBox aDefault class rtl::OUString
-sw/source/uibase/inc/prcntfld.hxx:111
- SwPercentField bLockAutoCalculation _Bool
toolkit/source/awt/vclxtoolkit.cxx:433
(anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
ucb/source/ucp/gio/gio_mount.hxx:46
@@ -642,7 +614,7 @@ ucb/source/ucp/gio/gio_mount.hxx:52
OOoMountOperationClass _gtk_reserved4 void (*)(void)
ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx:73
hierarchy_ucp::DataSupplier_Impl m_aIterator class HierarchyEntry::iterator
-ucbhelper/source/client/proxydecider.cxx:118
+ucbhelper/source/client/proxydecider.cxx:127
ucbhelper::proxydecider_impl::InternetProxyDecider_Impl m_aEmptyProxy const struct ucbhelper::InternetProxyServer
unoidl/source/sourceprovider-scanner.hxx:147
unoidl::detail::SourceProviderInterfaceTypeEntityPad directMandatoryBases std::vector<DirectBase>
@@ -696,11 +668,9 @@ vcl/inc/svdata.hxx:284
ImplSVNWFData mbNoActiveTabTextRaise _Bool
vcl/inc/svdata.hxx:286
ImplSVNWFData mbProgressNeedsErase _Bool
-vcl/inc/svdata.hxx:295
- ImplSVNWFData mbRolloverMenubar _Bool
vcl/inc/unx/i18n_status.hxx:56
vcl::I18NStatus m_aCurrentIM class rtl::OUString
-vcl/inc/unx/saldisp.hxx:266
+vcl/inc/unx/saldisp.hxx:288
SalDisplay m_aInvalidScreenData struct SalDisplay::ScreenData
vcl/source/filter/jpeg/Exif.hxx:62
Exif::TiffHeader byteOrder sal_uInt16
@@ -714,11 +684,11 @@ vcl/source/filter/jpeg/transupp.h:148
(anonymous) crop_xoffset_set JCROP_CODE
vcl/source/filter/jpeg/transupp.h:150
(anonymous) crop_yoffset_set JCROP_CODE
-vcl/source/fontsubset/sft.cxx:1054
+vcl/source/fontsubset/sft.cxx:1048
vcl::_subHeader2 firstCode sal_uInt16
-vcl/source/fontsubset/sft.cxx:1055
+vcl/source/fontsubset/sft.cxx:1049
vcl::_subHeader2 entryCount sal_uInt16
-vcl/source/fontsubset/sft.cxx:1056
+vcl/source/fontsubset/sft.cxx:1050
vcl::_subHeader2 idDelta sal_uInt16
vcl/source/gdi/dibtools.cxx:50
(anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index e87e298f7c70..c8156c084c3d 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -62,8 +62,28 @@ cui/source/inc/cuicharmap.hxx:108
SvxCharacterMap m_xShowSetArea std::unique_ptr<weld::CustomWeld>
cui/source/inc/cuicharmap.hxx:110
SvxCharacterMap m_xSearchSetArea std::unique_ptr<weld::CustomWeld>
+cui/source/inc/cuitabarea.hxx:704
+ SvxColorTabPage m_xCtlPreviewOld std::unique_ptr<weld::CustomWeld>
+cui/source/inc/cuitabarea.hxx:705
+ SvxColorTabPage m_xCtlPreviewNew std::unique_ptr<weld::CustomWeld>
+cui/source/inc/cuitabarea.hxx:706
+ SvxColorTabPage m_xValSetColorListWin std::unique_ptr<weld::CustomWeld>
+cui/source/inc/cuitabarea.hxx:707
+ SvxColorTabPage m_xValSetRecentListWin std::unique_ptr<weld::CustomWeld>
cui/source/inc/insrc.hxx:31
SvxInsRowColDlg m_xBeforeBtn std::unique_ptr<weld::RadioButton>
+cui/source/inc/page.hxx:105
+ SvxPageDescPage m_xOrientationFT std::unique_ptr<weld::Label>
+cui/source/inc/page.hxx:135
+ SvxPageDescPage m_xBspWin std::unique_ptr<weld::CustomWeld>
+cui/source/inc/paragrph.hxx:67
+ SvxStdParagraphTabPage m_xRightLabel std::unique_ptr<weld::Label>
+cui/source/inc/paragrph.hxx:91
+ SvxStdParagraphTabPage m_xExampleWin std::unique_ptr<weld::CustomWeld>
+cui/source/inc/paragrph.hxx:154
+ SvxParaAlignTabPage m_xExampleWin std::unique_ptr<weld::CustomWeld>
+cui/source/inc/paragrph.hxx:159
+ SvxParaAlignTabPage m_xPropertiesFL std::unique_ptr<weld::Widget>
cui/source/inc/swpossizetabpage.hxx:88
SvxSwPosSizeTabPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
cui/source/inc/textattr.hxx:69
@@ -80,6 +100,8 @@ emfio/source/emfuno/xemfparser.cxx:60
emfio::emfreader::XEmfParser context_ uno::Reference<uno::XComponentContext>
extensions/source/scanner/scanner.hxx:44
ScannerManager maProtector osl::Mutex
+filter/source/pdf/impdialog.hxx:186
+ ImpPDFTabGeneralPage mxSelectedSheets std::unique_ptr<weld::Label>
filter/source/xsltdialog/xmlfiltertabpagebasic.hxx:36
XMLFilterTabPageBasic m_xContainer std::unique_ptr<weld::Widget>
filter/source/xsltdialog/xmlfiltertabpagexslt.hxx:48
@@ -110,6 +132,12 @@ include/svtools/unoevent.hxx:162
SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface>
include/svx/ClassificationDialog.hxx:63
svx::ClassificationDialog m_nInsertMarkings sal_Int16
+include/svx/colorwindow.hxx:133
+ ColorWindow mxColorSetWin std::unique_ptr<weld::CustomWeld>
+include/svx/colorwindow.hxx:134
+ ColorWindow mxRecentColorSetWin std::unique_ptr<weld::CustomWeld>
+include/svx/hdft.hxx:87
+ SvxHFPage m_xBspWin std::unique_ptr<weld::CustomWeld>
include/vcl/uitest/uiobject.hxx:268
TabPageUIObject mxTabPage VclPtr<class TabPage>
include/xmloff/formlayerexport.hxx:173
@@ -166,15 +194,15 @@ sal/osl/unx/thread.cxx:112
osl_thread_global_st m_priority struct osl_thread_priority_st
sc/inc/formulalogger.hxx:42
sc::FormulaLogger maMessages std::vector<OUString>
-sc/inc/interpretercontext.hxx:23
+sc/inc/interpretercontext.hxx:31
ScInterpreterContext mrDoc const class ScDocument &
sc/qa/unit/ucalc_column.cxx:104
aInputs aName const char *
-sc/source/core/data/document.cxx:1248
+sc/source/core/data/document.cxx:1251
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1249
+sc/source/core/data/document.cxx:1252
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast
-sc/source/core/data/formulacell.cxx:1756
+sc/source/core/data/formulacell.cxx:1793
(anonymous namespace)::StackCleaner pInt std::unique_ptr<ScInterpreter>
sc/source/filter/inc/sheetdatacontext.hxx:61
oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
@@ -182,7 +210,7 @@ sc/source/ui/inc/crdlg.hxx:33
ScColOrRowDlg m_xBtnRows std::unique_ptr<weld::RadioButton>
sc/source/ui/inc/delcodlg.hxx:39
ScDeleteContentsDlg m_xBtnOk std::unique_ptr<weld::Button>
-sc/source/ui/inc/docsh.hxx:460
+sc/source/ui/inc/docsh.hxx:462
ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector>
sc/source/ui/inc/instbdlg.hxx:66
ScInsertTableDlg m_xBtnBehind std::unique_ptr<weld::RadioButton>
@@ -202,7 +230,7 @@ sd/source/ui/slidesorter/view/SlsLayouter.cxx:61
sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme>
sd/source/ui/table/TableDesignPane.hxx:106
sd::TableDesignPane aImpl class sd::TableDesignWidget
-sd/source/ui/view/DocumentRenderer.cxx:1321
+sd/source/ui/view/DocumentRenderer.cxx:1322
sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
sd/source/ui/view/viewshel.cxx:1215
sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
@@ -216,9 +244,9 @@ sd/source/ui/view/ViewShellBase.cxx:192
sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
sfx2/source/doc/doctempl.cxx:114
DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock
-sfx2/source/view/viewfrm.cxx:158
+sfx2/source/view/viewfrm.cxx:160
(anonymous namespace)::SfxEditDocumentDialog m_xEditDocument std::unique_ptr<weld::Button>
-sfx2/source/view/viewfrm.cxx:159
+sfx2/source/view/viewfrm.cxx:161
(anonymous namespace)::SfxEditDocumentDialog m_xCancel std::unique_ptr<weld::Button>
starmath/inc/dialog.hxx:347
SmSymbolDialog m_xSymbolSetDisplayArea std::unique_ptr<weld::CustomWeld>
@@ -268,6 +296,8 @@ sw/source/ui/misc/impfnote.hxx:44
SwEndNoteOptionPage m_xPosFT std::unique_ptr<weld::Label>
sw/source/uibase/inc/dbui.hxx:31
PrintMonitor m_xDocName std::unique_ptr<weld::Label>
+sw/source/uibase/inc/drpcps.hxx:141
+ SwDropCapsPage m_xPict std::unique_ptr<weld::CustomWeld>
sw/source/uibase/inc/insfnote.hxx:38
SwInsFootNoteDlg m_xNumberFrame std::unique_ptr<weld::Widget>
sw/source/uibase/inc/num.hxx:55
@@ -296,9 +326,13 @@ uui/source/unknownauthdlg.hxx:36
UnknownAuthDialog m_xOptionButtonDontAccept std::unique_ptr<weld::RadioButton>
vcl/inc/opengl/zone.hxx:46
OpenGLVCLContextZone aZone class OpenGLZone
+vcl/inc/qt5/Qt5Menu.hxx:74
+ Qt5MenuItem mbVisible _Bool
+vcl/inc/qt5/Qt5Object.hxx:34
+ Qt5Object m_aSystemData struct SystemEnvData
vcl/inc/salprn.hxx:44
SalPrinterQueueInfo mpPortName std::unique_ptr<OUString>
-vcl/source/app/salvtables.cxx:463
+vcl/source/app/salvtables.cxx:494
SalInstanceContainer m_xContainer VclPtr<vcl::Window>
vcl/source/gdi/jobset.cxx:34
ImplOldJobSetupData cDeviceName char [32]
@@ -310,7 +344,7 @@ vcl/unx/generic/print/prtsetup.hxx:73
RTSPaperPage m_xContainer std::unique_ptr<weld::Widget>
vcl/unx/generic/print/prtsetup.hxx:108
RTSDevicePage m_xContainer std::unique_ptr<weld::Widget>
-vcl/unx/gtk3/gtk3gtkinst.cxx:2166
+vcl/unx/gtk3/gtk3gtkinst.cxx:2221
CrippledViewport viewport GtkViewport
vcl/unx/gtk/a11y/atkhypertext.cxx:29
(anonymous) atk_hyper_link AtkHyperlink
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 8087001fff19..8ad41ca74132 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -1,6 +1,6 @@
basctl/source/basicide/basicbox.hxx:69
basctl::DocListenerBox m_aNotifier class basctl::DocumentEventNotifier
-basctl/source/inc/basidesh.hxx:88
+basctl/source/inc/basidesh.hxx:87
basctl::Shell m_aNotifier class basctl::DocumentEventNotifier
basctl/source/inc/bastype2.hxx:180
basctl::TreeListBox m_aNotifier class basctl::DocumentEventNotifier
@@ -82,6 +82,8 @@ codemaker/source/cppumaker/dependencies.hxx:114
codemaker::cppumaker::Dependencies m_floatDependency _Bool
codemaker/source/cppumaker/dependencies.hxx:115
codemaker::cppumaker::Dependencies m_doubleDependency _Bool
+comphelper/qa/container/comphelper_ifcontainer.cxx:45
+ ContainerListener m_pStats struct ContainerStats *
configmgr/source/components.cxx:164
configmgr::Components::WriteThread reference_ rtl::Reference<WriteThread> *
connectivity/source/drivers/mork/MorkParser.hxx:133
@@ -158,6 +160,8 @@ cui/source/inc/cuihyperdlg.hxx:57
SvxHlinkCtrl aRdOnlyForwarder class SfxStatusForwarder
cui/source/inc/cuihyperdlg.hxx:77
SvxHpLinkDlg maCtrl class SvxHlinkCtrl
+cui/source/options/cfgchart.hxx:33
+ SvxChartColorTable nNextElementNumber int
dbaccess/source/core/dataaccess/documentdefinition.cxx:287
dbaccess::LifetimeCoupler m_xClient Reference<class com::sun::star::uno::XInterface>
desktop/qa/desktop_lib/test_desktop_lib.cxx:178
@@ -206,6 +210,8 @@ emfio/inc/mtftools.hxx:128
emfio::LOGFONTW lfClipPrecision sal_uInt8
emfio/inc/mtftools.hxx:129
emfio::LOGFONTW lfQuality sal_uInt8
+emfio/inc/wmfreader.hxx:50
+ emfio::WmfReader mnCurrentAction sal_uInt32
emfio/source/reader/emfreader.cxx:310
(anonymous namespace)::BLENDFUNCTION aBlendOperation unsigned char
emfio/source/reader/emfreader.cxx:311
@@ -320,7 +326,7 @@ sc/inc/compiler.hxx:262
ScCompiler::AddInMap pEnglish const char *
sc/inc/compiler.hxx:264
ScCompiler::AddInMap pUpper const char *
-sc/inc/document.hxx:2514
+sc/inc/document.hxx:2509
ScMutationDisable mpDocument class ScDocument *
sc/inc/pivot.hxx:75
ScDPLabelData mnFlags sal_Int32
@@ -328,7 +334,7 @@ sc/inc/pivot.hxx:78
ScDPLabelData mbIsValue _Bool
sc/source/core/data/cellvalues.cxx:25
sc::(anonymous namespace)::BlockPos mnEnd size_t
-sc/source/core/data/column4.cxx:1313
+sc/source/core/data/column4.cxx:1314
(anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW
sc/source/filter/excel/xltoolbar.hxx:23
TBCCmd cmdID sal_uInt16
@@ -384,12 +390,8 @@ sc/source/ui/inc/AccessibleText.hxx:194
ScAccessiblePreviewHeaderCellTextData mbRowHeader _Bool
sc/source/ui/inc/datastream.hxx:108
sc::DataStream mnSettings sal_uInt32
-sc/source/ui/inc/filtdlg.hxx:198
- ScSpecialFilterDlg pOptionsMgr class ScFilterOptionsMgr *
sc/source/ui/inc/preview.hxx:47
ScPreview nTabPage long
-sc/source/ui/inc/sortkeydlg.hxx:46
- ScSortKeyWindow m_nItemHeight sal_Int32
sc/source/ui/inc/tabvwsh.hxx:129
ScTabViewShell pPivotSource class ScArea *
sd/source/filter/eppt/eppt.hxx:142
@@ -402,18 +404,14 @@ sd/source/filter/ppt/ppt97animations.hxx:50
Ppt97AnimationInfoAtom nUnknown1 sal_uInt8
sd/source/filter/ppt/ppt97animations.hxx:51
Ppt97AnimationInfoAtom nUnknown2 sal_uInt8
-sd/source/ui/inc/animobjs.hxx:123
- sd::AnimationWindow pControllerItem class sd::AnimationControllerItem *
-sd/source/ui/inc/navigatr.hxx:123
- SdNavigatorWin mpNavigatorCtrlItem class SdNavigatorControllerItem *
-sd/source/ui/inc/navigatr.hxx:124
- SdNavigatorWin mpPageNameCtrlItem class SdPageNameControllerItem *
sd/source/ui/remotecontrol/Receiver.hxx:36
sd::Receiver pTransmitter class sd::Transmitter *
sd/source/ui/sidebar/MasterPageContainerProviders.hxx:136
sd::sidebar::TemplatePreviewProvider msURL class rtl::OUString
sd/source/ui/sidebar/SlideBackground.hxx:99
sd::sidebar::SlideBackground m_pContainer VclPtr<class VclVBox>
+sfx2/inc/bitset.hxx:28
+ IndexBitSet nCount sal_uInt16
sfx2/source/view/classificationcontroller.cxx:59
sfx2::ClassificationCategoriesController m_aPropertyListener class sfx2::ClassificationPropertyListener
slideshow/source/engine/opengl/TransitionImpl.hxx:296
@@ -464,20 +462,24 @@ svx/source/sidebar/line/LinePropertyPanel.hxx:105
svx::sidebar::LinePropertyPanel maEdgeStyle sfx2::sidebar::ControllerItem
svx/source/sidebar/line/LinePropertyPanel.hxx:106
svx::sidebar::LinePropertyPanel maCapStyle sfx2::sidebar::ControllerItem
-svx/source/svdraw/svdpdf.hxx:188
- ImpSdrPdfImport mbLastObjWasLine _Bool
-svx/source/svdraw/svdpdf.hxx:195
+svx/source/svdraw/svdpdf.hxx:192
ImpSdrPdfImport mdPageWidthPts double
svx/source/table/tablertfimporter.cxx:53
sdr::table::RTFCellDefault maItemSet class SfxItemSet
-sw/inc/ndgrf.hxx:45
- SwGrfNode bGraphicArrived _Bool
sw/inc/shellio.hxx:145
SwReader aFileName class rtl::OUString
sw/source/core/doc/tblafmt.cxx:185
SwAfVersions m_nVerticalAlignmentVersion sal_uInt16
+sw/source/core/inc/swfont.hxx:975
+ SvStatistics nGetTextSize sal_uInt16
+sw/source/core/inc/swfont.hxx:976
+ SvStatistics nDrawText sal_uInt16
sw/source/core/inc/swfont.hxx:977
SvStatistics nGetStretchTextSize sal_uInt16
+sw/source/core/inc/swfont.hxx:978
+ SvStatistics nDrawStretchText sal_uInt16
+sw/source/core/inc/swfont.hxx:979
+ SvStatistics nChangeFont sal_uInt16
sw/source/core/text/xmldump.cxx:34
XmlPortionDumper ofs TextFrameIndex
sw/source/filter/html/htmlcss1.cxx:77
@@ -514,6 +516,10 @@ vcl/inc/opengl/RenderList.hxx:29
Vertex color glm::vec4
vcl/inc/opengl/RenderList.hxx:30
Vertex lineData glm::vec4
+vcl/inc/qt5/Qt5Frame.hxx:59
+ Qt5Frame m_pSalMenu class Qt5Menu *
+vcl/inc/qt5/Qt5Graphics.hxx:50
+ Qt5Graphics m_pFontCollection class PhysicalFontCollection *
vcl/inc/salmenu.hxx:34
SalItemParams nBits enum MenuItemBits
vcl/inc/salmenu.hxx:42
@@ -540,10 +546,12 @@ vcl/inc/salwtype.hxx:213
SalQueryCharPositionEvent mnCursorBoundHeight long
vcl/inc/salwtype.hxx:248
SalSwipeEvent mnVelocityY double
-vcl/inc/sft.hxx:462
+vcl/inc/sft.hxx:461
vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32)
vcl/inc/unx/gtk/gtkframe.hxx:215
GtkSalFrame m_nFloatFlags enum FloatWinPopupFlags
+vcl/inc/window.h:293
+ WindowImpl mnLockCount sal_uInt16
vcl/opengl/salbmp.cxx:435
(anonymous namespace)::ScanlineWriter mpCurrentScanline sal_uInt8 *
vcl/source/filter/graphicfilter.cxx:1008
@@ -568,5 +576,9 @@ vcl/unx/gtk/hudawareness.cxx:20
(anonymous) connection GDBusConnection *
vcl/unx/gtk/hudawareness.cxx:23
(anonymous) notify GDestroyNotify
+vcl/unx/kde4/KDEXLib.hxx:49
+ KDEXLib::SocketData pending YieldFunc
+vcl/unx/kde4/KDEXLib.hxx:50
+ KDEXLib::SocketData queued YieldFunc
writerfilter/source/dmapper/PropertyMap.hxx:198
writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
diff --git a/emfio/inc/wmfreader.hxx b/emfio/inc/wmfreader.hxx
index 4054141f0f0c..9e1059d63760 100644
--- a/emfio/inc/wmfreader.hxx
+++ b/emfio/inc/wmfreader.hxx
@@ -47,7 +47,6 @@ namespace emfio
sal_uInt32 mnEMFSize;
sal_uInt32 mnSkipActions;
- sal_uInt32 mnCurrentAction;
// eventually handed over external header
const WmfExternal* mpExternalHeader;
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index 83e7ca6e81d7..f93eb0cbc31a 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -1364,7 +1364,6 @@ namespace emfio
sal_uInt16 nFunction;
mnSkipActions = 0;
- mnCurrentAction = 0;
mpEMFStream.reset();
mnEMFRecCount = 0;
@@ -1388,7 +1387,6 @@ namespace emfio
bool bEMFAvailable = false;
while( true )
{
- mnCurrentAction++;
mpInputStream->ReadUInt32(mnRecSize).ReadUInt16( nFunction );
if (
@@ -1854,7 +1852,6 @@ namespace emfio
, mnEMFRec(0)
, mnEMFSize(0)
, mnSkipActions(0)
- , mnCurrentAction(0)
, mpExternalHeader(pExternalHeader)
{
}
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index cb7c5e820128..6915f851e0a5 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -102,8 +102,6 @@ private:
Color m_aAutoDisplayColor;
Color m_aSaveColor;
NamedColor m_aSelectedColor;
- sal_uInt16 m_nSlotId;
- bool m_bShowNoneButton;
std::shared_ptr<PaletteManager> m_xPaletteManager;
BorderColorStatus m_aBorderColorStatus;
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index 52db1503ba3e..e3c6b47276f5 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -90,7 +90,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FontPrevWindow : public weld::CustomWidgetCo
{
private:
std::unique_ptr<FontPrevWin_Impl> pImpl;
- OUString maText;
bool mbResetForeground : 1;
bool mbResetBackground : 1;
@@ -112,7 +111,6 @@ public:
SvxFont& GetCJKFont();
SvxFont& GetCTLFont();
void SetBackColor( const Color& rColor );
- const OUString& GetText() const { return maText; }
void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override;
bool IsTwoLines() const;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 8ba941422514..9ef90177388f 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -832,9 +832,6 @@ public:
ImplSVEvent * PostUserEvent( const Link<void*,void>& rLink, void* pCaller = nullptr, bool bReferenceLink = false );
void RemoveUserEvent( ImplSVEvent * nUserEvent );
- void IncrementLockCount();
- void DecrementLockCount();
-
// returns the input language used for the last key stroke
// may be LANGUAGE_DONTKNOW if not supported by the OS
LanguageType GetInputLanguage() const;
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 10c5fd0e3389..0688bfac45bc 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -611,11 +611,9 @@ void SlideSorterView::CompleteRedraw (
if (mnLockRedrawSmph == 0)
{
- mrSlideSorter.GetContentWindow()->IncrementLockCount();
if (mpLayeredDevice->HandleMapModeChange())
DeterminePageObjectVisibilities();
mpLayeredDevice->Repaint(rPaintArea);
- mrSlideSorter.GetContentWindow()->DecrementLockCount();
}
else
{
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index d33ccf54bebe..fc29dbd67ecb 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -25,7 +25,6 @@ class IndexBitSet
{
private:
sal_uInt16 nBlocks;
- sal_uInt16 nCount;
std::unique_ptr<sal_uInt32[]> pBitmap;
IndexBitSet& operator|=( sal_uInt16 nBit );
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 495909f8f14b..9dc18f3e5c04 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -37,7 +37,6 @@ IndexBitSet& IndexBitSet::operator-=(sal_uInt16 nBit)
if ( pBitmap[nBlock] & nBitVal )
{
pBitmap[nBlock] &= ~nBitVal;
- --nCount;
}
return *this;
@@ -66,7 +65,6 @@ IndexBitSet& IndexBitSet::operator|=( sal_uInt16 nBit )
if ( (pBitmap[nBlock] & nBitVal) == 0 )
{
pBitmap[nBlock] |= nBitVal;
- ++nCount;
}
return *this;
@@ -87,7 +85,6 @@ bool IndexBitSet::Contains( sal_uInt16 nBit ) const
IndexBitSet::IndexBitSet()
{
- nCount = 0;
nBlocks = 0;
}
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 311cfdd10d7b..0168c02d7e0c 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -1571,7 +1571,7 @@ void FontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
else
{
if (pImpl->mbUseResText)
- pImpl->maText = GetText();
+ pImpl->maText = OUString();
else if (!pImpl->mbSelection && !pImpl->mbTextInited)
{
using namespace css::i18n::ScriptType;
@@ -1611,7 +1611,7 @@ void FontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
}
if (pImpl->maText.isEmpty())
- pImpl->maText = GetText();
+ pImpl->maText = OUString();
if (pImpl->maText.isEmpty())
{ // fdo#58427: still no text? let's try that one...
@@ -1620,7 +1620,7 @@ void FontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
bool bEmpty = CleanAndCheckEmpty(pImpl->maText);
if (bEmpty)
- pImpl->maText = GetText();
+ pImpl->maText = OUString();
if (pImpl->maText.getLength() > (TEXT_WIDTH - 1))
{
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 325ca4359d7d..84a704ba8a75 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3762,10 +3762,8 @@ ColorListBox::ColorListBox(weld::MenuButton* pControl, weld::Window* pTopLevel)
, m_pTopLevel(pTopLevel)
, m_aColorWrapper(this)
, m_aAutoDisplayColor(Application::GetSettings().GetStyleSettings().GetDialogColor())
- , m_nSlotId(0)
- , m_bShowNoneButton(false)
{
- m_aSelectedColor = GetAutoColor(m_nSlotId);
+ m_aSelectedColor = GetAutoColor(0);
LockWidthRequest();
ShowPreview(m_aSelectedColor);
}
@@ -3793,15 +3791,13 @@ void ColorListBox::createColorWindow()
OUString() /*m_aCommandURL*/,
m_xPaletteManager,
m_aBorderColorStatus,
- m_nSlotId,
+ 0, // slotID
xFrame,
m_pTopLevel,
m_xButton.get(),
m_aColorWrapper));
SetNoSelection();
- if (m_bShowNoneButton)
- m_xColorWindow->ShowNoneButton();
m_xButton->set_popover(m_xColorWindow->GetWidget());
m_xColorWindow->SelectEntry(m_aSelectedColor);
}
@@ -3865,20 +3861,10 @@ void ColorListBox::ShowPreview(const NamedColor &rColor)
ScopedVclPtrInstance<VirtualDevice> xDevice;
xDevice->SetOutputSize(aImageSize);
const tools::Rectangle aRect(Point(0, 0), aImageSize);
- if (m_bShowNoneButton && rColor.first == COL_NONE_COLOR)
- {
- const Color aW(COL_WHITE);
- const Color aG(0xef, 0xef, 0xef);
- xDevice->DrawCheckered(aRect.TopLeft(), aRect.GetSize(), 8, aW, aG);
- xDevice->SetFillColor();
- }
+ if (rColor.first == COL_AUTO)
+ xDevice->SetFillColor(m_aAutoDisplayColor);
else
- {
- if (rColor.first == COL_AUTO)
- xDevice->SetFillColor(m_aAutoDisplayColor);
- else
- xDevice->SetFillColor(rColor.first);
- }
+ xDevice->SetFillColor(rColor.first);
xDevice->SetLineColor(rStyleSettings.GetDisableColor());
xDevice->DrawRect(aRect);
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index da11f0bc514e..0e2ee4a7cb6f 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -290,7 +290,6 @@ public:
ParentClipMode mnParentClipMode;
ActivateModeFlags mnActivateMode;
DialogControlFlags mnDlgCtrlFlags;
- sal_uInt16 mnLockCount;
AlwaysInputMode meAlwaysInputMode;
VclAlign meHalign;
VclAlign meValign;
diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx
index a5f6cdf515a2..9a0814052b24 100644
--- a/vcl/source/window/dndeventdispatcher.cxx
+++ b/vcl/source/window/dndeventdispatcher.cxx
@@ -260,9 +260,6 @@ sal_Int32 DNDEventDispatcher::fireDragEnterEvent( vcl::Window *pWindow,
{
SolarMutexClearableGuard aSolarGuard;
- // set an UI lock
- pWindow->IncrementLockCount();
-
// query DropTarget from window
Reference< XDropTarget > xDropTarget = pWindow->GetDropTarget();
@@ -323,9 +320,6 @@ sal_Int32 DNDEventDispatcher::fireDragExitEvent( vcl::Window *pWindow )
if( xDropTarget.is() )
n = static_cast < DNDListenerContainer * > ( xDropTarget.get() )->fireDragExitEvent();
-
- // release UI lock
- pWindow->DecrementLockCount();
}
return n;
@@ -385,13 +379,6 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( vcl::Window *pWindow,
n = static_cast < DNDListenerContainer * > ( xDropTarget.get() )->fireDropEvent(
xContext, nDropAction, relLoc.X(), relLoc.Y(), nSourceActions, xTransferable );
}
-
- if ( !xWindow->IsDisposed() )
- {
- // release UI lock
- pWindow->DecrementLockCount();
- }
-
}
return n;
@@ -420,9 +407,6 @@ sal_Int32 DNDEventDispatcher::fireDragGestureEvent( vcl::Window *pWindow,
n = static_cast < DNDListenerContainer * > ( xDragGestureRecognizer.get() )->fireDragGestureEvent(
nDragAction, relLoc.X(), relLoc.Y(), xSource, event );
}
-
- // release UI lock
- pWindow->DecrementLockCount();
}
return n;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8383e58a6e07..02f856cf4eb6 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -647,7 +647,6 @@ WindowImpl::WindowImpl( WindowType nType )
mnParentClipMode = ParentClipMode::NONE; // Flags for Parent-ClipChildren-Mode
mnActivateMode = ActivateModeFlags::NONE; // Will be converted in System/Overlap-Windows
mnDlgCtrlFlags = DialogControlFlags::NONE; // DialogControl-Flags
- mnLockCount = 0; // LockCount
meAlwaysInputMode = AlwaysInputNone; // neither AlwaysEnableInput nor AlwaysDisableInput called
meHalign = VclAlign::Fill;
meValign = VclAlign::Fill;
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 426eb01636ec..459557d438b8 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -979,19 +979,6 @@ void Window::SetCompoundControl( bool bCompound )
mpWindowImpl->mbCompoundControl = bCompound;
}
-void Window::IncrementLockCount()
-{
- assert( mpWindowImpl != nullptr );
- mpWindowImpl->mnLockCount++;
-}
-
-void Window::DecrementLockCount()
-{
- assert( mpWindowImpl != nullptr );
- if (mpWindowImpl)
- mpWindowImpl->mnLockCount--;
-}
-
WinBits Window::GetStyle() const
{
return mpWindowImpl ? mpWindowImpl->mnStyle : 0;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 16:43:48 +0000