officecfg/registry/data/org/openoffice/Office/Common.xcu | 2 + sw/source/ui/docvw/edtwin.cxx | 24 +++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-)
New commits: commit dcb080347ca127044313bbb3c11c37761cc2a7a2 Author: Cédric Bosdonnat <[email protected]> Date: Fri Nov 16 13:37:04 2012 +0100 n#780277: select field when clicking it instead of having cursor before it Change-Id: I93d623b62e9357a71bfca3403cc98092ef58c7e4 diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 6a6d744..1565d13 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -3096,6 +3096,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) bExecDrawTextLink = sal_True; } + SwContentAtPos aFieldAtPos ( SwContentAtPos::SW_FIELD ); + // only try to select frame, if pointer already was // switched accordingly if ( aActHitType != SDRHIT_NONE && !rSh.IsSelFrmMode() && @@ -3212,6 +3214,19 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) } } + // Are we selecting a field? + else if ( rSh.GetContentAtPos( aDocPos, aFieldAtPos ) ) + { + // select work, AdditionalMode if applicable + if ( KEY_MOD1 == rMEvt.GetModifier() && !rSh.IsAddMode() ) + { + rSh.EnterAddMode(); + rSh.SelWrd( &aDocPos ); + rSh.LeaveAddMode(); + } + else + rSh.SelWrd( &aDocPos ); + } break; } case 2: @@ -4333,7 +4348,8 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) } else { - if ( !rSh.IsInSelect() && rSh.ChgCurrPam( aDocPt ) ) + SwContentAtPos aFieldAtPos ( SwContentAtPos::SW_FIELD ); + if ( !rSh.IsInSelect() && rSh.ChgCurrPam( aDocPt ) && !rSh.GetContentAtPos( aDocPt, aFieldAtPos ) ) { const sal_Bool bTmpNoInterrupt = bNoInterrupt; bNoInterrupt = sal_False; @@ -4377,8 +4393,12 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) SwContentAtPos::SW_INETATTR | SwContentAtPos::SW_SMARTTAG | SwContentAtPos::SW_FORMCTRL); - if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_True ) ) + if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_False ) ) { + // Do it again if we're not on a field to update the cursor accordingly + if ( SwContentAtPos::SW_FIELD != aCntntAtPos.eCntntAtPos ) + rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_True ); + sal_Bool bViewLocked = rSh.IsViewLocked(); if( !bViewLocked && !rSh.IsReadOnlyAvailable() && aCntntAtPos.IsInProtectSect() ) commit ac1e59a1abea03d55286d6b2268572e1199c15ef Author: Cédric Bosdonnat <[email protected]> Date: Thu Nov 15 16:45:20 2012 +0100 CMIS: added OpenDataSpace default URL Change-Id: Ief298ad4ce724a31edfba977609358893bf4365d diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 45f4cfe..4bc30ed 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -609,6 +609,7 @@ <it>https://apps.lotuslive.com/files/basic/cmis/my/servicedoc</it> <it>http://<host>/servlet/cmis/repository/_P<Quickr place name>_RMain.nsf/servicedoc</it> <it>http://<host>/nuxeo/webservices/cmis/RepositoryService?wsdl</it> + <it>https://<host>/cmis/atom</it> <it>http://ec2-184-72-233-127.compute-1.amazonaws.com/ot-cmis/services/RepositoryService?wsdl</it> <it>http://<host>/_vti_bin/CMISSoapwsdl.aspx</it> </value> @@ -620,6 +621,7 @@ <it>Lotus Live Files</it> <it>Lotus Quickr Domino</it> <it>Nuxeo 5.4</it> + <it>OpenDataSpace</it> <it>OpenText ELS 10.2.0</it> <it>SharePoint 2010</it> </value>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
