diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-02 18:07:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-02 21:09:52 +0300 |
| commit | ede0abe6b1a0bf1ffbfe2ff9258e5b78f2cc606e (patch) | |
| tree | 240295fb9a6b26149c74977a7870bebd81cd4a57 /sw | |
| parent | 1d0636ebc660a9f74269807b416f2f1480f49530 (diff) | |
Bin EE_CNTRL_URLSFXEXECUTE which was only set, never tested
Change-Id: I18a9355bb902b19f0eeecb26d33eba4fb25db8cb
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/docvw/SidebarWin.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewdraw.cxx | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 454eb71815e9..d3c1b0be7936 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -420,7 +420,7 @@ void SwSidebarWin::InitControls() const SwViewOption* pVOpt = mrView.GetWrtShellPtr()->GetViewOptions(); sal_uLong nCntrl = mpOutliner->GetControlWord(); // TODO: crash when AUTOCOMPLETE enabled - nCntrl |= EE_CNTRL_MARKFIELDS | EE_CNTRL_PASTESPECIAL | EE_CNTRL_AUTOCORRECT | EV_CNTRL_AUTOSCROLL | EE_CNTRL_URLSFXEXECUTE; // | EE_CNTRL_AUTOCOMPLETE; + nCntrl |= EE_CNTRL_MARKFIELDS | EE_CNTRL_PASTESPECIAL | EE_CNTRL_AUTOCORRECT | EV_CNTRL_AUTOSCROLL; // | EE_CNTRL_AUTOCOMPLETE; if (SwViewOption::IsFieldShadings()) nCntrl |= EE_CNTRL_MARKFIELDS; else diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 3169d2dc5c5a..14c416f706d3 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -523,7 +523,6 @@ bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, sal_uInt32 nCntrl = pOutliner->GetControlWord(); nCntrl |= EE_CNTRL_ALLOWBIGOBJS; - nCntrl |= EE_CNTRL_URLSFXEXECUTE; const SwViewOption *pOpt = pSh->GetViewOptions(); |