diff options
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r-- | svx/source/svdraw/svdcrtv.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 3 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 1 | ||||
-rw-r--r-- | svx/source/svdraw/svdorect.cxx | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 673c03ec72b3..c015fe69a848 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -330,7 +330,7 @@ bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) bool SdrCreateView::IsTextTool() const { - return meEditMode==SdrViewEditMode::Create && nCurrentInvent==SdrInventor::Default && (nCurrentIdent==OBJ_TEXT || nCurrentIdent==OBJ_TEXTEXT || nCurrentIdent==OBJ_TITLETEXT || nCurrentIdent==OBJ_OUTLINETEXT); + return meEditMode==SdrViewEditMode::Create && nCurrentInvent==SdrInventor::Default && (nCurrentIdent==OBJ_TEXT || nCurrentIdent==OBJ_TITLETEXT || nCurrentIdent==OBJ_OUTLINETEXT); } bool SdrCreateView::IsEdgeTool() const @@ -449,7 +449,7 @@ bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, cons pCurrentCreate->SetMergedItemSet(aSet); } - if (mpModel && nInvent==SdrInventor::Default && (nIdent==OBJ_TEXT || nIdent==OBJ_TEXTEXT || + if (mpModel && nInvent==SdrInventor::Default && (nIdent==OBJ_TEXT || nIdent==OBJ_TITLETEXT || nIdent==OBJ_OUTLINETEXT)) { // default for all text frames: no background, no border diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 5b41d59ca7d3..6cbc0eb14f8d 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1495,7 +1495,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) if(pTEObj->IsInserted() && bDelObj && pTEObj->GetObjInventor()==SdrInventor::Default && !bDontDeleteReally) { SdrObjKind eIdent=static_cast<SdrObjKind>(pTEObj->GetObjIdentifier()); - if(eIdent==OBJ_TEXT || eIdent==OBJ_TEXTEXT) + if(eIdent==OBJ_TEXT) { pDelUndo= GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pTEObj); } @@ -2505,7 +2505,6 @@ bool SdrObjEditView::SupportsFormatPaintbrush( SdrInventor nObjectInventor, sal_ case OBJ_SPLNLINE: case OBJ_SPLNFILL: case OBJ_TEXT: - case OBJ_TEXTEXT: case OBJ_TITLETEXT: case OBJ_OUTLINETEXT: case OBJ_GRAF: diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 9090fb255a5c..54f7b0d487fe 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -3105,7 +3105,6 @@ SdrObject* SdrObjFactory::MakeNewObject( } break; case OBJ_TEXT: - case OBJ_TEXTEXT: case OBJ_TITLETEXT: case OBJ_OUTLINETEXT: { diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 576800fdbe19..115b3a7adf27 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -84,7 +84,7 @@ SdrRectObj::SdrRectObj( : SdrTextObj(rSdrModel, eNewTextKind), mpXPoly(nullptr) { - DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT || + DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, "SdrRectObj::SdrRectObj(SdrObjKind) can only be applied to text frames."); bClosedObj=true; @@ -97,7 +97,7 @@ SdrRectObj::SdrRectObj( : SdrTextObj(rSdrModel, eNewTextKind, rRect), mpXPoly(nullptr) { - DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT || + DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, "SdrRectObj::SdrRectObj(SdrObjKind,...) can only be applied to text frames."); bClosedObj=true; |