diff options
| author | Chris Laplante <mostthingsweb@gmail.com> | 2014-08-18 16:57:11 -0400 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-08-19 01:28:24 -0500 |
| commit | 7b33dbb25394a88b8eb2c826d951ce578605e895 (patch) | |
| tree | d99485092601a2f21a143049569daee0fd4e8a76 | |
| parent | 23b49f2390b3d551a52caf06496d8aadf1920bf8 (diff) | |
svx: Cleanup ASCII art and useless comments
Change-Id: I5399362056276f324fd43eda05d3f606dc6f8c71
Reviewed-on: https://gerrit.libreoffice.org/11011
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
207 files changed, 237 insertions, 2329 deletions
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx index 58023a87db74..a531837de3eb 100644 --- a/svx/inc/AccessibleTableShape.hxx +++ b/svx/inc/AccessibleTableShape.hxx @@ -102,7 +102,7 @@ public: virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - //===== XAccessibleTableSelection ============================================ + // XAccessibleTableSelection virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) @@ -215,7 +215,7 @@ public: virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleTableSelection ============================================ + // XAccessibleTableSelection virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index 70f3fda79236..eb428c6cf3c3 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -26,11 +26,7 @@ #include <vcl/timer.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> -/************************************************************************* -|* -|* Parameters for the interaction of a 3D object -|* -\************************************************************************/ +// Parameters for the interaction of a 3D object class E3dDragMethodUnit { public: @@ -55,12 +51,7 @@ public: {} }; -/************************************************************************* -|* -|* Derivative of SdrDragMethod for 3D objects -|* -\************************************************************************/ - +// Derivative of SdrDragMethod for 3D objects class E3dDragMethod : public SdrDragMethod { protected: @@ -91,13 +82,7 @@ public: virtual void CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverlayManager) SAL_OVERRIDE; }; - -/************************************************************************* -|* -|* Derivative of SdrDragMethod for spinning 3D objects -|* -\************************************************************************/ - +// Derivative of SdrDragMethod for spinning 3D objects class E3dDragRotate : public E3dDragMethod { basegfx::B3DPoint maGlobalCenter; @@ -114,13 +99,7 @@ public: virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE; }; - -/************************************************************************* -|* -|* Derivative of SdrDragMethod for moving 3D sub-objects -|* -\************************************************************************/ - +// Derivative of SdrDragMethod for moving 3D sub-objects class E3dDragMove : public E3dDragMethod { SdrHdlKind meWhatDragHdl; diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx index ccb1b8735685..bfcea286b1f7 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -105,9 +105,6 @@ namespace sdr { namespace contact { ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ); // never implemented }; - - //= UnoControlPrintOrPreviewContact - class SVX_DLLPRIVATE UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl { public: diff --git a/svx/inc/sxallitm.hxx b/svx/inc/sxallitm.hxx index b8ba71302fd6..741304d51ec3 100644 --- a/svx/inc/sxallitm.hxx +++ b/svx/inc/sxallitm.hxx @@ -22,27 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> - -// class SdrAllPositionXItem - class SdrAllPositionXItem: public SdrMetricItem { public: SdrAllPositionXItem(long nPosX=0): SdrMetricItem(SDRATTR_ALLPOSITIONX,nPosX) {} SdrAllPositionXItem(SvStream& rIn): SdrMetricItem(SDRATTR_ALLPOSITIONX,rIn) {} }; - -// class SdrAllPositionYItem - class SdrAllPositionYItem: public SdrMetricItem { public: SdrAllPositionYItem(long nPosY=0): SdrMetricItem(SDRATTR_ALLPOSITIONY,nPosY) {} SdrAllPositionYItem(SvStream& rIn): SdrMetricItem(SDRATTR_ALLPOSITIONY,rIn) {} }; - -// class SdrAllSizeWidthItem - class SdrAllSizeWidthItem: public SdrMetricItem { public: SdrAllSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_ALLSIZEWIDTH,nWdt) {} diff --git a/svx/inc/sxlayitm.hxx b/svx/inc/sxlayitm.hxx index 4df9bad6f1aa..4cbc1084344d 100644 --- a/svx/inc/sxlayitm.hxx +++ b/svx/inc/sxlayitm.hxx @@ -24,9 +24,6 @@ #include <svl/intitem.hxx> #include <svx/svdtypes.hxx> - -// class SdrLayerIdItem - class SdrLayerIdItem: public SfxUInt16Item { public: SdrLayerIdItem(sal_uInt16 nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId) {} @@ -34,10 +31,6 @@ public: SdrLayerID GetValue() const { return (SdrLayerID)SfxUInt16Item::GetValue(); } }; - -// class SdrLayerNameItem - - class SdrLayerNameItem: public SfxStringItem { public: SdrLayerNameItem() : SfxStringItem() { SetWhich(SDRATTR_LAYERNAME); } diff --git a/svx/inc/sxlogitm.hxx b/svx/inc/sxlogitm.hxx index 6b9d6e2d0ed9..c0f4816845f3 100644 --- a/svx/inc/sxlogitm.hxx +++ b/svx/inc/sxlogitm.hxx @@ -22,9 +22,6 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> - -// class SdrLogicSizeWidthItem - class SdrLogicSizeWidthItem: public SdrMetricItem { public: SdrLogicSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_LOGICSIZEWIDTH,nWdt) {} diff --git a/svx/inc/sxmovitm.hxx b/svx/inc/sxmovitm.hxx index c3bd851d4af9..1bf3ff2fe4ce 100644 --- a/svx/inc/sxmovitm.hxx +++ b/svx/inc/sxmovitm.hxx @@ -22,18 +22,12 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> - -// class SdrMoveXItem - class SdrMoveXItem: public SdrMetricItem { public: SdrMoveXItem(long n=0): SdrMetricItem(SDRATTR_MOVEX,n) {} SdrMoveXItem(SvStream& rIn): SdrMetricItem(SDRATTR_MOVEX,rIn) {} }; - -// class SdrMoveYItem - class SdrMoveYItem: public SdrMetricItem { public: SdrMoveYItem(long n=0): SdrMetricItem(SDRATTR_MOVEY,n) {} diff --git a/svx/inc/sxoneitm.hxx b/svx/inc/sxoneitm.hxx index 7167739a1929..4610e90840ae 100644 --- a/svx/inc/sxoneitm.hxx +++ b/svx/inc/sxoneitm.hxx @@ -22,27 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> - -// class SdrOnePositionXItem - class SdrOnePositionXItem: public SdrMetricItem { public: SdrOnePositionXItem(long nPosX=0): SdrMetricItem(SDRATTR_ONEPOSITIONX,nPosX) {} SdrOnePositionXItem(SvStream& rIn): SdrMetricItem(SDRATTR_ONEPOSITIONX,rIn) {} }; - -// class SdrOnePositionYItem - class SdrOnePositionYItem: public SdrMetricItem { public: SdrOnePositionYItem(long nPosY=0): SdrMetricItem(SDRATTR_ONEPOSITIONY,nPosY) {} SdrOnePositionYItem(SvStream& rIn): SdrMetricItem(SDRATTR_ONEPOSITIONY,rIn) {} }; - -// class SdrOneSizeWidthItem - class SdrOneSizeWidthItem: public SdrMetricItem { public: SdrOneSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_ONESIZEWIDTH,nWdt) {} diff --git a/svx/inc/sxonitm.hxx b/svx/inc/sxonitm.hxx index f65248e6e61e..6c3916edc07d 100644 --- a/svx/inc/sxonitm.hxx +++ b/svx/inc/sxonitm.hxx @@ -22,9 +22,6 @@ #include <svx/svddef.hxx> #include <svl/stritem.hxx> -/** - * class SdrObjectNameItem - */ class SdrObjectNameItem: public SfxStringItem { public: SdrObjectNameItem() : SfxStringItem() { SetWhich(SDRATTR_OBJECTNAME); } diff --git a/svx/inc/sxopitm.hxx b/svx/inc/sxopitm.hxx index 706a778a4c66..1a423fe0732b 100644 --- a/svx/inc/sxopitm.hxx +++ b/svx/inc/sxopitm.hxx @@ -22,9 +22,6 @@ #include <svx/svddef.hxx> #include <svx/sdynitm.hxx> - -// class SdrObjPrintableItem - class SdrObjPrintableItem: public SdrYesNoItem { public: SdrObjPrintableItem(bool bOn=false): SdrYesNoItem(SDRATTR_OBJPRINTABLE,bOn) {} diff --git a/svx/inc/sxraitm.hxx b/svx/inc/sxraitm.hxx index d1dfc6a85f6c..8e913ffeb8e9 100644 --- a/svx/inc/sxraitm.hxx +++ b/svx/inc/sxraitm.hxx @@ -22,9 +22,6 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -/** - * class SdrRotateAngleItem - */ class SdrRotateAngleItem: public SdrAngleItem { public: SdrRotateAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_ROTATEANGLE,nAngle) {} diff --git a/svx/inc/sxreaitm.hxx b/svx/inc/sxreaitm.hxx index 065759f284f8..46a063ef739a 100644 --- a/svx/inc/sxreaitm.hxx +++ b/svx/inc/sxreaitm.hxx @@ -23,9 +23,6 @@ #include <svx/sxfiitm.hxx> - -// class SdrResizeXAllItem - class SdrResizeXAllItem: public SdrFractionItem { public: SdrResizeXAllItem(): SdrFractionItem(SDRATTR_RESIZEXALL,Fraction(1,1)) {} @@ -33,9 +30,6 @@ public: SdrResizeXAllItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEXALL,rIn) {} }; - -// class SdrResizeYAllItem - class SdrResizeYAllItem: public SdrFractionItem { public: SdrResizeYAllItem(): SdrFractionItem(SDRATTR_RESIZEYALL,Fraction(1,1)) {} diff --git a/svx/inc/sxreoitm.hxx b/svx/inc/sxreoitm.hxx index 3483d4b20a69..4bb14b982325 100644 --- a/svx/inc/sxreoitm.hxx +++ b/svx/inc/sxreoitm.hxx @@ -23,9 +23,6 @@ #include <svx/sxfiitm.hxx> - -// class SdrResizeXOneItem - class SdrResizeXOneItem: public SdrFractionItem { public: SdrResizeXOneItem(): SdrFractionItem(SDRATTR_RESIZEXONE,Fraction(1,1)) {} @@ -33,9 +30,6 @@ public: SdrResizeXOneItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEXONE,rIn) {} }; - -// class SdrResizeYOneItem - class SdrResizeYOneItem: public SdrFractionItem { public: SdrResizeYOneItem(): SdrFractionItem(SDRATTR_RESIZEYONE,Fraction(1,1)) {} diff --git a/svx/inc/sxroaitm.hxx b/svx/inc/sxroaitm.hxx index 48d1399ad299..e8fba5f43657 100644 --- a/svx/inc/sxroaitm.hxx +++ b/svx/inc/sxroaitm.hxx @@ -22,9 +22,6 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -/** - * class SdrRotateAllItem - */ class SdrRotateAllItem: public SdrAngleItem { public: SdrRotateAllItem(long nAngle=0): SdrAngleItem(SDRATTR_ROTATEALL,nAngle) {} diff --git a/svx/inc/sxrooitm.hxx b/svx/inc/sxrooitm.hxx index 79f4789fe34e..82b116219281 100644 --- a/svx/inc/sxrooitm.hxx +++ b/svx/inc/sxrooitm.hxx @@ -22,9 +22,6 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -/** - * class SdrRotateOneItem - */ class SdrRotateOneItem: public SdrAngleItem { public: SdrRotateOneItem(long nAngle=0): SdrAngleItem(SDRATTR_ROTATEONE,nAngle) {} diff --git a/svx/inc/sxsaitm.hxx b/svx/inc/sxsaitm.hxx index 5359921d67c5..2ce51053de09 100644 --- a/svx/inc/sxsaitm.hxx +++ b/svx/inc/sxsaitm.hxx @@ -22,9 +22,6 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -/** - * class SdrShearAngleItem - */ class SdrShearAngleItem: public SdrAngleItem { public: SdrShearAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_SHEARANGLE,nAngle) {} diff --git a/svx/inc/sxsalitm.hxx b/svx/inc/sxsalitm.hxx index e6b14ece3b1f..66ca7d7cb0ff 100644 --- a/svx/inc/sxsalitm.hxx +++ b/svx/inc/sxsalitm.hxx @@ -22,18 +22,12 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> - -// class SdrHorzShearAllItem - class SdrHorzShearAllItem: public SdrAngleItem { public: SdrHorzShearAllItem(long nAngle=0): SdrAngleItem(SDRATTR_HORZSHEARALL,nAngle) {} SdrHorzShearAllItem(SvStream& rIn): SdrAngleItem(SDRATTR_HORZSHEARALL,rIn) {} }; - -// class SdrVertShearAllItem - class SdrVertShearAllItem: public SdrAngleItem { public: SdrVertShearAllItem(long nAngle=0): SdrAngleItem(SDRATTR_VERTSHEARALL,nAngle) {} diff --git a/svx/inc/sxsoitm.hxx b/svx/inc/sxsoitm.hxx index 0256b82587a5..bca37df0075d 100644 --- a/svx/inc/sxsoitm.hxx +++ b/svx/inc/sxsoitm.hxx @@ -22,18 +22,12 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> - -// class SdrHorzShearOneItem - class SdrHorzShearOneItem: public SdrAngleItem { public: SdrHorzShearOneItem(long nAngle=0): SdrAngleItem(SDRATTR_HORZSHEARONE,nAngle) {} SdrHorzShearOneItem(SvStream& rIn): SdrAngleItem(SDRATTR_HORZSHEARONE,rIn) {} }; - -// class SdrVertShearOneItem - class SdrVertShearOneItem: public SdrAngleItem { public: SdrVertShearOneItem(long nAngle=0): SdrAngleItem(SDRATTR_VERTSHEARONE,nAngle) {} diff --git a/svx/inc/sxtraitm.hxx b/svx/inc/sxtraitm.hxx index f741d8c09741..6e0f51bc0687 100644 --- a/svx/inc/sxtraitm.hxx +++ b/svx/inc/sxtraitm.hxx @@ -22,36 +22,24 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> - -// class SdrTransformRef1XItem - class SdrTransformRef1XItem: public SdrMetricItem { public: SdrTransformRef1XItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1X,nHgt) {} SdrTransformRef1XItem(SvStream& rIn): SdrMetricItem(SDRATTR_TRANSFORMREF1X,rIn) {} }; - -// class SdrTransformRef1YItem - class SdrTransformRef1YItem: public SdrMetricItem { public: SdrTransformRef1YItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1Y,nHgt) {} SdrTransformRef1YItem(SvStream& rIn): SdrMetricItem(SDRATTR_TRANSFORMREF1Y,rIn) {} }; - -// class SdrTransformRef2XItem - class SdrTransformRef2XItem: public SdrMetricItem { public: SdrTransformRef2XItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2X,nHgt) {} SdrTransformRef2XItem(SvStream& rIn): SdrMetricItem(SDRATTR_TRANSFORMREF2X,rIn) {} }; - -// class SdrTransformRef2YItem - class SdrTransformRef2YItem: public SdrMetricItem { public: SdrTransformRef2YItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2Y,nHgt) {} diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 3ca609d6cdb0..efc6e794a318 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -109,7 +109,6 @@ namespace } } -//= AccessibleControlShape AccessibleControlShape::AccessibleControlShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo) diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index 476ac63856eb..1b0e04e091f9 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -29,8 +29,7 @@ using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -//===== internal ============================================================ - +// internal AccessibleGraphicShape::AccessibleGraphicShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo) @@ -45,11 +44,7 @@ AccessibleGraphicShape::~AccessibleGraphicShape (void) { } - - - -//===== XAccessibleImage ==================================================== - +// XAccessibleImage OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -76,11 +71,7 @@ sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth (void) return AccessibleShape::getSize().Width; } - - - -//===== XInterface ========================================================== - +// XInterface com::sun::star::uno::Any SAL_CALL AccessibleGraphicShape::queryInterface (const com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -110,11 +101,7 @@ void SAL_CALL AccessibleShape::release (); } - - - -//===== XServiceInfo ======================================================== - +// XServiceInfo OUString SAL_CALL AccessibleGraphicShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -143,11 +130,7 @@ OUString SAL_CALL return aServiceNames; } - - - -//===== XTypeProvider =================================================== - +// XTypeProvider uno::Sequence<uno::Type> SAL_CALL AccessibleGraphicShape::getTypes (void) throw (uno::RuntimeException, std::exception) diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 0e62c15e37da..a512a3bfe15c 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -28,8 +28,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; -//===== internal ============================================================ - +// internal AccessibleOLEShape::AccessibleOLEShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo) @@ -44,11 +43,7 @@ AccessibleOLEShape::~AccessibleOLEShape (void) { } - - - -//===== XAccessibleAction =================================================== - +// XAccessibleAction sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -84,11 +79,7 @@ Reference<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActio throw lang::IndexOutOfBoundsException(); } - - - -//===== XInterface ========================================================== - +// XInterface com::sun::star::uno::Any SAL_CALL AccessibleOLEShape::queryInterface (const com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -118,11 +109,7 @@ void SAL_CALL AccessibleShape::release (); } - - - -//===== XServiceInfo ======================================================== - +// XServiceInfo OUString SAL_CALL AccessibleOLEShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -151,11 +138,7 @@ OUString SAL_CALL return aServiceNames; } - - - -//===== XTypeProvider =================================================== - +// XTypeProvider uno::Sequence<uno::Type> SAL_CALL AccessibleOLEShape::getTypes (void) throw (uno::RuntimeException, std::exception) @@ -172,7 +155,7 @@ uno::Sequence<uno::Type> SAL_CALL return aTypeList; } -//===== XAccessibleExtendedAttributes ======================================================== +// XAccessibleExtendedAttributes uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index ec0d369fe2f9..f97949ec0882 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -94,11 +94,7 @@ OUString GetOptionalProperty ( } // end of anonymous namespace - - - -//===== internal ============================================================ - +// internal AccessibleShape::AccessibleShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo) @@ -338,8 +334,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleDescription (void) return OUString(" "); } -//===== XAccessibleContext ================================================== - +// XAccessibleContext /** The children of this shape come from two sources: The children from group or scene shapes and the paragraphs of text. */ @@ -515,11 +510,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL return xStateSet; } - - - -//===== XAccessibleComponent ================================================ - +// XAccessibleComponent /** The implementation below is at the moment straightforward. It iterates over all children (and thereby instances all children which have not been already instatiated) until a child covering the specifed point is @@ -788,11 +779,7 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground (void) return nColor; } - - - -//===== XAccessibleEventBroadcaster ========================================= - +// XAccessibleEventBroadcaster void SAL_CALL AccessibleShape::addAccessibleEventListener ( const Reference<XAccessibleEventListener >& rxListener) throw (uno::RuntimeException, std::exception) @@ -823,11 +810,7 @@ void SAL_CALL AccessibleShape::removeAccessibleEventListener ( mpText->RemoveEventListener (rxListener); } - - - -//===== XInterface ========================================================== - +// XInterface com::sun::star::uno::Any SAL_CALL AccessibleShape::queryInterface (const com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -868,10 +851,7 @@ void SAL_CALL AccessibleContextBase::release (); } -//===== XAccessibleSelection ============================================ - - - +// XAccessibleSelection void SAL_CALL AccessibleShape::selectAccessibleChild( sal_Int32 ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) { @@ -969,7 +949,7 @@ void SAL_CALL AccessibleShape::deselectAccessibleChild( sal_Int32 ) } -//===== XAccessibleExtendedAttributes ======================================================== +// XAccessibleExtendedAttributes uno::Any SAL_CALL AccessibleShape::getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { @@ -985,8 +965,7 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes() return strRet; } -//===== XServiceInfo ======================================================== - +// XServiceInfo OUString SAL_CALL AccessibleShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -1015,12 +994,7 @@ uno::Sequence<OUString> SAL_CALL return aServiceNames; } - - - - -//===== XTypeProvider =================================================== - +// XTypeProvider uno::Sequence<uno::Type> SAL_CALL AccessibleShape::getTypes (void) throw (uno::RuntimeException, std::exception) @@ -1055,11 +1029,7 @@ uno::Sequence<uno::Type> SAL_CALL return aTypeList; } - - - -//===== lang::XEventListener ================================================ - +// lang::XEventListener /** Disposing calls are accepted only from the model: Just reset the reference to the model in the shape tree info. Otherwise this object remains functional. @@ -1087,11 +1057,7 @@ void SAL_CALL } } - - - -//===== document::XEventListener ============================================ - +// document::XEventListener void SAL_CALL AccessibleShape::notifyEvent (const document::EventObject& rEventObject) throw (uno::RuntimeException, std::exception) @@ -1124,8 +1090,7 @@ void SAL_CALL } } -//===== lang::XUnoTunnel ================================================ - +// lang::XUnoTunnel namespace { class theAccessibleShapeImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleShapeImplementationId > {}; @@ -1165,8 +1130,7 @@ sal_Int64 SAL_CALL return( nReturn ); } -//===== IAccessibleViewForwarderListener ==================================== - +// IAccessibleViewForwarderListener void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) { @@ -1185,11 +1149,8 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, mpText->UpdateChildren(); } - - - -//===== protected internal ================================================== -/// Set this object's name if is different to the current name. +// protected internal +// Set this object's name if is different to the current name. OUString AccessibleShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -1454,7 +1415,7 @@ struct XShapePosCompareHelper }; //end of group position -//===== XAccessibleGroupPosition ========================================= +// XAccessibleGroupPosition uno::Sequence< sal_Int32 > SAL_CALL AccessibleShape::getGroupPosition( const uno::Any& ) throw (uno::RuntimeException, std::exception) @@ -1571,7 +1532,7 @@ OUString AccessibleShape::getObjectLink( const uno::Any& ) return aRet; } -//===== XAccesibleHypertext ================================================== +// XAccesibleHypertext sal_Int32 SAL_CALL AccessibleShape::getHyperLinkCount() throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -1609,7 +1570,7 @@ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno: sal_Int32 nRet = 0; return nRet; } -//===== XAccesibleText ================================================== +// XAccesibleText sal_Int32 SAL_CALL AccessibleShape::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} sal_Bool SAL_CALL AccessibleShape::setCaretPosition( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;} sal_Unicode SAL_CALL AccessibleShape::getCharacter( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;} diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 9d8488ef579d..f73bceeaba77 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -254,12 +254,6 @@ namespace accessibility int mnNotifierClientId; }; - - - // AccessibleTextHelper_Impl implementation - - - AccessibleTextHelper_Impl::AccessibleTextHelper_Impl() : mxFrontEnd( NULL ), maLastSelection( EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND,EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND ), diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 5795f19f83a2..134f17ff1821 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -27,9 +27,7 @@ using ::com::sun::star::uno::Reference; namespace accessibility { - -//===== AccessibleChildrenManager =========================================== - +// AccessibleChildrenManager ChildrenManager::ChildrenManager ( const ::com::sun::star::uno::Reference<XAccessible>& rxParent, const ::com::sun::star::uno::Reference<drawing::XShapes>& rxShapeList, @@ -136,7 +134,7 @@ void ChildrenManager::RemoveFocus (void) mpImpl->RemoveFocus (); } -//===== IAccessibleViewForwarderListener ==================================== +// IAccessibleViewForwarderListener void ChildrenManager::ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) { diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 89a8238916c8..c156252efc8e 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -52,8 +52,7 @@ void adjustIndexInParentOfShapes(ChildDescriptorListType& _rList) } } -//===== AccessibleChildrenManager =========================================== - +// AccessibleChildrenManager ChildrenManagerImpl::ChildrenManagerImpl ( const uno::Reference<XAccessible>& rxParent, const uno::Reference<drawing::XShapes>& rxShapeList, @@ -655,11 +654,7 @@ void ChildrenManagerImpl::SetInfo (const AccessibleShapeTreeInfo& rShapeTreeInfo } } - - - -//===== lang::XEventListener ================================================ - +// lang::XEventListener void SAL_CALL ChildrenManagerImpl::disposing (const lang::EventObject& rEventObject) throw (uno::RuntimeException, std::exception) @@ -688,11 +683,7 @@ void SAL_CALL } } - - - -//===== document::XEventListener ============================================ - +// document::XEventListener /** Listen for new and removed shapes. */ void SAL_CALL @@ -711,11 +702,7 @@ void SAL_CALL // else ignore unknown event. } - - - -//===== view::XSelectionChangeListener ====================================== - +// view::XSelectionChangeListener void SAL_CALL ChildrenManagerImpl::selectionChanged (const lang::EventObject& /*rEvent*/) throw (uno::RuntimeException, std::exception) @@ -776,8 +763,7 @@ void SAL_CALL ChildrenManagerImpl::disposing (void) impl_dispose(); } -//===== IAccessibleViewForwarderListener ==================================== - +// IAccessibleViewForwarderListener void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) { @@ -796,11 +782,7 @@ void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType, } } - - - -//===== IAccessibleParent =================================================== - +// IAccessibleParent bool ChildrenManagerImpl::ReplaceChild ( AccessibleShape* pCurrentChild, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, @@ -1102,11 +1084,7 @@ void ChildrenManagerImpl::UnregisterAsDisposeListener ( static_cast<document::XEventListener*>(this)); } - - - -//===== AccessibleChildDescriptor =========================================== - +// AccessibleChildDescriptor ChildDescriptor::ChildDescriptor (const Reference<drawing::XShape>& xShape) : mxShape (xShape), mxAccessibleShape (NULL), diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 45a4b10d1a25..4ef4d8b30fc2 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -243,29 +243,22 @@ public: */ void RemoveFocus (void); - //===== lang::XEventListener ============================================ - + // lang::XEventListener virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - //===== document::XEventListener ======================================== - + // document::XEventListener virtual void SAL_CALL notifyEvent (const ::com::sun::star::document::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - //===== view::XSelectionChangeListener ================================== - + // view::XSelectionChangeListener virtual void SAL_CALL selectionChanged (const ::com::sun::star::lang::EventObject& rEvent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - //===== IAccessibleViewForwarderListener ================================ - + // IAccessibleViewForwarderListener /** Informs this children manager and its children about a change of one (or more) aspect of the view forwarder. @param aChangeType @@ -280,8 +273,7 @@ public: virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; - //===== IAccessibleParent =============================================== - + // IAccessibleParent /** Replace the specified child with a replacement. @param pCurrentChild This child is to be replaced. diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 04b85bae28bd..085bbb99dd46 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -37,7 +37,6 @@ #include <comphelper/accessibleeventnotifier.hxx> #include <svx/sdrpaintwindow.hxx> -//===== local includes ======================================================== #include <svx/ShapeTypeHandler.hxx> #include <svx/AccessibleShapeInfo.hxx> #include "GraphCtlAccessibleContext.hxx" @@ -50,8 +49,7 @@ #include <svx/svdetc.hxx> #include <svx/sdrhittesthelper.hxx> -//===== namespaces =========================================================== - +// namespaces using namespace ::cppu; using namespace ::osl; using namespace ::accessibility; @@ -61,9 +59,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; - -//===== internal ============================================================ - +// internal /** initialize this component and set default values */ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( const Reference< XAccessible >& rxParent, @@ -178,15 +174,13 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessible( return xAccessibleShape; } -//===== XAccessible ========================================================= - +// XAccessible Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) { return this; } -//===== XAccessibleComponent ================================================ - +// XAccessibleComponent sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { // no guard -> done in getSize() @@ -269,9 +263,7 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeExcept return awt::Size( aRect.getWidth(), aRect.getHeight() ); } - -//===== XAccessibleContext ================================================== - +// XAccessibleContext sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -447,8 +439,7 @@ lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( Il throw IllegalAccessibleComponentStateException(); } -//===== XAccessibleEventListener ============================================ - +// XAccessibleEventListener void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException, std::exception ) { @@ -555,8 +546,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) return static_cast<sal_Int32>(nColor); } - -//===== XServiceInfo ======================================================== +// XServiceInfo OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext" ); @@ -578,21 +568,19 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService return aSNs; } -//===== XTypeProvider ======================================================= +// XTypeProvider Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } -//===== XServiceName ======================================================== - +// XServiceName OUString SvxGraphCtrlAccessibleContext::getServiceName( void ) throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleContext" ); } -//===== XAccessibleSelection ============================================= - +// XAccessibleSelection void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -704,8 +692,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 } } -//===== internals ======================================================== - +// internals void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( long nIndex ) throw( lang::IndexOutOfBoundsException ) { if( nIndex < 0 || nIndex >= getSelectedAccessibleChildCount() ) @@ -875,8 +862,7 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi } } -//===== IAccessibleViewforwarder ======================================== - +// IAccessibleViewforwarder bool SvxGraphCtrlAccessibleContext::IsValid (void) const { return true; diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 1d45757fb26f..bcf602e75149 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -68,9 +68,6 @@ SvxPixelCtlAccessible::~SvxPixelCtlAccessible() dispose(); // set mpRepr = NULL & release all childs } } -/*-- 04.02.2002 14:11:55--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< XAccessibleContext > SvxPixelCtlAccessible::getAccessibleContext( ) throw (uno::RuntimeException, std::exception) { @@ -82,9 +79,6 @@ sal_Int32 SvxPixelCtlAccessible::getAccessibleChildCount( ) throw (uno::Runtime ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetSquares(); } -/*-- 04.02.2002 14:11:56--------------------------------------------------- - - -----------------------------------------------------------------------*/ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -119,9 +113,6 @@ sal_Int32 SvxPixelCtlAccessible::getAccessibleIndexInParent( ) break; return nIdx; } -/*-- 04.02.2002 14:11:57--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Int16 SvxPixelCtlAccessible::getAccessibleRole( ) throw (uno::RuntimeException, std::exception) { return AccessibleRole::LIST; @@ -592,15 +583,13 @@ SvxPixelCtlAccessibleChild::~SvxPixelCtlAccessibleChild() } } -//===== XAccessible ========================================================= - +// XAccessible uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext( void ) throw( RuntimeException, std::exception ) { return this; } -//===== XAccessibleComponent ================================================ - +// XAccessibleComponent sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { // no guard -> done in getBounds() @@ -665,8 +654,7 @@ sal_Int32 SvxPixelCtlAccessibleChild::getBackground( ) return mrParentWindow.GetControlBackground().GetColor(); } -//===== XAccessibleContext ================================================== - +// XAccessibleContext sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) { return 0; @@ -792,8 +780,7 @@ void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const u } } - -//===== XServiceInfo ======================================================== +// XServiceInfo OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName( void ) throw( RuntimeException, std::exception ) { return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxPixelCtlAccessibleChild" ) ); @@ -814,8 +801,7 @@ Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNam return aRet; } -//===== internal ============================================================ - +// internal void SvxPixelCtlAccessibleChild::CommitChange( const AccessibleEventObject& rEvent ) { if (mnClientId) diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index f0c8b226ac4d..eb7038253661 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -52,11 +52,7 @@ using namespace ::com::sun::star::lang; #define MAX_NUM_OF_CHILDREN 9 #define NOCHILDSELECTED -1 - - - -//===== internal ============================================================ - +// internal namespace { struct ChildIndexToPointData @@ -184,15 +180,13 @@ SvxRectCtlAccessibleContext::~SvxRectCtlAccessibleContext() } } -//===== XAccessible ========================================================= - +// XAccessible Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) { return this; } -//===== XAccessibleComponent ================================================ - +// XAccessibleComponent sal_Bool SAL_CALL SvxRectCtlAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { // no guard -> done in getBounds() @@ -259,8 +253,7 @@ bool SAL_CALL SvxRectCtlAccessibleContext::isFocusTraversable() throw( RuntimeEx return true; } -//===== XAccessibleContext ================================================== - +// XAccessibleContext sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -522,7 +515,7 @@ sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) return mpRepr->GetControlBackground().GetColor(); } -//===== XServiceInfo ======================================================== +// XServiceInfo OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" ); @@ -539,15 +532,13 @@ Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNa return Sequence< OUString >( &sServiceName, 1 ); } -//===== XTypeProvider ======================================================= - +// XTypeProvider Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } -//===== XAccessibleSelection ============================================= - +// XAccessibleSelection void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aSolarGuard; @@ -614,8 +605,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /* throw lang::IndexOutOfBoundsException( aMessage, *this ); // never possible } -//===== internals ======================================================== - +// internals void SvxRectCtlAccessibleContext::checkChildIndex( long nIndex ) throw( lang::IndexOutOfBoundsException ) { if( nIndex < 0 || nIndex >= getAccessibleChildCount() ) @@ -803,15 +793,13 @@ SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext() } } -//===== XAccessible ========================================================= - +// XAccessible Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) { return this; } -//===== XAccessibleComponent ================================================ - +// XAccessibleComponent sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { // no guard -> done in getBounds() @@ -905,8 +893,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( ) return mrParentWindow.GetControlBackground().GetColor(); } -//===== XAccessibleContext ================================================== - +// XAccessibleContext sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) { return 0; @@ -1038,8 +1025,7 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::removeAccessibleEventListener( c } } -//===== XAccessibleValue ================================================ - +// XAccessibleValue Any SAL_CALL SvxRectCtlChildAccessibleContext::getCurrentValue() throw( RuntimeException, std::exception ) { ThrowExceptionIfNotAlive(); @@ -1119,7 +1105,7 @@ Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessib return Reference< XAccessibleKeyBinding >(); } -//===== XServiceInfo ======================================================== +// XServiceInfo OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxRectCtlChildAccessibleContext" ); @@ -1136,14 +1122,12 @@ Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServ return Sequence< OUString >( &sServiceName, 1 ); } -//===== XTypeProvider ======================================================= +// XTypeProvider Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } -//===== internal ============================================================ - void SvxRectCtlChildAccessibleContext::CommitChange( const AccessibleEventObject& rEvent ) { if (mnClientId) diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index b0bd2a3375d3..a49a877a33b4 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -113,8 +113,7 @@ EnhancedCustomShapeEngine::~EnhancedCustomShapeEngine() { } -// XInterface ----------------------------------------------------------------- - +// XInterface void SAL_CALL EnhancedCustomShapeEngine::acquire() throw() { OWeakObject::acquire(); @@ -124,8 +123,7 @@ void SAL_CALL EnhancedCustomShapeEngine::release() throw() OWeakObject::release(); } -// XInitialization ------------------------------------------------------------ - +// XInitialization void SAL_CALL EnhancedCustomShapeEngine::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { @@ -146,7 +144,7 @@ void SAL_CALL EnhancedCustomShapeEngine::initialize( const Sequence< Any >& aArg } } -// XServiceInfo --------------------------------------------------------------- +// XServiceInfo OUString SAL_CALL EnhancedCustomShapeEngine::getImplementationName() throw( RuntimeException, std::exception ) { @@ -166,7 +164,7 @@ Sequence< OUString > SAL_CALL EnhancedCustomShapeEngine::getSupportedServiceName return aRet; } -// XCustomShapeEngine ----------------------------------------------------------- +// XCustomShapeEngine SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustomShape* pCustoObj, SdrObject* pRenderedShape ) { bool bHasText = pCustoObj->HasText(); diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index a2798fcaf555..1a1d2d0f283e 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -87,37 +87,22 @@ SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId rTbx.Invalidate(); } -/************************************************************************* -|* -|* Notification when the application status has changed -|* -\************************************************************************/ - +// Notification when the application status has changed void SvxTbxCtlCustomShapes::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { SfxToolBoxControl::StateChanged( nSID, eState, pState ); } -/************************************************************************* -|* -|* when one wants to create a popup window -|* -\************************************************************************/ - +// when one wants to create a popup window SfxPopupWindowType SvxTbxCtlCustomShapes::GetPopupWindowType() const { return( m_aCommand.isEmpty() ? SFX_POPUPWINDOW_ONCLICK : SFX_POPUPWINDOW_ONTIMEOUT); } -/************************************************************************* -|* -|* Here is the window created -|* The location of the Toolbox is queried through GetToolBox() -|* rItemRect are the screen coordinates -|* -\************************************************************************/ - +// Here is the window created +// The location of the Toolbox is queried through GetToolBox() +// rItemRect are the screen coordinates SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow() { createAndPositionSubToolBar( m_aSubTbxResName ); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 9458fbebce2f..349ad07dfa8c 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -47,9 +47,6 @@ SFX_IMPL_FLOATINGWINDOW_WITHID( SvxContourDlgChildWindow, SID_CONTOUR_DLG ); - -/******************************************************************************/ - SvxContourDlgItem::SvxContourDlgItem( sal_uInt16 _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) : SfxControllerItem ( _nId, rBindings ), rDlg ( rContourDlg ) @@ -266,8 +263,6 @@ SvxSuperContourDlg::~SvxSuperContourDlg() aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) ); } -// Resize methods - void SvxSuperContourDlg::Resize() { SfxFloatingWindow::Resize(); @@ -293,8 +288,6 @@ void SvxSuperContourDlg::Resize() } } -// Close methods - bool SvxSuperContourDlg::Close() { bool bRet = true; diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 6f68134d5dfa..0903a3259115 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -53,8 +53,6 @@ sal_uInt32& SvxShowCharSet::getSelectedChar() return cSelectedChar; } -// class SvxShowCharSet ================================================== - SvxShowCharSet::SvxShowCharSet(Window* pParent) : Control(pParent, WB_TABSTOP | WB_BORDER) , m_pAccessible(NULL) @@ -738,8 +736,6 @@ sal_Int32 SvxShowCharSet::getMaxCharCount() const return maFontCharMap.GetCharCount(); } - -// class SubsetMap ======================================================= // TODO: should be moved into Font Attributes stuff // we let it mature here though because it is currently the only use diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 732076eb9dd2..0180643b9af5 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -26,8 +26,6 @@ #include <vcl/builder.hxx> -// class SvxCheckListBox ------------------------------------------------- - SvxCheckListBox::SvxCheckListBox( Window* pParent, WinBits nWinStyle ) : SvTreeListBox( pParent, nWinStyle ) diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index d3aebb705358..1e5078a57587 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -116,10 +116,6 @@ void SvLBoxColorString::Paint( rDev.SetTextColor(a2Color); } - -// class SvxRedlinTable - - SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits) : SvSimpleTable(rParent,nBits) , bIsCalc(false) @@ -378,13 +374,6 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, } } - - - - -// class SvxTPView - - SvxTPView::SvxTPView(Window * pParent) : TabPage(pParent, "RedlineViewPage", "svx/ui/redlineviewpage.ui") , bEnableAccept(true) @@ -535,13 +524,6 @@ IMPL_LINK( SvxTPView, PbClickHdl, PushButton*, pPushB ) return 0; } - - - - -// class SvxTPFilter - - SvxTPFilter::SvxTPFilter( Window * pParent) : TabPage(pParent, "RedlineFilterPage", "svx/ui/redlinefilterpage.ui") , pRedlinTable(NULL) @@ -1074,10 +1056,6 @@ IMPL_LINK( SvxTPFilter, RefHandle, PushButton*, pRef ) return 0; } - -// class SvxAcceptChgCtr - - SvxAcceptChgCtr::SvxAcceptChgCtr(Window* pParent) : TabControl(pParent, WB_TABSTOP | WB_DIALOGCONTROL) { diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index b4e2316b7085..5016c12d5eb5 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -17,15 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// === includes (declaration) ============================================ #include "svx/databaseregistrationui.hxx" -// === includes (project) ================================================ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> -// === includes (global) ================================================= #include <sfx2/app.hxx> #include <svl/itemset.hxx> #include <vcl/msgbox.hxx> diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 02147de3e89c..d8da2985b566 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -117,8 +117,6 @@ void DialControlBmp::DrawElements( const OUString& rText, sal_Int32 nAngle ) DrawEllipse( Rectangle( nX - nSize, nY - nSize, nX + nSize, nY + nSize ) ); } -// private -------------------------------------------------------------------- - const Color& DialControlBmp::GetBackgroundColor() const { return GetSettings().GetStyleSettings().GetDialogColor(); @@ -427,8 +425,6 @@ void DialControl::SetModifyHdl( const Link& rLink ) mpImpl->maModifyHdl = rLink; } -// private -------------------------------------------------------------------- - void DialControl::Init( const Size& rWinSize, const Font& rWinFont ) { mpImpl->Init( rWinSize, rWinFont ); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 58214e753159..79c2176acd66 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1163,16 +1163,12 @@ void ColorLB::Fill( const XColorListRef &pColorTab ) SetUpdateMode( true ); } -/************************************************************************/ - void ColorLB::Append( const XColorEntry& rEntry ) { InsertEntry( rEntry.GetColor(), rEntry.GetName() ); AdaptDropDownLineCountToMaximum(); } -/************************************************************************/ - void ColorLB::Modify( const XColorEntry& rEntry, sal_Int32 nPos ) { RemoveEntry( nPos ); @@ -1242,8 +1238,6 @@ void HatchingLB::Fill( const XHatchListRef &pList ) SetUpdateMode( true ); } -/************************************************************************/ - void HatchingLB::Append( const XHatchEntry& rEntry, const Bitmap& rBitmap ) { if(!rBitmap.IsEmpty()) @@ -1258,8 +1252,6 @@ void HatchingLB::Append( const XHatchEntry& rEntry, const Bitmap& rBitmap ) AdaptDropDownLineCountToMaximum(); } -/************************************************************************/ - void HatchingLB::Modify( const XHatchEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ) { RemoveEntry( nPos ); @@ -1341,8 +1333,6 @@ void GradientLB::Fill( const XGradientListRef &pList ) SetUpdateMode( true ); } -/************************************************************************/ - void GradientLB::Append( const XGradientEntry& rEntry, const Bitmap& rBitmap ) { if(!rBitmap.IsEmpty()) @@ -1357,8 +1347,6 @@ void GradientLB::Append( const XGradientEntry& rEntry, const Bitmap& rBitmap ) AdaptDropDownLineCountToMaximum(); } -/************************************************************************/ - void GradientLB::Modify( const XGradientEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ) { RemoveEntry( nPos ); @@ -1373,8 +1361,6 @@ void GradientLB::Modify( const XGradientEntry& rEntry, sal_Int32 nPos, const Bit } } -/************************************************************************/ - void GradientLB::SelectEntryByList( const XGradientListRef &pList, const OUString& rStr, const XGradient& rGradient, sal_uInt16 nDist ) { @@ -1440,8 +1426,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBitmapLB(Window *pParent, V return pListBox; } -/************************************************************************/ - namespace { void formatBitmapExToSize(BitmapEx& rBitmapEx, const Size& rSize) @@ -1496,8 +1480,6 @@ namespace } } // end of anonymous namespace -/************************************************************************/ - void BitmapLB::Fill( const XBitmapListRef &pList ) { if( !pList.is() ) @@ -1523,8 +1505,6 @@ void BitmapLB::Fill( const XBitmapListRef &pList ) SetUpdateMode(true); } -/************************************************************************/ - void BitmapLB::Append(const Size& rSize, const XBitmapEntry& rEntry) { maBitmapEx = rEntry.GetGraphicObject().GetGraphic().GetBitmapEx(); @@ -1542,8 +1522,6 @@ void BitmapLB::Append(const Size& rSize, const XBitmapEntry& rEntry) AdaptDropDownLineCountToMaximum(); } -/************************************************************************/ - void BitmapLB::Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_Int32 nPos) { RemoveEntry(nPos); @@ -1565,8 +1543,6 @@ FillAttrLB::FillAttrLB(Window* pParent, WinBits aWB) { } -/************************************************************************/ - void FillAttrLB::Fill( const XBitmapListRef &pList ) { const long nCount(pList->Count()); @@ -1676,8 +1652,6 @@ void LineLB::Fill( const XDashListRef &pList ) SetUpdateMode( true ); } -/************************************************************************/ - void LineLB::Append( const XDashEntry& rEntry, const Bitmap& rBitmap ) { if(!rBitmap.IsEmpty()) @@ -1692,8 +1666,6 @@ void LineLB::Append( const XDashEntry& rEntry, const Bitmap& rBitmap ) AdaptDropDownLineCountToMaximum(); } -/************************************************************************/ - void LineLB::Modify( const XDashEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ) { RemoveEntry( nPos ); @@ -1767,8 +1739,6 @@ void LineEndLB::Fill( const XLineEndListRef &pList, bool bStart ) SetUpdateMode( true ); } -/************************************************************************/ - void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool bStart ) { if(!rBitmap.IsEmpty()) @@ -1792,8 +1762,6 @@ void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool AdaptDropDownLineCountToMaximum(); } -/************************************************************************/ - void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap, bool bStart ) { RemoveEntry( nPos ); diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 80ca47844986..5f4a53da0dde 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -68,8 +68,6 @@ #include <editeng/charscaleitem.hxx> #include <editeng/langitem.hxx> -// define ---------------------------------------------------------------- - //TODO: remove this and calculate off the actual size of text, not //an arbitrary number of characters #define TEXT_WIDTH 80 @@ -125,10 +123,6 @@ namespace } - - -// class FontPrevWin_Impl ----------------------------------------------- - class FontPrevWin_Impl { friend class SvxFontPrevWindow; @@ -219,8 +213,6 @@ inline bool FontPrevWin_Impl::Is100PercentFontWidthValid() const return n100PercentFontWidth != -1; } -// class FontPrevWin_Impl ----------------------------------------------- - /* * evalutates the scripttypes of the actual string. * Afterwards the positions of script change are notified in aScriptChg, @@ -439,8 +431,6 @@ void FontPrevWin_Impl::ScaleFontWidth( const OutputDevice& rOutDev ) aCTLFont.SetWidth( n100PercentFontWidthCTL * nFontWidthScale / 100 ); } -// class SvxFontPrevWindow ----------------------------------------------- - void SvxFontPrevWindow::InitSettings( bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 9a9a012bdcd2..9ad80ccc53b0 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -401,8 +401,7 @@ Array::~Array() { } -// array size and column/row indexes ------------------------------------------ - +// array size and column/row indexes void Array::Initialize( size_t nWidth, size_t nHeight ) { bool bDiagDblClip = mxImpl.get() ? mxImpl->mbDiagDblClip : DIAG_DBL_CLIP_DEFAULT; @@ -432,8 +431,7 @@ size_t Array::GetCellIndex( size_t nCol, size_t nRow, bool bRTL ) const return mxImpl->GetIndex( nCol, nRow ); } -// cell border styles --------------------------------------------------------- - +// cell border styles void Array::SetCellStyleLeft( size_t nCol, size_t nRow, const Style& rStyle ) { DBG_FRAME_CHECK_COLROW( nCol, nRow, "SetCellStyleLeft" ); @@ -650,8 +648,7 @@ const Style& Array::GetCellStyleTR( size_t nCol, size_t nRow ) const CELL( mxImpl->GetMergedFirstCol( nCol, nRow ), nFirstRow ).maBLTR : OBJ_STYLE_NONE; } -// cell merging --------------------------------------------------------------- - +// cell merging void Array::SetMergedRange( size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow ) { DBG_FRAME_CHECK_COLROW( nFirstCol, nFirstRow, "SetMergedRange" ); @@ -734,8 +731,7 @@ void Array::GetMergedRange( size_t& rnFirstCol, size_t& rnFirstRow, rnLastRow = mxImpl->GetMergedLastRow( nCol, nRow ); } -// clipping ------------------------------------------------------------------- - +// clipping void Array::SetClipRange( size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow ) { DBG_FRAME_CHECK_COLROW( nFirstCol, nFirstRow, "SetClipRange" ); @@ -755,8 +751,7 @@ Rectangle Array::GetClipRangeRectangle() const mxImpl->GetRowPosition( mxImpl->mnLastClipRow + 1 ) ); } -// cell coordinates ----------------------------------------------------------- - +// cell coordinates void Array::SetXOffset( long nXOffset ) { mxImpl->maXCoords[ 0 ] = nXOffset; @@ -863,8 +858,7 @@ Rectangle Array::GetCellRect( size_t nCol, size_t nRow, bool bSimple ) const return aRect; } -// diagonal frame borders ----------------------------------------------------- - +// diagonal frame borders double Array::GetHorDiagAngle( size_t nCol, size_t nRow, bool bSimple ) const { DBG_FRAME_CHECK_COLROW( nCol, nRow, "GetHorDiagAngle" ); @@ -882,8 +876,7 @@ void Array::SetUseDiagDoubleClipping( bool bSet ) mxImpl->mbDiagDblClip = bSet; } -// mirroring ------------------------------------------------------------------ - +// mirroring void Array::MirrorSelfX( bool bMirrorStyles, bool bSwapDiag ) { CellVec aNewCells; @@ -918,8 +911,7 @@ void Array::MirrorSelfX( bool bMirrorStyles, bool bSwapDiag ) mxImpl->mbXCoordsDirty = true; } -// drawing -------------------------------------------------------------------- - +// drawing void Array::DrawRange( drawinglayer::processor2d::BaseProcessor2D* pProcessor, size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow, const Color* pForceColor ) const diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 01763dd2ed66..3a8b0e32a7ed 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -108,10 +108,6 @@ inline void lclPolyPolyUnion( PolyPolygon& rDest, const PolyPolygon& rSource ) } // namespace - -// FrameBorder - - FrameBorder::FrameBorder( FrameBorderType eType ) : meType( eType ), meState( FRAMESTATE_HIDE ), @@ -210,10 +206,6 @@ FrameBorderType FrameBorder::GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const return eBorder; } - -// FrameSelectorImpl - - FrameSelectorImpl::FrameSelectorImpl( FrameSelector& rFrameSel ) : Resource( SVX_RES( RID_SVXSTR_BORDER_CONTROL ) ), mrFrameSel( rFrameSel ), @@ -285,8 +277,7 @@ FrameSelectorImpl::~FrameSelectorImpl() (*aIt)->Invalidate(); } -// initialization ------------------------------------------------------------- - +// initialization void FrameSelectorImpl::Initialize( FrameSelFlags nFlags ) { mnFlags = nFlags; @@ -364,15 +355,13 @@ void FrameSelectorImpl::InitBorderGeometry() { size_t nCol, nCols, nRow, nRows; - // Global border geometry values ------------------------------------------ - + // Global border geometry values /* mnLine* is the middle point inside a frame border (i.e. mnLine1 is mid X inside left border). */ mnLine1 = mnArrowSize + FRAMESEL_GEOM_INNER + FRAMESEL_GEOM_WIDTH / 2; mnLine2 = mnCtrlSize / 2; mnLine3 = 2 * mnLine2 - mnLine1; - // Frame helper array ----------------------------------------------------- - + // Frame helper array maArray.Initialize( mbVer ? 2 : 1, mbHor ? 2 : 1 ); maArray.SetUseDiagDoubleClipping( true ); @@ -382,8 +371,7 @@ void FrameSelectorImpl::InitBorderGeometry() maArray.SetYOffset( mnLine1 ); maArray.SetAllRowHeights( (mbHor ? mnLine2 : mnLine3) - mnLine1 ); - // Focus polygons --------------------------------------------------------- - + // Focus polygons /* Width for focus rectangles from center of frame borders. */ mnFocusOffs = FRAMESEL_GEOM_WIDTH / 2 + 1; @@ -429,8 +417,7 @@ void FrameSelectorImpl::InitBorderGeometry() } } - // Click areas ------------------------------------------------------------ - + // Click areas for( FrameBorderIter aIt( maAllBorders ); aIt.Is(); ++aIt ) (*aIt)->ClearClickArea(); @@ -511,8 +498,7 @@ void FrameSelectorImpl::sizeChanged() DoInvalidate( true ); } -// frame border access -------------------------------------------------------- - +// frame border access const FrameBorder& FrameSelectorImpl::GetBorder( FrameBorderType eBorder ) const { size_t nIndex = GetIndexFromFrameBorderType( eBorder ); @@ -527,8 +513,7 @@ FrameBorder& FrameSelectorImpl::GetBorderAccess( FrameBorderType eBorder ) return const_cast< FrameBorder& >( GetBorder( eBorder ) ); } -// drawing -------------------------------------------------------------------- - +// drawing void FrameSelectorImpl::DrawBackground() { // clear the area @@ -718,8 +703,7 @@ void FrameSelectorImpl::DoInvalidate( bool bFullRepaint ) mrFrameSel.Invalidate( INVALIDATE_NOERASE ); } -// frame border state and style ----------------------------------------------- - +// frame border state and style void FrameSelectorImpl::SetBorderState( FrameBorder& rBorder, FrameBorderState eState ) { DBG_ASSERT( rBorder.IsEnabled(), "svx::FrameSelectorImpl::SetBorderState - access to disabled border" ); @@ -767,8 +751,7 @@ void FrameSelectorImpl::ToggleBorderState( FrameBorder& rBorder ) } } -// frame border selection ----------------------------------------------------- - +// frame border selection void FrameSelectorImpl::SelectBorder( FrameBorder& rBorder, bool bSelect ) { DBG_ASSERT( rBorder.IsEnabled(), "svx::FrameSelectorImpl::SelectBorder - access to disabled border" ); @@ -798,10 +781,6 @@ bool FrameSelectorImpl::SelectedBordersEqual() const return bEqual; } - -// FrameSelector - - FrameSelector::FrameSelector(Window* pParent) : Control(pParent, WB_BORDER|WB_TABSTOP) { @@ -825,8 +804,7 @@ void FrameSelector::Initialize( FrameSelFlags nFlags ) Show(); } -// enabled frame borders ------------------------------------------------------ - +// enabled frame borders bool FrameSelector::IsBorderEnabled( FrameBorderType eBorder ) const { return mxImpl->GetBorder( eBorder ).IsEnabled(); @@ -858,8 +836,7 @@ sal_Int32 FrameSelector::GetEnabledBorderIndex( FrameBorderType eBorder ) const return -1; } -// frame border state and style ----------------------------------------------- - +// frame border state and style bool FrameSelector::SupportsDontCareState() const { return (mxImpl->mnFlags & FRAMESEL_DONTCARE) != 0; @@ -941,8 +918,7 @@ bool FrameSelector::GetVisibleColor( Color& rColor ) const return bFound; } -// frame border selection ----------------------------------------------------- - +// frame border selection const Link& FrameSelector::GetSelectHdl() const { return mxImpl->maSelectHdl; @@ -1008,8 +984,7 @@ void FrameSelector::SetColorToSelection( const Color& rColor ) mxImpl->SetBorderState( **aIt, FRAMESTATE_SHOW ); } -// accessibility -------------------------------------------------------------- - +// accessibility Reference< XAccessible > FrameSelector::CreateAccessible() { if( !mxImpl->mxAccess.is() ) @@ -1064,8 +1039,7 @@ Rectangle FrameSelector::GetClickBoundRect( FrameBorderType eBorder ) const return aRect; } -// virtual functions from base class ------------------------------------------ - +// virtual functions from base class void FrameSelector::Paint( const Rectangle& ) { mxImpl->CopyVirDevToControl(); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 4c9b21e5f029..616ff403b266 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -55,8 +55,6 @@ using namespace com::sun::star; -// static ---------------------------------------------------------------- - // Word 97 incompatibility (#i19922#) static const long MINBODY = 56; // 1mm in twips rounded @@ -696,7 +694,6 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) pItem = aIter.NextItem(); } - //---------------------------------------------------------------- { drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes; @@ -732,7 +729,6 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) } } - //---------------------------------------------------------------- { const sal_uInt16 nWhich = GetWhich(SID_ATTR_BORDER_OUTER); diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index feb1c309fa40..416faa608bc6 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -68,8 +68,6 @@ #define IMAP_CERN_EXT OUString("map") #define IMAP_NCSA_EXT OUString("map") -/******************************************************************************/ - SFX_IMPL_MODELESSDIALOG_WITHID( SvxIMapDlgChildWindow, SID_IMAP ); // ControllerItem diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index ed2d580e477e..3a1145d31717 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -31,13 +31,9 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -// STATIC DATA ----------------------------------------------------------- - #define CELL_WIDTH 1600L #define CELL_HEIGHT 800L -// class SvxPageWindow --------------------------------------------------- - SvxPageWindow::SvxPageWindow(Window* pParent) : Window(pParent), aWinSize(), diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index 9eaa96470580..ac4c7f341052 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -22,8 +22,6 @@ #include <vcl/builder.hxx> #include <vcl/settings.hxx> -// class SvxParaPrevWindow ----------------------------------------------- - SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, WinBits nBits) : Window( pParent, nBits), diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 9933dc03ba6d..af770701c26f 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -23,8 +23,6 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -// class SvxPasswordDialog ----------------------------------------------- - IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl) { bool bOK = true; diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 6d17f81c987b..e02fdb9cac8f 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -35,8 +35,6 @@ #include "svx/rulritem.hxx" #include <svl/eitem.hxx> -// class SvxRulerItem ---------------------------------------------------- - SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindings) : SfxControllerItem(_nId, rBindings), rRuler(rRul) diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx index 62e6a2d9d076..648ccc55238d 100644 --- a/svx/source/dialog/rlrcitem.hxx +++ b/svx/source/dialog/rlrcitem.hxx @@ -23,8 +23,6 @@ class SvxRuler; -// class SvxRulerItem ---------------------------------------------------- - class SvxRulerItem : public SfxControllerItem { private: diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index ce98f9c82038..a94085bd9f45 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -641,11 +641,6 @@ bool SvxColumnItem::IsLastAct() const return nActColumn == Count() - 1; } - - - -/* SvxColumnDescription */ - SvxColumnDescription::SvxColumnDescription() : nStart (0), nEnd (0), diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 479a165ef287..46c6a9baa37c 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -26,8 +26,6 @@ #include "svx/srchdlg.hxx" #include <svl/srchitem.hxx> -// class SvxSearchFamilyControllerItem ----------------------------------- - SvxSearchController::SvxSearchController ( sal_uInt16 _nId, diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx index d33525b2dd43..7385d77f5cd5 100644 --- a/svx/source/dialog/srchctrl.hxx +++ b/svx/source/dialog/srchctrl.hxx @@ -20,8 +20,6 @@ #define INCLUDED_SVX_SOURCE_DIALOG_SRCHCTRL_HXX #include <sfx2/ctrlitem.hxx> -// class SvxSearchFamilyController --------------------------------------- - class SvxSearchDialog; class SvxSearchController : public SfxControllerItem diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 0264cbb82336..e4673fb8c8ac 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -155,8 +155,6 @@ void StrArrToList_Impl( sal_uInt16 nId, const std::vector<OUString>& rStrLst ) SfxGetpApp()->PutItem( SfxStringListItem( nId, &rStrLst ) ); } -// class SearchAttrItemList ---------------------------------------------- - SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) : SrchAttrItemList(rList) { @@ -247,8 +245,6 @@ void SearchAttrItemList::Remove(size_t nPos, size_t nLen) SrchAttrItemList::erase( begin() + nPos, begin() + nPos + nLen ); } -// class SvxSearchDialog ------------------------------------------------- - SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ) : SfxModelessDialog(&rBind, pChildWin, pParent, "FindReplaceDialog", "svx/ui/findreplacedialog.ui") @@ -2213,8 +2209,6 @@ void SvxSearchDialog::SaveToModule_Impl() return xPeer; } -// class SvxSearchDialogWrapper ------------------------------------------ - SFX_IMPL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper, SID_SEARCH_DLG); diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx index 3ea9673cfe0c..6579f2d47c7f 100644 --- a/svx/source/dialog/stddlg.cxx +++ b/svx/source/dialog/stddlg.cxx @@ -21,11 +21,6 @@ #include <svx/stddlg.hxx> -// STATIC DATA ----------------------------------------------------------- - - -// class SvxStandardDialog ----------------------------------------------- - short SvxStandardDialog::Execute() { short nRet = ModalDialog::Execute(); diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 7e3d27c16808..bf12a85572aa 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -43,8 +43,6 @@ #define RULER_TAB_RTL ((sal_uInt16)0x0010) #endif -// STATIC DATA ----------------------------------------------------------- - #define CTRL_ITEM_COUNT 14 #define GAP 10 #define OBJECT_BORDER_COUNT 4 diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index ae5ba01aa4b0..86afcac86d1c 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -33,10 +33,6 @@ #include <rtl/strbuf.hxx> #include <osl/nlsupport.h> - -// class SvxTextEncodingBox - - SvxTextEncodingBox::SvxTextEncodingBox( Window* pParent, WinBits nBits ) : ListBox( pParent, nBits ) { diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index 72b79da27425..b7b0b47730f8 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -250,12 +250,6 @@ void E3dDragMethod::CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverl } } -/************************************************************************* - - E3dDragRotate - -*************************************************************************/ - TYPEINIT1(E3dDragRotate, E3dDragMethod); E3dDragRotate::E3dDragRotate(SdrDragView &_rView, diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx index 38c287fde338..fbd03121bd58 100644 --- a/svx/source/engine3d/e3dundo.cxx +++ b/svx/source/engine3d/e3dundo.cxx @@ -24,8 +24,6 @@ #include <svx/scene3d.hxx> #include <svx/e3dsceneupdater.hxx> -/************************************************************************/ - TYPEINIT1(E3dUndoAction, SfxUndoAction); E3dUndoAction::~E3dUndoAction () @@ -39,16 +37,8 @@ bool E3dUndoAction::CanRepeat(SfxRepeatTarget&) const return false; } -/************************************************************************/ - TYPEINIT1(E3dRotateUndoAction, E3dUndoAction); -/************************************************************************ - - E3dRotateUndoAction - -************************************************************************/ - // Undo destructor for 3D-Rotation E3dRotateUndoAction::~E3dRotateUndoAction () diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 7dcc3b840b94..d0c259ded1d8 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -83,10 +83,6 @@ namespace { } } - -/************************************************************************* -|* Svx3DWin - FloatingWindow -\************************************************************************/ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, SfxChildWindow *pCW, Window* pParent ) : SfxDockingWindow ( pInBindings, pCW, pParent, diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index ff32a413f550..1924a1036f73 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -758,10 +758,6 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs) SetGlueReallyAbsolute(false); // from now they are again relative to BoundRect (that is defined as aOutRect) } -/*************************************************************************/ - - - sdr::properties::BaseProperties* E3dCompoundObject::CreateObjectSpecificProperties() { return new sdr::properties::E3dCompoundProperties(*this); diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx index a62bc0bdd458..379abcdfb5fc 100644 --- a/svx/source/engine3d/polysc3d.cxx +++ b/svx/source/engine3d/polysc3d.cxx @@ -34,8 +34,6 @@ #include <svx/xtable.hxx> #include <svx/xlnwtit.hxx> -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1(E3dPolyScene, E3dScene); E3dPolyScene::E3dPolyScene() diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 4cd42174270f..489e4416d5ee 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -43,10 +43,6 @@ namespace svx using namespace ::com::sun::star::datatransfer; using namespace ::comphelper; - - //= OColumnTransferable - - OColumnTransferable::OColumnTransferable(const OUString& _rDatasource ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType @@ -380,9 +376,6 @@ namespace svx } } - - //= ODataAccessObjectTransferable - ODataAccessObjectTransferable::ODataAccessObjectTransferable( const OUString& _rDatasource ,const OUString& _rConnectionResource diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index c994db3426db..c327c751bb72 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -43,10 +43,6 @@ namespace svx using namespace ::com::sun::star::datatransfer; using namespace ::comphelper; - - //= OComponentTransferable - - OComponentTransferable::OComponentTransferable(const OUString& _rDatasourceOrLocation ,const Reference< XContent>& _xContent) { diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 57b593146dcf..2a585d50136b 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1879,7 +1879,7 @@ namespace } } -// Object data and state ------------------------------------------------------ +// Object data and state OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const { OUString sRetText; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 217f19ffdf5e..f519b46cf0e3 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -121,10 +121,6 @@ Font ImplCreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr ) return aFont; } - -//= FmXModifyMultiplexer - - FmXModifyMultiplexer::FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) ,OInterfaceContainerHelper( _rMutex ) @@ -159,10 +155,6 @@ void FmXModifyMultiplexer::modified(const EventObject& e) throw( RuntimeExceptio notifyEach( &XModifyListener::modified, aMulti ); } - -//= FmXUpdateMultiplexer - - FmXUpdateMultiplexer::FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) ,OInterfaceContainerHelper( _rMutex ) @@ -214,11 +206,6 @@ void FmXUpdateMultiplexer::updated(const EventObject &e) throw( RuntimeException notifyEach( &XUpdateListener::updated, aMulti ); } - - -//= FmXSelectionMultiplexer - - FmXSelectionMultiplexer::FmXSelectionMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) ,OInterfaceContainerHelper( _rMutex ) @@ -253,10 +240,6 @@ void SAL_CALL FmXSelectionMultiplexer::selectionChanged( const EventObject& _rEv notifyEach( &XSelectionChangeListener::selectionChanged, aMulti ); } - -//= FmXContainerMultiplexer - - FmXContainerMultiplexer::FmXContainerMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) ,OInterfaceContainerHelper( _rMutex ) @@ -307,10 +290,6 @@ void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e) throw( Ru notifyEach( &XContainerListener::elementReplaced, aMulti ); } - -//= FmXGridControlMultiplexer - - FmXGridControlMultiplexer::FmXGridControlMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) ,OInterfaceContainerHelper( _rMutex ) @@ -994,9 +973,6 @@ sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) throw( Runt return xPeer.is() ? xPeer->supportsMode(Mode) : sal_False; } - -//= FmXGridPeer - // helper class which prevents that in the peer's header the FmGridListener must be known class FmXGridPeer::GridListenerDelegator : public FmGridListener { diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index e4107ca2fe18..f03604bdc179 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1039,13 +1039,7 @@ void DbCellControl::invalidatedController() m_rColumn.GetParent().refreshController(m_rColumn.GetId(), DbGridControl::GrantControlAccess()); } -/*************************************************************************/ // CellModels -/*************************************************************************/ - - -//= DbLimitedLengthField - DbLimitedLengthField::DbLimitedLengthField( DbGridColumn& _rColumn ) :DbCellControl( _rColumn ) @@ -1073,7 +1067,6 @@ void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) dynamic_cast<Edit&>(*m_pPainter).SetMaxTextLen(_nMaxLen); } -//= DbTextField DbTextField::DbTextField(DbGridColumn& _rColumn) :DbLimitedLengthField(_rColumn) ,m_pEdit( NULL ) @@ -1247,10 +1240,6 @@ void DbTextField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) m_pPainterImplementation->SetMaxTextLen( _nMaxLen ); } - -//= DbFormattedField - - DbFormattedField::DbFormattedField(DbGridColumn& _rColumn) :DbLimitedLengthField(_rColumn) ,m_nKeyType(::com::sun::star::util::NumberFormat::UNDEFINED) @@ -1629,10 +1618,6 @@ bool DbFormattedField::commitControl() return true; } - -//= DbCheckBox - - DbCheckBox::DbCheckBox( DbGridColumn& _rColumn ) :DbCellControl( _rColumn, true ) { @@ -1755,9 +1740,6 @@ OUString DbCheckBox::GetFormatText(const Reference< XColumn >& /*_rxField*/, con return OUString(); } - -//= DbPatternField - DbPatternField::DbPatternField( DbGridColumn& _rColumn, const Reference<XComponentContext>& _rContext ) :DbCellControl( _rColumn ) ,m_xContext( _rContext ) @@ -1872,10 +1854,6 @@ bool DbPatternField::commitControl() return true; } - -//= DbSpinField - - DbSpinField::DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign ) :DbCellControl( _rColumn ) ,m_nStandardAlign( _nStandardAlign ) @@ -1910,10 +1888,6 @@ CellControllerRef DbSpinField::CreateController() const return new SpinCellController( static_cast< SpinField* >( m_pWindow ) ); } - -//= DbNumericField - - DbNumericField::DbNumericField( DbGridColumn& _rColumn ) :DbSpinField( _rColumn ) { @@ -2052,10 +2026,6 @@ bool DbNumericField::commitControl() return true; } - -//= DbCurrencyField - - DbCurrencyField::DbCurrencyField(DbGridColumn& _rColumn) :DbSpinField( _rColumn ) ,m_nScale( 0 ) @@ -2208,10 +2178,6 @@ bool DbCurrencyField::commitControl() return true; } - -//= DbDateField - - DbDateField::DbDateField( DbGridColumn& _rColumn ) :DbSpinField( _rColumn ) { @@ -2341,10 +2307,6 @@ bool DbDateField::commitControl() return true; } - -//= DbTimeField - - DbTimeField::DbTimeField( DbGridColumn& _rColumn ) :DbSpinField( _rColumn, ::com::sun::star::awt::TextAlign::LEFT ) { @@ -2453,10 +2415,6 @@ bool DbTimeField::commitControl() return true; } - -//= DbComboBox - - DbComboBox::DbComboBox(DbGridColumn& _rColumn) :DbCellControl(_rColumn) ,m_nKeyType(::com::sun::star::util::NumberFormat::UNDEFINED) @@ -2740,8 +2698,6 @@ bool DbListBox::commitControl() return true; } - -/*************************************************************************/ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbGridColumn& _rColumn) :DbCellControl(_rColumn) ,OSQLParserClient(rxContext) @@ -3205,7 +3161,6 @@ IMPL_LINK_NOARG(DbFilterField, OnClick) return 1; } -/*************************************************************************/ TYPEINIT0(FmXGridCell); @@ -3569,7 +3524,6 @@ void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWi } } -/*************************************************************************/ TYPEINIT1(FmXDataCell, FmXGridCell); void FmXDataCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, @@ -3587,7 +3541,6 @@ void FmXDataCell::UpdateFromColumn() m_pCellControl->UpdateFromField(xField, m_pColumn->GetParent().getNumberFormatter()); } -/*************************************************************************/ TYPEINIT1(FmXTextCell, FmXDataCell); FmXTextCell::FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl ) @@ -3637,10 +3590,6 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev, rDev.DrawText(rRect, aText, nStyle); } - -/*************************************************************************/ - - FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl ) :FmXTextCell( pColumn, _rControl ) ,m_aTextListeners(m_aMutex) @@ -3903,8 +3852,6 @@ void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWi FmXTextCell::onWindowEvent( _nEventId, _rWindow, _pEventData ); } -/*************************************************************************/ - FmXCheckBoxCell::FmXCheckBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl ) :FmXDataCell( pColumn, _rControl ) ,m_aItemListeners(m_aMutex) @@ -4079,9 +4026,6 @@ void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& } } -/*************************************************************************/ - - FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn, DbCellControl& _rControl) :FmXTextCell( pColumn, _rControl ) ,m_aItemListeners(m_aMutex) @@ -4418,11 +4362,6 @@ IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick) return 1; } - -/*************************************************************************/ - - - FmXComboBoxCell::FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl ) :FmXTextCell( pColumn, _rControl ) ,m_aItemListeners( m_aMutex ) @@ -4610,7 +4549,6 @@ void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& } } -/*************************************************************************/ TYPEINIT1(FmXFilterCell, FmXGridCell); FmXFilterCell::FmXFilterCell(DbGridColumn* pColumn, DbCellControl* pControl ) diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index 0460e2596c92..e7ec9d434ba3 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -29,10 +29,6 @@ namespace svx using namespace ::com::sun::star::datatransfer; - - //= OXFormsTransferable - - OXFormsTransferable::OXFormsTransferable( const OXFormsDescriptor &rhs ) : m_aDescriptor(rhs) { diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index a17f12b2ee66..7d776cb63b0d 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -33,9 +33,6 @@ using namespace svxform; using namespace ::connectivity; -//= OSystemParseContext - - OSystemParseContext::OSystemParseContext() : IParseContext() { SolarMutexGuard aGuard; diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index efabc93b1d6f..e09593bc5e65 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -37,9 +37,6 @@ namespace svx using namespace ::com::sun::star::ucb; using namespace ::comphelper; - - //= ODADescriptorImpl - class ODADescriptorImpl { protected: @@ -272,10 +269,6 @@ namespace svx m_bSequenceOutOfDate = false; } - - //= ODataAccessDescriptor - - ODataAccessDescriptor::ODataAccessDescriptor() :m_pImpl(new ODADescriptorImpl) { diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index f2143334e6bd..2a4f2d40b8cc 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -50,9 +50,6 @@ namespace svx namespace TemplateDescription = ::com::sun::star::ui::dialogs::TemplateDescription; - - //= DatabaseLocationInputController_Impl - class DatabaseLocationInputController_Impl { public: @@ -263,10 +260,6 @@ namespace svx m_bNeedExistenceCheck = true; } - - //= DatabaseLocationInputController - - DatabaseLocationInputController::DatabaseLocationInputController( const Reference<XComponentContext>& _rContext, ::svt::OFileURLControl& _rLocationInput, PushButton& _rBrowseButton ) :m_pImpl( new DatabaseLocationInputController_Impl( _rContext, _rLocationInput, _rBrowseButton ) ) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 6708f9081bcb..69b24e2e8abd 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -124,7 +124,6 @@ namespace svxform m_xPropSet( _rxSet ) {} }; - // class DataTreeListBox DataTreeListBox::DataTreeListBox(Window* pParent, WinBits nBits) : SvTreeListBox(pParent, nBits) , m_pXFormsPage(NULL) @@ -1343,7 +1342,6 @@ namespace svxform } } - // class DataNavigatorWindow DataNavigatorWindow::DataNavigatorWindow(Window* pParent, SfxBindings* pBindings) : Window(pParent) , m_pInstPage(NULL) @@ -2127,10 +2125,6 @@ namespace svxform } } - - // class DataNavigator - - DataNavigator::DataNavigator( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) : SfxDockingWindow( _pBindings, _pMgr, _pParent, @@ -2248,10 +2242,6 @@ namespace svxform ( (SfxDockingWindow*)pWindow )->Initialize( _pInfo ); } - - // class AddDataItemDialog - - AddDataItemDialog::AddDataItemDialog(Window* pParent, ItemNode* _pNode, const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper) : ModalDialog(pParent, "AddDataItemDialog" , "svx/ui/adddataitemdialog.ui") @@ -2729,10 +2719,6 @@ namespace svxform m_pItemFrame->set_label(sText); } - - // class AddConditionDialog - - AddConditionDialog::AddConditionDialog(Window* pParent, const OUString& _rPropertyName, const Reference< XPropertySet >& _rPropSet) @@ -2858,10 +2844,6 @@ namespace svxform return 0; } - - // class NamespaceItemDialog - - NamespaceItemDialog::NamespaceItemDialog( AddConditionDialog* _pCondDlg, Reference< XNameContainer >& _rContainer ) @@ -3032,10 +3014,6 @@ namespace svxform } } - - // class ManageNamespaceDialog - - ManageNamespaceDialog::ManageNamespaceDialog(Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit) : ModalDialog(pParent, "AddNamespaceDialog", "svx/ui/addnamespacedialog.ui") , m_pConditionDlg ( _pCondDlg ) @@ -3075,10 +3053,6 @@ namespace svxform return 0; } - - // class AddSubmissionDialog - - AddSubmissionDialog::AddSubmissionDialog( Window* pParent, ItemNode* _pNode, const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper) @@ -3297,10 +3271,6 @@ namespace svxform m_pRefBtn->Enable( m_xTempBinding.is() ); } - - // class AddModelDialog - - AddModelDialog::AddModelDialog(Window* pParent, bool bIsEdit) : ModalDialog(pParent, "AddModelDialog", "svx/ui/addmodeldialog.ui") { @@ -3311,10 +3281,6 @@ namespace svxform SetText(get<FixedText>("alttitle")->GetText()); } - - // class AddInstanceDialog - - AddInstanceDialog::AddInstanceDialog(Window* pParent, bool _bEdit) : ModalDialog(pParent, "AddInstanceDialog" , "svx/ui/addinstancedialog.ui") { @@ -3353,10 +3319,6 @@ namespace svxform return 0; } - - // class LinkedInstanceWarningBox - - LinkedInstanceWarningBox::LinkedInstanceWarningBox( Window* pParent ) : MessBox( pParent, SVX_RES( RID_QRY_LINK_WARNING ) ) diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx index a3fea992940d..f401592e9644 100644 --- a/svx/source/form/dbcharsethelper.cxx +++ b/svx/source/form/dbcharsethelper.cxx @@ -23,11 +23,6 @@ namespace svxform { - - - //= ODataAccessCharsetHelper - - ODataAccessCharsetHelper::ODataAccessCharsetHelper( ) { } diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index 90e89774dd8e..c5b6d052c408 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -159,10 +159,6 @@ namespace svxform OSL_ENSURE(s_nClients >= 0,"Illegall call of revokeClient()"); } - - //= OStaticDataAccessTools - - OStaticDataAccessTools::OStaticDataAccessTools() { } @@ -311,10 +307,6 @@ namespace svxform return bReturn; } - - //= DBToolsObjectFactory - - DBToolsObjectFactory::DBToolsObjectFactory() { } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index f90fbbfccd33..7de8f32a1730 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1023,9 +1023,6 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem ) } } - -// class FmFilterItemsString - class FmFilterItemsString : public SvLBoxString { public: @@ -1082,9 +1079,6 @@ void FmFilterItemsString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pE pViewData->maSize = aSize; } - -// class FmFilterString - class FmFilterString : public SvLBoxString { OUString m_aName; @@ -1138,9 +1132,6 @@ void FmFilterString::Paint( rDev.DrawText( aPos, GetText() ); } - -// class FmFilterNavigator - FmFilterNavigator::FmFilterNavigator( Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HASBUTTONSATROOT ) ,m_pModel( NULL ) @@ -1886,10 +1877,6 @@ void FmFilterNavigator::DeleteSelection() } } - - -// class FmFilterNavigatorWin - FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) @@ -2020,11 +2007,6 @@ void FmFilterNavigatorWin::GetFocus() m_pNavigator->GrabFocus(); } - - - -// class FmFilterNavigatorWinMgr - SFX_IMPL_DOCKINGWINDOW( FmFilterNavigatorWinMgr, SID_FM_FILTER_NAVIGATOR ) diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 57523e43864d..3b92a972c40b 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -73,8 +73,6 @@ using namespace ::com::sun::star::inspection; using namespace ::com::sun::star::form::inspection; using ::com::sun::star::awt::XWindow; -/*************************************************************************/ - //= FmPropBrwMgr @@ -185,10 +183,6 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) return SVX_RESSTR(nClassNameResourceId); } - -// class FmPropBrw - - FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent, const SfxChildWinInfo* _pInfo ) :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE) ) diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index 32ce91cb6cd1..25c5ee44bf7c 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -83,10 +83,6 @@ namespace svxform _rxPeer->setProperty( FM_PROP_BORDERCOLOR, makeAny( _rBoder.nBorderColor ) ); } - - //= ControlBorderManager - - ControlBorderManager::ControlBorderManager() :m_nFocusColor ( 0x000000FF ) ,m_nMouseHoveColor( 0x007098BE ) diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index 214728978aac..edcf75f3b60d 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -55,9 +55,6 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type& return aRet; } -/*********************************************************************** -* * -***********************************************************************/ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL SvxFmDrawPage::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > aTypes(SvxDrawPage::getTypes()); diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index b224432d8e86..40e4fe05246e 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -36,10 +36,6 @@ namespace svxform using namespace ::com::sun::star::uno; using namespace ::com::sun::star::datatransfer; - - //= OLocalExchange - - OLocalExchange::OLocalExchange( ) :m_bDragging( false ) ,m_bClipboardOwner( false ) @@ -120,10 +116,6 @@ namespace svxform return false; // do not have any formats by default } - - //= OControlTransferData - - OControlTransferData::OControlTransferData( ) :m_pFocusEntry( NULL ) { @@ -281,10 +273,6 @@ namespace svxform } } - - //= OControlExchange - - OControlExchange::OControlExchange( ) { } @@ -372,10 +360,6 @@ namespace svxform return new OControlExchange; } - - //= OLocalExchangeHelper - - OLocalExchangeHelper::OLocalExchangeHelper(Window* _pDragSource) :m_pDragSource(_pDragSource) ,m_pTransferable(NULL) diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 6fd2b10024e5..ca585ae128d8 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -69,9 +69,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; - -// class FmNavInsertedHint - TYPEINIT1( FmNavInsertedHint, SfxHint ); FmNavInsertedHint::FmNavInsertedHint( FmEntryData* pInsertedEntryData, sal_uInt32 nRelPos ) @@ -102,9 +99,6 @@ FmNavModelReplacedHint::~FmNavModelReplacedHint() { } - -// class FmNavRemovedHint - TYPEINIT1( FmNavRemovedHint, SfxHint ); FmNavRemovedHint::FmNavRemovedHint( FmEntryData* pRemovedEntryData ) @@ -117,10 +111,6 @@ FmNavRemovedHint::~FmNavRemovedHint() { } - - -// class FmNavNameChangedHint - TYPEINIT1( FmNavNameChangedHint, SfxHint ); FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName ) @@ -134,9 +124,6 @@ FmNavNameChangedHint::~FmNavNameChangedHint() { } - -// class FmNavClearedHint - TYPEINIT1( FmNavClearedHint, SfxHint ); FmNavClearedHint::FmNavClearedHint() @@ -158,10 +145,6 @@ TYPEINIT1(FmNavRequestSelectHint, SfxHint); TYPEINIT1(FmNavViewMarksChanged, SfxHint); - -// class FmEntryDataList - - FmEntryDataList::FmEntryDataList() { } @@ -209,9 +192,6 @@ void FmEntryDataList::clear() maEntryDataList.clear(); } - -// class FmEntryData - TYPEINIT0( FmEntryData ); FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface >& _rxIFace ) @@ -293,10 +273,6 @@ bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData ) return true; } - - -// class FmFormData - TYPEINIT1( FmFormData, FmEntryData ); FmFormData::FmFormData( @@ -359,10 +335,6 @@ bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData ) return FmEntryData::IsEqualWithoutChildren( pFormData ); } - - -// class FmControlData - TYPEINIT1( FmControlData, FmEntryData ); FmControlData::FmControlData( @@ -545,11 +517,6 @@ void FmControlData::ModelReplaced( namespace svxform { - - - // class NavigatorFrame - - NavigatorFrame::NavigatorFrame( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index 5b13593a1605..e21271702c9b 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -53,11 +53,6 @@ struct FmFormModelImplData } }; -/************************************************************************* -|* -|* Ctor -|* -\************************************************************************/ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers) : SdrModel(pPool, pPers, false, LOADREFCOUNTS) , m_pImpl(NULL) @@ -70,11 +65,6 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers) m_pImpl->pUndoEnv->acquire(); } -/************************************************************************* -|* -|* Ctor -|* -\************************************************************************/ FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers) : SdrModel(rPath, pPool, pPers, false, LOADREFCOUNTS) , m_pImpl(NULL) @@ -87,11 +77,6 @@ FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShe m_pImpl->pUndoEnv->acquire(); } -/************************************************************************* -|* -|* Ctor -|* -\************************************************************************/ FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable) : SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS) @@ -105,11 +90,6 @@ FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShe m_pImpl->pUndoEnv->acquire(); } -/************************************************************************* -|* -|* Dtor -|* -\************************************************************************/ FmFormModel::~FmFormModel() { if (m_pObjShell && m_pImpl->pUndoEnv->IsListening(*m_pObjShell)) @@ -124,21 +104,11 @@ FmFormModel::~FmFormModel() } -/************************************************************************* -|* -|* Erzeugt eine neue Seite -|* -\************************************************************************/ SdrPage* FmFormModel::AllocPage(bool bMasterPage) { return new FmFormPage(*this, bMasterPage); } -/************************************************************************* -|* -|* InsertPage -|* -\************************************************************************/ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos) { // hack solange Methode intern @@ -148,11 +118,6 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos) SdrModel::InsertPage( pPage, nPos ); } -/************************************************************************* -|* -|* MovePage -|* -\************************************************************************/ void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos ) { m_pImpl->bMovingPage = true; @@ -163,11 +128,6 @@ void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos ) m_pImpl->bMovingPage = false; } -/************************************************************************* -|* -|* RemovePage -|* -\************************************************************************/ SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum) { FmFormPage* pToBeRemovedPage = dynamic_cast< FmFormPage* >( GetPage( nPgNum ) ); @@ -185,11 +145,6 @@ SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum) return pRemovedPage; } -/************************************************************************* -|* -|* InsertMasterPage -|* -\************************************************************************/ void FmFormModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos) { // hack solange Methode intern @@ -199,11 +154,6 @@ void FmFormModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos) SdrModel::InsertMasterPage(pPage, nPos); } -/************************************************************************* -|* -|* RemoveMasterPage -|* -\************************************************************************/ SdrPage* FmFormModel::RemoveMasterPage(sal_uInt16 nPgNum) { FmFormPage* pPage = (FmFormPage*)SdrModel::RemoveMasterPage(nPgNum); diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 2e406d612cbb..3211331fb241 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -53,11 +53,6 @@ using namespace ::svxform; static bool bInit = false; -/************************************************************************* -|* -|* Ctor -|* -\************************************************************************/ FmFormObjFactory::FmFormObjFactory() { if ( !bInit ) @@ -92,22 +87,11 @@ FmFormObjFactory::FmFormObjFactory() } } - -/************************************************************************* -|* -|* Dtor -|* -\************************************************************************/ FmFormObjFactory::~FmFormObjFactory() { } - -/************************************************************************* -|* -|* ::com::sun::star::form::Form-Objekte erzeugen -|* -\************************************************************************/ +// ::com::sun::star::form::Form-Objekte erzeugen namespace { void lcl_initProperty( FmFormObj* _pObject, const OUString& _rPropName, const Any& _rValue ) diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 120dcb5dc5e6..0be2f6ae61e4 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -137,9 +137,6 @@ namespace svxform DECL_LINK( OnAsyncScriptEvent, ScriptEvent* ); }; - - //= FormScriptingEnvironment - class FormScriptingEnvironment: public IFormScriptingEnvironment, private boost::noncopyable { @@ -168,10 +165,6 @@ namespace svxform void impl_registerOrRevoke_throw( const Reference< XEventAttacherManager >& _rxManager, bool _bRegister ); }; - - //= FormScriptListener - - FormScriptListener::FormScriptListener( FormScriptingEnvironment* pScriptExecutor ) :m_pScriptExecutor( pScriptExecutor ) { @@ -794,10 +787,6 @@ namespace svxform return 0L; } - - //= FormScriptingEnvironment - - FormScriptingEnvironment::FormScriptingEnvironment( FmFormModel& _rModel ) :m_pScriptListener( NULL ) ,m_rFormModel( _rModel ) @@ -869,9 +858,6 @@ namespace svxform }; typedef ::boost::shared_ptr< IScript > PScript; - - //. NewStyleUNOScript - class NewStyleUNOScript : public IScript { SfxObjectShell& m_rObjectShell; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 69cd665450e1..08c06341a83c 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -144,9 +144,6 @@ using namespace ::com::sun::star::form::runtime; using namespace ::com::sun::star::frame; using namespace ::svxform; - -// class FmDesignModeChangedHint - TYPEINIT1( FmDesignModeChangedHint, SfxHint ); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 3c1798aa1c4d..b555eb8c7942 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -609,9 +609,6 @@ Reference< XForm > GetForm(const Reference< XInterface>& _rxElement) return Reference< XForm >(); } - -// class FmXFormShell_Base_Disambiguation - FmXFormShell_Base_Disambiguation::FmXFormShell_Base_Disambiguation( ::osl::Mutex& _rMutex ) :FmXFormShell_BD_BASE( _rMutex ) { @@ -628,10 +625,6 @@ void SAL_CALL FmXFormShell_Base_Disambiguation::disposing() // base classes. } - -// class FmXFormShell - - FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) :FmXFormShell_BASE(m_aMutex) ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE) diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index 1bbf1ca01476..7c743d910459 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -33,11 +33,6 @@ namespace svx { - - - //= TextControlCharAttribDialog - - TextControlCharAttribDialog::TextControlCharAttribDialog( Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList ) : SfxTabDialog( pParent, "TextControlCharacterPropertiesDialog", "svx/ui/textcontrolchardialog.ui", &_rCoreSet ) diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx index 23f0ec5295cf..a89e222887a2 100644 --- a/svx/source/form/fmtextcontrolfeature.cxx +++ b/svx/source/form/fmtextcontrolfeature.cxx @@ -30,10 +30,6 @@ namespace svx using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; - - //= FmTextControlFeature - - FmTextControlFeature::FmTextControlFeature( const Reference< XDispatch >& _rxDispatcher, const URL& _rFeatureURL, SfxSlotId _nSlotId, ISlotInvalidator* _pInvalidator ) :m_xDispatcher ( _rxDispatcher ) ,m_aFeatureURL ( _rFeatureURL ) diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 4682df6244ab..2a7c71e59018 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -158,9 +158,6 @@ namespace svx 0 }; - - //= FmFocusListenerAdapter - typedef ::cppu::WeakImplHelper1 < XFocusListener > FmFocusListenerAdapter_Base; class FmFocusListenerAdapter : public FmFocusListenerAdapter_Base @@ -247,9 +244,6 @@ namespace svx m_xWindow.clear(); } - - //= FmMouseListenerAdapter - typedef ::cppu::WeakImplHelper1 < XMouseListener > FmMouseListenerAdapter_Base; class FmMouseListenerAdapter : public FmMouseListenerAdapter_Base @@ -275,11 +269,6 @@ namespace svx virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; }; - - //= FmMouseListenerAdapter - - - FmMouseListenerAdapter::FmMouseListenerAdapter( const Reference< XControl >& _rxControl, IContextRequestObserver* _pObserver ) :m_pObserver( _pObserver ) ,m_xWindow( _rxControl, UNO_QUERY ) diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index fd3c9576a6a5..17b7613ea000 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -94,9 +94,6 @@ namespace svxform namespace ColumnValue = ::com::sun::star::sdbc::ColumnValue; namespace WritingMode2 = ::com::sun::star::text::WritingMode2; - - //= FormControlFactory_Data - struct FormControlFactory_Data { Reference<XComponentContext> m_xContext; @@ -107,10 +104,6 @@ namespace svxform } }; - - //= FormControlFactory - - FormControlFactory::FormControlFactory( const Reference<XComponentContext>& _rContext ) :m_pData( new FormControlFactory_Data( _rContext ) ) { diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 1777ec745a41..0d950c53e9e7 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -208,9 +208,6 @@ namespace svxform namespace FormFeature = ::com::sun::star::form::runtime::FormFeature; namespace DataType = ::com::sun::star::sdbc::DataType; - -// ColumnInfo - struct ColumnInfo { // information about the column itself @@ -246,9 +243,6 @@ struct ColumnInfo } }; - -//= ColumnInfoCache - class ColumnInfoCache { public: @@ -428,9 +422,6 @@ const ColumnInfo& ColumnInfoCache::getColumnInfo( size_t _pos ) return m_aColumns[ _pos ]; } - -// OParameterContinuation - class OParameterContinuation : public OInteraction< XInteractionSupplyParameters > { Sequence< PropertyValue > m_aValues; @@ -465,9 +456,6 @@ struct FmFieldInfo {xField->getPropertyValue(FM_PROP_NAME) >>= aFieldName;} }; - -// FmXAutoControl - class FmXAutoControl: public UnoControl { @@ -543,9 +531,6 @@ IMPL_LINK( FormController, OnInvalidateFeatures, void*, /*_pNotInterestedInThisP return 1; } -/*************************************************************************/ - - FormController::FormController(const Reference< css::uno::XComponentContext > & _rxORB ) :FormController_BASE( m_aMutex ) ,OPropertySetHelper( FormController_BASE::rBHelper ) diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 541fa5d99f3d..dfa6e9177bcb 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -192,10 +192,6 @@ namespace svx return ( pos != rDescriptions.end() ) ? pos->nSlotId : -1; } - - //= ControllerFeatures - - ControllerFeatures::ControllerFeatures( IControllerFeatureInvalidation* _pInvalidationCallback ) :m_pInvalidationCallback( _pInvalidationCallback ) ,m_pImpl( NULL ) @@ -235,10 +231,6 @@ namespace svx } } - - //= FormControllerHelper - - FormControllerHelper::FormControllerHelper( const Reference< XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback ) :m_pInvalidationCallback( _pInvalidationCallback ) { diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index 66bedcf534ac..261d62af88a8 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -46,11 +46,6 @@ namespace svxform using ::com::sun::star::frame::XDispatchProvider; using ::com::sun::star::lang::EventObject; - - //= DispatchInterceptionMultiplexer - - - DispatchInterceptionMultiplexer::DispatchInterceptionMultiplexer( const Reference< XDispatchProviderInterception >& _rxToIntercept, DispatchInterceptor* _pMaster ) :DispatchInterceptionMultiplexer_BASE(_pMaster && _pMaster->getInterceptorMutex() ? *_pMaster->getInterceptorMutex() : m_aFallback) diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index aca6ad92ecbc..2c18dbd3c30f 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -35,10 +35,6 @@ namespace svx using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::runtime; - - //= OSingleFeatureDispatcher - - OSingleFeatureDispatcher::OSingleFeatureDispatcher( const URL& _rFeatureURL, const sal_Int16 _nFormFeature, const Reference< XFormOperations >& _rxFormOperations, ::osl::Mutex& _rMutex ) :m_rMutex( _rMutex ) diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index c2bb99dbfa2f..784e2ec1f296 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -32,10 +32,6 @@ namespace svxform using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; - - //= FormToolboxes - - FormToolboxes::FormToolboxes( const Reference< XFrame >& _rxFrame ) { // the layout manager diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index c2890ca42f53..80298a70c78f 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -112,11 +112,6 @@ namespace svxform } } - - // class NavigatorTree - - - NavigatorTree::NavigatorTree( Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL ) // #100258# OJ WB_HSCROLL added ,m_aControlExchange(this) diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 6a5d79058e69..672692eef518 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -52,10 +52,6 @@ namespace svxform using namespace ::com::sun::star::script; using namespace ::com::sun::star::sdb; - - // class OFormComponentObserver - - OFormComponentObserver::OFormComponentObserver(NavigatorTreeModel* _pModel) :m_pNavModel(_pModel) ,m_nLocks(0) @@ -190,11 +186,6 @@ namespace svxform Remove( xElement ); } - - // class NavigatorTreeModel - - - NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages ) :m_pFormShell(NULL) ,m_pFormPage(NULL) diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index 34e2bd92027c..f9c40e850f49 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -28,10 +28,6 @@ namespace svxform using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - - //= OSQLParserClient - - OSQLParserClient::OSQLParserClient(const Reference< XComponentContext >& rxContext) { m_xContext = rxContext; diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx index 4fe922c5a7ad..cea9e09a230c 100644 --- a/svx/source/form/stringlistresource.cxx +++ b/svx/source/form/stringlistresource.cxx @@ -25,9 +25,6 @@ namespace svx { - //= StringListResource - - StringListResource::StringListResource( const ResId& _rResId ) :Resource( _rResId ) { diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 1ddfb40abd0a..adcda345e5f8 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -101,9 +101,6 @@ static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< conta } } -// class FmFieldWinListBox - - FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_BORDER ) ,pTabWin( pParent ) @@ -166,10 +163,6 @@ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi } } - -// class FmFieldWinData - - FmFieldWinData::FmFieldWinData() { } @@ -179,10 +172,6 @@ FmFieldWinData::~FmFieldWinData() { } - -// class FmFieldWin - - FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent) :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE)) ,SfxControllerItem(SID_FM_FIELDS_CONTROL, *_pBindings) diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index a8a474570e7a..667bb6473676 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -45,12 +45,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using ::com::sun::star::beans::XPropertySet; - - -// class SvxFmAbsRecWin - - - SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pController ) :NumericField( _pParent, WB_BORDER ) ,m_pController(_pController) @@ -242,11 +236,6 @@ void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nSelectModifier*/ ) } } - - -// class SvxFmTbxCtlAbsRec - - SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item ); SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) @@ -293,11 +282,6 @@ Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) return pWin; } - - -// SvxFmTbxCtlRecText - - SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem ); SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) @@ -324,11 +308,6 @@ Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent ) return pFixedText; } - - -// SvxFmTbxCtlRecFromText - - SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecFromText, SfxBoolItem ); SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) @@ -354,10 +333,6 @@ Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent ) return pFixedText; } - - -// SvxFmTbxCtlRecTotal - SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem ); @@ -406,9 +381,6 @@ void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, co SfxToolBoxControl::StateChanged( nSID, eState,pState ); } - -// SvxFmTbxNextRec - SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxNextRec, SfxBoolItem ); @@ -424,9 +396,6 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& r rTbx.SetSettings(aSettings, true); } - -// SvxFmTbxPrevRec - SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxPrevRec, SfxBoolItem ); diff --git a/svx/source/form/typeconversionclient.cxx b/svx/source/form/typeconversionclient.cxx index 14cb2d6f0053..8914d4e140b7 100644 --- a/svx/source/form/typeconversionclient.cxx +++ b/svx/source/form/typeconversionclient.cxx @@ -23,11 +23,6 @@ namespace svxform { - - - //= OTypeConversionClient - - OTypeConversionClient::OTypeConversionClient() { } diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index a9d6eb6b4f67..26049284e9fd 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -64,10 +64,6 @@ namespace svxform return OUString("org.openoffice.comp.svx.OAddConditionDialog"); } - - //= OAddConditionDialog - - OAddConditionDialog::OAddConditionDialog( const Reference< XComponentContext >& _rxORB ) :OAddConditionDialogBase( _rxORB ) { diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 4ef172f816e8..95cbf3a70585 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -82,7 +82,7 @@ class SvxGraphCtrlAccessibleContext : public SvxGraphCtrlAccessibleContext_Base, public: friend class GraphCtrl; - //===== internal ======================================================== + // internal SvxGraphCtrlAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, GraphCtrl& rRepresentation, @@ -94,14 +94,12 @@ public: protected: virtual ~SvxGraphCtrlAccessibleContext(); public: - //===== XAccessible ===================================================== - + // XAccessible /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleComponent ============================================ - + // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -119,9 +117,7 @@ public: virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - //===== XAccessibleContext ============================================== - + // XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -135,27 +131,22 @@ public: // virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {} // virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {} - //===== XAccessibleEventBroadcaster ===================================== - + // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XServiceInfo ==================================================== - + // XServiceInfo virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XTypeProvider =================================================== - + // XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XServiceName ==================================================== - + // XServiceName virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleSelection ============================================= - + // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection() throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -164,8 +155,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - //===== IAccessibleViewforwarder ======================================== - + // IAccessibleViewforwarder virtual bool IsValid (void) const SAL_OVERRIDE; virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; @@ -174,8 +164,6 @@ public: virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; protected: - //===== internals ======================================================== - void checkChildIndexOnSelection( long nIndexOfChild ) throw (::com::sun::star::lang::IndexOutOfBoundsException ); public: diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 3a2d80ceacb4..0ed799825e61 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -54,8 +54,6 @@ #include "datalistener.hxx" #include <vector> -// forward --------------------------------------------------------------- - class FmFormShell; diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index d3570db45bc6..96d9e209f2a7 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -225,9 +225,6 @@ inline bool OFilterItemExchange::hasFormat( const DataFlavorExVector& _rFormats return OLocalExchange::hasFormat( _rFormats, getFormatId() ); } - -//= OFilterExchangeHelper - class OFilterExchangeHelper : public OLocalExchangeHelper { public: @@ -296,14 +293,15 @@ private: The first form item. */ FmFormItem* getSelectedFilterItems(::std::vector<FmFilterItem*>& _rItemList); - /* inserts the filter items into the tree model and creates new FilterItems if needed. - @param _rFilterList - The items which should be inserted. - @param _pTargetItems - The target where to insert the items. - @param _bCopy - If <TRUE/> the items will not be removed from the model, otherwise they will. - */ + /** + * inserts the filter items into the tree model and creates new FilterItems if needed. + * @param _rFilterList + * The items which should be inserted. + * @param _pTargetItems + * The target where to insert the items. + * @param _bCopy + * If <TRUE/> the items will not be removed from the model, otherwise they will. + */ void insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems, bool _bCopy = false); SvTreeListEntry* getPrevEntry(SvTreeListEntry* _pStartWith = NULL); SvTreeListEntry* getNextEntry(SvTreeListEntry* _pStartWith = NULL); diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 5fb59251f91d..5d9eb264a3e8 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -44,9 +44,6 @@ namespace svxform #define CONTROL_STATUS_MOUSE_HOVER 0x02 #define CONTROL_STATUS_INVALID 0x04 - - //= BorderDescriptor - struct BorderDescriptor { sal_Int16 nBorderType; @@ -64,9 +61,6 @@ namespace svxform } }; - - //= UnderlineDescriptor - struct UnderlineDescriptor { sal_Int16 nUnderlineType; @@ -91,9 +85,6 @@ namespace svxform } }; - - //= ControlData - struct ControlData : public BorderDescriptor, UnderlineDescriptor { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl; diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx index 8b191253ba95..422763c957fd 100644 --- a/svx/source/inc/fmcontrollayout.hxx +++ b/svx/source/inc/fmcontrollayout.hxx @@ -29,10 +29,6 @@ namespace svxform { - - - //= ControlLayouter - class ControlLayouter { public: diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx index 5e9578728359..b79066a60028 100644 --- a/svx/source/inc/fmdocumentclassification.hxx +++ b/svx/source/inc/fmdocumentclassification.hxx @@ -26,10 +26,6 @@ namespace svxform { - - - //= DocumentType - enum DocumentType { eTextDocument, @@ -44,9 +40,6 @@ namespace svxform eUnknownDocumentType }; - - //= DocumentClassification - class DocumentClassification { public: diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index dbdc4f3c5140..6ad001dd84de 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -124,9 +124,6 @@ namespace svxform SVX_DLLPRIVATE void implReset(); }; - - //= OControlTransferData - class OControlTransferData { private: @@ -207,9 +204,6 @@ namespace svxform return m_aCurrentFormats; } - - //= OControlExchange - class OControlExchange : public OLocalExchange, public OControlTransferData { public: @@ -229,9 +223,6 @@ namespace svxform virtual void AddSupportedFormats() SAL_OVERRIDE; }; - - //= OControlExchangeHelper - class OControlExchangeHelper : public OLocalExchangeHelper { public: diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index b2affdd9dc5a..fbfa8d8e6bf2 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -309,8 +309,6 @@ namespace svxform class NavigatorTreeModel; - // class OFormComponentObserver - class OFormComponentObserver :public ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::container::XContainerListener @@ -345,9 +343,6 @@ namespace svxform void Remove( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ); }; - - //= NavigatorTreeModel - class NavigatorTreeModel : public SfxBroadcaster ,public SfxListener { diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index 708321c0dbf3..d13860193a80 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -28,10 +28,6 @@ namespace svx { - - - //= TextControlCharAttribDialog - class TextControlCharAttribDialog : public SfxTabDialog { private: diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx index ef9af8fd9413..dda2ebeab4db 100644 --- a/svx/source/inc/fmtextcontrolfeature.hxx +++ b/svx/source/inc/fmtextcontrolfeature.hxx @@ -31,10 +31,6 @@ namespace svx { - - - //= FmTextControlFeature - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::frame::XStatusListener > FmTextControlFeature_Base; diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index a5ed1577f2cd..3f2a9f82e795 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -51,9 +51,6 @@ namespace svx class FmTextControlFeature; class FmMouseListenerAdapter; - - //= IFocusObserver - class IFocusObserver { public: @@ -76,9 +73,6 @@ namespace svx ~IContextRequestObserver() {} }; - - //= FmTextControlShell - class FmTextControlShell :public IFocusObserver ,public ISlotInvalidator ,public IContextRequestObserver diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index ad0eecb1fefd..7d36fe55ff09 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -45,9 +45,6 @@ class FmFormModel; class FmFormObj; class SdrObject; - -// FmUndoPropertyAction - class FmUndoPropertyAction: public SdrUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xObj; @@ -65,9 +62,6 @@ public: }; - -// FmUndoContainerAction - class FmUndoContainerAction: public SdrUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > @@ -108,9 +102,6 @@ protected: void implReRemove( ); }; - -// FmUndoModelReplaceAction - class FmUndoModelReplaceAction : public SdrUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> m_xReplaced; diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 86e216585825..2d54fe8a69b1 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -141,8 +141,6 @@ typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::awt: > MapControlContainerToSetOfForms; class SdrModel; -// FmXFormView - class FmXFormView : public ::cppu::WeakImplHelper3< ::com::sun::star::form::XFormControllerListener, ::com::sun::star::awt::XFocusListener, diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index 92466f827ab7..4888a4959554 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -43,10 +43,6 @@ namespace comphelper { namespace svxform { - - - //= FormControlFactory - struct FormControlFactory_Data; class FormControlFactory diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index f6e4e87d13c8..3b1a23aaea3b 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -126,9 +126,6 @@ namespace svxform , ::com::sun::star::form::runtime::XFeatureInvalidation > FormController_BASE; - - // FormController - class ColumnInfoCache; class FormController :public ::comphelper::OBaseMutex ,public FormController_BASE diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index dbe66831e329..5822a6ec1934 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -34,10 +34,6 @@ namespace svx { - - - //= FeatureSlotTranslation - class FeatureSlotTranslation { public: @@ -51,9 +47,6 @@ namespace svx static sal_Int32 getSlotIdForFormFeature( sal_Int16 _nFormFeature ); }; - - //= IControllerFeatureInvalidation - class IControllerFeatureInvalidation { public: @@ -72,9 +65,6 @@ namespace svx ~IControllerFeatureInvalidation() {} }; - - //= ControllerFeatures - class FormControllerHelper; /** easier access to an FormControllerHelper instance */ diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index 1c2cf672b75d..529a941c2d02 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -30,10 +30,6 @@ namespace svxform { - - - //= DispatchInterceptor - class DispatchInterceptor { public: diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx index 51700a77b9ad..964eff888c39 100644 --- a/svx/source/inc/formfeaturedispatcher.hxx +++ b/svx/source/inc/formfeaturedispatcher.hxx @@ -31,10 +31,6 @@ namespace svx { - - - //= OSingleFeatureDispatcher - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::frame::XDispatch > OSingleFeatureDispatcher_Base; diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 6e1b9bd6b34a..33b3f510d749 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -146,8 +146,7 @@ struct FrameSelectorImpl : public Resource explicit FrameSelectorImpl( FrameSelector& rFrameSel ); ~FrameSelectorImpl(); - // initialization --------------------------------------------------------- - + // initialization /** Initializes the control, enables/disables frame borders according to flags. */ void Initialize( FrameSelFlags nFlags ); @@ -166,16 +165,13 @@ struct FrameSelectorImpl : public Resource /** call this to recalculate based on parent size */ void sizeChanged(); - - // frame border access ---------------------------------------------------- - + // frame border access /** Returns the object representing the specified frame border. */ const FrameBorder& GetBorder( FrameBorderType eBorder ) const; /** Returns the object representing the specified frame border (write access). */ FrameBorder& GetBorderAccess( FrameBorderType eBorder ); - // drawing ---------------------------------------------------------------- - + // drawing /** Draws the background of the entire control (the gray areas between borders). */ void DrawBackground(); @@ -204,8 +200,7 @@ struct FrameSelectorImpl : public Resource @param bFullRepaint true = Full repaint; false = update selection only. */ void DoInvalidate( bool bFullRepaint ); - // frame border state and style ------------------------------------------- - + // frame border state and style /** Sets the state of the specified frame border. */ void SetBorderState( FrameBorder& rBorder, FrameBorderState eState ); /** Sets the core style of the specified frame border, or hides the frame border, if pStyle is 0. */ @@ -214,8 +209,7 @@ struct FrameSelectorImpl : public Resource /** Changes the state of a frame border after a control event (mouse/keyboard). */ void ToggleBorderState( FrameBorder& rBorder ); - // frame border selection ------------------------------------------------- - + // frame border selection /** Selects a frame border and schedules redraw. */ void SelectBorder( FrameBorder& rBorder, bool bSelect ); /** Grabs focus without auto-selection of a frame border, if no border selected. */ diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 908cb1c68690..268fa9b24709 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -51,9 +51,6 @@ class DbCellControl; class Edit; class FmXGridCell; - -// FmMutexHelper - class FmMutexHelper { protected: diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx index 0a404f354b81..76f23d3ac690 100644 --- a/svx/source/inc/stringlistresource.hxx +++ b/svx/source/inc/stringlistresource.hxx @@ -29,10 +29,6 @@ namespace svx { - - - //= StringListResource - /** loads a list of strings from a resource, where the resource is of type RSC_RESOURCE, and has sub resources of type string, numbered from 1 to n */ diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index cae837f125a4..b8d76d1b7930 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -72,7 +72,7 @@ typedef ::cppu::WeakAggComponentImplHelper6< class SvxRectCtlAccessibleContext : public ::comphelper::OBaseMutex, public SvxRectCtlAccessibleContext_Base { public: - //===== internal ======================================================== + // internal SvxRectCtlAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, SvxRectCtl& rRepresentation, @@ -81,13 +81,11 @@ public: protected: virtual ~SvxRectCtlAccessibleContext(); public: - //===== XAccessible ===================================================== - + // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - //===== XAccessibleComponent ============================================ - + // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -135,8 +133,7 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleContext ============================================== - + // XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -170,8 +167,7 @@ public: throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_OVERRIDE; - //===== XAccessibleEventBroadcaster ===================================== - + // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) @@ -182,8 +178,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - //===== XServiceInfo ==================================================== - + // XServiceInfo virtual OUString SAL_CALL getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -193,13 +188,11 @@ public: virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - //===== XTypeProvider =================================================== - + // XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - //===== XAccessibleSelection ============================================= - + // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -227,8 +220,7 @@ public: protected: - //===== internals ======================================================== - + // internals void checkChildIndex( long nIndexOfChild ) throw( ::com::sun::star::lang::IndexOutOfBoundsException ); void checkChildIndexOnSelection( long nIndexOfChild ) throw( ::com::sun::star::lang::IndexOutOfBoundsException ); @@ -339,13 +331,11 @@ public: protected: virtual ~SvxRectCtlChildAccessibleContext(); public: - //===== XAccessible ===================================================== - + // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - //===== XAccessibleComponent ============================================ - + // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -391,8 +381,7 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleContext ============================================== - + // XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -425,8 +414,7 @@ public: getLocale( void ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_OVERRIDE; - //===== XAccessibleEventBroadcaster ===================================== - + // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) @@ -437,8 +425,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - //===== XAccessibleValue ================================================ - + // XAccessibleValue virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -456,8 +443,7 @@ public: virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XServiceInfo ==================================================== - + // XServiceInfo virtual OUString SAL_CALL getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -467,14 +453,11 @@ public: virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - //===== XTypeProvider =================================================== - + // XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - //===== internal ========================================================== - + // internal /// Sets the checked status void setStateChecked(bool bChecked, bool bFireFocus = true); void FireFocusEvent(); diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx index 43210ef1b665..909d1f825e80 100644 --- a/svx/source/inc/typeconversionclient.hxx +++ b/svx/source/inc/typeconversionclient.hxx @@ -26,10 +26,6 @@ namespace svxform { - - - //= OTypeConversionClient - class OTypeConversionClient : public ODbtoolsClient { protected: diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index 8d32c173c034..e5b59df68e29 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -28,10 +28,6 @@ namespace svxform { - - - //= OAddConditionDialog - typedef ::svt::OGenericUnoDialog OAddConditionDialogBase; class OAddConditionDialog :public OAddConditionDialogBase diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index e6fa0bc8edae..72c732e254f9 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -27,8 +27,6 @@ using namespace ::com::sun::star; TYPEINIT1(SvxSmartTagItem, SfxPoolItem); -// class SvxFontItem ----------------------------------------------------- - SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence, const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence, diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 7615aa8c8cc6..0c9f16d27fb7 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -44,8 +44,6 @@ using namespace ::com::sun::star; TYPEINIT1_FACTORY( SvxOrientationItem, SfxEnumItem, new SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0) ); TYPEINIT1_FACTORY( SvxMarginItem, SfxPoolItem, new SvxMarginItem(0) ); -// class SvxOrientationItem ---------------------------------------------- - SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation, const sal_uInt16 nId): SfxEnumItem( nId, (sal_uInt16)eOrientation ) @@ -174,8 +172,6 @@ void SvxOrientationItem::SetFromRotation( sal_Int32 nRotation, bool bStacked ) } } -// class SvxMarginItem --------------------------------------------------- - SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 128df692105a..01aceb34554d 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -41,12 +41,6 @@ TYPEINIT1(SvxChartKindErrorItem, SfxEnumItem); TYPEINIT1(SvxChartRegressItem, SfxEnumItem); TYPEINIT1_FACTORY(SvxDoubleItem, SfxPoolItem, new SvxDoubleItem(0.0, 0)); -/************************************************************************* -|* -|* SvxChartStyleItem -|* -*************************************************************************/ - SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) : SfxEnumItem(nId, (sal_uInt16)eStyle) { @@ -73,12 +67,6 @@ SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new SvxChartStyleItem(rIn, Which()); } -/************************************************************************* -|* -|* SvxChartDataDescrItem -|* -*************************************************************************/ - SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { @@ -98,12 +86,6 @@ SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c return new SvxChartDataDescrItem(rIn, Which()); } -/************************************************************************* -|* -|* SvxChartTextOrderItem -|* -*************************************************************************/ - SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder, sal_uInt16 nId) : SfxEnumItem(nId, (sal_uInt16)eOrder) @@ -192,12 +174,6 @@ bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sa return true; } -/************************************************************************* -|* -|* SvxChartTextOrientItem -|* -*************************************************************************/ - SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { @@ -217,12 +193,6 @@ SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) return new SvxChartTextOrientItem(rIn, Which()); } -/************************************************************************* -|* -|* SvxDoubleItem -|* -*************************************************************************/ - SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) : SfxPoolItem(nId), fVal(fValue) @@ -330,14 +300,6 @@ bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) return rVal >>= fVal; } - - -/************************************************************************* -|* -|* SvxChartKindErrorItem -|* -*************************************************************************/ - SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient, sal_uInt16 nId) : SfxEnumItem(nId, (sal_uInt16)eOrient) @@ -374,12 +336,6 @@ sal_uInt16 SvxChartKindErrorItem::GetVersion (sal_uInt16 nFileFormatVersion) con : 0; } -/************************************************************************* -|* -|* SvxChartIndicateItem -|* -*************************************************************************/ - SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient, sal_uInt16 nId) : SfxEnumItem(nId, (sal_uInt16)eOrient) @@ -416,12 +372,6 @@ sal_uInt16 SvxChartIndicateItem::GetVersion (sal_uInt16 nFileFormatVersion) cons : 0; } -/************************************************************************* -|* -|* SvxChartRegressItem -|* -*************************************************************************/ - SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient, sal_uInt16 nId) : SfxEnumItem(nId, (sal_uInt16)eOrient) diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 93a981918639..89710db5431b 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -30,12 +30,6 @@ TYPEINIT1_FACTORY( SvxBitmapListItem, SfxPoolItem , new SvxBitmapListItem ); TYPEINIT1_FACTORY( SvxDashListItem, SfxPoolItem , new SvxDashListItem ); TYPEINIT1_FACTORY( SvxLineEndListItem, SfxPoolItem , new SvxLineEndListItem ); - - -// SvxColorListItem - - - SvxColorListItem::SvxColorListItem() { } @@ -98,12 +92,6 @@ bool svtype::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) \ QUERY_PUT_IMPL( SvxColorListItem, ColorList ) - - -// SvxGradientListItem - - - SvxGradientListItem::SvxGradientListItem() { } @@ -151,12 +139,6 @@ SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxGradientListItem, GradientList ) - - -// SvxHatchListItem - - - SvxHatchListItem::SvxHatchListItem() { } @@ -204,13 +186,6 @@ SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxHatchListItem, HatchList ) - - - -// SvxBitmapListItem - - - SvxBitmapListItem::SvxBitmapListItem() { } @@ -252,12 +227,6 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxBitmapListItem, BitmapList ) - - -// SvxDashListItem - - - SvxDashListItem::SvxDashListItem() : pDashList( 0 ) { @@ -300,12 +269,6 @@ SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxDashListItem, DashList ) - - -// SvxLineEndListItem - - - SvxLineEndListItem::SvxLineEndListItem() { } diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index caf73ff9a630..8dd3500dc858 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -25,11 +25,6 @@ using namespace ::rtl; using namespace ::com::sun::star; -// STATIC DATA ----------------------------------------------------------- - - - - TYPEINIT1_FACTORY(SvxB3DVectorItem, SfxPoolItem, new SvxB3DVectorItem); diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 3158b83853b1..f06abd1d74ea 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -25,10 +25,6 @@ using namespace ::com::sun::star; -/****************************************************************************** - * Implementierung class SwCropGrf - ******************************************************************************/ - SvxGrfCrop::SvxGrfCrop( sal_uInt16 nItemId ) : SfxPoolItem( nItemId ), nLeft( 0 ), nRight( 0 ), nTop( 0 ), nBottom( 0 ) diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index f5d76c327c1b..2f9573f3319a 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -28,8 +28,6 @@ TYPEINIT1_FACTORY(SvxHyperlinkItem, SfxPoolItem, new SvxHyperlinkItem(0)); -// class SvxHyperlinkItem ------------------------------------------------ - #define HYPERLINKFF_MARKER 0x599401FE SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index c5876b47fada..138d1050b13f 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -34,8 +34,6 @@ #include <limits> -// class SvxNumberFormatShell -------------------------------------------- - const double SvxNumberFormatShell::DEFAULT_NUMVALUE = 1234.56789; @@ -1198,22 +1196,12 @@ void SvxNumberFormatShell::CategoryToPos_Impl( short nCategory, sal_uInt16& rPos } } - -/************************************************************************* -#* Member: MakePrevStringFromVal Datum:19.09.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvxNumberFormatShell -#* -#* Funktion: Formatiert die Zahl nValue abhaengig von rFormatStr -#* und speichert das Ergebnis in rPreviewStr. -#* -#* Input: FormatString, Farbe, zu formatierende Zahl -#* -#* Output: Ausgabestring rPreviewStr -#* -#************************************************************************/ - +/* + * Funktion: Formatiert die Zahl nValue abhaengig von rFormatStr + * und speichert das Ergebnis in rPreviewStr. + * Input: FormatString, Farbe, zu formatierende Zahl + * Output: Ausgabestring rPreviewStr + */ void SvxNumberFormatShell::MakePrevStringFromVal( const OUString& rFormatStr, OUString& rPreviewStr, @@ -1224,21 +1212,12 @@ void SvxNumberFormatShell::MakePrevStringFromVal( pFormatter->GetPreviewString( rFormatStr, nValue, rPreviewStr, &rpFontColor, eCurLanguage ); } -/************************************************************************* -#* Member: GetComment4Entry Datum:30.10.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvxNumberFormatShell -#* -#* Funktion: Liefert den Kommentar fuer einen gegebenen -#* Eintrag zurueck. -#* -#* Input: Nummer des Eintrags -#* -#* Output: Kommentar-String -#* -#************************************************************************/ - +/* + * Funktion: Liefert den Kommentar fuer einen gegebenen + * Eintrag zurueck. + * Input: Nummer des Eintrags + * Output: Kommentar-String + */ void SvxNumberFormatShell::SetComment4Entry(short nEntry, const OUString& aEntStr) { SvNumberformat *pNumEntry; @@ -1248,21 +1227,12 @@ void SvxNumberFormatShell::SetComment4Entry(short nEntry, const OUString& aEntSt if(pNumEntry!=NULL) pNumEntry->SetComment(aEntStr); } -/************************************************************************* -#* Member: GetComment4Entry Datum:30.10.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvxNumberFormatShell -#* -#* Funktion: Liefert den Kommentar fuer einen gegebenen -#* Eintrag zurueck. -#* -#* Input: Nummer des Eintrags -#* -#* Output: Kommentar-String -#* -#************************************************************************/ - +/* + * Funktion: Liefert den Kommentar fuer einen gegebenen + * Eintrag zurueck. + * Input: Nummer des Eintrags + * Output: Kommentar-String + */ OUString SvxNumberFormatShell::GetComment4Entry(short nEntry) { if(nEntry < 0) @@ -1279,25 +1249,15 @@ OUString SvxNumberFormatShell::GetComment4Entry(short nEntry) return OUString(); } -/************************************************************************* -#* Member: GetCategory4Entry Datum:30.10.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvxNumberFormatShell -#* -#* Funktion: Liefert die Kategorie- Nummer fuer einen gegebenen -#* Eintrag zurueck. -#* -#* Input: Nummer des Eintrags -#* -#* Output: Kategorie- Nummer -#* -#************************************************************************/ - +/* + * Funktion: Liefert die Kategorie- Nummer fuer einen gegebenen + * Eintrag zurueck. + * Input: Nummer des Eintrags + * Output: Kategorie- Nummer + */ short SvxNumberFormatShell::GetCategory4Entry(short nEntry) { if(nEntry<0) return 0; - if( static_cast<size_t>(nEntry) < aCurEntryList.size() ) { sal_uInt32 nMyNfEntry=aCurEntryList[nEntry]; @@ -1324,25 +1284,15 @@ short SvxNumberFormatShell::GetCategory4Entry(short nEntry) } -/************************************************************************* -#* Member: GetUserDefined4Entry Datum:31.10.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvxNumberFormatShell -#* -#* Funktion: Liefert die Information, ob ein Eintrag -#* benutzerspezifisch ist zurueck. -#* -#* Input: Nummer des Eintrags -#* -#* Output: Benutzerspezifisch? -#* -#************************************************************************/ - +/* + * Funktion: Liefert die Information, ob ein Eintrag + * benutzerspezifisch ist zurueck. + * Input: Nummer des Eintrags + * Output: Benutzerspezifisch? + */ bool SvxNumberFormatShell::GetUserDefined4Entry(short nEntry) { if(nEntry<0) return false; - if( static_cast<size_t>(nEntry) < aCurEntryList.size()) { sal_uInt32 nMyNfEntry=aCurEntryList[nEntry]; @@ -1359,22 +1309,12 @@ bool SvxNumberFormatShell::GetUserDefined4Entry(short nEntry) return false; } - -/************************************************************************* -#* Member: GetFormat4Entry Datum:30.10.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvxNumberFormatShell -#* -#* Funktion: Liefert den Format- String fuer einen gegebenen -#* Eintrag zurueck. -#* -#* Input: Nummer des Eintrags -#* -#* Output: Format- String -#* -#************************************************************************/ - +/* + * Funktion: Liefert den Format- String fuer einen gegebenen + * Eintrag zurueck. + * Input: Nummer des Eintrags + * Output: Format- String + */ OUString SvxNumberFormatShell::GetFormat4Entry(short nEntry) { if(nEntry < 0) @@ -1396,25 +1336,15 @@ OUString SvxNumberFormatShell::GetFormat4Entry(short nEntry) return OUString(); } -/************************************************************************* -#* Member: GetListPos4Entry Datum:31.10.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvxNumberFormatShell -#* -#* Funktion: Liefert die Listen- Nummer fuer einen gegebenen -#* Formatindex zurueck. -#* -#* Input: Nummer des Eintrags -#* -#* Output: Kategorie- Nummer -#* -#************************************************************************/ - +/* + * Funktion: Liefert die Listen- Nummer fuer einen gegebenen + * Formatindex zurueck. + * Input: Nummer des Eintrags + * Output: Kategorie- Nummer + */ short SvxNumberFormatShell::GetListPos4Entry(sal_uInt32 nIdx) { short nSelP=SELPOS_NONE; - // Check list size against return type limit. if( aCurEntryList.size() <= static_cast<size_t>(::std::numeric_limits< short >::max()) ) { diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 6aabe79d4063..d9847b84487e 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -23,8 +23,6 @@ TYPEINIT1(SvxNumberInfoItem, SfxPoolItem); -// class SvxNumberInfoItem ----------------------------------------------- - #define INIT(pNum,eVal,nDouble,rStr) \ SfxPoolItem ( nId ), \ \ diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 9968429eb8e7..45cb60b6cc41 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -32,14 +32,9 @@ using namespace ::rtl; using namespace ::com::sun::star; -// STATIC DATA ----------------------------------------------------------- - TYPEINIT1_FACTORY( SvxPageItem, SfxPoolItem , new SvxPageItem(0)); -/*-------------------------------------------------------------------- - Beschreibung: Konstruktor - --------------------------------------------------------------------*/ - +// Konstruktor SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), eNumType ( SVX_ARABIC ), @@ -48,10 +43,7 @@ SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), { } -/*-------------------------------------------------------------------- - Beschreibung: Copy-Konstruktor - --------------------------------------------------------------------*/ - +// Copy-Konstruktor SvxPageItem::SvxPageItem( const SvxPageItem& rItem ) : SfxPoolItem( rItem ) { @@ -60,19 +52,13 @@ SvxPageItem::SvxPageItem( const SvxPageItem& rItem ) eUse = rItem.eUse; } -/*-------------------------------------------------------------------- - Beschreibung: Clonen - --------------------------------------------------------------------*/ - +// Clonen SfxPoolItem* SvxPageItem::Clone( SfxItemPool * ) const { return new SvxPageItem( *this ); } -/*-------------------------------------------------------------------- - Beschreibung: Abfrage auf Gleichheit - --------------------------------------------------------------------*/ - +// Abfrage auf Gleichheit bool SvxPageItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -266,10 +252,7 @@ SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) con return rStrm; } -/*-------------------------------------------------------------------- - Beschreibung: HeaderFooterSet - --------------------------------------------------------------------*/ - +// HeaderFooterSet SvxSetItem::SvxSetItem( const sal_uInt16 nId, const SfxItemSet& rSet ) : SfxSetItem( nId, rSet ) diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 6a6b68a63f69..8139f0fce2ae 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -28,8 +28,6 @@ TYPEINIT1_FACTORY(SvxPostItAuthorItem, SfxStringItem, new SvxPostItAuthorItem(0) TYPEINIT1_FACTORY(SvxPostItDateItem, SfxStringItem, new SvxPostItDateItem(0)); TYPEINIT1_FACTORY(SvxPostItTextItem, SfxStringItem, new SvxPostItTextItem(0)); -// class SvxPostItAuthorItem --------------------------------------------- - SvxPostItAuthorItem::SvxPostItAuthorItem( sal_uInt16 _nWhich ) { SetWhich( _nWhich ); @@ -73,8 +71,6 @@ SfxPoolItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const return new SvxPostItAuthorItem( *this ); } -// class SvxPostItDateItem ----------------------------------------------- - SvxPostItDateItem::SvxPostItDateItem( sal_uInt16 _nWhich ) { SetWhich( _nWhich ); @@ -118,8 +114,6 @@ SfxPoolItem* SvxPostItDateItem::Clone( SfxItemPool * ) const return new SvxPostItDateItem( *this ); } -// class SvxPostItTextItem ----------------------------------------------- - SvxPostItTextItem::SvxPostItTextItem( sal_uInt16 _nWhich ) { SetWhich( _nWhich ); diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index abf7296632ba..c80589ae4dea 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -36,8 +36,6 @@ using namespace ::rtl; using namespace ::com::sun::star; -// STATIC DATA ----------------------------------------------------------- - TYPEINIT1_FACTORY(SvxRotateModeItem, SfxEnumItem, new SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD, 0)); diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 45791381cb8a..43c06f15586f 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -31,8 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -// STATIC DATA ----------------------------------------------------------- - SFX_IMPL_MENU_CONTROL(SvxSmartTagsControl, SvxSmartTagItem); diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index f36861967282..65ca2d5073d9 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -29,8 +29,6 @@ #include "editeng/flstitem.hxx" #include "editeng/fontitem.hxx" -// STATIC DATA ----------------------------------------------------------- - SFX_IMPL_MENU_CONTROL(SvxFontMenuControl, SvxFontItem); diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index 617b05392eaa..537a34a76478 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -70,10 +70,6 @@ namespace sdr { namespace contact { { } - - //= ViewContactOfUnoControl - - ViewContactOfUnoControl::ViewContactOfUnoControl( SdrUnoObj& _rUnoObject ) :ViewContactOfSdrObj( _rUnoObject ) ,m_pImpl( new ViewContactOfUnoControl_Impl ) diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 54107f63e778..bc22a54aefd2 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -142,9 +142,6 @@ namespace sdr { namespace contact { using ::com::sun::star::container::ContainerEvent; using ::com::sun::star::uno::Any; - - //= ControlHolder - class ControlHolder { private: @@ -346,8 +343,6 @@ namespace sdr { namespace contact { } - //= IPageViewAccess - /** interface encapsulating access to an SdrPageView, stripped down to the methods we really need */ class IPageViewAccess @@ -370,9 +365,6 @@ namespace sdr { namespace contact { ~IPageViewAccess() {} }; - - //= SdrPageViewAccess - /** is a ->IPageViewAccess implementation based on a real ->SdrPageView instance */ class SdrPageViewAccess : public IPageViewAccess @@ -410,9 +402,6 @@ namespace sdr { namespace contact { return m_rPageView.GetVisibleLayers().IsSet( _nLayerID ); } - - //= InvisibleControlViewAccess - /** is a ->IPageViewAccess implementation which can be used to create an invisble control for an arbitrary window */ @@ -804,9 +793,6 @@ namespace sdr { namespace contact { const OutputDevice& impl_getOutputDevice_throw() const; }; - - //= LazyControlCreationPrimitive2D - class LazyControlCreationPrimitive2D : public ::drawinglayer::primitive2d::BufferedDecompositionPrimitive2D { private: @@ -859,10 +845,6 @@ namespace sdr { namespace contact { ::basegfx::B2DHomMatrix m_aTransformation; }; - - //= ViewObjectContactOfUnoControl_Impl - - ViewObjectContactOfUnoControl_Impl::ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl ) :m_pAntiImpl( _pAntiImpl ) ,m_bCreatingControl( false ) @@ -1622,10 +1604,6 @@ namespace sdr { namespace contact { ImplPrimitive2DIDBlock( LazyControlCreationPrimitive2D, PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D ) - - //= ViewObjectContactOfUnoControl - - ViewObjectContactOfUnoControl::ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact ) :ViewObjectContactOfSdrObj( _rObjectContact, _rViewContact ) ,m_pImpl( new ViewObjectContactOfUnoControl_Impl( this ) ) @@ -1795,10 +1773,6 @@ namespace sdr { namespace contact { flushPrimitive2DSequence(); } - - //= UnoControlPrintOrPreviewContact - - UnoControlPrintOrPreviewContact::UnoControlPrintOrPreviewContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact ) :ViewObjectContactOfUnoControl( _rObjectContact, _rViewContact ) { diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 967cf24d6f03..d5915090c415 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -250,9 +250,7 @@ void NBOTypeMgrBase::StoreMapUnit_impl() { } } } -/*************************************************************************************************** -**********************Character Bullet Type lib********************************************************** -****************************************************************************************************/ +// Character Bullet Type lib BulletsSettings_Impl* BulletsTypeMgr::pActualBullets[] ={0,0,0,0,0,0,0,0}; sal_Unicode BulletsTypeMgr::aDynamicBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '}; sal_Unicode BulletsTypeMgr::aDynamicRTLBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '}; @@ -536,9 +534,7 @@ Font BulletsTypeMgr::GetBulCharFont(sal_uInt16 nIndex) return aRet; } -/*************************************************************************************************** -**********************Graphic Bullet Type lib*********************************************************** -****************************************************************************************************/ +// Graphic Bullet Type lib GraphyicBulletsTypeMgr::GraphyicBulletsTypeMgr() : NBOTypeMgrBase(eNBOType::BULLETS) { @@ -787,9 +783,7 @@ OUString GraphyicBulletsTypeMgr::GetGrfName(sal_uInt16 nIndex) return sRet; } -/*************************************************************************************************** -**********************Mix Bullets Type lib************************************************************** -****************************************************************************************************/ +// Mix Bullets Type lib MixBulletsSettings_Impl* MixBulletsTypeMgr::pActualBullets[] ={0,0,0,0,0,0,0,0}; MixBulletsSettings_Impl* MixBulletsTypeMgr::pDefaultActualBullets[] ={0,0,0,0,0,0,0,0}; @@ -1284,10 +1278,7 @@ bool MixBulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) return bRet; } -/*************************************************************************************************** -**********************Numbering Type lib************************************************************** -****************************************************************************************************/ - +// Numbering Type lib NumberingTypeMgr::NumberingTypeMgr() : NBOTypeMgrBase(eNBOType::NUMBERING) , pNumberSettingsArr (new NumberSettingsArr_Impl) @@ -1496,10 +1487,7 @@ bool NumberingTypeMgr::IsCustomized(sal_uInt16 nIndex) return bRet; } -/*************************************************************************************************** -**********************Multi-level /Outline Type lib******************************************************* -****************************************************************************************************/ - +// Multi-level /Outline Type lib OutlineTypeMgr::OutlineTypeMgr() : NBOTypeMgrBase(eNBOType::OUTLINE) { diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 2a5e55cf11bf..2df7827793fa 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -370,10 +370,7 @@ void ParaPropertyPanel::initial() #endif } -//===========================for Numbering & Bullet================================================ - - - +// for Numbering & Bullet IMPL_LINK(ParaPropertyPanel, NumBTbxDDHandler, ToolBox*, pToolBox) { const sal_uInt16 nId = pToolBox->GetCurItemId(); @@ -416,9 +413,7 @@ IMPL_LINK(ParaPropertyPanel, NumBTbxSelectHandler, ToolBox*, pToolBox) return 0; } - -//==================================for Background color===================== - +// for Background color IMPL_LINK(ParaPropertyPanel, ToolBoxBackColorDDHandler,ToolBox*, pToolBox) { const sal_uInt16 nId = pToolBox->GetCurItemId(); @@ -459,7 +454,7 @@ void ParaPropertyPanel::SetBGColor ( maColor = aColor; } -//==================================for Paragraph Indent===================== +// for Paragraph Indent IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl) { SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE ); @@ -577,8 +572,7 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl) return( 0L ); } -//==================================for Paragraph Line Spacing===================== - +// for Paragraph Line Spacing IMPL_LINK( ParaPropertyPanel, ClickLineSPDropDownHdl_Impl, ToolBox*, pBox ) { const sal_uInt16 nId = pBox->GetCurItemId(); @@ -593,7 +587,7 @@ IMPL_LINK( ParaPropertyPanel, ClickLineSPDropDownHdl_Impl, ToolBox*, pBox ) return (0L); } -//==================================for Paragraph Spacing===================== +// for Paragraph Spacing IMPL_LINK_NOARG( ParaPropertyPanel, ULSpaceHdl_Impl) { SvxULSpaceItem aMargin( SID_ATTR_PARA_ULSPACE ); @@ -656,7 +650,7 @@ IMPL_LINK(ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl, ToolBox *, pControl) return( 0L ); } -//==================================for Paragraph State change===================== +// for Paragraph State change void ParaPropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index df9a425a5e08..9e52c6721975 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -89,11 +89,7 @@ public: void EndNumberingPopupMode (void); private: - /********************************************************** - ** - ** UI controls - ** - ***********************************************************/ + // UI controls //Alignment ToolBox* mpTBxVertAlign; //NumBullet&Backcolor @@ -112,23 +108,14 @@ private: ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpColorUpdater; - /********************************************************** - ** - ** Resources - ** - ***********************************************************/ - + // Resources Image maSpace3; Image maIndHang; ImageList maNumBImageList; ImageList maNumBImageListRTL; - /**************************************************************** - ** - ** Data Member - ** - *****************************************************************/ + // Data Member long maTxtLeft; //Line spacing SvxLineSpacingItem *mpLnSPItem; @@ -146,12 +133,7 @@ private: FieldUnit m_last_eMetricUnit; SfxMapUnit m_eLRSpaceUnit; SfxMapUnit m_eULSpaceUnit; - /**************************************************************** - ** - ** Control Items - ** - *****************************************************************/ - + // Control Items ::sfx2::sidebar::ControllerItem maLRSpaceControl; ::sfx2::sidebar::ControllerItem maLNSpaceControl; ::sfx2::sidebar::ControllerItem maULSpaceControl; diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index 3292a73ebf13..2e02ca7b6175 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -335,8 +335,6 @@ void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( Run ReadConfiguration( bExcludedTypes, bRecognize ); } -//------------- PRIVATE ----------------------------------------------- - /** */ void SmartTagMgr::LoadLibraries() diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index fdd3ec43d244..3d1b43751979 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -29,8 +29,6 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxInsertStatusBarControl, SfxBoolItem); -// class SvxInsertStatusBarControl --------------------------------------- - SvxInsertStatusBarControl::SvxInsertStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& rStb ) : diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index de7e64717529..a08bdd2a2a8d 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -41,9 +41,6 @@ namespace const unsigned _FEEDBACK_TIMEOUT = 3000; } - -// class SvxModifyControl ------------------------------------------------ - struct SvxModifyControl::ImplData { enum ModificationState diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index ae5ae3cc2185..6fc3f922acdd 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -91,8 +91,6 @@ OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl, SvxSizeItem); -// class FunctionPopup_Impl ---------------------------------------------- - class FunctionPopup_Impl : public PopupMenu { public: @@ -123,8 +121,6 @@ void FunctionPopup_Impl::Select() nSelected = GetCurItemId(); } -// struct SvxPosSizeStatusBarControl_Impl -------------------------------- - struct SvxPosSizeStatusBarControl_Impl /* [Description] @@ -150,8 +146,6 @@ struct SvxPosSizeStatusBarControl_Impl Image aSizeImage; // Image to show the size }; -// class SvxPosSizeStatusBarControl ------------------------------------------ - /* [Description] Ctor(): diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index e123fe299d0a..1566e164c367 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -70,8 +70,6 @@ SelectionTypePopup::SelectionTypePopup( sal_uInt16 nCurrent ) CheckItem( state_to_id( nCurrent ), true ); } -// class SvxSelectionModeControl ----------------------------------------- - SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& rStb ) : diff --git a/svx/source/stbctrls/stbctrls.h b/svx/source/stbctrls/stbctrls.h index 8266d97ef068..532bbe19ca4f 100644 --- a/svx/source/stbctrls/stbctrls.h +++ b/svx/source/stbctrls/stbctrls.h @@ -19,8 +19,6 @@ #ifndef INCLUDED_SVX_SOURCE_STBCTRLS_STBCTRLS_H #define INCLUDED_SVX_SOURCE_STBCTRLS_STBCTRLS_H -// defines ------------------------------------------------------------------ - #define ZOOM_200 1 #define ZOOM_150 2 #define ZOOM_100 3 diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 70a270b704bb..eb8c7dbc8b85 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -36,8 +36,6 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem); -// class ZoomPopup_Impl -------------------------------------------------- - class ZoomPopup_Impl : public PopupMenu { public: @@ -97,7 +95,6 @@ void ZoomPopup_Impl::Select() } } -// class SvxZoomStatusBarControl ------------------------------------------ SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& rStb ) : diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index a738e25f76a8..7d2e479273ec 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -106,12 +106,6 @@ using namespace ::rtl; using namespace ::com::sun::star; -/************************************************************************* -|* -|* Constructor -|* -\************************************************************************/ - SdrItemPool::SdrItemPool( SfxItemPool* _pMaster, bool bLoadRefCounts) @@ -343,35 +337,18 @@ SdrItemPool::SdrItemPool( SetItemInfos(mpLocalItemInfos); } -/************************************************************************* -|* -|* copy ctor, so that static defaults are cloned -|* (Parameter 2 = sal_True) -|* -\************************************************************************/ - +// copy ctor, so that static defaults are cloned +// (Parameter 2 = sal_True) SdrItemPool::SdrItemPool(const SdrItemPool& rPool) : XOutdevItemPool(rPool) { } -/************************************************************************* -|* -|* Clone() -|* -\************************************************************************/ - SfxItemPool* SdrItemPool::Clone() const { return new SdrItemPool(*this); } -/************************************************************************* -|* -|* Destructor -|* -\************************************************************************/ - SdrItemPool::~SdrItemPool() { // dtor of SfxItemPool @@ -1604,11 +1581,6 @@ bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*n return true; } - -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Edge -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - // EdgeKind TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem); @@ -1747,10 +1719,6 @@ bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb return true; } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Measure -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem); SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); } @@ -1944,10 +1912,6 @@ bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ return true; } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Circ -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem); SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); } @@ -2031,10 +1995,6 @@ bool SdrSignedPercentItem::GetPresentation( return true; } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafRedItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafRedItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const @@ -2047,10 +2007,6 @@ SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrGrafRedItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafGreenItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafGreenItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const @@ -2063,10 +2019,6 @@ SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrGrafGreenItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafBlueItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafBlueItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const @@ -2079,10 +2031,6 @@ SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrGrafBlueItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafLuminanceItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafLuminanceItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const @@ -2095,10 +2043,6 @@ SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) c return new SdrGrafLuminanceItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafContrastItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafContrastItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const @@ -2111,10 +2055,6 @@ SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co return new SdrGrafContrastItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafGamma100Item -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafGamma100Item, SfxUInt32Item ); SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const @@ -2143,10 +2083,6 @@ bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId* return true; } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafInvertItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafInvertItem, SdrOnOffItem ); SfxPoolItem* SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const @@ -2159,10 +2095,6 @@ SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons return new SdrGrafInvertItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafTransparenceItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafTransparenceItem, SdrPercentItem ); SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const @@ -2175,10 +2107,6 @@ SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/ return new SdrGrafTransparenceItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafModeItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafModeItem, SfxEnumItem ); SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const @@ -2244,10 +2172,6 @@ bool SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, return true; } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafCropItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafCropItem, SvxGrfCrop ); SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index 621589c1f046..972c17de91ac 100644 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx @@ -30,9 +30,6 @@ class SdrDragView; - -// SdrDragMovHdl - class SdrDragMovHdl : public SdrDragMethod { protected: @@ -51,9 +48,6 @@ public: virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE; }; - -// SdrDragRotate - class SdrDragRotate : public SdrDragMethod { private: @@ -77,9 +71,6 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE; }; - -// SdrDragShear - class SdrDragShear : public SdrDragMethod { private: @@ -106,9 +97,6 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE; }; - -// SdrDragMirror - class SdrDragMirror : public SdrDragMethod { private: @@ -133,9 +121,6 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE; }; - -// SdrDragGradient - class SdrDragGradient : public SdrDragMethod { private: @@ -159,9 +144,6 @@ public: virtual void CancelSdrDrag() SAL_OVERRIDE; }; - -// SdrDragCrook - class SdrDragCrook : public SdrDragMethod { private: @@ -211,9 +193,6 @@ public: virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget) SAL_OVERRIDE; }; - -// SdrDragDistort - class SdrDragDistort : public SdrDragMethod { private: @@ -245,9 +224,6 @@ public: virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget) SAL_OVERRIDE; }; - -// SdrDragCrop - // derive from SdrDragObjOwn to have handles aligned to object when it // is sheared or rotated class SdrDragCrop : public SdrDragObjOwn diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 569d59923a56..e5e373ea3d1e 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -65,10 +65,7 @@ using namespace ::com::sun::star; -/****************************************************************************** -* Global data of the DrawingEngine -******************************************************************************/ - +// Global data of the DrawingEngine SdrGlobalData::SdrGlobalData() : pSysLocale(NULL), pLocaleData(NULL), diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index e907b2377a62..adb85752bb07 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -670,7 +670,6 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj, bool bScale) } } -/**************************************************************************************************/ void ImpSdrGDIMetaFileImport::DoAction(MetaPixelAction& /*rAct*/) const { } @@ -742,8 +741,6 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction& rAct) InsertObj(pRect); } -/**************************************************************************************************/ - void ImpSdrGDIMetaFileImport::DoAction(MetaEllipseAction& rAct) { SdrCircObj* pCirc=new SdrCircObj(OBJ_CIRC,rAct.GetRect()); @@ -781,8 +778,6 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaChordAction& rAct) InsertObj(pCirc); } -/**************************************************************************************************/ - bool ImpSdrGDIMetaFileImport::CheckLastLineMerge(const basegfx::B2DPolygon& rSrcPoly) { // #i102706# Do not merge closed polygons @@ -993,8 +988,6 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaPolyPolygonAction& rAct) } } -/**************************************************************************************************/ - void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rStr, const MetaAction& rAct ) { // calc text box size, add 5% to make it fit safely diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 9a0234e67dcc..74f2ec05bf43 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -917,9 +917,6 @@ void SdrHdl::onMouseLeave() { } - -// class SdrHdlColor - SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, bool bLum) : SdrHdl(rRef, HDL_COLR), aMarkerSize(rSize), @@ -1073,7 +1070,6 @@ void SdrHdlColor::SetSize(const Size& rNew) } } -// class SdrHdlGradient SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool bGrad) : SdrHdl(rRef1, bGrad ? HDL_GRAD : HDL_TRNS) , pColHdl1(NULL) @@ -2199,10 +2195,6 @@ SdrHdl* SdrHdlList::GetHdl(SdrHdlKind eKind1) const return pRet; } - -// SdrCropHdl - - SdrCropHdl::SdrCropHdl( const Point& rPnt, SdrHdlKind eNewKind, diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 73b566a0339b..11a193ef9585 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -141,10 +141,6 @@ bool SdrLayer::operator==(const SdrLayer& rCmpLayer) const && maName == rCmpLayer.maName); } - -// SdrLayerAdmin - - SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent): aLayer(), pParent(pNewParent), diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 71a579475365..bb2b68a97b00 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -778,9 +778,7 @@ const SdrTextObj* SdrModel::GetFormattingTextObj() const void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit ) { - /************************************************************************** - * Initialization of the Outliners for drawing text and HitTest - **************************************************************************/ + // Initialization of the Outliners for drawing text and HitTest if( bInit ) { pOutliner->EraseVirtualDevice(); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 4a1e9502f8e7..702493ea69c9 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -228,8 +228,6 @@ void ImpSdrPathDragData::ResetPoly(const SdrPathObj& rPO) aXP[4]=aTmpXP[nNextNextPnt0]; aXP.SetFlags(4,aTmpXP.GetFlags(nNextNextPnt0)); } -/*************************************************************************/ - struct ImpPathCreateUser : public SdrDragStatUserData { Point aBezControl0; @@ -503,8 +501,6 @@ XPolygon ImpPathCreateUser::GetRectPoly() const return aXP; } -/*************************************************************************/ - class ImpPathForDragAndCreate { SdrPathObj& mrSdrPathObject; @@ -1650,8 +1646,6 @@ Pointer ImpPathForDragAndCreate::GetCreatePointer() const return Pointer(POINTER_CROSS); } -/*************************************************************************/ - SdrPathObjGeoData::SdrPathObjGeoData() : meKind(OBJ_NONE) { @@ -1668,8 +1662,6 @@ sdr::contact::ViewContact* SdrPathObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfSdrPathObj(*this); } -/*************************************************************************/ - TYPEINIT1(SdrPathObj,SdrTextObj); SdrPathObj::SdrPathObj(SdrObjKind eNewKind) diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index ed4cedacbc04..edee086f559b 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -147,10 +147,6 @@ namespace } } - -// SdrUnoObj - - TYPEINIT1(SdrUnoObj, SdrRectObj); SdrUnoObj::SdrUnoObj(const OUString& rModelName, bool _bOwnUnoControlModel) diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index eafd2e52f468..166f2c3efab8 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -42,10 +42,6 @@ using namespace ::com::sun::star::container; namespace accessibility { - -// AccessibleCell - - AccessibleCell::AccessibleCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo ) : AccessibleCellBase( rxParent, AccessibleRole::TABLE_CELL ) , maShapeTreeInfo( rShapeTreeInfo ) diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index e95685093b05..98ee9c62b650 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -61,10 +61,6 @@ struct hash typedef boost::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; - -// AccessibleTableShapeImpl - - class AccessibleTableShapeImpl : public cppu::WeakImplHelper1< XModifyListener > { public: @@ -305,12 +301,6 @@ void SAL_CALL AccessibleTableShapeImpl::disposing( const EventObject& /*Source*/ { } - -// AccessibleTableShape - - - - AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo) : AccessibleTableShape_Base(rShapeInfo, rShapeTreeInfo) , mnPreviousSelectionCount(0) @@ -858,8 +848,7 @@ void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildInd } } - -//===== XAccessibleTableSelection ============================================ +// XAccessibleTableSelection sal_Bool SAL_CALL AccessibleTableShape::selectRow( sal_Int32 row ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { @@ -1156,8 +1145,7 @@ void SAL_CALL AccessibleTableHeaderShape::grabFocus (void) throw (RuntimeExcepti { mpTable->grabFocus(); } -//===== XAccessibleTable ============================================ - +// XAccessibleTable sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRowCount() throw (RuntimeException, std::exception) { return mbRow ? 1 : mpTable->getAccessibleRowCount(); @@ -1315,7 +1303,7 @@ sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumn( sal_Int32 nC return mpTable->getAccessibleColumn( nChildIndex ); } -//===== XAccessibleTableSelection ============================================ +// XAccessibleTableSelection sal_Bool SAL_CALL AccessibleTableHeaderShape::selectRow( sal_Int32 row ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 54729906bccf..830a88201c80 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -38,10 +38,6 @@ using namespace ::com::sun::star::table; namespace sdr { namespace table { - -// CellCursor - - CellCursor::CellCursor( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) : CellCursorBase( xTable, nLeft, nTop, nRight, nBottom ) { diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx index bdeee58c3a1b..dc0b5e482a70 100644 --- a/svx/source/table/cellcursor.hxx +++ b/svx/source/table/cellcursor.hxx @@ -31,10 +31,6 @@ namespace sdr { namespace table { struct CellPos; - -// CellCursor - - typedef ::cppu::ImplInheritanceHelper2< CellRange, ::com::sun::star::table::XCellCursor, ::com::sun::star::table::XMergeableCellRange > CellCursorBase; class CellCursor : public CellCursorBase diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx index 3615b366d676..f0adfa3f8db1 100644 --- a/svx/source/table/cellrange.cxx +++ b/svx/source/table/cellrange.cxx @@ -31,10 +31,6 @@ using namespace ::com::sun::star::table; namespace sdr { namespace table { - -// CellRange - - CellRange::CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) : mxTable( xTable ) , mnLeft(nLeft) diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx index 8284178c4ff4..96c1dbb221f4 100644 --- a/svx/source/table/cellrange.hxx +++ b/svx/source/table/cellrange.hxx @@ -29,10 +29,6 @@ namespace sdr { namespace table { - -// CellRange - - class CellRange : public ::cppu::WeakAggImplHelper1< ::com::sun::star::table::XCellRange >, public ICellRange { public: diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index a27ee47805da..db14b3ae7c6b 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -26,10 +26,6 @@ using namespace ::com::sun::star::lang; namespace sdr { namespace table { - -// FastPropertySetInfo - - FastPropertySetInfo::FastPropertySetInfo( const PropertyVector& rProps ) { addProperties( rProps ); @@ -101,10 +97,6 @@ sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName return hasProperty( aName ) != 0 ? sal_True : sal_False; } - -// FastPropertySet - - FastPropertySet::FastPropertySet( const rtl::Reference< FastPropertySetInfo >& xInfo ) : mxInfo( xInfo ) { diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 9009414e1821..976b4c84b967 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -156,10 +156,6 @@ public: Rectangle maLogicRect; }; - -// TableStyleSettings - - TableStyleSettings::TableStyleSettings() : mbUseFirstRow(true) , mbUseLastRow(false) diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index 2f9223f5807e..580f19165923 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -31,10 +31,6 @@ namespace sdr { namespace table { - -// TableColumn - - typedef ::cppu::ImplInheritanceHelper2< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableColumnBase; class TableColumn : public TableColumnBase diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index 1bc95e58dba7..0b6863281357 100644 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx @@ -34,10 +34,6 @@ using namespace ::com::sun::star::table; namespace sdr { namespace table { - -// TableColumns - - TableColumns::TableColumns( const TableModelRef& xTableModel ) : mxTableModel( xTableModel ) { diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx index 1ccf109e4223..e940cb6a7d7b 100644 --- a/svx/source/table/tablecolumns.hxx +++ b/svx/source/table/tablecolumns.hxx @@ -29,10 +29,6 @@ namespace sdr { namespace table { - -// TableColumns - - class TableColumns : public ::cppu::WeakAggImplHelper1< ::com::sun::star::table::XTableColumns > { public: diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 707496679062..32e551474592 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -80,10 +80,6 @@ using namespace ::com::sun::star::style; namespace sdr { namespace table { - -// class SvxTableControllerModifyListener - - class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XModifyListener > { public: diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 5f132c375ed4..e8a23022ed23 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -178,10 +178,6 @@ public: TableDesignStyleVector maDesigns; }; - -// TableDesignStyle - - TableDesignStyle::TableDesignStyle() : TableDesignStyleBase(m_aMutex) { diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index 24c004554fa0..df13cd19abbc 100644 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx @@ -36,10 +36,6 @@ namespace sdr { namespace table { class SdrTableObj; - -// ICellRange - - /** base class for each object implementing an XCellRange */ class ICellRange { @@ -54,10 +50,6 @@ protected: ~ICellRange() {} }; - -// TableModel - - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::table::XTable, ::com::sun::star::util::XBroadcaster > TableModelBase; class TableModel : public TableModelBase, diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index d7449baa703f..ed1e93872d24 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -43,10 +43,6 @@ const sal_Int32 Property_OptimalHeight = 1; const sal_Int32 Property_IsVisible = 2; const sal_Int32 Property_IsStartOfNewPage = 3; - -// TableRow - - TableRow::TableRow( const TableModelRef& xTableModel, sal_Int32 nRow, sal_Int32 nColumns ) : TableRowBase( getStaticPropertySetInfo() ) , mxTableModel( xTableModel ) diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 0d88268879f4..46198861818e 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -31,10 +31,6 @@ namespace sdr { namespace table { - -// TableRow - - typedef ::cppu::ImplInheritanceHelper2< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableRowBase; class TableRow : public TableRowBase diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx index 4e2817f92ec0..bfaecd7d78d3 100644 --- a/svx/source/table/tablerows.cxx +++ b/svx/source/table/tablerows.cxx @@ -35,10 +35,6 @@ using namespace ::com::sun::star::table; namespace sdr { namespace table { - -// TableRows - - TableRows::TableRows( const TableModelRef& xTableModel ) : mxTableModel( xTableModel ) { diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx index e8f5cff69517..bf681a53a1fb 100644 --- a/svx/source/table/tablerows.hxx +++ b/svx/source/table/tablerows.hxx @@ -29,10 +29,6 @@ namespace sdr { namespace table { - -// TableRows - - class TableRows : public ::cppu::WeakAggImplHelper1< ::com::sun::star::table::XTableRows > { public: diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx b/svx/source/tbxctrls/SvxColorChildWindow.cxx index 3ad9104bfd43..a896c0df448e 100644 --- a/svx/source/tbxctrls/SvxColorChildWindow.cxx +++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx @@ -26,12 +26,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID( SvxColorChildWindow, SID_COLOR_CONTROL ) -/************************************************************************* -|* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Animator -|* -\************************************************************************/ - +// Ableitung vom SfxChildWindow als "Behaelter" fuer Animator SvxColorChildWindow::SvxColorChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 3aad292a7071..62ca706d48c3 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// class SvxColorWindow_Impl -------------------------------------------------- - #ifndef INCLUDED_SVX_SOURCE_TBXCTRLS_COLORWINDOW_HXX #define INCLUDED_SVX_SOURCE_TBXCTRLS_COLORWINDOW_HXX @@ -30,10 +27,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <svx/SvxColorValueSet.hxx> - -// class SvxColorWindow_Impl -------------------------------------------------- - - class SvxColorWindow_Impl : public SfxPopupWindow { using FloatingWindow::StateChanged; diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 9792a562bde0..c3753afbe0e5 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -89,12 +89,6 @@ bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, sal_ return( rxOStm->GetError() == ERRCODE_NONE ); } -/************************************************************************* -|* -|* SvxColorValueSet_docking: Ctor -|* -\************************************************************************/ - SvxColorValueSet_docking::SvxColorValueSet_docking( Window* _pParent, const ResId& rResId ) : SvxColorValueSet( _pParent, rResId ), DragSourceHelper( this ), @@ -103,12 +97,6 @@ SvxColorValueSet_docking::SvxColorValueSet_docking( Window* _pParent, const ResI SetAccessibleName(SVX_RESSTR(STR_COLORTABLE)); } -/************************************************************************* -|* -|* SvxColorValueSet_docking: MouseButtonDown -|* -\************************************************************************/ - void SvxColorValueSet_docking::MouseButtonDown( const MouseEvent& rMEvt ) { // Fuer Mac noch anders handlen ! @@ -131,12 +119,6 @@ void SvxColorValueSet_docking::MouseButtonDown( const MouseEvent& rMEvt ) aDragPosPixel = GetPointerPosPixel(); } -/************************************************************************* -|* -|* SvxColorValueSet_docking: MouseButtonUp -|* -\************************************************************************/ - void SvxColorValueSet_docking::MouseButtonUp( const MouseEvent& rMEvt ) { // Fuer Mac noch anders handlen ! @@ -158,35 +140,17 @@ void SvxColorValueSet_docking::MouseButtonUp( const MouseEvent& rMEvt ) SetNoSelection(); } -/************************************************************************* -|* -|* Command-Event -|* -\************************************************************************/ - void SvxColorValueSet_docking::Command(const CommandEvent& rCEvt) { // Basisklasse SvxColorValueSet::Command(rCEvt); } -/************************************************************************* -|* -|* StartDrag -|* -\************************************************************************/ - void SvxColorValueSet_docking::StartDrag( sal_Int8 , const Point& ) { Application::PostUserEvent(STATIC_LINK(this, SvxColorValueSet_docking, ExecDragHdl)); } -/************************************************************************* -|* -|* Drag&Drop asynchron ausfuehren -|* -\************************************************************************/ - void SvxColorValueSet_docking::DoDrag() { SfxObjectShell* pDocSh = SfxObjectShell::Current(); @@ -214,12 +178,6 @@ IMPL_STATIC_LINK(SvxColorValueSet_docking, ExecDragHdl, void*, EMPTYARG) return(0); } -/************************************************************************* -|* -|* Ctor: SvxColorDockingWindow -|* -\************************************************************************/ - SvxColorDockingWindow::SvxColorDockingWindow ( SfxBindings* _pBindings, @@ -282,24 +240,11 @@ SvxColorDockingWindow::SvxColorDockingWindow StartListening( *_pBindings, true ); } - -/************************************************************************* -|* -|* Dtor: SvxColorDockingWindow -|* -\************************************************************************/ - SvxColorDockingWindow::~SvxColorDockingWindow() { EndListening( GetBindings() ); } -/************************************************************************* -|* -|* Notify -|* -\************************************************************************/ - void SvxColorDockingWindow::Notify( SfxBroadcaster& , const SfxHint& rHint ) { const SfxPoolItemHint *pPoolItemHint = PTR_CAST(SfxPoolItemHint, &rHint); @@ -312,12 +257,6 @@ void SvxColorDockingWindow::Notify( SfxBroadcaster& , const SfxHint& rHint ) } } -/************************************************************************* -|* -|* FillValueSet -|* -\************************************************************************/ - void SvxColorDockingWindow::FillValueSet() { if( pColorList.is() ) @@ -345,12 +284,6 @@ void SvxColorDockingWindow::FillValueSet() } } -/************************************************************************* -|* -|* SetSize -|* -\************************************************************************/ - void SvxColorDockingWindow::SetSize() { // Groesse fuer ValueSet berechnen @@ -392,12 +325,6 @@ void SvxColorDockingWindow::SetSize() aColorSet.SetPosSizePixel( Point( 2, 2 ), aSize ); } -/************************************************************************* -|* -|* SvxColorDockingWindow: Close -|* -\************************************************************************/ - bool SvxColorDockingWindow::Close() { SfxBoolItem aItem( SID_COLOR_CONTROL, false ); @@ -407,12 +334,6 @@ bool SvxColorDockingWindow::Close() return true; } -/************************************************************************* -|* -|* SelectHdl -|* -\************************************************************************/ - IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) { SfxDispatcher* pDispatcher = GetBindings().GetDispatcher(); @@ -509,13 +430,6 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) return 0; } -/************************************************************************* -|* -|* Resizing -|* -\************************************************************************/ - - void SvxColorDockingWindow::Resizing( Size& rNewSize ) { rNewSize.Width() -= 4; @@ -559,12 +473,6 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize ) rNewSize.Height() = nLines * aItemSize.Height() + 4; } -/************************************************************************* -|* -|* Resize -|* -\************************************************************************/ - void SvxColorDockingWindow::Resize() { if ( !IsFloatingMode() || !GetFloatingWindow()->IsRollUp() ) diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index ab0459b6a522..8a03c6b64ae6 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -58,12 +58,6 @@ using namespace ::com::sun::star::graphic; namespace svx { -/************************************************************************* -|* -|* ExtrusionDirectionWindow -|* -\************************************************************************/ - static const sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 }; ExtrusionDirectionWindow::ExtrusionDirectionWindow( @@ -232,10 +226,6 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl ) return 0; } - -// ExtrusionDirectionControl - - ExtrusionDirectionControl::ExtrusionDirectionControl( const Reference< XComponentContext >& rxContext ) : svt::PopupWindowController( @@ -294,8 +284,6 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceName return ExtrusionDirectionControl_getSupportedServiceNames(); } -// #################################################################### - ExtrusionDepthDialog::ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit eDefaultUnit ) : ModalDialog( pParent, "ExtrustionDepthDialog", "svx/ui/extrustiondepthdialog.ui" ) { @@ -309,8 +297,6 @@ double ExtrusionDepthDialog::getDepth() const return (double)( m_pMtrDepth->GetValue( FUNIT_100TH_MM ) ) / 100.0; } -// #################################################################### - double aDepthListInch[] = { 0, 1270,2540,5080,10160 }; double aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 }; @@ -547,11 +533,6 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames return ExtrusionDepthController_getSupportedServiceNames(); } - -// #################################################################### - - - ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_LIGHTING )) , mrController( rController ) @@ -810,8 +791,6 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames return ExtrusionLightingControl_getSupportedServiceNames(); } -// #################################################################### - ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 5b735c9dae1f..53ce3b462f88 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -47,11 +47,6 @@ using namespace ::com::sun::star::lang; SFX_IMPL_TOOLBOX_CONTROL( SvxFillToolBoxControl, XFillStyleItem ); -/************************************************************************* -|* -|* SvxFillToolBoxControl -|* -\************************************************************************/ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, @@ -537,12 +532,6 @@ Window* SvxFillToolBoxControl::CreateItemWindow(Window *pParent) return NULL; } -/************************************************************************* -|* -|* FillControl -|* -\************************************************************************/ - FillControl::FillControl(Window* pParent,WinBits nStyle) : Window(pParent,nStyle | WB_DIALOGCONTROL), mpLbFillType(new SvxFillTypeBox(this)), diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 270c83cb84fb..e1fd6143bdfc 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -70,9 +70,6 @@ namespace svx const int nColCount = 4; const int nLineCount = 4; -/************************************************************************* -|* Svx3DWin - FloatingWindow -\************************************************************************/ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, Window* pParent, sal_uInt16 /*nSID*/ ) : ModalDialog(pParent, "FontworkGalleryDialog", "svx/ui/fontworkgallerydialog.ui" ), mnThemeId ( 0xffff ), @@ -298,10 +295,6 @@ void FontWorkShapeTypeControl::Select(sal_uInt16 /*nSelectModifier*/) } - -// FontworkAlignmentWindow - - class FontworkAlignmentWindow : public ToolbarMenu { public: @@ -421,10 +414,6 @@ IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl) return 0; } - -// FontworkAlignmentControl - - class FontworkAlignmentControl : public svt::PopupWindowController { public: @@ -493,9 +482,6 @@ Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames return FontworkAlignmentControl_getSupportedServiceNames(); } - -// #################################################################### - class FontworkCharacterSpacingWindow : public ToolbarMenu { public: @@ -659,10 +645,6 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl) return 0; } - -// FontworkCharacterSpacingControl - - class FontworkCharacterSpacingControl : public svt::PopupWindowController { public: diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index f85b48803116..acf76892d0bc 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -53,9 +53,6 @@ using namespace ::com::sun::star::beans; #define LOGICAL_EDIT_HEIGHT 12 -// SvxLineBox - - SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : LineLB( pParent, nBits ), nCurPos ( 0 ), @@ -257,7 +254,6 @@ void SvxLineBox::FillControl() } } -// SvxMetricField SvxMetricField::SvxMetricField( Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : MetricField(pParent, nBits) @@ -419,10 +415,6 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt ) MetricField::DataChanged( rDCEvt ); } - -// SvxFillTypeBox - - SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) : FillTypeLB( pParent, nBits | WB_TABSTOP ), nCurPos ( 0 ), @@ -511,10 +503,6 @@ void SvxFillTypeBox::ReleaseFocus_Impl() } } - -// SvxFillAttrBox - - SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) : FillAttrLB( pParent, nBits | WB_TABSTOP ), nCurPos( 0 ), diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 051adbbeda33..4e59d1d4df7c 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -42,8 +42,6 @@ using namespace ::com::sun::star::frame; SFX_IMPL_TOOLBOX_CONTROL(SvxTableToolBoxControl,SfxUInt16Item); SFX_IMPL_TOOLBOX_CONTROL(SvxColumnsToolBoxControl,SfxUInt16Item); -// class TableWindow ----------------------------------------------------- - class TableWindow : public SfxPopupWindow { private: @@ -398,8 +396,6 @@ void TableWindow::CloseAndShowTableDialog() TableDialog( Sequence< PropertyValue >() ); } -// class ColumnsWindow --------------------------------------------------- - class ColumnsWindow : public SfxPopupWindow { private: @@ -704,8 +700,6 @@ void ColumnsWindow::PopupModeEnd() SfxPopupWindow::PopupModeEnd(); } -// class SvxTableToolBoxControl ------------------------------------------ - SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), bEnabled( true ) @@ -771,8 +765,6 @@ void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, cons ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); } -// class SvxColumnsToolBoxControl ------------------------------------------ - SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl(nSlotId, nId, rTbx) , bEnabled(false) diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index d556fca12b76..ea8ca940e9be 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -45,18 +45,10 @@ using namespace ::com::sun::star::lang; // For End Line Controlleer #define MAX_LINES 12 -// STATIC DATA ----------------------------------------------------------- - SFX_IMPL_TOOLBOX_CONTROL( SvxLineStyleToolBoxControl, XLineStyleItem ); SFX_IMPL_TOOLBOX_CONTROL( SvxLineWidthToolBoxControl, XLineWidthItem ); SFX_IMPL_TOOLBOX_CONTROL( SvxLineEndToolBoxControl, SfxBoolItem ); -/************************************************************************* -|* -|* SvxLineStyleToolBoxControl -|* -\************************************************************************/ - SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : @@ -195,12 +187,6 @@ Window* SvxLineStyleToolBoxControl::CreateItemWindow( Window *pParent ) return new SvxLineBox( pParent, m_xFrame ); } -/************************************************************************* -|* -|* SvxLineWidthToolBoxControl -|* -\************************************************************************/ - SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) @@ -262,14 +248,6 @@ Window* SvxLineWidthToolBoxControl::CreateItemWindow( Window *pParent ) return( new SvxMetricField( pParent, m_xFrame ) ); } - - -/************************************************************************* -|* -|* SvxLineEndWindow -|* -\************************************************************************/ - SvxLineEndWindow::SvxLineEndWindow( sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, @@ -624,12 +602,6 @@ void SvxLineEndWindow::GetFocus (void) aLineEndSet.GrabFocus(); } -/************************************************************************* -|* -|* SvxLineEndToolBoxControl -|* -\************************************************************************/ - SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 61b191d9de71..5124dc199ef3 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -91,8 +91,6 @@ #define MAX_MRU_FONTNAME_ENTRIES 5 #define LOGICAL_EDIT_HEIGHT 12 -// STATIC DATA ----------------------------------------------------------- - #ifndef DELETEZ #define DELETEZ(p) (delete (p), (p)=NULL) #endif diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 02f7da9695ab..981db9a86a00 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -113,10 +113,6 @@ private: void ReleaseFocus_Impl(); }; - -// class SvxFontSizeBox_Impl -------------------------------------------------- - - SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( Window* _pParent, const uno::Reference< frame::XDispatchProvider >& _rDispatchProvider, @@ -284,10 +280,6 @@ void SvxFontSizeBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) FontSizeBox::DataChanged( rDCEvt ); } - -// class FontHeightToolBoxControl - - FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< uno::XComponentContext >& rxContext ) : svt::ToolboxController( rxContext, uno::Reference< frame::XFrame >(), diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 2309224eb6ca..f21155cf14e5 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -239,10 +239,6 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) return nRet; } - - -// SearchToolbarControllersManager - SearchToolbarControllersManager::SearchToolbarControllersManager() { } @@ -347,9 +343,6 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag return xStatusListener; } - -// FindTextToolbarController - FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : svt::ToolboxController(rxContext, css::uno::Reference< css::frame::XFrame >(), OUString(COMMAND_FINDTEXT)) , m_pFindTextFieldControl(NULL) @@ -503,9 +496,6 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl) return 0; } - -// class UpDownSearchToolboxController - UpDownSearchToolboxController::UpDownSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext, Type eType ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), @@ -598,9 +588,6 @@ void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::Fe { } - -// MatchCaseToolboxController - MatchCaseToolboxController::MatchCaseToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), @@ -696,9 +683,6 @@ void SAL_CALL MatchCaseToolboxController::statusChanged( const css::frame::Featu { } - -// class FindAllToolboxController - FindAllToolboxController::FindAllToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), @@ -783,9 +767,6 @@ void SAL_CALL FindAllToolboxController::statusChanged( const css::frame::Feature { } - -// class ExitSearchToolboxController - ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), @@ -881,9 +862,6 @@ void SAL_CALL ExitSearchToolboxController::statusChanged( const css::frame::Feat { } - -// class SearchLabelToolboxController - SearchLabelToolboxController::SearchLabelToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), @@ -963,9 +941,6 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL SearchLabelToolboxController:: return VCLUnoHelper::GetInterface(pSL); } - -// class FindbarDispatcher - FindbarDispatcher::FindbarDispatcher() { } diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 59d7f1f11221..44b8e40f5897 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -32,12 +32,9 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlAlign, SfxAllEnumItem); -/************************************************************************* -|* -|* Klasse fuer SwToolbox -|* -\************************************************************************/ - +/* + * Klasse fuer SwToolbox + */ SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) , m_aSubTbName( "alignmentbar" ) @@ -49,24 +46,20 @@ SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTb m_aCommand = m_aCommandURL; } -/************************************************************************* -|* -|* Wenn man ein PopupWindow erzeugen will -|* -\************************************************************************/ +/* + * Wenn man ein PopupWindow erzeugen will + */ SfxPopupWindowType SvxTbxCtlAlign::GetPopupWindowType() const { return(SFX_POPUPWINDOW_ONCLICK); } -/************************************************************************* -|* -|* Hier wird das Fenster erzeugt -|* Lage der Toolbox mit GetToolBox() abfragbar -|* rItemRect sind die Screen-Koordinaten -|* -\************************************************************************/ +/* + * Hier wird das Fenster erzeugt + * Lage der Toolbox mit GetToolBox() abfragbar + * rItemRect sind die Screen-Koordinaten + */ SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow() { diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 77b9190e5aed..899a411273ab 100644 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -34,9 +34,6 @@ namespace svx #define TOOLBAR_RESNAME "private:resource/toolbar/" #define PROPNAME_LAYOUTMANAGER "LayoutManager" - - //= ToolboxAccess - ToolboxAccess::ToolboxAccess( const ::rtl::OUString& rToolboxName ) : m_bDocking ( false ), diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index b84ca8b381d2..c5d1102b2c10 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -44,7 +44,6 @@ SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, Tool addStatusListener( OUString( ".uno:VerticalTextState" )); } -/* ---------------------------------------------------------------------------*/ SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), bCheckVertical(true) diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 9a424863359b..75a07a90769f 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -20,22 +20,12 @@ #define INCLUDED_SVX_SOURCE_UNODRAW_SHAPEIMPL_HXX #include <svx/unoshape.hxx> - -/*********************************************************************** -* * -***********************************************************************/ - class SvxShapeCaption : public SvxShapeText { public: SvxShapeCaption( SdrObject* pObj ) throw(); virtual ~SvxShapeCaption() throw(); }; - -/*********************************************************************** -* * -***********************************************************************/ - class SvxPluginShape : public SvxOle2Shape { protected: @@ -54,11 +44,6 @@ public: virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) SAL_OVERRIDE; }; - -/*********************************************************************** -* * -***********************************************************************/ - class SvxAppletShape : public SvxOle2Shape { protected: @@ -77,11 +62,6 @@ public: virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) SAL_OVERRIDE; }; - -/*********************************************************************** -* * -***********************************************************************/ - class SvxFrameShape : public SvxOle2Shape { protected: diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index 63e23486301a..26b537e830f4 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -70,9 +70,6 @@ namespace svx { } - - //= PropertyChangeNotifier_Data - struct PropertyChangeNotifier_Data { ::cppu::OWeakObject& m_rContext; @@ -101,10 +98,6 @@ namespace svx _out_rValue = xContextProps->getPropertyValue( getPropertyName() ); } - - //= PropertyChangeNotifier - - PropertyChangeNotifier::PropertyChangeNotifier( ::cppu::OWeakObject& _rOwner, ::osl::Mutex& _rMutex ) :m_pData( new PropertyChangeNotifier_Data( _rOwner, _rMutex ) ) { diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 223b73a3b152..80999d4ec1ca 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -579,10 +579,6 @@ uno::Reference< com::sun::star::ucb::XAnyCompare > SAL_CALL SvxUnoDrawingModel:: return SvxCreateNumRuleCompare(); } - -// class SvxUnoDrawPagesAccess - - SvxUnoDrawPagesAccess::SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) throw() : mrModel(rMyModel) { @@ -654,10 +650,8 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements() // XDrawPages -/****************************************************************************** -* Erzeugt eine neue Seite mit Model an der angegebennen Position und gibt die * -* dazugehoerige SdDrawPage zurueck. * -******************************************************************************/ +// Erzeugt eine neue Seite mit Model an der angegebennen Position und gibt die +// dazugehoerige SdDrawPage zurueck. uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException, std::exception) { diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index f8caf5b6d0f0..cdce0f051388 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -60,8 +60,6 @@ using namespace ::com::sun::star::drawing; #define INTERFACE_TYPE( xint ) \ ::getCppuType((const Reference< xint >*)0) -// class SvxDrawPage * - UNO3_GETIMPLEMENTATION_IMPL( SvxDrawPage ); SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw() : mrBHelper( getMutex() ) diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index df64e3e448b2..655fa27d0089 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -802,10 +802,6 @@ comphelper::PropertyMapEntry const * ImplGetAdditionalWriterDrawingDefaultsPrope return aSvxAdditionalDefaultsPropertyMap_Impl; } -/*********************************************************************** -* class UHashMap * -***********************************************************************/ - typedef ::boost::unordered_map< OUString, sal_uInt32, OUStringHash > UHashMapImpl; namespace { @@ -900,10 +896,6 @@ sal_uInt32 UHashMap::getId( const OUString& rCompareString ) return it->second; } -/*********************************************************************** -* class SvxUnoPropertyMapProvider * -***********************************************************************/ - struct theSvxMapProvider : public rtl::Static<SvxUnoPropertyMapProvider, theSvxMapProvider> { @@ -979,7 +971,6 @@ const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(sal_uInt16 n return aSetArr[nPropertyId]; } -// ##################################################################### /** maps the API constant MeasureUnit to a vcl MapUnit enum. Returns false if conversion is not supported. diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index de1ffe4e9e38..c963981800db 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -69,10 +69,6 @@ using namespace ::com::sun::star::container; if( rType == ::getCppuType((const Reference< xint >*)0) ) \ aAny <<= Reference< xint >(this) -/*********************************************************************** -* class SvxShapeGroup * -***********************************************************************/ - SvxShapeGroup::SvxShapeGroup( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_GROUP), getSvxMapProvider().GetPropertySet(SVXMAP_GROUP, SdrObject::GetGlobalDrawObjectItemPool()) ), mxPage( pDrawPage ) @@ -144,7 +140,6 @@ OUString SAL_CALL SvxShapeGroup::getShapeType() return SvxShape::getShapeType(); } -//------------------------------------------------------------------1---- awt::Point SAL_CALL SvxShapeGroup::getPosition() throw(uno::RuntimeException, std::exception) { return SvxShape::getPosition(); @@ -371,11 +366,6 @@ uno::Sequence< OUString > SAL_CALL SvxShapeGroup::getSupportedServiceNames() { return SvxShape::getSupportedServiceNames(); } - -/*********************************************************************** -* * -***********************************************************************/ - SvxShapeConnector::SvxShapeConnector( SdrObject* pObj ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CONNECTOR), getSvxMapProvider().GetPropertySet(SVXMAP_CONNECTOR, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -438,7 +428,6 @@ OUString SAL_CALL SvxShapeConnector::getShapeType() return SvxShapeText::getShapeType(); } -//------------------------------------------------------------------1---- awt::Point SAL_CALL SvxShapeConnector::getPosition() throw(uno::RuntimeException, std::exception) { return SvxShapeText::getPosition(); @@ -532,10 +521,6 @@ uno::Sequence< OUString > SAL_CALL SvxShapeConnector::getSupportedServiceNames() return SvxShapeText::getSupportedServiceNames(); } -/*********************************************************************** -* class SvxShapeControl * -***********************************************************************/ - SvxShapeControl::SvxShapeControl( SdrObject* pObj ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CONTROL), getSvxMapProvider().GetPropertySet(SVXMAP_CONTROL, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -597,7 +582,6 @@ OUString SAL_CALL SvxShapeControl::getShapeType() return SvxShapeText::getShapeType(); } -//------------------------------------------------------------------1---- awt::Point SAL_CALL SvxShapeControl::getPosition() throw(uno::RuntimeException, std::exception) { return SvxShapeText::getPosition(); @@ -990,12 +974,6 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const OUString& aProperty } } - -/*********************************************************************** -* class SvxShapeDimensioning * -***********************************************************************/ - - SvxShapeDimensioning::SvxShapeDimensioning( SdrObject* pObj ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_DIMENSIONING), getSvxMapProvider().GetPropertySet(SVXMAP_DIMENSIONING, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -1011,12 +989,6 @@ uno::Sequence< OUString > SAL_CALL SvxShapeDimensioning::getSupportedServiceName { return SvxShapeText::getSupportedServiceNames(); } - -/*********************************************************************** -* * -***********************************************************************/ - - SvxShapeCircle::SvxShapeCircle( SdrObject* pObj ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CIRCLE), getSvxMapProvider().GetPropertySet(SVXMAP_CIRCLE, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -1033,11 +1005,6 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCircle::getSupportedServiceNames() th { return SvxShapeText::getSupportedServiceNames(); } - -/*********************************************************************** -* * -***********************************************************************/ - #include <svx/svdopath.hxx> @@ -1299,9 +1266,6 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygon::getSupportedServiceNames return SvxShapeText::getSupportedServiceNames(); } -/*********************************************************************** -* class SvxShapePolyPolygonBezier * -***********************************************************************/ #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include <com/sun/star/drawing/FlagSequence.hpp> @@ -1431,9 +1395,6 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygonBezier::getSupportedServic return SvxShapeText::getSupportedServiceNames(); } -/*********************************************************************** -* class SvxGraphicObject * -***********************************************************************/ #include <com/sun/star/awt/XBitmap.hpp> #include <vcl/cvtgrf.hxx> #include <svx/svdograf.hxx> @@ -1715,10 +1676,6 @@ SvxShapeCaption::~SvxShapeCaption() throw() { } -/*********************************************************************** -* class SvxCustomShape * -***********************************************************************/ - SvxCustomShape::SvxCustomShape( SdrObject* pObj ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap( SVXMAP_CUSTOMSHAPE ), getSvxMapProvider().GetPropertySet(SVXMAP_CUSTOMSHAPE, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -1786,7 +1743,6 @@ OUString SAL_CALL SvxCustomShape::getShapeType() return SvxShape::getShapeType(); } -//------------------------------------------------------------------1---- awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 4b42b8ca86ed..309b98c9cedb 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -56,11 +56,6 @@ using namespace ::com::sun::star::container; if( rType == ::getCppuType((const Reference< xint >*)0) ) \ aAny <<= Reference< xint >(this) -/*********************************************************************** -* class Svx3DSceneObject * -***********************************************************************/ - - Svx3DSceneObject::Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSCENEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSCENEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) , mxPage( pDrawPage ) @@ -477,12 +472,6 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames() comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.Shape3DScene" ); return aSeq; } - -/*********************************************************************** -* * -***********************************************************************/ - - Svx3DCubeObject::Svx3DCubeObject( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DCUBEOBJEKT), getSvxMapProvider().GetPropertySet(SVXMAP_3DCUBEOBJEKT, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -608,12 +597,6 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames() "com.sun.star.drawing.Shape3DCube"); return aSeq; } - -/*********************************************************************** -* * -***********************************************************************/ - - Svx3DSphereObject::Svx3DSphereObject( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSPHEREOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSPHEREOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -724,12 +707,6 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames() "com.sun.star.drawing.Shape3DSphere"); return aSeq; } - -/*********************************************************************** -* * -***********************************************************************/ - - Svx3DLatheObject::Svx3DLatheObject( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DLATHEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DLATHEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -932,11 +909,6 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames() "com.sun.star.drawing.Shape3DLathe"); return aSeq; } - -/*********************************************************************** -* * -***********************************************************************/ - Svx3DExtrudeObject::Svx3DExtrudeObject( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DEXTRUDEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DEXTRUDEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -1043,12 +1015,6 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames( "com.sun.star.drawing.Shape3DExtrude"); return aSeq; } - -/*********************************************************************** -* * -***********************************************************************/ - - Svx3DPolygonObject::Svx3DPolygonObject( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DPOLYGONOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DPOLYGONOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index fdc76fbe7244..a05f61e55c0a 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -790,11 +790,6 @@ bool SvxFrameShape::getPropertyValueImpl(const OUString& rName, const SfxItemPro return SvxOle2Shape::getPropertyValueImpl( rName, pProperty, rValue ); } } - -/*********************************************************************** -* * -***********************************************************************/ - SvxMediaShape::SvxMediaShape( SdrObject* pObj, OUString const & referer ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_MEDIA), getSvxMapProvider().GetPropertySet(SVXMAP_MEDIA, SdrObject::GetGlobalDrawObjectItemPool()) ), referer_(referer) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index dfec07e3f240..9d414580646f 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -107,10 +107,6 @@ using ::svx::IPropertyValueProvider; class GDIMetaFile; -/*********************************************************************** -* class SvxShapeImpl * -***********************************************************************/ - struct SvxShapeImpl { SvxShape& mrAntiImpl; @@ -145,7 +141,6 @@ struct SvxShapeImpl } }; -/**********************************************************************/ class ShapePositionProvider : public PropertyValueProvider { public: @@ -177,11 +172,6 @@ protected: } }; -/*********************************************************************** -* class SvxShape * -***********************************************************************/ - - SvxShape::SvxShape( SdrObject* pObject ) throw( uno::RuntimeException ) : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) @@ -3954,9 +3944,6 @@ void SvxShape::updateShapeKind() } } -/*********************************************************************** -* class SvxShapeText * -***********************************************************************/ SvxShapeText::SvxShapeText( SdrObject* pObject ) throw () : SvxShape( pObject, getSvxMapProvider().GetMap(SVXMAP_TEXT), getSvxMapProvider().GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) { @@ -4172,9 +4159,6 @@ bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* p return SvxShape::setPropertyToDefaultImpl( pProperty ); } -/*********************************************************************** -* class SvxShapeRect * -***********************************************************************/ SvxShapeRect::SvxShapeRect( SdrObject* pObj ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_SHAPE), getSvxMapProvider().GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool())) { diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 93205e65de37..209c473a0417 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -1029,12 +1029,6 @@ IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify*, aNotify) return 0; } - - - -// SvxTextEditSource - - SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText ) { mpImpl = new SvxTextEditSourceImpl( pObject, pText ); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 50d9555c48c2..28e034b12a9a 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -260,8 +260,6 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u return aUniqueName; } -// class XColorItem - TYPEINIT1_AUTOFACTORY(XColorItem, NameOrIndex); XColorItem::XColorItem(sal_uInt16 _nWhich, sal_Int32 nIndex, const Color& rTheColor) : @@ -351,8 +349,6 @@ bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*n // --- line attributes --- -// class XLineStyleItem - TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem); XLineStyleItem::XLineStyleItem(XLineStyle eTheLineStyle) : @@ -430,8 +426,6 @@ sal_uInt16 XLineStyleItem::GetValueCount() const return 3; } -// class XDash - XDash::XDash(XDashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen, sal_uInt16 nTheDashes, sal_uIntPtr nTheDashLen, sal_uIntPtr nTheDistance) : eDash(eTheDash), @@ -646,8 +640,6 @@ double XDash::CreateDotDashArray(::std::vector< double >& rDotDashArray, double return fFullDotDashLen; } -// class XLineDashItem - TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex); XLineDashItem::XLineDashItem(const OUString& rName, const XDash& rTheDash) : @@ -1014,8 +1006,6 @@ XLineDashItem* XLineDashItem::checkForUniqueItem( SdrModel* pModel ) const return NULL; } -// class XLineWidthItem - TYPEINIT1_AUTOFACTORY(XLineWidthItem, SfxMetricItem); XLineWidthItem::XLineWidthItem(long nWidth) : @@ -1073,8 +1063,6 @@ bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 return true; } -// class XLineColorItem - TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem); XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) : @@ -1226,8 +1214,6 @@ namespace } } -// class XLineStartItem - TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex); XLineStartItem::XLineStartItem(sal_Int32 nIndex) @@ -1570,8 +1556,6 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const return NULL; } -// class XLineEndItem - TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex); XLineEndItem::XLineEndItem(sal_Int32 nIndex) @@ -1913,8 +1897,6 @@ bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 n return true; } -// class XLineStartWidthItem - TYPEINIT1_AUTOFACTORY(XLineStartWidthItem, SfxMetricItem); XLineStartWidthItem::XLineStartWidthItem(long nWidth) : @@ -1965,8 +1947,6 @@ bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_ return true; } -// class XLineEndWidthItem - TYPEINIT1_AUTOFACTORY(XLineEndWidthItem, SfxMetricItem); XLineEndWidthItem::XLineEndWidthItem(long nWidth) : @@ -2017,8 +1997,6 @@ bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI return true; } -// class XLineStartCenterItem - TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem); XLineStartCenterItem::XLineStartCenterItem(bool bStartCenter) : @@ -2070,8 +2048,6 @@ bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal return true; } -// class XLineEndCenterItem - TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem); XLineEndCenterItem::XLineEndCenterItem(bool bEndCenter) : @@ -2125,8 +2101,6 @@ bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u // --- fill attributes --- -// class XFillStyleItem - TYPEINIT1_AUTOFACTORY(XFillStyleItem, SfxEnumItem); XFillStyleItem::XFillStyleItem(drawing::FillStyle eFillStyle) : @@ -2216,8 +2190,6 @@ bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 return true; } -// class XFillColorItem - TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem); XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) : @@ -2274,8 +2246,6 @@ bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 return true; } -// class XSecondaryFillColorItem - TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem); XSecondaryFillColorItem::XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor) : @@ -2318,8 +2288,6 @@ bool XSecondaryFillColorItem::GetPresentation return true; } -// class XGradient - XGradient::XGradient() : eStyle( XGRAD_LINEAR ), aStartColor( Color( COL_BLACK ) ), @@ -2366,8 +2334,6 @@ bool XGradient::operator==(const XGradient& rGradient) const nStepCount == rGradient.nStepCount ); } -// class XFillGradientItem - TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex); XFillGradientItem::XFillGradientItem(sal_Int32 nIndex, @@ -2753,8 +2719,6 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con return NULL; } -// class XFillFloatTransparenceItem - - TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem ); XFillFloatTransparenceItem::XFillFloatTransparenceItem() : @@ -2861,8 +2825,6 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM return NULL; } -// class XHatch - XHatch::XHatch(const Color& rCol, XHatchStyle eTheStyle, long nTheDistance, long nTheAngle) : eStyle(eTheStyle), @@ -2880,8 +2842,6 @@ bool XHatch::operator==(const XHatch& rHatch) const nAngle == rHatch.nAngle ); } -// class XFillHatchItem - TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex); XFillHatchItem::XFillHatchItem(const OUString& rName, @@ -3168,8 +3128,6 @@ XFillHatchItem* XFillHatchItem::checkForUniqueItem( SdrModel* pModel ) const // --- form text attributes --- -// class XFormTextStyleItem - TYPEINIT1_AUTOFACTORY(XFormTextStyleItem, SfxEnumItem); XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) : @@ -3212,8 +3170,6 @@ bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ return true; } -// class XFormTextAdjustItem - TYPEINIT1_AUTOFACTORY(XFormTextAdjustItem, SfxEnumItem); XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) : @@ -3256,8 +3212,6 @@ bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId* return true; } -// class XFormTextDistanceItem - TYPEINIT1_AUTOFACTORY(XFormTextDistanceItem, SfxMetricItem); XFormTextDistanceItem::XFormTextDistanceItem(long nDist) : @@ -3280,8 +3234,6 @@ SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c return new XFormTextDistanceItem(rIn); } -// class XFormTextStartItem - TYPEINIT1_AUTOFACTORY(XFormTextStartItem, SfxMetricItem); XFormTextStartItem::XFormTextStartItem(long nStart) : @@ -3304,8 +3256,6 @@ SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons return new XFormTextStartItem(rIn); } -// class XFormTextMirrorItem - TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem); XFormTextMirrorItem::XFormTextMirrorItem(bool bMirror) : @@ -3328,8 +3278,6 @@ SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con return new XFormTextMirrorItem(rIn); } -// class XFormTextOutlineItem - TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem); XFormTextOutlineItem::XFormTextOutlineItem(bool bOutline) : @@ -3352,8 +3300,6 @@ SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co return new XFormTextOutlineItem(rIn); } -// class XFormTextShadowItem - TYPEINIT1_AUTOFACTORY(XFormTextShadowItem, SfxEnumItem); XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) : @@ -3397,8 +3343,6 @@ bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId* return true; } -// class XFormTextShadowColorItem - TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem); XFormTextShadowColorItem::XFormTextShadowColorItem(const OUString& rName, @@ -3422,8 +3366,6 @@ SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/ return new XFormTextShadowColorItem(rIn); } -// class XFormTextShadowXValItem - TYPEINIT1_AUTOFACTORY(XFormTextShadowXValItem, SfxMetricItem); XFormTextShadowXValItem::XFormTextShadowXValItem(long nVal) : @@ -3446,8 +3388,6 @@ SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) return new XFormTextShadowXValItem(rIn); } -// class XFormTextShadowYValItem - TYPEINIT1_AUTOFACTORY(XFormTextShadowYValItem, SfxMetricItem); XFormTextShadowYValItem::XFormTextShadowYValItem(long nVal) : @@ -3470,8 +3410,6 @@ SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) return new XFormTextShadowYValItem(rIn); } -// class XFormTextHideFormItem - TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem); XFormTextHideFormItem::XFormTextHideFormItem(bool bHide) : diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index cd03b2b08e7e..eb478fef5142 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -32,8 +32,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -// class XLineTransparenceItem - TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item); XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) : @@ -79,8 +77,6 @@ bool XLineTransparenceItem::GetPresentation } } -// class XLineJointItem - - TYPEINIT1_AUTOFACTORY(XLineJointItem, SfxEnumItem); XLineJointItem::XLineJointItem( com::sun::star::drawing::LineJoint eLineJoint ) : @@ -184,8 +180,6 @@ sal_uInt16 XLineJointItem::GetValueCount() const return 5; } -// class AffineMatrixItem - TYPEINIT1_AUTOFACTORY(AffineMatrixItem, SfxPoolItem); AffineMatrixItem::AffineMatrixItem(const com::sun::star::geometry::AffineMatrix2D* pMatrix) @@ -287,8 +281,6 @@ bool AffineMatrixItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 return false; } -// class XLineCapItem - - TYPEINIT1_AUTOFACTORY(XLineCapItem, SfxEnumItem); XLineCapItem::XLineCapItem(com::sun::star::drawing::LineCap eLineCap) @@ -398,8 +390,6 @@ com::sun::star::drawing::LineCap XLineCapItem::GetValue() const return eRetval; } -// class XFillTransparenceItem - TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item); XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) : @@ -445,8 +435,6 @@ bool XFillTransparenceItem::GetPresentation } } -// class XFormTextShadowTranspItem - TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item); XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) : @@ -507,8 +495,6 @@ bool XGradientStepCountItem::GetPresentation return true; } -// class XFillBmpTileItem - TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem ); XFillBmpTileItem::XFillBmpTileItem( bool bTile ) : @@ -774,8 +760,6 @@ bool XFillBmpTileOffsetYItem::GetPresentation return true; } -// class XFillBmpStretchItem - TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem ); XFillBmpStretchItem::XFillBmpStretchItem( bool bStretch ) : @@ -882,8 +866,6 @@ bool XFillBmpPosOffsetYItem::GetPresentation return true; } -// class XFillBackgroundItem - TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem); XFillBackgroundItem::XFillBackgroundItem( bool bFill ) : diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 00466318171d..10bc9525791f 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -197,8 +197,6 @@ void XOBitmap::Array2Bitmap() bGraphicDirty = false; } -// class XFillBitmapItem - TYPEINIT1_AUTOFACTORY(XFillBitmapItem, NameOrIndex); XFillBitmapItem::XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject) diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index 755a7038228a..166c873f27da 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -36,8 +36,6 @@ Color RGB_Color( ColorData nColorName ) return aRGBColor; } -// class XColorEntry - XColorEntry::XColorEntry(const Color& rColor, const OUString& rName) : XPropertyEntry(rName), aColor(rColor) @@ -50,8 +48,6 @@ aColor(rOther.aColor) { } -// class XLineEndEntry - XLineEndEntry::XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const OUString& rName) : XPropertyEntry(rName), aB2DPolyPolygon(rB2DPolyPolygon) @@ -64,8 +60,6 @@ XLineEndEntry::XLineEndEntry(const XLineEndEntry& rOther) { } -// class XDashEntry - XDashEntry::XDashEntry(const XDash& rDash, const OUString& rName) : XPropertyEntry(rName), aDash(rDash) @@ -78,8 +72,6 @@ aDash(rOther.aDash) { } -// class XHatchEntry - XHatchEntry::XHatchEntry(const XHatch& rHatch, const OUString& rName) : XPropertyEntry(rName), aHatch(rHatch) @@ -92,8 +84,6 @@ XHatchEntry::XHatchEntry(const XHatchEntry& rOther) { } -// class XGradientEntry - XGradientEntry::XGradientEntry(const XGradient& rGradient, const OUString& rName) : XPropertyEntry(rName), aGradient(rGradient) @@ -106,8 +96,6 @@ XGradientEntry::XGradientEntry(const XGradientEntry& rOther) { } -// class XBitmapEntry - XBitmapEntry::XBitmapEntry(const GraphicObject& rGraphicObject, const OUString& rName) : XPropertyEntry(rName), maGraphicObject(rGraphicObject) |