Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1557
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/1557/1
add close option to findbar in Writer
Change-Id: Ie42da7ecc7f3cb59bb6f1fb798e72a6862eb1f67
---
M dictionaries
A icon-themes/galaxy/cmd/lc_exitsearch.png
M officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
M officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
M svx/inc/tbunosearchcontrollers.hxx
M svx/source/tbxctrls/tbunosearchcontrollers.cxx
M svx/source/unodraw/unoctabl.cxx
M svx/util/svx.component
M sw/uiconfig/swriter/toolbar/findbar.xml
9 files changed, 195 insertions(+), 2 deletions(-)
diff --git a/dictionaries b/dictionaries
index a844895..f0c914a 16
--- a/dictionaries
+++ b/dictionaries
-Subproject commit a84489515d2207b1c34646be7d6f532b84a37439
+Subproject commit f0c914a43e7e6540300da25c935a77aebb672094
diff --git a/icon-themes/galaxy/cmd/lc_exitsearch.png
b/icon-themes/galaxy/cmd/lc_exitsearch.png
new file mode 100644
index 000..18958f3
--- /dev/null
+++ b/icon-themes/galaxy/cmd/lc_exitsearch.png
Binary files differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index a60dd09..fe27c05 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -396,6 +396,17 @@
valuecom.sun.star.svx.DownSearchToolboxController/value
/prop
/node
+ node oor:name=com.sun.star.svx.ExitFindbarToolboxController
oor:op=replace
+prop oor:name=Command
+ value.uno:ExitSearch/value
+/prop
+prop oor:name=Module
+ value/
+/prop
+prop oor:name=Controller
+ valuecom.sun.star.svx.ExitFindbarToolboxController/value
+/prop
+ /node
node oor:name=com.sun.star.svx.UpSearchToolboxController
oor:op=replace
prop oor:name=Command
value.uno:UpSearch/value
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 42188b6..bbdf997 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1471,6 +1471,14 @@
value1/value
/prop
/node
+node oor:name=.uno:ExitSearch oor:op=replace
+prop oor:name=Label oor:type=xs:string
+value xml:lang=en-USExit Search/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+value1/value
+/prop
+/node
node oor:name=vnd.sun.star.findbar:FocusToFindbar
oor:op=replace
prop oor:name=Label oor:type=xs:string
value xml:lang=en-US~Find.../value
diff --git a/svx/inc/tbunosearchcontrollers.hxx
b/svx/inc/tbunosearchcontrollers.hxx
index 47a1d00..87f9756 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -135,6 +135,48 @@
};
+class ExitSearchToolboxController : public svt::ToolboxController,
+ public css::lang::XServiceInfo
+{
+public:
+enum Type { EXIT };
+
+ExitSearchToolboxController( const css::uno::Reference
css::lang::XMultiServiceFactory rServiceManager, Type eType );
+~ExitSearchToolboxController();
+
+// XInterface
+virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
css::uno::Type aType ) throw ( css::uno::RuntimeException );
+virtual void SAL_CALL acquire() throw ();
+virtual void SAL_CALL release() throw ();
+
+// XServiceInfo
+virtual ::rtl::OUString SAL_CALL getImplementationName() throw(
css::uno::RuntimeException );
+virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
ServiceName ) throw( css::uno::RuntimeException );
+virtual css::uno::Sequence ::rtl::OUString SAL_CALL
getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+static ::rtl::OUString getImplementationName_Static( ) throw()
+{
+return ::rtl::OUString(
com.sun.star.svx.ExitFindbarToolboxController );
+}
+
+static css::uno::Sequence ::rtl::OUString
getSupportedServiceNames_Static() throw();
+
+// XComponent
+virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException );
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence css::uno::Any
aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException);
+
+// XToolbarController
+virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (
css::uno::RuntimeException );
+
+// XStatusListener
+virtual void SAL_CALL statusChanged( const
