summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r--sc/source/ui/view/tabvwsha.cxx13
-rw-r--r--sc/source/ui/view/tabvwshe.cxx4
2 files changed, 16 insertions, 1 deletions
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index e34f697cb053..33a37b3ed93d 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -225,7 +225,18 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
break;
case SID_SEARCH_ITEM:
- rSet.Put( ScGlobal::GetSearchItem() );
+ {
+ SvxSearchItem searchItem = ScGlobal::GetSearchItem();
+ // i35093:
+ if (bSearchJustOpened)
+ {
+ ScMarkData& rMarkData = pViewData->GetMarkData();
+ if (rMarkData.IsMarked())
+ searchItem.SetSelection( sal_True );
+ }
+ bSearchJustOpened = sal_False;
+ rSet.Put(searchItem);
+ }
break;
case SID_SEARCH_OPTIONS:
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index e04a48151f10..b4b0f2ff974c 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -246,6 +246,10 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
switch ( nSlot )
{
+ case FID_SEARCH_ON:
+ bSearchJustOpened = sal_True;
+ break;
+
case FID_SEARCH_NOW:
{
if ( pReqArgs &&