[PUSHED] String to OUString
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5817 Approvals: Andrzej J.R. Hunt: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5817 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31d7794f4c7aa840545edff41a102b76bb39e042 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold Gerrit-Reviewer: Andrzej J.R. Hunt Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Thomas Arnhold ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[RESTORED] fdo#65014 Fix backwards/forwards search change of direction.
Andrzej J.R. Hunt has restored this change. Change subject: fdo#65014 Fix backwards/forwards search change of direction. .. Patch Set 2: Restored Simpler fix now implemented and tested. -- To view, visit https://gerrit.libreoffice.org/4061 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: restore Gerrit-Change-Id: I65a5d94b898dd4b7467889b1932f42c9b6b523fe Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andrzej J.R. Hunt Gerrit-Reviewer: Andrzej J.R. Hunt Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fdo#65014 Fix backwards/forwards search change of direction.
Andrzej J.R. Hunt has abandoned this change. Change subject: fdo#65014 Fix backwards/forwards search change of direction. .. Patch Set 2: Abandoned Abandoning for now -- I'll get back to this in 1.5 weeks time. -- To view, visit https://gerrit.libreoffice.org/4061 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I65a5d94b898dd4b7467889b1932f42c9b6b523fe Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andrzej J.R. Hunt Gerrit-Reviewer: Andrzej J.R. Hunt Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fix backwards/forwards search change of direction.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4061
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/4061/1
Fix backwards/forwards search change of direction.
Begin a search from the extremity of the selected region instead of from the
cursor position. Previously when changing search direction the first
"result" is the same as has been previously found when searching forwards as
the cursor is at the end of the selection, and the search region is from the
end of the previous result to the begin of the document. Now the selected
or previously found region is ignored.
Change-Id: I65a5d94b898dd4b7467889b1932f42c9b6b523fe
---
M sw/source/ui/uiview/viewsrch.cxx
1 file changed, 18 insertions(+), 0 deletions(-)
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index fce4d50..2049564 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -444,6 +444,24 @@
// aus 'Suche alle'
m_pWrtShell->StartAllAction();
m_pWrtShell->Push();
+
+// Move the cursor to the front/back of selected areas to avoid searching
+// through the selected area when doing a normal search.
+SwPaM* pCrsr = m_pWrtShell->GetCrsr();
+SwPaM* pStartCrsr = pCrsr;
+SwPosition* pStart =( *pCrsr->GetPoint() < *pCrsr->GetMark() ) ?
+pCrsr->GetPoint() : pCrsr->GetMark();
+SwPosition* pEnd = ( *pCrsr->GetPoint() < *pCrsr->GetMark() ) ?
+pCrsr->GetMark() : pCrsr->GetPoint();
+while ( ( pCrsr = ( SwPaM* ) pCrsr->GetNext() ) != pStartCrsr );
+{
+pStart = ( *pCrsr->GetPoint() < *pStart ) ? pCrsr->GetPoint() : pStart;
+pStart = ( *pCrsr->GetMark() < *pStart ) ? pCrsr->GetMark() : pStart;
+pEnd = ( *pCrsr->GetPoint() > *pEnd ) ? pCrsr->GetPoint() : pEnd;
+pEnd = ( *pCrsr->GetMark() > *pEnd ) ? pCrsr->GetMark() : pEnd;
+}
+*pStartCrsr->GetPoint() = m_pSrchItem->GetBackward() ? *pStart : *pEnd;
+
// falls in selektierten Bereichen gesucht werden soll, duerfen sie
// nicht aufgehoben werden
if (!m_pSrchItem->GetSelection())
--
To view, visit https://gerrit.libreoffice.org/4061
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65a5d94b898dd4b7467889b1932f42c9b6b523fe
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andrzej J.R. Hunt
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#64451 Add "Find All" to the Find bar.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4016
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/4016/1
fdo#64451 Add "Find All" to the Find bar.
Change-Id: I7a5f2881d2aa77f2d5c6c302c8eac1162b194bcf
---
M basctl/uiconfig/basicide/toolbar/findbar.xml
M officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
M officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
M sc/uiconfig/scalc/toolbar/findbar.xml
M sd/uiconfig/sdraw/toolbar/findbar.xml
M sd/uiconfig/simpress/toolbar/findbar.xml
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/sglobal/toolbar/findbar.xml
M sw/uiconfig/sweb/toolbar/findbar.xml
M sw/uiconfig/swriter/toolbar/findbar.xml
M sw/uiconfig/swxform/toolbar/findbar.xml
14 files changed, 190 insertions(+), 2 deletions(-)
diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml
b/basctl/uiconfig/basicide/toolbar/findbar.xml
index 57aec06..a7cb693 100644
--- a/basctl/uiconfig/basicide/toolbar/findbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/findbar.xml
@@ -22,6 +22,7 @@
+
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 64fa7b0..c4961d8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -440,6 +440,17 @@
com.sun.star.svx.MatchCaseToolboxController
+
+
+ .uno:FindAll
+
+
+
+
+
+ com.sun.star.svx.FindAllToolboxController
+
+
.uno:FontColor
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 74fbeeb..94e4929 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1483,6 +1483,11 @@
Match Case
+
+
+ Find All
+
+
Exit Search
diff --git a/sc/uiconfig/scalc/toolbar/findbar.xml
b/sc/uiconfig/scalc/toolbar/findbar.xml
index f8052a1..a3c5c0f 100644
--- a/sc/uiconfig/scalc/toolbar/findbar.xml
+++ b/sc/uiconfig/scalc/toolbar/findbar.xml
@@ -23,6 +23,7 @@
+
diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml
b/sd/uiconfig/sdraw/toolbar/findbar.xml
index f8052a1..4e8ec6b 100644
--- a/sd/uiconfig/sdraw/toolbar/findbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/findbar.xml
@@ -22,6 +22,7 @@
+
diff --git a/sd/uiconfig/simpress/toolbar/findbar.xml
b/sd/uiconfig/simpress/toolbar/findbar.xml
index f8052a1..4e8ec6b 100644
--- a/sd/uiconfig/simpress/toolbar/findbar.xml
+++ b/sd/uiconfig/simpress/toolbar/findbar.xml
@@ -22,6 +22,7 @@
+
diff --git a/svx/inc/tbunosearchcontrollers.hxx
b/svx/inc/tbunosearchcontrollers.hxx
index b68b4b5..ab3693c 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -257,6 +257,43 @@
CheckBox* m_pMatchCaseControl;
};
+class FindAllToolboxController : public svt::ToolboxController,
+ public css::lang::XServiceInfo
+{
+public:
+FindAllToolboxController( const css::uno::Reference<
css::uno::XComponentContext >& rxContext );
+~FindAllToolboxController();
+
+// 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 OUString SAL_CALL getImplementationName() throw(
css::uno::RuntimeException );
+virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw( css::uno::RuntimeException );
+virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException );
+
+static OUString getImplementationName_Static( ) throw()
+{
+return OUString( "com.sun.star.svx.FindAllToolboxController" );
+}
+
+static css::uno::Sequence< 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 css
[PUSHED] fdo#63035 Add "Match Case" to Find bar.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3977 -- To view, visit https://gerrit.libreoffice.org/3977 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1339767de7980426d32960bf5ee60e2f5c011be4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andrzej J.R. Hunt Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: Michael Meeks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63035 Add "Match Case" to Find bar.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3977
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/3977/1
fdo#63035 Add "Match Case" to Find bar.
Change-Id: I1339767de7980426d32960bf5ee60e2f5c011be4
---
M basctl/uiconfig/basicide/toolbar/findbar.xml
M include/svx/dialogs.hrc
M officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
M officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
M sc/uiconfig/scalc/toolbar/findbar.xml
M sd/uiconfig/sdraw/toolbar/findbar.xml
M sd/uiconfig/simpress/toolbar/findbar.xml
M svx/inc/tbunosearchcontrollers.hxx
M svx/source/tbxctrls/tbunosearchcontrollers.cxx
M svx/source/tbxctrls/tbunosearchcontrollers.src
M svx/source/unodraw/unoctabl.cxx
M svx/util/svx.component
M sw/uiconfig/sglobal/toolbar/findbar.xml
M sw/uiconfig/sweb/toolbar/findbar.xml
M sw/uiconfig/swriter/toolbar/findbar.xml
M sw/uiconfig/swxform/toolbar/findbar.xml
16 files changed, 300 insertions(+), 3 deletions(-)
diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml
b/basctl/uiconfig/basicide/toolbar/findbar.xml
index 42baa21..57aec06 100644
--- a/basctl/uiconfig/basicide/toolbar/findbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/findbar.xml
@@ -22,6 +22,7 @@
+
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 339cba7..f9e7833 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -928,6 +928,7 @@
#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
(RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//?
#define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START +
1190)
+#define RID_SVXSTR_FINDBAR_MATCHCASE(RID_SVX_START +
1192)
#define RID_SVXSTR_NEXTFREE (RID_SVX_START +
1191)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 56055d4..6fd5def 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -429,6 +429,17 @@
com.sun.star.svx.UpSearchToolboxController
+
+
+ .uno:MatchCase
+
+
+
+
+
+ com.sun.star.svx.MatchCaseToolboxController
+
+
.uno:FontColor
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 8ff9b74..b9e77a6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1470,6 +1470,11 @@
1
+
+
+ Match Case
+
+
Exit Search
diff --git a/sc/uiconfig/scalc/toolbar/findbar.xml
b/sc/uiconfig/scalc/toolbar/findbar.xml
index a0e6037..f8052a1 100644
--- a/sc/uiconfig/scalc/toolbar/findbar.xml
+++ b/sc/uiconfig/scalc/toolbar/findbar.xml
@@ -22,6 +22,7 @@
+
diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml
b/sd/uiconfig/sdraw/toolbar/findbar.xml
index a0e6037..f8052a1 100644
--- a/sd/uiconfig/sdraw/toolbar/findbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/findbar.xml
@@ -22,6 +22,7 @@
+
diff --git a/sd/uiconfig/simpress/toolbar/findbar.xml
b/sd/uiconfig/simpress/toolbar/findbar.xml
index a0e6037..f8052a1 100644
--- a/sd/uiconfig/simpress/toolbar/findbar.xml
+++ b/sd/uiconfig/simpress/toolbar/findbar.xml
@@ -22,6 +22,7 @@
+
diff --git a/svx/inc/tbunosearchcontrollers.hxx
b/svx/inc/tbunosearchcontrollers.hxx
index 23eb22f..5a83776 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
@@ -215,6 +216,49 @@
Type meType;
};
+class MatchCaseToolboxController : public svt::ToolboxController,
+ public css::lang::XServiceInfo
+{
+public:
+MatchCaseToolboxController( const css::uno::Reference<
css::uno::XComponentContext >& rxContext );
+~MatchCaseToolboxController();
+
+// 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 OUString SAL_CALL getImplementationName() throw(
css::uno::RuntimeException );
+virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw( css::uno::RuntimeException );
+virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException );
+
+static OUString getImplementationName_S
