svx/inc/AccessibleTableShape.hxx | 4 svx/inc/dragmt3d.hxx | 29 -- svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx | 3 svx/inc/sxallitm.hxx | 9 svx/inc/sxlayitm.hxx | 7 svx/inc/sxlogitm.hxx | 3 svx/inc/sxmovitm.hxx | 6 svx/inc/sxoneitm.hxx | 9 svx/inc/sxonitm.hxx | 3 svx/inc/sxopitm.hxx | 3 svx/inc/sxraitm.hxx | 3 svx/inc/sxreaitm.hxx | 6 svx/inc/sxreoitm.hxx | 6 svx/inc/sxroaitm.hxx | 3 svx/inc/sxrooitm.hxx | 3 svx/inc/sxsaitm.hxx | 3 svx/inc/sxsalitm.hxx | 6 svx/inc/sxsoitm.hxx | 6 svx/inc/sxtraitm.hxx | 12 - svx/source/accessibility/AccessibleControlShape.cxx | 1 svx/source/accessibility/AccessibleGraphicShape.cxx | 27 -- svx/source/accessibility/AccessibleOLEShape.cxx | 29 -- svx/source/accessibility/AccessibleShape.cxx | 75 +----- svx/source/accessibility/AccessibleTextHelper.cxx | 6 svx/source/accessibility/ChildrenManager.cxx | 6 svx/source/accessibility/ChildrenManagerImpl.cxx | 36 --- svx/source/accessibility/ChildrenManagerImpl.hxx | 18 - svx/source/accessibility/GraphCtlAccessibleContext.cxx | 38 +-- svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 24 -- svx/source/accessibility/svxrectctaccessiblecontext.cxx | 44 +--- svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 10 svx/source/customshapes/tbxcustomshapes.cxx | 25 -- svx/source/dialog/_contdlg.cxx | 7 svx/source/dialog/charmap.cxx | 4 svx/source/dialog/checklbx.cxx | 2 svx/source/dialog/ctredlin.cxx | 22 -- svx/source/dialog/databaseregistrationui.cxx | 4 svx/source/dialog/dialcontrol.cxx | 4 svx/source/dialog/dlgctrl.cxx | 32 -- svx/source/dialog/fntctrl.cxx | 10 svx/source/dialog/framelinkarray.cxx | 24 -- svx/source/dialog/frmsel.cxx | 54 +--- svx/source/dialog/hdft.cxx | 4 svx/source/dialog/imapdlg.cxx | 2 svx/source/dialog/pagectrl.cxx | 4 svx/source/dialog/paraprev.cxx | 2 svx/source/dialog/passwd.cxx | 2 svx/source/dialog/rlrcitem.cxx | 2 svx/source/dialog/rlrcitem.hxx | 2 svx/source/dialog/rulritem.cxx | 5 svx/source/dialog/srchctrl.cxx | 2 svx/source/dialog/srchctrl.hxx | 2 svx/source/dialog/srchdlg.cxx | 6 svx/source/dialog/stddlg.cxx | 5 svx/source/dialog/svxruler.cxx | 2 svx/source/dialog/txencbox.cxx | 4 svx/source/engine3d/dragmt3d.cxx | 6 svx/source/engine3d/e3dundo.cxx | 10 svx/source/engine3d/float3d.cxx | 4 svx/source/engine3d/obj3d.cxx | 4 svx/source/engine3d/polysc3d.cxx | 2 svx/source/fmcomp/dbaexchange.cxx | 7 svx/source/fmcomp/dbaobjectex.cxx | 4 svx/source/fmcomp/fmgridcl.cxx | 2 svx/source/fmcomp/fmgridif.cxx | 24 -- svx/source/fmcomp/gridcell.cxx | 62 ----- svx/source/fmcomp/xmlexchg.cxx | 4 svx/source/form/ParseContext.cxx | 3 svx/source/form/dataaccessdescriptor.cxx | 7 svx/source/form/databaselocationinput.cxx | 7 svx/source/form/datanavi.cxx | 38 --- svx/source/form/dbcharsethelper.cxx | 5 svx/source/form/dbtoolsclient.cxx | 8 svx/source/form/filtnav.cxx | 18 - svx/source/form/fmPropBrw.cxx | 6 svx/source/form/fmcontrolbordermanager.cxx | 4 svx/source/form/fmdpage.cxx | 3 svx/source/form/fmexch.cxx | 16 - svx/source/form/fmexpl.cxx | 33 --- svx/source/form/fmmodel.cxx | 50 ---- svx/source/form/fmobjfac.cxx | 18 - svx/source/form/fmscriptingenv.cxx | 14 - svx/source/form/fmshell.cxx | 3 svx/source/form/fmshimp.cxx | 7 svx/source/form/fmtextcontroldialogs.cxx | 5 svx/source/form/fmtextcontrolfeature.cxx | 4 svx/source/form/fmtextcontrolshell.cxx | 11 - svx/source/form/formcontrolfactory.cxx | 7 svx/source/form/formcontroller.cxx | 15 - svx/source/form/formcontrolling.cxx | 8 svx/source/form/formdispatchinterceptor.cxx | 5 svx/source/form/formfeaturedispatcher.cxx | 4 svx/source/form/formtoolbars.cxx | 4 svx/source/form/navigatortree.cxx | 5 svx/source/form/navigatortreemodel.cxx | 9 svx/source/form/sqlparserclient.cxx | 4 svx/source/form/stringlistresource.cxx | 3 svx/source/form/tabwin.cxx | 11 - svx/source/form/tbxform.cxx | 31 -- svx/source/form/typeconversionclient.cxx | 5 svx/source/form/xfm_addcondition.cxx | 4 svx/source/inc/GraphCtlAccessibleContext.hxx | 32 -- svx/source/inc/datanavi.hxx | 2 svx/source/inc/filtnav.hxx | 20 - svx/source/inc/fmcontrolbordermanager.hxx | 9 svx/source/inc/fmcontrollayout.hxx | 4 svx/source/inc/fmdocumentclassification.hxx | 7 svx/source/inc/fmexch.hxx | 9 svx/source/inc/fmexpl.hxx | 5 svx/source/inc/fmtextcontroldialogs.hxx | 4 svx/source/inc/fmtextcontrolfeature.hxx | 4 svx/source/inc/fmtextcontrolshell.hxx | 6 svx/source/inc/fmundo.hxx | 9 svx/source/inc/fmvwimp.hxx | 2 svx/source/inc/formcontrolfactory.hxx | 4 svx/source/inc/formcontroller.hxx | 3 svx/source/inc/formcontrolling.hxx | 10 svx/source/inc/formdispatchinterceptor.hxx | 4 svx/source/inc/formfeaturedispatcher.hxx | 4 svx/source/inc/frmselimpl.hxx | 16 - svx/source/inc/gridcell.hxx | 3 svx/source/inc/stringlistresource.hxx | 4 svx/source/inc/svxrectctaccessiblecontext.hxx | 51 +--- svx/source/inc/typeconversionclient.hxx | 4 svx/source/inc/xfm_addcondition.hxx | 4 svx/source/items/SmartTagItem.cxx | 2 svx/source/items/algitem.cxx | 4 svx/source/items/chrtitem.cxx | 50 ---- svx/source/items/drawitem.cxx | 37 --- svx/source/items/e3ditem.cxx | 5 svx/source/items/grfitem.cxx | 4 svx/source/items/hlnkitem.cxx | 2 svx/source/items/numfmtsh.cxx | 154 +++----------- svx/source/items/numinf.cxx | 2 svx/source/items/pageitem.cxx | 27 -- svx/source/items/postattr.cxx | 6 svx/source/items/rotmodit.cxx | 2 svx/source/mnuctrls/SmartTagCtl.cxx | 2 svx/source/mnuctrls/fntctl.cxx | 2 svx/source/sdr/contact/viewcontactofunocontrol.cxx | 4 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 26 -- svx/source/sidebar/nbdtmg.cxx | 22 -- svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 18 - svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 26 -- svx/source/smarttags/SmartTagMgr.cxx | 2 svx/source/stbctrls/insctrl.cxx | 2 svx/source/stbctrls/modctrl.cxx | 3 svx/source/stbctrls/pszctrl.cxx | 6 svx/source/stbctrls/selctrl.cxx | 2 svx/source/stbctrls/stbctrls.h | 2 svx/source/stbctrls/zoomctrl.cxx | 3 svx/source/svdraw/svdattr.cxx | 80 ------- svx/source/svdraw/svddrgm1.hxx | 24 -- svx/source/svdraw/svdetc.cxx | 5 svx/source/svdraw/svdfmtf.cxx | 7 svx/source/svdraw/svdhdl.cxx | 8 svx/source/svdraw/svdlayer.cxx | 4 svx/source/svdraw/svdmodel.cxx | 4 svx/source/svdraw/svdopath.cxx | 8 svx/source/svdraw/svdouno.cxx | 4 svx/source/table/accessiblecell.cxx | 4 svx/source/table/accessibletableshape.cxx | 18 - svx/source/table/cellcursor.cxx | 4 svx/source/table/cellcursor.hxx | 4 svx/source/table/cellrange.cxx | 4 svx/source/table/cellrange.hxx | 4 svx/source/table/propertyset.cxx | 8 svx/source/table/svdotable.cxx | 4 svx/source/table/tablecolumn.hxx | 4 svx/source/table/tablecolumns.cxx | 4 svx/source/table/tablecolumns.hxx | 4 svx/source/table/tablecontroller.cxx | 4 svx/source/table/tabledesign.cxx | 4 svx/source/table/tablemodel.hxx | 8 svx/source/table/tablerow.cxx | 4 svx/source/table/tablerow.hxx | 4 svx/source/table/tablerows.cxx | 4 svx/source/table/tablerows.hxx | 4 svx/source/tbxctrls/SvxColorChildWindow.cxx | 7 svx/source/tbxctrls/colorwindow.hxx | 7 svx/source/tbxctrls/colrctrl.cxx | 92 -------- svx/source/tbxctrls/extrusioncontrols.cxx | 21 - svx/source/tbxctrls/fillctrl.cxx | 11 - svx/source/tbxctrls/fontworkgallery.cxx | 18 - svx/source/tbxctrls/itemwin.cxx | 12 - svx/source/tbxctrls/layctrl.cxx | 8 svx/source/tbxctrls/linectrl.cxx | 28 -- svx/source/tbxctrls/tbcontrl.cxx | 2 svx/source/tbxctrls/tbunocontroller.cxx | 8 svx/source/tbxctrls/tbunosearchcontrollers.cxx | 25 -- svx/source/tbxctrls/tbxalign.cxx | 29 +- svx/source/tbxctrls/tbxcolor.cxx | 3 svx/source/tbxctrls/verttexttbxctrl.cxx | 1 svx/source/unodraw/shapeimpl.hxx | 20 - svx/source/unodraw/shapepropertynotifier.cxx | 7 svx/source/unodraw/unomod.cxx | 10 svx/source/unodraw/unopage.cxx | 2 svx/source/unodraw/unoprov.cxx | 9 svx/source/unodraw/unoshap2.cxx | 44 ---- svx/source/unodraw/unoshap3.cxx | 34 --- svx/source/unodraw/unoshap4.cxx | 5 svx/source/unodraw/unoshape.cxx | 16 - svx/source/unodraw/unoshtxt.cxx | 6 svx/source/xoutdev/xattr.cxx | 62 ----- svx/source/xoutdev/xattr2.cxx | 18 - svx/source/xoutdev/xattrbmp.cxx | 2 svx/source/xoutdev/xtable.cxx | 12 - 207 files changed, 237 insertions(+), 2329 deletions(-)
New commits: commit 7b33dbb25394a88b8eb2c826d951ce578605e895 Author: Chris Laplante <mostthings...@gmail.com> Date: Mon Aug 18 16:57:11 2014 -0400 svx: Cleanup ASCII art and useless comments Change-Id: I5399362056276f324fd43eda05d3f606dc6f8c71 Reviewed-on: https://gerrit.libreoffice.org/11011 Reviewed-by: Noel Grandin <noelgran...@gmail.com> Tested-by: Noel Grandin <noelgran...@gmail.com> diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx index 58023a8..a531837 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 70f3fda..eb428c6 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 ccb1b87..bfcea28 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 b8ba713..741304d 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 4df9bad..4cbc108 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 6b9d6e2..c0f4816 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 c3bd851..1bf3ff2 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 7167739..4610e90 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 f65248e..6c3916ed 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 706a778..1a423fe 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 d1dfc6a..8e913ff 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 065759f..46a063e 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 3483d4b..4bb14b9 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 48d1399..e8fba5f 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 79f4789..82b1162 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 5359921..2ce5105 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 e6b14ec..66ca7d7 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 0256b82..bca37df 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 f741d8c..6e0f51b 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 3ca609d..efc6e79 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 476ac63..1b0e04e 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 0e62c15..a512a3b 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 ec0d369..f97949e 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 9d8488e..f73bcee 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 5795f19..134f17f 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 89a8238..c156252 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 45a4b10..4ef4d8b 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 04b85ba..085bbb9 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 1d45757..bcf602e 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 f0c8b22..eb70382 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 b0bd2a3..a49a877 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 a2798fc..1a1d2d0 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 9458fbe..349ad07 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 6f68134..0903a32 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 732076eb..0180643 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 d3aebb7..1e5078a 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 b4e2316..5016c12 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 02147de..d8da298 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 58214e7..79c2176 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 80ca478..5f4a53d 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 9a9a012..9ad80cc 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 01763dd..3a8b0e3 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 4c9b21e..616ff40 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 feb1c30..416faa6 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 ed2d580..3a1145d 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 9eaa964..ac4c7f3 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 9933dc0..af77070 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 6d17f81..e02fdb9 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 62e6a2d..648ccc5 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 ce98f9c..a94085b 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 479a165..46c6a9b 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 d33525b..7385d77 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 0264cbb..e4673fb 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 3ea9673..6579f2d 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 7e3d27c..bf12a85 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 ae5ba01..86afcac 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 72b79da..b7b0b47 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 38c287f..fbd0312 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 7dcc3b8..d0c259d 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 ff32a41..1924a10 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 a62bc0b..379abcd 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 4cd4217..489e441 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 c994db3..c327c75 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 57b5931..2a585d5 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 217f19f..f519b46c 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 e4107ca..f03604b 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 0460e25..e7ec9d4 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 a17f12b2..7d776cb 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 efabc93..e09593b 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 f214333..2a4f2d4 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 6708f90..69b24e2 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 a3fea99..f401592 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 90e8977..c5b6d05 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 f90fbbf..7de8f32 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 ) ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits