summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-10-02 18:07:04 +0300
committerTor Lillqvist <tml@collabora.com>2014-10-02 21:09:52 +0300
commitede0abe6b1a0bf1ffbfe2ff9258e5b78f2cc606e (patch)
tree240295fb9a6b26149c74977a7870bebd81cd4a57
parent1d0636ebc660a9f74269807b416f2f1480f49530 (diff)
Bin EE_CNTRL_URLSFXEXECUTE which was only set, never tested
Change-Id: I18a9355bb902b19f0eeecb26d33eba4fb25db8cb
-rw-r--r--include/editeng/editstat.hxx1
-rw-r--r--sc/source/core/tool/editutil.cxx2
-rw-r--r--sc/source/ui/view/viewdata.cxx1
-rw-r--r--sd/source/core/drawdoc.cxx2
-rw-r--r--sd/source/ui/view/Outliner.cxx1
-rw-r--r--sd/source/ui/view/sdview.cxx1
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx2
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx1
8 files changed, 1 insertions, 10 deletions
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 29148212182b..243ff07713ff 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -39,7 +39,6 @@
#define EE_CNTRL_ONLINESPELLING 0x00001000 // During the edit Spelling
#define EE_CNTRL_STRETCHING 0x00002000 // Stretch mode
#define EE_CNTRL_MARKFIELDS 0x00004000 // Mark Fields with color
-#define EE_CNTRL_URLSFXEXECUTE 0x00008000 // !!!OLD!!!: SFX-URL-Execute.
#define EE_CNTRL_RESTOREFONT 0x00010000 // Restore Font in OutDev
#define EE_CNTRL_RTFSTYLESHEETS 0x00020000 // Use Stylesheets when imported
#define EE_CNTRL_AUTOCORRECT 0x00080000 // AutoCorrect
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 245831f49ab2..59d39c8c6ce5 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -852,8 +852,6 @@ ScFieldEditEngine::ScFieldEditEngine(
{
if ( pTextObjectPool )
SetEditTextObjectPool( pTextObjectPool );
- // EE_CNTRL_URLSFXEXECUTE nicht, weil die Edit-Engine den ViewFrame nicht kennt
- // wir haben keine StyleSheets fuer Text
SetControlWord( (GetControlWord() | EE_CNTRL_MARKFIELDS) & ~EE_CNTRL_RTFSTYLESHEETS );
}
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 688813c496b9..af08c7080b74 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2997,7 +2997,6 @@ void ScViewData::UpdateOutlinerFlags( Outliner& rOutl ) const
bool bOnlineSpell = pLocalDoc->GetDocOptions().IsAutoSpell();
sal_uLong nCntrl = rOutl.GetControlWord();
- nCntrl |= EE_CNTRL_URLSFXEXECUTE;
nCntrl |= EE_CNTRL_MARKFIELDS;
nCntrl |= EE_CNTRL_AUTOCORRECT;
if( bOnlineSpell )
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 89d5f2bd14e5..772364fdb345 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -279,7 +279,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
sal_uLong nCntrl = rOutliner.GetControlWord();
nCntrl |= EE_CNTRL_ALLOWBIGOBJS;
- nCntrl |= EE_CNTRL_URLSFXEXECUTE;
if (mbOnlineSpell)
nCntrl |= EE_CNTRL_ONLINESPELLING;
@@ -327,7 +326,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
sal_uLong nCntrl2 = pHitTestOutliner->GetControlWord();
nCntrl2 |= EE_CNTRL_ALLOWBIGOBJS;
- nCntrl2 |= EE_CNTRL_URLSFXEXECUTE;
nCntrl2 &= ~EE_CNTRL_ONLINESPELLING;
nCntrl2 &= ~ EE_CNTRL_ULSPACESUMMATION;
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index ccca4876a8f2..7a25bcdd88b9 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -173,7 +173,6 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
sal_uLong nCntrl = GetControlWord();
nCntrl |= EE_CNTRL_ALLOWBIGOBJS;
- nCntrl |= EE_CNTRL_URLSFXEXECUTE;
nCntrl |= EE_CNTRL_MARKFIELDS;
nCntrl |= EE_CNTRL_AUTOCORRECT;
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 98d90a4168d8..3a4fc537f2c6 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -681,7 +681,6 @@ bool View::SdrBeginTextEdit(
pOutl->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl));
sal_uLong nCntrl = pOutl->GetControlWord();
nCntrl |= EE_CNTRL_ALLOWBIGOBJS;
- nCntrl |= EE_CNTRL_URLSFXEXECUTE;
nCntrl |= EE_CNTRL_MARKFIELDS;
nCntrl |= EE_CNTRL_AUTOCORRECT;
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();