Kaydet (Commit) 944bc0a3 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: fdo#62478 crash on tools->options->base->databases

Change-Id: Ic24c5f14f66a4059ce653df34321352adb50496f
üst 2c82e5d3
...@@ -235,7 +235,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet ) ...@@ -235,7 +235,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet )
// restore column width // restore column width
rBar.SetItemSize( ITEMID_TYPE, aUserData.GetToken(0).ToInt32() ); rBar.SetItemSize( ITEMID_TYPE, aUserData.GetToken(0).ToInt32() );
HeaderEndDrag_Impl( NULL ); HeaderEndDrag_Impl( &rBar );
// restore sort direction // restore sort direction
sal_Bool bUp = (sal_Bool)(sal_uInt16)aUserData.GetToken(1).ToInt32(); sal_Bool bUp = (sal_Bool)(sal_uInt16)aUserData.GetToken(1).ToInt32();
HeaderBarItemBits nBits = rBar.GetItemBits(ITEMID_TYPE); HeaderBarItemBits nBits = rBar.GetItemBits(ITEMID_TYPE);
...@@ -251,7 +251,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet ) ...@@ -251,7 +251,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet )
nBits |= HIB_UPARROW; nBits |= HIB_UPARROW;
} }
rBar.SetItemBits( ITEMID_TYPE, nBits ); rBar.SetItemBits( ITEMID_TYPE, nBits );
HeaderSelect_Impl( NULL ); HeaderSelect_Impl( &rBar );
} }
} }
...@@ -312,6 +312,8 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl) ...@@ -312,6 +312,8 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl)
IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar )
{ {
assert(pBar);
if ( pBar && pBar->GetCurItemId() != ITEMID_TYPE ) if ( pBar && pBar->GetCurItemId() != ITEMID_TYPE )
return 0; return 0;
...@@ -341,6 +343,8 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) ...@@ -341,6 +343,8 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar )
IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
{ {
assert(pBar);
if ( pBar && !pBar->GetCurItemId() ) if ( pBar && !pBar->GetCurItemId() )
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment