diff options
103 files changed, 686 insertions, 1766 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index ee4e02688d14..5c67fcb6693b 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -39,7 +39,7 @@ class SdrPathObj; namespace sd { -// -------------------------------------------------------------------- + enum EValue { VALUE_FROM, VALUE_TO, VALUE_BY, VALUE_FIRST, VALUE_LAST }; diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 3921a9566a77..191574cf6d7e 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -60,7 +60,6 @@ namespace sd class Outliner; } - class Timer; class SfxObjectShell; class SdPage; @@ -133,11 +132,7 @@ namespace sd }; } - -// ------------------ -// - SdDrawDocument - -// ------------------ - +// SdDrawDocument class SdDrawDocument : public FmFormModel { private: diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 522ecb2a5e4e..8a764af0347b 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -90,15 +90,15 @@ #define STR_POOLSHEET_HEADLINE2 RID_GLOB_START+67 #define STR_POOLSHEET_MEASURE RID_GLOB_START+68 #define STR_POOLSHEET_ARROW RID_GLOB_START+69 -// + #define STR_POOLSHEET_BANDED_CELL RID_GLOB_START+70 #define STR_POOLSHEET_HEADER RID_GLOB_START+71 #define STR_POOLSHEET_TOTAL RID_GLOB_START+72 #define STR_POOLSHEET_FIRST_COLUMN RID_GLOB_START+73 #define STR_POOLSHEET_LAST_COLUMN RID_GLOB_START+74 -// + #define STR_POOLSHEET_OBJNOLINENOFILL RID_GLOB_START+75 -// + #define STR_PSEUDOSHEET_TITLE RID_GLOB_START+80 #define STR_PSEUDOSHEET_OUTLINE RID_GLOB_START+81 #define STR_PSEUDOSHEET_BACKGROUNDOBJECTS RID_GLOB_START+82 diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 8d6a6288e923..6953f4527952 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -167,7 +167,7 @@ public: virtual void Cancel() = 0; }; -//--------------------------------------------------------- + class SdAbstractDialogFactory { public: diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index e7ea9b696ce6..004827c0db64 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -31,13 +31,7 @@ #include "fadedef.h" #include "diadef.h" -//------------------------------------------------------------------ - - -//================================================================== -// layer attributes -//================================================================== - +// layer attributes class SdAttrLayerName : public SfxStringItem { public: @@ -47,8 +41,6 @@ public: SfxStringItem( ATTR_LAYER_NAME, aStr ) {} }; -//------------------------------------------------------------------ - class SdAttrLayerTitle : public SfxStringItem { public: @@ -56,8 +48,6 @@ public: SdAttrLayerTitle( const OUString& aStr ) : SfxStringItem( ATTR_LAYER_TITLE, aStr ) {} }; -//------------------------------------------------------------------ - class SdAttrLayerDesc : public SfxStringItem { public: @@ -65,7 +55,6 @@ public: SdAttrLayerDesc( const OUString& aStr ) : SfxStringItem( ATTR_LAYER_DESC, aStr ) {} }; -//------------------------------------------------------------------ class SdAttrLayerVisible : public SfxBoolItem { @@ -74,7 +63,6 @@ public: SfxBoolItem( ATTR_LAYER_VISIBLE, bValue ) {} }; -//------------------------------------------------------------------ class SdAttrLayerPrintable : public SfxBoolItem { @@ -83,7 +71,6 @@ public: SfxBoolItem( ATTR_LAYER_PRINTABLE, bValue ) {} }; -//------------------------------------------------------------------ class SdAttrLayerLocked : public SfxBoolItem { @@ -92,7 +79,6 @@ public: SfxBoolItem( ATTR_LAYER_LOCKED, bValue ) {} }; -//------------------------------------------------------------------ class SdAttrLayerThisPage : public SfxBoolItem { @@ -101,7 +87,6 @@ public: SfxBoolItem( ATTR_LAYER_THISPAGE, bValue ) {} }; -//------------------------------------------------------------------ class DiaEffectItem : public SfxEnumItem { @@ -117,7 +102,6 @@ public: { return (::com::sun::star::presentation::FadeEffect) SfxEnumItem::GetValue(); } }; -//------------------------------------------------------------------ class DiaSpeedItem : public SfxEnumItem { @@ -133,7 +117,6 @@ public: { return (FadeSpeed) SfxEnumItem::GetValue(); } }; -//------------------------------------------------------------------ class DiaAutoItem : public SfxEnumItem { @@ -148,7 +131,6 @@ public: PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); } }; -//------------------------------------------------------------------ class DiaTimeItem : public SfxUInt32Item { @@ -162,5 +144,4 @@ public: #endif // INCLUDED_SD_INC_SDATTR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx index 8e2f426152b9..f7379408f40a 100644 --- a/sd/inc/sdcgmfilter.hxx +++ b/sd/inc/sdcgmfilter.hxx @@ -22,10 +22,7 @@ #include "sdfilter.hxx" -// --------------- -// - SdCGMFilter - -// --------------- - +// SdCGMFilter class SdCGMFilter : public SdFilter { public: diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx index 9927a400e5f4..cd384eebbbd3 100644 --- a/sd/inc/sdfilter.hxx +++ b/sd/inc/sdfilter.hxx @@ -26,10 +26,7 @@ #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/task/XStatusIndicatorSupplier.hpp> -// ------------ -// - SdFilter - -// ------------ - +// SdFilter class SfxMedium; namespace sd { class DrawDocShell; diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx index e14e0c561344..2355b603252a 100644 --- a/sd/inc/sdgrffilter.hxx +++ b/sd/inc/sdgrffilter.hxx @@ -25,10 +25,7 @@ #include <tools/errinf.hxx> #include "sdfilter.hxx" -// --------------- -// - SdCGMFilter - -// --------------- - +// SdCGMFilter class SdGRFFilter : public SdFilter { public: diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx index 8f034f614029..840f226f5256 100644 --- a/sd/inc/sdhtmlfilter.hxx +++ b/sd/inc/sdhtmlfilter.hxx @@ -22,10 +22,8 @@ #include "sdfilter.hxx" -// ---------------- -// - SdHTMLFilter - -// ---------------- +// SdHTMLFilter class SdHTMLFilter : public SdFilter { diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx index 23f0839e5103..d9c786d3ae8c 100644 --- a/sd/inc/sdiocmpt.hxx +++ b/sd/inc/sdiocmpt.hxx @@ -22,7 +22,6 @@ #include <tools/stream.hxx> -////////////////////////////////////////////////////////////////////////////// class SvStream; class old_SdrDownCompat @@ -44,7 +43,7 @@ public: void OpenSubRecord(); void CloseSubRecord(); }; -////////////////////////////////////////////////////////////////////////////// + #include "sddllapi.h" #define SDIOCOMPAT_VERSIONDONTKNOW (sal_uInt16)0xffff @@ -65,5 +64,4 @@ public: #endif // INCLUDED_SD_INC_SDIOCMPT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx index 2191bba92d45..d4b923477c1d 100644 --- a/sd/inc/sdobjfac.hxx +++ b/sd/inc/sdobjfac.hxx @@ -23,9 +23,7 @@ #include <tools/link.hxx> -//----------------------- // class SdObjectFactory -//----------------------- class SdrObjFactory; class SdObjectFactory diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx index b4f322c82b4b..49cc8b8d89c9 100644 --- a/sd/inc/sdpptwrp.hxx +++ b/sd/inc/sdpptwrp.hxx @@ -22,10 +22,7 @@ #include "sdfilter.hxx" -// --------------- -// - SdPPTFilter - -// --------------- - +// SdPPTFilter class SdPPTFilter : public SdFilter { public: diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx index ad7665e236ae..46a125c24a4f 100644 --- a/sd/inc/sdxmlwrp.hxx +++ b/sd/inc/sdxmlwrp.hxx @@ -22,10 +22,7 @@ #include <tools/errcode.hxx> #include "sdfilter.hxx" -// --------------- -// - SdXMLFilter - -// --------------- - +// SdXMLFilter enum SdXMLFilterMode { SDXMLMODE_Normal, ///< standard load and save of the complete document diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx index 99b926e4b77d..c0270b8f17f8 100644 --- a/sd/inc/undo/undoobjects.hxx +++ b/sd/inc/undo/undoobjects.hxx @@ -30,7 +30,6 @@ class SdPage; namespace sd { -/////////////////////////////////////////////////////////////////////// class UndoRemovePresObjectImpl { @@ -47,8 +46,6 @@ private: SfxUndoAction* mpUndoPresObj; }; -/////////////////////////////////////////////////////////////////////// - class UndoRemoveObject : public SdrUndoRemoveObj, public UndoRemovePresObjectImpl { public: @@ -61,8 +58,6 @@ private: SdrObjectWeakRef mxSdrObject; }; -/////////////////////////////////////////////////////////////////////// - class UndoDeleteObject : public SdrUndoDelObj, public UndoRemovePresObjectImpl { public: @@ -75,7 +70,6 @@ private: SdrObjectWeakRef mxSdrObject; }; -/////////////////////////////////////////////////////////////////////// class UndoReplaceObject : public SdrUndoReplaceObj, public UndoRemovePresObjectImpl { @@ -89,7 +83,6 @@ private: SdrObjectWeakRef mxSdrObject; }; -/////////////////////////////////////////////////////////////////////// class UndoObjectSetText : public SdrUndoObjSetText { @@ -106,7 +99,7 @@ private: SdrObjectWeakRef mxSdrObject; }; -////////////////////////////////////////////////////////////////////////////// + // Undo for SdrObject::SetUserCall() class UndoObjectUserCall : public SdrUndoObj @@ -123,7 +116,7 @@ protected: SdrObjectWeakRef mxSdrObject; }; -////////////////////////////////////////////////////////////////////////////// + // Undo for SdPage::InsertPresObj() and SdPage::RemovePresObj() class UndoObjectPresentationKind : public SdrUndoObj @@ -141,7 +134,7 @@ protected: SdrObjectWeakRef mxSdrObject; }; -////////////////////////////////////////////////////////////////////////////// + // Restores correct position and size for presentation shapes with user call // on undo @@ -157,7 +150,6 @@ protected: SdrPageWeakRef mxPage; }; -////////////////////////////////////////////////////////////////////////////// class UndoGeoObject : public SdrUndoGeoObj { @@ -172,7 +164,6 @@ protected: SdrObjectWeakRef mxSdrObject; }; -////////////////////////////////////////////////////////////////////////////// class UndoAttrObject : public SdrUndoAttrObj { diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 5e3373e9a03c..78e812e834e0 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -1322,7 +1322,7 @@ interface DrawView StateMethod = GetMenuState ; Export = FALSE ; ] - ////////////////////////////////////////////////////////////////////// + // Begin FormSlots SID_FM_CREATE_CONTROL [ @@ -1339,7 +1339,7 @@ interface DrawView StateMethod = GetCtrlState ; ] // End FormSlots - ////////////////////////////////////////////////////////////////////// + SID_ATTR_FILL_STYLE // ole : no, status : ? [ ExecMethod = FuTemporary ; @@ -2382,7 +2382,7 @@ interface DrawView StateMethod = GetMenuState ; ] - SID_FORMATPAINTBRUSH // + SID_FORMATPAINTBRUSH [ ExecMethod = FuPermanent ; StateMethod = GetMenuState ; diff --git a/sd/sdi/drgrfob.sdi b/sd/sdi/drgrfob.sdi index 4efc73007e07..cf5bc9a2b85a 100644 --- a/sd/sdi/drgrfob.sdi +++ b/sd/sdi/drgrfob.sdi @@ -79,7 +79,6 @@ shell GraphicObjectBar StateMethod = GetFilterState; ] -//------------------------------------------------------------------------------ SID_ATTR_GRAF_MODE [ diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 19e03d757c26..9a03c4f20996 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -42,7 +42,6 @@ TbxImageItem AdvancedMode SID_OBJECT_CHOOSE_MODE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem AnimationEffects SID_ANIMATION_EFFECTS () [ @@ -67,7 +66,6 @@ SfxVoidItem AnimationEffects SID_ANIMATION_EFFECTS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxBoolItem AnimationObjects SID_ANIMATION_OBJECTS [ @@ -94,7 +92,6 @@ SfxBoolItem AnimationObjects SID_ANIMATION_OBJECTS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxBoolItem AnimatorAddObject SID_ANIMATOR_ADD [ @@ -121,7 +118,6 @@ SfxBoolItem AnimatorAddObject SID_ANIMATOR_ADD GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxBoolItem AnimatorCreateObject SID_ANIMATOR_CREATE [ @@ -148,7 +144,6 @@ SfxBoolItem AnimatorCreateObject SID_ANIMATOR_CREATE GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxBoolItem AnimatorInit SID_ANIMATOR_INIT [ @@ -175,7 +170,6 @@ SfxBoolItem AnimatorInit SID_ANIMATOR_INIT GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxUInt16Item AnimatorState SID_ANIMATOR_STATE [ @@ -202,7 +196,6 @@ SfxUInt16Item AnimatorState SID_ANIMATOR_STATE GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- TbxImageItem ArrowsToolbox SID_DRAWTBX_ARROWS [ @@ -229,7 +222,6 @@ TbxImageItem ArrowsToolbox SID_DRAWTBX_ARROWS GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem Backward SID_MOREBACK () [ @@ -254,7 +246,6 @@ SfxVoidItem Backward SID_MOREBACK GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem BeforeObject SID_BEFORE_OBJ () [ @@ -279,7 +270,6 @@ SfxVoidItem BeforeObject SID_BEFORE_OBJ GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem BehindObject SID_BEHIND_OBJ () [ @@ -304,7 +294,6 @@ SfxVoidItem BehindObject SID_BEHIND_OBJ GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem Break SID_BREAK () [ @@ -353,7 +342,6 @@ SfxVoidItem CapturePoint SID_CAPTUREPOINT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem ChangeBezier SID_CHANGEBEZIER () [ @@ -378,7 +366,6 @@ SfxVoidItem ChangeBezier SID_CHANGEBEZIER GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem ChangePolygon SID_CHANGEPOLYGON () [ @@ -403,7 +390,6 @@ SfxVoidItem ChangePolygon SID_CHANGEPOLYGON GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem ClickChangeRotation SID_CLICK_CHANGE_ROTATION [ @@ -430,7 +416,6 @@ SfxBoolItem ClickChangeRotation SID_CLICK_CHANGE_ROTATION GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxVoidItem CloseObject SID_OBJECT_CLOSE () [ @@ -455,7 +440,6 @@ SfxVoidItem CloseObject SID_OBJECT_CLOSE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem ColorView SID_COLORVIEW [ @@ -482,7 +466,6 @@ SfxBoolItem ColorView SID_COLORVIEW GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem Combine SID_COMBINE () [ @@ -507,7 +490,6 @@ SfxVoidItem Combine SID_COMBINE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem Cone SID_3D_CONE [ @@ -534,7 +516,6 @@ SfxBoolItem Cone SID_3D_CONE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem Connect SID_CONNECT () [ @@ -559,7 +540,6 @@ SfxVoidItem Connect SID_CONNECT GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem Connector SID_TOOL_CONNECTOR [ @@ -586,7 +566,6 @@ SfxBoolItem Connector SID_TOOL_CONNECTOR GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorArrowEnd SID_CONNECTOR_ARROW_END [ @@ -613,7 +592,6 @@ SfxBoolItem ConnectorArrowEnd SID_CONNECTOR_ARROW_END GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorArrows SID_CONNECTOR_ARROWS [ @@ -640,7 +618,6 @@ SfxBoolItem ConnectorArrows SID_CONNECTOR_ARROWS GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorArrowStart SID_CONNECTOR_ARROW_START [ @@ -667,7 +644,6 @@ SfxBoolItem ConnectorArrowStart SID_CONNECTOR_ARROW_START GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxVoidItem ConnectorAttributes SID_CONNECTION_DLG () [ @@ -692,7 +668,6 @@ SfxVoidItem ConnectorAttributes SID_CONNECTION_DLG GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorCircleEnd SID_CONNECTOR_CIRCLE_END [ @@ -719,7 +694,6 @@ SfxBoolItem ConnectorCircleEnd SID_CONNECTOR_CIRCLE_END GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorCircles SID_CONNECTOR_CIRCLES [ @@ -746,7 +720,6 @@ SfxBoolItem ConnectorCircles SID_CONNECTOR_CIRCLES GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorCircleStart SID_CONNECTOR_CIRCLE_START [ @@ -773,7 +746,6 @@ SfxBoolItem ConnectorCircleStart SID_CONNECTOR_CIRCLE_START GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorCurve SID_CONNECTOR_CURVE [ @@ -800,7 +772,6 @@ SfxBoolItem ConnectorCurve SID_CONNECTOR_CURVE GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorCurveArrowEnd SID_CONNECTOR_CURVE_ARROW_END [ @@ -827,7 +798,6 @@ SfxBoolItem ConnectorCurveArrowEnd SID_CONNECTOR_CURVE_ARROW_END GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorCurveArrows SID_CONNECTOR_CURVE_ARROWS [ @@ -854,7 +824,6 @@ SfxBoolItem ConnectorCurveArrows SID_CONNECTOR_CURVE_ARROWS GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorCurveArrowStart SID_CONNECTOR_CURVE_ARROW_START [ @@ -881,7 +850,6 @@ SfxBoolItem ConnectorCurveArrowStart SID_CONNECTOR_CURVE_ARROW_START GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorCurveCircleEnd SID_CONNECTOR_CURVE_CIRCLE_END [ @@ -908,7 +876,6 @@ SfxBoolItem ConnectorCurveCircleEnd SID_CONNECTOR_CURVE_CIRCLE_END GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorCurveCircles SID_CONNECTOR_CURVE_CIRCLES [ @@ -935,7 +902,6 @@ SfxBoolItem ConnectorCurveCircles SID_CONNECTOR_CURVE_CIRCLES GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorCurveCircleStart SID_CONNECTOR_CURVE_CIRCLE_START [ @@ -962,7 +928,6 @@ SfxBoolItem ConnectorCurveCircleStart SID_CONNECTOR_CURVE_CIRCLE_START GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLine SID_CONNECTOR_LINE [ @@ -989,7 +954,6 @@ SfxBoolItem ConnectorLine SID_CONNECTOR_LINE GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLineArrowEnd SID_CONNECTOR_LINE_ARROW_END [ @@ -1016,7 +980,6 @@ SfxBoolItem ConnectorLineArrowEnd SID_CONNECTOR_LINE_ARROW_END GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLineArrows SID_CONNECTOR_LINE_ARROWS [ @@ -1043,7 +1006,6 @@ SfxBoolItem ConnectorLineArrows SID_CONNECTOR_LINE_ARROWS GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLineArrowStart SID_CONNECTOR_LINE_ARROW_START [ @@ -1070,7 +1032,6 @@ SfxBoolItem ConnectorLineArrowStart SID_CONNECTOR_LINE_ARROW_START GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLineCircleEnd SID_CONNECTOR_LINE_CIRCLE_END [ @@ -1097,7 +1058,6 @@ SfxBoolItem ConnectorLineCircleEnd SID_CONNECTOR_LINE_CIRCLE_END GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLineCircles SID_CONNECTOR_LINE_CIRCLES [ @@ -1124,7 +1084,6 @@ SfxBoolItem ConnectorLineCircles SID_CONNECTOR_LINE_CIRCLES GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLineCircleStart SID_CONNECTOR_LINE_CIRCLE_START [ @@ -1151,7 +1110,6 @@ SfxBoolItem ConnectorLineCircleStart SID_CONNECTOR_LINE_CIRCLE_START GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLines SID_CONNECTOR_LINES [ @@ -1178,7 +1136,6 @@ SfxBoolItem ConnectorLines SID_CONNECTOR_LINES GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLinesArrowEnd SID_CONNECTOR_LINES_ARROW_END [ @@ -1205,7 +1162,6 @@ SfxBoolItem ConnectorLinesArrowEnd SID_CONNECTOR_LINES_ARROW_END GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLinesArrows SID_CONNECTOR_LINES_ARROWS [ @@ -1232,7 +1188,6 @@ SfxBoolItem ConnectorLinesArrows SID_CONNECTOR_LINES_ARROWS GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLinesArrowStart SID_CONNECTOR_LINES_ARROW_START [ @@ -1259,7 +1214,6 @@ SfxBoolItem ConnectorLinesArrowStart SID_CONNECTOR_LINES_ARROW_START GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLinesCircleEnd SID_CONNECTOR_LINES_CIRCLE_END [ @@ -1286,7 +1240,6 @@ SfxBoolItem ConnectorLinesCircleEnd SID_CONNECTOR_LINES_CIRCLE_END GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLinesCircles SID_CONNECTOR_LINES_CIRCLES [ @@ -1313,7 +1266,6 @@ SfxBoolItem ConnectorLinesCircles SID_CONNECTOR_LINES_CIRCLES GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- SfxBoolItem ConnectorLinesCircleStart SID_CONNECTOR_LINES_CIRCLE_START [ @@ -1340,7 +1292,6 @@ SfxBoolItem ConnectorLinesCircleStart SID_CONNECTOR_LINES_CIRCLE_START GroupId = GID_CONNECTOR; ] -//-------------------------------------------------------------------------- TbxImageItem ConnectorToolbox SID_DRAWTBX_CONNECTORS [ @@ -1367,7 +1318,6 @@ TbxImageItem ConnectorToolbox SID_DRAWTBX_CONNECTORS GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem convert_to_contour SID_CONVERT_TO_CONTOUR () [ @@ -1392,7 +1342,6 @@ SfxVoidItem convert_to_contour SID_CONVERT_TO_CONTOUR GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem ConvertInto3D SID_CONVERT_TO_3D () [ @@ -1417,7 +1366,6 @@ SfxVoidItem ConvertInto3D SID_CONVERT_TO_3D GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem ConvertInto3DLathe SID_CONVERT_TO_3D_LATHE () [ @@ -1442,7 +1390,6 @@ SfxVoidItem ConvertInto3DLathe SID_CONVERT_TO_3D_LATHE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem ConvertInto3DLatheFast SID_CONVERT_TO_3D_LATHE_FAST () [ @@ -1467,7 +1414,6 @@ SfxVoidItem ConvertInto3DLatheFast SID_CONVERT_TO_3D_LATHE_FAST GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem ConvertIntoBitmap SID_CONVERT_TO_BITMAP () [ @@ -1492,7 +1438,6 @@ SfxVoidItem ConvertIntoBitmap SID_CONVERT_TO_BITMAP GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem ConvertIntoMetaFile SID_CONVERT_TO_METAFILE () [ @@ -1517,7 +1462,6 @@ SfxVoidItem ConvertIntoMetaFile SID_CONVERT_TO_METAFILE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem ConvertTo1BitMatrix SID_CONVERT_TO_1BIT_MATRIX () [ @@ -1542,7 +1486,6 @@ SfxBoolItem ConvertTo1BitMatrix SID_CONVERT_TO_1BIT_MATRIX GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem ConvertTo1BitThreshold SID_CONVERT_TO_1BIT_THRESHOLD () [ @@ -1567,7 +1510,6 @@ SfxBoolItem ConvertTo1BitThreshold SID_CONVERT_TO_1BIT_THRESHOLD GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem ConvertTo4BitColors SID_CONVERT_TO_4BIT_COLORS () [ @@ -1592,7 +1534,6 @@ SfxBoolItem ConvertTo4BitColors SID_CONVERT_TO_4BIT_COLORS GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem ConvertTo4BitGrays SID_CONVERT_TO_4BIT_GRAYS () [ @@ -1617,7 +1558,6 @@ SfxBoolItem ConvertTo4BitGrays SID_CONVERT_TO_4BIT_GRAYS GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem ConvertTo8BitColors SID_CONVERT_TO_8BIT_COLORS () [ @@ -1642,7 +1582,6 @@ SfxBoolItem ConvertTo8BitColors SID_CONVERT_TO_8BIT_COLORS GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem ConvertTo8BitGrays SID_CONVERT_TO_8BIT_GRAYS () [ @@ -1667,7 +1606,6 @@ SfxBoolItem ConvertTo8BitGrays SID_CONVERT_TO_8BIT_GRAYS GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem ConvertToTrueColor SID_CONVERT_TO_24BIT () [ @@ -1692,7 +1630,6 @@ SfxBoolItem ConvertToTrueColor SID_CONVERT_TO_24BIT GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem CopyObjects SID_COPYOBJECTS () [ @@ -1717,7 +1654,6 @@ SfxVoidItem CopyObjects SID_COPYOBJECTS GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxBoolItem CrookRotate SID_OBJECT_CROOK_ROTATE [ @@ -1744,7 +1680,6 @@ SfxBoolItem CrookRotate SID_OBJECT_CROOK_ROTATE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem CrookSlant SID_OBJECT_CROOK_SLANT [ @@ -1771,7 +1706,6 @@ SfxBoolItem CrookSlant SID_OBJECT_CROOK_SLANT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem CrookStretch SID_OBJECT_CROOK_STRETCH [ @@ -1798,7 +1732,6 @@ SfxBoolItem CrookStretch SID_OBJECT_CROOK_STRETCH GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem Cube SID_3D_CUBE [ @@ -1825,7 +1758,6 @@ SfxBoolItem Cube SID_3D_CUBE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem CustomShowDialog SID_CUSTOMSHOW_DLG () [ @@ -1850,7 +1782,6 @@ SfxVoidItem CustomShowDialog SID_CUSTOMSHOW_DLG GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxBoolItem Cylinder SID_3D_CYLINDER [ @@ -1877,7 +1808,6 @@ SfxBoolItem Cylinder SID_3D_CYLINDER GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem Cyramid SID_3D_PYRAMID [ @@ -1904,7 +1834,6 @@ SfxBoolItem Cyramid SID_3D_PYRAMID GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem DeleteLayer SID_DELETE_LAYER () [ @@ -1929,7 +1858,6 @@ SfxVoidItem DeleteLayer SID_DELETE_LAYER GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxVoidItem DeletePage SID_DELETE_PAGE () [ @@ -1954,7 +1882,6 @@ SfxVoidItem DeletePage SID_DELETE_PAGE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxStringItem DeleteSnapItem SID_DELETE_SNAPITEM [ @@ -1981,7 +1908,6 @@ SfxStringItem DeleteSnapItem SID_DELETE_SNAPITEM GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxVoidItem DeSelect SID_UNSELECT () [ @@ -2006,7 +1932,6 @@ SfxVoidItem DeSelect SID_UNSELECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxBoolItem DiaMode SID_DIAMODE [ @@ -2033,7 +1958,6 @@ SfxBoolItem DiaMode SID_DIAMODE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem Dismantle SID_DISMANTLE () [ @@ -2058,7 +1982,6 @@ SfxVoidItem Dismantle SID_DISMANTLE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem DoubleClickTextEdit SID_DOUBLECLICK_TEXTEDIT [ @@ -2085,7 +2008,6 @@ SfxBoolItem DoubleClickTextEdit SID_DOUBLECLICK_TEXTEDIT GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxBoolItem DrawingMode SID_DRAWINGMODE [ @@ -2112,7 +2034,6 @@ SfxBoolItem DrawingMode SID_DRAWINGMODE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem DuplicatePage SID_DUPLICATE_PAGE (SfxStringItem PageName ID_VAL_PAGENAME,SfxUInt32Item WhatLayout ID_VAL_WHATLAYOUT,SfxBoolItem IsPageBack ID_VAL_ISPAGEBACK,SfxBoolItem IsPageObj ID_VAL_ISPAGEOBJ) [ @@ -2137,7 +2058,6 @@ SfxVoidItem DuplicatePage SID_DUPLICATE_PAGE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem EditHyperlink SID_EDIT_HYPERLINK () [ @@ -2162,7 +2082,6 @@ SfxVoidItem EditHyperlink SID_EDIT_HYPERLINK GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxVoidItem EditOutline SID_EDIT_OUTLINER () [ @@ -2187,7 +2106,6 @@ SfxVoidItem EditOutline SID_EDIT_OUTLINER GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxBoolItem CustomAnimation SID_CUSTOM_ANIMATION_PANEL [ @@ -2214,7 +2132,6 @@ SfxBoolItem CustomAnimation SID_CUSTOM_ANIMATION_PANEL GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxBoolItem CustomAnimationSchemes SID_CUSTOM_ANIMATION_SCHEMES_PANEL [ /* flags: */ @@ -2240,7 +2157,6 @@ SfxBoolItem CustomAnimationSchemes SID_CUSTOM_ANIMATION_SCHEMES_PANEL GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- TbxImageItem EllipseToolbox SID_DRAWTBX_ELLIPSES [ @@ -2267,7 +2183,6 @@ TbxImageItem EllipseToolbox SID_DRAWTBX_ELLIPSES GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem ExpandPage SID_EXPAND_PAGE () [ @@ -2292,7 +2207,6 @@ SfxVoidItem ExpandPage SID_EXPAND_PAGE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxVoidItem SetFillColor SID_SETFILLCOLOR (SfxUInt32Item Red ID_VAL_RED,SfxUInt32Item Green ID_VAL_GREEN,SfxUInt32Item Blue ID_VAL_BLUE) [ @@ -2317,7 +2231,6 @@ SfxVoidItem SetFillColor SID_SETFILLCOLOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxVoidItem Forward SID_MOREFRONT () [ @@ -2342,7 +2255,6 @@ SfxVoidItem Forward SID_MOREFRONT GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxUInt32Item GetBlue SID_GETBLUE (SfxUInt32Item WhatKind ID_VAL_WHATKIND) [ @@ -2367,7 +2279,6 @@ SfxUInt32Item GetBlue SID_GETBLUE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxUInt32Item GetFillStyle SID_GETFILLSTYLE [ @@ -2394,7 +2305,6 @@ SfxUInt32Item GetFillStyle SID_GETFILLSTYLE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxUInt32Item GetGreen SID_GETGREEN (SfxUInt32Item WhatKind ID_VAL_WHATKIND) [ @@ -2419,7 +2329,6 @@ SfxUInt32Item GetGreen SID_GETGREEN GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxUInt32Item GetLineStyle SID_GETLINESTYLE [ @@ -2446,7 +2355,6 @@ SfxUInt32Item GetLineStyle SID_GETLINESTYLE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxUInt32Item GetLineWidth SID_GETLINEWIDTH [ @@ -2473,7 +2381,6 @@ SfxUInt32Item GetLineWidth SID_GETLINEWIDTH GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxUInt32Item GetRed SID_GETRED (SfxUInt32Item WhatKind ID_VAL_WHATKIND) [ @@ -2498,7 +2405,6 @@ SfxUInt32Item GetRed SID_GETRED GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueEditMode SID_GLUE_EDITMODE [ @@ -2525,7 +2431,6 @@ SfxBoolItem GlueEditMode SID_GLUE_EDITMODE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxUInt16Item GlueEscapeDirection SID_GLUE_ESCDIR [ @@ -2552,7 +2457,6 @@ SfxUInt16Item GlueEscapeDirection SID_GLUE_ESCDIR GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueEscapeDirectionBottom SID_GLUE_ESCDIR_BOTTOM [ @@ -2579,7 +2483,6 @@ SfxBoolItem GlueEscapeDirectionBottom SID_GLUE_ESCDIR_BOTTOM GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueEscapeDirectionLeft SID_GLUE_ESCDIR_LEFT [ @@ -2606,7 +2509,6 @@ SfxBoolItem GlueEscapeDirectionLeft SID_GLUE_ESCDIR_LEFT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueEscapeDirectionRight SID_GLUE_ESCDIR_RIGHT [ @@ -2633,7 +2535,6 @@ SfxBoolItem GlueEscapeDirectionRight SID_GLUE_ESCDIR_RIGHT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueEscapeDirectionTop SID_GLUE_ESCDIR_TOP [ @@ -2660,7 +2561,6 @@ SfxBoolItem GlueEscapeDirectionTop SID_GLUE_ESCDIR_TOP GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueHorzAlignCenter SID_GLUE_HORZALIGN_CENTER [ @@ -2687,7 +2587,6 @@ SfxBoolItem GlueHorzAlignCenter SID_GLUE_HORZALIGN_CENTER GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueHorzAlignLeft SID_GLUE_HORZALIGN_LEFT [ @@ -2714,7 +2613,6 @@ SfxBoolItem GlueHorzAlignLeft SID_GLUE_HORZALIGN_LEFT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueHorzAlignRight SID_GLUE_HORZALIGN_RIGHT [ @@ -2741,7 +2639,6 @@ SfxBoolItem GlueHorzAlignRight SID_GLUE_HORZALIGN_RIGHT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueInsertPoint SID_GLUE_INSERT_POINT [ @@ -2768,7 +2665,6 @@ SfxBoolItem GlueInsertPoint SID_GLUE_INSERT_POINT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GluePercent SID_GLUE_PERCENT [ @@ -2795,7 +2691,6 @@ SfxBoolItem GluePercent SID_GLUE_PERCENT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueVertAlignBottom SID_GLUE_VERTALIGN_BOTTOM [ @@ -2822,7 +2717,6 @@ SfxBoolItem GlueVertAlignBottom SID_GLUE_VERTALIGN_BOTTOM GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueVertAlignCenter SID_GLUE_VERTALIGN_CENTER [ @@ -2849,7 +2743,6 @@ SfxBoolItem GlueVertAlignCenter SID_GLUE_VERTALIGN_CENTER GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem GlueVertAlignTop SID_GLUE_VERTALIGN_TOP [ @@ -2876,7 +2769,6 @@ SfxBoolItem GlueVertAlignTop SID_GLUE_VERTALIGN_TOP GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem Gradient SID_GRADIENT (SfxStringItem Name ID_VAL_INDEX,SfxUInt32Item Style ID_VAL_STYLE,SfxUInt32Item Angle ID_VAL_ANGLE,SfxUInt32Item Border ID_VAL_BORDER,SfxUInt32Item XOffset ID_VAL_CENTER_X,SfxUInt32Item YOffset ID_VAL_CENTER_Y,SfxUInt32Item StartIntens ID_VAL_STARTINTENS,SfxUInt32Item EndIntens ID_VAL_ENDINTENS) [ @@ -2901,7 +2793,6 @@ SfxVoidItem Gradient SID_GRADIENT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem GradientEndColor SID_SETGRADENDCOLOR (SfxStringItem Name ID_VAL_INDEX,SfxUInt32Item Red ID_VAL_RED,SfxUInt32Item Green ID_VAL_GREEN,SfxUInt32Item Blue ID_VAL_BLUE) [ @@ -2926,7 +2817,6 @@ SfxVoidItem GradientEndColor SID_SETGRADENDCOLOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxVoidItem GradientStartColor SID_SETGRADSTARTCOLOR (SfxStringItem Name ID_VAL_INDEX,SfxUInt32Item Red ID_VAL_RED,SfxUInt32Item Green ID_VAL_GREEN,SfxUInt32Item Blue ID_VAL_BLUE) [ @@ -2951,7 +2841,6 @@ SfxVoidItem GradientStartColor SID_SETGRADSTARTCOLOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxVoidItem GraphicExport SID_GRAPHIC_EXPORT () [ @@ -2976,7 +2865,6 @@ SfxVoidItem GraphicExport SID_GRAPHIC_EXPORT GroupId = GID_APPLICATION; ] -//-------------------------------------------------------------------------- SfxBoolItem GridFront SID_GRID_FRONT [ @@ -3003,7 +2891,6 @@ SfxBoolItem GridFront SID_GRID_FRONT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem HalfSphere SID_3D_HALF_SPHERE [ @@ -3030,7 +2917,6 @@ SfxBoolItem HalfSphere SID_3D_HALF_SPHERE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem HandoutMasterPage SID_HANDOUT_MASTERPAGE (SfxBoolItem Isactive ID_VAL_ISACTIVE) [ @@ -3058,7 +2944,6 @@ SfxVoidItem HandoutMasterPage SID_HANDOUT_MASTERPAGE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem HandoutMode SID_HANDOUTMODE [ @@ -3085,7 +2970,6 @@ SfxBoolItem HandoutMode SID_HANDOUTMODE GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- SfxVoidItem Hatch SID_HATCH (SfxStringItem Name ID_VAL_INDEX,SfxUInt32Item Style ID_VAL_STYLE,SfxUInt32Item Distance ID_VAL_DISTANCE,SfxUInt32Item Angle ID_VAL_ANGLE) [ @@ -3110,7 +2994,6 @@ SfxVoidItem Hatch SID_HATCH GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem HatchColor SID_SETHATCHCOLOR (SfxStringItem Name ID_VAL_INDEX,SfxUInt32Item Red ID_VAL_RED,SfxUInt32Item Green ID_VAL_GREEN,SfxUInt32Item Blue ID_VAL_BLUE) [ @@ -3135,7 +3018,6 @@ SfxVoidItem HatchColor SID_SETHATCHCOLOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxBoolItem HelplinesFront SID_HELPLINES_FRONT [ @@ -3162,7 +3044,6 @@ SfxBoolItem HelplinesFront SID_HELPLINES_FRONT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem HelplinesUse SID_HELPLINES_USE [ @@ -3189,7 +3070,6 @@ SfxBoolItem HelplinesUse SID_HELPLINES_USE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem HelplinesVisible SID_HELPLINES_VISIBLE [ @@ -3216,7 +3096,6 @@ SfxBoolItem HelplinesVisible SID_HELPLINES_VISIBLE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem HideSlide SID_HIDE_SLIDE () [ @@ -3241,7 +3120,6 @@ SfxVoidItem HideSlide SID_HIDE_SLIDE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem ShowSlide SID_SHOW_SLIDE () [ @@ -3266,7 +3144,6 @@ SfxVoidItem ShowSlide SID_SHOW_SLIDE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem Hyphenation SID_HYPHENATION [ @@ -3293,7 +3170,6 @@ SfxBoolItem Hyphenation SID_HYPHENATION GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxVoidItem ImportFromFile SID_INSERTFILE (SfxStringItem FileName ID_VAL_DUMMY1,SfxStringItem FilterName ID_VAL_DUMMY2) [ @@ -3318,7 +3194,6 @@ SfxVoidItem ImportFromFile SID_INSERTFILE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertAuthorField SID_INSERT_FLD_AUTHOR () [ @@ -3343,7 +3218,6 @@ SfxVoidItem InsertAuthorField SID_INSERT_FLD_AUTHOR GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertDateFieldFix SID_INSERT_FLD_DATE_FIX () [ @@ -3368,7 +3242,6 @@ SfxVoidItem InsertDateFieldFix SID_INSERT_FLD_DATE_FIX GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertDateFieldVar SID_INSERT_FLD_DATE_VAR () [ @@ -3393,7 +3266,6 @@ SfxVoidItem InsertDateFieldVar SID_INSERT_FLD_DATE_VAR GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertFileField SID_INSERT_FLD_FILE () [ @@ -3418,7 +3290,6 @@ SfxVoidItem InsertFileField SID_INSERT_FLD_FILE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertLayer SID_INSERTLAYER (SfxStringItem LayerName ID_VAL_LAYERNAME,SfxBoolItem IsVisible ID_VAL_ISVISIBLE,SfxBoolItem IsLocked ID_VAL_ISLOCKED,SfxBoolItem IsPrintable ID_VAL_ISPRINTABLE) [ @@ -3443,7 +3314,6 @@ SfxVoidItem InsertLayer SID_INSERTLAYER GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertPage SID_INSERTPAGE (SfxStringItem PageName ID_VAL_PAGENAME,SfxUInt32Item WhatLayout ID_VAL_WHATLAYOUT,SfxBoolItem IsPageBack ID_VAL_ISPAGEBACK,SfxBoolItem IsPageObj ID_VAL_ISPAGEOBJ) [ @@ -3468,7 +3338,6 @@ SfxVoidItem InsertPage SID_INSERTPAGE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertPageField SID_INSERT_FLD_PAGE () [ @@ -3493,7 +3362,6 @@ SfxVoidItem InsertPageField SID_INSERT_FLD_PAGE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertPagesField SID_INSERT_FLD_PAGES () [ @@ -3518,7 +3386,6 @@ SfxVoidItem InsertPagesField SID_INSERT_FLD_PAGES GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertPageQuick SID_INSERTPAGE_QUICK () [ @@ -3543,7 +3410,6 @@ SfxVoidItem InsertPageQuick SID_INSERTPAGE_QUICK GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertTimeFieldFix SID_INSERT_FLD_TIME_FIX () [ @@ -3568,7 +3434,6 @@ SfxVoidItem InsertTimeFieldFix SID_INSERT_FLD_TIME_FIX GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertTimeFieldVar SID_INSERT_FLD_TIME_VAR () [ @@ -3593,7 +3458,6 @@ SfxVoidItem InsertTimeFieldVar SID_INSERT_FLD_TIME_VAR GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- TbxImageItem InsertToolbox SID_DRAWTBX_INSERT [ @@ -3620,7 +3484,6 @@ TbxImageItem InsertToolbox SID_DRAWTBX_INSERT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem InteractiveGradient SID_OBJECT_GRADIENT () [ @@ -3645,7 +3508,6 @@ SfxVoidItem InteractiveGradient SID_OBJECT_GRADIENT GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem InteractiveTransparence SID_OBJECT_TRANSPARENCE () [ @@ -3670,7 +3532,6 @@ SfxVoidItem InteractiveTransparence SID_OBJECT_TRANSPARENCE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem LayerMode SID_LAYERMODE (SfxBoolItem IsActive ID_VAL_ISACTIVE,SfxUInt32Item WhatLayer ID_VAL_WHATLAYER) [ @@ -3698,7 +3559,6 @@ SfxVoidItem LayerMode SID_LAYERMODE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxStringItem LayoutStatus SID_STATUS_LAYOUT [ @@ -3725,7 +3585,6 @@ SfxStringItem LayoutStatus SID_STATUS_LAYOUT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem LeaveAllGroups SID_LEAVE_ALL_GROUPS [ @@ -3752,7 +3611,6 @@ SfxBoolItem LeaveAllGroups SID_LEAVE_ALL_GROUPS GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem LineArrowCircle SID_LINE_ARROW_CIRCLE [ @@ -3779,7 +3637,6 @@ SfxBoolItem LineArrowCircle SID_LINE_ARROW_CIRCLE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem LineArrowEnd SID_LINE_ARROW_END [ @@ -3806,7 +3663,6 @@ SfxBoolItem LineArrowEnd SID_LINE_ARROW_END GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem LineArrows SID_LINE_ARROWS [ @@ -3833,7 +3689,6 @@ SfxBoolItem LineArrows SID_LINE_ARROWS GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem LineArrowSquare SID_LINE_ARROW_SQUARE [ @@ -3860,7 +3715,6 @@ SfxBoolItem LineArrowSquare SID_LINE_ARROW_SQUARE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem LineArrowStart SID_LINE_ARROW_START [ @@ -3887,7 +3741,6 @@ SfxBoolItem LineArrowStart SID_LINE_ARROW_START GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem LineCircleArrow SID_LINE_CIRCLE_ARROW [ @@ -3914,7 +3767,6 @@ SfxBoolItem LineCircleArrow SID_LINE_CIRCLE_ARROW GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem LineColor SID_SETLINECOLOR (SfxUInt32Item Red ID_VAL_RED,SfxUInt32Item Green ID_VAL_GREEN,SfxUInt32Item Blue ID_VAL_BLUE) [ @@ -3939,7 +3791,6 @@ SfxVoidItem LineColor SID_SETLINECOLOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxVoidItem LineEndPolygon SID_LINEEND_POLYGON () [ @@ -3964,7 +3815,6 @@ SfxVoidItem LineEndPolygon SID_LINEEND_POLYGON GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem LineSquareArrow SID_LINE_SQUARE_ARROW [ @@ -3991,7 +3841,6 @@ SfxBoolItem LineSquareArrow SID_LINE_SQUARE_ARROW GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem LineTo SID_LINETO (SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y) [ @@ -4016,7 +3865,6 @@ SfxVoidItem LineTo SID_LINETO GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- TbxImageItem LineToolbox SID_DRAWTBX_LINES [ @@ -4043,7 +3891,6 @@ TbxImageItem LineToolbox SID_DRAWTBX_LINES GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem ManageLinks SID_MANAGE_LINKS () [ @@ -4068,7 +3915,6 @@ SfxVoidItem ManageLinks SID_MANAGE_LINKS GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxVoidItem MasterPage SID_MASTERPAGE (SfxBoolItem Isactive ID_VAL_ISACTIVE) [ @@ -4096,7 +3942,6 @@ SfxVoidItem MasterPage SID_MASTERPAGE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem MeasureAttributes SID_MEASURE_DLG () [ @@ -4121,7 +3966,6 @@ SfxVoidItem MeasureAttributes SID_MEASURE_DLG GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxBoolItem MeasureLine SID_DRAW_MEASURELINE [ @@ -4148,7 +3992,6 @@ SfxBoolItem MeasureLine SID_DRAW_MEASURELINE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem MirrorHorz SID_HORIZONTAL () [ @@ -4173,7 +4016,6 @@ SfxVoidItem MirrorHorz SID_HORIZONTAL GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem MirrorVert SID_VERTICAL () [ @@ -4198,7 +4040,6 @@ SfxVoidItem MirrorVert SID_VERTICAL GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem ModifyField SID_MODIFY_FIELD () [ @@ -4223,7 +4064,6 @@ SfxVoidItem ModifyField SID_MODIFY_FIELD GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxVoidItem ModifyLayer SID_MODIFYLAYER (SfxStringItem LayerName ID_VAL_LAYERNAME,SfxBoolItem IsVisible ID_VAL_ISVISIBLE,SfxBoolItem IsLocked ID_VAL_ISLOCKED,SfxBoolItem IsPrintable ID_VAL_ISPRINTABLE) [ @@ -4248,7 +4088,6 @@ SfxVoidItem ModifyLayer SID_MODIFYLAYER GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem ModifyPage SID_MODIFYPAGE (SfxStringItem PageName ID_VAL_PAGENAME,SfxUInt32Item WhatLayout ID_VAL_WHATLAYOUT,SfxBoolItem IsPageBack ID_VAL_ISPAGEBACK,SfxBoolItem IsPageObj ID_VAL_ISPAGEOBJ) [ @@ -4297,7 +4136,6 @@ SfxUInt32Item AssignLayout SID_ASSIGN_LAYOUT GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem ModifyPresentationObject SID_PRESENTATIONOBJECT () [ @@ -4322,7 +4160,6 @@ SfxVoidItem ModifyPresentationObject SID_PRESENTATIONOBJECT GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem Morphing SID_POLYGON_MORPHING () [ @@ -4347,7 +4184,6 @@ SfxVoidItem Morphing SID_POLYGON_MORPHING GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem MoveTo SID_MOVETO (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y) [ @@ -4372,7 +4208,6 @@ SfxVoidItem MoveTo SID_MOVETO GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem NameGroup SID_NAME_GROUP () [ @@ -4422,7 +4257,6 @@ SfxVoidItem ObjectTitleDescription SID_OBJECT_TITLE_DESCRIPTION GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem NavigatorInit SID_NAVIGATOR_INIT [ @@ -4449,7 +4283,6 @@ SfxBoolItem NavigatorInit SID_NAVIGATOR_INIT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxStringItem NavigatorObject SID_NAVIGATOR_OBJECT [ @@ -4476,7 +4309,6 @@ SfxStringItem NavigatorObject SID_NAVIGATOR_OBJECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxUInt16Item NavigatorPage SID_NAVIGATOR_PAGE [ @@ -4503,7 +4335,6 @@ SfxUInt16Item NavigatorPage SID_NAVIGATOR_PAGE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxStringItem NavigatorPageName SID_NAVIGATOR_PAGENAME [ @@ -4530,7 +4361,6 @@ SfxStringItem NavigatorPageName SID_NAVIGATOR_PAGENAME GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxBoolItem NavigatorPen SID_NAVIGATOR_PEN [ @@ -4557,7 +4387,6 @@ SfxBoolItem NavigatorPen SID_NAVIGATOR_PEN GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxUInt32Item NavigatorState SID_NAVIGATOR_STATE [ @@ -4584,7 +4413,6 @@ SfxUInt32Item NavigatorState SID_NAVIGATOR_STATE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxBoolItem NewRouting SID_CONNECTION_NEW_ROUTING [ @@ -4611,7 +4439,6 @@ SfxBoolItem NewRouting SID_CONNECTION_NEW_ROUTING GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem NotesMasterPage SID_NOTES_MASTERPAGE (SfxBoolItem Isactive ID_VAL_ISACTIVE) [ @@ -4639,7 +4466,6 @@ SfxVoidItem NotesMasterPage SID_NOTES_MASTERPAGE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem NotesMode SID_NOTESMODE [ @@ -4666,7 +4492,6 @@ SfxBoolItem NotesMode SID_NOTESMODE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- TbxImageItem ObjectPosition SID_POSITION [ @@ -4693,7 +4518,6 @@ TbxImageItem ObjectPosition SID_POSITION GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- TbxImageItem Objects3DToolbox SID_DRAWTBX_3D_OBJECTS [ @@ -4720,7 +4544,6 @@ TbxImageItem Objects3DToolbox SID_DRAWTBX_3D_OBJECTS GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem OriginalSize SID_ORIGINAL_SIZE () [ @@ -4745,7 +4568,6 @@ SfxVoidItem OriginalSize SID_ORIGINAL_SIZE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem OutlineMode SID_OUTLINEMODE [ @@ -4772,7 +4594,6 @@ SfxBoolItem OutlineMode SID_OUTLINEMODE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem OutputQualityBlackWhite SID_OUTPUT_QUALITY_BLACKWHITE [ @@ -4799,7 +4620,6 @@ SfxBoolItem OutputQualityBlackWhite SID_OUTPUT_QUALITY_BLACKWHITE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem OutputQualityColor SID_OUTPUT_QUALITY_COLOR [ @@ -4826,7 +4646,6 @@ SfxBoolItem OutputQualityColor SID_OUTPUT_QUALITY_COLOR GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem OutputQualityContrast SID_OUTPUT_QUALITY_CONTRAST [ @@ -4853,7 +4672,6 @@ SfxBoolItem OutputQualityContrast SID_OUTPUT_QUALITY_CONTRAST GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem OutputQualityGrayscale SID_OUTPUT_QUALITY_GRAYSCALE [ @@ -4880,7 +4698,6 @@ SfxBoolItem OutputQualityGrayscale SID_OUTPUT_QUALITY_GRAYSCALE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem PackAndGo SID_PACKNGO () [ @@ -4905,7 +4722,6 @@ SfxVoidItem PackAndGo SID_PACKNGO GroupId = GID_APPLICATION; ] -//-------------------------------------------------------------------------- SfxVoidItem PageMargin SID_PAGEMARGIN (SfxUInt32Item PageLeft ID_VAL_PAGELEFT,SfxUInt32Item PageRight ID_VAL_PAGERIGHT,SfxUInt32Item PageTop ID_VAL_PAGETOP,SfxUInt32Item PageBottom ID_VAL_PAGEBOTTOM,SfxBoolItem ScaleObjects ID_VAL_SCALEOBJECTS) [ @@ -4930,7 +4746,6 @@ SfxVoidItem PageMargin SID_PAGEMARGIN GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem PageMode SID_PAGEMODE (SfxBoolItem IsActive ID_VAL_ISACTIVE,SfxUInt32Item WhatKind ID_VAL_WHATKIND) [ @@ -4958,7 +4773,6 @@ SfxVoidItem PageMode SID_PAGEMODE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem PageSetup SID_PAGESETUP () [ @@ -4983,7 +4797,6 @@ SfxVoidItem PageSetup SID_PAGESETUP GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxVoidItem PageSize SID_PAGESIZE (SfxUInt32Item PageWidth ID_VAL_PAGEWIDTH,SfxUInt32Item PageHeight ID_VAL_PAGEHEIGHT,SfxBoolItem ScaleObjects ID_VAL_SCALEOBJECTS) [ @@ -5008,7 +4821,6 @@ SfxVoidItem PageSize SID_PAGESIZE GroupId = GID_APPLICATION; ] -//-------------------------------------------------------------------------- SfxUInt16Item PagesPerRow SID_PAGES_PER_ROW [ @@ -5035,7 +4847,6 @@ SfxUInt16Item PagesPerRow SID_PAGES_PER_ROW GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxStringItem PageStatus SID_STATUS_PAGE [ @@ -5062,7 +4873,6 @@ SfxStringItem PageStatus SID_STATUS_PAGE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem ParaspaceDecrease SID_PARASPACE_DECREASE [ @@ -5089,7 +4899,6 @@ SfxBoolItem ParaspaceDecrease SID_PARASPACE_DECREASE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxBoolItem ParaspaceIncrease SID_PARASPACE_INCREASE [ @@ -5116,7 +4925,6 @@ SfxBoolItem ParaspaceIncrease SID_PARASPACE_INCREASE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxBoolItem PickThrough SID_PICK_THROUGH [ @@ -5143,7 +4951,6 @@ SfxBoolItem PickThrough SID_PICK_THROUGH GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem Polygon SID_DRAW_POLYGON [ @@ -5170,7 +4977,6 @@ SfxBoolItem Polygon SID_DRAW_POLYGON GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem Presentation SID_PRESENTATION () [ @@ -5195,7 +5001,6 @@ SfxVoidItem Presentation SID_PRESENTATION GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem PresentationCurrentSlide SID_PRESENTATION_CURRENT_SLIDE () [ @@ -5220,7 +5025,6 @@ SfxVoidItem PresentationCurrentSlide SID_PRESENTATION_CURRENT_SLIDE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem PresentationDialog SID_PRESENTATION_DLG () [ @@ -5245,7 +5049,6 @@ SfxVoidItem PresentationDialog SID_PRESENTATION_DLG GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxVoidItem Remote SID_REMOTE_DLG () [ @@ -5270,7 +5073,6 @@ SfxVoidItem Remote SID_REMOTE_DLG GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxVoidItem PresentationEnd SID_PRESENTATION_END () [ @@ -5295,7 +5097,6 @@ SfxVoidItem PresentationEnd SID_PRESENTATION_END GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem ClearUndoStack SID_CLEAR_UNDO_STACK () [ @@ -5320,7 +5121,6 @@ SfxVoidItem ClearUndoStack SID_CLEAR_UNDO_STACK GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem PresentationLayout SID_PRESENTATION_LAYOUT () [ @@ -5345,7 +5145,6 @@ SfxVoidItem PresentationLayout SID_PRESENTATION_LAYOUT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxUInt32Item PreviewState SID_PREVIEW_STATE [ @@ -5372,7 +5171,6 @@ SfxUInt32Item PreviewState SID_PREVIEW_STATE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem PreviewWindow SID_PREVIEW_WIN [ @@ -5399,7 +5197,6 @@ SfxBoolItem PreviewWindow SID_PREVIEW_WIN GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem QuickEdit SID_QUICKEDIT [ @@ -5426,7 +5223,6 @@ SfxBoolItem QuickEdit SID_QUICKEDIT GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- TbxImageItem RectangleToolbox SID_DRAWTBX_RECTANGLES [ @@ -5453,7 +5249,6 @@ TbxImageItem RectangleToolbox SID_DRAWTBX_RECTANGLES GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem RehearseTimings SID_REHEARSE_TIMINGS () [ @@ -5478,7 +5273,6 @@ SfxVoidItem RehearseTimings SID_REHEARSE_TIMINGS GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem RenameLayer SID_RENAMELAYER () [ @@ -5503,7 +5297,6 @@ SfxVoidItem RenameLayer SID_RENAMELAYER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxVoidItem RenamePage SID_RENAMEPAGE () [ @@ -5528,7 +5321,6 @@ SfxVoidItem RenamePage SID_RENAMEPAGE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxVoidItem RenamePageQuick SID_RENAMEPAGE_QUICK () [ @@ -5553,7 +5345,6 @@ SfxVoidItem RenamePageQuick SID_RENAMEPAGE_QUICK GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxVoidItem ReverseOrder SID_REVERSE_ORDER () [ @@ -5578,7 +5369,6 @@ SfxVoidItem ReverseOrder SID_REVERSE_ORDER GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SvxObjectItem RulerObject SID_RULER_OBJECT [ @@ -5605,7 +5395,6 @@ SvxObjectItem RulerObject SID_RULER_OBJECT GroupId = ; ] -//-------------------------------------------------------------------------- SfxVoidItem SelectAt SID_SELECTAT (SfxUInt32Item AnchorX ID_VAL_ANCHOR_X,SfxUInt32Item AnchorY ID_VAL_ANCHOR_Y,SfxUInt32Item Left ID_VAL_MOUSESTART_X,SfxUInt32Item Top ID_VAL_MOUSESTART_Y,SfxUInt32Item Right ID_VAL_LENGTH_X,SfxUInt32Item Bottom ID_VAL_LENGTH_Y) [ @@ -5630,7 +5419,6 @@ SfxVoidItem SelectAt SID_SELECTAT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxVoidItem SelectGradient SID_SELECTGRADIENT (SfxStringItem Name ID_VAL_INDEX) [ @@ -5655,7 +5443,6 @@ SfxVoidItem SelectGradient SID_SELECTGRADIENT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxVoidItem SelectHatch SID_SELECTHATCH (SfxStringItem Name ID_VAL_INDEX) [ @@ -5680,7 +5467,6 @@ SfxVoidItem SelectHatch SID_SELECTHATCH GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- SfxVoidItem SetFillStyle SID_SETFILLSTYLE (SfxUInt32Item Style ID_VAL_STYLE) [ @@ -5705,7 +5491,6 @@ SfxVoidItem SetFillStyle SID_SETFILLSTYLE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxVoidItem SetLineStyle SID_SETLINESTYLE (SfxUInt32Item Style ID_VAL_STYLE) [ @@ -5730,7 +5515,6 @@ SfxVoidItem SetLineStyle SID_SETLINESTYLE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxVoidItem SetLineWidth SID_SETLINEWIDTH (SfxUInt32Item Width ID_VAL_WIDTH) [ @@ -5755,7 +5539,6 @@ SfxVoidItem SetLineWidth SID_SETLINEWIDTH GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxStringItem SetSnapItem SID_SET_SNAPITEM [ @@ -5782,7 +5565,6 @@ SfxStringItem SetSnapItem SID_SET_SNAPITEM GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem Shear SID_OBJECT_SHEAR [ @@ -5809,7 +5591,6 @@ SfxBoolItem Shear SID_OBJECT_SHEAR GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxBoolItem Shell3D SID_3D_SHELL [ @@ -5836,7 +5617,6 @@ SfxBoolItem Shell3D SID_3D_SHELL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem SlideChangeWindow SID_SLIDE_TRANSITIONS_PANEL [ @@ -5863,7 +5643,6 @@ SfxBoolItem SlideChangeWindow SID_SLIDE_TRANSITIONS_PANEL GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem SlideMasterPage SID_SLIDE_MASTERPAGE (SfxBoolItem Isactive ID_VAL_ISACTIVE) [ @@ -5891,7 +5670,6 @@ SfxVoidItem SlideMasterPage SID_SLIDE_MASTERPAGE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem SnapBorder SID_SNAP_BORDER [ @@ -5918,7 +5696,6 @@ SfxBoolItem SnapBorder SID_SNAP_BORDER GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem SnapFrame SID_SNAP_FRAME [ @@ -5945,7 +5722,6 @@ SfxBoolItem SnapFrame SID_SNAP_FRAME GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem SnapPoints SID_SNAP_POINTS [ @@ -5972,7 +5748,6 @@ SfxBoolItem SnapPoints SID_SNAP_POINTS GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem SolidCreate SID_SOLID_CREATE [ @@ -5999,7 +5774,6 @@ SfxBoolItem SolidCreate SID_SOLID_CREATE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem Sphere SID_3D_SPHERE [ @@ -6026,7 +5800,6 @@ SfxBoolItem Sphere SID_3D_SPHERE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem StartApplication SID_STARTAPP () [ @@ -6051,7 +5824,6 @@ SfxVoidItem StartApplication SID_STARTAPP GroupId = GID_APPLICATION; ] -//-------------------------------------------------------------------------- SfxVoidItem SummaryPage SID_SUMMARY_PAGE () [ @@ -6076,7 +5848,6 @@ SfxVoidItem SummaryPage SID_SUMMARY_PAGE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- SfxVoidItem SwitchLayer SID_SWITCHLAYER (SfxUInt32Item WhatLayer ID_VAL_WHATLAYER) [ @@ -6101,7 +5872,6 @@ SfxVoidItem SwitchLayer SID_SWITCHLAYER GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem SwitchPage SID_SWITCHPAGE (SfxUInt32Item WhatPage ID_VAL_WHATPAGE,SfxUInt32Item WhatKind ID_VAL_WHATKIND) [ @@ -6126,7 +5896,6 @@ SfxVoidItem SwitchPage SID_SWITCHPAGE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxVoidItem SwitchPointEdit SID_SWITCH_POINTEDIT () [ @@ -6151,7 +5920,6 @@ SfxVoidItem SwitchPointEdit SID_SWITCH_POINTEDIT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem TextAlignment SID_TEXTALIGNMENT [ @@ -6178,7 +5946,6 @@ SfxBoolItem TextAlignment SID_TEXTALIGNMENT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxVoidItem TextAttributes SID_TEXTATTR_DLG (SfxBoolItem IsAutoGrow ID_VAL_DUMMY0,SfxBoolItem IsCenter ID_VAL_DUMMY1,SfxBoolItem IsFitToSize ID_VAL_DUMMY2,SfxUInt32Item LeftBorder ID_VAL_DUMMY3,SfxUInt32Item RightBorder ID_VAL_DUMMY4,SfxUInt32Item TopBorder ID_VAL_DUMMY5,SfxUInt32Item BottomBorder ID_VAL_DUMMY6) [ @@ -6203,7 +5970,6 @@ SfxVoidItem TextAttributes SID_TEXTATTR_DLG GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxBoolItem TextFitToSizeTool SID_TEXT_FITTOSIZE [ @@ -6230,7 +5996,6 @@ SfxBoolItem TextFitToSizeTool SID_TEXT_FITTOSIZE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxBoolItem TextAutoFitToSize SID_OUTLINE_TEXT_AUTOFIT [ @@ -6257,7 +6022,6 @@ SfxBoolItem TextAutoFitToSize SID_OUTLINE_TEXT_AUTOFIT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- TbxImageItem TextToolbox SID_DRAWTBX_TEXT [ @@ -6284,7 +6048,6 @@ TbxImageItem TextToolbox SID_DRAWTBX_TEXT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxVoidItem TitleMasterPage SID_TITLE_MASTERPAGE (SfxBoolItem Isactive ID_VAL_ISACTIVE) [ @@ -6312,7 +6075,6 @@ SfxVoidItem TitleMasterPage SID_TITLE_MASTERPAGE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- SfxBoolItem Torus SID_3D_TORUS [ @@ -6339,7 +6101,6 @@ SfxBoolItem Torus SID_3D_TORUS GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- SfxBoolItem VerticalTextFitToSizeTool SID_TEXT_FITTOSIZE_VERTICAL [ @@ -6366,7 +6127,6 @@ SfxBoolItem VerticalTextFitToSizeTool SID_TEXT_FITTOSIZE_VERTICAL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- SfxVoidItem ZoomPanning SID_ZOOM_PANNING () [ @@ -6445,7 +6205,6 @@ SfxVoidItem Crop SID_OBJECT_CROP GroupId = GID_DOCUMENT ; ] -//-------------------------------------------------------------------------- SfxVoidItem HeaderAndFooter SID_HEADER_AND_FOOTER () [ @@ -6470,7 +6229,6 @@ SfxVoidItem HeaderAndFooter SID_HEADER_AND_FOOTER GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertPageNumber SID_INSERT_PAGE_NUMBER () [ @@ -6495,7 +6253,6 @@ SfxVoidItem InsertPageNumber SID_INSERT_PAGE_NUMBER GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem InsertDateAndTime SID_INSERT_DATE_TIME () [ @@ -6520,7 +6277,6 @@ SfxVoidItem InsertDateAndTime SID_INSERT_DATE_TIME GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- SfxVoidItem MasterLayouts SID_MASTER_LAYOUTS () [ @@ -6621,7 +6377,6 @@ SfxBoolItem LayerDialogChildWindow SID_LAYER_DIALOG_WIN GroupId = GID_OPTIONS; ] - SfxVoidItem InsertMasterPage SID_INSERT_MASTER_PAGE( SfxStringItem PageName ID_VAL_PAGENAME, SfxUInt32Item WhatLayout ID_VAL_WHATLAYOUT, @@ -6813,7 +6568,6 @@ SfxVoidItem TableToolBox SID_TABLE_TOOLBOX GroupId = GID_APPLICATION; ] -//-------------------------------------------------------------------------- SfxVoidItem DistributeColumns SID_TABLE_DISTRIBUTE_COLUMNS () [ @@ -6838,8 +6592,6 @@ SfxVoidItem DistributeColumns SID_TABLE_DISTRIBUTE_COLUMNS GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- - SfxVoidItem DistributeRows SID_TABLE_DISTRIBUTE_ROWS () [ @@ -6964,7 +6716,6 @@ SfxVoidItem TaskPaneShowSmallPreview SID_TP_SHOW_SMALL_PREVIEW GroupId = GID_VIEW; ] - SfxVoidItem TaskPaneShowLargePreview SID_TP_SHOW_LARGE_PREVIEW [ /* flags: */ @@ -7068,7 +6819,6 @@ SfxInt32Item SwitchViewShell SID_SWITCH_SHELL GroupId = GID_VIEW; ] - /** This item holds the requested pane of the multi pane GUI in which a change of the view shell is requested by a call to the SID_SWITCH_SHELL slot. @@ -7252,7 +7002,6 @@ SfxVoidItem PhotoAlbumDialog SID_PHOTOALBUM GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- SfxVoidItem PresentationMinimizer SID_PRESENTATION_MINIMIZER () [ diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index fc22835f3e0d..c8982cf0d0e6 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -153,8 +153,6 @@ CustomAnimationEffect::CustomAnimationEffect( const ::com::sun::star::uno::Refer setNode( xNode ); } - - void CustomAnimationEffect::setNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { mxNode = xNode; @@ -278,8 +276,6 @@ void CustomAnimationEffect::setNode( const ::com::sun::star::uno::Reference< ::c checkForText(); } - - sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_Int16 nIterateType ) { sal_Int32 nSubItems = 0; @@ -374,14 +370,10 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In return nSubItems; } - - CustomAnimationEffect::~CustomAnimationEffect() { } - - CustomAnimationEffectPtr CustomAnimationEffect::clone() const { Reference< XCloneable > xCloneable( mxNode, UNO_QUERY_THROW ); @@ -391,8 +383,6 @@ CustomAnimationEffectPtr CustomAnimationEffect::clone() const return pEffect; } - - sal_Int32 CustomAnimationEffect::get_node_type( const Reference< XAnimationNode >& xNode ) { sal_Int16 nNodeType = -1; @@ -419,8 +409,6 @@ sal_Int32 CustomAnimationEffect::get_node_type( const Reference< XAnimationNode return nNodeType; } - - void CustomAnimationEffect::setPresetClass( sal_Int16 nPresetClass ) { if( mnPresetClass != nPresetClass ) @@ -503,8 +491,6 @@ void CustomAnimationEffect::setNodeType( sal_Int16 nNodeType ) } } - - void CustomAnimationEffect::setGroupId( sal_Int32 nGroupId ) { mnGroupId = nGroupId; @@ -543,8 +529,6 @@ void CustomAnimationEffect::setGroupId( sal_Int32 nGroupId ) } } - - /** checks if the text for this effect has changed and updates internal flags. returns true if something changed. */ @@ -645,8 +629,6 @@ bool CustomAnimationEffect::calculateIterateDuration() return bChange; } - - void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget ) { try @@ -700,8 +682,6 @@ void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget } } - - void CustomAnimationEffect::setTargetSubItem( sal_Int16 nSubItem ) { try @@ -737,8 +717,6 @@ void CustomAnimationEffect::setTargetSubItem( sal_Int16 nSubItem ) } } - - void CustomAnimationEffect::setDuration( double fDuration ) { if( (mfDuration != -1.0) && (mfDuration != fDuration) ) try @@ -762,7 +740,6 @@ void CustomAnimationEffect::setDuration( double fDuration ) if( !xChildNode.is() ) continue; - double fChildBegin = 0.0; xChildNode->getBegin() >>= fChildBegin; if( fChildBegin != 0.0 ) @@ -789,8 +766,6 @@ void CustomAnimationEffect::setDuration( double fDuration ) } } - - void CustomAnimationEffect::setBegin( double fBegin ) { if( mxNode.is() ) try @@ -804,8 +779,6 @@ void CustomAnimationEffect::setBegin( double fBegin ) } } - - void CustomAnimationEffect::setAcceleration( double fAcceleration ) { if( mxNode.is() ) try @@ -819,7 +792,6 @@ void CustomAnimationEffect::setAcceleration( double fAcceleration ) } } - void CustomAnimationEffect::setDecelerate( double fDecelerate ) { if( mxNode.is() ) try @@ -833,8 +805,6 @@ void CustomAnimationEffect::setDecelerate( double fDecelerate ) } } - - void CustomAnimationEffect::setAutoReverse( sal_Bool bAutoReverse ) { if( mxNode.is() ) try @@ -848,8 +818,6 @@ void CustomAnimationEffect::setAutoReverse( sal_Bool bAutoReverse ) } } - - void CustomAnimationEffect::replaceNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { sal_Int16 nNodeType = mnNodeType; @@ -885,8 +853,6 @@ void CustomAnimationEffect::replaceNode( const ::com::sun::star::uno::Reference< setIterateInterval( fIterateInterval ); } - - Reference< XShape > CustomAnimationEffect::getTargetShape() const { Reference< XShape > xShape; @@ -901,8 +867,6 @@ Reference< XShape > CustomAnimationEffect::getTargetShape() const return xShape; } - - Any CustomAnimationEffect::getRepeatCount() const { if( mxNode.is() ) @@ -916,8 +880,6 @@ Any CustomAnimationEffect::getRepeatCount() const } } - - Any CustomAnimationEffect::getEnd() const { if( mxNode.is() ) @@ -931,8 +893,6 @@ Any CustomAnimationEffect::getEnd() const } } - - sal_Int16 CustomAnimationEffect::getFill() const { if( mxNode.is() ) @@ -941,8 +901,6 @@ sal_Int16 CustomAnimationEffect::getFill() const return 0; } - - void CustomAnimationEffect::setRepeatCount( const Any& rRepeatCount ) { if( mxNode.is() ) @@ -954,24 +912,18 @@ void CustomAnimationEffect::setRepeatCount( const Any& rRepeatCount ) } } - - void CustomAnimationEffect::setEnd( const Any& rEnd ) { if( mxNode.is() ) mxNode->setEnd( rEnd ); } - - void CustomAnimationEffect::setFill( sal_Int16 nFill ) { if( mxNode.is() ) mxNode->setFill( nFill ); } - - Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const throw (Exception) { DBG_ASSERT( mbHasAfterEffect, "sd::CustomAnimationEffect::createAfterEffectNode(), this node has no after effect!" ); @@ -1025,8 +977,6 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const return xAnimate; } - - void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType ) { if( mnIterateType != nIterateType ) try @@ -1116,8 +1066,6 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType ) } } - - void CustomAnimationEffect::setIterateInterval( double fIterateInterval ) { if( mfIterateInterval != fIterateInterval ) @@ -1135,8 +1083,6 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval ) } } - - OUString CustomAnimationEffect::getPath() const { OUString aPath; @@ -1163,8 +1109,6 @@ OUString CustomAnimationEffect::getPath() const return aPath; } - - void CustomAnimationEffect::setPath( const OUString& rPath ) { if( mxNode.is() ) try @@ -1189,8 +1133,6 @@ void CustomAnimationEffect::setPath( const OUString& rPath ) } } - - Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue ) { Any aProperty; @@ -1240,8 +1182,6 @@ Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAt return aProperty; } - - bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const Any& rValue ) { bool bChanged = false; @@ -1317,15 +1257,11 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA return bChanged; } - - static bool implIsColorAttribute( const OUString& rAttributeName ) { return rAttributeName == "FillColor" || rAttributeName == "LineColor" || rAttributeName == "CharColor"; } - - Any CustomAnimationEffect::getColor( sal_Int32 nIndex ) { Any aColor; @@ -1373,8 +1309,6 @@ Any CustomAnimationEffect::getColor( sal_Int32 nIndex ) return aColor; } - - void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor ) { if( mxNode.is() ) try @@ -1426,8 +1360,6 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor ) } } - - Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType, EValue eValue ) { Any aProperty; @@ -1474,8 +1406,6 @@ Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType, return aProperty; } - - bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const Any& rValue ) { bool bChanged = false; @@ -1547,8 +1477,6 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType, return bChanged; } - - void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSource, double fVolume /* = 1.0 */ ) { DBG_ASSERT( !mxAudio.is(), "sd::CustomAnimationEffect::createAudio(), node already has an audio!" ); @@ -1567,8 +1495,6 @@ void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSour } } - - static Reference< XCommand > findCommandNode( const Reference< XAnimationNode >& xRootNode ) { Reference< XCommand > xCommand; @@ -1623,8 +1549,6 @@ void CustomAnimationEffect::removeAudio() } - - void CustomAnimationEffect::setAudio( const Reference< ::com::sun::star::animations::XAudio >& xAudio ) { if( mxAudio != xAudio ) try @@ -1642,8 +1566,6 @@ void CustomAnimationEffect::setAudio( const Reference< ::com::sun::star::animati } } - - void CustomAnimationEffect::setStopAudio() { if( mnCommand != EffectCommands::STOPAUDIO ) try @@ -1667,15 +1589,11 @@ void CustomAnimationEffect::setStopAudio() } } - - bool CustomAnimationEffect::getStopAudio() const { return mnCommand == EffectCommands::STOPAUDIO; } - - SdrPathObj* CustomAnimationEffect::createSdrPathObjFromPath() { SdrPathObj * pPathObj = new SdrPathObj( OBJ_PATHLINE ); @@ -1683,8 +1601,6 @@ SdrPathObj* CustomAnimationEffect::createSdrPathObjFromPath() return pPathObj; } - - void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj ) { ::basegfx::B2DPolyPolygon xPolyPoly; @@ -1709,8 +1625,6 @@ void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj ) rPathObj.SetPathPoly( xPolyPoly ); } - - void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj ) { ::basegfx::B2DPolyPolygon xPolyPoly( rPathObj.GetPathPoly() ); @@ -1747,15 +1661,11 @@ void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj setPath( ::basegfx::tools::exportToSvgD( xPolyPoly, true, true, true) ); } -// ==================================================================== - EffectSequenceHelper::EffectSequenceHelper() : mnSequenceType( EffectNodeType::DEFAULT ) { } - - EffectSequenceHelper::EffectSequenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer >& xSequenceRoot ) : mxSequenceRoot( xSequenceRoot ), mnSequenceType( EffectNodeType::DEFAULT ) { @@ -1763,15 +1673,11 @@ EffectSequenceHelper::EffectSequenceHelper( const ::com::sun::star::uno::Referen create( xNode ); } - - EffectSequenceHelper::~EffectSequenceHelper() { reset(); } - - void EffectSequenceHelper::reset() { EffectSequence::iterator aIter( maEffects.begin() ); @@ -1790,8 +1696,6 @@ Reference< XAnimationNode > EffectSequenceHelper::getRootNode() return xRoot; } - - void EffectSequenceHelper::append( const CustomAnimationEffectPtr& pEffect ) { pEffect->setEffectSequence( this ); @@ -1799,8 +1703,6 @@ void EffectSequenceHelper::append( const CustomAnimationEffectPtr& pEffect ) rebuild(); } - - CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPresetPtr& pPreset, const Any& rTarget, double fDuration /* = -1.0 */ ) { CustomAnimationEffectPtr pEffect; @@ -1872,8 +1774,6 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres return pEffect; } - - CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathObj, const Any& rTarget, double fDuration /* = -1.0 */ ) { CustomAnimationEffectPtr pEffect; @@ -1921,8 +1821,6 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb return pEffect; } - - void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pPreset, const OUString& rPresetSubType, double fDuration /* = -1.0 */ ) { if( pEffect.get() && pPreset.get() ) try @@ -1943,16 +1841,12 @@ void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, con } } - - void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pPreset, double fDuration /* = -1.0 */ ) { OUString strEmpty; replace( pEffect, pPreset, strEmpty, fDuration ); } - - void EffectSequenceHelper::remove( const CustomAnimationEffectPtr& pEffect ) { if( pEffect.get() ) @@ -1964,15 +1858,11 @@ void EffectSequenceHelper::remove( const CustomAnimationEffectPtr& pEffect ) rebuild(); } - - void EffectSequenceHelper::rebuild() { implRebuild(); } - - void EffectSequenceHelper::implRebuild() { try @@ -2097,22 +1987,16 @@ void EffectSequenceHelper::implRebuild() } } - - stl_CustomAnimationEffect_search_node_predict::stl_CustomAnimationEffect_search_node_predict( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xSearchNode ) : mxSearchNode( xSearchNode ) { } - - bool stl_CustomAnimationEffect_search_node_predict::operator()( CustomAnimationEffectPtr pEffect ) const { return pEffect->getNode() == mxSearchNode; } - - static bool implFindNextContainer( Reference< XTimeContainer >& xParent, Reference< XTimeContainer >& xCurrent, Reference< XTimeContainer >& xNext ) throw(Exception) { @@ -2133,8 +2017,6 @@ static bool implFindNextContainer( Reference< XTimeContainer >& xParent, Referen return xNext.is(); } - - void stl_process_after_effect_node_func(AfterEffectNode& rNode) { try @@ -2246,15 +2128,11 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode) } } - - EffectSequence::iterator EffectSequenceHelper::find( const CustomAnimationEffectPtr& pEffect ) { return std::find( maEffects.begin(), maEffects.end(), pEffect ); } - - CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const { CustomAnimationEffectPtr pEffect; @@ -2272,8 +2150,6 @@ CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const ::com::sun::sta return pEffect; } - - sal_Int32 EffectSequenceHelper::getOffsetFromEffect( const CustomAnimationEffectPtr& xEffect ) const { sal_Int32 nOffset = 0; @@ -2288,8 +2164,6 @@ sal_Int32 EffectSequenceHelper::getOffsetFromEffect( const CustomAnimationEffect return -1; } - - CustomAnimationEffectPtr EffectSequenceHelper::getEffectFromOffset( sal_Int32 nOffset ) const { EffectSequence::const_iterator aIter( maEffects.begin() ); @@ -2303,8 +2177,6 @@ CustomAnimationEffectPtr EffectSequenceHelper::getEffectFromOffset( sal_Int32 nO return pEffect; } - - bool EffectSequenceHelper::disposeShape( const Reference< XShape >& xShape ) { bool bChanges = false; @@ -2327,8 +2199,6 @@ bool EffectSequenceHelper::disposeShape( const Reference< XShape >& xShape ) return bChanges; } - - bool EffectSequenceHelper::hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) { EffectSequence::iterator aIter( maEffects.begin() ); @@ -2342,8 +2212,6 @@ bool EffectSequenceHelper::hasEffect( const com::sun::star::uno::Reference< com: return false; } - - void EffectSequenceHelper::insertTextRange( const com::sun::star::uno::Any& aTarget ) { bool bChanges = false; @@ -2364,8 +2232,6 @@ void EffectSequenceHelper::insertTextRange( const com::sun::star::uno::Any& aTar rebuild(); } - - void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTarget ) { ParagraphTarget aParaTarget; @@ -2418,8 +2284,6 @@ void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTa rebuild(); } - - CustomAnimationTextGroup::CustomAnimationTextGroup( const Reference< XShape >& rTarget, sal_Int32 nGroupId ) : maTarget( rTarget ), mnGroupId( nGroupId ) @@ -2427,8 +2291,6 @@ CustomAnimationTextGroup::CustomAnimationTextGroup( const Reference< XShape >& r reset(); } - - void CustomAnimationTextGroup::reset() { mnTextGrouping = -1; @@ -2445,8 +2307,6 @@ void CustomAnimationTextGroup::reset() maEffects.clear(); } - - void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr& pEffect ) { maEffects.push_back( pEffect ); @@ -2495,16 +2355,12 @@ void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr& pEffect ) } } - - class TextGroupMapImpl : public std::map< sal_Int32, CustomAnimationTextGroup* > { public: CustomAnimationTextGroup* findGroup( sal_Int32 nGroupId ); }; - - CustomAnimationTextGroupPtr EffectSequenceHelper::findGroup( sal_Int32 nGroupId ) { CustomAnimationTextGroupPtr aPtr; @@ -2516,8 +2372,6 @@ CustomAnimationTextGroupPtr EffectSequenceHelper::findGroup( sal_Int32 nGroupId return aPtr; } - - void EffectSequenceHelper::updateTextGroups() { maGroupMap.clear(); @@ -2545,8 +2399,6 @@ void EffectSequenceHelper::updateTextGroups() } } - - CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse ) { // first finde a free group-id @@ -2604,8 +2456,6 @@ CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimati return pTextGroup; } - - void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextGroupPtr pTextGroup, CustomAnimationEffectPtr pEffect, bool bUsed ) { Reference< XShape > xTarget( pTextGroup->maTarget ); @@ -2699,8 +2549,6 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG } } - - void EffectSequenceHelper::setTextGrouping( CustomAnimationTextGroupPtr pTextGroup, sal_Int32 nTextGrouping ) { if( pTextGroup->mnTextGrouping == nTextGrouping ) @@ -2781,8 +2629,6 @@ void EffectSequenceHelper::setTextGrouping( CustomAnimationTextGroupPtr pTextGro } } - - void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bAnimateForm ) { if( pTextGroup->mbAnimateForm == bAnimateForm ) @@ -2855,8 +2701,6 @@ void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGrou } } - - void EffectSequenceHelper::setTextGroupingAuto( CustomAnimationTextGroupPtr pTextGroup, double fTextGroupingAuto ) { sal_Int32 nTextGrouping = pTextGroup->mnTextGrouping; @@ -2899,8 +2743,6 @@ void EffectSequenceHelper::setTextGroupingAuto( CustomAnimationTextGroupPtr pTex notify_listeners(); } - - struct ImplStlTextGroupSortHelper { ImplStlTextGroupSortHelper( bool bReverse ) : mbReverse( bReverse ) {}; @@ -2909,8 +2751,6 @@ struct ImplStlTextGroupSortHelper sal_Int32 getTargetParagraph( const CustomAnimationEffectPtr& p1 ); }; - - sal_Int32 ImplStlTextGroupSortHelper::getTargetParagraph( const CustomAnimationEffectPtr& p1 ) { const Any aTarget(p1->getTarget()); @@ -2926,8 +2766,6 @@ sal_Int32 ImplStlTextGroupSortHelper::getTargetParagraph( const CustomAnimationE } } - - bool ImplStlTextGroupSortHelper::operator()( const CustomAnimationEffectPtr& p1, const CustomAnimationEffectPtr& p2 ) { if( mbReverse ) @@ -2940,8 +2778,6 @@ bool ImplStlTextGroupSortHelper::operator()( const CustomAnimationEffectPtr& p1, } } - - void EffectSequenceHelper::setTextReverse( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bTextReverse ) { if( pTextGroup->mbTextReverse == bTextReverse ) @@ -2976,39 +2812,29 @@ void EffectSequenceHelper::setTextReverse( CustomAnimationTextGroupPtr pTextGrou } } - - void EffectSequenceHelper::addListener( ISequenceListener* pListener ) { if( std::find( maListeners.begin(), maListeners.end(), pListener ) == maListeners.end() ) maListeners.push_back( pListener ); } - - void EffectSequenceHelper::removeListener( ISequenceListener* pListener ) { maListeners.remove( pListener ); } - - struct stl_notify_listeners_func : public std::unary_function<ISequenceListener*, void> { stl_notify_listeners_func() {} void operator()(ISequenceListener* pListener) { pListener->notify_change(); } }; - - void EffectSequenceHelper::notify_listeners() { stl_notify_listeners_func aFunc; std::for_each( maListeners.begin(), maListeners.end(), aFunc ); } - - void EffectSequenceHelper::create( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { DBG_ASSERT( xNode.is(), "sd::EffectSequenceHelper::create(), illegal argument" ); @@ -3029,8 +2855,6 @@ void EffectSequenceHelper::create( const ::com::sun::star::uno::Reference< ::com } } - - void EffectSequenceHelper::createEffectsequence( const Reference< XAnimationNode >& xNode ) { DBG_ASSERT( xNode.is(), "sd::EffectSequenceHelper::createEffectsequence(), illegal argument" ); @@ -3052,8 +2876,6 @@ void EffectSequenceHelper::createEffectsequence( const Reference< XAnimationNode } } - - void EffectSequenceHelper::createEffects( const Reference< XAnimationNode >& xNode ) { DBG_ASSERT( xNode.is(), "sd::EffectSequenceHelper::createEffects(), illegal argument" ); @@ -3098,8 +2920,6 @@ void EffectSequenceHelper::createEffects( const Reference< XAnimationNode >& xNo } } - - void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode >& xNode ) { try @@ -3157,8 +2977,6 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode > } } -// ==================================================================== - class AnimationChangeListener : public cppu::WeakImplHelper1< XChangesListener > { public: @@ -3180,8 +2998,6 @@ void SAL_CALL AnimationChangeListener::disposing( const ::com::sun::star::lang:: { } -// ==================================================================== - MainSequence::MainSequence() : mxTimingRootNode( SequenceTimeContainer::create( ::comphelper::getProcessComponentContext() ) ) , mbRebuilding( false ) @@ -3198,8 +3014,6 @@ MainSequence::MainSequence() init(); } - - MainSequence::MainSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) : mxTimingRootNode( xNode, UNO_QUERY ) , mbRebuilding( false ) @@ -3210,15 +3024,11 @@ MainSequence::MainSequence( const ::com::sun::star::uno::Reference< ::com::sun:: init(); } - - MainSequence::~MainSequence() { reset(); } - - void MainSequence::init() { mnSequenceType = EffectNodeType::MAIN_SEQUENCE; @@ -3231,8 +3041,6 @@ void MainSequence::init() createMainSequence(); } - - void MainSequence::reset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode ) { reset(); @@ -3242,8 +3050,6 @@ void MainSequence::reset( const ::com::sun::star::uno::Reference< ::com::sun::st createMainSequence(); } - - Reference< ::com::sun::star::animations::XAnimationNode > MainSequence::getRootNode() { DBG_ASSERT( mnRebuildLockGuard == 0, "MainSequence::getRootNode(), rebuild is locked, is this really what you want?" ); @@ -3258,8 +3064,6 @@ Reference< ::com::sun::star::animations::XAnimationNode > MainSequence::getRootN return EffectSequenceHelper::getRootNode(); } - - void MainSequence::createMainSequence() { if( mxTimingRootNode.is() ) try @@ -3320,8 +3124,6 @@ void MainSequence::createMainSequence() DBG_ASSERT( mxSequenceRoot.is(), "sd::MainSequence::create(), found no main sequence!" ); } - - void MainSequence::reset() { EffectSequenceHelper::reset(); @@ -3339,12 +3141,10 @@ void MainSequence::reset() } catch( Exception& ) { - // ... + } } - - InteractiveSequencePtr MainSequence::createInteractiveSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) { InteractiveSequencePtr pIS; @@ -3368,8 +3168,6 @@ InteractiveSequencePtr MainSequence::createInteractiveSequence( const ::com::sun return pIS; } - - CustomAnimationEffectPtr MainSequence::findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const { CustomAnimationEffectPtr pEffect = EffectSequenceHelper::findEffect( xNode ); @@ -3385,8 +3183,6 @@ CustomAnimationEffectPtr MainSequence::findEffect( const ::com::sun::star::uno:: return pEffect; } - - sal_Int32 MainSequence::getOffsetFromEffect( const CustomAnimationEffectPtr& pEffect ) const { sal_Int32 nOffset = EffectSequenceHelper::getOffsetFromEffect( pEffect ); @@ -3409,8 +3205,6 @@ sal_Int32 MainSequence::getOffsetFromEffect( const CustomAnimationEffectPtr& pEf return -1; } - - CustomAnimationEffectPtr MainSequence::getEffectFromOffset( sal_Int32 nOffset ) const { if( nOffset >= 0 ) @@ -3433,8 +3227,6 @@ CustomAnimationEffectPtr MainSequence::getEffectFromOffset( sal_Int32 nOffset ) return pEffect; } - - bool MainSequence::disposeShape( const Reference< XShape >& xShape ) { bool bChanges = EffectSequenceHelper::disposeShape( xShape ); @@ -3451,8 +3243,6 @@ bool MainSequence::disposeShape( const Reference< XShape >& xShape ) return bChanges; } - - bool MainSequence::hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) { if( EffectSequenceHelper::hasEffect( xShape ) ) @@ -3471,8 +3261,6 @@ bool MainSequence::hasEffect( const com::sun::star::uno::Reference< com::sun::st return false; } - - void MainSequence::insertTextRange( const com::sun::star::uno::Any& aTarget ) { EffectSequenceHelper::insertTextRange( aTarget ); @@ -3484,7 +3272,6 @@ void MainSequence::insertTextRange( const com::sun::star::uno::Any& aTarget ) } } - void MainSequence::disposeTextRange( const com::sun::star::uno::Any& aTarget ) { EffectSequenceHelper::disposeTextRange( aTarget ); @@ -3496,8 +3283,6 @@ void MainSequence::disposeTextRange( const com::sun::star::uno::Any& aTarget ) } } - - /** callback from the sd::View when an object just left text edit mode */ void MainSequence::onTextChanged( const Reference< XShape >& xShape ) { @@ -3510,8 +3295,6 @@ void MainSequence::onTextChanged( const Reference< XShape >& xShape ) } } - - void EffectSequenceHelper::onTextChanged( const Reference< XShape >& xShape ) { bool bChanges = false; @@ -3527,22 +3310,16 @@ void EffectSequenceHelper::onTextChanged( const Reference< XShape >& xShape ) EffectSequenceHelper::implRebuild(); } - - void MainSequence::rebuild() { startRebuildTimer(); } - - void MainSequence::lockRebuilds() { mnRebuildLockGuard++; } - - void MainSequence::unlockRebuilds() { DBG_ASSERT( mnRebuildLockGuard, "sd::MainSequence::unlockRebuilds(), no corresponding lockRebuilds() call!" ); @@ -3556,8 +3333,6 @@ void MainSequence::unlockRebuilds() } } - - void MainSequence::implRebuild() { if( mnRebuildLockGuard ) @@ -3596,15 +3371,11 @@ void MainSequence::implRebuild() mbRebuilding = false; } - - void MainSequence::notify_change() { notify_listeners(); } - - bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTriggerShape ) { EffectSequenceHelper* pOldSequence = pEffect->getEffectSequence(); @@ -3648,8 +3419,6 @@ bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const :: } - - IMPL_LINK_NOARG(MainSequence, onTimerHdl) { if( mbTimerMode ) @@ -3665,8 +3434,6 @@ IMPL_LINK_NOARG(MainSequence, onTimerHdl) return 0; } - - /** starts a timer that recreates the internal structure from the API core after 1 second */ void MainSequence::startRecreateTimer() { @@ -3677,8 +3444,6 @@ void MainSequence::startRecreateTimer() } } - - /** starts a timer that rebuilds the API core from the internal structure after 1 second */ void MainSequence::startRebuildTimer() { @@ -3686,8 +3451,6 @@ void MainSequence::startRebuildTimer() maTimer.Start(); } -// ==================================================================== - InteractiveSequence::InteractiveSequence( const Reference< XTimeContainer >& xSequenceRoot, MainSequence* pMainSequence ) : EffectSequenceHelper( xSequenceRoot ), mpMainSequence( pMainSequence ) { @@ -3716,8 +3479,6 @@ InteractiveSequence::InteractiveSequence( const Reference< XTimeContainer >& xSe } } - - void InteractiveSequence::rebuild() { mpMainSequence->rebuild(); @@ -3728,8 +3489,6 @@ void InteractiveSequence::implRebuild() EffectSequenceHelper::implRebuild(); } - - MainSequenceRebuildGuard::MainSequenceRebuildGuard( const MainSequencePtr& pMainSequence ) : mpMainSequence( pMainSequence ) { @@ -3743,7 +3502,6 @@ MainSequenceRebuildGuard::~MainSequenceRebuildGuard() mpMainSequence->unlockRebuilds(); } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx index a154da1bce20..5b8933209e7e 100644 --- a/sd/source/core/PageListWatcher.cxx +++ b/sd/source/core/PageListWatcher.cxx @@ -24,7 +24,7 @@ #include <tools/debug.hxx> #include <svx/svdmodel.hxx> -////////////////////////////////////////////////////////////////////////////// + void ImpPageListWatcher::ImpRecreateSortedPageListOnDemand() { @@ -186,7 +186,7 @@ sal_uInt32 ImpPageListWatcher::GetVisibleSdPageCount() return nVisiblePageCount; } -////////////////////////////////////////////////////////////////////////////// + sal_uInt32 ImpDrawPageListWatcher::ImpGetPageCount() const { @@ -207,7 +207,7 @@ ImpDrawPageListWatcher::~ImpDrawPageListWatcher() { } -////////////////////////////////////////////////////////////////////////////// + sal_uInt32 ImpMasterPageListWatcher::ImpGetPageCount() const { diff --git a/sd/source/core/PageListWatcher.hxx b/sd/source/core/PageListWatcher.hxx index 07a5ce59c513..d16d67f737bf 100644 --- a/sd/source/core/PageListWatcher.hxx +++ b/sd/source/core/PageListWatcher.hxx @@ -64,8 +64,6 @@ public: sal_uInt32 GetVisibleSdPageCount(); }; -////////////////////////////////////////////////////////////////////////////// - class ImpDrawPageListWatcher : public ImpPageListWatcher { protected: @@ -77,8 +75,6 @@ public: virtual ~ImpDrawPageListWatcher(); }; -////////////////////////////////////////////////////////////////////////////// - class ImpMasterPageListWatcher : public ImpPageListWatcher { protected: diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index caab663034fa..b57c67f843e1 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -80,7 +80,6 @@ private: void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage* pBMMPage, bool bRenameDuplicates, SdDrawDocument* pBookmarkDoc ) { // now check for duplicate masterpage and layout names - // =================================================== OUString aFullNameLayout( pBMMPage->GetLayoutName() ); sal_Int32 nIndex = aFullNameLayout.indexOf( SD_LT_SEPARATOR ); @@ -129,9 +128,9 @@ static void lcl_IterateBookmarkPages( SdDrawDocument &rDoc, SdDrawDocument* pBoo const std::vector<OUString> &rBookmarkList, sal_uInt16 nBMSdPageCount, InsertBookmarkAsPage_FindDuplicateLayouts& rPageIterator, bool bRenameDuplicates = false ) { - // + // Refactored copy'n'pasted layout name collection from InsertBookmarkAsPage - // + int nPos, nEndPos; if( rBookmarkList.empty() ) @@ -471,7 +470,6 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( } } - // Get the necessary presentation stylesheets and transfer them before // the pages, else, the text objects won't reference their styles anymore. ::svl::IUndoManager* pUndoMgr = NULL; @@ -481,14 +479,12 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_INSERTPAGES), ""); } - // // Refactored copy'n'pasted layout name collection into IterateBookmarkPages - // + std::vector<OUString> aLayoutsToTransfer; InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( aLayoutsToTransfer ); lcl_IterateBookmarkPages( *this, pBookmarkDoc, rBookmarkList, nBMSdPageCount, aSearchFunctor, ( rBookmarkList.empty() && pBookmarkDoc != this ) ); - // Copy the style that we actually need. SdStyleSheetPool* pBookmarkStyleSheetPool = dynamic_cast<SdStyleSheetPool*>(pBookmarkDoc->GetStyleSheetPool()); SdStyleSheetPool* pStyleSheetPool = dynamic_cast<SdStyleSheetPool*>(GetStyleSheetPool()); @@ -766,7 +762,6 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( } } - // We might have duplicate master pages now, as the drawing engine does not // recognize duplicates. Remove these now. sal_uInt16 nNewMPageCount = GetMasterPageCount(); @@ -1152,7 +1147,6 @@ bool SdDrawDocument::IsReadOnly() const return false; } - // In the subsequent AllocModel() a DocShell (xAllocedDocShRef) is created. // Any pre-existing DocShell is deleted void SdDrawDocument::SetAllocDocSh(bool bAlloc) @@ -1322,7 +1316,6 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool } } - /** Exchange master page * * Either the nSdPageNum gets a new, own master page or the master page is @@ -1900,8 +1893,6 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, mpDocSh->SetWaitCursor( sal_False ); } - - void SdDrawDocument::Merge(SdrModel& rSourceModel, sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx index 1a0d943e47a4..eac66af774dd 100644 --- a/sd/source/core/sdiocmpt.cxx +++ b/sd/source/core/sdiocmpt.cxx @@ -21,8 +21,6 @@ #include "sdiocmpt.hxx" -////////////////////////////////////////////////////////////////////////////// - old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, sal_uInt16 nNewMode) : rStream(rNewStream), nSubRecSiz(0), diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx index 7eeec67546ec..9f1ab74db1ce 100644 --- a/sd/source/core/undo/undoobjects.cxx +++ b/sd/source/core/undo/undoobjects.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "undo/undoobjects.hxx" #include "sdpage.hxx" #include "CustomAnimationEffect.hxx" @@ -26,8 +25,6 @@ using namespace sd; -/////////////////////////////////////////////////////////////////////// - UndoRemovePresObjectImpl::UndoRemovePresObjectImpl( SdrObject& rObject ) : mpUndoUsercall(0) , mpUndoAnimation(0) @@ -52,8 +49,6 @@ UndoRemovePresObjectImpl::UndoRemovePresObjectImpl( SdrObject& rObject ) } } - - UndoRemovePresObjectImpl::~UndoRemovePresObjectImpl() { delete mpUndoAnimation; @@ -61,8 +56,6 @@ UndoRemovePresObjectImpl::~UndoRemovePresObjectImpl() delete mpUndoUsercall; } - - void UndoRemovePresObjectImpl::Undo() { if( mpUndoUsercall ) @@ -73,8 +66,6 @@ void UndoRemovePresObjectImpl::Undo() mpUndoAnimation->Undo(); } - - void UndoRemovePresObjectImpl::Redo() { if( mpUndoAnimation ) @@ -85,17 +76,12 @@ void UndoRemovePresObjectImpl::Redo() mpUndoUsercall->Redo(); } -/////////////////////////////////////////////////////////////////////// - - UndoRemoveObject::UndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) : SdrUndoRemoveObj( rObject, bOrdNumDirect ), UndoRemovePresObjectImpl( rObject ) , mxSdrObject(&rObject) { } - - void UndoRemoveObject::Undo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoRemoveObject::Undo(), object already dead!" ); @@ -106,8 +92,6 @@ void UndoRemoveObject::Undo() } } - - void UndoRemoveObject::Redo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoRemoveObject::Redo(), object already dead!" ); @@ -118,8 +102,6 @@ void UndoRemoveObject::Redo() } } -/////////////////////////////////////////////////////////////////////// - UndoDeleteObject::UndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ) : SdrUndoDelObj( rObject, bOrdNumDirect ) , UndoRemovePresObjectImpl( rObject ) @@ -127,8 +109,6 @@ UndoDeleteObject::UndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ) { } - - void UndoDeleteObject::Undo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoDeleteObject::Undo(), object already dead!" ); @@ -139,8 +119,6 @@ void UndoDeleteObject::Undo() } } - - void UndoDeleteObject::Redo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoDeleteObject::Redo(), object already dead!" ); @@ -151,8 +129,6 @@ void UndoDeleteObject::Redo() } } -/////////////////////////////////////////////////////////////////////// - UndoReplaceObject::UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) : SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ) , UndoRemovePresObjectImpl( rOldObject ) @@ -160,8 +136,6 @@ UndoReplaceObject::UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObje { } - - void UndoReplaceObject::Undo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoReplaceObject::Undo(), object already dead!" ); @@ -172,8 +146,6 @@ void UndoReplaceObject::Undo() } } - - void UndoReplaceObject::Redo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoReplaceObject::Redo(), object already dead!" ); @@ -184,8 +156,6 @@ void UndoReplaceObject::Redo() } } -/////////////////////////////////////////////////////////////////////// - UndoObjectSetText::UndoObjectSetText( SdrObject& rObject, sal_Int32 nText ) : SdrUndoObjSetText( rObject, nText ) , mpUndoAnimation(0) @@ -203,15 +173,11 @@ UndoObjectSetText::UndoObjectSetText( SdrObject& rObject, sal_Int32 nText ) } } - - UndoObjectSetText::~UndoObjectSetText() { delete mpUndoAnimation; } - - void UndoObjectSetText::Undo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoObjectSetText::Undo(), object already dead!" ); @@ -224,8 +190,6 @@ void UndoObjectSetText::Undo() } } - - void UndoObjectSetText::Redo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoObjectSetText::Redo(), object already dead!" ); @@ -238,7 +202,6 @@ void UndoObjectSetText::Redo() } } -////////////////////////////////////////////////////////////////////////////// // Undo for SdrObject::SetUserCall() UndoObjectUserCall::UndoObjectUserCall(SdrObject& rObject) @@ -249,8 +212,6 @@ UndoObjectUserCall::UndoObjectUserCall(SdrObject& rObject) { } - - void UndoObjectUserCall::Undo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoObjectUserCall::Undo(), object already dead!" ); @@ -261,8 +222,6 @@ void UndoObjectUserCall::Undo() } } - - void UndoObjectUserCall::Redo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoObjectUserCall::Redo(), object already dead!" ); @@ -272,7 +231,6 @@ void UndoObjectUserCall::Redo() } } -////////////////////////////////////////////////////////////////////////////// // Undo for SdPage::InsertPresObj() and SdPage::RemovePresObj() UndoObjectPresentationKind::UndoObjectPresentationKind(SdrObject& rObject) @@ -288,8 +246,6 @@ UndoObjectPresentationKind::UndoObjectPresentationKind(SdrObject& rObject) meOldKind = static_cast< SdPage* >( mxPage.get() )->GetPresObjKind( &rObject ); } - - void UndoObjectPresentationKind::Undo() { if( mxPage.is() && mxSdrObject.is() ) @@ -303,8 +259,6 @@ void UndoObjectPresentationKind::Undo() } } - - void UndoObjectPresentationKind::Redo() { if( mxPage.is() && mxSdrObject.is() ) @@ -317,22 +271,16 @@ void UndoObjectPresentationKind::Redo() } } -////////////////////////////////////////////////////////////////////////////// - UndoAutoLayoutPosAndSize::UndoAutoLayoutPosAndSize( SdPage& rPage ) : mxPage( &rPage ) { } - - void UndoAutoLayoutPosAndSize::Undo() { // do nothing } - - void UndoAutoLayoutPosAndSize::Redo() { SdPage* pPage = static_cast< SdPage* >( mxPage.get() ); @@ -340,8 +288,6 @@ void UndoAutoLayoutPosAndSize::Redo() pPage->SetAutoLayout( pPage->GetAutoLayout(), sal_False, sal_False ); } -////////////////////////////////////////////////////////////////////////////// - UndoGeoObject::UndoGeoObject( SdrObject& rNewObj ) : SdrUndoGeoObj( rNewObj ) , mxPage( rNewObj.GetPage() ) @@ -349,8 +295,6 @@ UndoGeoObject::UndoGeoObject( SdrObject& rNewObj ) { } - - void UndoGeoObject::Undo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoGeoObject::Undo(), object already dead!" ); @@ -368,8 +312,6 @@ void UndoGeoObject::Undo() } } - - void UndoGeoObject::Redo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoGeoObject::Redo(), object already dead!" ); @@ -387,10 +329,6 @@ void UndoGeoObject::Redo() } } - - -////////////////////////////////////////////////////////////////////////////// - UndoAttrObject::UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) : SdrUndoAttrObj( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False ) , mxPage( rObject.GetPage() ) @@ -398,8 +336,6 @@ UndoAttrObject::UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSav { } - - void UndoAttrObject::Undo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoAttrObject::Undo(), object already dead!" ); @@ -417,8 +353,6 @@ void UndoAttrObject::Undo() } } - - void UndoAttrObject::Redo() { DBG_ASSERT( mxSdrObject.is(), "sd::UndoAttrObject::Redo(), object already dead!" ); diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 852755704b82..a7374e0370b6 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -164,8 +164,6 @@ void PPTWriter::exportPPTPost( ) mbStatus = sal_True; }; - - void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStream& rBinaryTagData10Atom ); void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 nMode, @@ -358,8 +356,6 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ mpPptEscherEx->CloseContainer(); // EPP_Slide } - - void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > aXBackgroundPropSet ) { mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainMaster | nPageNum, mpStrm->Tell() ); @@ -446,8 +442,6 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS mpPptEscherEx->CloseContainer(); // EPP_MainMaster }; - - PPTWriter::~PPTWriter() { delete mpExEmbed; @@ -467,8 +461,6 @@ PPTWriter::~PPTWriter() mXStatusIndicator->end(); } - - sal_Bool PPTWriter::ImplCreateCurrentUserStream() { mpCurUserStrm = mrStg->OpenSotStream( OUString( "Current User" ) ); @@ -484,7 +476,7 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream() sal_uInt32 nEditPos = mpCurUserStrm->Tell(); mpCurUserStrm->WriteUInt32( (sal_uInt32)0x0 ) // OffsetToCurrentEdit; - .WriteUInt16( (sal_uInt16)nLenOfUserName ) // + .WriteUInt16( (sal_uInt16)nLenOfUserName ) .WriteUInt16( (sal_uInt16)0x3f4 ) // DocFileVersion .WriteUChar( (sal_uInt8)3 ) // MajorVersion .WriteUChar( (sal_uInt8)0 ) // MinorVersion @@ -499,8 +491,6 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream() return sal_True; }; - - sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation() { uno::Reference<document::XDocumentPropertiesSupplier> xDPS( @@ -552,8 +542,6 @@ sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation() return sal_True; } - - void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId ) { if ( rSt.Tell() ) @@ -567,8 +555,6 @@ void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sa } } - - void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ) { if ( rXPagePropSet.is() ) @@ -593,8 +579,6 @@ void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star } } - - void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ) { if ( rXPagePropSet.is() ) @@ -677,8 +661,6 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com } } - - sal_Bool PPTWriter::ImplCreateDocument() { sal_uInt32 i; @@ -943,8 +925,6 @@ sal_Bool PPTWriter::ImplCreateDocument() return sal_True; }; - - sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) { sal_uInt32 nCurrentOfs, nParaOfs, nParaCount = 0; @@ -1026,8 +1006,6 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) return sal_True; } - - sal_Bool PPTWriter::ImplCreateMainNotes() { EscherSolverContainer aSolverContainer; @@ -1068,8 +1046,6 @@ sal_Bool PPTWriter::ImplCreateMainNotes() return sal_True; } - - static OUString getInitials( const OUString& rName ) { OUString sInitials; @@ -1155,8 +1131,6 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr } } - - void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum ) { mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_Notes | nPageNum, mpStrm->Tell() ); @@ -1204,7 +1178,6 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su { //************************ ****** //** DEFAULT BACKGROUND SHAPE ** - //****************************** sal_uInt32 nFillColor = 0xffffff; sal_uInt32 nFillBackColor = 0; @@ -1281,8 +1254,6 @@ void PPTWriter::ImplWriteVBA() } } - - void PPTWriter::ImplWriteOLE( ) { @@ -1361,7 +1332,6 @@ void PPTWriter::ImplWriteOLE( ) } } - // write PersistantTable and UserEditAtom sal_Bool PPTWriter::ImplWriteAtomEnding() @@ -1472,10 +1442,8 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() return sal_True; } - // - exported function - - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd, diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index f593b74b5541..1cef1d08aa05 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -197,8 +197,6 @@ private: boost::ptr_vector<FontCollectionEntry> maFonts; }; -// ------------------------------------------------------------------------ - #define PPTEX_STYLESHEETENTRYS 9 enum PPTExTextAttr @@ -322,8 +320,6 @@ class PPTExStyleSheet void WriteTxCFStyleAtom( SvStream& rSt ); }; -// ------------------------------------------------------------------------ - class PPTWriterBase : public PropValue, public GroupTable { protected: diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 3843fb9b51e3..304c2b298b39 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -78,13 +78,9 @@ using namespace ::com::sun::star; -//////////////////////////////////////////////////////////////////////////////////////////////////// - #define ANSI_CHARSET 0 #define SYMBOL_CHARSET 2 -//////////////////////////////////////////////////////////////////////////////////////////////////// - /* Font Families */ #define FF_ROMAN 0x10 #define FF_SWISS 0x20 @@ -92,13 +88,9 @@ using namespace ::com::sun::star; #define FF_SCRIPT 0x40 #define FF_DECORATIVE 0x50 -//////////////////////////////////////////////////////////////////////////////////////////////////// - #define DEFAULT_PITCH 0x00 #define FIXED_PITCH 0x01 - - PPTExBulletProvider::PPTExBulletProvider() { pGraphicProv = new EscherGraphicProvider( _E_GRAPH_PROV_USE_INSTANCES | _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES ); @@ -153,8 +145,6 @@ sal_uInt16 PPTExBulletProvider::GetId( const OString& rUniqueId, Size& rGraphicS return nRetValue; } - - sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm ) { sal_uInt32 nSize = 28; @@ -172,8 +162,6 @@ sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm ) return nSize; } - - sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pStrm ) { sal_uInt32 nSize = 111; @@ -223,8 +211,6 @@ sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream return nSize; } - - sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm ) { sal_uInt32 nSize = 68; @@ -243,8 +229,6 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm ) return nSize; } - - sal_uInt32 PPTWriter::ImplProgBinaryTag( SvStream* pStrm ) { sal_uInt32 nPictureStreamSize, nOutlineStreamSize, nSize = 8; @@ -274,8 +258,6 @@ sal_uInt32 PPTWriter::ImplProgBinaryTag( SvStream* pStrm ) return nSize; } - - sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStream* pBinTagStrm ) { sal_uInt32 nSize = 8 + 8 + 14; @@ -305,8 +287,6 @@ sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStrea return nSize; } - - sal_uInt32 PPTWriter::ImplProgTagContainer( SvStream* pStrm, SvMemoryStream* pBinTagStrm ) { sal_uInt32 nSize = 0; @@ -328,8 +308,6 @@ sal_uInt32 PPTWriter::ImplProgTagContainer( SvStream* pStrm, SvMemoryStream* pBi return nSize; } - - sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm ) { sal_uInt32 nSize = 8; @@ -353,8 +331,6 @@ sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm ) return nSize; } - - sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm ) { sal_uInt32 i, nSize = 28 * mnMasterPages + 8; @@ -376,8 +352,6 @@ sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm ) return nSize; } - - sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const sal_uInt32 nType, const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 ) { @@ -416,8 +390,6 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const return nHyperId; } - - sal_Bool PPTWriter::ImplCloseDocument() { sal_uInt32 nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_Document ); @@ -577,8 +549,6 @@ sal_Bool PPTWriter::ImplCloseDocument() return sal_False; } - - sal_Bool PropValue::GetPropertyValue( ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, @@ -617,8 +587,6 @@ sal_Bool PropValue::GetPropertyValue( return bRetValue; } - - ::com::sun::star::beans::PropertyState PropValue::GetPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const OUString& rPropertyName ) @@ -633,27 +601,21 @@ sal_Bool PropValue::GetPropertyValue( } catch( ::com::sun::star::uno::Exception& ) { - //... + } return eRetValue; } - - sal_Bool PropValue::ImplGetPropertyValue( const OUString& rString ) { return GetPropertyValue( mAny, mXPropSet, rString ); } - - sal_Bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & aXPropSet, const OUString& rString ) { return GetPropertyValue( mAny, aXPropSet, rString ); } - - sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool bGetPropertyState ) { ePropState = ::com::sun::star::beans::PropertyState_AMBIGUOUS_VALUE; @@ -681,8 +643,6 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool return bRetValue; } - - void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) { sal_Bool bFirstParagraph = sal_True; @@ -827,8 +787,6 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) } } -// ----------------------------------------------------------------------- - void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) { sal_uInt32 nPropertyFlags; @@ -1034,8 +992,6 @@ sal_Bool PPTWriter::ImplGetText() return ( mnTextSize != 0 ); } -// ----------------------------------------------------------------------- - void PPTWriter::ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt ) { if ( mnAngle < 0 ) @@ -1070,8 +1026,6 @@ void PPTWriter::ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt ) } } -// ----------------------------------------------------------------------- - void PPTWriter::ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropertyContainer& rPropOpt ) { if ( !mbFontIndependentLineSpacing ) @@ -1104,8 +1058,6 @@ void PPTWriter::ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropert } } -// ----------------------------------------------------------------------- - void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_uInt32 nAtomInstance, TextRuleEntry* pTextRule, SvStream& rExtBuStr, EscherPropertyContainer* pPropOpt ) { @@ -1423,8 +1375,6 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u } } -// ----------------------------------------------------------------------- - void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, ::com::sun::star::presentation::AnimationEffect eAe, ::com::sun::star::presentation::AnimationEffect eTe, @@ -1942,8 +1892,6 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, .WriteUInt16( (sal_uInt16)0 ); // PadWord } -// ----------------------------------------------------------------------- - void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eCa, sal_Bool bMediaClickAction ) { sal_uInt32 nSoundRef = 0; // a reference to a sound in the sound collection, or NULL. @@ -2098,8 +2046,6 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat for ( int i = 0; i < 4; i++, rSt.WriteUInt32( (sal_uInt32)0 ) ) ; } -// ----------------------------------------------------------------------- - sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet, ::com::sun::star::presentation::AnimationEffect& eEffect, ::com::sun::star::presentation::AnimationEffect& eTextEffect, @@ -2126,8 +2072,6 @@ sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com return bHasEffect; }; -// ----------------------------------------------------------------------- - sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPage, const PageType /* ePageType */, const sal_uInt32 nStyleInstance, const sal_uInt8 nPlaceHolderId ) { @@ -2181,8 +2125,6 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag return bRet; } -// ----------------------------------------------------------------------- - void PPTWriter::ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolverContainer& rSolver ) { sal_uInt32 nId = mpPptEscherEx->GenerateShapeId(); @@ -3527,8 +3469,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a mnPagesWritten++; } -// ----------------------------------------------------------------------- - struct CellBorder { sal_Int32 mnPos; // specifies the distance to the top/left position of the table @@ -3890,8 +3830,6 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc mpPptEscherEx->CloseContainer(); } - - void TextObjBinary::Write( SvStream* pStrm ) { sal_uInt32 nSize, nPos = pStrm->Tell(); diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 04513c21d1ab..a6df016fe948 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "eppt.hxx" #include "epptdef.hxx" @@ -164,8 +163,6 @@ PPTWriterBase::PPTWriterBase( const Reference< XModel > & rXModel, { } - - PPTWriterBase::~PPTWriterBase() { // Possibly unnecessary sanity check for mXStatusIndicator.is(). @@ -176,8 +173,6 @@ PPTWriterBase::~PPTWriterBase() mXStatusIndicator->end(); } - - void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData ) { if ( !InitSOIface() ) @@ -257,8 +252,6 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert exportPPTPost(); } - - sal_Bool PPTWriterBase::InitSOIface() { while( true ) @@ -286,8 +279,6 @@ sal_Bool PPTWriterBase::InitSOIface() return sal_False; } - - sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) { while( true ) @@ -371,8 +362,6 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) return sal_False; } - - sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) { Any aAny; @@ -418,8 +407,6 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) return sal_True; }; - - sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum ) { if ( !GetPageByIndex( nPageNum, NOTICE ) ) @@ -431,8 +418,6 @@ sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum ) return sal_True; }; - - sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum ) { if ( !GetPageByIndex( nPageNum, MASTER ) ) @@ -450,8 +435,6 @@ sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum ) return sal_True; }; - - sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const { ::com::sun::star::uno::Any aAny; @@ -483,8 +466,6 @@ PHLayout& PPTWriterBase::GetLayout( const ::com::sun::star::uno::Reference< ::c return pPHLayout[ GetLayoutOffsetFixed( rXPropSet ) ]; } - - PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const { if( nOffset >= 0 && nOffset < EPP_LAYOUT_SIZE ) @@ -495,8 +476,6 @@ PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const return pPHLayout[ 0 ]; } - - sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType ) { sal_uInt32 nRetValue = 0; @@ -526,8 +505,6 @@ sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType ) return nRetValue; } -// ----------------------------------------------------------------------- - sal_Bool PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum ) { sal_Bool bRet = sal_False; @@ -539,8 +516,6 @@ sal_Bool PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum ) return bRet; } - - sal_Bool PPTWriterBase::GetStyleSheets() { int nInstance, nLevel; @@ -665,7 +640,7 @@ sal_Bool PPTWriterBase::GetStyleSheets() } catch( Exception& ) { - // + } } } @@ -678,8 +653,6 @@ sal_Bool PPTWriterBase::GetStyleSheets() return bRetValue; } -// ----------------------------------------------------------------------- - sal_Bool PPTWriterBase::CreateMainNotes() { if ( !GetPageByIndex( 0, NOTICE ) ) @@ -711,8 +684,6 @@ sal_Bool PPTWriterBase::CreateMainNotes() return ImplCreateMainNotes(); } -// ----------------------------------------------------------------------- - awt::Size PPTWriterBase::MapSize( const awt::Size& rSize ) { Size aRetSize( OutputDevice::LogicToLogic( Size( rSize.Width, rSize.Height ), maMapModeSrc, maMapModeDest ) ); @@ -724,16 +695,12 @@ awt::Size PPTWriterBase::MapSize( const awt::Size& rSize ) return awt::Size( aRetSize.Width(), aRetSize.Height() ); } -// ----------------------------------------------------------------------- - awt::Point PPTWriterBase::MapPoint( const awt::Point& rPoint ) { Point aRet( OutputDevice::LogicToLogic( Point( rPoint.X, rPoint.Y ), maMapModeSrc, maMapModeDest ) ); return awt::Point( aRet.X(), aRet.Y() ); } -// ----------------------------------------------------------------------- - Rectangle PPTWriterBase::MapRectangle( const awt::Rectangle& rRect ) { ::com::sun::star::awt::Point aPoint( rRect.X, rRect.Y ); @@ -743,8 +710,6 @@ Rectangle PPTWriterBase::MapRectangle( const awt::Rectangle& rRect ) return Rectangle( Point( aP.X, aP.Y ), Size( aS.Width, aS.Height ) ); } -// ----------------------------------------------------------------------- - sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) { while(true) @@ -797,8 +762,6 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) return sal_False; } -// ----------------------------------------------------------------------- - sal_Int8 PPTWriterBase::GetTransition( sal_Int16 nTransitionType, sal_Int16 nTransitionSubtype, FadeEffect eEffect, sal_uInt8& nDirection ) { sal_Int8 nPPTTransitionType = 0; @@ -1003,8 +966,6 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection return nPPTTransitionType; } -// ----------------------------------------------------------------------- - sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX ) { sal_uInt32 nShapes = mXShapes->getCount(); diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 89500cfe80ad..2a2dc41d0687 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -462,7 +462,6 @@ sal_uInt32 PortionObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPositi return mnTextSize; } -// ----------------------------------------------------------------------- // Return: 0 = no TextField // bit28->31 text field type : // 1 = Date diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index d3acedfaab3c..7ad4fe411391 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -22,21 +22,21 @@ #include <vcl/decoview.hxx> -// ===================================================================== -// ===================================================================== + + SdHtmlAttrPreview::SdHtmlAttrPreview( Window* pParent, const ResId& rResId ) :Control( pParent, rResId ) { } -// ===================================================================== -// ===================================================================== + + SdHtmlAttrPreview::~SdHtmlAttrPreview() { } -// ===================================================================== -// ===================================================================== + + void SdHtmlAttrPreview::Paint( const Rectangle& rRect ) { DecorationView aDecoView( this ); @@ -72,8 +72,8 @@ void SdHtmlAttrPreview::Paint( const Rectangle& rRect ) TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER ); } -// ===================================================================== -// ===================================================================== + + void SdHtmlAttrPreview::SetColors( Color& aBack, Color& aText, Color& aLink, Color& aVLink, Color& aALink ) { diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index cc603f205d4a..b8322c444e52 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -90,7 +90,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::document; // get parameter from Itemset - #define RESTOHTML( res ) StringToHTMLString(SD_RESSTR(res)) const char *pButtonNames[] = @@ -122,9 +121,7 @@ const char *pButtonNames[] = #define BTN_MORE 10 #define BTN_LESS 11 -// ********************************************************************* // Helper class for the simple creation of files local/remote -// ********************************************************************* class EasyFile { private: @@ -142,9 +139,7 @@ public: sal_uLong close(); }; -// ********************************************************************* // Helper class for the embedding of text attributes into the html output -// ********************************************************************* class HtmlState { private: @@ -171,9 +166,8 @@ public: OUString Flush(); }; -// ===================================================================== + // close all still open tags -// ===================================================================== OUString HtmlState::Flush() { OUString aStr; @@ -188,9 +182,8 @@ OUString HtmlState::Flush() return aStr; } -// ===================================================================== + // c'tor with default color for the page -// ===================================================================== HtmlState::HtmlState( Color aDefColor ) { mbColor = false; @@ -202,9 +195,8 @@ HtmlState::HtmlState( Color aDefColor ) maDefColor = aDefColor; } -// ===================================================================== + // enables/disables bold print -// ===================================================================== OUString HtmlState::SetWeight( bool bWeight ) { OUString aStr; @@ -218,9 +210,9 @@ OUString HtmlState::SetWeight( bool bWeight ) return aStr; } -// ===================================================================== + // enables/disables italic -// ===================================================================== + OUString HtmlState::SetItalic( bool bItalic ) { OUString aStr; @@ -234,9 +226,9 @@ OUString HtmlState::SetItalic( bool bItalic ) return aStr; } -// ===================================================================== + // enables/disables underlines -// ===================================================================== + OUString HtmlState::SetUnderline( bool bUnderline ) { OUString aStr; @@ -250,9 +242,8 @@ OUString HtmlState::SetUnderline( bool bUnderline ) return aStr; } -// ===================================================================== + // enables/disables strike through -// ===================================================================== OUString HtmlState::SetStrikeout( bool bStrike ) { OUString aStr; @@ -266,9 +257,8 @@ OUString HtmlState::SetStrikeout( bool bStrike ) return aStr; } -// ===================================================================== + // Sets the specified text color -// ===================================================================== OUString HtmlState::SetColor( Color aColor ) { OUString aStr; @@ -292,9 +282,8 @@ OUString HtmlState::SetColor( Color aColor ) return aStr; } -// ===================================================================== + // enables/disables a hyperlink -// ===================================================================== OUString HtmlState::SetLink( const OUString& aLink, const OUString& aTarget ) { OUString aStr; @@ -324,10 +313,7 @@ OUString HtmlState::SetLink( const OUString& aLink, const OUString& aTarget ) return aStr; } -// ********************************************************************* // methods of the class HtmlExport -// ********************************************************************* - static OUString getParagraphStyle( SdrOutliner* pOutliner, sal_Int32 nPara ) { SfxItemSet aParaSet( pOutliner->GetParaAttribs( nPara ) ); @@ -344,9 +330,8 @@ static OUString getParagraphStyle( SdrOutliner* pOutliner, sal_Int32 nPara ) return sStyle; } -// ===================================================================== + // constructor for the html export helper classes -// ===================================================================== HtmlExport::HtmlExport( OUString aPath, const Sequence< PropertyValue >& rParams, @@ -404,7 +389,7 @@ HtmlExport::~HtmlExport() { } -/** get common export parameters from item set */ +// get common export parameters from item set void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams ) { mbImpress = mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS; @@ -631,9 +616,8 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams maDocFileName = maIndex; } -/////////////////////////////////////////////////////////////////////// + // exports the (in the c'tor specified impress document) to html -/////////////////////////////////////////////////////////////////////// void HtmlExport::ExportHtml() { if(mbUserAttr) @@ -662,7 +646,7 @@ void HtmlExport::ExportHtml() maDocFileName += ".odp"; } - ////// + sal_uInt16 nProgrCount = mnSdPageCount; nProgrCount += mbImpress?mnSdPageCount:0; @@ -673,7 +657,6 @@ void HtmlExport::ExportHtml() mpDocSh->SetWaitCursor( true ); - // Exceptions are cool... CreateFileNames(); @@ -738,8 +721,6 @@ void HtmlExport::ExportHtml() ResetProgress(); } -/////////////////////////////////////////////////////////////////////// - void HtmlExport::SetDocColors( SdPage* pPage ) { if( pPage == NULL ) @@ -783,14 +764,12 @@ void HtmlExport::SetDocColors( SdPage* pPage ) } } -/////////////////////////////////////////////////////////////////////// - void HtmlExport::InitProgress( sal_uInt16 nProgrCount ) { mpProgress = new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nProgrCount ); } -/////////////////////////////////////////////////////////////////////// + void HtmlExport::ResetProgress() { @@ -798,7 +777,7 @@ void HtmlExport::ResetProgress() mpProgress = NULL; } -/////////////////////////////////////////////////////////////////////// + void HtmlExport::ExportKiosk() { @@ -815,9 +794,8 @@ void HtmlExport::ExportKiosk() ResetProgress(); } -/////////////////////////////////////////////////////////////////////// + // Export Document with WebCast (TM) Technology -/////////////////////////////////////////////////////////////////////// void HtmlExport::ExportWebCast() { mnPagesWritten = 0; @@ -879,10 +857,8 @@ void HtmlExport::ExportWebCast() ResetProgress(); } -/////////////////////////////////////////////////////////////////////// -// Save the presentation as a downloadable file in the dest directory -/////////////////////////////////////////////////////////////////////// +// Save the presentation as a downloadable file in the dest directory bool HtmlExport::SavePresentation() { meEC.SetContext( STR_HTMLEXP_ERROR_CREATE_FILE, maDocFileName ); @@ -917,9 +893,8 @@ bool HtmlExport::SavePresentation() return false; } -// ===================================================================== + // create image files -// ===================================================================== bool HtmlExport::CreateImagesForPresPages( bool bThumbnail) { try @@ -983,9 +958,8 @@ bool HtmlExport::CreateImagesForPresPages( bool bThumbnail) return true; } -// ===================================================================== + // get SdrTextObject with layout text of this page -// ===================================================================== SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage) { sal_uLong nObjectCount = pPage->GetObjCount(); @@ -1005,10 +979,8 @@ SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage) return pResult; } -// ===================================================================== -// create HTML text version of impress pages -// ===================================================================== +// create HTML text version of impress pages OUString HtmlExport::CreateMetaCharset() const { OUString aStr; @@ -1036,7 +1008,7 @@ bool HtmlExport::CreateHtmlTextForPresPages() SetDocColors( pPage ); } -// HTML head + // HTML head OUStringBuffer aStr(maHTMLHeader); aStr.append(CreateMetaCharset()); aStr.append(" <title>"); @@ -1045,10 +1017,10 @@ bool HtmlExport::CreateHtmlTextForPresPages() aStr.append("</head>\r\n"); aStr.append(CreateBodyTag()); -// navigation bar + // navigation bar aStr.append(CreateNavBar(nSdPage, true)); -// page title + // page title OUString sTitleText( CreateTextForTitle(pOutliner,pPage, pPage->GetPageBackgroundColor()) ); aStr.append("<h1 style=\""); aStr.append(getParagraphStyle(pOutliner, 0)); @@ -1056,10 +1028,10 @@ bool HtmlExport::CreateHtmlTextForPresPages() aStr.append(sTitleText); aStr.append("</h1>\r\n"); -// write outline text + // write outline text aStr.append(CreateTextForPage( pOutliner, pPage, true, pPage->GetPageBackgroundColor() )); -// notes + // notes if(mbNotes) { SdPage* pNotesPage = maNotesPages[ nSdPage ]; @@ -1075,7 +1047,7 @@ bool HtmlExport::CreateHtmlTextForPresPages() } } -// clsoe page + // close page aStr.append("</body>\r\n</html>"); bOk = WriteHtml(maTextFiles[nSdPage], false, aStr.makeStringAndClear()); @@ -1119,7 +1091,7 @@ bool HtmlExport::WriteHtml( const OUString& rFileName, bool bAddExtension, const return nErr == 0; } -// ===================================================================== + /** creates a outliner text for the title objects of a page */ @@ -1143,9 +1115,8 @@ OUString HtmlExport::CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, return OUString(); } -// ===================================================================== + // creates a outliner text for a page -// ===================================================================== OUString HtmlExport::CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ) @@ -1237,9 +1208,8 @@ OUString HtmlExport::CreateTextForPage( SdrOutliner* pOutliner, return aStr.makeStringAndClear(); } -// ===================================================================== + // creates a outliner text for a note page -// ===================================================================== OUString HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool, @@ -1270,9 +1240,8 @@ OUString HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner, return aStr.makeStringAndClear(); } -// ===================================================================== + // converts a paragraph of the outliner to html -// ===================================================================== OUString HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_Int32 nPara, const Color& rBackgroundColor ) { OUStringBuffer aStr; @@ -1315,11 +1284,10 @@ OUString HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_Int32 nP return aStr.makeStringAndClear(); } -// ===================================================================== + // Depending on the attributes of the specified set and the specified // HtmlState, it creates the needed html tags in order to get the -// attributes. -// ===================================================================== +// attributes OUString HtmlExport::TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor ) { OUStringBuffer aStr; @@ -1407,9 +1375,8 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState return aStr.makeStringAndClear(); } -// ===================================================================== + // create HTML wrapper for picture files -// ===================================================================== bool HtmlExport::CreateHtmlForPresPages() { bool bOk = true; @@ -1421,7 +1388,6 @@ bool HtmlExport::CreateHtmlForPresPages() // find clickable objects (also on the master page) and put it in the // list. This in reverse order character order since in html the first // area is taken in the case they overlap. - SdPage* pPage = maPages[ nSdPage ]; if( mbDocColors ) @@ -1463,12 +1429,12 @@ bool HtmlExport::CreateHtmlForPresPages() bMasterDone = true; } -// HTML Head + // HTML Head OUStringBuffer aStr(maHTMLHeader); aStr.append(CreateMetaCharset()); aStr.append(" <title>" + StringToHTMLString(maPageNames[nSdPage]) + "</title>\r\n"); -// insert timing information + // insert timing information pPage = maPages[ nSdPage ]; if( meMode == PUBLISH_KIOSK ) { @@ -1509,16 +1475,16 @@ bool HtmlExport::CreateHtmlForPresPages() aStr.append("</head>\r\n"); -// HTML Body + // HTML Body aStr.append(CreateBodyTag()); if( mbSlideSound && pPage->IsSoundOn() ) aStr.append(InsertSound(pPage->GetSoundFile())); -// navigation bar + // navigation bar if(!mbFrames ) aStr.append(CreateNavBar(nSdPage, false)); -// Image + // Image aStr.append("<center>"); aStr.append("<img src=\""); aStr.append(maImageFiles[nSdPage]); @@ -1529,7 +1495,7 @@ bool HtmlExport::CreateHtmlForPresPages() aStr.append("></center>\r\n"); -// notes + // notes if(mbNotes && !mbFrames) { SdrOutliner* pOutliner = mpDoc->GetInternalOutliner(); @@ -1548,7 +1514,7 @@ bool HtmlExport::CreateHtmlForPresPages() } } -// create Imagemap if necessary + // create Imagemap if necessary if (!aClickableObjects.empty()) { aStr.append("<map name=\"map0\">\r\n"); @@ -1578,10 +1544,10 @@ bool HtmlExport::CreateHtmlForPresPages() long nRadius = aRect.GetWidth() / 2; - /************************************************************* - |* insert areas into Imagemap of the object, if the object has - |* such a Imagemap - \************************************************************/ + /** + insert areas into Imagemap of the object, if the object has + such a Imagemap + */ if (pIMapInfo) { const ImageMap& rIMap = pIMapInfo->GetImageMap(); @@ -1666,10 +1632,10 @@ bool HtmlExport::CreateHtmlForPresPages() - /************************************************************* - |* if there is a presentation::ClickAction, determine bookmark - |* and create area for the whole object - \************************************************************/ + /** + if there is a presentation::ClickAction, determine bookmark + and create area for the whole object + */ if( pInfo ) { OUString aHRef; @@ -1782,9 +1748,8 @@ bool HtmlExport::CreateHtmlForPresPages() return bOk; } -// ===================================================================== + // create overview pages -// ===================================================================== bool HtmlExport::CreateContentPage() { if( mbDocColors ) @@ -1918,9 +1883,9 @@ bool HtmlExport::CreateContentPage() return bOk; } -// ===================================================================== + // create note pages (for frames) -// ===================================================================== + bool HtmlExport::CreateNotesPages() { bool bOk = true; @@ -1957,9 +1922,9 @@ bool HtmlExport::CreateNotesPages() return bOk; } -// ===================================================================== + // create outline pages (for frames) -// ===================================================================== + bool HtmlExport::CreateOutlinePages() { bool bOk = true; @@ -2019,9 +1984,8 @@ bool HtmlExport::CreateOutlinePages() return bOk; } -// ===================================================================== + // set file name -// ===================================================================== void HtmlExport::CreateFileNames() { // create lists with new file names @@ -2168,9 +2132,9 @@ static const char * JS_CollapseOutline = " frames[\"outline\"].location.href = \"outline0.$EXT\";\r\n" "}\r\n\r\n"; -// ==================================================================== + // create page with the frames -// ==================================================================== + bool HtmlExport::CreateFrames() { OUString aTmp; @@ -2274,7 +2238,7 @@ bool HtmlExport::CreateFrames() return bOk; } -// ==================================================================== + // create button bar for standard // we create the following html files // navbar0.htm navigation bar graphic for the first page @@ -2282,7 +2246,6 @@ bool HtmlExport::CreateFrames() // navbar2.htm navigation bar graphic for the last page // navbar3.htm navigation outline closed // navbar4.htm navigation outline open -// ==================================================================== bool HtmlExport::CreateNavBarFrames() { bool bOk = true; @@ -2304,7 +2267,7 @@ bool HtmlExport::CreateNavBarFrames() aStr.append(CreateBodyTag()); aStr.append("<center>\r\n"); - // first page + // first page aButton = SD_RESSTR(STR_HTMLEXP_FIRSTPAGE); if(mnButtonThema != -1) aButton = CreateImage(GetButtonName((nFile == 0 || mnSdPageCount == 1? @@ -2316,7 +2279,7 @@ bool HtmlExport::CreateNavBarFrames() aStr.append(aButton); aStr.append("\r\n"); - // to the previous page + // to the previous page aButton = SD_RESSTR(STR_PUBLISH_BACK); if(mnButtonThema != -1) aButton = CreateImage(GetButtonName((nFile == 0 || mnSdPageCount == 1? @@ -2328,7 +2291,7 @@ bool HtmlExport::CreateNavBarFrames() aStr.append(aButton); aStr.append("\r\n"); - // to the next page + // to the next page aButton = SD_RESSTR(STR_PUBLISH_NEXT); if(mnButtonThema != -1) aButton = CreateImage(GetButtonName((nFile ==2 || mnSdPageCount == 1? @@ -2340,7 +2303,7 @@ bool HtmlExport::CreateNavBarFrames() aStr.append(aButton); aStr.append("\r\n"); - // to the last page + // to the last page aButton = SD_RESSTR(STR_HTMLEXP_LASTPAGE); if(mnButtonThema != -1) aButton = CreateImage(GetButtonName((nFile ==2 || mnSdPageCount == 1? @@ -2357,7 +2320,7 @@ bool HtmlExport::CreateNavBarFrames() aStr.append(aButton); aStr.append("\r\n"); - // content + // content if (mbContentsPage) { aButton = SD_RESSTR(STR_PUBLISH_OUTLINE); @@ -2369,7 +2332,7 @@ bool HtmlExport::CreateNavBarFrames() aStr.append("\r\n"); } - // text mode + // text mode if(mbImpress) { aButton = SD_RESSTR(STR_HTMLEXP_SETTEXT); @@ -2381,7 +2344,7 @@ bool HtmlExport::CreateNavBarFrames() aStr.append("\r\n"); } - // and finished... + // and finished... aStr.append("</center>\r\n"); aStr.append("</body>\r\n</html>"); @@ -2443,9 +2406,8 @@ bool HtmlExport::CreateNavBarFrames() return bOk; } -// ==================================================================== + // create button bar for standard -// ==================================================================== OUString HtmlExport::CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const { // prepare button bar @@ -2546,7 +2508,7 @@ OUString HtmlExport::CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const return aStr.makeStringAndClear(); } -/** export navigation graphics from button set */ +// export navigation graphics from button set bool HtmlExport::CreateBitmaps() { if(mnButtonThema != -1 && mpButtonSet.get() ) @@ -2567,9 +2529,8 @@ bool HtmlExport::CreateBitmaps() return true; } -// ===================================================================== + // creates the <body> tag, including the specified color attributes -// ===================================================================== OUString HtmlExport::CreateBodyTag() const { OUStringBuffer aStr( "<body" ); @@ -2598,9 +2559,8 @@ OUString HtmlExport::CreateBodyTag() const return aStr.makeStringAndClear(); } -// ===================================================================== + // creates a hyperlink -// ===================================================================== OUString HtmlExport::CreateLink( const OUString& aLink, const OUString& aText, const OUString& aTarget ) const @@ -2619,9 +2579,8 @@ OUString HtmlExport::CreateLink( const OUString& aLink, return aStr.makeStringAndClear(); } -// ===================================================================== + // creates a image tag -// ===================================================================== OUString HtmlExport::CreateImage( const OUString& aImage, const OUString& aAltText, sal_Int16 nWidth, sal_Int16 nHeight ) const @@ -2657,9 +2616,8 @@ OUString HtmlExport::CreateImage( const OUString& aImage, const OUString& aAltTe return aStr.makeStringAndClear(); } -// ===================================================================== + // create area for a circle; we expect pixel coordinates -// ===================================================================== OUString HtmlExport::ColorToHTMLString( Color aColor ) { static const char hex[] = "0123456789ABCDEF"; @@ -2674,9 +2632,8 @@ OUString HtmlExport::ColorToHTMLString( Color aColor ) return aStr.makeStringAndClear(); } -// ===================================================================== + // create area for a circle; we expect pixel coordinates -// ===================================================================== OUString HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX, sal_uLong nCenterY, @@ -2693,9 +2650,8 @@ OUString HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius, } -// ===================================================================== + // create area for a polygon; we expect pixel coordinates -// ===================================================================== OUString HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPolygon, Size aShift, double fFactor, const OUString& rHRef ) const { @@ -2730,9 +2686,8 @@ OUString HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPo return aStr.makeStringAndClear(); } -// ===================================================================== + // create area for a rectangle; we expect pixel coordinates -// ===================================================================== OUString HtmlExport::CreateHTMLRectArea( const Rectangle& rRect, const OUString& rHRef ) const { @@ -2747,9 +2702,8 @@ OUString HtmlExport::CreateHTMLRectArea( const Rectangle& rRect, return aStr; } -// ===================================================================== + // escapes a string for html -// ===================================================================== OUString HtmlExport::StringToHTMLString( const OUString& rString ) { SvMemoryStream aMemStm; @@ -2759,9 +2713,8 @@ OUString HtmlExport::StringToHTMLString( const OUString& rString ) return OUString( (char*)aMemStm.GetData(), nLength, RTL_TEXTENCODING_UTF8 ); } -// ===================================================================== + // creates a url for a specific page -// ===================================================================== OUString HtmlExport::CreatePageURL( sal_uInt16 nPgNum ) { if(mbFrames) @@ -2869,7 +2822,7 @@ bool HtmlExport::CreateASPScripts() static const char *PERL_Scripts[] = { "webcast.pl", "common.pl", "editpic.pl", "poll.pl", "savepic.pl", "show.pl" }; -/** creates and saves the PERL scripts for WebShow */ +// creates and saves the PERL scripts for WebShow bool HtmlExport::CreatePERLScripts() { for( sal_uInt16 n = 0; n < (sizeof( PERL_Scripts ) / sizeof(char *)); n++ ) @@ -2889,7 +2842,7 @@ bool HtmlExport::CreatePERLScripts() return true; } -/** creates a list with names of the saved images */ +// creates a list with names of the saved images bool HtmlExport::CreateImageFileList() { OUStringBuffer aStr; @@ -2910,7 +2863,7 @@ bool HtmlExport::CreateImageFileList() return bOk; } -/** creates a file with the actual page number */ +// creates a file with the actual page number bool HtmlExport::CreateImageNumberFile() { OUString aFileName("currpic.txt"); @@ -2935,7 +2888,7 @@ bool HtmlExport::CreateImageNumberFile() return nErr == 0; } -// ===================================================================== + OUString HtmlExport::InsertSound( const OUString& rSoundFile ) { @@ -2955,7 +2908,7 @@ OUString HtmlExport::InsertSound( const OUString& rSoundFile ) return aStr; } -// ===================================================================== + bool HtmlExport::CopyFile( const OUString& rSourceFile, const OUString& rDestFile ) { @@ -2973,7 +2926,7 @@ bool HtmlExport::CopyFile( const OUString& rSourceFile, const OUString& rDestFil } } -// ===================================================================== + bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess, OUString const & aFileName ) { @@ -3060,7 +3013,7 @@ OUString HtmlExport::GetButtonName( int nButton ) const return OUString::createFromAscii(pButtonNames[nButton]); } -// ===================================================================== + EasyFile::EasyFile() { pMedium = NULL; @@ -3068,14 +3021,14 @@ EasyFile::EasyFile() bOpen = false; } -// ===================================================================== + EasyFile::~EasyFile() { if( bOpen ) close(); } -// ===================================================================== + sal_uLong EasyFile::createStream( const OUString& rUrl, SvStream* &rpStr ) { sal_uLong nErr = 0; @@ -3115,7 +3068,7 @@ sal_uLong EasyFile::createStream( const OUString& rUrl, SvStream* &rpStr ) return nErr; } -// ===================================================================== + sal_uLong EasyFile::createFileName( const OUString& rURL, OUString& rFileName ) { sal_uLong nErr = 0; @@ -3140,7 +3093,7 @@ sal_uLong EasyFile::createFileName( const OUString& rURL, OUString& rFileName ) return nErr; } -// ===================================================================== + sal_uLong EasyFile::close() { sal_uLong nErr = 0; @@ -3165,17 +3118,15 @@ sal_uLong EasyFile::close() return nErr; } -// ===================================================================== -// This class helps reporting errors during file i/o -// ===================================================================== +// This class helps reporting errors during file i/o HtmlErrorContext::HtmlErrorContext(Window *_pWin) : ErrorContext(_pWin) { mnResId = 0; } -// ===================================================================== + bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr ) { @@ -3191,7 +3142,7 @@ bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr ) return true; } -// ===================================================================== + void HtmlErrorContext::SetContext( sal_uInt16 nResId, const OUString& rURL ) { @@ -3200,7 +3151,7 @@ void HtmlErrorContext::SetContext( sal_uInt16 nResId, const OUString& rURL ) maURL2 = ""; } -// ===================================================================== + void HtmlErrorContext::SetContext( sal_uInt16 nResId, const OUString& rURL1, const OUString& rURL2 ) { @@ -3209,7 +3160,4 @@ void HtmlErrorContext::SetContext( sal_uInt16 nResId, const OUString& rURL1, con maURL2 = rURL2; } -// ===================================================================== - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src index bf23d8503d50..66cfe65248a5 100644 --- a/sd/source/filter/html/pubdlg.src +++ b/sd/source/filter/html/pubdlg.src @@ -29,7 +29,7 @@ ModalDialog DLG_PUBLISHING Text [ en-US ] = "HTML Export" ; Moveable = TRUE ; - // Page 1, choose a design // + // Page 1, choose a design FixedLine PAGE1_TITEL { Pos = MAP_APPFONT ( 6 , 9 ) ; @@ -81,7 +81,7 @@ ModalDialog DLG_PUBLISHING }; - // Page 2, type of publishing // + // Page 2, type of publishing FixedLine PAGE2_TITEL { Pos = MAP_APPFONT ( 6, 9 ) ; @@ -161,7 +161,7 @@ ModalDialog DLG_PUBLISHING Border = TRUE; }; - // Special options for html // + // Special options for html FixedLine PAGE2_TITEL_HTML { Pos = MAP_APPFONT( 138, 9 ); @@ -192,7 +192,7 @@ ModalDialog DLG_PUBLISHING Text [ en-US ] = "Show notes"; }; - // Special options for kiosk // + // Special options for kiosk FixedLine PAGE2_TITEL_KIOSK { Pos = MAP_APPFONT( 138, 9 ); @@ -259,7 +259,7 @@ ModalDialog DLG_PUBLISHING Text [ en-US ] = "~Endless" ; }; - // Special options for WebCast // + // Special options for WebCast FixedLine PAGE2_TITEL_WEBCAST { Pos = MAP_APPFONT( 138, 9 ); @@ -331,9 +331,9 @@ ModalDialog DLG_PUBLISHING LEFT = TRUE; }; - // Page 3, Misc Options, Picture Format and Resolution // + // Page 3, Misc Options, Picture Format and Resolution - // Picture Format // + // Picture Format FixedLine PAGE3_TITEL_1 { Pos = MAP_APPFONT ( 6, 9 ) ; @@ -388,7 +388,7 @@ ModalDialog DLG_PUBLISHING Vert = TRUE; }; - // Resolution // + // Resolution FixedLine PAGE3_TITEL_2 { Pos = MAP_APPFONT( 138, 9 ); @@ -420,7 +420,7 @@ ModalDialog DLG_PUBLISHING Text [ en-US ] = "High resolution (~1024x768 pixels)"; }; - // Resolution // + // Resolution FixedLine PAGE3_TITEL_3 { Pos = MAP_APPFONT( 6, 85 ); @@ -444,7 +444,7 @@ ModalDialog DLG_PUBLISHING Text [ en-US ] = "Export ~hidden slides" ; }; - // Page 4, information for titel page // + // Page 4, information for titel page FixedLine PAGE4_TITEL_1 { Pos = MAP_APPFONT ( 6 , 9 ) ; @@ -536,7 +536,7 @@ ModalDialog DLG_PUBLISHING Text [ en-US ] = "Note: 'Created with %PRODUCTNAME'"; }; - // Page 5, Buttons // + // Page 5, Buttons FixedLine PAGE5_TITEL { Pos = MAP_APPFONT ( 6 , 9 ) ; @@ -560,7 +560,7 @@ ModalDialog DLG_PUBLISHING Size = MAP_APPFONT ( 243, 95 ) ; }; - // Page 6, colorscheme // + // Page 6, colorscheme FixedLine PAGE6_TITEL { Pos = MAP_APPFONT ( 6 , 9 ) ; diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 37ae2cb859bd..605d22ed4221 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -217,23 +217,17 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage } } -////////////////////////////////////////////////////////////////////////// -// -// Dtor -// -////////////////////////////////////////////////////////////////////////// + +// Dtor ImplSdPPTImport::~ImplSdPPTImport() { delete pStData; } -////////////////////////////////////////////////////////////////////////// -// -// Import -// -////////////////////////////////////////////////////////////////////////// + +// Import sal_Bool ImplSdPPTImport::Import() { if ( !bOk ) @@ -543,9 +537,9 @@ sal_Bool ImplSdPPTImport::Import() Scale( aVisAreaSize ); pDocShell->SetVisArea( Rectangle( Point(), aVisAreaSize ) ); - /////////////////////////////////////////////////////////// + // create master pages: - /////////////////////////////////////////////////////////// + SfxProgress* pStbMgr = new SfxProgress( pDocShell, SD_RESSTR( STR_POWERPOINT_IMPORT ), pMasterPages->size() + pSlidePages->size() + pNotePages->size() ); @@ -577,9 +571,9 @@ sal_Bool ImplSdPPTImport::Import() SfxStyleSheet* pSheet; if ( nMasterNum == 1 ) { - /////////////////// - // standardsheet // - /////////////////// + + // standardsheet + pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS ); if ( pSheet ) { @@ -604,10 +598,10 @@ sal_Bool ImplSdPPTImport::Import() aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, 0xffffffff ); } - /////////////////////////////////////////////////////////// + // create layoutstylesheets, set layoutname and stylesheet // (only on standard and not pages) - /////////////////////////////////////////////////////////// + OUString aLayoutName( SD_RESSTR( STR_LAYOUT_DEFAULT_NAME ) ); if ( nMasterNum > 2 ) { @@ -625,9 +619,9 @@ sal_Bool ImplSdPPTImport::Import() aLayoutName += SD_RESSTR( STR_LAYOUT_OUTLINE ); pPage->SetLayoutName( aLayoutName ); - ///////////////////// - // set stylesheets // - ///////////////////// + + // set stylesheets + if ( pPage->GetPageKind() == PK_STANDARD ) { sal_uInt32 nTitleInstance = TSS_TYPE_PAGETITLE; @@ -639,9 +633,9 @@ sal_Bool ImplSdPPTImport::Import() nTitleInstance = TSS_TYPE_TITLE; nOutlinerInstance = TSS_TYPE_SUBTITLE; } - ///////////////////// - // titelstylesheet // - ///////////////////// + + // titelstylesheet + pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ); if ( pSheet ) { @@ -652,9 +646,9 @@ sal_Bool ImplSdPPTImport::Import() aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, 0xffffffff, NULL ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, 0xffffffff ); } - //////////////////////// - // outlinerstylesheet // - //////////////////////// + + // outlinerstylesheet + sal_uInt16 nLevel; PPTParagraphObj* pParagraphs[ 9 ]; PPTParagraphObj* pPreviousPara = NULL; @@ -680,9 +674,9 @@ sal_Bool ImplSdPPTImport::Import() pParagraphs[ nLevel ] = NULL; } for ( nLevel = 0; nLevel < 9; delete pParagraphs[ nLevel++ ] ) ; - ///////////////////////// - // subtitle stylesheet // - ///////////////////////// + + // subtitle stylesheet + pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ); if ( pSheet ) { @@ -716,9 +710,9 @@ sal_Bool ImplSdPPTImport::Import() for ( i = 0; i < mpDoc->GetMasterPageCount() && ( (pMPage = (SdPage*)mpDoc->GetMasterPage( i )) != 0 ); i++ ) { SetPageNum( i, PPT_MASTERPAGE ); - ///////////////////////////////////////////// - // importing master page objects // - ///////////////////////////////////////////// + + // importing master page objects + PptSlidePersistList* pList = GetPageList( eAktPageKind ); PptSlidePersistEntry* pPersist = ( pList && ( nAktPageNum < pList->size() ) ) ? (*pList)[ nAktPageNum ] : NULL; @@ -835,9 +829,9 @@ sal_Bool ImplSdPPTImport::Import() rStCtrl.Seek( nFPosMerk ); ImportPageEffect( (SdPage*)pMPage, bNewAnimationsUsed ); - /////////////////////// - // background object // - /////////////////////// + + // background object + pObj = pMPage->GetObj( 0 ); if ( pObj && pObj->GetObjIdentifier() == OBJ_RECT ) { @@ -873,9 +867,9 @@ sal_Bool ImplSdPPTImport::Import() if( pStbMgr ) pStbMgr->SetState( nImportedPages++ ); } - //////////////////////////////////// - // importing slide pages // - //////////////////////////////////// + + // importing slide pages + { sal_uInt32 nFPosMerk = rStCtrl.Tell(); PptPageKind ePageKind = eAktPageKind; @@ -1044,17 +1038,17 @@ sal_Bool ImplSdPPTImport::Import() SetPageNum( nPageNum, ePageKind ); rStCtrl.Seek( nFPosMerk ); } - /////////////////////////////////////////////////////////////////// - // create handout and note pages // - /////////////////////////////////////////////////////////////////// + + // create handout and note pages + bOk = mpDoc->CreateMissingNotesAndHandoutPages(); if ( bOk ) { for ( i = 0; i < mpDoc->GetSdPageCount( PK_STANDARD ); i++ ) { - //////////////////// - // set AutoLayout // - //////////////////// + + // set AutoLayout + SetPageNum( i, PPT_SLIDEPAGE ); SdPage* pPage = mpDoc->GetSdPage( i, PK_STANDARD ); AutoLayout eAutoLayout = AUTOLAYOUT_NONE; @@ -1171,9 +1165,9 @@ sal_Bool ImplSdPPTImport::Import() pPage->SetAutoLayout( eAutoLayout, sal_False ); } } - ////////////////////////////////////////////////////////////// - // handout master page: auto layout // - ////////////////////////////////////////////////////////////// + + // handout master page: auto layout + SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT ); pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, sal_True, sal_True ); } @@ -1458,12 +1452,9 @@ void ImplSdPPTImport::SetHeaderFooterPageSettings( SdPage* pPage, const PptSlide } } -////////////////////////////////////////////////////////////////////////// -// -// Import of pages -// -////////////////////////////////////////////////////////////////////////// + +// Import of pages struct Ppt97AnimationStlSortHelper { bool operator()( const std::pair< SdrObject*, Ppt97AnimationPtr >& p1, const std::pair< SdrObject*, Ppt97AnimationPtr >& p2 ); @@ -1851,15 +1842,12 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat rStCtrl.Seek( nFilePosMerk ); } -////////////////////////////////////////////////////////////////////////// -// + + // import of sounds -// + // Not only the sounds are imported as string, they are also inserted to // the gallery if they are not already there. -// -/////////////////////////////////////////////////////////////////////////// - OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const { OUString aRetval; @@ -1964,12 +1952,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const return aRetval; } -////////////////////////////////////////////////////////////////////////// -// // media object import, the return value is the url to the media object -// -////////////////////////////////////////////////////////////////////////// - OUString ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const { OUString aRetVal; @@ -2034,12 +2017,9 @@ OUString ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const return aRetVal; } -////////////////////////////////////////////////////////////////////////// -// -// import of objects -// -////////////////////////////////////////////////////////////////////////// + +// import of objects void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiveInfoAtom* pIAtom, const OUString& aMacroName ) { // set local information into pInfo @@ -2717,9 +2697,7 @@ ImplSdPPTImport::ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Ref } -// - exported function - - - +// exported function extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium ) { diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 628158d5ba3e..d35a88d85c0f 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -100,11 +100,11 @@ const transition* transition::find( const OUString& rName ) return NULL; } -// ==================================================================== -// ==================================================================== + + SvStream& operator>>(SvStream& rIn, AnimationNode& rNode ) { @@ -120,7 +120,7 @@ SvStream& operator>>(SvStream& rIn, AnimationNode& rNode ) return rIn; } -// ==================================================================== + static bool convertMeasure( OUString& rString ) { @@ -158,7 +158,7 @@ static bool convertMeasure( OUString& rString ) } -// ==================================================================== + bool PropertySet::hasProperty( sal_Int32 nProperty ) const { @@ -176,7 +176,7 @@ Any PropertySet::getProperty( sal_Int32 nProperty ) const return Any(); } -// ==================================================================== + /** this adds an any to another any. if rNewValue is empty, rOldValue is returned. @@ -213,7 +213,7 @@ static Any addToSequence( const Any& rOldValue, const Any& rNewValue ) } } -// ==================================================================== + AnimationImporter::AnimationImporter( ImplSdPPTImport* pPPTImport, SvStream& rStCtrl ) : mpPPTImport( pPPTImport ), mrStCtrl( rStCtrl ) @@ -3171,7 +3171,7 @@ void AnimationImporter::importPropertySetContainer( const Atom* pAtom, PropertyS } } -// ==================================================================== + #ifdef DBG_ANIM_LOG void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bAppend ) diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index 894efb4b4c21..955588e00ede 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -53,7 +53,7 @@ PropEntry& PropEntry::operator=(const PropEntry& rPropEntry) return *this; } -// ----------------------------------------------------------------------- + void PropItem::Clear() { @@ -61,7 +61,7 @@ void PropItem::Clear() delete[] (sal_uInt8*)SwitchBuffer(); } -// ----------------------------------------------------------------------- + static sal_Int32 lcl_getMaxSafeStrLen(sal_uInt32 nSize) { @@ -173,7 +173,7 @@ sal_Bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, sal_Bool bAl return bRetValue; } -// ----------------------------------------------------------------------- + PropItem& PropItem::operator=( PropItem& rPropItem ) { @@ -191,7 +191,7 @@ PropItem& PropItem::operator=( PropItem& rPropItem ) return *this; } -// ----------------------------------------------------------------------- + Section::Section( const Section& rSection ) : mnTextEnc(rSection.mnTextEnc), @@ -201,7 +201,7 @@ Section::Section( const Section& rSection ) aFMTID[ i ] = rSection.aFMTID[ i ]; } -// ----------------------------------------------------------------------- + Section::Section( const sal_uInt8* pFMTID ) { @@ -210,7 +210,7 @@ Section::Section( const sal_uInt8* pFMTID ) aFMTID[ i ] = pFMTID[ i ]; } -// ----------------------------------------------------------------------- + sal_Bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) { @@ -235,7 +235,7 @@ sal_Bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) return sal_False; } -// ----------------------------------------------------------------------- + void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize ) { @@ -262,7 +262,7 @@ void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBu maEntries.push_back( new PropEntry( nId, pBuf, nBufSize, mnTextEnc ) ); } -// ----------------------------------------------------------------------- + sal_Bool Section::GetDictionary( Dictionary& rDict ) { @@ -319,7 +319,7 @@ sal_Bool Section::GetDictionary( Dictionary& rDict ) return bRetValue; } -// ----------------------------------------------------------------------- + void Section::Read( SvStorageStream *pStrm ) { @@ -507,7 +507,7 @@ void Section::Read( SvStorageStream *pStrm ) pStrm->Seek( nSecOfs + nSecSize ); } -// ----------------------------------------------------------------------- + Section& Section::operator=( const Section& rSection ) { @@ -520,7 +520,7 @@ Section& Section::operator=( const Section& rSection ) return *this; } -// ----------------------------------------------------------------------- + PropRead::PropRead( SvStorage& rStorage, const OUString& rName ) : mbStatus ( sal_False ), @@ -541,14 +541,14 @@ PropRead::PropRead( SvStorage& rStorage, const OUString& rName ) : } } -// ----------------------------------------------------------------------- + void PropRead::AddSection( Section& rSection ) { maSections.push_back( new Section( rSection ) ); } -// ----------------------------------------------------------------------- + const Section* PropRead::GetSection( const sal_uInt8* pFMTID ) { @@ -561,7 +561,7 @@ const Section* PropRead::GetSection( const sal_uInt8* pFMTID ) return NULL; } -// ----------------------------------------------------------------------- + void PropRead::Read() { @@ -598,7 +598,7 @@ void PropRead::Read() } } -// ----------------------------------------------------------------------- + PropRead& PropRead::operator=( const PropRead& rPropRead ) { diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index 153d7c0dd4e4..dcd4cf36830b 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -32,7 +32,7 @@ class HelpButton; namespace sd { -// -------------------------------------------------------------------- + class CustomAnimationCreateTabPage; class CustomAnimationPane; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 3c27cf8ba5ec..bb425853248a 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -99,7 +99,7 @@ extern void fillDurationComboBox( ListBox* pBox ); extern OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText = true ); extern OUString getPropertyName( sal_Int32 nPropertyType ); -// ==================================================================== + class PresetPropertyBox : public PropertySubControl { @@ -186,7 +186,7 @@ Control* PresetPropertyBox::getControl() return mpControl; } -// ==================================================================== + class ColorPropertyBox : public PropertySubControl { @@ -270,7 +270,7 @@ Control* ColorPropertyBox::getControl() return mpControl; } -// ==================================================================== + class FontPropertyBox : public PropertySubControl { @@ -355,7 +355,7 @@ Control* FontPropertyBox::getControl() return mpControl; } -// ==================================================================== + class DropdownMenuBox : public Edit { @@ -530,7 +530,7 @@ Control* CharHeightPropertyBox::getControl() return mpControl; } -// ==================================================================== + class TransparencyPropertyBox : public PropertySubControl { @@ -972,7 +972,7 @@ Control* ScalePropertyBox::getControl() return mpControl; } -// ==================================================================== + class FontStylePropertyBox : public PropertySubControl { @@ -1109,7 +1109,7 @@ Control* FontStylePropertyBox::getControl() return mpControl; } -// ==================================================================== + class CustomAnimationEffectTabPage : public TabPage { @@ -1211,9 +1211,9 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con OUString aPresetId; pSet->getPropertyValue( nHandlePresetId ) >>= aPresetId; - // + // property 1 - // + if( pSet->getPropertyState( nHandleProperty1Type ) != STLPropertyState_AMBIGUOUS ) { @@ -1242,9 +1242,9 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con mpFTProperty1->Enable( mpLBProperty1->IsEnabled() ); - // + // accelerate & deccelerate - // + if( pSet->getPropertyState( nHandleAccelerate ) == STLPropertyState_DIRECT ) { @@ -1260,9 +1260,9 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con } } - // + // init after effect controls - // + mpLBAfterEffect->SetSelectHdl( LINK( this, CustomAnimationEffectTabPage, implSelectHdl ) ); mpLBTextAnim->SetSelectHdl( LINK( this, CustomAnimationEffectTabPage, implSelectHdl ) ); @@ -2405,7 +2405,7 @@ void PropertyControl::Resize() ListBox::Resize(); } -// ==================================================================== + PropertySubControl::~PropertySubControl() { diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index 08568fc236d6..f7d350bfc7f0 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -32,7 +32,7 @@ class HelpButton; namespace sd { -// -------------------------------------------------------------------- + // property handles const sal_Int32 nHandleSound = 0; @@ -97,7 +97,7 @@ const sal_Int32 nPropertyTypeTransparency = 19; const sal_Int32 nPropertyTypeFontStyle = 20; const sal_Int32 nPropertyTypeScale = 21; -// -------------------------------------------------------------------- + class PropertySubControl { @@ -123,7 +123,7 @@ protected: sal_Int32 mnType; }; -// -------------------------------------------------------------------- + class PropertyControl : public ListBox { @@ -140,7 +140,7 @@ private: PropertySubControl* mpSubControl; }; -// -------------------------------------------------------------------- + class CustomAnimationDurationTabPage; class CustomAnimationEffectTabPage; diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index cca0944cadf5..16d8e9e5cd82 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -198,7 +198,7 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true ) return aDescription; } -// ==================================================================== + class CustomAnimationListEntryItem : public SvLBoxString { @@ -316,7 +316,7 @@ void CustomAnimationListEntryItem::Clone( SvLBoxItem* ) { } -// ==================================================================== + class CustomAnimationListEntry : public SvTreeListEntry { @@ -350,7 +350,7 @@ CustomAnimationListEntry::~CustomAnimationListEntry() { } -// ==================================================================== + class CustomAnimationTriggerEntryItem : public SvLBoxString { @@ -454,7 +454,7 @@ void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* ) { } -// ==================================================================== + CustomAnimationList::CustomAnimationList( ::Window* pParent ) : SvTreeListBox( pParent, WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ) diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index f093d0afcb2e..18f0b90e17d3 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2274,7 +2274,7 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot } } -// ==================================================================== + ::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame ) diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index f18fd643d051..54564b5bb109 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -58,7 +58,7 @@ class ViewShellBase; typedef std::vector< rtl::Reference< MotionPathTag > > MotionPathTagVector; -// -------------------------------------------------------------------- + class CustomAnimationPane : public PanelLayout, public ICustomAnimationListController { diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index fc8a1521ff62..792e1f9efb25 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -60,11 +60,9 @@ using ::com::sun::star::uno::RuntimeException; using ::sd::framework::FrameworkHelper; -// ____________________________ -// -// ::sd::impl::TransitionEffect -// ____________________________ + +// ::sd::impl::TransitionEffect namespace sd { namespace impl @@ -232,11 +230,9 @@ struct TransitionEffect } // namespace impl } // namespace sd -// ______________________ -// -// Local Helper Functions -// ______________________ + +// Local Helper Functions namespace { @@ -421,11 +417,9 @@ void lcl_FillSoundListBox( namespace sd { -// ___________________ -// -// SlideTransitionPane -// ___________________ + +// SlideTransitionPane SlideTransitionPane::SlideTransitionPane( ::Window * pParent, ViewShellBase & rBase, @@ -522,8 +516,6 @@ void SlideTransitionPane::UpdateLook (void) } - - void SlideTransitionPane::onSelectionChanged() { updateControls(); @@ -1046,7 +1038,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected) sal_uInt16 nPos = mpLB_SOUND->GetSelectEntryPos(); if( nPos == 2 ) { - // other sound ... + // other sound... openSoundFileDialog(); } } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 080b33cc41eb..c65f3050d2a9 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -354,7 +354,7 @@ Pointer SdPathHdl::GetSdrDragPointer() const return Pointer( eStyle ); } -// ==================================================================== + MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, const CustomAnimationEffectPtr& pEffect ) : SmartTag( rView ) diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 876b8f1aac40..71d12c73e308 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -1088,7 +1088,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation } } -// ==================================================================== + Color AnnotationManagerImpl::GetColor(sal_uInt16 aAuthorIndex) { @@ -1203,7 +1203,7 @@ SdPage* AnnotationManagerImpl::GetCurrentPage() return mrBase.GetMainViewShell()->getCurrentPage(); } -// ==================================================================== + AnnotationManager::AnnotationManager( ViewShellBase& rViewShellBase ) : mxImpl( new AnnotationManagerImpl( rViewShellBase ) ) diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index aff8b343f247..6f5ce349571c 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -289,7 +289,7 @@ Pointer AnnotationHdl::GetSdrDragPointer() const return Pointer( eStyle ); } -// ==================================================================== + AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const Reference< XAnnotation >& xAnnotation, Color& rColor, int nIndex, const Font& rFont ) : SmartTag( rView ) diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src index 2b2cbdca3aec..0cb12a0e64de 100644 --- a/sd/source/ui/app/popup2_tmpl.src +++ b/sd/source/ui/app/popup2_tmpl.src @@ -28,9 +28,8 @@ -// + // TEXTOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_TEXTOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -54,11 +53,11 @@ MN_DISTRIBUTE MNSUB_CONVERT - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -70,9 +69,8 @@ }; }; -// + // OUTLINETEXTOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_OUTLINETEXTOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -97,11 +95,11 @@ MN_DISTRIBUTE MNSUB_CONVERT - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -113,9 +111,8 @@ }; }; -// + // GEOMOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_GEOMOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -141,11 +138,11 @@ MN_LEAVE_GROUP MN_DISMANTLE - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -157,9 +154,8 @@ }; }; -// + // Customshape POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_CUSTOMSHAPE_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -185,11 +181,11 @@ MN_LEAVE_GROUP MN_DISMANTLE - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -203,9 +199,8 @@ }; }; -// + // 3DOSCENE_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_3DSCENE_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -226,11 +221,11 @@ MN_ENTER_GROUP MN_3D_WIN - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -242,9 +237,8 @@ }; }; -// + // 3DOSCENE2_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_3DSCENE2_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -266,11 +260,11 @@ MN_LEAVE_GROUP MN_3D_WIN - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -282,9 +276,8 @@ }; }; -// + // 3DOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_3DOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -305,11 +298,11 @@ MN_LEAVE_GROUP MN_3D_WIN - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -321,9 +314,8 @@ }; }; -// + // GROUPOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_GROUPOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -345,11 +337,11 @@ MNSUB_MIRROR MNSUB_CONVERT - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_UNGROUP @@ -362,9 +354,8 @@ }; }; -// + // LINEOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_LINEOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -388,11 +379,11 @@ MN_LEAVE_GROUP MN_DISMANTLE - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -404,9 +395,8 @@ }; }; -// + // EDGEOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_EDGEOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -432,11 +422,11 @@ MN_LEAVE_GROUP MN_DISMANTLE - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -448,9 +438,8 @@ }; }; -// + // MEASUREOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_MEASUREOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -476,11 +465,11 @@ MN_LEAVE_GROUP MN_DISMANTLE - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -493,9 +482,8 @@ }; -// + // POLYLINEOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_POLYLINEOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -521,11 +509,11 @@ MN_DISMANTLE MN_BREAK - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -537,9 +525,8 @@ }; }; -// + // NOSEL_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_NOSEL_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -568,9 +555,8 @@ }; }; -// + // MULTISELECTION_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_MULTISELECTION_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -609,9 +595,8 @@ }; }; -// + // GRAPHIC_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_GRAPHIC_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -636,11 +621,11 @@ MNSUB_CONVERT MN_BREAK - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -657,9 +642,7 @@ }; }; -// // OLE2_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_OLE2_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -671,30 +654,30 @@ MN_TRANSFORM MN_ORIGINAL_SIZE - //-#i118485# Added support for Line,Area and Text + // #i118485# Added support for Line,Area and Text MN_LINE MN_AREA SEPARATOR MN_CHAR_PARAGRAPH SEPARATOR - //-#i118485#---------------------- + // #i118485# MN_OBJECT_ALIGN MN_POSITION MN_DISTRIBUTE - //-#i118485# Added support for conversions + // #i118485# Added support for conversions MNSUB_MIRROR MNSUB_CONVERT - //-#i118485#---------------------- + // #i118485# MN_BREAK - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -704,10 +687,7 @@ }; }; - -// // PAGETAB_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_PAGETAB_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -728,9 +708,8 @@ }; }; -// + // Media_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_MEDIA_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -746,11 +725,11 @@ MN_DISTRIBUTE MN_BREAK - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -760,9 +739,8 @@ }; }; -// + // Table shape context menu -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_TABLE_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index cc489966cc42..6596db03f0ca 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -336,7 +336,7 @@ Bitmap BMP_WAIT_ICON File = "waiticon.bmp"; }; -// ---------------------------------------- + Bitmap BMP_FADE_EFFECT_INDICATOR { diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src index 80351507509b..13e718a0a1d5 100644 --- a/sd/source/ui/app/tbxids_tmpl.src +++ b/sd/source/ui/app/tbxids_tmpl.src @@ -21,9 +21,8 @@ #define _TBXIDS_SRC #define SEPARATOR ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; #define TBI(x) ToolBoxItem { x }; - // + // Toolbox bar - // #define TBI_OBJECT_SELECT \ ToolBoxItem\ {\ @@ -260,9 +259,9 @@ Hide = TRUE; \ }; - // + // Object bar - // + #define TBI_FORMAT_BEZIER_EDIT_RC \ ToolBoxItem\ {\ @@ -377,9 +376,9 @@ - // + // Option bar - // + #define TBI_FORMAT_BEZIER_EDIT \ ToolBoxItem\ {\ diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src index 8e898fb8291a..aaed1afd3a6f 100644 --- a/sd/source/ui/app/toolbox2_tmpl.src +++ b/sd/source/ui/app/toolbox2_tmpl.src @@ -23,9 +23,8 @@ #include <svx/svxids.hrc> #include <svx/globlmn.hrc> #endif - // + // toolbox bar - // ToolBox SD_TOOLBOX { HelpId = HID_SD_DRAW_TOOLBOX ; @@ -127,9 +126,8 @@ ToolBox SD_TOOLBOX }; }; }; - // + // object bar - // #if SD_TOOLBOX == RID_DRAW_TOOLBOX ToolBox RID_DRAW_OBJ_TOOLBOX #elif SD_TOOLBOX == RID_GRAPHIC_TOOLBOX @@ -171,9 +169,8 @@ ToolBox RID_GRAPHIC_OBJ_TOOLBOX TBI_IMAGEMAP }; }; - // - // option bar - // + +// option bar #if SD_TOOLBOX == RID_DRAW_TOOLBOX ToolBox RID_DRAW_OPTIONS_TOOLBOX #elif SD_TOOLBOX == RID_GRAPHIC_TOOLBOX diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 86de6d3f04b4..605fd24f413e 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -309,7 +309,7 @@ IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl ) return 0; } -// ==================================================================== + OUString SlideLayoutController_getImplementationName() { @@ -357,9 +357,9 @@ Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Ref new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:InsertPage" , true ) ); } -//======================================================================== + // class SlideLayoutController -//======================================================================== + SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentContext >& rxContext, const OUString& sCommandURL, bool bInsertPage ) : svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), sCommandURL ) diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index eda2615eaa3a..c3147e4aeb72 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -362,10 +362,10 @@ void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry ) // long nExtraHeight = 0; -// + // if ( pEntry->m_bHasButtons ) // nExtraHeight = m_nExtraHeight; -// + // DrawText( Rectangle( aPos.X(), aPos.Y(), rRect.Right(), rRect.Bottom() - nExtraHeight ), // sDescription, TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK ); } diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index 9c5ca8f025fd..1c39e3b6ba5e 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -43,9 +43,8 @@ namespace sd { #define ICON_OFFSET 72 #define RIGHT_ICON_OFFSET 5 #define SPACE_BETWEEN 3 -//------------------------------------------------------------------------------ -// struct ClientBoxEntry -//------------------------------------------------------------------------------ + +// struct ClientBoxEntry struct ClientBoxEntry; struct ClientInfo; @@ -62,13 +61,11 @@ struct ClientBoxEntry }; -//------------------------------------------------------------------------------ -// class ExtensionBox_Impl -//------------------------------------------------------------------------------ +// class ExtensionBox_Impl class ClientBox; -//------------------------------------------------------------------------------ + class ClientRemovedListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener > { ClientBox *m_pParent; @@ -78,14 +75,12 @@ public: ClientRemovedListener( ClientBox *pParent ) { m_pParent = pParent; } ~ClientRemovedListener(); - //=================================================================================== + // XEventListener virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) throw (::com::sun::star::uno::RuntimeException); }; - -//------------------------------------------------------------------------------ class ClientBox: public Control { @@ -130,7 +125,7 @@ class ClientBox: bool HandleCursorKey( sal_uInt16 nKeyCode ); void DeleteRemoved(); - //----------------- + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar* ); //Index starts with 1. @@ -162,7 +157,7 @@ public: void RecalcAll(); void RemoveUnlocked(); - //----------------- + void selectEntry( const long nPos ); long addEntry( ClientInfo* pClientInfo ); void updateEntry( const ClientInfo* rPackageInfo ); diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 049924b63e7b..19a6bac34d49 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -30,12 +30,7 @@ #include <vcl/msgbox.hxx> #include "svtools/treelistentry.hxx" - -///////////////////// -// SdCustomShowDlg // -///////////////////// - - +// SdCustomShowDlg SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ) : ModalDialog ( pWindow, "CustomSlideShows", "modules/simpress/ui/customslideshows.ui" ), @@ -252,9 +247,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) return( 0L ); } -/** - * StartShow-Hdl - */ +// StartShow-Hdl IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl) { EndDialog( RET_YES ); @@ -262,21 +255,13 @@ IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl) return 0; } -/** - * CheckState - */ +// CheckState sal_Bool SdCustomShowDlg::IsCustomShow() const { return( m_pCbxUseCustomShow->IsEnabled() && m_pCbxUseCustomShow->IsChecked() ); } - - -/////////////////////////// -// SdDefineCustomShowDlg // -/////////////////////////// - - +// SdDefineCustomShowDlg SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ) : ModalDialog ( pWindow, "DefineCustomSlideShow", "modules/simpress/ui/definecustomslideshow.ui" ), @@ -321,7 +306,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, OUString aStr( pPage->GetName() ); m_pLbPages->InsertEntry( aStr ); } - //aLbPages.SelectEntryPos( 0 ); + // aLbPages.SelectEntryPos( 0 ); if( rpCustomShow ) { @@ -355,9 +340,7 @@ SdDefineCustomShowDlg::~SdDefineCustomShowDlg() { } -/** - * CheckState - */ +// CheckState void SdDefineCustomShowDlg::CheckState() { sal_Bool bPages = m_pLbPages->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; @@ -370,9 +353,7 @@ void SdDefineCustomShowDlg::CheckState() m_pBtnRemove->Enable( bCSPages ); } -/** - * ButtonHdl() - */ +// ButtonHdl() IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) { if( p == m_pBtnAdd ) @@ -404,13 +385,13 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) } else if( p == m_pBtnRemove ) { - //sal_uInt16 nPos = aLbCustomPages.GetSelectEntryPos(); + // sal_uInt16 nPos = aLbCustomPages.GetSelectEntryPos(); SvTreeListEntry* pEntry = m_pLbCustomPages->FirstSelected(); if( pEntry ) { sal_uLong nPos = m_pLbCustomPages->GetModel()->GetAbsPos( pEntry ); - //rpCustomShow->Remove( nPos ); - //aLbCustomPages.RemoveEntry( nPos ); + // rpCustomShow->Remove( nPos ); + // aLbCustomPages.RemoveEntry( nPos ); m_pLbCustomPages->GetModel()->Remove( m_pLbCustomPages->GetModel()->GetEntryAtAbsPos( nPos ) ); bModified = sal_True; @@ -418,7 +399,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) } else if( p == m_pEdtName ) { - //rpCustomShow->SetName( aEdtName.GetText() ); + // rpCustomShow->SetName( aEdtName.GetText() ); bModified = sal_True; } @@ -483,9 +464,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() } } -/** - * OK-Hdl - */ +// OK-Hdl IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl) { // check name... diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 553553994ee8..b90d2de7e6c7 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -37,11 +37,7 @@ using namespace ::com::sun::star; SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaPages, SfxUInt16Item ) - -//======================================================================== // SdPagesField -//======================================================================== - SdPagesField::SdPagesField( Window* pParent, const uno::Reference< frame::XFrame >& rFrame, WinBits nBits ) : @@ -113,13 +109,13 @@ SdTbxCtlDiaPages::SdTbxCtlDiaPages( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& { } -//======================================================================== + SdTbxCtlDiaPages::~SdTbxCtlDiaPages() { } -//======================================================================== + void SdTbxCtlDiaPages::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) @@ -147,7 +143,7 @@ void SdTbxCtlDiaPages::StateChanged( sal_uInt16, } } -//======================================================================== + Window* SdTbxCtlDiaPages::CreateItemWindow( Window* pParent ) { diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index ef79fdb83a6b..8b7df0406d26 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -85,8 +85,8 @@ void InterpolateFixedBitmap( FixedBitmap * pBitmap ) } -// ==================================================================== -// ==================================================================== + + const char* PageHelpIds[] = { @@ -97,7 +97,7 @@ const char* PageHelpIds[] = HID_SD_AUTOPILOT_PAGE5 }; -// ==================================================================== + class PasswordEntry { @@ -106,7 +106,7 @@ public: OUString maPath; }; -// ==================================================================== + /** A simple wrapper that looks like a PushButton and is used to force the broadcasting of focus events primarly for accessibility tools. @@ -132,7 +132,7 @@ private: -// ==================================================================== + class AssistentDlgImpl : public SfxListener { @@ -346,7 +346,7 @@ public: -// ==================================================================== + AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, sal_Bool bAutoPilot ) : mpTemplateRegion(NULL), @@ -1818,7 +1818,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) } -////////////////////////////////////////////// + AssistentDlg::AssistentDlg(Window* pParent, sal_Bool bAutoPilot) : ModalDialog(pParent,SdResId(DLG_ASS)) diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 3756d86754e3..a6d4f06f8167 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -42,9 +42,8 @@ #include "drawdoc.hxx" #include "ViewShell.hxx" -/////////////////////////////////////////////////////////////////////// + // preview control for presentation layout -/////////////////////////////////////////////////////////////////////// #include <vcl/ctrl.hxx> #include <tools/color.hxx> #include <i18nlangtag/mslangid.hxx> @@ -88,9 +87,9 @@ public: } -/////////////////////////////////////////////////////////////////////// + // tab page for slide & header'n'notes -/////////////////////////////////////////////////////////////////////// + namespace sd { @@ -173,7 +172,7 @@ public: } -/////////////////////////////////////////////////////////////////////// + using namespace ::sd; @@ -426,7 +425,7 @@ void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const H pPage->setHeaderFooterSettings( rNewSettings ); } -/////////////////////////////////////////////////////////////////////// + HeaderFooterTabPage::HeaderFooterTabPage( HeaderFooterDialog* pDialog, ::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) : TabPage( pWindow, "HeaderFooterTab", "modules/simpress/ui/headerfootertab.ui" ), @@ -731,7 +730,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo } } -/////////////////////////////////////////////////////////////////////// + PresLayoutPreview::PresLayoutPreview( ::Window* pParent ) : Control(pParent) diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 1deda09f7243..7eef3b88557f 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -348,7 +348,7 @@ void Configuration::ThrowIfDisposed (void) const -//============================================================================= + bool AreConfigurationsEquivalent ( const Reference<XConfiguration>& rxConfiguration1, diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index d9fccbab2d30..75388099f7f3 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -72,7 +72,7 @@ public: throw (cssu::RuntimeException); - //------------------------------------------------------------------------- + DECL_LINK(WindowEventHandler, VclWindowEvent*); diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 83caf19e1809..5a91b7428fc7 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -176,7 +176,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR, 0); - /////////////////////////////////////////////////////////////////////// + // Retrieve additional data for dialog SvxShadowItem aShadowItem(SID_ATTR_BORDER_SHADOW); @@ -188,7 +188,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) mpDoc->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) ); - /////////////////////////////////////////////////////////////////////// + // Retrieve page-data for dialog SvxPageItem aPageItem( SID_ATTR_PAGE ); @@ -226,7 +226,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT2, bFullSize ) ); - /////////////////////////////////////////////////////////////////////// + // Merge ItemSet for dialog const sal_uInt16* pPtr = aNewAttr.GetRanges(); @@ -481,7 +481,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( !pArgs ) return; - /////////////////////////////////////////////////////////////////////////// + // Set new page-attributes PageKind ePageKind = mpDrawViewShell->GetPageKind(); const SfxPoolItem* pPoolItem; @@ -574,13 +574,13 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( bSetPageSizeAndBorder || !mbMasterPage ) mpDrawViewShell->SetPageSizeAndBorder(ePageKind, aNewSize, nLeft, nRight, nUpper, nLower, bScaleAll, eOrientation, nPaperBin, bFullSize ); - //////////////////////////////////////////////////////////////////////////////// - // + + // if bMasterPage==sal_False then create a background-object for this page with the // properties set in the dialog before, but if mbPageBckgrdDeleted==sal_True then // the background of this page was set to invisible, so it would be a mistake // to create a new background-object for this page ! - // + if( mbDisplayBackgroundTabPage ) { diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 5f151f2cccd2..f232be019230 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -807,7 +807,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) // is used, then ImpSetAttributesForNewTextObject is called and then the object is // deleted again since not the minimum drag distance was travelled. Then, a new // klick text object is created and thus all that stuff needs to be set again here. - // + // Before using the new object the vertical writing mode // needs to be set. This is done here at the OutlinerParaObject // directly to not mirror the layout text items involved. These items will be set diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index e5cbc4f0d2e8..e58cdc5b65ec 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -26,7 +26,7 @@ namespace sd { -// ==================================================================== + SmartTag::SmartTag( ::sd::View& rView ) : mrView( rView ) @@ -143,7 +143,7 @@ void SmartTag::CheckPossibilities() { } -// ==================================================================== + SmartTagSet::SmartTagSet( View& rView ) : mrView( rView ) @@ -425,7 +425,7 @@ void SmartTagSet::CheckPossibilities() mxSelectedTag->CheckPossibilities(); } -// ==================================================================== + SmartHdl::SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Point& rPnt, SdrHdlKind eNewKind /*=HDL_MOVE*/ ) : SdrHdl( rPnt, eNewKind ) diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index d4e46fc0aced..c899ea24a5dd 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -44,10 +44,8 @@ namespace sd { class FrameView; class ViewShell; -// ------------------ -// - DrawDocShell - -// ------------------ +// DrawDocShell class SD_DLLPUBLIC DrawDocShell : public SfxObjectShell { public: diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 239b8fa4c70a..d8ce41627f3f 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -55,10 +55,8 @@ class ViewShell; class Window; class ViewClipboard; -// ------------------- -// - SdViewRedrawRec - -// ------------------- +// SdViewRedrawRec struct SdViewRedrawRec { OutputDevice* mpOut; diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 7bbf8a6360a9..5dbbbc77a5e9 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -132,7 +132,7 @@ public: virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) throw (com::sun::star::uno::RuntimeException); - // ------------------------------------------------------------------------ + /** The returned value is calculated as the difference between the total height of the control and the heigh of its first tab page. diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index fc156511a50d..c740269478d3 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -45,7 +45,7 @@ namespace sd { class AnimationControllerItem; class View; -//------------------------------------------------------------------------ + enum BitmapAdjustment { @@ -60,7 +60,7 @@ enum BitmapAdjustment BA_RIGHT_DOWN }; -//------------------------------------------------------------------------ + class SdDisplay : public Control { @@ -80,7 +80,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; -//------------------------------------------------------------------------ + class AnimationWindow : public SfxDockingWindow { @@ -147,7 +147,7 @@ private: AnimationControllerItem* pControllerItem; ScopeLock maPlayLock; - //------------------------------------ + DECL_LINK( ClickFirstHdl, void * ); DECL_LINK( ClickStopHdl, void * ); diff --git a/sd/source/ui/inc/annotationmanager.hxx b/sd/source/ui/inc/annotationmanager.hxx index a5f5d00fe432..4527b146f4aa 100644 --- a/sd/source/ui/inc/annotationmanager.hxx +++ b/sd/source/ui/inc/annotationmanager.hxx @@ -30,7 +30,7 @@ namespace sd class ViewShellBase; class AnnotationManagerImpl; -// -------------------------------------------------------------------- + class AnnotationManager { diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index de1a1917f188..4f70008ead40 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -32,7 +32,7 @@ class SdDrawDocument; class SdCustomShow; class SdCustomShowList; -//------------------------------------------------------------------------ + class SdCustomShowDlg : public ModalDialog { @@ -66,7 +66,7 @@ public: }; -//------------------------------------------------------------------------ + class SdDefineCustomShowDlg : public ModalDialog { diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 35ae462b1134..1a7734785b57 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -30,7 +30,7 @@ #include <sfx2/tbxctrl.hxx> #include <com/sun/star/frame/XFrame.hpp> -//======================================================================== + // SdPagesField: class SdPagesField : public SvxMetricField @@ -49,9 +49,9 @@ public: void UpdatePagesField( const SfxUInt16Item* pItem ); }; -//======================================================================== + // SdTbxCtlDiaPages: -//======================================================================== + class SdTbxCtlDiaPages : public SfxToolBoxControl { diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index bfbc62d2491d..adc8e0efb9e4 100644 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -27,10 +27,8 @@ #include <vcl/dialog.hxx> #include "sdresid.hxx" -// -------------------- -// - SdInsertPasteDlg - -// -------------------- +// SdInsertPasteDlg class SD_DLLPUBLIC SdInsertPasteDlg : public ModalDialog { private: diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index ae2f68aa770e..70b6a89c6981 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -26,7 +26,7 @@ class SdDrawDocument; -//------------------------------------------------------------------------ + class SdInsertPagesObjsDlg : public ModalDialog { diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 2a9b910e69cd..582cf3cf1fe5 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -55,7 +55,7 @@ class Menu; class SdNavigatorControllerItem; class SdPageNameControllerItem; -//------------------------------------------------------------------------ + class NavDocInfo { @@ -75,7 +75,7 @@ private: ::sd::DrawDocShell* mpDocShell; }; -//------------------------------------------------------------------------ + class SdNavigatorWin : public Window diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc index 77d84a892af8..1648902e8ced 100644 --- a/sd/source/ui/inc/pubdlg.hrc +++ b/sd/source/ui/inc/pubdlg.hrc @@ -25,7 +25,7 @@ #define PAGE1_DEL_DESIGN 6 #define PAGE1_DESC 7 -////////////////////////////// + #define PAGE2_TITEL 21 #define PAGE2_STANDARD 22 @@ -60,7 +60,7 @@ #define PAGE2_CGI 48 #define PAGE2_VERT 49 -////////////////////////////// + #define PAGE3_TITEL_1 51 #define PAGE3_PNG 51 @@ -77,7 +77,7 @@ #define PAGE3_VERT 62 #define PAGE3_HIDDEN_SLIDES 63 -////////////////////////////// + #define PAGE4_TITEL_1 66 #define PAGE4_AUTHOR_TXT 67 @@ -91,13 +91,13 @@ #define PAGE4_DOWNLOAD 75 #define PAGE4_CREATED 76 -////////////////////////////// + #define PAGE5_TITEL 81 #define PAGE5_TEXTONLY 82 #define PAGE5_BUTTONS 83 -////////////////////////////// + #define PAGE6_TITEL 101 #define PAGE6_DEFAULT 102 @@ -110,7 +110,7 @@ #define PAGE6_DOCCOLORS 109 #define PAGE6_PREVIEW 111 -////////////////////////////// + #define BUT_LAST 200 #define BUT_NEXT 201 @@ -119,7 +119,7 @@ #define BUT_HELP 204 #define BOTTOM_LINE 205 -////////////////////////////// + #define DLG_PUBLISHING 739 diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 40c624e1c8f9..a36bf44dbce9 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -25,10 +25,8 @@ #include <sfx2/objsh.hxx> #include <svl/lstner.hxx> -// ------------------ -// - SdTransferable - -// ------------------ +// SdTransferable class SdDrawDocument; class SdrObject; class INetBookmark; diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index 6cb23e42c9e4..75401647ea19 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -21,15 +21,14 @@ #define INCLUDED_SD_SOURCE_UI_INC_TASKPANE_PANELID_HXX -//...................................................................................................................... + namespace sd { namespace toolpanel { -//...................................................................................................................... - //================================================================================================================== - //= PanelId - //================================================================================================================== - /** List of top level panels that can be shown in the task pane. + + + /** PanelId + List of top level panels that can be shown in the task pane. */ enum PanelId { @@ -44,9 +43,8 @@ namespace sd { namespace toolpanel PanelId GetStandardPanelId( const OUString& i_rTaskPanelResourceURL ); -//...................................................................................................................... + } } // namespace sd::toolpanel -//...................................................................................................................... #endif // INCLUDED_SD_SOURCE_UI_INC_TASKPANE_PANELID_HXX diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 17675fd3f7a4..5f1e436e3848 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -80,7 +80,7 @@ private: OUString aLastFile; ::std::vector< long > aVerbVector; - //------------------------------------ + DECL_LINK( ClickSearchHdl, void * ); DECL_LINK( ClickActionHdl, void * ); diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index edcae533081d..65b8471cd10f 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -26,10 +26,8 @@ class SdDrawDocument; class SdPage; class SfxItemSet; -// ----------------------------- -// - SdBackgroundObjUndoAction - -// ----------------------------- +// SdBackgroundObjUndoAction class SdBackgroundObjUndoAction : public SdUndoAction { private: diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 4f3b069f2bee..b53d7fd9d6dc 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -50,8 +50,7 @@ using namespace ::com::sun::star::lang; namespace sd { namespace presenter { -//===== Service =============================================================== - +// Service Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance ( const Reference<XComponentContext>& rxContext) { @@ -78,8 +77,7 @@ Sequence<OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (v -//===== PresenterTextView::Implementation ===================================== - +// PresenterTextView::Implementation class PresenterTextView::Implementation { public: @@ -129,8 +127,7 @@ private: -//===== PresenterTextView ===================================================== - +// PresenterTextView PresenterTextView::PresenterTextView (const Reference<XComponentContext>& rxContext) : PresenterTextViewInterfaceBase(), mpImplementation(new Implementation()) @@ -156,8 +153,7 @@ void SAL_CALL PresenterTextView::disposing (void) -//----- XInitialization ------------------------------------------------------- - +// XInitialization void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments) throw (Exception, RuntimeException) { @@ -286,8 +282,7 @@ void PresenterTextView::ThrowIfDisposed (void) -//===== PresenterTextView::Implementation ===================================== - +// PresenterTextView::Implementation PresenterTextView::Implementation::Implementation (void) : msTextPropertyName("Text"), msBitmapPropertyName("Bitmap"), @@ -343,9 +338,9 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) EditEngine* pEditEngine = mpEditEngine; if (pEditEngine == NULL) { - // + // set fonts to be used - // + SvtLinguOptions aOpt; SvtLinguConfig().GetOptions( aOpt ); diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index e6ff9aa23194..7ee3e32b06d1 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -178,7 +178,7 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber ) // OUStringBuffer aStrBuffer; // ::sax::Converter::encodeBase64( aStrBuffer, aTemp ); -// + // OString aNotes = OUStringToOString( // aStrBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ); diff --git a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h index defa6b7eb634..612b6eeeda2f 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h @@ -15,7 +15,7 @@ * limitations under the License. */ -//--------------------------------------------------------------------------------------------------------------------------- + /*! @header CommonServices Common Services for Mac OS X, Linux, Palm, VxWorks, Windows, and Windows CE. @@ -32,15 +32,12 @@ extern "C" { #pragma mark == Target == #endif -//=========================================================================================================================== -// Target -//=========================================================================================================================== +// Target // Macintosh - #if ( !defined( TARGET_OS_MAC ) ) #if ( ( macintosh || __MACH__ ) && !KERNEL ) -// ConditionalMacros.h in CoreServices will define this TARGET_* flag. + // ConditionalMacros.h in CoreServices will define this TARGET_* flag. #else #define TARGET_OS_MAC 0 #endif @@ -55,7 +52,6 @@ extern "C" { #endif // FreeBSD - #if ( !defined( TARGET_OS_FREEBSD ) ) #if ( defined( __FreeBSD__ ) ) #define TARGET_OS_FREEBSD 1 @@ -65,7 +61,6 @@ extern "C" { #endif // Linux - #if ( !defined( TARGET_OS_LINUX ) ) #if ( defined( __linux__ ) ) #define TARGET_OS_LINUX 1 @@ -75,7 +70,6 @@ extern "C" { #endif // Solaris - #if ( !defined( TARGET_OS_SOLARIS ) ) #if ( defined(solaris) || (defined(__SVR4) && defined(sun)) ) #define TARGET_OS_SOLARIS 1 @@ -85,7 +79,6 @@ extern "C" { #endif // Palm - #if ( !defined( TARGET_OS_PALM ) ) #if ( defined( __PALMOS_TRAPS__ ) || defined( __PALMOS_ARMLET__ ) ) #define TARGET_OS_PALM 1 @@ -95,7 +88,6 @@ extern "C" { #endif // VxWorks - #if ( !defined( TARGET_OS_VXWORKS ) ) // No predefined macro for VxWorks so just assume VxWorks if nothing else is set. @@ -108,7 +100,6 @@ extern "C" { #endif // Windows - #if ( !defined( TARGET_OS_WIN32 ) ) #if ( macintosh || __MACH__ ) // ConditionalMacros.h in CoreServices will define this TARGET_* flag. @@ -122,7 +113,6 @@ extern "C" { #endif // Windows CE - #if ( !defined( TARGET_OS_WINDOWS_CE ) ) #if ( defined( _WIN32_WCE ) ) #define TARGET_OS_WINDOWS_CE 1 @@ -135,10 +125,8 @@ extern "C" { #pragma mark == Includes == #endif -//=========================================================================================================================== -// Includes -//=========================================================================================================================== +// Includes #if ( !KERNEL ) #if defined(WIN32) && !defined(_WSPIAPI_COUNTOF) #define _WSPIAPI_COUNTOF(_Array) (sizeof(_Array) / sizeof(_Array[0])) @@ -161,7 +149,6 @@ extern "C" { #if ( __MACH__ ) // Mac OS X - #include <sys/types.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -174,7 +161,6 @@ extern "C" { #else // Classic Mac OS - #include <ConditionalMacros.h> #include <MacTypes.h> @@ -183,7 +169,6 @@ extern "C" { #elif ( KERNEL ) // Mac OS X Kernel - #include <stdint.h> #include <libkern/OSTypes.h> @@ -201,14 +186,12 @@ extern "C" { #elif ( TARGET_OS_LINUX ) // Linux - #include <stdint.h> #include <arpa/inet.h> #elif ( TARGET_OS_SOLARIS ) // Solaris - #include <stdint.h> #include <arpa/inet.h> @@ -228,13 +211,11 @@ extern "C" { #elif ( TARGET_OS_VXWORKS ) // VxWorks - #include "vxWorks.h" #elif ( TARGET_OS_WIN32 ) // Windows - #if ( !defined( WIN32_WINDOWS ) ) #define WIN32_WINDOWS 0x0401 #endif @@ -285,12 +266,10 @@ extern "C" { #pragma mark == CPU == #endif -//=========================================================================================================================== -// CPU -//=========================================================================================================================== -// PowerPC +// CPU +// PowerPC #if ( !defined( TARGET_CPU_PPC ) ) #if ( defined( __ppc__ ) || defined( __PPC__ ) || defined( powerpc ) || defined( ppc ) || defined( _M_MPPC ) ) #define TARGET_CPU_PPC 1 @@ -300,7 +279,6 @@ extern "C" { #endif // x86 - #if ( !defined( TARGET_CPU_X86 ) ) #if ( __INTEL__ || defined( __i386__ ) || defined( i386 ) || defined( intel ) || defined( _M_IX86 ) ) #define TARGET_CPU_X86 1 @@ -310,7 +288,6 @@ extern "C" { #endif // MIPS - #if ( !defined( TARGET_CPU_MIPS ) ) #if ( __MIPS__ || defined( MIPS32 ) || defined( R3000 ) || defined( R4000 ) || defined( R4650 ) || defined( _M_MRX000 ) ) #define TARGET_CPU_MIPS 1 @@ -327,12 +304,10 @@ extern "C" { #pragma mark == Byte Order == #endif -//=========================================================================================================================== + // Byte Order -//=========================================================================================================================== // TARGET_RT_LITTLE_ENDIAN - #if ( !defined( TARGET_RT_LITTLE_ENDIAN ) ) #if ( MIPSEL || IL_LITTLE_ENDIAN || defined( __LITTLE_ENDIAN__ ) || \ ( defined( BYTE_ORDER ) && defined( LITTLE_ENDIAN ) && ( BYTE_ORDER == LITTLE_ENDIAN ) ) || \ @@ -346,7 +321,6 @@ extern "C" { #endif // TARGET_RT_BIG_ENDIAN - #if ( !defined( TARGET_RT_BIG_ENDIAN ) ) #if ( MIPSEB || IL_BIG_ENDIAN || defined( __BIG_ENDIAN__ ) || \ ( defined( BYTE_ORDER ) && defined( BIG_ENDIAN ) && ( BYTE_ORDER == BIG_ENDIAN ) ) || \ @@ -380,7 +354,6 @@ extern "C" { #endif // TARGET_RT_BYTE_ORDER - #if ( !defined( TARGET_RT_BYTE_ORDER_BIG_ENDIAN ) ) #define TARGET_RT_BYTE_ORDER_BIG_ENDIAN 1234 #endif @@ -401,10 +374,8 @@ extern "C" { #pragma mark == Constants == #endif -//=========================================================================================================================== -// Constants -//=========================================================================================================================== +// Constants #if ( !TARGET_OS_MAC ) #define CR '\r' #endif @@ -419,12 +390,10 @@ extern "C" { #pragma mark == Compatibility == #endif -//=========================================================================================================================== + // Compatibility -//=========================================================================================================================== // Macros to allow the same code to work on Windows and other sockets API-compatible platforms. - #if ( TARGET_OS_WIN32 ) #define close_compat( X ) closesocket( X ) #define errno_compat() (int) GetLastError() @@ -452,7 +421,7 @@ typedef int SocketRef; #endif // socklen_t is not defined on the following platforms so emulate it if not defined: -// + // - Pre-Panther Mac OS X. Panther defines SO_NOADDRERR so trigger off that. // - Windows SDK prior to 2003. 2003+ SDK's define EAI_AGAIN so trigger off that. // - VxWorks @@ -464,7 +433,7 @@ typedef int socklen_t; #endif // ssize_t is not defined on the following platforms so emulate it if not defined: -// + // - Mac OS X when not building with BSD headers // - Windows @@ -483,12 +452,11 @@ typedef int ssize_t; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined SOCKADDR_IS_IP_LOOPBACK @abstract Determines if a sockaddr is an IPv4 or IPv6 loopback address (if IPv6 is supported). */ - #if ( defined( AF_INET6 ) ) #define SOCKADDR_IS_IP_LOOPBACK( SA ) \ ( ( (const struct sockaddr *)( SA ) )->sa_family == AF_INET ) \ @@ -503,12 +471,11 @@ typedef int ssize_t; : 0 #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined SOCKADDR_IS_IP_LINK_LOCAL @abstract Determines if a sockaddr is an IPv4 or IPv6 link-local address (if IPv6 is supported). */ - #if ( defined( AF_INET6 ) ) #define SOCKADDR_IS_IP_LINK_LOCAL( SA ) \ ( ( ( (const struct sockaddr *)( SA ) )->sa_family == AF_INET ) \ @@ -526,7 +493,6 @@ typedef int ssize_t; // _beginthreadex and _endthreadex are not supported on Windows CE 2.1 or later (the C runtime issues with leaking // resources have apparently been resolved and they seem to have just ripped out support for the API) so map it to // CreateThread on Windows CE. - #if ( TARGET_OS_WINDOWS_CE ) #define _beginthreadex_compat( SECURITY_PTR, STACK_SIZE, START_ADDRESS, ARG_LIST, FLAGS, THREAD_ID_PTR ) \ (uintptr_t) CreateThread( SECURITY_PTR, STACK_SIZE, (LPTHREAD_START_ROUTINE) START_ADDRESS, ARG_LIST, FLAGS, \ @@ -560,7 +526,7 @@ typedef int ssize_t; #pragma mark == Macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined kSizeCString @abstract A meta-value to pass to supported routines to indicate the size should be calculated with strlen. @@ -568,7 +534,7 @@ typedef int ssize_t; #define kSizeCString ( (size_t) -1 ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined sizeof_array @abstract Determines the number of elements in an array. @@ -576,7 +542,7 @@ typedef int ssize_t; #define sizeof_array( X ) ( sizeof( X ) / sizeof( X[ 0 ] ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined sizeof_element @abstract Determines the size of an array element. @@ -584,7 +550,7 @@ typedef int ssize_t; #define sizeof_element( X ) sizeof( X[ 0 ] ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined sizeof_string @abstract Determines the size of a constant C string, excluding the null terminator. @@ -592,7 +558,7 @@ typedef int ssize_t; #define sizeof_string( X ) ( sizeof( ( X ) ) - 1 ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined sizeof_field @abstract Determines the size of a field of a type. @@ -600,7 +566,7 @@ typedef int ssize_t; #define sizeof_field( TYPE, FIELD ) sizeof( ( ( (TYPE *) 0 )->FIELD ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function RoundUp @abstract Rounds X up to a multiple of Y. @@ -608,7 +574,7 @@ typedef int ssize_t; #define RoundUp( X, Y ) ( ( X ) + ( ( Y ) -( ( X ) % ( Y ) ) ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function IsAligned @abstract Returns non-zero if X is aligned to a Y byte boundary and 0 if not. Y must be a power of 2. @@ -616,7 +582,7 @@ typedef int ssize_t; #define IsAligned( X, Y ) ( ( ( X ) &( ( Y ) -1 ) ) == 0 ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function IsFieldAligned @abstract Returns non-zero if FIELD of type TYPE is aligned to a Y byte boundary and 0 if not. Y must be a power of 2. @@ -624,7 +590,7 @@ typedef int ssize_t; #define IsFieldAligned( X, TYPE, FIELD, Y ) IsAligned( ( (uintptr_t)( X ) ) + offsetof( TYPE, FIELD ), ( Y ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function AlignDown @abstract Aligns X down to a Y byte boundary. Y must be a power of 2. @@ -632,7 +598,7 @@ typedef int ssize_t; #define AlignDown( X, Y ) ( ( X ) &~( ( Y ) -1 ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function AlignUp @abstract Aligns X up to a Y byte boundary. Y must be a power of 2. @@ -640,7 +606,7 @@ typedef int ssize_t; #define AlignUp( X, Y ) ( ( ( X ) + ( ( Y ) -1 ) ) & ~( ( Y ) -1 ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function Min @abstract Returns the lesser of X and Y. @@ -650,7 +616,7 @@ typedef int ssize_t; #define Min( X, Y ) ( ( ( X ) < ( Y ) ) ? ( X ) : ( Y ) ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function Max @abstract Returns the greater of X and Y. @@ -660,7 +626,7 @@ typedef int ssize_t; #define Max( X, Y ) ( ( ( X ) > ( Y ) ) ? ( X ) : ( Y ) ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function InsertBits @abstract Inserts BITS (both 0 and 1 bits) into X, controlled by MASK and SHIFT, and returns the result. @@ -677,7 +643,7 @@ typedef int ssize_t; #define InsertBits( X, BITS, MASK, SHIFT ) ( ( ( X ) &~( MASK ) ) | ( ( ( BITS ) << ( SHIFT ) ) & ( MASK ) ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function ExtractBits @abstract Extracts bits from X, controlled by MASK and SHIFT, and returns the result. @@ -694,7 +660,7 @@ typedef int ssize_t; #define ExtractBits( X, MASK, SHIFT ) ( ( ( X ) >> ( SHIFT ) ) & ( ( MASK ) >> ( SHIFT ) ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function Stringify @abstract Stringify's an expression. @@ -734,9 +700,9 @@ typedef int ssize_t; #endif #if ( TARGET_LANGUAGE_C_LIKE ) -//=========================================================================================================================== + // Standard Types -//=========================================================================================================================== + #if ( !defined( INT8_MIN ) ) @@ -834,14 +800,14 @@ typedef unsigned long int uintptr_t; #pragma mark == bool == #endif -//=========================================================================================================================== + // Boolean Constants and Types -//=========================================================================================================================== + // C++ defines bool, true, and false. Metrowerks allows this to be controlled by the "bool" option though. // C99 defines __bool_true_false_are_defined when bool, true, and false are defined. // MacTypes.h defines true and false (Mac builds only). -// + // Note: The Metrowerks has to be in its own block because Microsoft Visual Studio .NET does not completely // short-circuit and gets confused by the option( bool ) portion of the conditional. @@ -892,7 +858,7 @@ typedef int bool; #define TYPE_BOOL 1 #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef CStr255 @abstract 255 character null-terminated (C-style) string. @@ -904,7 +870,7 @@ typedef char CStr255[ 256 ]; #endif // TARGET_LANGUAGE_C_LIKE -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined TYPE_LONGLONG_NATIVE @abstract Defines whether long long (or its equivalent) is natively supported or requires special libraries. @@ -918,7 +884,7 @@ typedef char CStr255[ 256 ]; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined long_long_compat @abstract Compatibility type to map to the closest thing to long long and unsigned long long. @@ -943,7 +909,7 @@ typedef unsigned long long unsigned_long_long_compat; #pragma mark == Errors == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @enum OSStatus @abstract Status Code @@ -1100,11 +1066,11 @@ typedef int32_t OSStatus; #pragma mark == Mac Compatibility == #endif -//=========================================================================================================================== + // Mac Compatibility -//=========================================================================================================================== -//--------------------------------------------------------------------------------------------------------------------------- + + /*! @enum Duration @abstract Type used to specify a duration of time. @@ -1158,7 +1124,7 @@ typedef int32_t Duration; #define kWeeksPerYear 52 #define kMonthsPerYear 12 -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined VersionStages @abstract NumVersion-style version stages. @@ -1169,7 +1135,7 @@ typedef int32_t Duration; #define kVersionStageBeta 0x60 #define kVersionStageFinal 0x80 -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function NumVersionBuild @abstract Builds a 32-bit Mac-style NumVersion value (e.g. NumVersionBuild( 1, 2, 3, kVersionStageBeta, 4 ) -> 1.2.3b4). @@ -1189,7 +1155,7 @@ typedef int32_t Duration; #define NumVersionExtractStage( VERSION ) ( (uint8_t)( ( ( VERSION ) >> 8 ) & 0xFF ) ) #define NumVersionExtractRevision( VERSION ) ( (uint8_t)( ( VERSION ) & 0xFF ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function NumVersionCompare @abstract Compares two NumVersion values and returns the following values: @@ -1207,7 +1173,7 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight ); #pragma mark == Binary Constants == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined binary_4 @abstract Macro to generate an 4-bit constant using binary notation (e.g. binary_4( 1010 ) == 0xA). @@ -1217,7 +1183,7 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight ); #define binary_4_hex_wrap( a ) binary_4_hex( a ) #define binary_4_hex( a ) ( 0x ## a ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined binary_8 @abstract Macro to generate an 8-bit constant using binary notation (e.g. binary_8( 01111011 ) == 0x7B). @@ -1227,7 +1193,7 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight ); #define binary_8_hex_wrap( a ) binary_8_hex( a ) #define binary_8_hex( a ) ( 0x ## a ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined binary_16 @abstract Macro to generate an 16-bit constant using binary notation (e.g. binary_16( 01111011, 01111011 ) == 0x7B7B). @@ -1237,7 +1203,7 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight ); #define binary_16_hex_wrap( a, b ) binary_16_hex( a, b ) #define binary_16_hex( a, b ) ( 0x ## a ## b ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined binary_32 @abstract Macro to generate an 32-bit constant using binary notation @@ -1514,7 +1480,7 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight ); #pragma mark == Debugging == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function CommonServicesTest @abstract Unit test. diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c index 3bcc42380d8c..6e397c805235 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c @@ -23,10 +23,8 @@ #pragma mark == Includes == #endif -//=========================================================================================================================== -// Includes -//=========================================================================================================================== +// Includes #if ( !KERNEL ) #include <ctype.h> #include <stdio.h> @@ -57,7 +55,6 @@ #endif // If MDNS_DEBUGMSGS is defined (even if defined 0), it is aware of mDNS and it is probably safe to include mDNSEmbeddedAPI.h. - #if ( defined( MDNS_DEBUGMSGS ) ) #include "mDNSEmbeddedAPI.h" #endif @@ -66,70 +63,58 @@ #pragma mark == Macros == #endif -//=========================================================================================================================== -// Macros -//=========================================================================================================================== +// Macros #define DebugIsPrint( C ) ( ( ( C ) >= 0x20 ) && ( ( C ) <= 0x7E ) ) #if 0 #pragma mark == Prototypes == #endif -//=========================================================================================================================== -// Prototypes -//=========================================================================================================================== +// Prototypes static OSStatus DebugPrint( DebugLevel inLevel, char *inData, size_t inSize ); // fprintf - #if ( DEBUG_FPRINTF_ENABLED ) static OSStatus DebugFPrintFInit( DebugOutputTypeFlags inFlags, const char *inFilename ); static void DebugFPrintFPrint( char *inData, size_t inSize ); #endif // iDebug (Mac OS X user and kernel) - #if ( DEBUG_IDEBUG_ENABLED ) static OSStatus DebugiDebugInit( void ); static void DebugiDebugPrint( char *inData, size_t inSize ); #endif // kprintf (Mac OS X Kernel) - #if ( DEBUG_KPRINTF_ENABLED ) static void DebugKPrintFPrint( char *inData, size_t inSize ); #endif // Mac OS X IOLog (Mac OS X Kernel) - #if ( DEBUG_MAC_OS_X_IOLOG_ENABLED ) static void DebugMacOSXIOLogPrint( char *inData, size_t inSize ); #endif // Mac OS X Log - #if ( TARGET_OS_MAC ) static OSStatus DebugMacOSXLogInit( void ); static void DebugMacOSXLogPrint( char *inData, size_t inSize ); #endif // Windows Debugger - #if ( TARGET_OS_WIN32 ) static void DebugWindowsDebuggerPrint( char *inData, size_t inSize ); #endif // Windows Event Log - #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule ); static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t inSize ); #endif // DebugLib support - #if ( DEBUG_CORE_SERVICE_ASSERTS_ENABLED ) static pascal void DebugAssertOutputHandler( @@ -145,7 +130,6 @@ DebugAssertOutputHandler( #endif // Utilities - static char * DebugNumVersionToString( uint32_t inVersion, char *inString ); #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) @@ -166,10 +150,8 @@ DebugWinCharToTCharString( #pragma mark == Globals == #endif -//=========================================================================================================================== -// Private Globals -//=========================================================================================================================== +// Private Globals #if ( TARGET_OS_VXWORKS ) // TCP States for inetstatShow. @@ -192,7 +174,6 @@ const char * kDebugTCPStates[] = #endif // General - static bool gDebugInitialized = false; static DebugOutputType gDebugOutputType = kDebugOutputTypeNone; static DebugLevel gDebugPrintLevelMin = kDebugLevelInfo; @@ -203,7 +184,6 @@ static DebugAssertOutputHandlerUPP gDebugAssertOutputHandlerUPP = NULL; #endif // Custom - static DebugOutputFunctionPtr gDebugCustomOutputFunction = NULL; static void * gDebugCustomOutputContext = NULL; @@ -214,7 +194,6 @@ static FILE * gDebugFPrintFFile = NULL; #endif // MacOSXLog - #if ( TARGET_OS_MAC ) typedef int ( *DebugMacOSXLogFunctionPtr )( const char *inFormat, ... ); @@ -222,8 +201,6 @@ static DebugMacOSXLogFunctionPtr gDebugMacOSXLogFunction = NULL; #endif // WindowsEventLog - - #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) static HANDLE gDebugWindowsEventLogEventSource = NULL; #endif @@ -233,10 +210,8 @@ static HANDLE gDebugWindowsEventLogEventSource = NULL; #pragma mark == General == #endif -//=========================================================================================================================== -// DebugInitialize -//=========================================================================================================================== +// DebugInitialize DEBUG_EXPORT OSStatus DebugInitialize( DebugOutputType inType, ... ) { OSStatus err; @@ -302,8 +277,7 @@ DEBUG_EXPORT OSStatus DebugInitialize( DebugOutputType inType, ... ) #endif } - // Process output kind. - + // Process output kind gDebugOutputType = type; switch( type ) { @@ -396,10 +370,8 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugFinalize -//=========================================================================================================================== +// DebugFinalize DEBUG_EXPORT void DebugFinalize( void ) { #if ( DEBUG_CORE_SERVICE_ASSERTS_ENABLED ) @@ -413,10 +385,8 @@ DEBUG_EXPORT void DebugFinalize( void ) #endif } -//=========================================================================================================================== -// DebugGetProperty -//=========================================================================================================================== +// DebugGetProperty DEBUG_EXPORT OSStatus DebugGetProperty( DebugPropertyTag inTag, ... ) { OSStatus err; @@ -452,10 +422,8 @@ DEBUG_EXPORT OSStatus DebugGetProperty( DebugPropertyTag inTag, ... ) return( err ); } -//=========================================================================================================================== -// DebugSetProperty -//=========================================================================================================================== +// DebugSetProperty DEBUG_EXPORT OSStatus DebugSetProperty( DebugPropertyTag inTag, ... ) { OSStatus err; @@ -496,10 +464,8 @@ DEBUG_EXPORT OSStatus DebugSetProperty( DebugPropertyTag inTag, ... ) #pragma mark == Output == #endif -//=========================================================================================================================== -// DebugPrintF -//=========================================================================================================================== +// DebugPrintF DEBUG_EXPORT size_t DebugPrintF( DebugLevel inLevel, const char *inFormat, ... ) { va_list args; @@ -521,10 +487,8 @@ exit: return( n ); } -//=========================================================================================================================== -// DebugPrintFVAList -//=========================================================================================================================== +// DebugPrintFVAList DEBUG_EXPORT size_t DebugPrintFVAList( DebugLevel inLevel, const char *inFormat, va_list inArgs ) { size_t n; @@ -545,10 +509,8 @@ exit: return( n ); } -//=========================================================================================================================== -// DebugPrint -//=========================================================================================================================== +// DebugPrint static OSStatus DebugPrint( DebugLevel inLevel, char *inData, size_t inSize ) { OSStatus err; @@ -645,15 +607,13 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugPrintAssert -// -// Warning: This routine relies on several of the strings being string constants that will exist forever because the -// underlying logMsg API that does the printing is asynchronous so it cannot use temporary/stack-based -// pointer variables (e.g. local strings). The debug macros that invoke this function only use constant -// constant strings, but if this function is invoked directly from other places, it must use constant strings. -//=========================================================================================================================== +// DebugPrintAssert + +// Warning: This routine relies on several of the strings being string constants that will exist forever because the +// underlying logMsg API that does the printing is asynchronous so it cannot use temporary/stack-based +// pointer variables (e.g. local strings). The debug macros that invoke this function only use constant +// constant strings, but if this function is invoked directly from other places, it must use constant strings. DEBUG_EXPORT void DebugPrintAssert( int_least32_t inErrorCode, @@ -664,7 +624,6 @@ DebugPrintAssert( const char * inFunction ) { // Skip if the level is not in the enabled range.. - if( ( kDebugLevelAssert < gDebugPrintLevelMin ) || ( kDebugLevelAssert > gDebugPrintLevelMax ) ) { return; @@ -698,8 +657,7 @@ DebugPrintAssert( inFunction ? inFunction : "" ); } - // Break into the debugger if enabled. - + // Break into the debugger if enabled #if ( TARGET_OS_WIN32 ) if( gDebugBreakLevel <= kDebugLevelAssert ) { @@ -716,10 +674,8 @@ DebugPrintAssert( #endif #if ( DEBUG_FPRINTF_ENABLED ) -//=========================================================================================================================== -// DebugFPrintFInit -//=========================================================================================================================== +// DebugFPrintFInit static OSStatus DebugFPrintFInit( DebugOutputTypeFlags inFlags, const char *inFilename ) { OSStatus err; @@ -760,17 +716,14 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugFPrintFPrint -//=========================================================================================================================== +// DebugFPrintFPrint static void DebugFPrintFPrint( char *inData, size_t inSize ) { char * p; char * q; // Convert \r to \n. fprintf will interpret \n and convert to whatever is appropriate for the platform. - p = inData; q = p + inSize; while( p < q ) @@ -783,7 +736,6 @@ static void DebugFPrintFPrint( char *inData, size_t inSize ) } // Write the data and flush. - if( gDebugFPrintFFile ) { fprintf( gDebugFPrintFFile, "%.*s", (int) inSize, inData ); @@ -793,10 +745,8 @@ static void DebugFPrintFPrint( char *inData, size_t inSize ) #endif // DEBUG_FPRINTF_ENABLED #if ( DEBUG_IDEBUG_ENABLED ) -//=========================================================================================================================== -// DebugiDebugInit -//=========================================================================================================================== +// DebugiDebugInit static OSStatus DebugiDebugInit( void ) { OSStatus err; @@ -807,7 +757,6 @@ static OSStatus DebugiDebugInit( void ) // Emulate the iDebugSetOutputType macro in iDebugServices.h. // Note: This is not thread safe, but neither is iDebugServices.h nor iDebugKext. - if( !_giDebugReserved1 ) { _giDebugReserved1 = (uint32_t *) IOMalloc( sizeof( uint32_t ) ); @@ -828,10 +777,8 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugiDebugPrint -//=========================================================================================================================== +// DebugiDebugPrint static void DebugiDebugPrint( char *inData, size_t inSize ) { #if ( TARGET_API_MAC_OSX_KERNEL ) @@ -861,10 +808,8 @@ static void DebugiDebugPrint( char *inData, size_t inSize ) #endif #if ( DEBUG_KPRINTF_ENABLED ) -//=========================================================================================================================== -// DebugKPrintFPrint -//=========================================================================================================================== +// DebugKPrintFPrint static void DebugKPrintFPrint( char *inData, size_t inSize ) { extern void kprintf( const char *inFormat, ... ); @@ -874,10 +819,8 @@ static void DebugKPrintFPrint( char *inData, size_t inSize ) #endif #if ( DEBUG_MAC_OS_X_IOLOG_ENABLED ) -//=========================================================================================================================== -// DebugMacOSXIOLogPrint -//=========================================================================================================================== +// DebugMacOSXIOLogPrint static void DebugMacOSXIOLogPrint( char *inData, size_t inSize ) { extern void IOLog( const char *inFormat, ... ); @@ -887,10 +830,8 @@ static void DebugMacOSXIOLogPrint( char *inData, size_t inSize ) #endif #if ( TARGET_OS_MAC ) -//=========================================================================================================================== -// DebugMacOSXLogInit -//=========================================================================================================================== +// DebugMacOSXLogInit static OSStatus DebugMacOSXLogInit( void ) { OSStatus err; @@ -932,10 +873,7 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugMacOSXLogPrint -//=========================================================================================================================== - +// DebugMacOSXLogPrint static void DebugMacOSXLogPrint( char *inData, size_t inSize ) { if( gDebugMacOSXLogFunction ) @@ -946,10 +884,8 @@ static void DebugMacOSXLogPrint( char *inData, size_t inSize ) #endif #if ( TARGET_OS_WIN32 ) -//=========================================================================================================================== -// DebugWindowsDebuggerPrint -//=========================================================================================================================== +// DebugWindowsDebuggerPrint void DebugWindowsDebuggerPrint( char *inData, size_t inSize ) { TCHAR buffer[ 512 ]; @@ -960,7 +896,6 @@ void DebugWindowsDebuggerPrint( char *inData, size_t inSize ) // Copy locally and null terminate the string. This also converts from char to TCHAR in case we are // building with UNICODE enabled since the input is always char. Also convert \r to \n in the process. - src = inData; if( inSize >= sizeof_array( buffer ) ) { @@ -980,16 +915,13 @@ void DebugWindowsDebuggerPrint( char *inData, size_t inSize ) *dst = 0; // Print out the string to the debugger. - OutputDebugString( buffer ); } #endif #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) -//=========================================================================================================================== -// DebugWindowsEventLogInit -//=========================================================================================================================== +// DebugWindowsEventLogInit static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule ) { OSStatus err; @@ -1004,7 +936,6 @@ static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule ) key = NULL; // Use a default name if needed then convert the name to TCHARs so it works on ANSI or Unicode builds. - if( !inName || ( *inName == '\0' ) ) { inName = "DefaultApp"; @@ -1012,18 +943,15 @@ static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule ) DebugWinCharToTCharString( inName, kSizeCString, name, sizeof( name ), NULL ); // Build the path string using the fixed registry path and app name. - src = "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\"; DebugWinCharToTCharString( src, kSizeCString, path, sizeof_array( path ), &size ); DebugWinCharToTCharString( inName, kSizeCString, path + size, sizeof_array( path ) - size, NULL ); // Add/Open the source name as a sub-key under the Application key in the EventLog registry key. - err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, NULL ); require_noerr_quiet( err, exit ); // Set the path in the EventMessageFile subkey. Add 1 to the TCHAR count to include the null terminator. - n = GetModuleFileName( inModule, path, sizeof_array( path ) ); err = translate_errno( n > 0, (OSStatus) GetLastError(), kParamErr ); require_noerr_quiet( err, exit ); @@ -1034,14 +962,12 @@ static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule ) require_noerr_quiet( err, exit ); // Set the supported event types in the TypesSupported subkey. - typesSupported = EVENTLOG_SUCCESS | EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE | EVENTLOG_AUDIT_SUCCESS | EVENTLOG_AUDIT_FAILURE; err = RegSetValueEx( key, TEXT( "TypesSupported" ), 0, REG_DWORD, (const LPBYTE) &typesSupported, sizeof( DWORD ) ); require_noerr_quiet( err, exit ); // Set up the event source. - gDebugWindowsEventLogEventSource = RegisterEventSource( NULL, name ); err = translate_errno( gDebugWindowsEventLogEventSource, (OSStatus) GetLastError(), kParamErr ); require_noerr_quiet( err, exit ); @@ -1054,10 +980,8 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugWindowsEventLogPrint -//=========================================================================================================================== +// DebugWindowsEventLogPrint static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t inSize ) { WORD type; @@ -1068,8 +992,7 @@ static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t char c; const TCHAR * array[ 1 ]; - // Map the debug level to a Windows EventLog type. - + // Map the debug level to a Windows EventLog type if( inLevel <= kDebugLevelNotice ) { type = EVENTLOG_INFORMATION_TYPE; @@ -1085,7 +1008,6 @@ static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t // Copy locally and null terminate the string. This also converts from char to TCHAR in case we are // building with UNICODE enabled since the input is always char. Also convert \r to \n in the process. - src = inData; if( inSize >= sizeof_array( buffer ) ) { @@ -1105,7 +1027,6 @@ static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t *dst = 0; // Add the the string to the event log. - array[ 0 ] = buffer; if( gDebugWindowsEventLogEventSource ) { @@ -1115,10 +1036,8 @@ static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t #endif // TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE #if ( DEBUG_CORE_SERVICE_ASSERTS_ENABLED ) -//=========================================================================================================================== -// DebugAssertOutputHandler -//=========================================================================================================================== +// DebugAssertOutputHandler static pascal void DebugAssertOutputHandler( OSType inComponentSignature, @@ -1146,28 +1065,28 @@ DebugAssertOutputHandler( #pragma mark == Utilities == #endif -//=========================================================================================================================== -// DebugSNPrintF -// -// Stolen from mDNS.c's mDNS_snprintf/mDNS_vsnprintf with the following changes: -// -// Changed names to avoid name collisions with the mDNS versions. -// Changed types to standard C types since mDNSEmbeddedAPI.h may not be available. -// Conditionalized mDNS stuff so it can be used with or with mDNSEmbeddedAPI.h. -// Added 64-bit support for %d (%lld), %i (%lli), %u (%llu), %o (%llo), %x (%llx), and %b (%llb). -// Added %@ - Cocoa/CoreFoundation object. Param is the object. Strings are used directly. Others use CFCopyDescription. -// Added %.8a - FIbre Channel address. Arg=ptr to address. -// Added %##a - IPv4 (if AF_INET defined) or IPv6 (if AF_INET6 defined) sockaddr. Arg=ptr to sockaddr. -// Added %b - Binary representation of integer (e.g. 01101011). Modifiers and arg=the same as %d, %x, etc. -// Added %C - Mac-style FourCharCode (e.g. 'APPL'). Arg=32-bit value to print as a Mac-style FourCharCode. -// Added %H - Hex Dump (e.g. "\x6b\xa7" -> "6B A7"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size. -// Added %#H - Hex Dump & ASCII (e.g. "\x41\x62" -> "6B A7 'Ab'"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size. -// Added %m - Error Message (e.g. 0 -> "kNoErr"). Modifiers and error code args are the same as %d, %x, etc. -// Added %S - UTF-16 string. Host order if no BOM. Precision is UTF-16 char count. BOM counts in any precision. Arg=ptr. -// Added %#S - Big Endian UTF-16 string (unless BOM overrides). Otherwise the same as %S. -// Added %##S - Little Endian UTF-16 string (unless BOM overrides). Otherwise the same as %S. -// Added %U - Universally Unique Identifier (UUID) (e.g. 6ba7b810-9dad-11d1-80b4-00c04fd430c8). Arg=ptr to 16-byte UUID. -//=========================================================================================================================== + +// DebugSNPrintF + +// Stolen from mDNS.c's mDNS_snprintf/mDNS_vsnprintf with the following changes: + +// Changed names to avoid name collisions with the mDNS versions. +// Changed types to standard C types since mDNSEmbeddedAPI.h may not be available. +// Conditionalized mDNS stuff so it can be used with or with mDNSEmbeddedAPI.h. +// Added 64-bit support for %d (%lld), %i (%lli), %u (%llu), %o (%llo), %x (%llx), and %b (%llb). +// Added %@ - Cocoa/CoreFoundation object. Param is the object. Strings are used directly. Others use CFCopyDescription. +// Added %.8a - FIbre Channel address. Arg=ptr to address. +// Added %##a - IPv4 (if AF_INET defined) or IPv6 (if AF_INET6 defined) sockaddr. Arg=ptr to sockaddr. +// Added %b - Binary representation of integer (e.g. 01101011). Modifiers and arg=the same as %d, %x, etc. +// Added %C - Mac-style FourCharCode (e.g. 'APPL'). Arg=32-bit value to print as a Mac-style FourCharCode. +// Added %H - Hex Dump (e.g. "\x6b\xa7" -> "6B A7"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size. +// Added %#H - Hex Dump & ASCII (e.g. "\x41\x62" -> "6B A7 'Ab'"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size. +// Added %m - Error Message (e.g. 0 -> "kNoErr"). Modifiers and error code args are the same as %d, %x, etc. +// Added %S - UTF-16 string. Host order if no BOM. Precision is UTF-16 char count. BOM counts in any precision. Arg=ptr. +// Added %#S - Big Endian UTF-16 string (unless BOM overrides). Otherwise the same as %S. +// Added %##S - Little Endian UTF-16 string (unless BOM overrides). Otherwise the same as %S. +// Added %U - Universally Unique Identifier (UUID) (e.g. 6ba7b810-9dad-11d1-80b4-00c04fd430c8). Arg=ptr to 16-byte UUID. + DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, ...) { @@ -1181,9 +1100,9 @@ DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, return(length); } -//=========================================================================================================================== -// DebugSNPrintFVAList - va_list version of DebugSNPrintF. See DebugSNPrintF for more info. -//=========================================================================================================================== + +// DebugSNPrintFVAList - va_list version of DebugSNPrintF. See DebugSNPrintF for more info. + DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char *fmt, va_list arg) { @@ -1607,9 +1526,9 @@ exit: return(nwritten); } -//=========================================================================================================================== -// DebugGetErrorString -//=========================================================================================================================== + +// DebugGetErrorString + DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char *inBuffer, size_t inBufferSize ) { @@ -2014,9 +1933,9 @@ DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char return( s ); } -//=========================================================================================================================== -// DebugHexDump -//=========================================================================================================================== + +// DebugHexDump + DEBUG_EXPORT size_t DebugHexDump( @@ -2139,12 +2058,12 @@ DebugHexDump( } // Build the prefix string. It will be in one of the following formats: - // + // 1) "00000000+0000[0000]" (address and offset) // 2) "00000000" (address only) // 3) "0000[0000]" (offset only) // 4) "" (no address or offset) - // + // Note: If we're printing multiple "lines", but not printing newlines, a space is used to separate. s = prefixString; @@ -2375,9 +2294,9 @@ DebugHexDump( return( (size_t)( dst - outBuffer ) ); } -//=========================================================================================================================== -// DebugNumVersionToString -//=========================================================================================================================== + +// DebugNumVersionToString + static char * DebugNumVersionToString( uint32_t inVersion, char *inString ) { @@ -2440,9 +2359,9 @@ static char * DebugNumVersionToString( uint32_t inVersion, char *inString ) return( inString ); } -//=========================================================================================================================== -// DebugTaskLevel -//=========================================================================================================================== + +// DebugTaskLevel + DEBUG_EXPORT uint32_t DebugTaskLevel( void ) { @@ -2461,9 +2380,9 @@ DEBUG_EXPORT uint32_t DebugTaskLevel( void ) } #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) -//=========================================================================================================================== -// DebugWinEnableConsole -//=========================================================================================================================== + +// DebugWinEnableConsole + #pragma warning( disable:4311 ) @@ -2547,9 +2466,9 @@ exit: #endif // TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE #if ( TARGET_OS_WIN32 ) -//=========================================================================================================================== -// DebugWinCharToTCharString -//=========================================================================================================================== + +// DebugWinCharToTCharString + static TCHAR * DebugWinCharToTCharString( @@ -2597,9 +2516,9 @@ DebugWinCharToTCharString( #pragma mark == Debugging == #endif -//=========================================================================================================================== -// DebugServicesTest -//=========================================================================================================================== + +// DebugServicesTest + DEBUG_EXPORT OSStatus DebugServicesTest( void ) { diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h index cb0ef4d1acae..97ac12bccd36 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h @@ -15,7 +15,7 @@ * limitations under the License. */ -//--------------------------------------------------------------------------------------------------------------------------- + /*! @header DebugServices Debugging Library @@ -36,9 +36,9 @@ #pragma mark == Settings == #endif -//=========================================================================================================================== + // Settings -//=========================================================================================================================== + // General @@ -90,7 +90,7 @@ #pragma mark == Output == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_FPRINTF_ENABLED @abstract Enables ANSI C fprintf output. @@ -108,7 +108,7 @@ #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_MAC_OS_X_IOLOG_ENABLED @abstract Enables IOLog (Mac OS X Kernel) output. @@ -118,7 +118,7 @@ #define DEBUG_MAC_OS_X_IOLOG_ENABLED TARGET_API_MAC_OSX_KERNEL #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_KPRINTF_ENABLED @abstract Enables kprintf (Mac OS X Kernel) output. @@ -128,7 +128,7 @@ #define DEBUG_KPRINTF_ENABLED TARGET_API_MAC_OSX_KERNEL #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_IDEBUG_ENABLED @abstract Enables iDebug (Mac OS X user and Kernel) output. @@ -144,7 +144,7 @@ #define DEBUG_IDEBUG_ENABLED TARGET_API_MAC_OSX_KERNEL #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_CORE_SERVICE_ASSERTS_ENABLED @abstract Controls whether Core Services assert handling is enabled. Enabling requires CoreServices framework. @@ -158,7 +158,7 @@ #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef DebugOutputType @abstract Type of debug output (i.e. where the output goes). @@ -177,7 +177,7 @@ typedef uint32_t DebugOutputType; #define kDebugOutputTypeWindowsEventLog 0x7765766CU // 'wevl' - 1st param = C-string name, 2nd param = HMODULE or NULL. // Console meta output kind - Any kind of Console output (in horizontal order of preference): -// + // Mac OS X = ANSI printf (viewable in Console.app) // Mac OS X Kernel = IOLog (/var/log/system.log) or kprintf (serial). // Windows = ANSI printf (Console window) or OutputDebugString (debugger). @@ -185,7 +185,7 @@ typedef uint32_t DebugOutputType; #define kDebugOutputTypeMetaConsole 0x434F4E53U // 'CONS' - no params -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef DebugOutputTypeFlags @abstract Flags controlling how the output type is configured. @@ -203,7 +203,7 @@ typedef unsigned int DebugOutputTypeFlags; #define kDebugOutputTypeFlagsStdErr 2 #define kDebugOutputTypeFlagsFile 10 -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef DebugOutputFunctionPtr @abstract Function ptr for a custom callback to print debug output. @@ -211,15 +211,15 @@ typedef unsigned int DebugOutputTypeFlags; typedef void ( *DebugOutputFunctionPtr )( char *inData, size_t inSize, void *inContext ); -//=========================================================================================================================== + // Constants -//=========================================================================================================================== + #if 0 #pragma mark == Flags == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef DebugFlags @abstract Flags controlling how output is printed. @@ -239,7 +239,7 @@ typedef uint32_t DebugFlags; #define kDebugFlagsNo16ByteHexPad ( 1 << 8 ) #define kDebugFlagsNoByteCount ( 1 << 9 ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @enum DebugTaskLevelFlags @abstract Flags indicating the task level. @@ -268,11 +268,11 @@ enum #pragma mark == Levels == #endif -//=========================================================================================================================== + // Constants & Types - Levels -//=========================================================================================================================== -//--------------------------------------------------------------------------------------------------------------------------- + + /*! @typedef DebugLevel @abstract Level used to control debug logging. @@ -304,7 +304,7 @@ typedef int32_t DebugLevel; #define kDebugLevelFlagStackTrace 0x00010000 #define kDebugLevelFlagDebugBreak 0x00020000 -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef LogLevel @abstract Level used to control which events are logged. @@ -333,7 +333,7 @@ typedef int32_t LogLevel; #pragma mark == Properties == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef DebugPropertyTag @abstract Tag for properties. @@ -355,7 +355,7 @@ typedef uint32_t DebugPropertyTag; #pragma mark == General macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_UNUSED @abstract Macro to mark a paramter as unused to avoid unused parameter warnings. @@ -368,7 +368,7 @@ typedef uint32_t DebugPropertyTag; #define DEBUG_UNUSED( X ) (void)( X ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_USE_ONLY @abstract Macro to mark a variable as used only when debugging is enabled. @@ -386,7 +386,7 @@ typedef uint32_t DebugPropertyTag; #define DEBUG_USE_ONLY( X ) (void)( X ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_LOCAL @abstract Macros to make variables and functions static when debugging is off, but extern when debugging is on. @@ -403,7 +403,7 @@ typedef uint32_t DebugPropertyTag; #define DEBUG_LOCAL static #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_STATIC @abstract Macros to make variables and functions static when debugging is off, but extern when debugging is on. @@ -420,7 +420,7 @@ typedef uint32_t DebugPropertyTag; #define DEBUG_STATIC static #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_EXPORT @abstract Macros to export variables. @@ -438,7 +438,7 @@ typedef uint32_t DebugPropertyTag; #define DEBUG_EXPORT extern #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined debug_add @abstract Macro to add (or subtract if negative) a value when debugging is on. Does nothing if debugging is off. @@ -450,7 +450,7 @@ typedef uint32_t DebugPropertyTag; #define debug_add( A, B ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined debug_perform @abstract Macro to perform something in debug-only builds. @@ -462,7 +462,7 @@ typedef uint32_t DebugPropertyTag; #define debug_perform( X ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function translate_errno @abstract Returns 0 if the test success. If the test fails, returns errno if non-zero and othewise the alternate error. @@ -474,7 +474,7 @@ typedef uint32_t DebugPropertyTag; #pragma mark == Compile Time macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_compile_time @abstract Performs a compile-time check of something such as the size of an int. @@ -502,7 +502,7 @@ typedef uint32_t DebugPropertyTag; #define check_compile_time( X ) extern int debug_compile_time_name[ ( X ) ? 1 : -1 ] -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_compile_time_code @abstract Perform a compile-time check, suitable for placement in code, of something such as the size of an int. @@ -533,7 +533,7 @@ typedef uint32_t DebugPropertyTag; #pragma mark == check macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check @abstract Check that an expression is true (non-zero). @@ -564,7 +564,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_string @abstract Check that an expression is true (non-zero) with an explanation. @@ -596,7 +596,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_noerr @abstract Check that an error code is noErr (0). @@ -631,7 +631,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_noerr_string @abstract Check that an error code is noErr (0) with an explanation. @@ -666,7 +666,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_translated_errno @abstract Check a condition and prints errno (if non-zero) to the log. @@ -696,7 +696,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_ptr_overlap @abstract Checks that two ptrs do not overlap. @@ -716,7 +716,7 @@ typedef uint32_t DebugPropertyTag; #pragma mark == require macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require @abstract Requires that an expression evaluate to true. @@ -743,7 +743,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_string @abstract Requires that an expression evaluate to true with an explanation. @@ -770,7 +770,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_quiet @abstract Requires that an expression evaluate to true. @@ -795,7 +795,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr @abstract Require that an error code is noErr (0). @@ -825,7 +825,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr_string @abstract Require that an error code is noErr (0). @@ -856,7 +856,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr_action_string @abstract Require that an error code is noErr (0). @@ -888,7 +888,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr_quiet @abstract Require that an error code is noErr (0). @@ -913,7 +913,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr_action @abstract Require that an error code is noErr (0) with an action to execute otherwise. @@ -944,7 +944,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr_action_quiet @abstract Require that an error code is noErr (0) with an action to execute otherwise. @@ -970,7 +970,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_action @abstract Requires that an expression evaluate to true with an action to execute otherwise. @@ -998,7 +998,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_action_quiet @abstract Requires that an expression evaluate to true with an action to execute otherwise. @@ -1024,7 +1024,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_action_string @abstract Requires that an expression evaluate to true with an explanation and action to execute otherwise. @@ -1054,7 +1054,7 @@ typedef uint32_t DebugPropertyTag; #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_throw @abstract Requires that an expression evaluates to true or an exception is thrown. @@ -1082,9 +1082,9 @@ typedef uint32_t DebugPropertyTag; #pragma mark == Design-By-Contract macros == #endif -//=========================================================================================================================== + // Design-By-Contract macros -//=========================================================================================================================== + #define ensure( X ) check( X ) #define ensure_string( X, STR ) check_string( X, STR ) @@ -1098,9 +1098,9 @@ typedef uint32_t DebugPropertyTag; #pragma mark == Expect macros == #endif -//=========================================================================================================================== + // Expect macros -//=========================================================================================================================== + // Expect macros allow code to include runtime checking of things that should not happen in shipping code (e.g. internal // programmer errors, such as a NULL parameter where it is not allowed). Once the code has been verified to work correctly @@ -1139,7 +1139,7 @@ typedef uint32_t DebugPropertyTag; #pragma mark == Output macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined debug_string @abstract Prints a debugging C string. @@ -1161,7 +1161,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined debug_print_assert @abstract Prints an assertion. @@ -1174,7 +1174,7 @@ typedef uint32_t DebugPropertyTag; #define debug_print_assert( ERROR_CODE, ASSERT_STRING, MESSAGE, FILENAME, LINE_NUMBER, FUNCTION ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined dlog @abstract Prints a debug-only message. @@ -1198,7 +1198,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined dlogv @abstract Prints a debug-only message. @@ -1210,7 +1210,7 @@ typedef uint32_t DebugPropertyTag; #define dlogv( LEVEL, FORMAT, LIST ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined dlogmem @abstract Prints a debug-only dump of memory. @@ -1223,7 +1223,7 @@ typedef uint32_t DebugPropertyTag; #define dlogmem( LEVEL, PTR, SIZE ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DebugNSLog @abstract Debug-only macro for the Cocoa NSLog function. @@ -1247,7 +1247,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DebugLogMsg @abstract Debug-only macro for the VxWorks logMsg function. @@ -1279,7 +1279,7 @@ typedef uint32_t DebugPropertyTag; extern "C" { #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugInitialize @abstract Initializes the debugging library for a specific kind of output. @@ -1310,7 +1310,7 @@ DEBUG_EXPORT OSStatus DebugInitialize( DebugOutputType inType, ... ); #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugFinalize @abstract Releases any resources used by the debugging library @@ -1326,7 +1326,7 @@ DEBUG_EXPORT void DebugFinalize( void ); #define debug_terminate() #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugGetProperty @abstract Gets the specified property from the debugging library. @@ -1354,7 +1354,7 @@ DEBUG_EXPORT OSStatus DebugGetProperty( DebugPropertyTag inTag, ... ); #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugSetProperty @abstract Sets the specified property from the debugging library. @@ -1386,7 +1386,7 @@ DEBUG_EXPORT OSStatus DebugSetProperty( DebugPropertyTag inTag, ... ); #pragma mark == Routines - Debugging Output == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugPrintF @abstract Prints a debug message with printf-style formatting. @@ -1406,7 +1406,7 @@ DEBUG_EXPORT OSStatus DebugSetProperty( DebugPropertyTag inTag, ... ); DEBUG_EXPORT size_t DebugPrintF( DebugLevel inLevel, const char *inFormat, ... ); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugPrintFVAList @abstract va_list version of DebugPrintF. See DebugPrintF for more info. @@ -1416,7 +1416,7 @@ DEBUG_EXPORT size_t DebugPrintF( DebugLevel inLevel, const char *inFormat, . DEBUG_EXPORT size_t DebugPrintFVAList( DebugLevel inLevel, const char *inFormat, va_list inArgs ); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugPrintAssert @abstract Prints a message describing the reason the (e.g. an assert failed), an optional error message, @@ -1457,7 +1457,7 @@ DebugPrintAssert( #pragma mark == Routines - Utilities == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugSNPrintF @abstract Debugging versions of standard C snprintf with extra features. @@ -1496,7 +1496,7 @@ DebugPrintAssert( DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, ...); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugSNPrintFVAList @abstract va_list version of DebugSNPrintF. See DebugSNPrintF for more info. @@ -1506,7 +1506,7 @@ DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char *fmt, va_list arg); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugGetErrorString @abstract Gets an error string from an error code. @@ -1528,7 +1528,7 @@ DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char *inBuffer, size_t inBufferSize ); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugHexDump @abstract Hex dumps data to a string or to the output device. @@ -1560,7 +1560,7 @@ DebugHexDump( #define dloghex( LEVEL, INDENT, LABEL, LABEL_SIZE, LABEL_MIN_SIZE, TYPE, TYPE_SIZE, DATA_START, DATA, DATA_SIZE, FLAGS, BUFFER, BUFFER_SIZE ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugTaskLevel @abstract Returns the current task level. @@ -1590,7 +1590,7 @@ DebugHexDump( DEBUG_EXPORT uint32_t DebugTaskLevel( void ); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugServicesTest @abstract Unit test. diff --git a/sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.c b/sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.c index a36183d7a61e..6007242539fb 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.c @@ -32,7 +32,7 @@ #define ASSIGNLINK( e, l, o) ( *((void**)((char*) (e) + (o))) = (l)) -// GenLinkedList ///////////////////////////////////////////////////////////// +// GenLinkedList void InitLinkedList( GenLinkedList *pList, size_t linkOffset) /* Initialize the block of memory pointed to by pList as a linked list. */ @@ -124,7 +124,7 @@ int ReplaceElem( GenLinkedList *pList, void *elemInList, void *newElem) } -// GenDoubleLinkedList ///////////////////////////////////////////////////////// +// GenDoubleLinkedList void InitDoubleLinkedList( GenDoubleLinkedList *pList, size_t fwdLinkOffset, size_t backLinkOffset) @@ -183,7 +183,7 @@ void DLLRemoveFromList( GenDoubleLinkedList *pList, void *elem) } -// GenLinkedOffsetList ///////////////////////////////////////////////////// +// GenLinkedOffsetList // Extract the Next offset from element #define GETOFFSET( e, o) ( *(size_t*)((char*) (e) + (o)) ) diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c index 63e8f6326e1b..1c4e08463900 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c @@ -130,7 +130,7 @@ typedef void (*ProcessReplyFn)(DNSServiceOp *const sdr, const CallbackHeader *co // When using kDNSServiceFlagsShareConnection, there is one primary _DNSServiceOp_t, and zero or more subordinates // For the primary, the 'next' field points to the first subordinate, and its 'next' field points to the next, and so on. // For the primary, the 'primary' field is NULL; for subordinates the 'primary' field points back to the associated primary -// + // _DNS_SD_LIBDISPATCH is defined where libdispatch/GCD is available. This does not mean that the application will use the // DNSServiceSetDispatchQueue API. Hence any new code guarded with _DNS_SD_LIBDISPATCH should still be backwards compatible. struct _DNSServiceRef_t @@ -870,7 +870,7 @@ static void CallbackWithError(DNSServiceRef sdRef, DNSServiceErrorType error) // call the callback with a subordinate sdRef the application can call DNSServiceRefDeallocate // on the main sdRef and DNSServiceRefDeallocate handles this case by walking all the sdRefs and // clears the moreptr so that we can terminate here. - // + // If DNSServiceRefDeallocate was not called in the callback, then set moreptr to NULL so that // we don't access the stack variable after we return from this function. if (!morebytes) {syslog(LOG_WARNING, "dnssdclientstub:sdRef: CallbackwithError morebytes zero sdr %p", sdr); return;} diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h index 37bae8a1c431..29466c1c0138 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h @@ -30,9 +30,9 @@ #define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_MDNSRESPONDER_DNSSD_IPC_H -// + // Common cross platform services -// + #if defined(WIN32) # include <winsock2.h> #endif diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 006919aae283..aa4ae8760461 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -43,7 +43,7 @@ namespace sd { static const sal_uLong HIDE_MOUSE_TIMEOUT = 10000; static const sal_uLong SHOW_MOUSE_TIMEOUT = 1000; -// ============================================================================= + ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, ::Window* pParent ) : ::sd::Window( pParent ) diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index de376763bcba..849b2a7d36fe 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -101,7 +101,7 @@ namespace { } -////////////////////////////////////////////////////////////////////////////// + const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index eee338483171..9424c114c7d5 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -3629,7 +3629,7 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const throw IllegalArgumentException(); } -//////////////////////////////// + // XAnimationListener diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index d4eeabb5fbe1..17584c78797a 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -87,7 +87,7 @@ class SlideShowView; class AnimationSlideController; class PaneHider; -// -------------------------------------------------------------------- + struct PresentationSettingsEx : public PresentationSettings { @@ -105,7 +105,7 @@ struct PresentationSettingsEx : public PresentationSettings void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException); }; -// -------------------------------------------------------------------- + struct WrappedShapeEventImpl { @@ -118,7 +118,7 @@ struct WrappedShapeEventImpl typedef boost::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr; typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap; -// -------------------------------------------------------------------- + class SlideShowListenerProxy : private ::cppu::BaseMutex, public ::cppu::WeakImplHelper2< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener > @@ -162,7 +162,7 @@ public: css::uno::Reference< css::presentation::XSlideShow > mxSlideShow; }; -// -------------------------------------------------------------------- + typedef ::cppu::WeakComponentImplHelper2< css::presentation::XSlideShowController, css::container::XIndexAccess > SlideshowImplBase; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 2eed17d46b69..48a782585c50 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -50,10 +50,8 @@ using namespace ::com::sun::star; namespace sd { -/////////////////////////////////////////////////////////////////////// -// SlideShowViewListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewListeners SlideShowViewListeners::SlideShowViewListeners( ::osl::Mutex& rMutex ) : mrMutex( rMutex ) { @@ -114,10 +112,8 @@ void SlideShowViewListeners::disposing( const lang::EventObject& _rEventSource ) maListeners.clear(); } -/////////////////////////////////////////////////////////////////////// -// SlideShowViewPaintListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewPaintListeners SlideShowViewPaintListeners::SlideShowViewPaintListeners( ::osl::Mutex& rMutex ) : SlideShowViewPaintListeners_Base( rMutex ) { @@ -130,10 +126,8 @@ bool SlideShowViewPaintListeners::implTypedNotify( const Reference< awt::XPaintL return true; // continue calling listeners } -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseListeners SlideShowViewMouseListeners::SlideShowViewMouseListeners( ::osl::Mutex& rMutex ) : SlideShowViewMouseListeners_Base( rMutex ) { @@ -164,10 +158,8 @@ bool SlideShowViewMouseListeners::implTypedNotify( const Reference< awt::XMouseL return true; // continue calling listeners } -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseMotionListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseMotionListeners SlideShowViewMouseMotionListeners::SlideShowViewMouseMotionListeners( ::osl::Mutex& rMutex ) : SlideShowViewMouseMotionListeners_Base( rMutex ) { @@ -190,9 +182,9 @@ bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::X return true; // continue calling listeners } -/////////////////////////////////////////////////////////////////////// + // SlideShowView -/////////////////////////////////////////////////////////////////////// + SlideShowView::SlideShowView( ShowWindow& rOutputWindow, SdDrawDocument* pDoc, @@ -223,7 +215,7 @@ SlideShowView::SlideShowView( ShowWindow& rOutputWindow, mTranslationOffset.Height = 0; } -/// Dispose all internal references +// Dispose all internal references void SAL_CALL SlideShowView::dispose() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -250,7 +242,7 @@ void SAL_CALL SlideShowView::dispose() throw (RuntimeException) WeakComponentImplHelperBase::dispose(); } -/// Disposing our broadcaster +// Disposing our broadcaster void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 27d543d45257..c6d674d7117c 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -98,10 +98,8 @@ struct WrappedMouseMotionEvent : public ::com::sun::star::lang::EventObject ::com::sun::star::awt::MouseEvent maEvent; }; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewListeners typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > > ViewListenerVector; class SlideShowViewListeners { @@ -120,10 +118,8 @@ protected: typedef ::std::auto_ptr< SlideShowViewListeners > SlideShowViewListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewPaintListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewPaintListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XPaintListener, ::com::sun::star::awt::PaintEvent > SlideShowViewPaintListeners_Base; @@ -137,10 +133,8 @@ protected: }; typedef ::std::auto_ptr< SlideShowViewPaintListeners > SlideShowViewPaintListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseListener, WrappedMouseEvent > SlideShowViewMouseListeners_Base; class SlideShowViewMouseListeners : public SlideShowViewMouseListeners_Base @@ -156,10 +150,8 @@ protected: typedef ::std::auto_ptr< SlideShowViewMouseListeners > SlideShowViewMouseListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseMotionListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseMotionListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseMotionListener, WrappedMouseMotionEvent > SlideShowViewMouseMotionListeners_Base; @@ -175,10 +167,8 @@ protected: typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners > SlideShowViewMouseMotionListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowView -/////////////////////////////////////////////////////////////////////// +// SlideShowView class ShowWindow; class SlideshowImpl; diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 45ae4beae044..1b73da750733 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -833,7 +833,7 @@ void TableDesignWidget::FillDesignPreviewControl() m_pValueSet->SelectItem(nSelectedItem); } -// ==================================================================== + short TableDesignDialog::Execute() { @@ -849,14 +849,14 @@ short TableDesignDialog::Execute() return RET_CANCEL; } -// ==================================================================== + ::Window * createTableDesignPanel( ::Window* pParent, ViewShellBase& rBase ) { return new TableDesignPane( pParent, rBase ); } -// ==================================================================== + void showTableDesignDialog( ::Window* pParent, ViewShellBase& rBase ) { diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 9ec8f454c84d..ca5394bf030d 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -43,7 +43,7 @@ class EventMultiplexerEvent; class ViewShellBase; -// -------------------------------------------------------------------- + #define CB_HEADER_ROW 0 #define CB_TOTAL_ROW 1 @@ -121,7 +121,7 @@ public: } }; -// -------------------------------------------------------------------- + class TableDesignDialog : public ModalDialog { diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 2ec197365197..901f8b2a0c90 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -522,25 +522,25 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes return aTypeName; } -/* XServiceInfo */ +// XServiceInfo OUString SAL_CALL SdFilterDetect::getImplementationName() throw( RuntimeException ) { return impl_getStaticImplementationName(); } \ -/* XServiceInfo */ +// XServiceInfo sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException ) { return cppu::supportsService(this, sServiceName); } -/* XServiceInfo */ +// XServiceInfo Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( RuntimeException ) { return impl_getStaticSupportedServiceNames(); } -/* Helper for XServiceInfo */ +// Helper for XServiceInfo Sequence< OUString > SdFilterDetect::impl_getStaticSupportedServiceNames() { Sequence< OUString > seqServiceNames( 1 ); @@ -548,13 +548,13 @@ Sequence< OUString > SdFilterDetect::impl_getStaticSupportedServiceNames() return seqServiceNames ; } -/* Helper for XServiceInfo */ +// Helper for XServiceInfo OUString SdFilterDetect::impl_getStaticImplementationName() { return OUString( "com.sun.star.comp.draw.FormatDetector" ); } -/* Helper for registry */ +// Helper for registry Reference< XInterface > SAL_CALL SdFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( Exception ) { return static_cast< cppu::OWeakObject * >( diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx index fea874b4295e..f58c1cd33f04 100644 --- a/sd/source/ui/unoidl/sddetect.hxx +++ b/sd/source/ui/unoidl/sddetect.hxx @@ -58,9 +58,9 @@ public: SFX_DECL_XSERVICEINFO_NOFACTORY - //---------------------------------------------------------------------------------- + // XExtendedFilterDetect - //---------------------------------------------------------------------------------- + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); }; diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index b5e7538f19c6..7e77cc2cfca1 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -30,7 +30,7 @@ #include <cppuhelper/implbase5.hxx> #include <comphelper/servicehelper.hxx> -/////////////////////////////////////////////////////////////////////////////// + class SdXImpressDocument; class SdCustomShow; @@ -94,7 +94,7 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); }; -// -------------------------------------------------------------------------- + #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index f0ef6b8f3140..1009ad341010 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -27,7 +27,7 @@ #include <svx/svdobj.hxx> #include <cppuhelper/supportsservice.hxx> -// folgende fuer InsertSdPage() +// following ones for InsertSdPage() #include <svx/svdlayer.hxx> #include "DrawDocShell.hxx" @@ -53,10 +53,8 @@ using namespace ::rtl; using namespace ::com::sun::star; -//============================================================================= -// class SdLayer -//============================================================================= +// class SdLayer #define WID_LAYER_LOCKED 1 #define WID_LAYER_PRINTABLE 2 #define WID_LAYER_VISIBLE 3 @@ -136,7 +134,6 @@ OUString SdLayer::convertToExternalName( const OUString& rName ) } } -/** */ SdLayer::SdLayer( SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_ ) throw() : pLayerManager(pLayerManager_) , mxLayerManager(pLayerManager_) @@ -145,7 +142,6 @@ SdLayer::SdLayer( SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_ ) throw() { } -/** */ SdLayer::~SdLayer() throw() { } @@ -304,7 +300,6 @@ void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& , const uno void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -/** */ sal_Bool SdLayer::get( LayerAttribute what ) throw() { if(pLayer&&pLayerManager) @@ -402,11 +397,7 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() //TODO: uno::Exception? } - - - -//===== ::com::sun::star::container::XChild ================================= - +// ::com::sun::star::container::XChild uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void) throw (::com::sun::star::uno::RuntimeException) { @@ -445,18 +436,14 @@ void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventLi } -//============================================================================= -// class SdLayerManager -//============================================================================= -/** */ +// class SdLayerManager SdLayerManager::SdLayerManager( SdXImpressDocument& rMyModel ) throw() :mpModel( &rMyModel) { mpLayers = new SvUnoWeakContainer; } -/** */ SdLayerManager::~SdLayerManager() throw() { dispose(); @@ -650,7 +637,6 @@ uno::Any SAL_CALL SdLayerManager::getByIndex( sal_Int32 nLayer ) return aAny; } - // XNameAccess uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 27b32360f469..f36110e80c3f 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -160,7 +160,7 @@ void SdUnoForbiddenCharsTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) t } } -/////////////////////////////////////////////////////////////////////// + const sal_Int32 WID_MODEL_LANGUAGE = 1; const sal_Int32 WID_MODEL_TABSTOP = 2; @@ -2129,10 +2129,10 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r // insert the bookmark to this page into the NamedDestinations if( pPDFExtOutDevData->GetIsExportNamedDestinations() ) pPDFExtOutDevData->CreateNamedDest( aPageName, aPageRect, nPageNumber - 1 ); - // + // add the name to the outline, (almost) same code as in sc/source/ui/unoobj/docuno.cxx // issue #i40318. - // + if( pPDFExtOutDevData->GetIsExportBookmarks() ) { // Destination Export @@ -2333,9 +2333,9 @@ void SAL_CALL SdXImpressDocument::dispose() throw (::com::sun::star::uno::Runtim } } -//============================================================================= + // class SdDrawPagesAccess -//============================================================================= + SdDrawPagesAccess::SdDrawPagesAccess( SdXImpressDocument& rMyModel ) throw() : mpModel( &rMyModel) @@ -2589,9 +2589,9 @@ void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang OSL_FAIL( "not implemented!" ); } -//============================================================================= + // class SdMasterPagesAccess -//============================================================================= + SdMasterPagesAccess::SdMasterPagesAccess( SdXImpressDocument& rMyModel ) throw() : mpModel(&rMyModel) @@ -2841,9 +2841,9 @@ uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames return aSeq; } -//============================================================================= + // class SdDocLinkTargets -//============================================================================= + SdDocLinkTargets::SdDocLinkTargets( SdXImpressDocument& rMyModel ) throw() : mpModel( &rMyModel ) diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 96dcdf59821c..b18e8d0d0cc4 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -88,7 +88,7 @@ using ::com::sun::star::drawing::XShape; extern OUString getPageApiNameFromUiName( const OUString& rUIName ); extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ); -/////////////////////////////////////////////////////////////////////// + typedef std::map<sal_uIntPtr, SfxExtItemPropertySetInfo*> SdExtPropertySetInfoCache; static SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache; @@ -97,7 +97,7 @@ static SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache; typedef std::map<sal_uInt32, uno::Sequence< uno::Type >*> SdTypesCache; static SdTypesCache gImplTypesCache; -/////////////////////////////////////////////////////////////////////// + #define WID_EFFECT 1 diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index d066bc8222ef..81b0a8ad0cf6 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -86,7 +86,7 @@ extern Reference< XAnnotation > createAnnotation( const Reference< XComponentCon extern Reference< XAnnotationEnumeration > createAnnotationEnumeration( const sd::AnnotationVector& ); } -/* this are the ids for page properties */ +// this are the ids for page properties enum WID_PAGE { WID_PAGE_LEFT, WID_PAGE_RIGHT, WID_PAGE_TOP, WID_PAGE_BOTTOM, WID_PAGE_WIDTH, @@ -103,7 +103,7 @@ enum WID_PAGE static sal_Char const sEmptyPageName[sizeof("page")] = "page"; -/** this function stores the property maps for draw pages in impress and draw */ +// this function stores the property maps for draw pages in impress and draw const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKind ePageKind ) { static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] = @@ -1862,10 +1862,8 @@ Reference< XAnimationNode > SAL_CALL SdGenericDrawPage::getAnimationNode() throw return pSdPage->getAnimationNode(); } -//======================================================================== -// SdPageLinkTargets -//======================================================================== +// SdPageLinkTargets SdPageLinkTargets::SdPageLinkTargets( SdGenericDrawPage* pUnoPage ) throw() { mxPage = pUnoPage; @@ -1876,7 +1874,7 @@ SdPageLinkTargets::~SdPageLinkTargets() throw() { } - // XElementAccess +// XElementAccess uno::Type SAL_CALL SdPageLinkTargets::getElementType() throw(uno::RuntimeException) { @@ -2021,10 +2019,8 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames() return aSeq; } -//======================================================================== -// SdDrawPage -//======================================================================== +// SdDrawPage SdDrawPage::SdDrawPage( SdXImpressDocument* pModel, SdPage* pPage ) throw() : SdGenericDrawPage( pModel, pPage, ImplGetDrawPagePropertySet( pModel->IsImpressDocument(), pPage->GetPageKind() ) ) { @@ -2422,7 +2418,6 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getNotesPage() return NULL; } - // XIndexAccess sal_Int32 SAL_CALL SdDrawPage::getCount() throw(uno::RuntimeException) @@ -2674,10 +2669,7 @@ Any SdGenericDrawPage::getNavigationOrder() } } -//======================================================================== // class SdMasterPage -//======================================================================== - SdMasterPage::SdMasterPage( SdXImpressDocument* pModel, SdPage* pPage ) throw() : SdGenericDrawPage( pModel, pPage, ImplGetMasterPagePropertySet( pPage ? pPage->GetPageKind() : PK_STANDARD ) ) { diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index e8e7319b8f09..476ba6a744f4 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -941,7 +941,7 @@ void ToolBarManager::Implementation::Update ( // updated (under the assumption that our lock to the // ViewShellManager was the only one open. If that is not the // case then all should still be well but not as fast.) - // + // Note that the lock count may have been increased since // entering this method. In that case one of the next // UnlockUpdate() calls will post the UpdateCallback. diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index c82e123049f4..26d6b950e022 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1366,13 +1366,13 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } } - /////////////////////////////////////////////////////////////////////// + // Menuoption: Change->Convert->To Bitmap, Change->Convert->To Metafile // disable, if there only Bitmap or Metafiles marked // Menuoption: Format->Area, Format->Line // disabled, if the marked objects not able to handle // these attributes - // + bool bSingleGraphicSelected = false; @@ -1487,10 +1487,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem (SID_ATTR_GRAF_CROP); } - /////////////////////////////////////////////////////////////////////// + // Menuoption: Edit->Hyperlink // Disable, if there is no hyperlink - // + sal_Bool bDisableEditHyperlink = sal_True; if( mpDrawView->AreObjectsMarked() && ( mpDrawView->GetMarkedObjectList().GetMarkCount() == 1 ) ) { diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index b456f7f24bc2..ab096ecde125 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -302,7 +302,7 @@ Pointer ImageButtonHdl::GetPointer() const return Pointer( POINTER_ARROW ); } -// ==================================================================== + ChangePlaceholderTag::ChangePlaceholderTag( ::sd::View& rView, SdrObject& rPlaceholderObj ) : SmartTag( rView ) diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx index 99fad9ef0cb2..353a1ced2734 100644 --- a/sd/workben/custompanel/ctp_panel.cxx +++ b/sd/workben/custompanel/ctp_panel.cxx @@ -32,10 +32,10 @@ #include <tools/diagnose_ex.h> -//...................................................................................................................... + namespace sd { namespace colortoolpanel { -//...................................................................................................................... + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -70,9 +70,9 @@ namespace sd { namespace colortoolpanel namespace WindowAttribute = ::com::sun::star::awt::WindowAttribute; namespace PosSize = ::com::sun::star::awt::PosSize; - //================================================================================================================== + //= helpers - //================================================================================================================== + namespace { Reference< XWindow > lcl_createPlainWindow_nothrow( const Reference< XComponentContext >& i_rContext, @@ -100,9 +100,9 @@ namespace sd { namespace colortoolpanel return NULL; } } - //================================================================================================================== + //= class SingleColorPanel - //================================================================================================================== + SingleColorPanel::SingleColorPanel( const Reference< XComponentContext >& i_rContext, const Reference< XConfigurationController >& i_rConfigController, const Reference< XResourceId >& i_rResourceId ) @@ -230,8 +230,8 @@ namespace sd { namespace colortoolpanel m_xWindow.clear(); } -//...................................................................................................................... + } } // namespace sd::colortoolpanel -//...................................................................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx index b067ddc6bddc..bbe0379eac2d 100644 --- a/sd/workben/custompanel/ctp_panel.hxx +++ b/sd/workben/custompanel/ctp_panel.hxx @@ -32,14 +32,13 @@ #include <boost/scoped_ptr.hpp> -//...................................................................................................................... + namespace sd { namespace colortoolpanel { -//...................................................................................................................... - //================================================================================================================== - //= class SingleColorPanel - //================================================================================================================== + + + // class SingleColorPanel typedef ::cppu::WeakComponentImplHelper3 < ::com::sun::star::drawing::framework::XView , ::com::sun::star::ui::XToolPanel , ::com::sun::star::awt::XPaintListener @@ -83,9 +82,8 @@ namespace sd { namespace colortoolpanel ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xWindow; }; -//...................................................................................................................... + } } // namespace sd::colortoolpanel -//...................................................................................................................... #endif // INCLUDED_SD_WORKBEN_CUSTOMPANEL_CTP_PANEL_HXX |