diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-11-15 14:40:12 -0900 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2018-11-16 07:44:45 +0100 |
| commit | b4aa41f305c9f02a245dcab8b046af430a4dd6c9 (patch) | |
| tree | 568c6755569182c20f332dc106dd7fc14ac8be22 | |
| parent | fdb520825339a8618cd41b0d972b98155039b9e7 (diff) | |
tdf#121216 Fix custom pattern not displayed in area tab page
pattern editor on reopening
Change-Id: I1c77dff4bfebc9f4a2661210f5bbbaa8573a90db
Reviewed-on: https://gerrit.libreoffice.org/63456
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
| -rw-r--r-- | cui/source/tabpages/tppattern.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index a0705a8fd11e..56ada28c2681 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -178,16 +178,17 @@ void SvxPatternTabPage::ActivatePage( const SfxItemSet& rSet ) XFillBitmapItem aItem( rSet.Get( XATTR_FILLBITMAP ) ); - sal_Int32 nPos( 0 ); if ( aItem.isPattern() ) { - nPos = SearchPatternList( aItem.GetName() ); - if ( nPos == LISTBOX_ENTRY_NOTFOUND ) - nPos = 0; + sal_Int32 nPos = SearchPatternList( aItem.GetName() ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + { + sal_uInt16 nId = m_xPatternLB->GetItemId( static_cast<size_t>( nPos ) ); + m_xPatternLB->SelectItem( nId ); + } } - - sal_uInt16 nId = m_xPatternLB->GetItemId( static_cast<size_t>( nPos ) ); - m_xPatternLB->SelectItem( nId ); + else + m_xPatternLB->SelectItem( m_xPatternLB->GetItemId( static_cast<size_t>( 0 ) ) ); } } |