diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-02-26 11:48:22 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-26 12:59:09 +0100 |
commit | bb850eead3dd2883343029a863368360e03fcfee (patch) | |
tree | 25bbd3fdc7c00bf4c748ee12a94d11f52d5973c2 | |
parent | 7f743c373b028106f5923f53399aae55a51e3e06 (diff) |
n#802888 SwEditWin: let fields have priority over header/footer flys
http://people.freedesktop.org/~vmiklos/2013/watermark-field-click.odt is
a reproducer, double-click was catched by the fly frame from the header,
so the field edit dialog didn't appear.
(cherry picked from commit 61f467c8974d6b6face41e7027d75ae4ddb6fdb2)
Conflicts:
sw/source/ui/docvw/edtwin.cxx
Change-Id: Ibd3ea382085fa4cbdc1af73d4be1e5c053a81eaa
-rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 712b31f01ad5..36db79562a7b 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2731,7 +2731,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) } } - if ( lcl_CheckHeaderFooterClick( rSh, aDocPos, rMEvt.GetClicks() ) ) + sal_Bool bIsDocReadOnly = rView.GetDocShell()->IsReadOnly(); + if ( (bIsDocReadOnly || !rSh.GetCurFld()) && lcl_CheckHeaderFooterClick( rSh, aDocPos, rMEvt.GetClicks() ) ) return; @@ -2750,7 +2751,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) // work but in practice ... lcl_SelectShellForDrop( rView ); - sal_Bool bIsDocReadOnly = rView.GetDocShell()->IsReadOnly(); sal_Bool bCallBase = sal_True; if( pQuickHlpData->bClear ) |