From 6b3b49b6aaaba5c5b2b0f2263982f800754e3445 Mon Sep 17 00:00:00 2001 From: David Nalley Date: Fri, 4 Mar 2011 20:46:43 +0100 Subject: comment cleanup on unocore stuf --- sw/source/core/unocore/unodraw.cxx | 219 +++++++++++++------------------------ sw/source/core/unocore/unomap.cxx | 83 +++----------- 2 files changed, 91 insertions(+), 211 deletions(-) diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 31f4c6b81d4b..168904e21952 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -61,7 +61,7 @@ #include #include #include -// OD 2004-04-21 #i26791# +// #i26791# #include #include #include @@ -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(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* pObj = pFmt->FindSdrObject(); + // determine correct SdrObject* pObj = GetSvxShape()->GetSdrObject(); - // OD 10.07.2003 #110742# - safety assertion: + // safety assertion: // must be the same as FindSdrObject()>, if 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(), " 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 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 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 3304f8a34a8b..6a1122322ae0 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -35,9 +35,8 @@ #include #include #include -// --> OD 2004-08-06 #i28749# +// #i28749# #include -// <-- #include #include #include @@ -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 { 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; } -- cgit v1.2.3