comphelper/source/misc/proxyaggregation.cxx | 1
compilerplugins/clang/unusedmethods.results | 66 ++-----------
compilerplugins/clang/unusedmethods.unused-returns.results | 18 +--
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 1
dbaccess/source/ui/browser/sbagrid.cxx | 1
include/vcl/gfxlink.hxx | 13 --
reportdesign/source/ui/report/ReportSection.cxx | 2
reportdesign/source/ui/report/SectionWindow.cxx | 2
starmath/source/view.cxx | 1
svtools/source/uno/treecontrolpeer.cxx | 1
svx/source/form/fmscriptingenv.cxx | 1
sw/source/ui/dbui/dbtablepreviewdialog.cxx | 1
ucb/source/ucp/tdoc/tdoc_stgelems.cxx | 1
vcl/source/gdi/gfxlink.cxx | 47 ---------
14 files changed, 37 insertions(+), 119 deletions(-)
New commits:
commit a17b19726d723b16dacb49db7a8efd5fee9cb4cf
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jul 22 13:07:14 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jul 23 06:46:22 2019 +0200
loplugin:unusedmethods
Change-Id: I3bde62d674f5beaa6d19dcd22e6be15dfefe4205
Reviewed-on: https://gerrit.libreoffice.org/76118
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/unusedmethods.results
b/compilerplugins/clang/unusedmethods.results
index 60ca3d010750..b694a86f18fb 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -66,8 +66,6 @@ connectivity/source/inc/OTypeInfo.hxx:47
_Bool connectivity::OTypeInfo::operator!=(const struct
connectivity::OTypeInfo &) const
cui/source/dialogs/SpellAttrib.hxx:75
_Bool svx::SpellErrorDescription::operator==(const struct
svx::SpellErrorDescription &) const
-cui/source/inc/cfg.hxx:356
- void SvxMenuEntriesListBox::insert(int,const class rtl::OUString &,const
class rtl::OUString &,const class rtl::OUString *)
cui/source/inc/cfgutil.hxx:143
_Bool CuiConfigFunctionListBox::get_iter_first(class weld::TreeIter &)
const
cui/source/inc/cfgutil.hxx:145
@@ -78,22 +76,10 @@ cui/source/inc/cfgutil.hxx:151
class rtl::OUString CuiConfigFunctionListBox::get_id(int) const
cui/source/inc/cfgutil.hxx:165
int CuiConfigFunctionListBox::get_selected_index() const
-cui/source/inc/cuihyperdlg.hxx:105
- _Bool SvxHpLinkDlg::OK_Impl()
-cui/source/inc/cuihyperdlg.hxx:120
- void SvxHpLinkDlg::Ok()
-cui/source/inc/cuihyperdlg.hxx:141
- class weld::Button & SvxHpLinkDlg::GetApplyButton()
-cui/source/inc/cuihyperdlg.hxx:142
- class weld::Button & SvxHpLinkDlg::GetCancelButton()
cui/source/inc/CustomNotebookbarGenerator.hxx:30
CustomNotebookbarGenerator::CustomNotebookbarGenerator()
cui/source/inc/hangulhanjadlg.hxx:245
class rtl::OUString svx::SuggestionEdit::get_text() const
-cui/source/inc/hltpbase.hxx:124
- class Size SvxHyperlinkTabPageBase::GetSizeExtraWnd()
-cui/source/inc/iconcdlg.hxx:69
- void IconChoicePage::ImplInitSettings()
cui/source/inc/SvxNotebookbarConfigPage.hxx:51
void SvxNotebookbarConfigPage::SetElement()
dbaccess/source/filter/hsqldb/fbalterparser.hxx:20
@@ -142,8 +128,6 @@ editeng/inc/edtspell.hxx:113
class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const
struct editeng::MisspellRange *, class std::__cxx1998::vector<struct
editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> >
>, class std::__debug::vector<struct editeng::MisspellRange, class
std::allocator<struct editeng::MisspellRange> > > WrongList::end() const
extensions/source/scanner/scanner.hxx:81
void ScannerManager::SetData(void *)
-framework/source/uiconfiguration/ImageList.hxx:53
- _Bool ImageList::operator!=(const class ImageList &) const
hwpfilter/source/mzstring.h:99
class MzString & MzString::operator<<(unsigned char)
hwpfilter/source/mzstring.h:101
@@ -460,7 +444,7 @@ include/drawinglayer/tools/primitive2dxmldump.hxx:44
void drawinglayer::tools::Primitive2dXmlDump::dump(const class
drawinglayer::primitive2d::Primitive2DContainer &,const class rtl::OUString &)
include/editeng/hyphenzoneitem.hxx:63
_Bool SvxHyphenZoneItem::IsPageEnd() const
-include/filter/msfilter/mstoolbar.hxx:103
+include/filter/msfilter/mstoolbar.hxx:102
Indent::Indent(_Bool)
include/formula/opcode.hxx:520
class std::__cxx11::basic_string<char, struct std::char_traits<char>,
class std::allocator<char> > OpCodeEnumToString(enum OpCode)
@@ -468,6 +452,10 @@ include/formula/tokenarray.hxx:182
class formula::FormulaTokenArrayReferencesIterator
formula::FormulaTokenArrayReferencesIterator::operator++(int)
include/formula/tokenarray.hxx:573
basic_ostream<type-parameter-?-?, type-parameter-?-?> &
formula::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?>
&,const class formula::FormulaTokenArray &)
+include/framework/addonsoptions.hxx:194
+ const class rtl::OUString
framework::AddonsOptions::GetAddonsNotebookBarResourceName(unsigned int) const
+include/framework/addonsoptions.hxx:219
+ _Bool framework::AddonsOptions::GetMergeNotebookBarInstructions(const
class rtl::OUString &,class std::__debug::vector<struct
framework::MergeNotebookBarInstruction, class std::allocator<struct
framework::MergeNotebookBarInstruction> > &) const
include/i18nlangtag/languagetag.hxx:263
enum LanguageTag::ScriptType LanguageTag::getScriptType() const
include/o3tl/any.hxx:155
@@ -526,8 +514,6 @@ include/sfx2/charwin.hxx:65
void SvxCharView::connect_focus_out(const class Link<class weld::Widget &,
void> &)
include/sfx2/childwin.hxx:164
void SfxChildWindow::ClearController()
-include/sfx2/childwin.hxx:172
- class Size SfxChildWindow::GetSizePixel() const
include/sfx2/docfilt.hxx:80
_Bool SfxFilter::GetGpgEncryption() const
include/sfx2/evntconf.hxx:60
@@ -544,8 +530,6 @@ include/svl/lockfilecommon.hxx:58
void svt::LockFileCommon::SetURL(const class rtl::OUString &)
include/svtools/DocumentToGraphicRenderer.hxx:106
_Bool DocumentToGraphicRenderer::isImpress() const
-include/svtools/inettbc.hxx:75
- void SvtURLBox::SetSmartProtocol(enum INetProtocol)
include/svx/autoformathelper.hxx:145
_Bool AutoFormatBase::operator==(const class AutoFormatBase &)
include/svx/ClassificationEditView.hxx:38
@@ -646,8 +630,6 @@ include/tools/weakbase.h:113
_Bool tools::WeakReference::operator>(const WeakReference<reference_type>
&) const
include/unotest/directories.hxx:43
class rtl::OUString test::Directories::getPathFromWorkdir(const class
rtl::OUString &) const
-include/unotools/datetime.hxx:50
- void utl::extractDate(const struct com::sun::star::util::DateTime &,struct
com::sun::star::util::Date &)
include/unotools/moduleoptions.hxx:166
_Bool SvtModuleOptions::IsDataBase() const
include/unotools/textsearch.hxx:130
@@ -662,8 +644,6 @@ include/vcl/animate/AnimationBitmap.hxx:69
_Bool AnimationBitmap::operator!=(const struct AnimationBitmap &) const
include/vcl/BitmapColor.hxx:39
void BitmapColor::SetAlpha(unsigned char)
-include/vcl/bitmapex.hxx:473
- void ReadRawDIB()
include/vcl/commandevent.hxx:249
CommandMediaData::CommandMediaData(enum MediaCommand)
include/vcl/commandevent.hxx:256
@@ -698,8 +678,8 @@ include/vcl/gdimtf.hxx:110
_Bool GDIMetaFile::operator!=(const class GDIMetaFile &) const
include/vcl/gdimtf.hxx:202
void GDIMetaFile::dumpAsXml(const char *) const
-include/vcl/gfxlink.hxx:109
- void GfxLink::SwapOut()
+include/vcl/gfxlink.hxx:59
+ GfxLink::SwapOutData::SwapOutData(const class rtl::OUString &)
include/vcl/gradient.hxx:104
_Bool Gradient::operator!=(const class Gradient &) const
include/vcl/hatch.hxx:55
@@ -708,8 +688,6 @@ include/vcl/inputctx.hxx:62
_Bool InputContext::operator!=(const class InputContext &) const
include/vcl/ITiledRenderable.hxx:193
enum PointerStyle vcl::ITiledRenderable::getPointer()
-include/vcl/ivctrl.hxx:216
- void SvtIconChoiceCtrl::SetStyle(long)
include/vcl/lok.hxx:24
void vcl::lok::unregisterPollCallbacks()
include/vcl/opengl/OpenGLHelper.hxx:67
@@ -738,16 +716,10 @@ include/vcl/svapp.hxx:170
ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const
class std::__debug::vector<class rtl::OUString, class std::allocator<class
rtl::OUString> > &)
include/vcl/svapp.hxx:801
void Application::AppEvent(const class ApplicationEvent &)
-include/vcl/syswin.hxx:172
+include/vcl/syswin.hxx:173
void SystemWindow::SetIdleDebugName(const char *)
-include/vcl/texteng.hxx:287
- void TextEngine::RemoveAttribs(unsigned int,unsigned short)
-include/vcl/texteng.hxx:288
- class std::unique_ptr<class TextCharAttrib, struct
std::default_delete<class TextCharAttrib> > TextEngine::RemoveAttrib(unsigned
int,const class TextCharAttrib &)
include/vcl/textrectinfo.hxx:45
_Bool TextRectInfo::operator!=(const class TextRectInfo &) const
-include/vcl/textview.hxx:215
- void TextView::SupportProtectAttribute(_Bool)
include/vcl/treelistbox.hxx:361
void SvTreeListBox::RemoveSelection()
include/vcl/treelistbox.hxx:378
@@ -1188,8 +1160,6 @@ sw/inc/IDocumentMarkAccess.hxx:105
_Bool IDocumentMarkAccess::iterator::operator<=(const class
IDocumentMarkAccess::iterator &) const
sw/inc/IDocumentMarkAccess.hxx:106
_Bool IDocumentMarkAccess::iterator::operator>=(const class
IDocumentMarkAccess::iterator &) const
-sw/inc/IDocumentMarkAccess.hxx:282
- class IDocumentMarkAccess::iterator
IDocumentMarkAccess::findFirstMarkStartsBefore(const struct SwPosition &) const
sw/inc/node.hxx:231
const class IDocumentStylePoolAccess &
SwNode::getIDocumentStylePoolAccess() const
sw/inc/node.hxx:235
@@ -1206,8 +1176,6 @@ sw/inc/rdfhelper.hxx:94
void SwRDFHelper::removeTextNodeStatement(const class rtl::OUString
&,class SwTextNode &,const class rtl::OUString &,const class rtl::OUString &)
sw/inc/rdfhelper.hxx:97
void SwRDFHelper::updateTextNodeStatement(const class rtl::OUString
&,const class rtl::OUString &,class SwTextNode &,const class rtl::OUString
&,const class rtl::OUString &,const class rtl::OUString &)
-sw/inc/redline.hxx:100
-
SwRedlineExtraData_FormattingChanges::SwRedlineExtraData_FormattingChanges(const
class SfxItemSet *)
sw/inc/ring.hxx:203
sw::RingIterator::RingIterator<value_type>()
sw/inc/swatrset.hxx:226
@@ -1246,13 +1214,13 @@ sw/source/core/access/accportions.cxx:77
unsigned long FindLastBreak(const vector<type-parameter-?-?,
allocator<type-parameter-?-?> > &,type-parameter-?-?)
sw/source/core/inc/frame.hxx:912
void SwFrame::dumpTopMostAsXml(struct _xmlTextWriter *) const
-sw/source/core/inc/frame.hxx:1345
+sw/source/core/inc/frame.hxx:1356
class Size SwRectFnSet::GetSize(const class SwRect &) const
-sw/source/core/inc/frame.hxx:1376
+sw/source/core/inc/frame.hxx:1387
long SwRectFnSet::LeftDist(const class SwRect &,long) const
-sw/source/core/inc/frame.hxx:1377
+sw/source/core/inc/frame.hxx:1388
long SwRectFnSet::RightDist(const class SwRect &,long) const
-sw/source/core/inc/mvsave.hxx:170
+sw/source/core/inc/mvsave.hxx:176
_Bool ZSortFly::operator==(const class ZSortFly &) const
sw/source/core/text/porlin.hxx:117
_Bool SwLinePortion::IsTabRightPortion() const
@@ -1260,14 +1228,10 @@ sw/source/core/text/txtpaint.hxx:66
DbgBackColor::DbgBackColor(class OutputDevice *,const _Bool)
sw/source/core/text/txtpaint.hxx:73
DbgRect::DbgRect(class OutputDevice *,const class tools::Rectangle
&,const _Bool,class Color)
-sw/source/filter/ww8/docxtablestyleexport.hxx:42
- void DocxTableStyleExport::CharFormat(class
com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &)
sw/source/filter/ww8/ww8struc.hxx:246
WW8_BRCVer6::WW8_BRCVer6()
sw/source/ui/dbui/createaddresslistdialog.hxx:100
void SwFindEntryDialog::hide()
-sw/source/ui/dbui/mmaddressblockpage.hxx:159
- class SwCustomizeAddressBlockDialog *
AddressMultiLineEdit::GetAddressDialog()
sw/source/uibase/inc/bookmark.hxx:45
void BookmarkTable::remove(const class weld::TreeIter &)
sw/source/uibase/inc/condedit.hxx:53
@@ -1326,10 +1290,6 @@ vcl/inc/fontinstance.hxx:90
void LogicalFontInstance::ReleaseHbFont()
vcl/inc/fontselect.hxx:48
_Bool FontSelectPattern::operator!=(const class FontSelectPattern &) const
-vcl/inc/impglyphitem.hxx:97
- class LogicalFontInstance * GlyphItem::fontInstance() const
-vcl/inc/impglyphitem.hxx:98
- enum GlyphItemFlags GlyphItem::flags() const
vcl/inc/impgraph.hxx:59
_Bool GraphicID::operator==(const class GraphicID &) const
vcl/inc/opengl/BufferObject.hxx:50
@@ -1372,6 +1332,8 @@ vcl/inc/qt5/Qt5DragAndDrop.hxx:91
void Qt5DropTarget::deinitialize()
vcl/inc/qt5/Qt5FilePicker.hxx:145
void Qt5FilePicker::disposing(const struct
com::sun::star::lang::EventObject &)
+vcl/inc/qt5/Qt5FilePicker.hxx:162
+ void Qt5FilePicker::setCustomControlWidgetLayout(class QGridLayout *)
vcl/inc/qt5/Qt5FontFace.hxx:37
class Qt5FontFace * Qt5FontFace::fromQFont(const class QFont &)
vcl/inc/qt5/Qt5FontFace.hxx:43
diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results
b/compilerplugins/clang/unusedmethods.unused-returns.results
index a2b0d2a83b78..4a0f461fcd80 100644
--- a/compilerplugins/clang/unusedmethods.unused-returns.results
+++ b/compilerplugins/clang/unusedmethods.unused-returns.results
@@ -4,6 +4,8 @@ connectivity/source/inc/odbc/OConnection.hxx:78
short connectivity::odbc::OConnection::Construct(const class rtl::OUString
&,const class com::sun::star::uno::Sequence<struct
com::sun::star::beans::PropertyValue> &)
connectivity/source/inc/odbc/OStatement.hxx:115
_Bool connectivity::odbc::OStatement_Base::lockIfNecessary(const class
rtl::OUString &)
+cui/source/inc/iconcdlg.hxx:80
+ _Bool IconChoicePage::FillItemSet(class SfxItemSet *)
extensions/source/scanner/sane.hxx:97
_Bool Sane::CheckConsistency(const char *,_Bool)
extensions/source/scanner/sane.hxx:140
@@ -64,13 +66,13 @@ include/LibreOfficeKit/LibreOfficeKit.hxx:621
int lok::Document::getSignatureState()
include/LibreOfficeKit/LibreOfficeKit.hxx:631
unsigned long lok::Document::renderShapeSelection(char **)
-include/LibreOfficeKit/LibreOfficeKit.hxx:749
+include/LibreOfficeKit/LibreOfficeKit.hxx:757
char * lok::Office::getFilterTypes()
-include/LibreOfficeKit/LibreOfficeKit.hxx:803
+include/LibreOfficeKit/LibreOfficeKit.hxx:811
char * lok::Office::getVersionInfo()
-include/LibreOfficeKit/LibreOfficeKit.hxx:817
- _Bool lok::Office::runMacro(const char *)
include/LibreOfficeKit/LibreOfficeKit.hxx:825
+ _Bool lok::Office::runMacro(const char *)
+include/LibreOfficeKit/LibreOfficeKit.hxx:833
_Bool lok::Office::signDocument(const char *,const unsigned char *,const
int,const unsigned char *,const int)
include/oox/crypto/AgileEngine.hxx:121
_Bool oox::core::AgileEngine::decryptHmacKey()
@@ -78,7 +80,7 @@ include/oox/crypto/AgileEngine.hxx:122
_Bool oox::core::AgileEngine::decryptHmacValue()
include/oox/crypto/AgileEngine.hxx:137
_Bool oox::core::AgileEngine::encryptHmacValue()
-include/oox/crypto/CryptTools.hxx:113
+include/oox/crypto/CryptTools.hxx:112
_Bool oox::core::CryptoHash::update(class std::__debug::vector<unsigned
char, class std::allocator<unsigned char> > &,unsigned int)
include/oox/dump/dumperbase.hxx:640
long oox::dump::FlagsList::getIgnoreFlags() const
@@ -140,9 +142,9 @@ include/oox/helper/propertyset.hxx:110
_Bool oox::PropertySet::setProperty(int,class Color)
include/oox/ole/axbinarywriter.hxx:116
_Bool
oox::ole::AxBinaryPropertyWriter::ComplexProperty::writeProperty(class
oox::ole::AxAlignedOutputStream &)
-include/oox/ole/olehelper.hxx:180
+include/oox/ole/olehelper.hxx:179
_Bool oox::ole::MSConvertOCXControls::importControlFromStream(class
oox::BinaryInputStream &,class com::sun::star::uno::Reference<class
com::sun::star::form::XFormComponent> &,const class rtl::OUString &)
-include/oox/ole/olehelper.hxx:191
+include/oox/ole/olehelper.hxx:190
_Bool oox::ole::MSConvertOCXControls::ReadOCXCtlsStream(const class
tools::SvRef<class SotStorageStream> &,class
com::sun::star::uno::Reference<class com::sun::star::form::XFormComponent>
&,int,int)
include/sax/fshelper.hxx:135
class sax_fastparser::FastSerializerHelper *
sax_fastparser::FastSerializerHelper::write(int)
@@ -196,7 +198,7 @@ include/tools/config.hxx:38
_Bool Config::ImplUpdateConfig() const
include/tools/multisel.hxx:93
_Bool StringRangeEnumerator::insertRange(int,int,_Bool)
-include/vcl/bitmap.hxx:169
+include/vcl/bitmap.hxx:170
_Bool Bitmap::Dither()
include/vcl/bitmapex.hxx:240
_Bool BitmapEx::Rotate(long,const class Color &)
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 55dcf25ef6a5..c3fca958d176 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -53,21 +53,10 @@ class Graphic;
class VCL_DLLPUBLIC GfxLink
{
private:
-
- struct SwapOutData
- {
- SwapOutData(const OUString &aURL);
- ~SwapOutData();
-
- OUString const maURL; // File is removed in the destructor
-
- };
-
GfxLinkType meType;
sal_uInt32 mnUserId;
mutable std::shared_ptr<sal_uInt8> mpSwapInData;
- mutable std::shared_ptr<SwapOutData> mpSwapOutData;
sal_uInt32 mnSwapInDataSize;
MapMode maPrefMapMode;
@@ -106,8 +95,6 @@ public:
bool ExportNative( SvStream& rOStream ) const;
- bool IsSwappedOut() const { return( bool(mpSwapOutData) ); }
-
bool IsEMF() const; // WMF & EMF stored under the same type
(NativeWmf)
public:
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 3bb236ca4a34..f76a0dd9ee16 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -79,15 +79,6 @@ bool GfxLink::IsNative() const
const sal_uInt8* GfxLink::GetData() const
{
- if( IsSwappedOut() )
- {
- auto pData = GetSwapInData();
- if (pData)
- {
- mpSwapInData = pData;
- mpSwapOutData.reset();
- }
- }
return mpSwapInData.get();
}
@@ -224,45 +215,9 @@ SvStream& ReadGfxLink( SvStream& rIStream, GfxLink&
rGfxLink)
return rIStream;
}
-GfxLink::SwapOutData::SwapOutData(const OUString &aURL) : maURL(aURL)
-{
-}
-
-GfxLink::SwapOutData::~SwapOutData()
-{
- if( maURL.getLength() > 0 )
- osl_removeFile( maURL.pData );
-}
-
std::shared_ptr<sal_uInt8> GfxLink::GetSwapInData() const
{
- if( !IsSwappedOut() )
- return mpSwapInData;
-
- std::shared_ptr<sal_uInt8> pData;
-
- SvFileStream aFileStream(mpSwapOutData->maURL, StreamMode::STD_READ);
- pData = o3tl::make_shared_array<sal_uInt8>(mnSwapInDataSize);
- aFileStream.ReadBytes(pData.get(), mnSwapInDataSize);
- bool bError = false;
- auto const e = aFileStream.GetError();
- if (e != ERRCODE_NONE) {
- SAL_WARN("vcl", "reading <" << mpSwapOutData->maURL << "> failed with
" << e);
- bError = true;
- }
- if (!bError) {
- sal_uInt64 const nActReadSize = aFileStream.Tell();
- if (nActReadSize != mnSwapInDataSize) {
- SAL_WARN(
- "vcl",
- "reading <" << mpSwapOutData->maURL << "> produced " <<
nActReadSize
- << " instead of " << mnSwapInDataSize << " bytes");
- bError = true;
- }
- }
- if (bError)
- pData.reset();
- return pData;
+ return mpSwapInData;
}
bool GfxLink::IsEMF() const
commit b71e02dd5bfaaa490dc7f56eddf10c17681108b5
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jul 22 11:58:43 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jul 23 06:46:13 2019 +0200
dispose() methods should clear their smart pointers
especiall the ref-counted ones
Change-Id: Ib3bb029043b1b923010ef4a47bfc377e1f569da7
Reviewed-on: https://gerrit.libreoffice.org/76102
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/comphelper/source/misc/proxyaggregation.cxx
b/comphelper/source/misc/proxyaggregation.cxx
index 13d59edfe679..5efb0f211f76 100644
--- a/comphelper/source/misc/proxyaggregation.cxx
+++ b/comphelper/source/misc/proxyaggregation.cxx
@@ -172,6 +172,7 @@ namespace comphelper
{
m_xInner->removeEventListener( this );
m_xInner->dispose();
+ m_xInner.clear();
}
}
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 9b36567c2d9c..6f050db476d8 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -226,6 +226,7 @@ void OAppDetailPageHelper::dispose()
Reference< ::util::XCloseable> xCloseable(m_xFrame,UNO_QUERY);
if ( xCloseable.is() )
xCloseable->close(true);
+ m_xFrame.clear();
}
catch(const Exception&)
{
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx
b/dbaccess/source/ui/browser/sbagrid.cxx
index 059f9ac5542f..ad891571fd46 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -694,6 +694,7 @@ void SbaGridControl::dispose()
{
if (m_nAsyncDropEvent)
Application::RemoveUserEvent(m_nAsyncDropEvent);
+ m_nAsyncDropEvent = nullptr;
FmGridControl::dispose();
}
diff --git a/reportdesign/source/ui/report/ReportSection.cxx
b/reportdesign/source/ui/report/ReportSection.cxx
index 20cb5428e5c4..880a68f7b59c 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -118,9 +118,11 @@ void OReportSection::dispose()
m_pPage = nullptr;
if ( m_pMulti.is() )
m_pMulti->dispose();
+ m_pMulti.clear();
if ( m_pReportListener.is() )
m_pReportListener->dispose();
+ m_pReportListener.clear();
m_pFunc.reset();
{
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx
b/reportdesign/source/ui/report/SectionWindow.cxx
index 3cc789fea738..cc16aedf9d59 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -108,8 +108,10 @@ void OSectionWindow::dispose()
{
if ( m_pSectionMulti.is() )
m_pSectionMulti->dispose();
+ m_pSectionMulti.clear();
if ( m_pGroupMulti.is() )
m_pGroupMulti->dispose();
+ m_pGroupMulti.clear();
}
catch (uno::Exception&)
{
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 195b4506bd54..4c64b59e1c50 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -124,6 +124,7 @@ void SmGraphicWindow::dispose()
{
if (mxAccessible.is())
mxAccessible->ClearWin(); // make Accessible nonfunctional
+ mxAccessible.clear();
CaretBlinkStop();
ScrollableWindow::dispose();
}
diff --git a/svtools/source/uno/treecontrolpeer.cxx
b/svtools/source/uno/treecontrolpeer.cxx
index 974ee8edabab..65b7b7994b32 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1423,6 +1423,7 @@ void UnoTreeListBoxImpl::dispose()
{
if( mxPeer.is() )
mxPeer->disposeControl();
+ mxPeer.clear();
SvTreeListBox::dispose();
}
diff --git a/svx/source/form/fmscriptingenv.cxx
b/svx/source/form/fmscriptingenv.cxx
index 27260c0381ea..2f123a881f18 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -1069,6 +1069,7 @@ namespace svxform
::osl::MutexGuard aGuard( m_aMutex );
m_bDisposed = true;
m_pScriptListener->dispose();
+ m_pScriptListener.clear();
}
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index 42f07505fe37..27110367df53 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -87,6 +87,7 @@ void SwDBTablePreviewDialog::dispose()
{
m_xFrame->setComponent(nullptr, nullptr);
m_xFrame->dispose();
+ m_xFrame.clear();
}
m_pDescriptionFI.clear();
m_pBeamerWIN.clear();
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index b80db98d9554..57052d55433c 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
@@ -205,6 +205,7 @@ uno::Sequence< sal_Int8 > SAL_CALL
Storage::getImplementationId()
void SAL_CALL Storage::dispose()
{
m_xWrappedStorage->dispose();
+ m_xWrappedStorage.clear();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
