diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-20 15:56:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-23 06:28:00 +0000 |
| commit | aa0d0536a444fb26d9e570bd6bf6c1bdc3596cf3 (patch) | |
| tree | 8b2a5207e77fa4054a37b33c25378c23a00af8ed /sc/source/ui/dbgui | |
| parent | b722f3d6fc72877e8caaaae7291d5d736ddc494d (diff) | |
tdf#97527 - vcl: reference-count Menu
some places are marked with "dodgy"- need to check those to see
what is going on, because they are leaving dangling pointers behind
in the Menu class
Change-Id: I41d5c7c0fec2f70ce9e3ffdc48cd03d26c0a869b
Reviewed-on: https://gerrit.libreoffice.org/26516
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source/ui/dbgui')
| -rw-r--r-- | sc/source/ui/dbgui/csvgrid.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index e2a8ec2b75e8..850453b0d671 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -78,7 +78,7 @@ ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : mpEditEngine->SetRefMapMode( MapMode( MAP_PIXEL ) ); maEdEngSize = mpEditEngine->GetPaperSize(); - maPopup.SetMenuFlags( maPopup.GetMenuFlags() | MenuFlags::NoAutoMnemonics ); + mpPopup->SetMenuFlags( mpPopup->GetMenuFlags() | MenuFlags::NoAutoMnemonics ); EnableRTL( false ); // RTL InitFonts(); @@ -505,12 +505,12 @@ void ScCsvGrid::SetTypeNames( const std::vector<OUString>& rTypeNames ) maTypeNames = rTypeNames; Repaint( true ); - maPopup.Clear(); + mpPopup->Clear(); sal_uInt32 nCount = maTypeNames.size(); sal_uInt32 nIx; sal_uInt16 nItemId; for( nIx = 0, nItemId = 1; nIx < nCount; ++nIx, ++nItemId ) - maPopup.InsertItem( nItemId, maTypeNames[ nIx ] ); + mpPopup->InsertItem( nItemId, maTypeNames[ nIx ] ); ::std::for_each( maColStates.begin(), maColStates.end(), Func_SetType( CSV_TYPE_DEFAULT ) ); } @@ -582,9 +582,9 @@ void ScCsvGrid::ScrollVertRel( ScMoveMode eDir ) void ScCsvGrid::ExecutePopup( const Point& rPos ) { - sal_uInt16 nItemId = maPopup.Execute( this, rPos ); + sal_uInt16 nItemId = mpPopup->Execute( this, rPos ); if( nItemId ) // 0 = cancelled - Execute( CSVCMD_SETCOLUMNTYPE, maPopup.GetItemPos( nItemId ) ); + Execute( CSVCMD_SETCOLUMNTYPE, mpPopup->GetItemPos( nItemId ) ); } // selection handling --------------------------------------------------------- |