[Libreoffice] [PATCH] Filters - Clean up comments in sw_unodraw.cxx & sw_unoredline.cxx

Another patch cleaning up comments.

Graeme

From a124ef166e4998b60f1f4482ff8b17ea0ca70ff7 Mon Sep 17 00:00:00 2001
From: J. Graeme Lingard <jgraeme+git@gmail.com>
Date: Fri, 22 Oct 2010 22:50:13 +0100
Subject: [PATCH] Clean up comments in sw_unodraw.cxx & sw_unoredline.cxx

---
 binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx |  210 +++-----------------
 .../bf_sw/source/core/unocore/sw_unoredline.cxx    |   82 +--------
 2 files changed, 34 insertions(+), 258 deletions(-)

diff --git a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx 
b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
index 2021f6a..83f3af8 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-
 #ifdef _MSC_VER
 #pragma hdrstop
 #endif
@@ -89,9 +88,6 @@ DECLARE_STL_USTRINGACCESS_MAP( Sequence< sal_Int8 > *,  SwShapeImplementationIdM
 
 static SwShapeImplementationIdMap aImplementationIdMap;
 
-/* -----------------22.01.99 13:19-------------------
- *
- * --------------------------------------------------*/
 class SwShapeDescriptor_Impl
 {
     SwFmtHoriOrient*   pHOrient;
@@ -180,70 +176,47 @@ public:
     void RemoveLRSpace(){DELETEZ(pLRSpace);}
     void SetOpaque(sal_Bool bSet){bOpaque = bSet;}
 };
+
 /****************************************************************************
     class SwFmDrawPage
 ****************************************************************************/
-
-/* -----------------28.01.99 12:03-------------------
- *
- * --------------------------------------------------*/
 SwFmDrawPage::SwFmDrawPage( SdrPage* pPage ) :
     SvxFmDrawPage( pPage ), pPageView(0)
 {
 }
 
-/*-- 22.01.99 11:13:07---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwFmDrawPage::~SwFmDrawPage() throw ()
 {
     RemovePageView();
 }
-/*-- 22.01.99 11:13:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const SdrMarkList&     SwFmDrawPage::PreGroup(const uno::Reference< drawing::XShapes > & xShapes)
 {
     _SelectObjectsInView( xShapes, GetPageView() );
     const SdrMarkList& rMarkList = pView->GetMarkList();
     return rMarkList;
 }
-/*-- 22.01.99 11:13:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwFmDrawPage::PreUnGroup(const uno::Reference< drawing::XShapeGroup >  xShapeGroup)
 {
     uno::Reference< drawing::XShape >  xShape(xShapeGroup, UNO_QUERY);
     _SelectObjectInView( xShape, GetPageView() );
 }
-/*-- 22.01.99 11:13:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
-/*void         SwFmDrawPage::PostGroup()
-{
-    pView->GroupMarked();
-}
-/*-- 22.01.99 11:13:08---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SdrPageView*   SwFmDrawPage::GetPageView()
 {
     if(!pPageView)
         pPageView = pView->ShowPage( pPage, Point() );
     return pPageView;
 }
-/*-- 22.01.99 11:13:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void   SwFmDrawPage::RemovePageView()
 {
     if(pPageView && pView)
         pView->HidePage( pPageView );
     pPageView = 0;
 }
-/*-- 22.01.99 11:13:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Reference< uno::XInterface >      SwFmDrawPage::GetInterface( SdrObject* pObj )
 {
     uno::Reference< XInterface >  xShape;
@@ -261,17 +234,12 @@ uno::Reference< uno::XInterface >         SwFmDrawPage::GetInterface( 
SdrObject* pObj
     }
     return xShape;
 }
-/*-- 22.01.99 11:13:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SdrObject* SwFmDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape > & xShape ) 
throw ()
 {
     //TODO: stimmt das so - kann die Methode weg?
     return SvxFmDrawPage::_CreateSdrObject( xShape );
 }
-/*-- 22.01.99 11:13:09---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 
 uno::Reference< drawing::XShape >  SwFmDrawPage::_CreateShape( SdrObject *pObj ) const throw ()
 {
@@ -305,8 +273,7 @@ uno::Reference< drawing::XShape >  SwFmDrawPage::_CreateShape( SdrObject *pObj )
      }
     else
     {
-        // own block - temporary object has to be destroyed before
-        // the delegator is set #81670#
+        // own block - temporary object has to be destroyed before the delegator is set
         {
             xRet = SvxFmDrawPage::_CreateShape( pObj );
         }
@@ -334,23 +301,16 @@ uno::Reference< drawing::XShape >  SwFmDrawPage::_CreateShape( SdrObject 
*pObj )
 /****************************************************************************
     class SwXDrawPage
 ****************************************************************************/
-/* -----------------------------06.04.00 13:14--------------------------------
-
- ---------------------------------------------------------------------------*/
 OUString SwXDrawPage::getImplementationName(void) throw( RuntimeException )
 {
     return C2U("SwXDrawPage");
 }
-/* -----------------------------06.04.00 13:14--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SwXDrawPage::supportsService(const OUString& rServiceName) throw( RuntimeException )
 {
     return C2U("com.sun.star.drawing.GenericDrawPage") == rServiceName;
 }
-/* -----------------------------06.04.00 13:14--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< OUString > SwXDrawPage::getSupportedServiceNames(void) throw( RuntimeException )
 {
     Sequence< OUString > aRet(1);
@@ -358,17 +318,13 @@ Sequence< OUString > SwXDrawPage::getSupportedServiceNames(void) throw( 
RuntimeE
     pArray[0] = C2U("com.sun.star.drawing.GenericDrawPage");
     return aRet;
 }
-/*-- 22.01.99 11:22:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwXDrawPage::SwXDrawPage(SwDoc* pDc) :
     pDoc(pDc),
     pDrawPage(0)
 {
 }
-/*-- 22.01.99 11:22:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwXDrawPage::~SwXDrawPage()
 {
     if(xPageAgg.is())
@@ -377,9 +333,7 @@ SwXDrawPage::~SwXDrawPage()
         xPageAgg->setDelegator(xInt);
     }
 }
-/* -----------------------------15.06.00 15:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 Any SwXDrawPage::queryInterface( const Type& aType ) throw(RuntimeException)
 {
     Any aRet = SwXDrawPageBaseClass::queryInterface(aType);
@@ -389,9 +343,7 @@ Any SwXDrawPage::queryInterface( const Type& aType ) throw(RuntimeException)
     }
     return aRet;
 }
-/* -----------------------------15.06.00 15:01--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< Type > SwXDrawPage::getTypes(  ) throw(RuntimeException)
 {
     Sequence< uno::Type > aPageTypes = SwXDrawPageBaseClass::getTypes();
@@ -410,9 +362,7 @@ Sequence< Type > SwXDrawPage::getTypes(  ) throw(RuntimeException)
     pPageTypes[nIndex] = ::getCppuType((Reference< ::com::sun::star::form::XFormsSupplier>*)0);
     return aPageTypes;
 }
-/*-- 22.01.99 11:33:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SwXDrawPage::getCount(void) throw( uno::RuntimeException )
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -426,9 +376,7 @@ sal_Int32 SwXDrawPage::getCount(void) throw( uno::RuntimeException )
         return pDrawPage->getCount();
     }
 }
-/*-- 22.01.99 11:33:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex)
         throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException )
 {
@@ -446,16 +394,12 @@ uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex)
     }
     return uno::Any();
 }
-/* -----------------22.01.99 13:13-------------------
- *
- * --------------------------------------------------*/
+
 uno::Type  SwXDrawPage::getElementType(void) throw( uno::RuntimeException )
 {
     return ::getCppuType((const uno::Reference<drawing::XShape>*)0);
 }
-/* -----------------22.01.99 13:13-------------------
- *
- * --------------------------------------------------*/
+
 sal_Bool SwXDrawPage::hasElements(void) throw( uno::RuntimeException )
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -467,9 +411,6 @@ sal_Bool SwXDrawPage::hasElements(void) throw( uno::RuntimeException )
         return ((SwXDrawPage*)this)->GetSvxPage()->hasElements();
 }
 
-/* -----------------22.01.99 12:42-------------------
- *
- * --------------------------------------------------*/
 void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
     throw( uno::RuntimeException )
 {
@@ -545,8 +486,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
-    // invisible layer.
+    // set layer of new drawing object to corresponding invisible layer.
     if(FmFormInventor != pObj->GetObjInventor())
         pObj->SetLayer( bOpaque ? pDoc->GetInvisibleHeavenId() : pDoc->GetInvisibleHellId() );
     else
@@ -604,9 +544,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
     delete pPam;
     delete pInternalPam;
 }
-/* -----------------22.01.99 12:42-------------------
- *
- * --------------------------------------------------*/
+
 void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape) throw( 
uno::RuntimeException )
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -615,9 +553,7 @@ void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape) throw
     Reference<lang::XComponent> xComp(xShape, UNO_QUERY);
     xComp->dispose();
 }
-/* -----------------17.02.99 10:38-------------------
- *
- * --------------------------------------------------*/
+
 uno::Reference< drawing::XShapeGroup >  SwXDrawPage::group(const uno::Reference< drawing::XShapes 
> & xShapes) throw( uno::RuntimeException )
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -664,9 +600,7 @@ uno::Reference< drawing::XShapeGroup >  SwXDrawPage::group(const uno::Reference<
     }
     return xRet;
 }
-/* -----------------17.02.99 10:38-------------------
- *
- * --------------------------------------------------*/
+
 void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeGroup) throw( 
uno::RuntimeException )
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -687,9 +621,7 @@ void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeG
         pPage->RemovePageView();
     }
 }
-/* -----------------05.05.98 17:05-------------------
- *
- * --------------------------------------------------*/
+
 SwFmDrawPage*  SwXDrawPage::GetSvxPage()
 {
     if(!xPageAgg.is() && pDoc)
@@ -712,21 +644,18 @@ SwFmDrawPage*     SwXDrawPage::GetSvxPage()
     }
     return pDrawPage;
 }
-/****************************************************************************
 
+/****************************************************************************
+ SwXShape
 ****************************************************************************/
 TYPEINIT1(SwXShape, SwClient);
-/* -----------------------------10.03.00 18:02--------------------------------
 
- ---------------------------------------------------------------------------*/
 const uno::Sequence< sal_Int8 > & SwXShape::getUnoTunnelId()
 {
     static uno::Sequence< sal_Int8 > aSeq = ::binfilter::CreateUnoTunnelId();
     return aSeq;
 }
-/* -----------------------------10.03.00 18:04--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Int64 SAL_CALL SwXShape::getSomething( const uno::Sequence< sal_Int8 >& rId )
     throw(uno::RuntimeException)
 {
@@ -751,9 +680,7 @@ sal_Int64 SAL_CALL SwXShape::getSomething( const uno::Sequence< sal_Int8 >& rId
     }
     return 0;
 }
-/* -----------------01.02.99 11:38-------------------
- *
- * --------------------------------------------------*/
+
 SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) :
     aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_SHAPE)),
     _pMap(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_SHAPE)),
@@ -791,9 +718,6 @@ SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) :
     }
 }
 
-/*-- 22.01.99 11:42:26---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwXShape::~SwXShape()
 {
     if (xShapeAgg.is())
@@ -803,9 +727,7 @@ SwXShape::~SwXShape()
     }
     delete pImpl;
 }
-/* -----------------------------16.06.00 12:21--------------------------------
 
- ---------------------------------------------------------------------------*/
 Any SwXShape::queryInterface( const uno::Type& aType ) throw(RuntimeException)
 {
     Any aRet = SwXShapeBaseClass::queryInterface(aType);
@@ -813,9 +735,7 @@ Any SwXShape::queryInterface( const uno::Type& aType ) throw(RuntimeException)
         aRet = xShapeAgg->queryAggregation(aType);
     return aRet;
 }
-/* -----------------------------16.06.00 12:21--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< Type > SwXShape::getTypes(  ) throw(RuntimeException)
 {
     Sequence< uno::Type > aRet = SwXShapeBaseClass::getTypes();
@@ -839,9 +759,7 @@ Sequence< Type > SwXShape::getTypes(  ) throw(RuntimeException)
     }
     return aRet;
 }
-/* -----------------------------04.04.01 07:37--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< sal_Int8 > SwXShape::getImplementationId(  ) throw(RuntimeException)
 {
     vos::OGuard aGuard( Application::GetSolarMutex() );
@@ -883,9 +801,7 @@ Sequence< sal_Int8 > SwXShape::getImplementationId(  ) throw(RuntimeException)
         return *pImplementationId;
     }
 }
-/*-- 22.01.99 11:42:26---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Reference< XPropertySetInfo >  SwXShape::getPropertySetInfo(void) throw( 
uno::RuntimeException )
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -907,9 +823,7 @@ uno::Reference< XPropertySetInfo >  SwXShape::getPropertySetInfo(void) throw( un
         aRet = new SfxItemPropertySetInfo( _pMap );
     return aRet;
 }
-/*-- 22.01.99 11:42:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
     throw( UnknownPropertyException, PropertyVetoException,
         IllegalArgumentException, WrappedTargetException, RuntimeException)
@@ -964,8 +878,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
                     if(pSvxShape)
                     {
                         SdrObject* pObj = pSvxShape->GetSdrObject();
-                        // OD 25.06.2003 #108784# - set layer of new drawing
-                        // object to corresponding invisible layer.
+                        // set layer of new drawing object to corresponding invisible layer.
                         bool bIsVisible = pDoc->IsVisibleLayerId( pObj->GetLayer() );
                         if(FmFormInventor != pObj->GetObjInventor())
                         {
@@ -1066,9 +979,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& 
a
         }
     }
 }
-/*-- 22.01.99 11:42:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
     throw( UnknownPropertyException, WrappedTargetException, uno::RuntimeException )
 {
@@ -1090,7 +1001,7 @@ uno::Any SwXShape::getPropertyValue(const 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() );
@@ -1167,9 +1078,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
     }
     return aRet;
 }
-/* -----------------------------02.11.00 09:41--------------------------------
 
- ---------------------------------------------------------------------------*/
 PropertyState SwXShape::getPropertyState( const OUString& rPropertyName )
     throw(beans::UnknownPropertyException, RuntimeException)
 {
@@ -1180,9 +1089,7 @@ PropertyState SwXShape::getPropertyState( const OUString& rPropertyName )
     Sequence< PropertyState > aStates = getPropertyStates(aNames);
     return aStates.getConstArray()[0];
 }
-/* -----------------------------02.11.00 09:41--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< PropertyState > SwXShape::getPropertyStates(
     const Sequence< OUString >& aPropertyNames )
         throw(UnknownPropertyException, RuntimeException)
@@ -1224,7 +1131,7 @@ Sequence< PropertyState > SwXShape::getPropertyStates(
                     const SwAttrSet& rSet = pFmt->GetAttrSet();
                     SfxItemState eItemState = rSet.GetItemState(pMap->nWID, FALSE);
 
-                    //special handling for #88835#: vertical orientation should only be
+                    //vertical orientation should only be
                     //exported if the anchor type is FLY_AUTO_CNTNT
                     if(RES_VERT_ORIENT == pMap->nWID && SFX_ITEM_SET == eItemState)
                     {
@@ -1289,9 +1196,7 @@ Sequence< PropertyState > SwXShape::getPropertyStates(
         throw RuntimeException();
     return aRet;
 }
-/* -----------------------------02.11.00 09:41--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwXShape::setPropertyToDefault( const OUString& rPropertyName )
     throw(UnknownPropertyException, RuntimeException)
 {
@@ -1342,9 +1247,7 @@ void SwXShape::setPropertyToDefault( const OUString& rPropertyName )
     else
         throw RuntimeException();
 }
-/* -----------------------------02.11.00 09:41--------------------------------
 
- ---------------------------------------------------------------------------*/
 Any SwXShape::getPropertyDefault( const OUString& rPropertyName )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -1380,16 +1283,12 @@ Any SwXShape::getPropertyDefault( const OUString& rPropertyName )
         throw RuntimeException();
     return aRet;
 }
-/*-- 22.01.99 11:42:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXShape::addPropertyChangeListener(const OUString& PropertyName, const Reference< 
XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, 
RuntimeException )
 {
     DBG_WARNING("not implemented");
 }
-/*-- 22.01.99 11:42:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXShape::removePropertyChangeListener(
     const OUString& PropertyName,
     const Reference< XPropertyChangeListener > & aListener)
@@ -1397,30 +1296,22 @@ void SwXShape::removePropertyChangeListener(
 {
     DBG_WARNING("not implemented");
 }
-/*-- 22.01.99 11:42:28---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXShape::addVetoableChangeListener(const OUString& PropertyName, const Reference< 
XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, 
RuntimeException )
 {
     DBG_WARNING("not implemented");
 }
-/*-- 22.01.99 11:42:28---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXShape::removeVetoableChangeListener(const OUString& PropertyName, const Reference< 
XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, 
RuntimeException )
 {
     DBG_WARNING("not implemented");
 }
-/*-- 22.01.99 11:42:28---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXShape::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
 {
     ClientModify(this, pOld, pNew);
 }
-/* -----------------14.04.99 13:02-------------------
- *
- * --------------------------------------------------*/
+
 void SwXShape::attach(const Reference< XTextRange > & xTextRange)
     throw( IllegalArgumentException, RuntimeException )
 {
@@ -1478,9 +1369,7 @@ void SwXShape::attach(const Reference< XTextRange > & xTextRange)
         }
     }
 }
-/* -----------------14.04.99 13:02-------------------
- *
- * --------------------------------------------------*/
+
 Reference< XTextRange >  SwXShape::getAnchor(void) throw( RuntimeException )
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -1502,24 +1391,20 @@ Reference< XTextRange >  SwXShape::getAnchor(void) throw( RuntimeException )
         aRef = pImpl->GetTextRange();
     return aRef;
 }
-/* -----------------14.04.99 13:02-------------------
- *
- * --------------------------------------------------*/
+
 void SwXShape::dispose(void) throw( RuntimeException )
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
     SwFrmFmt* pFmt = GetFrmFmt();
     if(pFmt)
     {
-        // OD 10.07.2003 #110742# - determine correct <SdrObject>
+        // determine correct <SdrObject>
         SdrObject* pObj = pFmt->FindSdrObject();
-        // OD 10.07.2003 #110742# - safety assertion:
-        // <pObj> must be the same as <pFmt->FindSdrObject()>, if <pObj> isn't
-        // a 'virtual' drawing object.
+        // safety assertion: <pObj> must be the same as <pFmt->FindSdrObject()>,
+        // if <pObj> isn't a 'virtual' drawing object.
         ASSERT( !pObj->ISA(SwDrawVirtObj) || pObj == pFmt->FindSdrObject(),
                 "<SwXShape::dispose(..) - different 'master' drawing objects!!" );
-        // OD 10.07.2003 #110742# - perform delete of draw frame format *not*
-        // for 'virtual' drawing objects.
+        // perform delete of draw frame format *not* for 'virtual' drawing objects.
         if(pObj && pObj->IsInserted())
         {
             if( pFmt->GetAnchor().GetAnchorId() == FLY_IN_CNTNT )
@@ -1542,9 +1427,7 @@ void SwXShape::dispose(void) throw( RuntimeException )
             xComp->dispose();
     }
 }
-/* -----------------14.04.99 13:02-------------------
- *
- * --------------------------------------------------*/
+
 void SwXShape::addEventListener(const Reference< XEventListener > & aListener) throw( 
RuntimeException )
 {
     Reference< XUnoTunnel > xShapeTunnel(xShapeAgg, UNO_QUERY);
@@ -1552,25 +1435,19 @@ void SwXShape::addEventListener(const Reference< XEventListener > & 
aListener) t
     if(pSvxShape)
          pSvxShape->addEventListener(aListener);
 }
-/* -----------------14.04.99 13:02-------------------
- *
- * --------------------------------------------------*/
+
 void SwXShape::removeEventListener(const Reference< XEventListener > & aListener) throw( 
RuntimeException )
 {
     SvxShape* pSvxShape = GetSvxShape();
     if(pSvxShape)
         pSvxShape->removeEventListener(aListener);
 }
-/* -----------------03.06.99 08:53-------------------
- *
- * --------------------------------------------------*/
+
 OUString SwXShape::getImplementationName(void) throw( RuntimeException )
 {
     return C2U("SwXShape");
 }
-/* -----------------03.06.99 08:53-------------------
- *
- * --------------------------------------------------*/
+
 sal_Bool SwXShape::supportsService(const OUString& rServiceName) throw( RuntimeException )
 {
     sal_Bool bRet = sal_False;
@@ -1584,9 +1461,7 @@ sal_Bool SwXShape::supportsService(const OUString& rServiceName) throw( 
RuntimeE
     }
     return bRet;
 }
-/* -----------------03.06.99 08:53-------------------
- *
- * --------------------------------------------------*/
+
 Sequence< OUString > SwXShape::getSupportedServiceNames(void) throw( RuntimeException )
 {
     Sequence< OUString > aSeq;
@@ -1604,9 +1479,7 @@ Sequence< OUString > SwXShape::getSupportedServiceNames(void) throw( 
RuntimeExce
     }
     return aSeq;
 }
-/* -----------------------------15.03.00 14:54--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxShape*      SwXShape::GetSvxShape()
 {
     SvxShape* pSvxShape = 0;
@@ -1618,9 +1491,10 @@ SvxShape*        SwXShape::GetSvxShape()
     }
     return pSvxShape;
 }
-/*-- 31.05.01 09:59:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+/****************************************************************************
+ SwXGroupShape
+****************************************************************************/
 SwXGroupShape::SwXGroupShape(Reference< XInterface > & xShape) :
         SwXShape(xShape)
 {
@@ -1630,15 +1504,10 @@ SwXGroupShape::SwXGroupShape(Reference< XInterface > & xShape) :
 #endif
 }
 
-/*-- 31.05.01 09:59:19---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwXGroupShape::~SwXGroupShape()
 {
 }
-/*-- 31.05.01 09:59:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Any SwXGroupShape::queryInterface( const uno::Type& rType ) throw(RuntimeException)
 {
     Any aRet;
@@ -1648,23 +1517,17 @@ Any SwXGroupShape::queryInterface( const uno::Type& rType ) 
throw(RuntimeExcepti
         aRet = SwXShape::queryInterface(rType);
     return aRet;
 }
-/*-- 31.05.01 09:59:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXGroupShape::acquire(  ) throw()
 {
     SwXShape::acquire();
 }
-/*-- 31.05.01 09:59:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXGroupShape::release(  ) throw()
 {
     SwXShape::release();
 }
-/*-- 31.05.01 09:59:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXGroupShape::add( const Reference< XShape >& xShape ) throw (RuntimeException)
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -1698,8 +1561,7 @@ void SwXGroupShape::add( const Reference< XShape >& xShape ) throw 
(RuntimeExcep
                 if(pObj)
                 {
                     SwDoc* pDoc = pFmt->GetDoc();
-                    // OD 25.06.2003 #108784# - set layer of new drawing
-                    // object to corresponding invisible layer.
+                    // set layer of new drawing object to corresponding invisible layer.
                     if( FmFormInventor != pObj->GetObjInventor())
                     {
                         pObj->SetLayer( pSwShape->pImpl->GetOpaque()
@@ -1722,9 +1584,7 @@ void SwXGroupShape::add( const Reference< XShape >& xShape ) throw 
(RuntimeExcep
     else
         throw RuntimeException();
 }
-/*-- 31.05.01 09:59:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXGroupShape::remove( const Reference< XShape >& xShape ) throw (RuntimeException)
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -1740,9 +1600,7 @@ void SwXGroupShape::remove( const Reference< XShape >& xShape ) throw 
(RuntimeEx
         throw RuntimeException();
     xShapes->remove(xShape);
 }
-/*-- 31.05.01 09:59:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SwXGroupShape::getCount(void) throw( uno::RuntimeException )
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -1758,9 +1616,7 @@ sal_Int32 SwXGroupShape::getCount(void) throw( uno::RuntimeException )
         throw RuntimeException();
     return xAcc->getCount();
 }
-/*-- 31.05.01 09:59:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Any SwXGroupShape::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, 
WrappedTargetException, RuntimeException )
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -1775,9 +1631,7 @@ Any SwXGroupShape::getByIndex(sal_Int32 nIndex) throw( 
IndexOutOfBoundsException
         throw RuntimeException();
     return xAcc->getByIndex(nIndex);
 }
-/*-- 31.05.01 09:59:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Type SwXGroupShape::getElementType(  ) throw(RuntimeException)
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
@@ -1792,9 +1646,7 @@ uno::Type SwXGroupShape::getElementType(  ) throw(RuntimeException)
         throw RuntimeException();
     return xAcc->getElementType();
 }
-/*-- 31.05.01 09:59:22---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwXGroupShape::hasElements(  ) throw(RuntimeException)
 {
     vos::OGuard  aGuard(Application::GetSolarMutex());
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoredline.cxx 
b/binfilter/bf_sw/source/core/unocore/sw_unoredline.cxx
index 9e027c1..440b805 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoredline.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoredline.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-
 #ifdef _MSC_VER
 #pragma hdrstop
 #endif
@@ -67,25 +66,17 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 using namespace ::rtl;
 
-
-/* ---------------------------------------------------------------------------
-
- ---------------------------------------------------------------------------*/
 SwXRedlineText::SwXRedlineText(SwDoc* pDoc, SwNodeIndex aIndex) :
     SwXText(pDoc, CURSOR_REDLINE),
     aNodeIndex(aIndex)
 {
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 const SwStartNode* SwXRedlineText::GetStartNode() const
 {
     return aNodeIndex.GetNode().GetStartNode();
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 Any SwXRedlineText::queryInterface( const Type& rType )
     throw(RuntimeException)
 {
@@ -108,9 +99,7 @@ Any SwXRedlineText::queryInterface( const Type& rType )
 
     return aRet;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence<Type> SwXRedlineText::getTypes()
     throw(RuntimeException)
 {
@@ -124,9 +113,7 @@ Sequence<Type> SwXRedlineText::getTypes()
 
     return aTypes;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence<sal_Int8> SwXRedlineText::getImplementationId()
     throw(RuntimeException)
 {
@@ -140,9 +127,7 @@ Sequence<sal_Int8> SwXRedlineText::getImplementationId()
     }
     return aId;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference<XTextCursor> SwXRedlineText::createTextCursor(void)
     throw( RuntimeException )
 {
@@ -184,9 +169,7 @@ Reference<XTextCursor> SwXRedlineText::createTextCursor(void)
 
     return (XWordCursor*)pCrsr;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference<XTextCursor> SwXRedlineText::createTextCursorByRange(
     const Reference<XTextRange> & aTextRange)
         throw( RuntimeException )
@@ -196,9 +179,7 @@ Reference<XTextCursor> SwXRedlineText::createTextCursorByRange(
     xCursor->gotoRange(aTextRange->getEnd(), sal_True);
     return xCursor;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference<XEnumeration> SwXRedlineText::createEnumeration(void)
     throw( RuntimeException )
 {
@@ -207,42 +188,30 @@ Reference<XEnumeration> SwXRedlineText::createEnumeration(void)
     aPam.Move(fnMoveForward, fnGoNode);
     return new SwXParagraphEnumeration(this, *aPam.Start(), CURSOR_REDLINE);
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 uno::Type SwXRedlineText::getElementType(  ) throw(RuntimeException)
 {
     return ::getCppuType((uno::Reference<XTextRange>*)0);
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool SwXRedlineText::hasElements(  ) throw(RuntimeException)
 {
     return sal_True;   // we always have a content index
 }
-/* -----------------------------19.12.00 11:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 SwXRedlinePortion::SwXRedlinePortion(  const SwRedline* pRed,
                         const SwUnoCrsr* pPortionCrsr,
                         Reference< XText >  xParent, BOOL bStart) :
     SwXTextPortion(pPortionCrsr, xParent, bStart ? PORTION_REDLINE_START : PORTION_REDLINE_END),
-//     SwXText(pPortionCrsr->GetDoc(), CURSOR_REDLINE),
-//     SwXRedlineText(pPortionCrsr->GetDoc(), *pRed->GetContentIdx()),
     pRedline(pRed)
 {
     SetCollapsed(!pRedline->HasMark());
 }
-/*-- 19.12.00 11:37:24---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwXRedlinePortion::~SwXRedlinePortion()
 {
 }
-/* -----------------------------19.12.00 11:46--------------------------------
 
- ---------------------------------------------------------------------------*/
 util::DateTime lcl_DateTimeToUno(const DateTime& rDT)
 {
     util::DateTime aRetDT;
@@ -255,7 +224,7 @@ util::DateTime lcl_DateTimeToUno(const DateTime& rDT)
     aRetDT.HundredthSeconds = rDT.Get100Sec();
     return aRetDT;
 }
-// ---------------------------------------------------------------------------
+
 OUString lcl_RedlineTypeToOUString(SwRedlineType eType)
 {
     OUString sRet;
@@ -269,7 +238,7 @@ OUString lcl_RedlineTypeToOUString(SwRedlineType eType)
     }
     return sRet;
 }
-// ---------------------------------------------------------------------------
+
 Sequence<PropertyValue> lcl_GetSuccessorProperties(const SwRedline& rRedline)
 {
     Sequence<PropertyValue> aValues(4);
@@ -291,7 +260,7 @@ Sequence<PropertyValue> lcl_GetSuccessorProperties(const SwRedline& rRedline)
     }
     return aValues;
 }
-// ---------------------------------------------------------------------------
+
 Any SwXRedlinePortion::getPropertyValue( const OUString& rPropertyName )
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -322,9 +291,7 @@ Any SwXRedlinePortion::getPropertyValue( const OUString& rPropertyName )
     }
     return aRet;
 }
-/* -----------------------------19.12.00 15:16--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwXRedlinePortion::Validate() throw( RuntimeException )
 {
     SwUnoCrsr* pUnoCrsr = GetCrsr();
@@ -339,9 +306,7 @@ void SwXRedlinePortion::Validate() throw( RuntimeException )
     if(!bFound)
         throw RuntimeException();
 }
-/* -----------------------------21.03.00 15:39--------------------------------
 
- ---------------------------------------------------------------------------*/
 uno::Sequence< sal_Int8 > SAL_CALL SwXRedlinePortion::getImplementationId(  ) 
throw(uno::RuntimeException)
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
@@ -354,9 +319,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SwXRedlinePortion::getImplementationId(  ) th
     }
     return aId;
 }
-/* -----------------------------11.01.01 16:39--------------------------------
 
- ---------------------------------------------------------------------------*/
 Any  SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, const SwRedline& rRedline 
) throw()
 {
     Any aRet;
@@ -396,9 +359,7 @@ Any  SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, const S
     }
     return aRet;
 }
-/* -----------------------------11.01.01 11:22--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< PropertyValue > SwXRedlinePortion::CreateRedlineProperties(
     const SwRedline& rRedline, sal_Bool bIsStart ) throw()
 {
@@ -451,9 +412,7 @@ Sequence< PropertyValue > SwXRedlinePortion::CreateRedlineProperties(
     aRet.realloc(nPropIdx);
     return aRet;
 }
-/*-- 11.01.01 17:06:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 TYPEINIT1(SwXRedline, SwClient);
 SwXRedline::SwXRedline(SwRedline& rRedline, SwDoc& rDoc) :
     pDoc(&rDoc),
@@ -462,24 +421,18 @@ SwXRedline::SwXRedline(SwRedline& rRedline, SwDoc& rDoc) :
 {
     pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
 }
-/*-- 11.01.01 17:06:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwXRedline::~SwXRedline()
 {
 }
-/*-- 11.01.01 17:06:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Reference< XPropertySetInfo > SwXRedline::getPropertySetInfo(  ) throw(RuntimeException)
 {
     static uno::Reference< beans::XPropertySetInfo >  xRef =
         
SfxItemPropertySet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_REDLINE)).getPropertySetInfo();
     return xRef;
 }
-/*-- 11.01.01 17:06:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXRedline::setPropertyValue( const OUString& rPropertyName, const Any& aValue )
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException,
         WrappedTargetException, RuntimeException)
@@ -516,9 +469,7 @@ void SwXRedline::setPropertyValue( const OUString& rPropertyName, const Any& aVa
         throw IllegalArgumentException();
     }
 }
-/*-- 11.01.01 17:06:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Any SwXRedline::getPropertyValue( const OUString& rPropertyName )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -561,7 +512,6 @@ Any SwXRedline::getPropertyValue( const OUString& rPropertyName )
                     pPoint = pRedline->GetMark();
                 SwPaM aTmp(*pPoint);
                 Reference<XText> xTmpParent;
-//                             Reference< XTextRange > xRange = 
SwXTextRange::createTextRangeFromPaM(aTmp);
                 Reference<XTextRange>xRange =
                     SwXTextRange::CreateTextRangeFromPosition( pDoc, *pPoint, 0 );
                 xRet = xRange.get();
@@ -590,42 +540,32 @@ Any SwXRedline::getPropertyValue( const OUString& rPropertyName )
         aRet = SwXRedlinePortion::GetPropertyValue(rPropertyName, *pRedline);
     return aRet;
 }
-/*-- 11.01.01 17:06:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXRedline::addPropertyChangeListener(
     const OUString& aPropertyName,
     const Reference< XPropertyChangeListener >& xListener )
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
-/*-- 11.01.01 17:06:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXRedline::removePropertyChangeListener(
     const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener )
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
-/*-- 11.01.01 17:06:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXRedline::addVetoableChangeListener(
     const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener )
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
-/*-- 11.01.01 17:06:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXRedline::removeVetoableChangeListener(
     const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener )
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
-/*-- 11.01.01 17:06:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwXRedline::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
 {
     ClientModify(this, pOld, pNew);
@@ -635,9 +575,7 @@ void SwXRedline::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
         pRedline = 0;
     }
 }
-/*-- 19.12.00 11:37:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Reference< XEnumeration >  SwXRedline::createEnumeration(void) throw( RuntimeException )
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
@@ -654,25 +592,19 @@ Reference< XEnumeration >  SwXRedline::createEnumeration(void) throw( 
RuntimeExc
     }
     return xRet;
 }
-/* -----------------------------19.12.00 12:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 uno::Type SwXRedline::getElementType(  ) throw(RuntimeException)
 {
     return ::getCppuType((uno::Reference<XTextRange>*)0);
 }
-/* -----------------------------19.12.00 12:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool SwXRedline::hasElements(  ) throw(RuntimeException)
 {
     if(!pDoc)
         throw RuntimeException();
     return 0 != pRedline->GetContentIdx();
 }
-/* -----------------------------19.12.00 15:11--------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference< XTextCursor >  SwXRedline::createTextCursor(void) throw( RuntimeException )
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
@@ -707,9 +639,7 @@ Reference< XTextCursor >  SwXRedline::createTextCursor(void) throw( RuntimeExcep
     }
     return xRet;
 }
-/* -----------------------------19.12.00 15:11--------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference< XTextCursor >  SwXRedline::createTextCursorByRange(
     const Reference< XTextRange > & aTextPosition)
         throw( RuntimeException )
@@ -717,9 +647,7 @@ Reference< XTextCursor >  SwXRedline::createTextCursorByRange(
     throw RuntimeException();
     return Reference< XTextCursor >  ();
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 Any SwXRedline::queryInterface( const uno::Type& rType )
     throw(RuntimeException)
 {
@@ -730,9 +658,7 @@ Any SwXRedline::queryInterface( const uno::Type& rType )
     }
     return aRet;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence<Type> SwXRedline::getTypes()
     throw(RuntimeException)
 {
@@ -746,9 +672,7 @@ Sequence<Type> SwXRedline::getTypes()
         pTypes[nCurType++] = pBaseTypes[nType];
     return aTypes;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence<sal_Int8> SwXRedline::getImplementationId()
     throw(RuntimeException)
 {
-- 
1.7.1