summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/tbunosearchcontrollers.cxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-07-26 16:44:56 +0200
committerJan Holesovsky <kendy@suse.cz>2011-07-27 00:20:50 +0200
commit5e75c47fff173e9060483a25b2a3f0bc525106d7 (patch)
treebb85932eefaebb6dd8e362e2b479d8605cac85e0 /svx/source/tbxctrls/tbunosearchcontrollers.cxx
parent0705460359f80e4474fbdcdef3c75bd246253c91 (diff)
findbar: When using the findbar, reset flags to default, fdo#37179.
Diffstat (limited to 'svx/source/tbxctrls/tbunosearchcontrollers.cxx')
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx16
1 files changed, 12 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 64e84b777830..20d0c7dba41a 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -48,6 +48,7 @@ namespace svx
static const ::rtl::OUString SEARCHITEM_SEARCHSTRING( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.SearchString" ) );
static const ::rtl::OUString SEARCHITEM_SEARCHBACKWARD( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.Backward" ) );
+static const ::rtl::OUString SEARCHITEM_SEARCHFLAGS( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.SearchFlags" ) );
static const ::rtl::OUString COMMAND_EXECUTESEARCH( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExecuteSearch" ) );
static const ::rtl::OUString COMMAND_FINDTEXT( RTL_CONSTASCII_USTRINGPARAM( ".uno:FindText" ) );
@@ -161,7 +162,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
Remember_Impl(GetText());
::rtl::OUString sFindText = GetText();
- css::uno::Sequence< css::beans::PropertyValue > lArgs(2);
+ css::uno::Sequence< css::beans::PropertyValue > lArgs(3);
lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
lArgs[0].Value <<= sFindText;
@@ -172,6 +173,9 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
else
lArgs[1].Value <<= sal_False;
+ lArgs[2].Name = SEARCHITEM_SEARCHFLAGS;
+ lArgs[2].Value <<= 0;
+
impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
nRet = 1;
}
@@ -556,11 +560,13 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
}
}
- css::uno::Sequence< css::beans::PropertyValue > lArgs(2);
+ css::uno::Sequence< css::beans::PropertyValue > lArgs(3);
lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
lArgs[0].Value <<= sFindText;
lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
lArgs[1].Value <<= sal_False;
+ lArgs[2].Name = SEARCHITEM_SEARCHFLAGS;
+ lArgs[2].Value <<= 0;
impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
@@ -685,11 +691,13 @@ void SAL_CALL UpSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) th
}
}
- css::uno::Sequence< css::beans::PropertyValue > lArgs(2);
+ css::uno::Sequence< css::beans::PropertyValue > lArgs(3);
lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
lArgs[0].Value <<= sFindText;
- lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
+ lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
lArgs[1].Value <<= sal_True;
+ lArgs[2].Name = SEARCHITEM_SEARCHFLAGS;
+ lArgs[2].Value <<= 0;
impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);