[Libreoffice-commits] .: 3 commits - sw/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Fri Mar 4 23:41:41 PST 2011
sw/source/core/inc/notxtfrm.hxx | 5
sw/source/core/unocore/unocrsrhelper.cxx | 78 ++---------
sw/source/core/unocore/unodraw.cxx | 219 ++++++++++---------------------
sw/source/core/unocore/unofield.cxx | 8 -
sw/source/core/unocore/unoidx.cxx | 15 --
sw/source/core/unocore/unomap.cxx | 83 +----------
sw/source/core/unocore/unosect.cxx | 30 ----
sw/source/core/unocore/unosett.cxx | 28 ---
8 files changed, 130 insertions(+), 336 deletions(-)
New commits:
commit 526f967122f2233f348b0a2dd882a80d3d3388cc
Author: David Nalley <david at gnsa.us>
Date: Fri Mar 4 20:46:43 2011 +0100
comment cleanup on unocore stuf
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 9bbe817..62b6862 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -61,7 +61,7 @@
#include <fmtornt.hxx>
#include <fmtanchr.hxx>
#include <fmtsrnd.hxx>
-// OD 2004-04-21 #i26791#
+// #i26791#
#include <fmtfollowtextflow.hxx>
#include <rootfrm.hxx>
#include <editeng/lrspitem.hxx>
@@ -105,37 +105,33 @@ class SwShapeDescriptor_Impl
SvxLRSpaceItem* pLRSpace;
sal_Bool bOpaque;
uno::Reference< text::XTextRange > xTextRange;
- // OD 2004-04-21 #i26791#
+ // #i26791#
SwFmtFollowTextFlow* mpFollowTextFlow;
- // OD 2004-05-05 #i28701# - add property 'WrapInfluenceOnObjPos'
+ // #i28701#
SwFmtWrapInfluenceOnObjPos* pWrapInfluenceOnObjPos;
- // --> OD 2004-08-06 #i28749#
+ // #i28749#
sal_Int16 mnPositionLayoutDir;
- // <--
public:
bool bInitializedPropertyNotifier;
public:
SwShapeDescriptor_Impl() :
- // --> OD 2004-08-18 #i32349# - no defaults, in order to determine on
+ // #i32349# - no defaults, in order to determine on
// adding a shape, if positioning attributes are set or not.
pHOrient( 0L ),
pVOrient( 0L ),
- // <--
pAnchor(0),
pSurround(0),
pULSpace(0),
pLRSpace(0),
bOpaque(sal_False),
- // OD 2004-04-21 #i26791#
+ // #i26791#
mpFollowTextFlow( new SwFmtFollowTextFlow( FALSE ) ),
- // OD 2004-05-05 #i28701#
- // --> OD 2004-10-18 #i35017# - constant name has changed
+ // #i28701# #i35017#
pWrapInfluenceOnObjPos( new SwFmtWrapInfluenceOnObjPos(
text::WrapInfluenceOnPosition::ONCE_CONCURRENT ) ),
- // <--
- // --> OD 2004-08-06 #i28749#
+ // #i28749#
mnPositionLayoutDir( text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
bInitializedPropertyNotifier(false)
{}
@@ -148,9 +144,9 @@ public:
delete pSurround;
delete pULSpace;
delete pLRSpace;
- // OD 2004-04-22 #i26791#
+ // #i26791#
delete mpFollowTextFlow;
- // OD 2004-05-05 #i28701#
+ // #i28701#
delete pWrapInfluenceOnObjPos;
}
SwFmtAnchor* GetAnchor(sal_Bool bCreate = sal_False)
@@ -165,7 +161,7 @@ public:
{
if (bCreate && !pHOrient)
{
- // OD 2004-06-03 #i26791# - change default
+ // #i26791#
pHOrient = new SwFmtHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::FRAME );
}
return pHOrient;
@@ -174,7 +170,7 @@ public:
{
if(bCreate && !pVOrient)
{
- // OD 2004-04-21 #i26791# - change default
+ // #i26791#
pVOrient = new SwFmtVertOrient( 0, text::VertOrientation::NONE, text::RelOrientation::FRAME );
}
return pVOrient;
@@ -218,7 +214,7 @@ public:
void RemoveLRSpace(){DELETEZ(pLRSpace);}
void SetOpaque(sal_Bool bSet){bOpaque = bSet;}
- // OD 2004-04-21 #i26791#
+ // #i26791#
SwFmtFollowTextFlow* GetFollowTextFlow( sal_Bool _bCreate = sal_False )
{
if ( _bCreate && !mpFollowTextFlow )
@@ -230,7 +226,7 @@ public:
DELETEZ(mpFollowTextFlow);
}
- // --> OD 2004-08-06 #i28749#
+ // #i28749#
sal_Int16 GetPositionLayoutDir() const
{
return mnPositionLayoutDir;
@@ -256,18 +252,16 @@ public:
{
mnPositionLayoutDir = text::PositionLayoutDir::PositionInLayoutDirOfAnchor;
}
- // <--
- // OD 2004-05-05 #i28701#
+ // #i28701#
inline SwFmtWrapInfluenceOnObjPos* GetWrapInfluenceOnObjPos(
const sal_Bool _bCreate = sal_False )
{
if ( _bCreate && !pWrapInfluenceOnObjPos )
{
pWrapInfluenceOnObjPos = new SwFmtWrapInfluenceOnObjPos(
- // --> OD 2004-10-18 #i35017# - constant name has changed
+ // #i35017#
text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
- // <--
}
return pWrapInfluenceOnObjPos;
}
@@ -629,7 +623,6 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
throw aExcept;
}
- // --> OD, HB
if ( pSvxShape->GetSdrObject() )
{
if ( pSvxShape->GetSdrObject()->IsInserted() )
@@ -637,7 +630,6 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
return;
}
}
- // <--
GetSvxPage()->add(xShape);
uno::Reference< uno::XAggregation > xAgg = pShape->GetAggregationInterface();
@@ -669,27 +661,25 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
if(pDesc->GetAnchor())
aAnchor = *pDesc->GetAnchor();
- // --> OD 2004-08-18 #i32349# - if no horizontal position exists, create one
+ // #i32349# - if no horizontal position exists, create one
if ( !pDesc->GetHOrient() )
{
SwFmtHoriOrient* pHori = pDesc->GetHOrient( sal_True );
SwTwips nHoriPos = MM100_TO_TWIP(aMM100Pos.X);
pHori->SetPos( nHoriPos );
}
- // <--
{
if(pDesc->GetHOrient()->GetHoriOrient() == text::HoriOrientation::NONE)
aMM100Pos.X = TWIP_TO_MM100(pDesc->GetHOrient()->GetPos());
aSet.Put( *pDesc->GetHOrient() );
}
- // --> OD 2004-08-18 #i32349# - if no vertical position exists, create one
+ // #i32349# - if no vertical position exists, create one
if ( !pDesc->GetVOrient() )
{
SwFmtVertOrient* pVert = pDesc->GetVOrient( sal_True );
SwTwips nVertPos = MM100_TO_TWIP(aMM100Pos.Y);
pVert->SetPos( nVertPos );
}
- // <--
{
if(pDesc->GetVOrient()->GetVertOrient() == text::VertOrientation::NONE)
aMM100Pos.Y = TWIP_TO_MM100(pDesc->GetVOrient()->GetPos());
@@ -700,13 +690,13 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
aSet.Put( *pDesc->GetSurround());
bOpaque = pDesc->IsOpaque();
- // OD 2004-04-22 #i26791#
+ // #i26791#
if ( pDesc->GetFollowTextFlow() )
{
aSet.Put( *pDesc->GetFollowTextFlow() );
}
- // OD 2004-05-05 #i28701#
+ // #i28701#
if ( pDesc->GetWrapInfluenceOnObjPos() )
{
aSet.Put( *pDesc->GetWrapInfluenceOnObjPos() );
@@ -715,7 +705,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
pSvxShape->setPosition(aMM100Pos);
SdrObject* pObj = pSvxShape->GetSdrObject();
- // OD 25.06.2003 #108784# - set layer of new drawing object to corresponding
+ // #108784# - set layer of new drawing object to corresponding
// invisible layer.
if(FmFormInventor != pObj->GetObjInventor())
pObj->SetLayer( bOpaque ? pDoc->GetInvisibleHeavenId() : pDoc->GetInvisibleHellId() );
@@ -750,14 +740,14 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
pDoc->GetRootFrm()->GetCrsrOfst( pPam->GetPoint(), aTmp, &aState );
aAnchor.SetAnchor( pPam->GetPoint() );
- // --> OD 2004-08-18 #i32349# - adjustment of vertical positioning
+ // #i32349# - adjustment of vertical positioning
// attributes no longer needed, because its already got a default.
}
else
{
aAnchor.SetType(FLY_AT_PAGE);
- // --> OD 2004-08-18 #i32349# - adjustment of vertical positioning
+ // #i32349# - adjustment of vertical positioning
// attributes no longer needed, because its already got a default.
}
aSet.Put(aAnchor);
@@ -867,9 +857,8 @@ SwFmDrawPage* SwXDrawPage::GetSvxPage()
if(!xPageAgg.is() && pDoc)
{
SolarMutexGuard aGuard;
- // --> OD 2005-08-08 #i52858# - method name changed
+ // #i52858#
SdrModel* pModel = pDoc->GetOrCreateDrawModel();
- // <--
SdrPage* pPage = pModel->GetPage( 0 );
{
@@ -949,7 +938,7 @@ SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) :
uno::Any aAgg = xShape->queryInterface(rAggType);
if(aAgg.getValueType() == rAggType)
xShapeAgg = *(uno::Reference< uno::XAggregation >*)aAgg.getValue();
- // --> OD 2004-07-23 #i31698#
+ // #i31698#
if ( xShapeAgg.is() )
{
xShapeAgg->queryAggregation( ::getCppuType((uno::Reference< drawing::XShape >*)0) ) >>= mxShape;
@@ -1030,7 +1019,7 @@ SwXShape::~SwXShape()
uno::Any SwXShape::queryInterface( const uno::Type& aType ) throw( uno::RuntimeException )
{
uno::Any aRet = SwXShapeBaseClass::queryInterface(aType);
- // --> OD 2005-08-15 #i53320# - follow-up of #i31698#
+ // #i53320# - follow-up of #i31698#
// interface drawing::XShape is overloaded. Thus, provide
// correct object instance.
if(!aRet.hasValue() && xShapeAgg.is())
@@ -1040,7 +1029,6 @@ uno::Any SwXShape::queryInterface( const uno::Type& aType ) throw( uno::RuntimeE
else
aRet = xShapeAgg->queryAggregation(aType);
}
- // <--
return aRet;
}
@@ -1189,7 +1177,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
if(pSvxShape)
{
SdrObject* pObj = pSvxShape->GetSdrObject();
- // OD 25.06.2003 #108784# - set layer of new drawing
+ // set layer of new drawing
// object to corresponding invisible layer.
bool bIsVisible = pDoc->IsVisibleLayerId( pObj->GetLayer() );
if(FmFormInventor != pObj->GetObjInventor())
@@ -1206,7 +1194,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
}
}
- // OD 2004-04-22 #i26791# - special handling for property FN_TEXT_RANGE
+ // #i26791# - special handling for property FN_TEXT_RANGE
else if ( FN_TEXT_RANGE == pEntry->nWID )
{
SwFmtAnchor aAnchor( static_cast<const SwFmtAnchor&>(aSet.Get( RES_ANCHOR )) );
@@ -1267,14 +1255,13 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
delete pInternalPam;
}
}
- // --> OD 2004-08-06 #i28749#
+ // #i28749#
else if ( FN_SHAPE_POSITION_LAYOUT_DIR == pEntry->nWID )
{
sal_Int16 nPositionLayoutDir = 0;
aValue >>= nPositionLayoutDir;
pFmt->SetPositionLayoutDir( nPositionLayoutDir );
}
- // <--
else if( pDoc->GetRootFrm() )
{
UnoActionContext aCtx(pDoc);
@@ -1413,19 +1400,19 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
case RES_OPAQUE :
pImpl->SetOpaque(*(sal_Bool*)aValue.getValue());
break;
- // OD 2004-04-22 #i26791#
+ // #i26791#
case RES_FOLLOW_TEXT_FLOW:
{
pItem = pImpl->GetFollowTextFlow( sal_True );
}
break;
- // OD 2004-05-05 #i28701#
+ // #i28701#
case RES_WRAP_INFLUENCE_ON_OBJPOS:
{
pItem = pImpl->GetWrapInfluenceOnObjPos( sal_True );
}
break;
- // --> OD 2004-08-06 #i28749#
+ // #i28749#
case FN_SHAPE_POSITION_LAYOUT_DIR :
{
sal_Int16 nPositionLayoutDir = 0;
@@ -1433,7 +1420,6 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
pImpl->SetPositionLayoutDir( nPositionLayoutDir );
}
break;
- // <--
}
if(pItem)
((SfxPoolItem*)pItem)->PutValue(aValue, pEntry->nMemberId);
@@ -1448,7 +1434,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
if(aPSet.getValueType() != rPSetType || !aPSet.getValue())
throw uno::RuntimeException();
xPrSet = *(uno::Reference< beans::XPropertySet >*)aPSet.getValue();
- // --> OD 2004-08-05 #i31698# - setting the caption point of a
+ // #i31698# - setting the caption point of a
// caption object doesn't have to change the object position.
// Thus, keep the position, before the caption point is set and
// restore it afterwards.
@@ -1458,7 +1444,6 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
{
aKeepedPosition = getPosition();
}
- // <--
if( pFmt && pFmt->GetDoc()->GetRootFrm() )
{
UnoActionContext aCtx(pFmt->GetDoc());
@@ -1497,7 +1482,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
if(pSvxShape)
{
SdrObject* pObj = pSvxShape->GetSdrObject();
- // OD 02.07.2003 #108784# - consider invisible layers
+ // consider invisible layers
sal_Bool bOpaque =
( pObj->GetLayer() != pFmt->GetDoc()->GetHellId() &&
pObj->GetLayer() != pFmt->GetDoc()->GetInvisibleHellId() );
@@ -1517,7 +1502,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
aRet.setValue(&aPoint, ::getCppuType( (awt::Point*)0 ));
}
}
- // OD 2004-04-22 #i26791# - special handling for FN_TEXT_RANGE
+ // #i26791# - special handling for FN_TEXT_RANGE
else if ( FN_TEXT_RANGE == pEntry->nWID )
{
const SwFmtAnchor aAnchor = pFmt->GetAnchor();
@@ -1547,7 +1532,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
}
}
}
- // --> OD 2004-08-06 #i28749#
+ // #i28749#
else if ( FN_SHAPE_TRANSFORMATION_IN_HORI_L2R == pEntry->nWID )
{
// get property <::drawing::Shape::Transformation>
@@ -1558,8 +1543,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
{
aRet <<= pFmt->GetPositionLayoutDir();
}
- // <--
- // --> OD 2004-10-28 #i36248#
+ // #i36248#
else if ( FN_SHAPE_STARTPOSITION_IN_HORI_L2R == pEntry->nWID )
{
// get property <::drawing::Shape::StartPosition>
@@ -1572,7 +1556,6 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
// without conversion to layout direction as below
aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition")) );
}
- // <--
else
{
const SwAttrSet& rSet = pFmt->GetAttrSet();
@@ -1614,19 +1597,19 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
aRet.setValue(&aPoint, ::getCppuType( (awt::Point*)0 ));
}
break;
- // OD 2004-04-22 #i26791#
+ // #i26791#
case RES_FOLLOW_TEXT_FLOW :
{
pItem = pImpl->GetFollowTextFlow();
}
break;
- // OD 2004-05-05 #i28701#
+ // #i28701#
case RES_WRAP_INFLUENCE_ON_OBJPOS:
{
pItem = pImpl->GetWrapInfluenceOnObjPos();
}
break;
- // --> OD 2004-08-06 #i28749#
+ // #i28749#
case FN_SHAPE_TRANSFORMATION_IN_HORI_L2R:
{
// get property <::drawing::Shape::Transformation>
@@ -1639,8 +1622,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
aRet <<= pImpl->GetPositionLayoutDir();
}
break;
- // <--
- // --> OD 2004-08-06 #i36248#
+ // #i36248#
case FN_SHAPE_STARTPOSITION_IN_HORI_L2R:
{
// get property <::drawing::Shape::StartPosition>
@@ -1655,7 +1637,6 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition")) );
}
break;
- // <--
}
if(pItem)
pItem->QueryValue(aRet, pEntry->nMemberId);
@@ -1665,7 +1646,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
{
aRet = _getPropAtAggrObj( rPropertyName );
- // --> OD 2004-07-28 #i31698# - convert the position (translation)
+ // #i31698# - convert the position (translation)
// of the drawing object in the transformation
if ( rPropertyName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation"))) )
{
@@ -1673,43 +1654,35 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
aRet >>= aMatrix;
aRet <<= _ConvertTransformationToLayoutDir( aMatrix );
}
- // <--
- // --> OD 2004-10-28 #i36248#
+ // #i36248#
else if ( rPropertyName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition"))) )
{
awt::Point aStartPos;
aRet >>= aStartPos;
- // --> OD 2009-01-12 #i59051#
+ // #i59051#
aRet <<= _ConvertStartOrEndPosToLayoutDir( aStartPos );
- // <--
}
else if ( rPropertyName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition"))) )
{
awt::Point aEndPos;
aRet >>= aEndPos;
- // --> OD 2009-01-12 #i59051#
+ // #i59051#
aRet <<= _ConvertStartOrEndPosToLayoutDir( aEndPos );
- // <--
}
- // --> OD 2009-01-16 #i59051#
+ // #i59051#
else if ( rPropertyName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PolyPolygonBezier"))) )
{
drawing::PolyPolygonBezierCoords aPath;
aRet >>= aPath;
aRet <<= _ConvertPolyPolygonBezierToLayoutDir( aPath );
- // <--
}
- // <--
}
}
return aRet;
}
/** method to get property from aggregation object
-
- OD 2004-10-28 #i36248#
-
- @author OD
+ #i36248#
*/
uno::Any SwXShape::_getPropAtAggrObj( const ::rtl::OUString& _rPropertyName )
throw( beans::UnknownPropertyException, lang::WrappedTargetException,
@@ -1812,7 +1785,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates(
case RES_SURROUND:
pItem = pImpl->GetSurround();
break;
- // OD 2004-05-05 #i28701#
+ // #i28701#
case RES_WRAP_INFLUENCE_ON_OBJPOS:
{
pItem = pImpl->GetWrapInfluenceOnObjPos();
@@ -1877,13 +1850,13 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName )
case RES_OPAQUE : pImpl->SetOpaque(sal_False); break;
case FN_TEXT_RANGE :
break;
- // OD 2004-04-22 #i26791#
+ // #i26791#
case RES_FOLLOW_TEXT_FLOW:
{
pImpl->RemoveFollowTextFlow();
}
break;
- // OD 2004-05-05 #i28701#
+ // #i28701#
case RES_WRAP_INFLUENCE_ON_OBJPOS:
{
pImpl->RemoveWrapInfluenceOnObjPos();
@@ -2091,29 +2064,25 @@ void SwXShape::dispose(void) throw( uno::RuntimeException )
SwFrmFmt* pFmt = GetFrmFmt();
if(pFmt)
{
- // OD 10.07.2003 #110742# - determine correct <SdrObject>
- //SdrObject* pObj = pFmt->FindSdrObject();
+ // determine correct <SdrObject>
SdrObject* pObj = GetSvxShape()->GetSdrObject();
- // OD 10.07.2003 #110742# - safety assertion:
+ // safety assertion:
// <pObj> must be the same as <pFmt->FindSdrObject()>, if <pObj> isn't
// a 'virtual' drawing object.
- // OD 25.08.2003 #111713# - refine assertion for safety reason.
- // --> OD 2005-02-02 #119236# - correct assertion and refine it.
+ // correct assertion and refine it for safety reason.
OSL_ENSURE( !pObj ||
pObj->ISA(SwDrawVirtObj) ||
pObj->GetUpGroup() ||
pObj == pFmt->FindSdrObject(),
"<SwXShape::dispose(..) - different 'master' drawing objects!!" );
- // <--
- // OD 10.07.2003 #110742# - perform delete of draw frame format *not*
+ // perform delete of draw frame format *not*
// for 'virtual' drawing objects.
- // --> OD 2005-02-02 #119236# - no delete of draw format for members
+ // no delete of draw format for members
// of a group
if ( pObj &&
!pObj->ISA(SwDrawVirtObj) &&
!pObj->GetUpGroup() &&
pObj->IsInserted() )
- // <--
{
if (pFmt->GetAnchor().GetAnchorId() == FLY_AS_CHAR)
{
@@ -2205,7 +2174,7 @@ SvxShape* SwXShape::GetSvxShape()
return pSvxShape;
}
-// --> OD 2004-07-22 #i31698# -
+// #i31698#
// implementation of virtual methods from drawing::XShape
awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException )
{
@@ -2218,7 +2187,7 @@ awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException )
SdrObject* pTopGroupObj = _GetTopGroupObj( pSvxShape );
if ( pTopGroupObj )
{
- // --> OD 2004-10-01 #i34750# - get attribute position of top group
+ // #i34750# - get attribute position of top group
// shape and add offset between top group object and group member
uno::Reference< drawing::XShape > xGroupShape =
uno::Reference< drawing::XShape >( pTopGroupObj->getUnoShape(),
@@ -2226,23 +2195,21 @@ awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException )
aPos = xGroupShape->getPosition();
// add offset between top group object and group member
// to the determined attribute position
- // --> OD 2004-10-01 #i34750# - correction:
+ // #i34750#:
// consider the layout direction
const Rectangle aMemberObjRect = GetSvxShape()->GetSdrObject()->GetSnapRect();
const Rectangle aGroupObjRect = pTopGroupObj->GetSnapRect();
- // --> OD 2005-08-16 #i53320# - relative position of group member and
+ // #i53320# - relative position of group member and
// top group object is always given in horizontal left-to-right layout.
awt::Point aOffset( 0, 0 );
{
aOffset.X = ( aMemberObjRect.Left() - aGroupObjRect.Left() );
aOffset.Y = ( aMemberObjRect.Top() - aGroupObjRect.Top() );
}
- // <--
aOffset.X = TWIP_TO_MM100(aOffset.X);
aOffset.Y = TWIP_TO_MM100(aOffset.Y);
aPos.X += aOffset.X;
aPos.Y += aOffset.Y;
- // <--
}
}
@@ -2255,12 +2222,12 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition )
SdrObject* pTopGroupObj = _GetTopGroupObj();
if ( !pTopGroupObj )
{
- // --> OD 2005-02-10 #i37877# - no adjustment of position attributes,
+ // #i37877# - no adjustment of position attributes,
// if the position also has to be applied at the drawing object and
// a contact object is already registered at the drawing object.
bool bApplyPosAtDrawObj(false);
bool bNoAdjustOfPosProp(false);
- // --> OD 2004-10-19 #i35798# - apply position also to drawing object,
+ // #i35798# - apply position also to drawing object,
// if drawing object has no anchor position set.
if ( mxShape.is() )
{
@@ -2281,7 +2248,6 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition )
}
}
}
- // <--
// shape isn't a group member. Thus, set positioning attributes
if ( !bNoAdjustOfPosProp )
{
@@ -2291,7 +2257,6 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition )
{
mxShape->setPosition( aPosition );
}
- // <--
}
else if ( mxShape.is() )
{
@@ -2311,20 +2276,19 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition )
uno::Reference< drawing::XShape >( pTopGroupObj->getUnoShape(),
uno::UNO_QUERY );
{
- // --> OD 2004-09-29 #i34750# - correction:
+ // #i34750#
// use method <xGroupShape->getPosition()> to get the correct
// position of the top group object.
awt::Point aAttrPosInHoriL2R(
_ConvertPositionToHoriL2R( xGroupShape->getPosition(),
xGroupShape->getSize() ) );
- // <--
aNewPos.X -= aAttrPosInHoriL2R.X;
aNewPos.Y -= aAttrPosInHoriL2R.Y;
}
// convert relative position in horizontal left-to-right layout into
// absolute position in horizontal left-to-right layout
{
- // --> OD 2004-10-01 #i34750# - correction:
+ // #i34750#
// use method <SvxShape->getPosition()> to get the correct
// 'Drawing layer' position of the top group shape.
uno::Reference< lang::XUnoTunnel > xGrpShapeTunnel(
@@ -2335,7 +2299,6 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition )
const awt::Point aGroupPos = pSvxGroupShape->getPosition();
aNewPos.X += aGroupPos.X;
aNewPos.Y += aGroupPos.Y;
- // <--
}
// set position
mxShape->setPosition( aNewPos );
@@ -2361,8 +2324,7 @@ void SAL_CALL SwXShape::setSize( const awt::Size& aSize )
mxShape->setSize( aSize );
}
}
-// <--
-// --> OD 2004-07-22 #i31698# -
+// #i31698#
// implementation of virtual methods from drawing::XShapeDescriptor
::rtl::OUString SAL_CALL SwXShape::getShapeType() throw ( uno::RuntimeException )
{
@@ -2373,12 +2335,8 @@ void SAL_CALL SwXShape::setSize( const awt::Size& aSize )
}
return aType;
}
-// <--
/** method to determine top group object
-
- OD 2004-08-03 #i31698#
-
- @author OD
+ #i31698#
*/
SdrObject* SwXShape::_GetTopGroupObj( SvxShape* _pSvxShape )
{
@@ -2402,10 +2360,7 @@ SdrObject* SwXShape::_GetTopGroupObj( SvxShape* _pSvxShape )
}
/** method to determine position according to the positioning attributes
-
- OD 2004-08-03 #i31698#
-
- @author OD
+ #i31698#
*/
awt::Point SwXShape::_GetAttrPosition()
{
@@ -2415,7 +2370,7 @@ awt::Point SwXShape::_GetAttrPosition()
aHoriPos >>= aAttrPos.X;
uno::Any aVertPos( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")) ) );
aVertPos >>= aAttrPos.Y;
- // --> OD 2004-10-19 #i35798# - fallback, if attribute position is (0,0)
+ // #i35798# - fallback, if attribute position is (0,0)
// and no anchor position is applied to the drawing object
SvxShape* pSvxShape = GetSvxShape();
if ( pSvxShape )
@@ -2431,8 +2386,7 @@ awt::Point SwXShape::_GetAttrPosition()
aAttrPos.Y = TWIP_TO_MM100(aObjRect.Top());
}
}
- // <--
- // --> OD 2004-11-10 #i35007# - If drawing object is anchored as-character,
+ // #i35007# - If drawing object is anchored as-character,
// it's x-position isn't sensible. Thus, return the x-position as zero in this case.
text::TextContentAnchorType eTextAnchorType =
text::TextContentAnchorType_AT_PARAGRAPH;
@@ -2445,17 +2399,13 @@ awt::Point SwXShape::_GetAttrPosition()
{
aAttrPos.X = 0;
}
- // <--
return aAttrPos;
}
/** method to convert the position (translation) of the drawing object to
the layout direction horizontal left-to-right.
-
- OD 2004-07-27 #i31698#
-
- @author OD
+ #i31698#
*/
awt::Point SwXShape::_ConvertPositionToHoriL2R( const awt::Point _aObjPos,
const awt::Size _aObjSize )
@@ -2497,17 +2447,14 @@ awt::Point SwXShape::_ConvertPositionToHoriL2R( const awt::Point _aObjPos,
/** method to convert the transformation of the drawing object to the layout
direction, the drawing object is in
-
- OD 2004-07-27 #i31698#
-
- @author OD
+ #i31698#
*/
drawing::HomogenMatrix3 SwXShape::_ConvertTransformationToLayoutDir(
drawing::HomogenMatrix3 _aMatrixInHoriL2R )
{
drawing::HomogenMatrix3 aMatrix( _aMatrixInHoriL2R );
- // --> OD 2005-03-10 #i44334#, #i44681# - direct manipulation of the
+ // #i44334#, #i44681# - direct manipulation of the
// tranformation structure isn't valid, if it contains rotation.
SvxShape* pSvxShape = GetSvxShape();
OSL_ENSURE( pSvxShape,
@@ -2533,9 +2480,8 @@ drawing::HomogenMatrix3 SwXShape::_ConvertTransformationToLayoutDir(
// apply translation difference to transformation matrix.
if ( aTranslateDiff.X != 0 || aTranslateDiff.Y != 0 )
{
- // --> OD 2007-01-03 #i73079# - use correct matrix type
+ // #i73079# - use correct matrix type
::basegfx::B2DHomMatrix aTempMatrix;
- // <--
aTempMatrix.set(0, 0, aMatrix.Line1.Column1 );
aTempMatrix.set(0, 1, aMatrix.Line1.Column2 );
@@ -2546,11 +2492,8 @@ drawing::HomogenMatrix3 SwXShape::_ConvertTransformationToLayoutDir(
aTempMatrix.set(2, 0, aMatrix.Line3.Column1 );
aTempMatrix.set(2, 1, aMatrix.Line3.Column2 );
aTempMatrix.set(2, 2, aMatrix.Line3.Column3 );
-
- // --> OD 2007-01-03 #i73079#
+ // #i73079#
aTempMatrix.translate( aTranslateDiff.X, aTranslateDiff.Y );
- // <--
-
aMatrix.Line1.Column1 = aTempMatrix.get(0, 0);
aMatrix.Line1.Column2 = aTempMatrix.get(0, 1);
aMatrix.Line1.Column3 = aTempMatrix.get(0, 2);
@@ -2563,21 +2506,17 @@ drawing::HomogenMatrix3 SwXShape::_ConvertTransformationToLayoutDir(
}
}
}
- // <--
return aMatrix;
}
/** method to adjust the positioning properties
-
- OD 2004-08-02 #i31698#
-
- @author OD
+ #i31698#
*/
void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition )
{
// handle x-position
- // --> OD 2004-11-10 #i35007# - no handling of x-position, if drawing
+ // #i35007# - no handling of x-position, if drawing
// object is anchored as-character, because it doesn't make sense.
text::TextContentAnchorType eTextAnchorType =
text::TextContentAnchorType_AT_PARAGRAPH;
@@ -2587,7 +2526,6 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition )
aAny >>= eTextAnchorType;
}
if ( eTextAnchorType != text::TextContentAnchorType_AS_CHARACTER )
- // <--
{
// determine current x-postion
rtl::OUString aHoriPosPropStr( RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition") );
@@ -2650,10 +2588,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition )
/** method to convert start or end position of the drawing object to the
Writer specific position, which is the attribute position in layout direction
-
- OD 2009-01-12 #i59051#
-
- @author OD
+ #i59051#
*/
::com::sun::star::awt::Point SwXShape::_ConvertStartOrEndPosToLayoutDir(
const ::com::sun::star::awt::Point& aStartOrEndPos )
@@ -2815,7 +2750,7 @@ void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::Ru
if(pObj)
{
SwDoc* pDoc = pFmt->GetDoc();
- // OD 25.06.2003 #108784# - set layer of new drawing
+ // set layer of new drawing
// object to corresponding invisible layer.
if( FmFormInventor != pObj->GetObjInventor())
{
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 8e5b76d..450fa07 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -35,9 +35,8 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/text/PageNumberType.hpp>
#include <com/sun/star/script/XLibraryContainer.hpp>
-// --> OD 2004-08-06 #i28749#
+// #i28749#
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
-// <--
#include <swtypes.hxx>
#include <unomap.hxx>
#include <unoprnms.hxx>
@@ -144,7 +143,7 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
{ SW_PROP_NMID(UNO_NAME_PARA_IS_NUMBERING_RESTART), FN_NUMBER_NEWSTART, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0 }, \
{ SW_PROP_NMID(UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE), FN_UNO_PARA_CONT_PREV_SUBTREE, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0 }, \
{ SW_PROP_NMID(UNO_NAME_PARA_LIST_LABEL_STRING), FN_UNO_PARA_NUM_STRING, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0 }, \
- { SW_PROP_NMID(UNO_NAME_OUTLINE_LEVEL), RES_PARATR_OUTLINELEVEL, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0}, //#outline level, zhaojianwei
+ { SW_PROP_NMID(UNO_NAME_OUTLINE_LEVEL), RES_PARATR_OUTLINELEVEL, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0},
#define COMMON_HYPERLINK_PROPERTIES \
{ SW_PROP_NMID(UNO_NAME_HYPER_LINK_U_R_L), RES_TXTATR_INETFMT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_URL_URL}, \
@@ -288,9 +287,7 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
#define ANCHOR_TYPES_PROPERTY { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPES), FN_UNO_ANCHOR_TYPES, CPPU_E2T(CPPUTYPE_SEQANCHORTYPE),PropertyAttribute::READONLY, 0xff},
-// OD 18.09.2003 #i18732# - add property
-// OD 2004-05-05 #i28701# - add property 'WrapInfluenceOnObjPos'
-// OD 2009-07-13 #i73249# - add properties 'Title' and 'Description'
+// #i18732# #i28701# #i73249#
#define COMMON_FRAME_PROPERTIES \
{ SW_PROP_NMID(UNO_NAME_ANCHOR_PAGE_NO), RES_ANCHOR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_ANCHOR_PAGENUM }, \
{ SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), RES_ANCHOR, CPPU_E2T(CPPUTYPE_TXTCNTANCHOR), PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE}, \
@@ -372,8 +369,6 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
{ SW_PROP_NMID(UNO_NAME_CHAR_DIFF_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE , CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},
-//#outline level, zhaojianwei delete { SW_PROP_NMID(UNO_NAME_DEFAULT_OUTLINE_LEVEL), FN_UNO_DEFAULT_OUTLINE_LEVEL, CPPU_E2T(CPPUTYPE_INT8), PropertyAttribute::MAYBEVOID, 0},
-//add { SW_PROP_NMID(UNO_NAME_OUTLINE_LEVEL), RES_PARATR_OUTLINELEVEL,CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0},
#define COMMON_PARA_STYLE_PROPERTIES \
{ SW_PROP_NMID(UNO_NAME_BREAK_TYPE), RES_BREAK, CPPU_E2T(CPPUTYPE_BREAK), PROPERTY_NONE, 0},\
{ SW_PROP_NMID(UNO_NAME_PAGE_DESC_NAME), RES_PAGEDESC, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGEDESCNAME },\
@@ -527,7 +522,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL), FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, 0}, \
{ SW_PROP_NMID(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME), RES_FRMATR_CONDITIONAL_STYLE_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0}, \
{ SW_PROP_NMID(UNO_NAME_PARA_IS_NUMBERING_RESTART), FN_NUMBER_NEWSTART, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0 }, \
- { SW_PROP_NMID(UNO_NAME_OUTLINE_LEVEL), RES_PARATR_OUTLINELEVEL, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0}, //#outline level,zhaojianwei
+ { SW_PROP_NMID(UNO_NAME_OUTLINE_LEVEL), RES_PARATR_OUTLINELEVEL, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0},
COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN
TABSTOPS_MAP_ENTRY
COMMON_TEXT_CONTENT_PROPERTIES
@@ -681,9 +676,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- // --> OD 2005-06-06 #i50322# - add missing map entry for transparency of graphic background
+ // #i50322# - add missing map entry for transparency of graphic background
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_TRANSPARENCY), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENCY},
- // <--
{ SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
{ SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
{ SW_PROP_NMID(UNO_NAME_HORI_ORIENT), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_HORIORIENT_ORIENT },
@@ -735,9 +729,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_IS_AUTO_UPDATE), FN_UNO_IS_AUTO_UPDATE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- // OD 18.09.2003 #i18732#
+ // #i18732#
{ SW_PROP_NMID(UNO_NAME_IS_FOLLOWING_TEXT_FLOW), RES_FOLLOW_TEXT_FLOW, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- // OD 2004-05-05 #i28701#
+ // #i28701#
{ SW_PROP_NMID(UNO_NAME_WRAP_INFLUENCE_ON_POSITION), RES_WRAP_INFLUENCE_ON_OBJPOS, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_WRAP_INFLUENCE},
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
{0,0,0,0,0,0}
@@ -916,9 +910,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_TABLE_NAME), FN_UNO_TABLE_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_PAGE_STYLE_NAME), RES_PAGEDESC, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- // --> collapsing borders DVO, FME 2005-05-27 #i29550#
+ // #i29550#
{ SW_PROP_NMID(UNO_NAME_COLLAPSING_BORDERS), RES_COLLAPSING_BORDERS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- // <-- collapsing
_REDLINE_NODE_PROPERTIES
{0,0,0,0,0,0}
};
@@ -970,17 +963,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PropertyAttribute::MAYBEVOID|PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_POSITION},
{ SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID|PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_TRANSPARENT },
{ SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), RES_BOXATR_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID ,0 },
- // commented properties already found in
- // COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01
-// { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BORDER_DISTANCE|CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
{ SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_VERTORIENT_ORIENT },
{ SW_PROP_NMID(UNO_NAME_CHART_ROW_AS_LABEL), FN_UNO_RANGE_ROW_LABEL, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0},
{ SW_PROP_NMID(UNO_NAME_CHART_COLUMN_AS_LABEL), FN_UNO_RANGE_COL_LABEL, CPPU_E2T(CPPUTYPE_BOOLEAN) , PropertyAttribute::MAYBEVOID, 0},
@@ -1002,9 +984,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_FILE_LINK), WID_SECT_LINK , CPPU_E2T(CPPUTYPE_SECTFILELNK), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_IS_VISIBLE), WID_SECT_VISIBLE , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_SECT_PROTECTED, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- // --> FME 2004-06-22 #114856# edit in readonly sections
{ SW_PROP_NMID(UNO_NAME_EDIT_IN_READONLY), WID_SECT_EDIT_IN_READONLY, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- // <--
{ SW_PROP_NMID(UNO_NAME_LINK_REGION), WID_SECT_REGION , CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
@@ -1036,10 +1016,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
_REDLINE_NODE_PROPERTIES
{ SW_PROP_NMID(UNO_NAME_IS_CURRENTLY_VISIBLE), WID_SECT_CURRENTLY_VISIBLE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
- /* -> #109700# */
{ SW_PROP_NMID(UNO_NAME_SECT_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS}, \
{ SW_PROP_NMID(UNO_NAME_SECT_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS}, \
- /* <- #1097001# */
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aSectionPropertyMap_Impl;
@@ -1052,7 +1030,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_SEARCH_ALL), WID_SEARCH_ALL, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_SEARCH_BACKWARDS), WID_BACKWARDS, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_SEARCH_CASE_SENSITIVE), WID_CASE_SENSITIVE, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_SEARCH_IN_SELECTION), WID_IN_SELECTION, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_SEARCH_REGULAR_EXPRESSION), WID_REGULAR_EXPRESSION, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY), WID_SIMILARITY, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_ADD), WID_SIMILARITY_ADD, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
@@ -1076,7 +1053,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_CHAIN_PREV_NAME), RES_CHAIN, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_CHAIN_PREVNAME},
/*not impl*/ { SW_PROP_NMID(UNO_NAME_CLIENT_MAP), RES_URL, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_URL_CLIENTMAP },
{ SW_PROP_NMID(UNO_NAME_EDIT_IN_READONLY), RES_EDIT_IN_READONLY, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_GRAPHIC), RES_BACKGROUND, &, PROPERTY_NONE, MID_GRAPHIC
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
//next elements are part of the service description
{ SW_PROP_NMID(UNO_NAME_FRAME_HEIGHT_ABSOLUTE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS },
@@ -1107,7 +1083,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_GRAPHIC_FILTER), FN_UNO_GRAPHIC_FILTER, CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0 },
{ SW_PROP_NMID(UNO_NAME_GRAPHIC), FN_UNO_GRAPHIC, CPPU_E2T(CPPUTYPE_REFXGRAPHIC), 0, 0 },
{ SW_PROP_NMID(UNO_NAME_ACTUAL_SIZE), FN_UNO_ACTUAL_SIZE, CPPU_E2T(CPPUTYPE_AWTSIZE), PropertyAttribute::READONLY, CONVERT_TWIPS},
-// { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), FN_UNO_ALTERNATIVE_TEXT,CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE , 0 },
{ SW_PROP_NMID(UNO_NAME_CONTOUR_POLY_POLYGON), FN_PARAM_COUNTOUR_PP, CPPU_E2T(CPPUTYPE_PNTSEQSEQ), PropertyAttribute::MAYBEVOID, 0 },
{ SW_PROP_NMID(UNO_NAME_IS_PIXEL_CONTOUR), FN_UNO_IS_PIXEL_CONTOUR, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_CONTOUR), FN_UNO_IS_AUTOMATIC_CONTOUR , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
@@ -1142,7 +1117,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_GRAPHIC_URL), FN_UNO_REPLACEMENT_GRAPHIC_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0 },
{ SW_PROP_NMID(UNO_NAME_GRAPHIC), FN_UNO_REPLACEMENT_GRAPHIC, CPPU_E2T(CPPUTYPE_REFXGRAPHIC), PropertyAttribute::MAYBEVOID, 0 },
{ SW_PROP_NMID(UNO_NAME_COMPONENT),FN_UNO_COMPONENT, CPPU_E2T(CPPUTYPE_REFCOMPONENT), PropertyAttribute::READONLY, 0},
-// { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), FN_UNO_ALTERNATIVE_TEXT,CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE , 0 },
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aEmbeddedPropertyMap_Impl;
@@ -1173,11 +1147,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_TEXT_RANGE), FN_TEXT_RANGE, CPPU_E2T(CPPUTYPE_REFTXTRANGE), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_OPAQUE), RES_OPAQUE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_ANCHOR_POSITION), FN_ANCHOR_POSITION, CPPU_E2T(CPPUTYPE_AWTPOINT), PropertyAttribute::READONLY, 0},
- // OD 2004-05-04 #i26791#
+ // #i26791#
{ SW_PROP_NMID(UNO_NAME_IS_FOLLOWING_TEXT_FLOW), RES_FOLLOW_TEXT_FLOW, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- // --> OD 2004-06-29 #i28701#
+ // #i28701#
{ SW_PROP_NMID(UNO_NAME_WRAP_INFLUENCE_ON_POSITION), RES_WRAP_INFLUENCE_ON_OBJPOS, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_WRAP_INFLUENCE},
- // --> OD 2004-08-06 #i28749#
+ // #i28749#
{ SW_PROP_NMID( UNO_NAME_TRANSFORMATION_IN_HORI_L2R),
FN_SHAPE_TRANSFORMATION_IN_HORI_L2R,
CPPU_E2T(CPPUTYPE_TRANSFORMATIONINHORIL2R),
@@ -1186,8 +1160,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
FN_SHAPE_POSITION_LAYOUT_DIR,
CPPU_E2T(CPPUTYPE_INT16),
PROPERTY_NONE, 0},
- // <--
- // --> OD 2004-10-28 #i36248#
+ // #i36248#
{ SW_PROP_NMID( UNO_NAME_STARTPOSITION_IN_HORI_L2R),
FN_SHAPE_STARTPOSITION_IN_HORI_L2R,
CPPU_E2T(CPPUTYPE_AWTPOINT),
@@ -1196,11 +1169,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
FN_SHAPE_ENDPOSITION_IN_HORI_L2R,
CPPU_E2T(CPPUTYPE_AWTPOINT),
PropertyAttribute::READONLY, 0},
- // <--
- // --> OD 2006-11-09 #i71182#
+ // #i71182#
// missing map entry for property <PageToogle>
{ SW_PROP_NMID(UNO_NAME_PAGE_TOGGLE), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },
- // <--
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aShapeMap_Impl;
@@ -1263,7 +1234,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_USE_DASH), WID_USE_DASH , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_USE_UPPER_CASE), WID_USE_UPPER_CASE , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_??? ), WID_??? , &_getReflection , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_MAIN_ENTRY_CHARACTER_STYLE_NAME), WID_MAIN_ENTRY_CHARACTER_STYLE_NAME , CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
@@ -1294,14 +1264,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_LEVEL), WID_LEVEL , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_MARKS), WID_CREATE_FROM_MARKS , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_OUTLINE), WID_CREATE_FROM_OUTLINE , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_PARAGRAPH_STYLE_NAMES), WID_PARAGRAPH_STYLE_NAMES , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_LEVEL_PARAGRAPH_STYLES), WID_LEVEL_PARAGRAPH_STYLES , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES), WID_CREATE_FROM_PARAGRAPH_STYLES, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_RECALC_TAB_STOPS), WID_RECALC_TAB_STOPS , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_??? ), WID_??? , &_getReflection , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
@@ -1332,7 +1299,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
_BASE_INDEX_PROPERTIES_
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_MARKS), WID_CREATE_FROM_MARKS , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_PARAGRAPH_STYLE_NAMES), WID_PARAGRAPH_STYLE_NAMES , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE,0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_USE_LEVEL_FROM_SOURCE), WID_USE_LEVEL_FROM_SOURCE , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
@@ -1462,8 +1428,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_SIZE_TYPE },
{ SW_PROP_NMID(UNO_NAME_WIDTH_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_WIDTH_TYPE },
{ SW_PROP_NMID(UNO_NAME_IS_SPLIT_ALLOWED), RES_ROW_SPLIT, CPPU_E2T(CPPUTYPE_BOOLEAN) , PropertyAttribute::MAYBEVOID, 0},
- // { SW_PROP_NMID(UNO_NAME_HEIGHT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS },
- // { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
{0,0,0,0,0,0}
};
@@ -1485,17 +1449,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
{ SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), RES_BOXATR_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID ,0 },
{ SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_GRAPHIC_TRANSPARENT },
- // commented ones are already part of
- // COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01:
-// { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BORDER_DISTANCE|CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
-// { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
{ SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
{ SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
{ SW_PROP_NMID(UNO_NAME_IS_PROTECTED), RES_PROTECT, CPPU_E2T(CPPUTYPE_BOOLEAN), 0, MID_PROTECT_CONTENT},
@@ -1591,9 +1544,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_LOCK_UPDATES), WID_DOC_LOCK_UPDATES, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_HAS_VALID_SIGNATURES), WID_DOC_HAS_VALID_SIGNATURES, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_BUILDID), WID_DOC_BUILDID, CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0},
- // --> OD 2006-03-21 #b6375613#
{ SW_PROP_NMID(UNO_NAME_APPLY_WORKAROUND_FOR_B6375613), WID_APPLY_WORKAROUND_FOR_B6375613, CPPU_E2T(CPPUTYPE_BOOLEAN), 0, 0},
- // <--
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aDocMap_Impl;
@@ -1688,9 +1639,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
COMMON_HYPERLINK_PROPERTIES
{ SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAME), RES_TXTATR_CHARFMT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0},
{ SW_PROP_NMID(UNO_NAME_IS_SPLIT_ALLOWED), RES_ROW_SPLIT, CPPU_E2T(CPPUTYPE_BOOLEAN) , PropertyAttribute::MAYBEVOID, 0},
- // --> collapsing borders DVO, FME 2005-05-27 #i29550#
+ // #i29550#
{ SW_PROP_NMID(UNO_NAME_COLLAPSING_BORDERS), RES_COLLAPSING_BORDERS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- // <-- collapsing
//text grid enhancement for better CJK support. 2007-04-01
//just export the default page mode property, other properties are not handled in this version
@@ -3102,11 +3052,6 @@ const SfxItemPropertySet* SwUnoPropertyMapProvider::GetPropertySet( sal_uInt16
sal_Bool SwItemPropertySet::FillItem(SfxItemSet& /*rSet*/, sal_uInt16 /*nWhich*/, sal_Bool /*bGetProperty*/) const
{
sal_Bool bRet = sal_False;
-/* if(nWhich == SID_ATTR_PAGE_PAPERBIN)
- {
- rSet.Put(SvxPaperBinItem(SID_ATTR_PAGE_PAPERBIN, 0));
- bRet = sal_True;
- }*/
return bRet;
}
commit a69d89753ea5f45d9fa4f335165b6e4e5e304cc3
Author: David Nalley <david at gnsa.us>
Date: Fri Mar 4 18:18:09 2011 +0100
Comment cleanup writer (part1)
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 5d9c41c..bae97f2 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -86,9 +86,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-// --> OD 2008-11-26 #158694#
#include <SwNodeNum.hxx>
-// <--
#include <fmtmeta.hxx>
@@ -135,7 +133,7 @@ GetNestedTextContent(SwTxtNode & rTextNode, xub_StrLen const nIndex,
}
/* --------------------------------------------------
-* Lesen spezieller Properties am Cursor
+ * Read the special properties of the cursor
* --------------------------------------------------*/
sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
, SwPaM& rPam
@@ -149,7 +147,6 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
sal_Bool bDone = sal_True;
switch(rEntry.nWID)
{
- // --> OD 2008-11-26 #158694#
case FN_UNO_PARA_CONT_PREV_SUBTREE:
if (pAny)
{
@@ -187,24 +184,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
*pAny <<= OUString(sRet);
}
break;
- // <--
- // --> OD 2008-05-20 #outlinelevel# - no longer needed
-// case FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL:
-// if (pAny)
-// {
-// const SwTxtNode * pTmpNode = pNode;
-
-// if (!pTmpNode)
-// pTmpNode = rPam.GetNode()->GetTxtNode();
-
-// sal_Int8 nRet = -1;
-// if (pTmpNode && pTmpNode->GetOutlineLevel() != NO_NUMBERING)
-// nRet = sal::static_int_cast< sal_Int8 >(pTmpNode->GetOutlineLevel());
-// *pAny <<= nRet;
-// }
-// break;
- // <--
- case RES_PARATR_OUTLINELEVEL: //#outlinelevel added by zhaojianwei
+ case RES_PARATR_OUTLINELEVEL:
if (pAny)
{
const SwTxtNode * pTmpNode = pNode;
@@ -218,7 +198,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
*pAny <<= nRet;
}
- break; //<-end,zhaojianwei
+ break;
case FN_UNO_PARA_CONDITIONAL_STYLE_NAME:
case FN_UNO_PARA_STYLE :
{
@@ -263,16 +243,13 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
break;
case FN_UNO_NUM_LEVEL :
case FN_UNO_IS_NUMBER :
- // --> OD 2008-07-14 #i91601#
+ // #i91601#
case FN_UNO_LIST_ID:
- // <--
case FN_NUMBER_NEWSTART:
{
// a multi selection is not considered
const SwTxtNode* pTxtNd = rPam.GetNode()->GetTxtNode();
- // --> OD 2010-01-13 #b6912256#
if ( pTxtNd && pTxtNd->IsInList() )
- // <--
{
if( pAny )
{
@@ -283,13 +260,12 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
BOOL bIsNumber = pTxtNd->IsCountedInList();
pAny->setValue(&bIsNumber, ::getBooleanCppuType());
}
- // --> OD 2008-07-14 #i91601#
+ // #i91601#
else if ( rEntry.nWID == FN_UNO_LIST_ID )
{
const String sListId = pTxtNd->GetListId();
*pAny <<= OUString(sListId);
}
- // <--
else /*if(rEntry.nWID == UNO_NAME_PARA_IS_NUMBERING_RESTART)*/
{
BOOL bIsRestart = pTxtNd->IsListRestart();
@@ -308,7 +284,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
*pAny <<= static_cast<sal_Int16>( 0 );
else if(rEntry.nWID == FN_UNO_IS_NUMBER)
*pAny <<= false;
- // --> OD 2008-07-14 #i91601#
+ // #i91601#
else if ( rEntry.nWID == FN_UNO_LIST_ID )
{
*pAny <<= OUString();
@@ -349,7 +325,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
}
}
else
- //auch hier - nicht zu unterscheiden
+ //also here - indistinguishable
eNewState = PropertyState_DEFAULT_VALUE;
}
break;
@@ -393,16 +369,6 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
eNewState = PropertyState_DEFAULT_VALUE;
}
break;
-/* laesst sich nicht feststellen
-* case FN_UNO_BOOKMARK:
- {
- if()
- {
- uno::Reference< XBookmark > xBkm = SwXBookmarks::GetObject(rBkm);
- rAny.set(&xBkm, ::getCppuType((const XBookmark*)0)());
- }
- }
- break;*/
case FN_UNO_TEXT_TABLE:
case FN_UNO_CELL:
{
@@ -589,7 +555,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
}
break;
case RES_TXTATR_CHARFMT:
- // kein break hier!
+ // no break here!
default: bDone = sal_False;
}
if( bDone )
@@ -647,7 +613,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
else
{
- // CharStyle besorgen und an der Rule setzen
+ // get CharStyle and set the rule
sal_uInt16 nChCount = pDoc->GetCharFmts()->Count();
SwCharFmt* pCharFmt = 0;
for(sal_uInt16 nCharFmt = 0; nCharFmt < nChCount; nCharFmt++)
@@ -665,7 +631,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
SfxStyleSheetBasePool* pPool = pDoc->GetDocShell()->GetStyleSheetPool();
SfxStyleSheetBase* pBase;
pBase = pPool->Find(pNewCharStyles[i], SFX_STYLE_FAMILY_CHAR);
- // soll das wirklich erzeugt werden?
+ // shall it really be created?
if(!pBase)
pBase = &pPool->Make(pNewCharStyles[i], SFX_STYLE_FAMILY_PAGE);
pCharFmt = ((SwDocStyleSheet*)pBase)->GetCharFmt();
@@ -674,7 +640,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
aFmt.SetCharFmt(pCharFmt);
}
}
- //jetzt nochmal fuer Fonts
+ //Now again for fonts
if(
pBulletFontNames[i] != SwXNumberingRules::GetInvalidStyle() &&
(
@@ -698,7 +664,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
}
UnoActionContext aAction(pDoc);
- if( rPam.GetNext() != &rPam ) // Mehrfachselektion ?
+ if( rPam.GetNext() != &rPam ) // Multiple selection?
{
pDoc->StartUndo( UNDO_START, NULL );
SwPamRanges aRangeArr( rPam );
@@ -727,7 +693,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
// no start of a new list
pDoc->SetNumRule( rPam, *pRule, false );
}
- // --> OD 2009-08-18 #i103817#
+ // #i103817#
// outline numbering
else
{
@@ -737,7 +703,6 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
throw RuntimeException();
pDoc->SetNumRule( rPam, *pRule, false );
}
- // <--
}
}
else if(rValue.getValueType() == ::getVoidCppuType())
@@ -768,7 +733,7 @@ void GetCurPageStyle(SwPaM& rPaM, String &rString)
}
/* --------------------------------------------------
- * spezielle Properties am Cursor zuruecksetzen
+ * reset special properties of the cursor
* --------------------------------------------------*/
void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam)
{
@@ -784,7 +749,7 @@ void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPa
{
UnoActionContext aAction(pDoc);
- if( rPam.GetNext() != &rPam ) // Mehrfachselektion ?
+ if( rPam.GetNext() != &rPam ) // Multiple selection?
{
pDoc->StartUndo( UNDO_START, NULL );
SwPamRanges aRangeArr( rPam );
@@ -917,8 +882,8 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
SfxObjectShellRef aRef( pDocSh );
pDocSh->RegisterTransfer( *pMed );
- pMed->DownLoad(); // ggfs. den DownLoad anstossen
- if( aRef.Is() && 1 < aRef->GetRefCount() ) // noch gueltige Ref?
+ pMed->DownLoad(); // if necessary: start the download
+ if( aRef.Is() && 1 < aRef->GetRefCount() ) // Ref still valid?
{
SwReader* pRdr;
SfxItemSet* pSet = pMed->GetItemSet();
@@ -937,7 +902,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
SwNodeIndex aSave( pUnoCrsr->GetPoint()->nNode, -1 );
xub_StrLen nCntnt = pUnoCrsr->GetPoint()->nContent.GetIndex();
- sal_uInt32 nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen
+ sal_uInt32 nErrno = pRdr->Read( *pRead ); // and paste the document
if(!nErrno)
{
@@ -953,13 +918,6 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
delete pRdr;
- // ggfs. alle Verzeichnisse updaten:
-/* if( pWrtShell->IsUpdateTOX() )
- {
- SfxRequest aReq( *this, FN_UPDATE_TOX );
- Execute( aReq );
- pWrtShell->SetUpdateTOX( sal_False ); // wieder zurueck setzen
- }*/
}
}
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index c244fe9..ef575c9 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1542,7 +1542,7 @@ void SwXTextField::attachToRange(
SwFieldType* pFldType = pDoc->GetFldType(RES_SETEXPFLD, m_sTypeName, sal_True);
if(!pFldType)
throw uno::RuntimeException();
- //#93192# detect the field type's sub type and set an appropriate number format
+ // detect the field type's sub type and set an appropriate number format
if(m_pProps->bFormatIsDefault &&
nsSwGetSetExpType::GSE_STRING == ((SwSetExpFieldType*)pFldType)->GetType())
m_pProps->nFormat = -1;
@@ -1879,7 +1879,6 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An
}
else
{
- // -> #111840#
SwDoc * pDoc = GetDoc();
if (NULL != pDoc)
@@ -1891,7 +1890,6 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An
aPosition.nContent = *pTxtFld->GetStart();
pDoc->PutValueToField( aPosition, rValue, pEntry->nWID);
}
- // <- #111840#
}
pField->PutValue( rValue, pEntry->nWID );
@@ -1901,7 +1899,7 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An
const_cast<SwFmtFld*>(pFmtFld)->Broadcast(SwFmtFldHint( 0, SWFMTFLD_CHANGED ));
}
- //#114571# changes of the expanded string have to be notified
+ // changes of the expanded string have to be notified
//#to the SwTxtFld
if(RES_DBFLD == nWhich && pFmtFld->GetTxtFld())
{
@@ -2263,10 +2261,8 @@ void SwXTextField::update( ) throw (uno::RuntimeException)
}
break;
}
- // --> FME 2004-10-06 #116480#
// Text formatting has to be triggered.
const_cast<SwFmtFld*>(pFmtFld)->Modify( 0, 0 );
- // <--
}
else
m_bCallUpdate = sal_True;
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 572cd5e..5a3d956 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -1851,7 +1851,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
}
SwUnoInternalPaM aPam(*pDoc);
- //das muss jetzt sal_True liefern
+ //which must now return sal_True
::sw::XTextRangeToSwPaM(aPam, xTextRange);
SwTOXMark aMark (pTOXType);
if (m_pImpl->m_sAltText.getLength())
@@ -2897,7 +2897,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
}
aToken.nChapterFormat = nFormat;
}
-//--->i53420
+// #i53420#
else if (pProperties[j].Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("ChapterLevel")))
{
@@ -2908,7 +2908,6 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
}
aToken.nOutlineLevel = nLevel;
}
-//<---
else if (pProperties[j].Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("BibliographyDataField")))
{
@@ -2943,7 +2942,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
{
aToken.eTokenType = TOKEN_ENTRY;
}
-//---> i53420
+// #i53420#
// check for chapter format allowed values if it was TOKEN_ENTRY_NO type
// only allowed value are CF_NUMBER and CF_NUM_NOPREPST_TITLE
// reading from file
@@ -2958,7 +2957,6 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
throw lang::IllegalArgumentException();
}
}
-//<---
sPattern += aToken.GetString();
}
SwForm aForm(rTOXBase.GetTOXForm());
@@ -3016,7 +3014,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
{
case TOKEN_ENTRY_NO:
{
-//--->i53420
+// #i53420#
// writing to file (from doc to properties)
sal_Int32 nElements = 2;
sal_Int32 nCurrentElement = 0;
@@ -3067,7 +3065,6 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
pArr[nCurrentElement].Name = C2U("ChapterLevel");
pArr[nCurrentElement].Value <<= aToken.nOutlineLevel;
}
-//<---
}
break;
case TOKEN_ENTRY: // no difference between Entry and Entry Text
@@ -3173,11 +3170,9 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
break;
}
pArr[2].Value <<= nVal;
-//--->i53420
+// #i53420#
pArr[3].Name = C2U("ChapterLevel");
- //
pArr[3].Value <<= aToken.nOutlineLevel;
-//<---
}
break;
case TOKEN_LINK_START:
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index d052e5e..a1103c9 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -63,7 +63,6 @@
#include <fmtclbl.hxx>
#include <editeng/frmdiritem.hxx>
#include <fmtcntnt.hxx>
-/* #109700# */
#include <editeng/lrspitem.hxx>
@@ -85,15 +84,13 @@ struct SwTextSectionProperties_Impl
::std::auto_ptr<SvXMLAttrContainerItem> m_pXMLAttr;
::std::auto_ptr<SwFmtNoBalancedColumns> m_pNoBalanceItem;
::std::auto_ptr<SvxFrameDirectionItem> m_pFrameDirItem;
- ::std::auto_ptr<SvxLRSpaceItem> m_pLRSpaceItem; // #109700#
+ ::std::auto_ptr<SvxLRSpaceItem> m_pLRSpaceItem;
bool m_bDDE;
bool m_bHidden;
bool m_bCondHidden;
bool m_bProtect;
- // --> FME 2004-06-22 #114856# edit in readonly sections
bool m_bEditInReadonly;
- // <--
bool m_bUpdateType;
SwTextSectionProperties_Impl()
@@ -101,9 +98,7 @@ struct SwTextSectionProperties_Impl
, m_bHidden(false)
, m_bCondHidden(false)
, m_bProtect(false)
- // --> FME 2004-06-22 #114856# edit in readonly sections
, m_bEditInReadonly(false)
- // <--
, m_bUpdateType(true)
{
}
@@ -347,15 +342,13 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
aSect.SetHidden(m_pImpl->m_pProps->m_bHidden);
aSect.SetProtectFlag(m_pImpl->m_pProps->m_bProtect);
- // --> FME 2004-06-22 #114856# edit in readonly sections
aSect.SetEditInReadonlyFlag(m_pImpl->m_pProps->m_bEditInReadonly);
- // <--
SfxItemSet aSet(pDoc->GetAttrPool(),
RES_COL, RES_COL,
RES_BACKGROUND, RES_BACKGROUND,
RES_FTN_AT_TXTEND, RES_FRAMEDIR,
- RES_LR_SPACE, RES_LR_SPACE, // #109700#
+ RES_LR_SPACE, RES_LR_SPACE,
RES_UNKNOWNATR_CONTAINER,RES_UNKNOWNATR_CONTAINER,
0);
if (m_pImpl->m_pProps->m_pBrushItem.get())
@@ -386,7 +379,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
{
aSet.Put(*m_pImpl->m_pProps->m_pFrameDirItem);
}
- /* #109700# */
if (m_pImpl->m_pProps->m_pLRSpaceItem.get())
{
aSet.Put(*m_pImpl->m_pProps->m_pLRSpaceItem);
@@ -402,7 +394,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
pRet->GetFmt()->Add(m_pImpl.get());
pRet->GetFmt()->SetXObject(static_cast< ::cppu::OWeakObject*>(this));
- // #97450# XML import must hide sections depending on their old
+ // XML import must hide sections depending on their old
// condition status
if (m_pImpl->m_pProps->m_sCondition.getLength() != 0)
{
@@ -795,7 +787,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
}
}
break;
- // --> FME 2004-06-22 #114856# edit in readonly sections
case WID_SECT_EDIT_IN_READONLY:
{
sal_Bool bVal(sal_False);
@@ -812,7 +803,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
pSectionData->SetEditInReadonlyFlag(bVal);
}
}
- // <--
break;
case WID_SECT_PASSWORD:
{
@@ -906,7 +896,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
}
else if (RES_LR_SPACE == pEntry->nWID)
{
- // #109700#
if (!m_pProps->m_pLRSpaceItem.get())
{
m_pProps->m_pLRSpaceItem.reset(
@@ -1031,7 +1020,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
case WID_SECT_DDE_AUTOUPDATE:
{
// GetUpdateType() returns .._ALWAYS or .._ONCALL
- if (pSect && pSect->IsLinkType() && pSect->IsConnected()) // lijian i73247
+ if (pSect && pSect->IsLinkType() && pSect->IsConnected()) // #i73247#
{
const sal_Bool bTemp =
(pSect->GetUpdateType() == sfx2::LINKUPDATE_ALWAYS);
@@ -1098,7 +1087,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
pRet[nProperty] <<= bTemp;
}
break;
- // --> FME 2004-06-22 #114856# edit in readonly sections
case WID_SECT_EDIT_IN_READONLY:
{
const sal_Bool bTemp = (m_bIsDescriptor)
@@ -1106,7 +1094,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
pRet[nProperty] <<= bTemp;
}
break;
- // <--
case FN_PARAM_LINK_DISPLAY_NAME:
{
if (pFmt)
@@ -1155,7 +1142,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
case FN_UNO_REDLINE_NODE_END:
{
if (!pFmt)
- break; // lijian i73247
+ break; // #i73247#
SwNode* pSectNode = pFmt->GetSectionNode();
if (FN_UNO_REDLINE_NODE_END == pEntry->nWID)
{
@@ -1261,7 +1248,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
}
pQueryItem = m_pProps->m_pFrameDirItem.get();
}
- /* -> #109700# */
else if (RES_LR_SPACE == pEntry->nWID)
{
if (!m_pProps->m_pLRSpaceItem.get())
@@ -1271,7 +1257,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
}
pQueryItem = m_pProps->m_pLRSpaceItem.get();
}
- /* <- #109700# */
if (pQueryItem)
{
pQueryItem->QueryValue(pRet[nProperty],
@@ -1444,9 +1429,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
case WID_SECT_REGION :
case WID_SECT_VISIBLE:
case WID_SECT_PROTECTED:
- // --> FME 2004-06-22 #114856# edit in readonly sections
case WID_SECT_EDIT_IN_READONLY:
- // <--
case FN_PARAM_LINK_DISPLAY_NAME:
case FN_UNO_ANCHOR_TYPES:
case FN_UNO_TEXT_WRAP:
@@ -1590,7 +1573,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
}
}
break;
- // --> FME 2004-06-22 #114856# edit in readonly sections
case WID_SECT_EDIT_IN_READONLY:
{
if (m_pImpl->m_bIsDescriptor)
@@ -1678,9 +1660,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
}
break;
case WID_SECT_PROTECTED:
- // --> FME 2004-06-22 #114856# edit in readonly sections
case WID_SECT_EDIT_IN_READONLY:
- // <--
{
sal_Bool bTemp = sal_False;
aRet.setValue( &bTemp, ::getCppuBooleanType());
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index cd4097d..e66fbfa 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -181,7 +181,6 @@ const SfxItemPropertySet* GetNumberingRulesSet()
#define WID_DISTANCE 4
#define WID_INTERVAL 5
#define WID_SEPARATOR_TEXT 6
-//#define WID_CHARACTER_STYLE 7
#define WID_COUNT_EMPTY_LINES 8
#define WID_COUNT_LINES_IN_FRAMES 9
#define WID_RESTART_AT_EACH_PAGE 10
@@ -1251,12 +1250,8 @@ void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElemen
rProperties, nIndex);
else if(pDocShell)
{
- // --> OD 2008-04-21 #i87650# - correction of cws swwarnings:
- // Do not set member <pNumRule>
-// pNumRule = pDocShell->GetDoc()->GetOutlineNumRule();
-// SwNumRule aNumRule(*pNumRule);
+ // #i87650# - correction of cws swwarnings:
SwNumRule aNumRule( *(pDocShell->GetDoc()->GetOutlineNumRule()) );
- // <--
SwXNumberingRules::SetNumberingRuleByIndex( aNumRule,
rProperties, nIndex);
//hier noch die Zeichenformate bei Bedarf setzen
@@ -1543,11 +1538,8 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
aPropertyValues.Insert(pData, aPropertyValues.Count());
}
Size aSize = rFmt.GetGraphicSize();
- // --> OD 2010-05-04 #i101131# - applying patch from CMC
+ // #i101131#
// adjust conversion due to type mismatch between <Size> and <awt::Size>
-// aSize.Width() = TWIP_TO_MM100( aSize.Width() );
-// aSize.Height() = TWIP_TO_MM100( aSize.Height() );
-// pData = new PropValData((void*)&aSize, SW_PROP_NAME_STR(UNO_NAME_GRAPHIC_SIZE), ::getCppuType((const awt::Size*)0));
awt::Size aAwtSize(TWIP_TO_MM100(aSize.Width()), TWIP_TO_MM100(aSize.Height()));
pData = new PropValData((void*)&aAwtSize, SW_PROP_NAME_STR(UNO_NAME_GRAPHIC_SIZE), ::getCppuType((const awt::Size*)0));
// <--
@@ -1786,10 +1778,9 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
}
}
aFmt.SetCharFmt( pCharFmt );
- // os 2005-08-22 #i51842#
+ // #i51842#
// If the character format has been found it's name should not be in the
// char style names array
- //sNewCharStyleNames[(sal_uInt16)nIndex] = sCharFmtName;
sNewCharStyleNames[(sal_uInt16)nIndex].Erase();
}
else
@@ -1925,7 +1916,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
awt::FontDescriptor* pDesc = (awt::FontDescriptor*)pData->aVal.getValue();
if(pDesc)
{
- // --> OD 2008-09-11 #i93725#
+ // #i93725#
// do not accept "empty" font
if ( pDesc->Name.getLength() > 0 )
{
@@ -2054,12 +2045,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
SwTxtFmtColl &rTxtColl = *((*pColls)[k]);
if(rTxtColl.IsDefault())
continue;
- //if(rTxtColl.GetOutlineLevel() == nIndex && //#outline level,removed by zhaojianwei
- // rTxtColl.GetName() != sStyleName)
- // rTxtColl..SetOutlineLevel(NO_NUMBERING);
- //else if(rTxtColl.GetName() == sStyleName)
- // rTxtColl.SetOutlineLevel(sal_Int8(nIndex));
- if ( rTxtColl.IsAssignedToListLevelOfOutlineStyle() && //add by zhaojianwei
+ if ( rTxtColl.IsAssignedToListLevelOfOutlineStyle() &&
rTxtColl.GetAssignedOutlineStyleLevel() == nIndex &&
rTxtColl.GetName() != sStyleName )
{
@@ -2068,7 +2054,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
else if ( rTxtColl.GetName() == sStyleName )
{
rTxtColl.AssignToListLevelOfOutlineStyle( nIndex );
- } //<-end,,zhaojianwei,
+ }
}
}
break;
@@ -2277,7 +2263,7 @@ OUString SwXNumberingRules::getName() throw( RuntimeException )
SwStyleNameMapper::FillProgName(pNumRule->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, sal_True );
return OUString ( aString );
}
- // --> OD 2005-10-25 #126347# - consider chapter numbering <SwXNumberingRules>
+ // consider chapter numbering <SwXNumberingRules>
else if ( pDocShell )
{
SwStyleNameMapper::FillProgName( pDocShell->GetDoc()->GetOutlineNumRule()->GetName(),
commit 989eddf0cfb98de5e9db130bb0cf10f52fe52f2a
Author: David Nalley <david at gnsa.us>
Date: Thu Mar 3 14:43:42 2011 +0100
deleted a bogus comment and translated a german comment
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index 394149a..d3d4414 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -40,7 +40,7 @@ class SwNoTxtFrm: public SwCntntFrm
{
friend void _FrmFinit();
- short nWeight; // "Wichtigkeit" der Grafik
+ short nWeight; // importance of the graphic
const Size& GetSize() const;
@@ -48,7 +48,6 @@ class SwNoTxtFrm: public SwCntntFrm
void Format ( const SwBorderAttrs *pAttrs = 0 );
void PaintCntnt ( OutputDevice*, const SwRect&, const SwRect& ) const;
- /// OD 25.09.2002 #99739# - delete unused 3rd parameter
void PaintPicture( OutputDevice*, const SwRect& ) const;
protected:
virtual void MakeAll();
@@ -71,7 +70,7 @@ public:
void StopAnimation( OutputDevice* = 0 ) const;
BOOL HasAnimation() const;
- // Routinen fuer den Grafik-Cache
+ // Routine for the graphics cache
USHORT GetWeight() { return nWeight; }
};
More information about the Libreoffice-commits
mailing list