summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat@free.fr>2013-03-25 17:58:49 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-03-26 08:45:48 +0000
commitedc8b07e5f69413b3710ddf192a84a862b0e17af (patch)
tree6ff8f6c94b736bf94c3c1c3824a183f7bb356ed0 /sfx2
parent369cb8e216f9287234d601f4b28e0332a2ec29a5 (diff)
fdo#62659: only select items in ThumbnailView on TabStop
Change-Id: I024df8520f0daf2cc2e9e5f041e1ff18cb3689ec (cherry picked from commit f8a3582d4cbcf6a705f724b921e370c739ecee35) Reviewed-on: https://gerrit.libreoffice.org/3034 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/thumbnailview.cxx22
1 files changed, 13 insertions, 9 deletions
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 08be7cb39014..0da633f4e568 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -126,6 +126,7 @@ void ThumbnailView::ImplDeleteItems()
}
mItemList.clear();
+ mFilteredItemList.clear();
}
void ThumbnailView::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
@@ -680,17 +681,20 @@ void ThumbnailView::Paint( const Rectangle &aRect)
void ThumbnailView::GetFocus()
{
- // Select the first item if nothing selected
- int nSelected = -1;
- for (size_t i = 0, n = mItemList.size(); i < n && nSelected == -1; ++i)
+ if(GETFOCUS_TAB & GetGetFocusFlags())
{
- if (mItemList[i]->isSelected())
- nSelected = i;
- }
+ // Select the first item if nothing selected
+ int nSelected = -1;
+ for (size_t i = 0, n = mItemList.size(); i < n && nSelected == -1; ++i)
+ {
+ if (mItemList[i]->isSelected())
+ nSelected = i;
+ }
- if ( nSelected == -1 && mItemList.size( ) > 0 )
- {
- SelectItem( 1 );
+ if ( nSelected == -1 && mItemList.size( ) > 0 )
+ {
+ SelectItem( 1 );
+ }
}
// Tell the accessible object that we got the focus.