[Libreoffice-commits] core.git: filter/source include/svx svx/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Apr 20 07:01:11 UTC 2018
filter/source/msfilter/msdffimp.cxx | 1 -
include/svx/svdobj.hxx | 1 -
include/svx/svdotext.hxx | 1 -
svx/source/sidebar/SelectionAnalyzer.cxx | 3 ---
svx/source/svdraw/svdcrtv.cxx | 4 ++--
svx/source/svdraw/svdedxv.cxx | 3 +--
svx/source/svdraw/svdobj.cxx | 1 -
svx/source/svdraw/svdorect.cxx | 4 ++--
sw/source/uibase/utlui/content.cxx | 3 ---
9 files changed, 5 insertions(+), 16 deletions(-)
New commits:
commit 73584b2342b4e527b5329b4bf779171c4fc2d4ce
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Apr 19 16:30:01 2018 +0200
OBJ_TEXTEXT is dead
with
commit dfefe448c41921f2f1e54d3f69b8b9e89031d055
Date: Thu Mar 1 15:54:32 2018 +0100
SOSAW080: Added first bunch of basic changes to helpers
Change-Id: Ib0dc816a62f36966f0d61b16916a49f11007b413
Reviewed-on: https://gerrit.libreoffice.org/53169
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 2e842b106f78..4eaf3205e437 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -472,7 +472,6 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
case OBJ_RECT :
case OBJ_TEXT :
case OBJ_PAGE :
- case OBJ_TEXTEXT :
case OBJ_TITLETEXT :
case OBJ_OUTLINETEXT :
{
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 618b6b37495a..df6d42f2233f 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -124,7 +124,6 @@ enum SdrObjKind {
OBJ_SPLNLINE =14, /// natural cubic Spline (ni)
OBJ_SPLNFILL =15, /// periodic cubic Spline (ni)
OBJ_TEXT =16, /// text object
- OBJ_TEXTEXT =17, /// text extension frame (ni)
OBJ_TITLETEXT =20, /// TitleText, special text object for StarDraw
OBJ_OUTLINETEXT=21, /// OutlineText, special text object for StarDraw
OBJ_GRAF =22, /// foreign graphic (StarView Graphic)
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index f7a577404d6c..8cae87d87af2 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -195,7 +195,6 @@ protected:
// Possible values for eTextKind are:
// OBJ_TEXT regular text frame
- // OBJ_TEXTEXT text continuation frame
// OBJ_TITLETEXT TitleText for presentations
// OBJ_OUTLINETEXT OutlineText for presentations
// eTextKind only has meaning when bTextFrame=sal_True, since otherwise
diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx
index f39fbc217b81..ea4fb5db2d7f 100644
--- a/svx/source/sidebar/SelectionAnalyzer.cxx
+++ b/svx/source/sidebar/SelectionAnalyzer.cxx
@@ -205,7 +205,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt
case OBJ_TITLETEXT:
case OBJ_OUTLINETEXT:
case OBJ_TEXT:
- case OBJ_TEXTEXT:
case OBJ_MEASURE:
case OBJ_RECT:
case OBJ_CIRC:
@@ -272,7 +271,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD (
case OBJ_TITLETEXT:
case OBJ_OUTLINETEXT:
case OBJ_TEXT:
- case OBJ_TEXTEXT:
return EnumContext::Context::TextObject;
case OBJ_GRAF:
@@ -468,7 +466,6 @@ bool SelectionAnalyzer::IsTextObjType (const sal_uInt16 nType)
switch(nType)
{
case OBJ_TEXT:
- case OBJ_TEXTEXT:
case OBJ_TITLETEXT:
case OBJ_OUTLINETEXT:
return true;
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;
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 37de556ce50b..40477f01982a 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -932,7 +932,6 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
{
case OBJ_GRUP:
case OBJ_TEXT:
- case OBJ_TEXTEXT:
case OBJ_LINE:
case OBJ_RECT:
case OBJ_CUSTOMSHAPE:
@@ -1016,7 +1015,6 @@ OUString SwContentTree::GetEntryLongDescription( SvTreeListEntry* pEntry ) const
{
case OBJ_GRUP:
case OBJ_TEXT:
- case OBJ_TEXTEXT:
case OBJ_LINE:
case OBJ_RECT:
case OBJ_CUSTOMSHAPE:
@@ -2835,7 +2833,6 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent)
{
case OBJ_GRUP:
case OBJ_TEXT:
- case OBJ_TEXTEXT:
case OBJ_LINE:
case OBJ_RECT:
case OBJ_CIRC:
More information about the Libreoffice-commits
mailing list