[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Fri Oct 21 05:59:26 PDT 2011
binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx | 25 ---
binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx | 28 ----
binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx | 30 ----
binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx | 7 -
binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx | 29 ----
binfilter/bf_svx/source/svdraw/svx_svdopath.cxx | 81 ------------
binfilter/bf_svx/source/svdraw/svx_svdorect.cxx | 21 ---
binfilter/bf_svx/source/svdraw/svx_svdotext.cxx | 144 -----------------------
binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx | 77 +++---------
binfilter/bf_svx/source/svdraw/svx_svdtxhdl.cxx | 6
binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx | 13 --
binfilter/bf_svx/source/unodraw/svx_unoshape.cxx | 17 --
binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx | 21 ---
binfilter/inc/bf_svx/svdoedge.hxx | 5
binfilter/inc/bf_svx/svdomeas.hxx | 22 ---
binfilter/inc/bf_svx/svdoole2.hxx | 4
binfilter/inc/bf_svx/svdopath.hxx | 12 -
binfilter/inc/bf_svx/svdotext.hxx | 89 --------------
19 files changed, 47 insertions(+), 586 deletions(-)
New commits:
commit 11918eca191a915d84a2efffe22c4243476b4ebe
Author: Joseph Powers <jpowers27 at cox.net>
Date: Thu Oct 20 07:57:53 2011 -0700
More cleanup in bf_svx
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
index 65b8c8c..c0f4343 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
@@ -812,7 +812,7 @@ sal_Bool SdXShape::IsEmptyPresObj() const throw()
// check if the object is in edit, than its temporarely not empty
SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, pObj );
- return (NULL == pTextObj) || ( NULL == pTextObj->GetEditOutlinerParaObject() );
+ return (NULL == pTextObj);
}
/** sets/reset the empty status of a presentation object
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
index 9cc6ffd..e357ca3 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
@@ -198,18 +198,6 @@ namespace binfilter {
-
-
-
-
-
-
-
-
-
-
-
-
/*N*/ void SdrCaptionObj::ImpGetCaptParams(ImpCaptParams& rPara) const
/*N*/ {
/*N*/ const SfxItemSet& rSet = GetItemSet();
@@ -263,9 +251,6 @@ namespace binfilter {
/*N*/ else aPol[1].Y()+=rPara.nLineLen;
/*N*/ }
/*N*/ }
-/*N*/ if (!rPara.bFixedAngle) {
-/*N*/ // fehlende Implementation
-/*N*/ }
/*N*/ rPoly=aPol;
/*N*/ }
@@ -273,20 +258,16 @@ namespace binfilter {
/*N*/ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rectangle& rRect) const
/*N*/ {
/*N*/ switch (rPara.eType) {
-/*?*/ case SDRCAPT_TYPE1: DBG_BF_ASSERT(0, "STRIP"); break;
-/*?*/ case SDRCAPT_TYPE2: DBG_BF_ASSERT(0, "STRIP"); break;
+/*?*/ case SDRCAPT_TYPE1: break;
+/*?*/ case SDRCAPT_TYPE2: break;
/*N*/ case SDRCAPT_TYPE3: ImpCalcTail3(rPara,rPoly,rRect); break;
-/*?*/ case SDRCAPT_TYPE4: DBG_BF_ASSERT(0, "STRIP"); break;
+/*?*/ case SDRCAPT_TYPE4: break;
/*N*/ }
/*N*/ }
-
-
-
-
/*N*/ void SdrCaptionObj::NbcMove(const Size& rSiz)
/*N*/ {
/*N*/ SdrRectObj::NbcMove(rSiz);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
index 06e6725..dfeec02 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
@@ -345,11 +345,6 @@ namespace binfilter {
/*?*/ }
/*?*/ }
/*?*/
-/*?*/ // new shadow line drawing
-/*?*/ if( pLineGeometry.get() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ // draw the line geometry
-/*?*/ }
/*N*/ }
// Before here the LineAttr were set: if(pLineAttr) rXOut.SetLineAttr(*pLineAttr);
@@ -395,11 +390,6 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ bool bOk=TRUE;
-/*N*/ if (HasText()) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ if (bOk && (rInfoRec.nPaintMode & SDRPAINTMODE_GLUEPOINTS) !=0) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ return bOk;
/*N*/ }
@@ -437,22 +427,6 @@ namespace binfilter {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/*N*/ void SdrCircObj::NbcMove(const Size& aSiz)
/*N*/ {
/*N*/ MoveRect(aRect,aSiz);
@@ -525,8 +499,6 @@ namespace binfilter {
-
-
/*N*/ void Union(Rectangle& rR, const Point& rP)
/*N*/ {
/*N*/ if (rP.X()<rR.Left ()) rR.Left ()=rP.X();
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
index 9982fb2..b75a885 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
@@ -76,8 +76,7 @@ namespace binfilter {
/*N*/ if (bAutoVertex) {
/*N*/ rGP=pObj->GetVertexGluePoint(nConId);
/*N*/ bRet=TRUE;
-/*N*/ } else if (bAutoCorner) {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ } else {
+/*N*/ } else if (!bAutoCorner) {
/*?*/ const SdrGluePointList* pGPL=pObj->GetGluePointList();
/*N*/ if (pGPL!=NULL) {
/*?*/ USHORT nNum=pGPL->FindGluePoint(nConId);
@@ -521,11 +520,6 @@ namespace binfilter {
/*N*/ return bHit ? (SdrObject*)this : NULL;
/*N*/ }
-/*N*/ bool SdrEdgeObj::IsNode() const
-/*N*/ {
-/*N*/ return TRUE;
-/*N*/ }
-
/*N*/ SdrGluePoint SdrEdgeObj::GetVertexGluePoint(USHORT nNum) const
/*N*/ {
/*N*/ Point aPt;
@@ -1599,23 +1593,6 @@ je Objekt variiert von 0-3:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/*N*/ void SdrEdgeObj::NbcSetSnapRect(const Rectangle& rRect)
/*N*/ {
/*N*/ Rectangle aOld(GetSnapRect());
@@ -1654,11 +1631,6 @@ je Objekt variiert von 0-3:
/*N*/ }
/*N*/ }
-/*N*/ void SdrEdgeObj::NbcSetPoint(const Point&, USHORT)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ // ToDo: Umconnekten fehlt noch
-/*N*/ }
-
/*N*/ void SdrEdgeObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ if (rIn.GetError()!=0) return;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
index 551884c..674c47e 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
@@ -397,9 +397,6 @@ namespace binfilter {
/*N*/ rPol.eUsedTextVPos=rRec.eWantTextVPos;
/*N*/ if (rPol.eUsedTextVPos==SDRMEASURE_TEXTVAUTO) rPol.eUsedTextVPos=SDRMEASURE_ABOVE;
/*N*/ bool bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE;
-/*N*/ if (rPol.eUsedTextVPos==SDRMEASURETEXT_VERTICALCENTERED) {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ rPol.bBreakedLine=bBrkLine;
/*N*/ if (rPol.eUsedTextHPos==SDRMEASURE_TEXTHAUTO) { // bei zu breitem Text diesen eventuell nach aussen schieben
/*N*/ bool bOutside=FALSE;
@@ -776,10 +773,6 @@ namespace binfilter {
/*N*/ SetTextDirty();
/*N*/ }
-/*N*/ bool SdrMeasureObj::BegTextEdit(SdrOutliner& /*rOutl*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE;
-/*N*/ }
-
/*N*/ void SdrMeasureObj::EndTextEdit(SdrOutliner& rOutl)
/*N*/ {
/*N*/ SdrTextObj::EndTextEdit(rOutl);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
index e034973..0f50c71 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
@@ -99,7 +99,7 @@ SdrOle2Obj::SdrOle2Obj(bool bFrame_)
SdrOle2Obj::SdrOle2Obj(const SvInPlaceObjectRef& /*rNewObjRef*/, const XubString& /*rNewObjName*/, const Rectangle& rNewRect, bool /*bFrame_*/) :
SdrRectObj(rNewRect)
-{DBG_BF_ASSERT(0, "STRIP");
+{
}
void SdrOle2Obj::Init()
@@ -306,17 +306,6 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel)
if( bChg )
Disconnect(); // mit dem alten Namen
- if( pModel && pNewModel )
- {
- SvPersist* pDestPers = pNewModel->GetPersist();
- SvPersist* pSrcPers = pModel->GetPersist();
-
- if( pDestPers && pSrcPers && ( pDestPers != pSrcPers ) )
- {
- {DBG_BF_ASSERT(0, "STRIP");}
- }
- }
-
SdrRectObj::SetModel( pNewModel );
if( bChg )
@@ -482,18 +471,6 @@ void SdrOle2Obj::NbcSetLogicRect(const Rectangle& rRect)
ImpSetVisAreaSize();
}
-bool SdrOle2Obj::HasGDIMetaFile() const
-{
- DBG_BF_ASSERT(0, "STRIP");
- return FALSE;
-}
-
-const GDIMetaFile* SdrOle2Obj::GetGDIMetaFile() const
-{
- DBG_BF_ASSERT(0, "STRIP");
- return NULL;
-}
-
void SdrOle2Obj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
{
rIn.SetError( 0 );
@@ -584,10 +561,6 @@ BOOL SdrOle2Obj::Unload()
if (pPersist)
{
SvPersist* pO = *ppObjRef;
- if( pO->IsModified() )
- {
- DBG_BF_ASSERT(0, "return value of DoSave() or DoSaveCompleted() is not checked here");
- }
ppObjRef->Clear();
if (pPersist->Unload(pO))
bUnloaded = TRUE;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
index b48398f..3a4f35c 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
@@ -302,12 +302,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*?*/
/*?*/ rXOut.DrawXPolyPolygon(aTmpXPoly);
/*?*/ }
-/*?*/
-/*?*/ // new shadow line drawing
-/*?*/ if( pLineGeometry.get() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ // draw the line geometry
-/*?*/ }
/*N*/ }
// Before here the LineAttr were set: if(pLineAttr) rXOut.SetLineAttr(*pLineAttr);
@@ -338,9 +332,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ if (HasText()) {
/*?*/ bOk=SdrTextObj::Paint(rXOut,rInfoRec);
/*N*/ }
-/*N*/ if (bOk && (rInfoRec.nPaintMode & SDRPAINTMODE_GLUEPOINTS) !=0) {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ return bOk;
/*N*/ }
@@ -401,57 +392,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
-
-
-
-
-
-/*?*/ inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, bool bClosed)
-/*?*/ {
-/*?*/ if (nPnt>0) {
-/*?*/ nPnt--;
-/*?*/ } else {
-/*?*/ nPnt=nPntMax;
-/*?*/ if (bClosed) nPnt--;
-/*?*/ }
-/*?*/ return nPnt;
-/*?*/ }
-
-/*?*/ inline USHORT GetNextPnt(USHORT nPnt, USHORT nPntMax, bool bClosed)
-/*?*/ {
-/*?*/ nPnt++;
-/*?*/ if (nPnt>nPntMax || (bClosed && nPnt>=nPntMax)) nPnt=0;
-/*?*/ return nPnt;
-/*?*/ }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/*N*/ void SdrPathObj::NbcMove(const Size& rSiz)
/*N*/ {
/*N*/ SdrTextObj::NbcMove(rSiz);
@@ -520,11 +460,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
-/*N*/ bool SdrPathObj::IsPolyObj() const
-/*N*/ {
-/*N*/ return TRUE;
-/*N*/ }
-
/*N*/ USHORT SdrPathObj::GetPointCount() const
/*N*/ {
/*N*/ USHORT nPolyCnt = aPathPolygon.Count();
@@ -574,12 +509,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
-
-
-
-
-
-
/*N*/ SdrObjGeoData* SdrPathObj::NewGeoData() const
/*N*/ {
/*N*/ return new SdrPathObjGeoData;
@@ -663,10 +592,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ // Polygon schliessen (wird dabei um einen Punkt erweitert)
/*N*/ aPathPolygon[nPolyNum][nPointAnz]=aStartPt;
/*N*/ }
-/*N*/ } else {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/
/*N*/ }
/*N*/ }
/*N*/ SetRectsDirty();
@@ -687,13 +613,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
-
-
-
-
-
-
-
////////////////////////////////////////////////////////////////////////////////////////////////////
//
// transformation interface for StarOfficeAPI. This implements support for
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx b/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx
index 1701d79..9377a63 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx
@@ -274,13 +274,6 @@ namespace binfilter {
/*?*/ rXOut.DrawRect(aR,USHORT(2*nEckRad),USHORT(2*nEckRad));
/*?*/ }
/*?*/ }
-/*?*/
-/*?*/ // new shadow line drawing
-/*?*/ if( pLineGeometry.get() )
-/*?*/ {
-/*?*/ // draw the line geometry
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*N*/ }
// Before here the LineAttr were set: if(pLineAttr) rXOut.SetLineAttr(*pLineAttr);
@@ -312,9 +305,6 @@ namespace binfilter {
/*N*/ if (HasText()) {
/*?*/ bOk=SdrTextObj::Paint(rXOut,rInfoRec);
/*N*/ }
-/*N*/ if (bOk && (rInfoRec.nPaintMode & SDRPAINTMODE_GLUEPOINTS) !=0) {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ return bOk;
/*N*/ }
@@ -334,7 +324,7 @@ namespace binfilter {
/*N*/ if (bFilled && nBoundWdt>short(nTol) && nBoundHgt>short(nTol) && Abs(aGeo.nShearWink)<=4500) {
/*N*/ if (!bForceTol && !bTextFrame ) nMyTol=0; // Keine Toleranz noetig hier
/*N*/ }
-/*N*/ if (nWdt>nMyTol && (!bTextFrame || pEdtOutl==NULL)) nMyTol=nWdt; // Bei dicker Umrandung keine Toleranz noetig, ausser wenn bei TextEdit
+/*N*/ if (nWdt > nMyTol ) nMyTol=nWdt; // Bei dicker Umrandung keine Toleranz noetig, ausser wenn bei TextEdit
/*N*/ Rectangle aR(aRect);
/*N*/ if (nMyTol!=0 && bFilled) {
/*N*/ aR.Left ()-=nMyTol;
@@ -424,15 +414,6 @@ namespace binfilter {
/*N*/ }
-
-
-
-
-
-
-
-
-
/*N*/ Pointer SdrRectObj::GetCreatePointer() const
/*N*/ {
/*N*/ if (IsTextFrame()) return Pointer(POINTER_DRAW_TEXT);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
index 8f3cd8c..baca551 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
@@ -71,7 +71,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ SdrTextObj::SdrTextObj():
/*N*/ pOutlinerParaObject(NULL),
-/*N*/ pEdtOutl(NULL),
/*N*/ pFormTextBoundRect(NULL),
/*N*/ eTextKind(OBJ_TEXT)
/*N*/ {
@@ -79,21 +78,12 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ bPortionInfoChecked=FALSE;
/*N*/ bTextFrame=FALSE;
/*N*/ bNoShear=FALSE;
-/*N*/ bNoRotate=FALSE;
/*N*/ bNoMirror=FALSE;
-/*N*/ bDisableAutoWidthOnDragging=FALSE;
-/*N*/
-/*N*/ // #101684#
-/*N*/ mbInEditMode = FALSE;
-/*N*/
-/*N*/ // #108784#
-/*N*/ maTextEditOffset = Point(0, 0);
/*N*/ }
/*N*/ SdrTextObj::SdrTextObj(const Rectangle& rNewRect):
/*N*/ aRect(rNewRect),
/*N*/ pOutlinerParaObject(NULL),
-/*N*/ pEdtOutl(NULL),
/*N*/ pFormTextBoundRect(NULL),
/*N*/ eTextKind(OBJ_TEXT)
/*N*/ {
@@ -101,60 +91,34 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ bPortionInfoChecked=FALSE;
/*N*/ bTextFrame=FALSE;
/*N*/ bNoShear=FALSE;
-/*N*/ bNoRotate=FALSE;
/*N*/ bNoMirror=FALSE;
-/*N*/ bDisableAutoWidthOnDragging=FALSE;
/*N*/ ImpJustifyRect(aRect);
-/*N*/
-/*N*/ // #101684#
-/*N*/ mbInEditMode = FALSE;
-/*N*/
-/*N*/ // #108784#
-/*N*/ maTextEditOffset = Point(0, 0);
/*N*/ }
/*N*/ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind):
/*N*/ pOutlinerParaObject(NULL),
-/*N*/ pEdtOutl(NULL),
/*N*/ pFormTextBoundRect(NULL),
/*N*/ eTextKind(eNewTextKind)
/*N*/ {
/*N*/ bTextSizeDirty=FALSE;
/*N*/ bTextFrame=TRUE;
/*N*/ bNoShear=TRUE;
-/*N*/ bNoRotate=FALSE;
/*N*/ bNoMirror=TRUE;
/*N*/ bPortionInfoChecked=FALSE;
-/*N*/ bDisableAutoWidthOnDragging=FALSE;
-/*N*/
-/*N*/ // #101684#
-/*N*/ mbInEditMode = FALSE;
-/*N*/
-/*N*/ // #108784#
-/*N*/ maTextEditOffset = Point(0, 0);
/*N*/ }
/*N*/ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect):
/*N*/ aRect(rNewRect),
/*N*/ pOutlinerParaObject(NULL),
-/*N*/ pEdtOutl(NULL),
/*N*/ pFormTextBoundRect(NULL),
/*N*/ eTextKind(eNewTextKind)
/*N*/ {
/*N*/ bTextSizeDirty=FALSE;
/*N*/ bTextFrame=TRUE;
/*N*/ bNoShear=TRUE;
-/*N*/ bNoRotate=FALSE;
/*N*/ bNoMirror=TRUE;
/*N*/ bPortionInfoChecked=FALSE;
-/*N*/ bDisableAutoWidthOnDragging=FALSE;
/*N*/ ImpJustifyRect(aRect);
-/*N*/
-/*N*/ // #101684#
-/*N*/ mbInEditMode = FALSE;
-/*N*/
-/*N*/ // #108784#
-/*N*/ maTextEditOffset = Point(0, 0);
/*N*/ }
/*N*/ SdrTextObj::~SdrTextObj()
@@ -226,10 +190,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ const SfxItemSet& rSet = GetItemSet();
/*N*/ BOOL bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
/*N*/
-/*N*/ // #101684#
-/*N*/ BOOL bInEditMOde = IsInEditMode();
-/*N*/
-/*N*/ if(!bInEditMOde && bRet)
+/*N*/ if(bRet)
/*N*/ {
/*N*/ SdrTextAniKind eAniKind = ((SdrTextAniKindItem&)(rSet.Get(SDRATTR_TEXT_ANIKIND))).GetValue();
/*N*/
@@ -254,10 +215,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ const SfxItemSet& rSet = GetItemSet();
/*N*/ SdrTextHorzAdjust eRet = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue();
/*N*/
-/*N*/ // #101684#
-/*N*/ BOOL bInEditMode = IsInEditMode();
-/*N*/
-/*N*/ if(!bInEditMode && eRet == SDRTEXTHORZADJUST_BLOCK)
+/*N*/ if(eRet == SDRTEXTHORZADJUST_BLOCK)
/*N*/ {
/*N*/ SdrTextAniKind eAniKind = ((SdrTextAniKindItem&)(rSet.Get(SDRATTR_TEXT_ANIKIND))).GetValue();
/*N*/
@@ -283,10 +241,9 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ // #103516# Take care for vertical text animation here
/*N*/ const SfxItemSet& rSet = GetItemSet();
/*N*/ SdrTextVertAdjust eRet = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue();
-/*N*/ BOOL bInEditMode = IsInEditMode();
/*N*/
/*N*/ // #103516# Take care for vertical text animation here
-/*N*/ if(!bInEditMode && eRet == SDRTEXTVERTADJUST_BLOCK)
+/*N*/ if(eRet == SDRTEXTVERTADJUST_BLOCK)
/*N*/ {
/*N*/ SdrTextAniKind eAniKind = ((SdrTextAniKindItem&)(rSet.Get(SDRATTR_TEXT_ANIKIND))).GetValue();
/*N*/
@@ -322,26 +279,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ }
-
-/*N*/ bool SdrTextObj::HasEditText() const
-/*N*/ {
-/*N*/ bool bRet=FALSE;
-/*N*/ if (pEdtOutl!=NULL) {
-/*N*/ Paragraph* p1stPara=pEdtOutl->GetParagraph( 0 );
-/*N*/ ULONG nParaAnz=pEdtOutl->GetParagraphCount();
-/*N*/ if (p1stPara==NULL) nParaAnz=0;
-/*N*/ if (nParaAnz==1) { // bei nur einem Para nachsehen ob da ueberhaupt was drin steht
-/*N*/ XubString aStr(pEdtOutl->GetText(p1stPara));
-/*N*/
-/*N*/ // Aha, steht nix drin!
-/*N*/ if(!aStr.Len())
-/*N*/ nParaAnz = 0;
-/*N*/ }
-/*N*/ bRet=nParaAnz!=0;
-/*N*/ }
-/*N*/ return bRet;
-/*N*/ }
-
/*N*/ void SdrTextObj::SetPage(SdrPage* pNewPage)
/*N*/ {
/*N*/ bool bRemove=pNewPage==NULL && pPage!=NULL;
@@ -373,9 +310,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ SdrAttrObj::SetModel(pNewModel);
/*N*/
/*N*/ if (bChg && pOutlinerParaObject!=NULL && pOldModel!=NULL && pNewModel!=NULL) {
-/*?*/ MapUnit aOldUnit(pOldModel->GetScaleUnit());
-/*?*/ MapUnit aNewUnit(pNewModel->GetScaleUnit());
-/*?*/ bool bScaleUnitChanged=aNewUnit!=aOldUnit;
/*?*/ SetTextSizeDirty();
/*?*/ // und nun dem OutlinerParaObject einen neuen Pool verpassen
/*?*/ // !!! Hier muss noch DefTab und RefDevice der beiden Models
@@ -396,8 +330,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*?*/ rOutliner.SetText(*pOutlinerParaObject);
/*?*/ delete pOutlinerParaObject;
/*?*/ pOutlinerParaObject=NULL;
-/*?*/ if (bScaleUnitChanged) {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ SetOutlinerParaObject(rOutliner.CreateParaObject()); // #34494#
/*?*/ pOutlinerParaObject->ClearPortionInfo();
/*?*/ bPortionInfoChecked=FALSE;
@@ -431,15 +363,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ if(bTextFrame)
/*N*/ {
/*N*/ SetItem(SdrTextMinFrameHeightItem(nHgt));
-/*N*/
-/*N*/ // #84974# use bDisableAutoWidthOnDragging as
-/*N*/ // bDisableAutoHeightOnDragging if vertical.
-/*N*/ if(IsVerticalWriting() && bDisableAutoWidthOnDragging)
-/*N*/ {
-/*?*/ bDisableAutoWidthOnDragging = FALSE;
-/*?*/ SetItem(SdrTextAutoGrowHeightItem(FALSE));
-/*N*/ }
-/*N*/
/*N*/ return TRUE;
/*N*/ }
/*?*/ return FALSE;
@@ -452,15 +375,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ if(bTextFrame)
/*N*/ {
/*N*/ SetItem(SdrTextMinFrameWidthItem(nWdt));
-/*N*/
-/*N*/ // #84974# use bDisableAutoWidthOnDragging only
-/*N*/ // when not vertical.
-/*N*/ if(!IsVerticalWriting() && bDisableAutoWidthOnDragging)
-/*N*/ {
-/*?*/ bDisableAutoWidthOnDragging = FALSE;
-/*?*/ SetItem(SdrTextAutoGrowWidthItem(FALSE));
-/*N*/ }
-/*N*/
/*N*/ return TRUE;
/*N*/ }
/*N*/ return FALSE;
@@ -543,10 +457,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ long nWdt=nAnkWdt;
/*N*/ long nHgt=nAnkHgt;
/*N*/
-/*N*/ // #101684#
-/*N*/ BOOL bInEditMode = IsInEditMode();
-/*N*/
-/*N*/ if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE))
+/*N*/ if ( eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE )
/*N*/ {
/*?*/ // Grenzenlose Papiergroesse fuer Laufschrift
/*?*/ if (eAniDirection==SDRTEXTANI_LEFT || eAniDirection==SDRTEXTANI_RIGHT) nWdt=1000000;
@@ -569,14 +480,9 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ }
/*N*/
/*N*/ rOutliner.SetPaperSize(aNullSize);
-/*N*/ if (bContourFrame)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ // Text in den Outliner stecken - ggf. den aus dem EditOutliner
/*N*/ OutlinerParaObject* pPara=pOutlinerParaObject;
-/*N*/ if (pEdtOutl && !bNoEditText)
-/*?*/ pPara=pEdtOutl->CreateParaObject();
-/*N*/
/*N*/ if (pPara)
/*N*/ {
/*N*/ BOOL bHitTest = FALSE;
@@ -599,9 +505,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*?*/ rOutliner.SetTextObj( NULL );
/*N*/ }
/*N*/
-/*N*/ if (pEdtOutl && !bNoEditText && pPara)
-/*?*/ delete pPara;
-/*N*/
/*N*/ rOutliner.SetUpdateMode(TRUE);
/*N*/ rOutliner.SetControlWord(nStat0);
/*N*/
@@ -673,26 +576,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*?*/ rTextRect=aAnkRect;
/*N*/ }
-/*N*/ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const
-/*N*/ {
-/*N*/ OutlinerParaObject* pPara=NULL;
-/*N*/ if (pEdtOutl!=NULL) { // Wird gerade editiert, also das ParaObject aus dem aktiven Editor verwenden
-/*?*/ Paragraph* p1stPara=pEdtOutl->GetParagraph( 0 );
-/*?*/ ULONG nParaAnz=pEdtOutl->GetParagraphCount();
-/*?*/ if (nParaAnz==1 && p1stPara!=NULL) { // bei nur einem Para nachsehen ob da ueberhaupt was drin steht
-/*?*/ XubString aStr(pEdtOutl->GetText(p1stPara));
-/*?*/
-/*?*/ // Aha, steht nix drin!
-/*?*/ if(!aStr.Len())
-/*?*/ nParaAnz = 0;
-/*?*/ }
-/*?*/ if (p1stPara!=NULL && nParaAnz!=0) {
-/*?*/ pPara = pEdtOutl->CreateParaObject(0, (sal_uInt16)nParaAnz);
-/*?*/ }
-/*N*/ }
-/*N*/ return pPara;
-/*N*/ }
-
// Geht z.Zt. nur wenn das Obj schon wenigstens einmal gepaintet wurde
// Denn dann ist der MtfAnimator initiallisiert
@@ -852,18 +735,11 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/
/*N*/ // #101776# Not all of the necessary parameters were copied yet.
/*N*/ bNoShear = pText->bNoShear;
-/*N*/ bNoRotate = pText->bNoRotate;
/*N*/ bNoMirror = pText->bNoMirror;
-/*N*/ bDisableAutoWidthOnDragging = pText->bDisableAutoWidthOnDragging;
/*N*/
/*N*/ if (pOutlinerParaObject!=NULL) delete pOutlinerParaObject;
/*N*/ if (pText->HasText()) {
-/*N*/ const Outliner* pEO=pText->pEdtOutl;
-/*N*/ if (pEO!=NULL) {
-/*?*/ pOutlinerParaObject=pEO->CreateParaObject();
-/*N*/ } else {
-/*N*/ pOutlinerParaObject=pText->pOutlinerParaObject->Clone();
-/*N*/ }
+/*N*/ pOutlinerParaObject=pText->pOutlinerParaObject->Clone();
/*N*/ } else {
/*N*/ pOutlinerParaObject=NULL;
/*N*/ }
@@ -953,10 +829,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
// #101029#: Extracted from Paint()
-/*N*/ void SdrTextObj::SetupOutlinerFormatting( SdrOutliner&, Rectangle& ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ OutlinerParaObject* SdrTextObj::GetOutlinerParaObject() const
/*N*/ {
/*N*/ return pOutlinerParaObject;
@@ -1028,10 +900,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ }
/*N*/ }
-/*N*/ void SdrTextObj::RestartAnimation(SdrPageView*) const
-/*N*/ {
-/*N*/ }
-
/*N*/ void SdrTextObj::SaveGeoData(SdrObjGeoData& rGeo) const
/*N*/ {
/*N*/ SdrAttrObj::SaveGeoData(rGeo);
@@ -1213,8 +1081,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ // #89459#
/*N*/ if(pOutlinerParaObject)
/*N*/ return pOutlinerParaObject->IsVertical();
-/*N*/ if(pEdtOutl)
-/*?*/ return pEdtOutl->IsVertical();
/*N*/ return FALSE;
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx
index 816a8f3..214bc3b 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx
@@ -111,7 +111,7 @@ namespace binfilter {
/*N*/ {
/*N*/ SdrAttrObj::NbcSetStyleSheet(pNewStyleSheet,bDontRemoveHardAttr);
/*N*/
-/*N*/ if ( pOutlinerParaObject && !pEdtOutl && !IsLinkedText() )
+/*N*/ if ( pOutlinerParaObject && !IsLinkedText() )
/*N*/ {
/*N*/ // StyleSheet auf alle Absaetze anwenden
/*N*/ SdrOutliner& rOutliner=ImpGetDrawOutliner();
@@ -199,15 +199,8 @@ namespace binfilter {
/*N*/ {
/*N*/ Outliner* pOutliner;
/*N*/
-/*N*/ if(!pEdtOutl)
-/*N*/ {
-/*N*/ pOutliner = &ImpGetDrawOutliner();
-/*N*/ pOutliner->SetText(*pOutlinerParaObject);
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*?*/ pOutliner = pEdtOutl;
-/*N*/ }
+/*N*/ pOutliner = &ImpGetDrawOutliner();
+/*N*/ pOutliner->SetText(*pOutlinerParaObject);
/*N*/
/*N*/ sal_uInt16 nParaCount((sal_uInt16)pOutliner->GetParagraphCount());
/*N*/ for(sal_uInt16 nPara(0); nPara < nParaCount; nPara++)
@@ -217,18 +210,15 @@ namespace binfilter {
/*N*/ pOutliner->SetParaAttribs(nPara, aSet);
/*N*/ }
/*N*/
-/*N*/ if(!pEdtOutl)
+/*N*/ if(nParaCount)
/*N*/ {
-/*N*/ if(nParaCount)
-/*N*/ {
-/*N*/ SfxItemSet aNewSet(pOutliner->GetParaAttribs(0));
-/*N*/ mpObjectItemSet->Put(aNewSet);
-/*N*/ }
-/*N*/
-/*N*/ OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, nParaCount);
-/*N*/ pOutliner->Clear();
-/*N*/ NbcSetOutlinerParaObject(pTemp);
+/*N*/ SfxItemSet aNewSet(pOutliner->GetParaAttribs(0));
+/*N*/ mpObjectItemSet->Put(aNewSet);
/*N*/ }
+/*N*/
+/*N*/ OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, nParaCount);
+/*N*/ pOutliner->Clear();
+/*N*/ NbcSetOutlinerParaObject(pTemp);
/*N*/ }
/*N*/
/*N*/ // Extra-Repaint wenn das Layout so radikal geaendert wird (#43139#)
@@ -314,41 +304,24 @@ namespace binfilter {
/*N*/ if (aSiz.Width()<2) aSiz.Width()=2; // Mindestgroesse 2
/*N*/ if (aSiz.Height()<2) aSiz.Height()=2; // Mindestgroesse 2
/*N*/
-/*N*/ // #101684#
-/*N*/ BOOL bInEditMode = IsInEditMode();
+/*N*/ if (bHScroll) aSiz.Width() = 0x0FFFFFFF; // Laufschrift nicht umbrechen
+/*N*/ if (bVScroll) aSiz.Height() = 0x0FFFFFFF;
/*N*/
-/*N*/ if(!bInEditMode)
-/*N*/ {
-/*N*/ if (bHScroll) aSiz.Width()=0x0FFFFFFF; // Laufschrift nicht umbrechen
-/*N*/ if (bVScroll) aSiz.Height()=0x0FFFFFFF;
-/*N*/ }
-/*N*/
-/*N*/ if(pEdtOutl)
-/*N*/ {
-/*?*/ pEdtOutl->SetMaxAutoPaperSize(aSiz);
-/*?*/ if (bWdtGrow) {
-/*?*/ Size aLclSiz(pEdtOutl->CalcTextSize());
-/*?*/ nWdt=aLclSiz.Width()+1; // lieber etwas Tolleranz
-/*?*/ if (bHgtGrow) nHgt=aLclSiz.Height()+1; // lieber etwas Tolleranz
-/*?*/ } else {
-/*?*/ nHgt=pEdtOutl->GetTextHeight()+1; // lieber etwas Tolleranz
-/*?*/ }
+/*N*/ Outliner& rOutliner=ImpGetDrawOutliner();
+/*N*/ rOutliner.SetPaperSize(aSiz);
+/*N*/ rOutliner.SetUpdateMode(TRUE);
+/*N*/ // !!! hier sollte ich wohl auch noch mal die Optimierung mit
+/*N*/ // bPortionInfoChecked usw einbauen
+/*N*/ if (pOutlinerParaObject!=NULL) rOutliner.SetText(*pOutlinerParaObject);
+/*N*/ if (bWdtGrow) {
+/*N*/ Size aLclSiz(rOutliner.CalcTextSize());
+/*N*/ nWdt=aLclSiz.Width()+1; // lieber etwas Tolleranz
+/*N*/ if (bHgtGrow) nHgt=aLclSiz.Height()+1; // lieber etwas Tolleranz
/*N*/ } else {
-/*N*/ Outliner& rOutliner=ImpGetDrawOutliner();
-/*N*/ rOutliner.SetPaperSize(aSiz);
-/*N*/ rOutliner.SetUpdateMode(TRUE);
-/*N*/ // !!! hier sollte ich wohl auch noch mal die Optimierung mit
-/*N*/ // bPortionInfoChecked usw einbauen
-/*N*/ if (pOutlinerParaObject!=NULL) rOutliner.SetText(*pOutlinerParaObject);
-/*N*/ if (bWdtGrow) {
-/*N*/ Size aLclSiz(rOutliner.CalcTextSize());
-/*N*/ nWdt=aLclSiz.Width()+1; // lieber etwas Tolleranz
-/*N*/ if (bHgtGrow) nHgt=aLclSiz.Height()+1; // lieber etwas Tolleranz
-/*N*/ } else {
-/*N*/ nHgt=rOutliner.GetTextHeight()+1; // lieber etwas Tolleranz
-/*N*/ }
-/*N*/ rOutliner.Clear();
+/*N*/ nHgt=rOutliner.GetTextHeight()+1; // lieber etwas Tolleranz
/*N*/ }
+/*N*/ rOutliner.Clear();
+
/*N*/ if (nWdt<nMinWdt) nWdt=nMinWdt;
/*N*/ if (nWdt>nMaxWdt) nWdt=nMaxWdt;
/*N*/ nWdt+=nHDist;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdtxhdl.cxx b/binfilter/bf_svx/source/svdraw/svx_svdtxhdl.cxx
index ab51c23..8e7a6e8 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdtxhdl.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdtxhdl.cxx
@@ -77,9 +77,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ bDraw = bDrawEffect;
/*N*/
/*N*/ OutlinerParaObject* pPara=rTextObj.GetOutlinerParaObject();
-/*N*/ if (rTextObj.IsTextEditActive()) {
-/*?*/ pPara=rTextObj.GetEditOutlinerParaObject();
-/*N*/ }
/*N*/ if (pPara!=NULL) {
/*N*/ XPolyPolygon aXPP;
/*N*/ //rTextObj.TakeContour(aXPP);
@@ -131,9 +128,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ rXOut.GetOutDev()->SetFont(aFont);
/*N*/ rOutliner.Clear();
/*N*/ }
-/*N*/ if (rTextObj.IsTextEditActive()) {
-/*?*/ delete pPara;
-/*N*/ }
/*N*/ }
// #101498# Record and sort all portions
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
index 2964776..fbe1845 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
@@ -190,19 +190,6 @@ Any SAL_CALL SvxOle2Shape::getPropertyValue( const OUString& PropertyName ) thro
{
Graphic* pGraphic = pOle->GetGraphic();
- // if there isn't already a preview graphic set, check if we need to generate
- // one if model says so
- if( pGraphic == NULL && !pOle->IsEmptyPresObj() && pModel->IsSaveOLEPreview() )
- {
- const GDIMetaFile* pMetaFile = pOle->GetGDIMetaFile();
- if( pMetaFile )
- {
- Graphic aNewGrf( *pMetaFile );
- pOle->SetGraphic( &aNewGrf );
- pGraphic = pOle->GetGraphic();
- }
- }
-
if( pGraphic )
{
BfGraphicObject aObj( *pGraphic );
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
index 105c868..4706762 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
@@ -2153,22 +2153,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
}
case OWN_ATTR_METAFILE:
{
- if( pObj->ISA(SdrOle2Obj))
- {
- SdrOle2Obj& aObj = *(SdrOle2Obj*)pObj;
-
- if(aObj.HasGDIMetaFile() && aObj.GetGDIMetaFile())
- {
- SvMemoryStream aDestStrm( 65535, 65535 );
-
- ConvertGDIMetaFileToWMF( *aObj.GetGDIMetaFile(), aDestStrm, NULL, sal_False );
- const uno::Sequence<sal_Int8> aSeq(
- static_cast< const sal_Int8* >(aDestStrm.GetData()),
- aDestStrm.GetEndOfData());
- aAny <<= aSeq;
- }
- }
- else
+ if( !pObj->ISA(SdrOle2Obj))
{
aAny = GetBitmap( sal_True );
}
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
index 818e8d9..0fae877 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
@@ -109,11 +109,7 @@ private:
void SetupOutliner();
sal_Bool HasView() const { return mpView ? sal_True : sal_False; }
- sal_Bool IsEditMode() const
- {
- SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject );
- return mbShapeIsEditMode && pTextObj && pTextObj->IsTextEditActive() ? sal_True : sal_False;
- }
+ sal_Bool IsEditMode() const { return sal_False; } // DBG_BF_ASSERT
public:
SvxTextEditSourceImpl( SdrObject* pObject );
@@ -394,7 +390,6 @@ void SvxTextEditSourceImpl::SetupOutliner()
if( pTextObj )
{
Rectangle aBoundRect( pTextObj->GetBoundRect() );
- pTextObj->SetupOutlinerFormatting( *mpOutliner, aPaintRect );
// #101029# calc text offset from shape anchor
maTextOffset = aPaintRect.TopLeft() - aBoundRect.TopLeft();
@@ -459,7 +454,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
BOOL bTextEditActive = FALSE;
SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject );
if( pTextObj )
- mpOutlinerParaObject = pTextObj->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active
+ mpOutlinerParaObject = NULL; // Get the OutlinerParaObject if text edit is active
if( mpOutlinerParaObject )
bTextEditActive = TRUE; // text edit active
@@ -469,13 +464,6 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
if( mpOutlinerParaObject && ( bTextEditActive || !mpObject->IsEmptyPresObj() || mpObject->GetPage()->IsMasterPage() ) )
{
mpOutliner->SetText( *mpOutlinerParaObject );
-
- // #91254# put text to object and set EmptyPresObj to FALSE
- if( pTextObj && bTextEditActive && mpOutlinerParaObject && mpObject->IsEmptyPresObj() && pTextObj->IsRealyEdited() )
- {
- mpObject->SetEmptyPresObj( FALSE );
- pTextObj->SetOutlinerParaObject( mpOutlinerParaObject );
- }
}
else
{
@@ -813,10 +801,7 @@ Point SvxTextEditSourceImpl::PixelToLogic( const Point& rPoint, const MapMode& r
return Point();
}
-IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify*, EMPTYARG)
-{
- return 0;
-}
+IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify*, EMPTYARG) { return 0; } // DBG_BF_ASSERT
//------------------------------------------------------------------------
diff --git a/binfilter/inc/bf_svx/svdoedge.hxx b/binfilter/inc/bf_svx/svdoedge.hxx
index b0220f9..91c4f1d 100644
--- a/binfilter/inc/bf_svx/svdoedge.hxx
+++ b/binfilter/inc/bf_svx/svdoedge.hxx
@@ -197,7 +197,7 @@ public:
virtual UINT16 GetObjIdentifier() const;
virtual const Rectangle& GetBoundRect() const;
virtual const Rectangle& GetSnapRect() const;
- virtual bool IsNode() const;
+ virtual bool IsNode() const { return true; } // DBG_BF_ASSERT
virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
// ItemSet access
@@ -231,8 +231,7 @@ public:
virtual void NbcSetAnchorPos(const Point& rPnt);
- virtual void NbcSetPoint(const Point& rPnt, USHORT i);
-
+ virtual void NbcSetPoint(const Point&, USHORT ) {} // DBG_BF_ASSERT
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
virtual void AfterRead();
diff --git a/binfilter/inc/bf_svx/svdomeas.hxx b/binfilter/inc/bf_svx/svdomeas.hxx
index d7af16c..f40d10e 100644
--- a/binfilter/inc/bf_svx/svdomeas.hxx
+++ b/binfilter/inc/bf_svx/svdomeas.hxx
@@ -44,21 +44,6 @@ struct ImpMeasureRec;
struct ImpMeasurePoly;
//************************************************************
-// Hilfsklasse SdrMeasureObjGeoData
-//************************************************************
-
-class SdrMeasureObjGeoData : public SdrTextObjGeoData
-{
-public:
- Point aPt1;
- Point aPt2;
-
-public:
- SdrMeasureObjGeoData();
- virtual ~SdrMeasureObjGeoData();
-};
-
-//************************************************************
// SdrMeasureObj
//************************************************************
@@ -91,11 +76,6 @@ public:
virtual UINT16 GetObjIdentifier() const;
virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
-
-
-
-
-
virtual void NbcMove(const Size& rSiz);
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual long GetRotateAngle() const;
@@ -107,7 +87,7 @@ public:
virtual void NbcSetPoint(const Point& rPnt, USHORT i);
- virtual bool BegTextEdit(SdrOutliner& rOutl);
+ virtual bool BegTextEdit(SdrOutliner& rOutl) { return false; } // DBG_BF_ASSERT
virtual void EndTextEdit(SdrOutliner& rOutl);
virtual const Size& GetTextSize() const;
virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText=FALSE,
diff --git a/binfilter/inc/bf_svx/svdoole2.hxx b/binfilter/inc/bf_svx/svdoole2.hxx
index 5750135..d6f6fa5 100644
--- a/binfilter/inc/bf_svx/svdoole2.hxx
+++ b/binfilter/inc/bf_svx/svdoole2.hxx
@@ -127,10 +127,6 @@ public:
virtual void NbcSetSnapRect(const Rectangle& rRect);
virtual void NbcSetLogicRect(const Rectangle& rRect);
- // fuer Import:
- bool HasGDIMetaFile() const;
- const GDIMetaFile* GetGDIMetaFile() const;
-
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
BOOL Unload();
diff --git a/binfilter/inc/bf_svx/svdopath.hxx b/binfilter/inc/bf_svx/svdopath.hxx
index cce4324..302b269 100644
--- a/binfilter/inc/bf_svx/svdopath.hxx
+++ b/binfilter/inc/bf_svx/svdopath.hxx
@@ -111,7 +111,7 @@ public:
virtual void NbcShear(const Point& rRefPnt, double fTan, bool bVShear);
- virtual bool IsPolyObj() const;
+ virtual bool IsPolyObj() const { return true; } // DBG_BF_ASSERT
virtual USHORT GetPointCount() const;
virtual const Point& GetPoint(USHORT nHdlNum) const;
virtual void NbcSetPoint(const Point& rPnt, USHORT nHdlNum);
@@ -129,21 +129,11 @@ public:
void SetPathPoly(const XPolyPolygon& rPathPoly);
void NbcSetPathPoly(const XPolyPolygon& rPathPoly);
- // Man stecke die Handlenummer rein und bekomme die Polygon- und Punktnummer
- // des zugehoerigen Punkts im XPolyPolygon.
- bool TakePolyIdxForHdlNum(USHORT nHdlNum, USHORT& rPolyNum, USHORT& rPointNum) const { return FindPolyPnt(nHdlNum,rPolyNum,rPointNum,FALSE); }
-
// Spezialfunktionen fuer Bezierpolygon-Bearbeitung
static bool IsClosed(SdrObjKind eKind) { return eKind==OBJ_POLY || eKind==OBJ_PATHPOLY || eKind==OBJ_PATHFILL || eKind==OBJ_FREEFILL || eKind==OBJ_SPLNFILL; }
static bool IsLine(SdrObjKind eKind) { return eKind==OBJ_PLIN || eKind==OBJ_PATHPLIN || eKind==OBJ_PATHLINE || eKind==OBJ_FREELINE || eKind==OBJ_SPLNLINE || eKind==OBJ_LINE; }
- static bool IsFreeHand(SdrObjKind eKind) { return eKind==OBJ_FREELINE || eKind==OBJ_FREEFILL; }
- static bool IsBezier(SdrObjKind eKind) { return eKind==OBJ_PATHLINE || eKind==OBJ_PATHFILL; }
- static bool IsSpline(SdrObjKind eKind) { return eKind==OBJ_SPLNLINE || eKind==OBJ_SPLNFILL; }
bool IsClosed() const { return eKind==OBJ_POLY || eKind==OBJ_PATHPOLY || eKind==OBJ_PATHFILL || eKind==OBJ_FREEFILL || eKind==OBJ_SPLNFILL; }
bool IsLine() const { return eKind==OBJ_PLIN || eKind==OBJ_PATHPLIN || eKind==OBJ_PATHLINE || eKind==OBJ_FREELINE || eKind==OBJ_SPLNLINE || eKind==OBJ_LINE; }
- bool IsFreeHand() const { return eKind==OBJ_FREELINE || eKind==OBJ_FREEFILL; }
- bool IsBezier() const { return eKind==OBJ_PATHLINE || eKind==OBJ_PATHFILL; }
- bool IsSpline() const { return eKind==OBJ_SPLNLINE || eKind==OBJ_SPLNFILL; }
////////////////////////////////////////////////////////////////////////////////////////////////////
//
diff --git a/binfilter/inc/bf_svx/svdotext.hxx b/binfilter/inc/bf_svx/svdotext.hxx
index 224b6b2..e74cb1a 100644
--- a/binfilter/inc/bf_svx/svdotext.hxx
+++ b/binfilter/inc/bf_svx/svdotext.hxx
@@ -130,12 +130,6 @@ protected:
// Hier merke ich mir die Ausmasse des Textes (n.i.)
Size aTextSize;
- // Ein Outliner*, damit
- // 1. das TextObj nicht von mehreren Views gleichzeitig editiert und
- // 2. beim Streamen waerend des Editierens ein Flush() ausgefuehrt
- // werden kann
- SdrOutliner* pEdtOutl;
-
// Bei Fontwork muss soviel auf's BoundRect draufgerechnet werden
// damit es ausreichend gross ist.
Rectangle* pFormTextBoundRect;
@@ -149,16 +143,6 @@ protected:
// um ein beschriftetes Grafikobjekt handelt.
SdrObjKind eTextKind;
- // #108784#
- // For text editing in SW Haeder/Footer it is necessary to be
- // able to set an offset for the text edit to allow text editing at the
- // position of the virtual object. This offset is used when setting up
- // and maintaining the OutlinerView.
- Point maTextEditOffset;
-public:
- const Point& GetTextEditOffset() const { return maTextEditOffset; }
- void SetTextEditOffset(const Point& rNew) { maTextEditOffset = rNew; }
-
protected:
// Fuer beschriftete Zeichenobjekte ist bTextFrame=FALSE. Der Textblock
// wird dann hoizontal und vertikal an aRect zentriert. Bei bTextFrame=
@@ -167,24 +151,9 @@ protected:
BOOL bTextFrame : 1;
BOOL bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten
BOOL bNoShear : 1; // Obj darf nicht gesheart werden (->Graf+Ole+TextFrame)
- BOOL bNoRotate : 1; // Obj darf nicht gedreht werden (->Ole)
BOOL bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame)
BOOL bTextSizeDirty : 1;
- // #101684#
- BOOL mbInEditMode : 1; // Is this text obejct in edit mode?
-
- // Fuer Objekt mit freier Groesse im Draw (Mengentext). Das Flag wird vom
- // der App beim Create gesetzt.
- // Wenn das Objekt dann spaeter in der Breite resized wird, wird
- // AutoGrowWidth abgeschaltet (Hart auf FALSE attributiert). Das Flag wird
- // dann ebenfalls auf FALSE gesetzt, sodass sich das Objekt anschliessend
- // wie ein normales Textobjekt verhaelt.
- // Resize in der Breite kann sein:
- // - Interaktives Resize in Einfach- oder Mehrfachselektion
- // - Positions+Groesse Dialog
- BOOL bDisableAutoWidthOnDragging : 1;
-
private:
void ImpCheckMasterCachable();
// #101029#: Extracted from ImpGetDrawOutliner()
@@ -194,7 +163,6 @@ private:
void ImpLinkAnmeldung();
void ImpLinkAbmeldung();
ImpSdrObjTextLinkUserData* GetLinkUserData() const;
-// void ImpCheckItemSetChanges(const SfxItemSet& rAttr);
protected:
bool ImpCanConvTextToCurve() const { return pOutlinerParaObject!=NULL && pModel!=NULL && !IsOutlText() && !IsFontwork(); }
@@ -230,9 +198,6 @@ protected:
public:
TYPEINFO();
- // #101684#
- BOOL IsInEditMode() const { return mbInEditMode; }
-
// via eCharSet kann der CharSet der vorliegenden Datei uebergeben werden.
// Bei RTL_TEXTENCODING_DONTKNOW wird der CharSet der aktuellen Plattform verwendet.
// Derzeit unterstuetzt wird ASCII und RTF wobei ich die Unterscheidung
@@ -251,15 +216,7 @@ public:
bool IsTextFrame() const { return bTextFrame; }
bool IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); }
BOOL GetTextKind() const { return eTextKind; }
- bool HasText() const { return pEdtOutl==NULL ? pOutlinerParaObject!=NULL : HasEditText(); }
- bool HasEditText() const;
- bool IsTextEditActive() const { return pEdtOutl!=NULL; }
-
- /** returns true only if we are in edit mode and the user actually changed anything */
- bool IsRealyEdited(){DBG_BF_ASSERT(0, "STRIP"); return false;}
-
- void SetDisableAutoWidthOnDragging(bool bOn) { bDisableAutoWidthOnDragging=bOn; }
- bool IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; }
+ bool HasText() const { return pOutlinerParaObject != NULL; }
// FitToSize und Fontwork wird bei GetTextSize() nicht berueksichtigt!
virtual const Size& GetTextSize() const;
@@ -269,7 +226,6 @@ public:
virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText=FALSE,
Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const;
- const GeoStat& GetGeoStat() const { return aGeo; }
inline long GetEckenradius() const;
bool IsAutoGrowHeight() const;
inline long GetMinTextFrameHeight() const;
@@ -331,15 +287,12 @@ public:
virtual void EndTextEdit(SdrOutliner& rOutl);
virtual SdrObject* CheckTextEditHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const;
- bool IsTextAnimated() const { return GetTextAniKind()!=SDRTEXTANI_NONE; }
-
virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
virtual OutlinerParaObject* GetOutlinerParaObject() const;
- OutlinerParaObject* GetEditOutlinerParaObject() const;
virtual void NbcReformatText();
virtual void ReformatText();
- virtual void RestartAnimation(SdrPageView* pPageView) const;
+ virtual void RestartAnimation(SdrPageView*) const {} // DBG_BF_ASSERT
virtual bool CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const;
@@ -354,40 +307,6 @@ public:
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
- void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; }
-
- /** Setup given Outliner equivalently to SdrTextObj::Paint()
-
- To setup an arbitrary Outliner in the same way as the draw
- outliner on SdrTextObj::Paint(). Among others, the paper size,
- control word and character stretching are initialized, such
- that the formatting should match the screen representation.
- The textual content of the outliner is not touched, i.e. no
- Init() or Clear() is called on the Outliner.
-
- @param rOutl
- The Outliner to setup.
-
- @param rPaintRect
- The region to paint the outliner content into. This is useful
- to e.g. determine the top, left position of text in shapes.
- */
- void SetupOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const;
-
- /** Update given Outliner equivalently to SdrTextObj::Paint()
-
- Same functionality as in SetupOutlinerFormatting(), except
- that the outliner content is not cleared.
-
- @param rOutl
- The Outliner to update.
-
- @param rPaintRect
- The region to paint the outliner content into. This is useful
- to e.g. determine the top, left position of text in shapes.
- */
- void UpdateOutlinerFormatting( SdrOutliner& /*rOutl*/, Rectangle& /*rPaintRect*/ ){DBG_BF_ASSERT(0, "STRIP");}
-
void ForceOutlinerParaObject();
BOOL IsVerticalWriting() const;
void SetVerticalWriting( BOOL bVertical );
@@ -408,10 +327,6 @@ public:
// to use (0,0) as upper left and will be scaled to the given size in the matrix.
virtual void TRSetBaseGeometry(const Matrix3D& rMat, const XPolyPolygon& rPolyPolygon);
- // #103836# iterates over the paragraphs of a given SdrObject and removes all
- // hard set character attributes with the which ids contained in the
- // given vector
- void RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>& rCharWhichIds );
};
//************************************************************
More information about the Libreoffice-commits
mailing list