sc/source/ui/dbgui/csvgrid.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit bf64e7d61596170ee9f9823d96a91fd3fbff91a8
Author: Eike Rathke <er...@redhat.com>
Date: Mon Jun 27 18:31:20 2016 +0200
fix CSV import dialog crash, tdf#97527 follow-up
Regression of aa0d0536a444fb26d9e570bd6bf6c1bdc3596cf3 that changed a
PopupMenu member instance to VclPtr<PopupMenu> without creating one.
Change-Id: I7fe4cf1741c9bd4ced08c8125b6f49e1cc185478
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 850453b..5221907 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -64,6 +64,7 @@ ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) :
ScCsvControl( rParent ),
mpBackgrDev( VclPtr<VirtualDevice>::Create() ),
mpGridDev( VclPtr<VirtualDevice>::Create() ),
+ mpPopup( VclPtr<PopupMenu>::Create() ),
mpColorConfig( nullptr ),
mpEditEngine( new ScEditEngineDefaulter( EditEngine::CreatePool(), true )
),
maHeaderFont( GetFont() ),
@@ -95,6 +96,7 @@ void ScCsvGrid::dispose()
OSL_ENSURE(mpColorConfig, "the object hasn't been initialized properly");
if (mpColorConfig)
mpColorConfig->RemoveListener(this);
+ mpPopup.disposeAndClear();
mpBackgrDev.disposeAndClear();
mpGridDev.disposeAndClear();
ScCsvControl::dispose();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
