diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 20:51:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 07:42:24 -0600 |
| commit | b1181b89f3c6a0b435f49d9b2bfa18db2b5f6f3c (patch) | |
| tree | 1ccd7fbb50f8ef1a6ac846e178550da83cd263ca | |
| parent | 060ab521fa0d5d6b9fcb97eab4718c04e8aec944 (diff) | |
Remove visual noise from svx
Change-Id: I56497d953b0500ba0967fddb36ca8bbbe86c62ad
Reviewed-on: https://gerrit.libreoffice.org/8321
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
373 files changed, 3094 insertions, 3096 deletions
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index cd499d60bf4b..f14b5837ea80 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -33,9 +33,9 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -// ---------------------- + // - GalleryBrowserMode - -// ---------------------- + enum GalleryBrowserMode { @@ -45,9 +45,9 @@ enum GalleryBrowserMode GALLERYBROWSERMODE_PREVIEW = 3 }; -// ----------------- + // - GalleryTravel - -// ----------------- + enum GalleryBrowserTravel { @@ -58,17 +58,17 @@ enum GalleryBrowserTravel GALLERYBROWSERTRAVEL_NEXT = 4 }; -// ------------------------ + // - GalleryItemTextFlags - -// ------------------------ + #define GALLERY_ITEM_THEMENAME 0x00000001 #define GALLERY_ITEM_TITLE 0x00000002 #define GALLERY_ITEM_PATH 0x00000004 -// ------------------ + // - GalleryToolBox - -// ------------------ + class GalleryToolBox : public ToolBox { @@ -82,9 +82,9 @@ public: ~GalleryToolBox(); }; -// ------------------- + // - GalleryBrowser2 - -// ------------------- + class Gallery; class GalleryTheme; diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi index a7bc807c8fee..af34d7b61eb1 100644 --- a/svx/sdi/fmslots.sdi +++ b/svx/sdi/fmslots.sdi @@ -306,32 +306,32 @@ interface Form ExecMethod = Execute ; StateMethod = GetState ; ] - //-------------------------------------------------------------------------- + SID_FM_FMEXPLORER_CONTROL [ StateMethod = GetState ; ] - //-------------------------------------------------------------------------- + SID_FM_DATANAVIGATOR_CONTROL [ StateMethod = GetState ; ] - //-------------------------------------------------------------------------- + SID_FM_FIELDS_CONTROL [ StateMethod = GetState ; ] - //-------------------------------------------------------------------------- + SID_FM_PROPERTY_CONTROL [ StateMethod = GetState ; ] - //-------------------------------------------------------------------------- + SID_FM_FILTER_NAVIGATOR_CONTROL [ StateMethod = GetState ; ] - //-------------------------------------------------------------------------- + SID_FM_SHOW_PROPERTIES [ StateMethod = GetState ; diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 4b410e3236f4..3673283f1f68 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -42,7 +42,7 @@ SfxBoolItem AbsoluteRecord SID_FM_RECORD_ABSOLUTE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem AddField SID_FM_ADD_FIELD [ @@ -69,7 +69,7 @@ SfxBoolItem AddField SID_FM_ADD_FIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem AddTable SID_FM_ADDTABLE () [ @@ -94,7 +94,7 @@ SfxVoidItem AddTable SID_FM_ADDTABLE GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem AlignCenter SID_OBJECT_ALIGN_CENTER () [ @@ -119,7 +119,7 @@ SfxVoidItem AlignCenter SID_OBJECT_ALIGN_CENTER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AlignDown SID_OBJECT_ALIGN_DOWN () [ @@ -144,7 +144,7 @@ SfxVoidItem AlignDown SID_OBJECT_ALIGN_DOWN GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ObjectAlignLeft SID_OBJECT_ALIGN_LEFT () [ @@ -169,7 +169,7 @@ SfxVoidItem ObjectAlignLeft SID_OBJECT_ALIGN_LEFT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxAdjustItem Alignment SID_ATTR_PARA_ADJUST [ @@ -196,7 +196,7 @@ SvxAdjustItem Alignment SID_ATTR_PARA_ADJUST GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AlignMiddle SID_OBJECT_ALIGN_MIDDLE () [ @@ -221,7 +221,7 @@ SfxVoidItem AlignMiddle SID_OBJECT_ALIGN_MIDDLE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ObjectAlignRight SID_OBJECT_ALIGN_RIGHT () [ @@ -246,7 +246,7 @@ SfxVoidItem ObjectAlignRight SID_OBJECT_ALIGN_RIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AlignUp SID_OBJECT_ALIGN_UP () [ @@ -271,7 +271,7 @@ SfxVoidItem AlignUp SID_OBJECT_ALIGN_UP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem Arc SID_DRAW_ARC (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND) [ @@ -299,7 +299,7 @@ SfxVoidItem Arc SID_DRAW_ARC GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem Assign3D SID_3D_ASSIGN [ @@ -326,7 +326,7 @@ SfxBoolItem Assign3D SID_3D_ASSIGN GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem AutoControlFocus SID_FM_AUTOCONTROLFOCUS [ @@ -353,7 +353,7 @@ SfxBoolItem AutoControlFocus SID_FM_AUTOCONTROLFOCUS GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem AutoFilter SID_FM_AUTOFILTER () [ @@ -378,7 +378,7 @@ SfxVoidItem AutoFilter SID_FM_AUTOFILTER GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem AutoFormat SID_AUTOFORMAT (SfxStringItem aFormatName SID_AUTOFORMAT) [ @@ -403,7 +403,7 @@ SfxVoidItem AutoFormat SID_AUTOFORMAT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem BackgroundImage SID_GALLERY_BG_BRUSH (SvxBrushItem Background SID_GALLERY_BG_BRUSH, SfxUInt16Item Position SID_GALLERY_BG_POS) @@ -432,7 +432,7 @@ SfxVoidItem BackgroundImage SID_GALLERY_BG_BRUSH GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxStringItem TableStyle SID_TABLE_STYLE () @@ -458,7 +458,7 @@ SfxStringItem TableStyle SID_TABLE_STYLE GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem TableStyleSettings SID_TABLE_STYLE_SETTINGS (SfxBoolItem UseFirstRowStyle ID_VAL_USEFIRSTROWSTYLE, @@ -489,7 +489,7 @@ SfxVoidItem TableStyleSettings SID_TABLE_STYLE_SETTINGS GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem TableDesign SID_TABLEDESIGN [ /* flags: */ @@ -512,7 +512,7 @@ SfxVoidItem TableDesign SID_TABLEDESIGN ToolBoxConfig = TRUE, GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxColorItem BackgroundColor SID_BACKGROUND_COLOR [ @@ -539,7 +539,7 @@ SvxColorItem BackgroundColor SID_BACKGROUND_COLOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxBrushItem BackgroundPattern SID_ATTR_BRUSH [ @@ -566,7 +566,7 @@ SvxBrushItem BackgroundPattern SID_ATTR_BRUSH GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxBrushItem BackgroundPatternController SID_BACKGROUND_PATTERN [ @@ -593,7 +593,7 @@ SvxBrushItem BackgroundPatternController SID_BACKGROUND_PATTERN GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem Bezier_Unfilled SID_DRAW_BEZIER_NOFILL [ @@ -620,7 +620,7 @@ SfxBoolItem Bezier_Unfilled SID_DRAW_BEZIER_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem BezierAppend SID_BEZIER_APPEND [ @@ -647,7 +647,7 @@ SfxBoolItem BezierAppend SID_BEZIER_APPEND GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxStringItem BezierClose SID_BEZIER_CLOSE [ @@ -674,7 +674,7 @@ SfxStringItem BezierClose SID_BEZIER_CLOSE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxStringItem BezierConvert SID_BEZIER_CONVERT [ @@ -701,7 +701,7 @@ SfxStringItem BezierConvert SID_BEZIER_CONVERT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem BezierCutLine SID_BEZIER_CUTLINE [ @@ -728,7 +728,7 @@ SfxBoolItem BezierCutLine SID_BEZIER_CUTLINE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem BezierDelete SID_BEZIER_DELETE [ @@ -755,7 +755,7 @@ SfxBoolItem BezierDelete SID_BEZIER_DELETE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem BezierEdge SID_BEZIER_EDGE [ @@ -782,7 +782,7 @@ SfxBoolItem BezierEdge SID_BEZIER_EDGE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem BezierEliminatePoints SID_BEZIER_ELIMINATE_POINTS [ @@ -809,7 +809,7 @@ SfxBoolItem BezierEliminatePoints SID_BEZIER_ELIMINATE_POINTS GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem BezierFill SID_DRAW_BEZIER_FILL [ @@ -836,7 +836,7 @@ SfxBoolItem BezierFill SID_DRAW_BEZIER_FILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem BezierInsert SID_BEZIER_INSERT [ @@ -863,7 +863,7 @@ SfxBoolItem BezierInsert SID_BEZIER_INSERT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem BezierMove SID_BEZIER_MOVE [ @@ -890,7 +890,7 @@ SfxBoolItem BezierMove SID_BEZIER_MOVE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem BezierSmooth SID_BEZIER_SMOOTH [ @@ -917,7 +917,7 @@ SfxBoolItem BezierSmooth SID_BEZIER_SMOOTH GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem BezierSymmetric SID_BEZIER_SYMMTR [ @@ -944,7 +944,7 @@ SfxBoolItem BezierSymmetric SID_BEZIER_SYMMTR GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem BezierTo SID_BEZIERTO (SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y) [ @@ -969,7 +969,7 @@ SfxVoidItem BezierTo SID_BEZIERTO GroupId = ; ] -//-------------------------------------------------------------------------- + SfxBoolItem BmpMask SID_BMPMASK [ @@ -996,7 +996,7 @@ SfxBoolItem BmpMask SID_BMPMASK GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxBoolItem BmpMaskExec SID_BMPMASK_EXEC [ @@ -1023,7 +1023,7 @@ SfxBoolItem BmpMaskExec SID_BMPMASK_EXEC GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxBoolItem BmpMaskPipette SID_BMPMASK_PIPETTE [ @@ -1050,7 +1050,7 @@ SfxBoolItem BmpMaskPipette SID_BMPMASK_PIPETTE GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SvxWeightItem Bold SID_ATTR_CHAR_WEIGHT [ @@ -1077,7 +1077,7 @@ SvxWeightItem Bold SID_ATTR_CHAR_WEIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxWeightItem BoldLatin SID_ATTR_CHAR_LATIN_WEIGHT [ @@ -1104,7 +1104,7 @@ SvxWeightItem BoldLatin SID_ATTR_CHAR_LATIN_WEIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxWeightItem BoldCJK SID_ATTR_CHAR_CJK_WEIGHT [ @@ -1131,7 +1131,7 @@ SvxWeightItem BoldCJK SID_ATTR_CHAR_CJK_WEIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxWeightItem BoldCTL SID_ATTR_CHAR_CTL_WEIGHT [ @@ -1158,7 +1158,7 @@ SvxWeightItem BoldCTL SID_ATTR_CHAR_CTL_WEIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxObjectItem Border SID_BORDER_OBJECT [ @@ -1185,7 +1185,7 @@ SfxObjectItem Border SID_BORDER_OBJECT GroupId = ; ] -//-------------------------------------------------------------------------- + SvxBoxInfoItem BorderInner SID_ATTR_BORDER_INNER [ @@ -1212,7 +1212,7 @@ SvxBoxInfoItem BorderInner SID_ATTR_BORDER_INNER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxBoxItem BorderOuter SID_ATTR_BORDER_OUTER [ @@ -1239,7 +1239,7 @@ SvxBoxItem BorderOuter SID_ATTR_BORDER_OUTER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetBorderStyle SID_ATTR_BORDER (SvxBoxItem OuterBorder SID_ATTR_BORDER_OUTER,SvxBoxInfoItem InnerBorder SID_ATTR_BORDER_INNER) [ @@ -1267,7 +1267,7 @@ SfxVoidItem SetBorderStyle SID_ATTR_BORDER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem BringToFront SID_FRAME_TO_TOP () [ @@ -1292,7 +1292,7 @@ SfxVoidItem BringToFront SID_FRAME_TO_TOP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem DrawCaption SID_DRAW_CAPTION [ @@ -1319,7 +1319,7 @@ SfxBoolItem DrawCaption SID_DRAW_CAPTION GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SvxCaseMapItem CaseMap SID_ATTR_CHAR_CASEMAP [ @@ -1346,7 +1346,7 @@ SvxCaseMapItem CaseMap SID_ATTR_CHAR_CASEMAP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem CenterPara SID_ATTR_PARA_ADJUST_CENTER [ @@ -1374,7 +1374,7 @@ SfxBoolItem CenterPara SID_ATTR_PARA_ADJUST_CENTER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeCaseToFullWidth SID_TRANSLITERATE_FULLWIDTH () [ @@ -1399,7 +1399,7 @@ SfxVoidItem ChangeCaseToFullWidth SID_TRANSLITERATE_FULLWIDTH GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeCaseToHalfWidth SID_TRANSLITERATE_HALFWIDTH () [ @@ -1424,7 +1424,7 @@ SfxVoidItem ChangeCaseToHalfWidth SID_TRANSLITERATE_HALFWIDTH GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeCaseToHiragana SID_TRANSLITERATE_HIRAGANA () [ @@ -1449,7 +1449,7 @@ SfxVoidItem ChangeCaseToHiragana SID_TRANSLITERATE_HIRAGANA GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeCaseToKatakana SID_TRANSLITERATE_KATAGANA () [ @@ -1474,7 +1474,7 @@ SfxVoidItem ChangeCaseToKatakana SID_TRANSLITERATE_KATAGANA GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeCaseToSentenceCase SID_TRANSLITERATE_SENTENCE_CASE () [ @@ -1499,7 +1499,7 @@ SfxVoidItem ChangeCaseToSentenceCase SID_TRANSLITERATE_SENTENCE_CASE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeCaseToTitleCase SID_TRANSLITERATE_TITLE_CASE () [ @@ -1524,7 +1524,7 @@ SfxVoidItem ChangeCaseToTitleCase SID_TRANSLITERATE_TITLE_CASE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeCaseToToggleCase SID_TRANSLITERATE_TOGGLE_CASE () [ @@ -1549,7 +1549,7 @@ SfxVoidItem ChangeCaseToToggleCase SID_TRANSLITERATE_TOGGLE_CASE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeCaseRotateCase SID_TRANSLITERATE_ROTATE_CASE () [ @@ -1574,7 +1574,7 @@ SfxVoidItem ChangeCaseRotateCase SID_TRANSLITERATE_ROTATE_CASE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeCaseToLower SID_TRANSLITERATE_LOWER () [ @@ -1599,7 +1599,7 @@ SfxVoidItem ChangeCaseToLower SID_TRANSLITERATE_LOWER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeCaseToUpper SID_TRANSLITERATE_UPPER () [ @@ -1624,7 +1624,7 @@ SfxVoidItem ChangeCaseToUpper SID_TRANSLITERATE_UPPER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ChangeControlType SID_FM_CHANGECONTROLTYPE [ @@ -1651,7 +1651,7 @@ SfxBoolItem ChangeControlType SID_FM_CHANGECONTROLTYPE GroupId = ; ] -//-------------------------------------------------------------------------- + SvxFontItem CharFontName SID_ATTR_CHAR_FONT [ @@ -1730,7 +1730,7 @@ SvxFontItem CharEndPreviewFontName SID_ATTR_CHAR_ENDPREVIEW_FONT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxFontItem CharFontNameLatin SID_ATTR_CHAR_LATIN_FONT [ @@ -1757,7 +1757,7 @@ SvxFontItem CharFontNameLatin SID_ATTR_CHAR_LATIN_FONT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxFontItem CharFontNameCJK SID_ATTR_CHAR_CJK_FONT [ @@ -1784,7 +1784,7 @@ SvxFontItem CharFontNameCJK SID_ATTR_CHAR_CJK_FONT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxFontItem CharFontNameCTL SID_ATTR_CHAR_CTL_FONT [ @@ -1811,7 +1811,7 @@ SvxFontItem CharFontNameCTL SID_ATTR_CHAR_CTL_FONT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem Checkbox SID_INSERT_CHECKBOX [ @@ -1838,7 +1838,7 @@ SfxBoolItem Checkbox SID_INSERT_CHECKBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem CheckBox SID_FM_CHECKBOX [ @@ -1865,7 +1865,7 @@ SfxBoolItem CheckBox SID_FM_CHECKBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SvxChooseControlItem ChooseControls SID_CHOOSE_CONTROLS [ @@ -1894,7 +1894,7 @@ SvxChooseControlItem ChooseControls SID_CHOOSE_CONTROLS PseudoPrefix = SID_INSERT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ChoosePolygon SID_CHOOSE_POLYGON [ @@ -1921,7 +1921,7 @@ SfxBoolItem ChoosePolygon SID_CHOOSE_POLYGON GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem Circle SID_DRAW_CIRCLE (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y) [ @@ -1949,7 +1949,7 @@ SfxVoidItem Circle SID_DRAW_CIRCLE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem Circle_Unfilled SID_DRAW_CIRCLE_NOFILL (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y) [ @@ -1977,7 +1977,7 @@ SfxVoidItem Circle_Unfilled SID_DRAW_CIRCLE_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem CircleArc SID_DRAW_CIRCLEARC (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND) [ @@ -2005,7 +2005,7 @@ SfxVoidItem CircleArc SID_DRAW_CIRCLEARC GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem CircleCut SID_DRAW_CIRCLECUT (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND) [ @@ -2033,7 +2033,7 @@ SfxVoidItem CircleCut SID_DRAW_CIRCLECUT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem CircleCut_Unfilled SID_DRAW_CIRCLECUT_NOFILL (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND) [ @@ -2061,7 +2061,7 @@ SfxVoidItem CircleCut_Unfilled SID_DRAW_CIRCLECUT_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem CirclePie SID_DRAW_CIRCLEPIE (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND) [ @@ -2089,7 +2089,7 @@ SfxVoidItem CirclePie SID_DRAW_CIRCLEPIE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem CirclePie_Unfilled SID_DRAW_CIRCLEPIE_NOFILL (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND) [ @@ -2117,7 +2117,7 @@ SfxVoidItem CirclePie_Unfilled SID_DRAW_CIRCLEPIE_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem ClearOutline SID_OUTLINE_DELETEALL () [ @@ -2142,7 +2142,7 @@ SfxVoidItem ClearOutline SID_OUTLINE_DELETEALL GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SvxColorItem Color SID_ATTR_CHAR_COLOR [ @@ -2169,7 +2169,7 @@ SvxColorItem Color SID_ATTR_CHAR_COLOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ColorControl SID_COLOR_CONTROL [ @@ -2196,7 +2196,7 @@ SfxBoolItem ColorControl SID_COLOR_CONTROL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ComboBox SID_FM_COMBOBOX [ @@ -2223,7 +2223,7 @@ SfxBoolItem ComboBox SID_FM_COMBOBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem NavigationBar SID_FM_NAVIGATIONBAR [ /* flags: */ @@ -2249,7 +2249,7 @@ SfxBoolItem NavigationBar SID_FM_NAVIGATIONBAR GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem Combobox SID_INSERT_COMBOBOX [ @@ -2276,7 +2276,7 @@ SfxBoolItem Combobox SID_INSERT_COMBOBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxUInt16Item Config SID_FM_CONFIG [ @@ -2305,7 +2305,7 @@ SfxUInt16Item Config SID_FM_CONFIG PseudoPrefix = SID_INSERT; ] -//-------------------------------------------------------------------------- + SfxBoolItem MoreControls SID_FM_MORE_CONTROLS [ @@ -2334,7 +2334,7 @@ SfxBoolItem MoreControls SID_FM_MORE_CONTROLS PseudoPrefix = SID_INSERT; ] -//-------------------------------------------------------------------------- + SfxBoolItem FormDesignTools SID_FM_FORM_DESIGN_TOOLS [ @@ -2363,7 +2363,7 @@ SfxBoolItem FormDesignTools SID_FM_FORM_DESIGN_TOOLS PseudoPrefix = SID_INSERT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ContourDialog SID_CONTOUR_DLG [ @@ -2390,7 +2390,7 @@ SfxBoolItem ContourDialog SID_CONTOUR_DLG GroupId = GID_GRAPHIC; ] -//-------------------------------------------------------------------------- + SfxBoolItem ContourExecute SID_CONTOUR_EXEC [ @@ -2417,7 +2417,7 @@ SfxBoolItem ContourExecute SID_CONTOUR_EXEC GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ControlProperties SID_FM_CTL_PROPERTIES [ @@ -2444,7 +2444,7 @@ SfxBoolItem ControlProperties SID_FM_CTL_PROPERTIES GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToButton SID_FM_CONVERTTO_BUTTON [ @@ -2471,7 +2471,7 @@ SfxBoolItem ConvertToButton SID_FM_CONVERTTO_BUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToCheckBox SID_FM_CONVERTTO_CHECKBOX [ @@ -2498,7 +2498,7 @@ SfxBoolItem ConvertToCheckBox SID_FM_CONVERTTO_CHECKBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToCombo SID_FM_CONVERTTO_COMBOBOX [ @@ -2525,7 +2525,7 @@ SfxBoolItem ConvertToCombo SID_FM_CONVERTTO_COMBOBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToCurrency SID_FM_CONVERTTO_CURRENCY [ @@ -2552,7 +2552,7 @@ SfxBoolItem ConvertToCurrency SID_FM_CONVERTTO_CURRENCY GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToDate SID_FM_CONVERTTO_DATE [ @@ -2579,7 +2579,7 @@ SfxBoolItem ConvertToDate SID_FM_CONVERTTO_DATE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToEdit SID_FM_CONVERTTO_EDIT [ @@ -2606,7 +2606,7 @@ SfxBoolItem ConvertToEdit SID_FM_CONVERTTO_EDIT GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToFileControl SID_FM_CONVERTTO_FILECONTROL [ @@ -2633,7 +2633,7 @@ SfxBoolItem ConvertToFileControl SID_FM_CONVERTTO_FILECONTROL GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToFixed SID_FM_CONVERTTO_FIXEDTEXT [ @@ -2660,7 +2660,7 @@ SfxBoolItem ConvertToFixed SID_FM_CONVERTTO_FIXEDTEXT GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToFormatted SID_FM_CONVERTTO_FORMATTED [ @@ -2687,7 +2687,7 @@ SfxBoolItem ConvertToFormatted SID_FM_CONVERTTO_FORMATTED GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToScrollBar SID_FM_CONVERTTO_SCROLLBAR [ @@ -2714,7 +2714,7 @@ SfxBoolItem ConvertToScrollBar SID_FM_CONVERTTO_SCROLLBAR GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToSpinButton SID_FM_CONVERTTO_SPINBUTTON [ @@ -2741,7 +2741,7 @@ SfxBoolItem ConvertToSpinButton SID_FM_CONVERTTO_SPINBUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToGroup SID_FM_CONVERTTO_GROUPBOX [ @@ -2768,7 +2768,7 @@ SfxBoolItem ConvertToGroup SID_FM_CONVERTTO_GROUPBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToImageBtn SID_FM_CONVERTTO_IMAGEBUTTON [ @@ -2795,7 +2795,7 @@ SfxBoolItem ConvertToImageBtn SID_FM_CONVERTTO_IMAGEBUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToImageControl SID_FM_CONVERTTO_IMAGECONTROL [ @@ -2822,7 +2822,7 @@ SfxBoolItem ConvertToImageControl SID_FM_CONVERTTO_IMAGECONTROL GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToList SID_FM_CONVERTTO_LISTBOX [ @@ -2849,7 +2849,7 @@ SfxBoolItem ConvertToList SID_FM_CONVERTTO_LISTBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToNumeric SID_FM_CONVERTTO_NUMERIC [ @@ -2876,7 +2876,7 @@ SfxBoolItem ConvertToNumeric SID_FM_CONVERTTO_NUMERIC GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToPattern SID_FM_CONVERTTO_PATTERN [ @@ -2903,7 +2903,7 @@ SfxBoolItem ConvertToPattern SID_FM_CONVERTTO_PATTERN GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToRadio SID_FM_CONVERTTO_RADIOBUTTON [ @@ -2930,7 +2930,7 @@ SfxBoolItem ConvertToRadio SID_FM_CONVERTTO_RADIOBUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToTime SID_FM_CONVERTTO_TIME [ @@ -2957,7 +2957,7 @@ SfxBoolItem ConvertToTime SID_FM_CONVERTTO_TIME GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ConvertToNavigationBar SID_FM_CONVERTTO_NAVIGATIONBAR [ @@ -2984,7 +2984,7 @@ SfxBoolItem ConvertToNavigationBar SID_FM_CONVERTTO_NAVIGATIONBAR GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem CountAll SID_FM_COUNTALL () [ @@ -3009,7 +3009,7 @@ SfxVoidItem CountAll SID_FM_COUNTALL GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxBoolItem CreateControl SID_FM_CREATE_CONTROL () [ @@ -3037,7 +3037,7 @@ SfxBoolItem CreateControl SID_FM_CREATE_CONTROL GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertCurrencyField SID_INSERT_CURRENCYFIELD [ @@ -3064,7 +3064,7 @@ SfxBoolItem InsertCurrencyField SID_INSERT_CURRENCYFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem CurrencyField SID_FM_CURRENCYFIELD [ @@ -3091,7 +3091,7 @@ SfxBoolItem CurrencyField SID_FM_CURRENCYFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem Dash SID_DASH (SfxStringItem Name ID_VAL_INDEX,SfxUInt32Item Style ID_VAL_STYLE,SfxUInt32Item Dots ID_VAL_DOTS,SfxUInt32Item DotLen ID_VAL_DOTLEN,SfxUInt32Item Dashes ID_VAL_DASHES,SfxUInt32Item DashLen ID_VAL_DASHLEN,SfxUInt32Item Distance ID_VAL_DISTANCE) [ @@ -3116,7 +3116,7 @@ SfxVoidItem Dash SID_DASH GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxBoolItem AddDateField SID_INSERT_DATEFIELD [ @@ -3143,7 +3143,7 @@ SfxBoolItem AddDateField SID_INSERT_DATEFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem DateField SID_FM_DATEFIELD [ @@ -3170,7 +3170,7 @@ SfxBoolItem DateField SID_FM_DATEFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem DefaultBullet FN_NUM_BULLET_ON (SfxBoolItem On FN_PARAM_1) [ @@ -3200,7 +3200,7 @@ SfxVoidItem DefaultBullet FN_NUM_BULLET_ON GroupId = GID_ENUMERATION; ] -//-------------------------------------------------------------------------- + SfxBoolItem DeleteRecord SID_FM_RECORD_DELETE () [ @@ -3228,7 +3228,7 @@ SfxBoolItem DeleteRecord SID_FM_RECORD_DELETE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem SwitchControlDesignMode SID_FM_DESIGN_MODE [ @@ -3255,7 +3255,7 @@ SfxBoolItem SwitchControlDesignMode SID_FM_DESIGN_MODE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem DistributeSelection SID_DISTRIBUTE_DLG () [ @@ -3280,7 +3280,7 @@ SfxVoidItem DistributeSelection SID_DISTRIBUTE_DLG GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxBoolItem DrawSelect SID_DRAW_SELECT [ @@ -3307,7 +3307,7 @@ SfxBoolItem DrawSelect SID_DRAW_SELECT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SvxDrawToolItem InsertDraw SID_INSERT_DRAW [ @@ -3336,7 +3336,7 @@ SvxDrawToolItem InsertDraw SID_INSERT_DRAW PseudoPrefix = SID_DRAW; ] -//-------------------------------------------------------------------------- + SfxBoolItem DSBrowserExplorer SID_DSBROWSER_EXPLORER [ @@ -3363,7 +3363,7 @@ SfxBoolItem DSBrowserExplorer SID_DSBROWSER_EXPLORER GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem Edit SID_FM_EDIT [ @@ -3390,7 +3390,7 @@ SfxBoolItem Edit SID_FM_EDIT GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertEdit SID_INSERT_EDIT [ @@ -3417,7 +3417,7 @@ SfxBoolItem InsertEdit SID_INSERT_EDIT GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem Ellipse SID_DRAW_ELLIPSE (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y) [ @@ -3445,7 +3445,7 @@ SfxVoidItem Ellipse SID_DRAW_ELLIPSE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem Ellipse_Unfilled SID_DRAW_ELLIPSE_NOFILL (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y) [ @@ -3473,7 +3473,7 @@ SfxVoidItem Ellipse_Unfilled SID_DRAW_ELLIPSE_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem EllipseCut SID_DRAW_ELLIPSECUT (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND) [ @@ -3501,7 +3501,7 @@ SfxVoidItem EllipseCut SID_DRAW_ELLIPSECUT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem EllipseCut_Unfilled SID_DRAW_ELLIPSECUT_NOFILL (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND) [ @@ -3529,7 +3529,7 @@ SfxVoidItem EllipseCut_Unfilled SID_DRAW_ELLIPSECUT_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem EnterGroup SID_ENTER_GROUP () [ @@ -3554,7 +3554,7 @@ SfxVoidItem EnterGroup SID_ENTER_GROUP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxEscapementItem Escapement SID_ATTR_CHAR_ESCAPEMENT [ @@ -3581,7 +3581,7 @@ SvxEscapementItem Escapement SID_ATTR_CHAR_ESCAPEMENT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxObjectItem FieldController SID_FM_FIELDS_CONTROL [ @@ -3608,7 +3608,7 @@ SfxObjectItem FieldController SID_FM_FIELDS_CONTROL GroupId = ; ] -//-------------------------------------------------------------------------- + SfxBoolItem FileControl SID_FM_FILECONTROL [ @@ -3635,7 +3635,7 @@ SfxBoolItem FileControl SID_FM_FILECONTROL GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertFileControl SID_INSERT_FILECONTROL [ @@ -3662,7 +3662,7 @@ SfxBoolItem InsertFileControl SID_INSERT_FILECONTROL GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertTreeControl SID_INSERT_TREECONTROL [ @@ -3690,7 +3690,7 @@ SfxBoolItem InsertTreeControl SID_INSERT_TREECONTROL ] -//-------------------------------------------------------------------------- + XFillBitmapItem FillBitmap SID_ATTR_FILL_BITMAP [ @@ -3717,7 +3717,7 @@ XFillBitmapItem FillBitmap SID_ATTR_FILL_BITMAP GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + XFillColorItem FillColor SID_ATTR_FILL_COLOR [ @@ -3744,7 +3744,7 @@ XFillColorItem FillColor SID_ATTR_FILL_COLOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + XFillGradientItem FillGradient SID_ATTR_FILL_GRADIENT [ @@ -3771,7 +3771,7 @@ XFillGradientItem FillGradient SID_ATTR_FILL_GRADIENT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + XFillHatchItem FillHatch SID_ATTR_FILL_HATCH [ @@ -3798,7 +3798,7 @@ XFillHatchItem FillHatch SID_ATTR_FILL_HATCH GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + XFillStyleItem FillStyle SID_ATTR_FILL_STYLE [ @@ -3825,7 +3825,7 @@ XFillStyleItem FillStyle SID_ATTR_FILL_STYLE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FilterCrit SID_FM_FILTERCRIT () [ @@ -3850,7 +3850,7 @@ SfxVoidItem FilterCrit SID_FM_FILTERCRIT GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxBoolItem FirstRecord SID_FM_RECORD_FIRST () [ @@ -3878,7 +3878,7 @@ SfxBoolItem FirstRecord SID_FM_RECORD_FIRST GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SvxBlinkItem Flash SID_ATTR_FLASH [ @@ -3905,7 +3905,7 @@ SvxBlinkItem Flash SID_ATTR_FLASH GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxObjectItem FmExplorerController SID_FM_FMEXPLORER_CONTROL [ @@ -3932,7 +3932,7 @@ SfxObjectItem FmExplorerController SID_FM_FMEXPLORER_CONTROL GroupId = ; ] -//-------------------------------------------------------------------------- + SfxObjectItem FmFilterNavigatorController SID_FM_FILTER_NAVIGATOR_CONTROL [ @@ -3959,7 +3959,7 @@ SfxObjectItem FmFilterNavigatorController SID_FM_FILTER_NAVIGATOR_CONTROL GroupId = ; ] -//-------------------------------------------------------------------------- + SfxVoidItem FontDialog SID_CHAR_DLG () [ @@ -4008,7 +4008,7 @@ SfxVoidItem FontEffectsDialog SID_CHAR_DLG_EFFECT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxFontHeightItem FontHeight SID_ATTR_CHAR_FONTHEIGHT [ @@ -4035,7 +4035,7 @@ SvxFontHeightItem FontHeight SID_ATTR_CHAR_FONTHEIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxFontHeightItem FontHeighLatin SID_ATTR_CHAR_LATIN_FONTHEIGHT [ @@ -4062,7 +4062,7 @@ SvxFontHeightItem FontHeighLatin SID_ATTR_CHAR_LATIN_FONTHEIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxFontHeightItem FontHeightCJK SID_ATTR_CHAR_CJK_FONTHEIGHT [ @@ -4089,7 +4089,7 @@ SvxFontHeightItem FontHeightCJK SID_ATTR_CHAR_CJK_FONTHEIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxFontHeightItem FontHeightCTL SID_ATTR_CHAR_CTL_FONTHEIGHT [ @@ -4116,7 +4116,7 @@ SvxFontHeightItem FontHeightCTL SID_ATTR_CHAR_CTL_FONTHEIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem FontWork SID_FONTWORK [ @@ -4143,7 +4143,7 @@ SfxBoolItem FontWork SID_FONTWORK GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + XFormTextAdjustItem FontWorkTextAdjust SID_FORMTEXT_ADJUST [ @@ -4170,7 +4170,7 @@ XFormTextAdjustItem FontWorkTextAdjust SID_FORMTEXT_ADJUST GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + XFormTextDistanceItem FontWorkTextDistance SID_FORMTEXT_DISTANCE [ @@ -4197,7 +4197,7 @@ XFormTextDistanceItem FontWorkTextDistance SID_FORMTEXT_DISTANCE GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + XFormTextMirrorItem FontWorkTextMirror SID_FORMTEXT_MIRROR [ @@ -4224,7 +4224,7 @@ XFormTextMirrorItem FontWorkTextMirror SID_FORMTEXT_MIRROR GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + XFormTextOutlineItem FontWorkTextOutline SID_FORMTEXT_OUTLINE [ @@ -4251,7 +4251,7 @@ XFormTextOutlineItem FontWorkTextOutline SID_FORMTEXT_OUTLINE GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + XFormTextShadowItem FontWorkTextShadow SID_FORMTEXT_SHADOW [ @@ -4278,7 +4278,7 @@ XFormTextShadowItem FontWorkTextShadow SID_FORMTEXT_SHADOW GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + XFormTextShadowColorItem FontWorkTextShadowColor SID_FORMTEXT_SHDWCOLOR [ @@ -4305,7 +4305,7 @@ XFormTextShadowColorItem FontWorkTextShadowColor SID_FORMTEXT_SHDWCOLOR GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + XFormTextShadowXValItem FontWorkTextShadowXVal SID_FORMTEXT_SHDWXVAL [ @@ -4332,7 +4332,7 @@ XFormTextShadowXValItem FontWorkTextShadowXVal SID_FORMTEXT_SHDWXVAL GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + XFormTextShadowYValItem FontWorkTextShadowYVal SID_FORMTEXT_SHDWYVAL [ @@ -4359,7 +4359,7 @@ XFormTextShadowYValItem FontWorkTextShadowYVal SID_FORMTEXT_SHDWYVAL GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + XFormTextStartItem FontWorkTextStart SID_FORMTEXT_START [ @@ -4386,7 +4386,7 @@ XFormTextStartItem FontWorkTextStart SID_FORMTEXT_START GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + XFormTextStyleItem FontWorkTextStyle SID_FORMTEXT_STYLE [ @@ -4413,7 +4413,7 @@ XFormTextStyleItem FontWorkTextStyle SID_FORMTEXT_STYLE GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxVoidItem FormatArea SID_ATTRIBUTES_AREA () [ @@ -4438,7 +4438,7 @@ SfxVoidItem FormatArea SID_ATTRIBUTES_AREA GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + XFormTextHideFormItem FormatFontWorkClose SID_FORMTEXT_HIDEFORM [ @@ -4465,7 +4465,7 @@ XFormTextHideFormItem FormatFontWorkClose SID_FORMTEXT_HIDEFORM GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxVoidItem FormatGroup SID_GROUP () [ @@ -4490,7 +4490,7 @@ SfxVoidItem FormatGroup SID_GROUP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FormatLine SID_ATTRIBUTES_LINE () [ @@ -4515,7 +4515,7 @@ SfxVoidItem FormatLine SID_ATTRIBUTES_LINE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem FormattedField SID_FM_FORMATTEDFIELD [ @@ -4542,7 +4542,7 @@ SfxBoolItem FormattedField SID_FM_FORMATTEDFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ScrollBar SID_FM_SCROLLBAR [ @@ -4569,7 +4569,7 @@ SfxBoolItem ScrollBar SID_FM_SCROLLBAR GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem SpinButton SID_FM_SPINBUTTON [ @@ -4596,7 +4596,7 @@ SfxBoolItem SpinButton SID_FM_SPINBUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertFormattedField SID_INSERT_FORMATTEDFIELD [ @@ -4623,7 +4623,7 @@ SfxBoolItem InsertFormattedField SID_INSERT_FORMATTEDFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem FormatUngroup SID_UNGROUP () [ @@ -4648,7 +4648,7 @@ SfxVoidItem FormatUngroup SID_UNGROUP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FormFilter SID_FM_FILTER_START () [ @@ -4673,7 +4673,7 @@ SfxVoidItem FormFilter SID_FM_FILTER_START GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxBoolItem FormFiltered SID_FM_FORM_FILTERED () [ @@ -4701,7 +4701,7 @@ SfxBoolItem FormFiltered SID_FM_FORM_FILTERED GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem FormFilterExecute SID_FM_FILTER_EXECUTE () [ @@ -4726,7 +4726,7 @@ SfxVoidItem FormFilterExecute SID_FM_FILTER_EXECUTE GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem FormFilterExit SID_FM_FILTER_EXIT () [ @@ -4751,7 +4751,7 @@ SfxVoidItem FormFilterExit SID_FM_FILTER_EXIT GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxBoolItem FormFilterNavigator SID_FM_FILTER_NAVIGATOR () [ @@ -4776,7 +4776,7 @@ SfxBoolItem FormFilterNavigator SID_FM_FILTER_NAVIGATOR GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxBoolItem FormProperties SID_FM_PROPERTIES [ @@ -4803,7 +4803,7 @@ SfxBoolItem FormProperties SID_FM_PROPERTIES GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem Freeline SID_DRAW_FREELINE [ @@ -4830,7 +4830,7 @@ SfxBoolItem Freeline SID_DRAW_FREELINE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem Freeline_Unfilled SID_DRAW_FREELINE_NOFILL [ @@ -4857,7 +4857,7 @@ SfxBoolItem Freeline_Unfilled SID_DRAW_FREELINE_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem AutoColorInvalid SID_ATTR_AUTO_COLOR_INVALID [ @@ -4884,7 +4884,7 @@ SfxBoolItem AutoColorInvalid SID_ATTR_AUTO_COLOR_INVALID GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxBoolItem Gallery SID_GALLERY [ @@ -4911,7 +4911,7 @@ SfxBoolItem Gallery SID_GALLERY GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxBoolItem GalleryEnableAddCopy SID_GALLERY_ENABLE_ADDCOPY [ @@ -4938,7 +4938,7 @@ SfxBoolItem GalleryEnableAddCopy SID_GALLERY_ENABLE_ADDCOPY GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxStringListItem GetRedoStrings SID_GETREDOSTRINGS [ @@ -4965,7 +4965,7 @@ SfxStringListItem GetRedoStrings SID_GETREDOSTRINGS GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxStringListItem GetUndoStrings SID_GETUNDOSTRINGS [ @@ -4992,7 +4992,7 @@ SfxStringListItem GetUndoStrings SID_GETUNDOSTRINGS GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem GrafAttrCrop SID_ATTR_GRAF_CROP () [ @@ -5017,7 +5017,7 @@ SfxVoidItem GrafAttrCrop SID_ATTR_GRAF_CROP GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxInt16Item GrafBlue SID_ATTR_GRAF_BLUE [ @@ -5044,7 +5044,7 @@ SfxInt16Item GrafBlue SID_ATTR_GRAF_BLUE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxInt16Item GrafContrast SID_ATTR_GRAF_CONTRAST [ @@ -5071,7 +5071,7 @@ SfxInt16Item GrafContrast SID_ATTR_GRAF_CONTRAST GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxUInt32Item GrafGamma SID_ATTR_GRAF_GAMMA [ @@ -5098,7 +5098,7 @@ SfxUInt32Item GrafGamma SID_ATTR_GRAF_GAMMA GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxInt16Item GrafGreen SID_ATTR_GRAF_GREEN [ @@ -5125,7 +5125,7 @@ SfxInt16Item GrafGreen SID_ATTR_GRAF_GREEN GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem GrafInvert SID_ATTR_GRAF_INVERT [ @@ -5152,7 +5152,7 @@ SfxBoolItem GrafInvert SID_ATTR_GRAF_INVERT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxInt16Item GrafLuminance SID_ATTR_GRAF_LUMINANCE [ @@ -5179,7 +5179,7 @@ SfxInt16Item GrafLuminance SID_ATTR_GRAF_LUMINANCE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxUInt16Item GrafMode SID_ATTR_GRAF_MODE [ @@ -5206,7 +5206,7 @@ SfxUInt16Item GrafMode SID_ATTR_GRAF_MODE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxInt16Item GrafRed SID_ATTR_GRAF_RED [ @@ -5233,7 +5233,7 @@ SfxInt16Item GrafRed SID_ATTR_GRAF_RED GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxUInt16Item GrafTransparence SID_ATTR_GRAF_TRANSPARENCE [ @@ -5260,7 +5260,7 @@ SfxUInt16Item GrafTransparence SID_ATTR_GRAF_TRANSPARENCE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem GraphicFilterInvert SID_GRFFILTER_INVERT () [ @@ -5285,7 +5285,7 @@ SfxVoidItem GraphicFilterInvert SID_GRFFILTER_INVERT GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxVoidItem GraphicFilterMosaic SID_GRFFILTER_MOSAIC () [ @@ -5310,7 +5310,7 @@ SfxVoidItem GraphicFilterMosaic SID_GRFFILTER_MOSAIC GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxVoidItem GraphicFilterPopart SID_GRFFILTER_POPART () [ @@ -5335,7 +5335,7 @@ SfxVoidItem GraphicFilterPopart SID_GRFFILTER_POPART GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxVoidItem GraphicFilterPoster SID_GRFFILTER_POSTER () [ @@ -5360,7 +5360,7 @@ SfxVoidItem GraphicFilterPoster SID_GRFFILTER_POSTER GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxVoidItem GraphicFilterRelief SID_GRFFILTER_EMBOSS () [ @@ -5385,7 +5385,7 @@ SfxVoidItem GraphicFilterRelief SID_GRFFILTER_EMBOSS GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxVoidItem GraphicFilterRemoveNoise SID_GRFFILTER_REMOVENOISE () [ @@ -5410,7 +5410,7 @@ SfxVoidItem GraphicFilterRemoveNoise SID_GRFFILTER_REMOVENOISE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxVoidItem GraphicFilterSepia SID_GRFFILTER_SEPIA () [ @@ -5435,7 +5435,7 @@ SfxVoidItem GraphicFilterSepia SID_GRFFILTER_SEPIA GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxVoidItem GraphicFilterSharpen SID_GRFFILTER_SHARPEN () [ @@ -5460,7 +5460,7 @@ SfxVoidItem GraphicFilterSharpen SID_GRFFILTER_SHARPEN GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxVoidItem GraphicFilterSmooth SID_GRFFILTER_SMOOTH () [ @@ -5485,7 +5485,7 @@ SfxVoidItem GraphicFilterSmooth SID_GRFFILTER_SMOOTH GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxVoidItem GraphicFilterSobel SID_GRFFILTER_SOBEL () [ @@ -5510,7 +5510,7 @@ SfxVoidItem GraphicFilterSobel SID_GRFFILTER_SOBEL GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxVoidItem GraphicFilterSolarize SID_GRFFILTER_SOLARIZE () [ @@ -5535,7 +5535,7 @@ SfxVoidItem GraphicFilterSolarize SID_GRFFILTER_SOLARIZE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + TbxImageItem GraphicFilterToolbox SID_GRFFILTER [ @@ -5562,7 +5562,7 @@ TbxImageItem GraphicFilterToolbox SID_GRFFILTER GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxBoolItem Grid SID_FM_DBGRID [ @@ -5589,7 +5589,7 @@ SfxBoolItem Grid SID_FM_DBGRID GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem GridUse SID_GRID_USE [ @@ -5616,7 +5616,7 @@ SfxBoolItem GridUse SID_GRID_USE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem GridVisible SID_GRID_VISIBLE [ @@ -5643,7 +5643,7 @@ SfxBoolItem GridVisible SID_GRID_VISIBLE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem GroupBox SID_FM_GROUPBOX [ @@ -5670,7 +5670,7 @@ SfxBoolItem GroupBox SID_FM_GROUPBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem Groupbox SID_INSERT_GROUPBOX [ @@ -5697,7 +5697,7 @@ SfxBoolItem Groupbox SID_INSERT_GROUPBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxRectangleItem HeaderFooterBorder SID_RULER_LR_MIN_MAX [ @@ -5724,7 +5724,7 @@ SfxRectangleItem HeaderFooterBorder SID_RULER_LR_MIN_MAX GroupId = ; ] -//-------------------------------------------------------------------------- + SfxBoolItem HelplinesMove SID_HELPLINES_MOVE [ @@ -5751,7 +5751,7 @@ SfxBoolItem HelplinesMove SID_HELPLINES_MOVE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem HFixedLine SID_INSERT_HFIXEDLINE [ @@ -5778,7 +5778,7 @@ SfxBoolItem HFixedLine SID_INSERT_HFIXEDLINE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem HScrollbar SID_INSERT_HSCROLLBAR [ @@ -5805,7 +5805,7 @@ SfxBoolItem HScrollbar SID_INSERT_HSCROLLBAR GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SvxHyperlinkItem Hyperlink SID_HYPERLINK_GETLINK [ @@ -5832,7 +5832,7 @@ SvxHyperlinkItem Hyperlink SID_HYPERLINK_GETLINK GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxBoolItem Imagebutton SID_FM_IMAGEBUTTON [ @@ -5859,7 +5859,7 @@ SfxBoolItem Imagebutton SID_FM_IMAGEBUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ImageControl SID_FM_IMAGECONTROL [ @@ -5886,7 +5886,7 @@ SfxBoolItem ImageControl SID_FM_IMAGECONTROL GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertImageControl SID_INSERT_IMAGECONTROL [ @@ -5913,7 +5913,7 @@ SfxBoolItem InsertImageControl SID_INSERT_IMAGECONTROL GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ImageMapDialog SID_IMAP [ @@ -5940,7 +5940,7 @@ SfxBoolItem ImageMapDialog SID_IMAP GroupId = GID_GRAPHIC; ] -//-------------------------------------------------------------------------- + SfxBoolItem ImageMapExecute SID_IMAP_EXEC [ @@ -6110,7 +6110,7 @@ SfxVoidItem CompressGraphic SID_COMPRESS_GRAPHIC GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxBoolItem Init3D SID_3D_INIT [ @@ -6137,7 +6137,7 @@ SfxBoolItem Init3D SID_3D_INIT GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem InPlaceObjectResize SID_OBJECTRESIZE () [ @@ -6162,7 +6162,7 @@ SfxVoidItem InPlaceObjectResize SID_OBJECTRESIZE GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertAnnotation SID_INSERT_POSTIT (SvxPostItAuthorItem Author SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date SID_ATTR_POSTIT_DATE,SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT) [ @@ -6187,7 +6187,7 @@ SfxVoidItem InsertAnnotation SID_INSERT_POSTIT GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ShowAnnotations SID_SHOW_POSTIT () [ @@ -6212,7 +6212,7 @@ SfxBoolItem ShowAnnotations SID_SHOW_POSTIT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ReplyToAnnotation SID_REPLYTO_POSTIT () @@ -6238,7 +6238,7 @@ SfxVoidItem ReplyToAnnotation SID_REPLYTO_POSTIT GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeleteAnnotation SID_DELETE_POSTIT () @@ -6264,7 +6264,7 @@ SfxVoidItem DeleteAnnotation SID_DELETE_POSTIT GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeleteAllAnnotation SID_DELETEALL_POSTIT () @@ -6314,7 +6314,7 @@ SfxVoidItem DeleteAllAnnotationByAuthor SID_DELETEALLBYAUTHOR_POSTIT GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxVoidItem NextAnnotation SID_NEXT_POSTIT () @@ -6340,7 +6340,7 @@ SfxVoidItem NextAnnotation SID_NEXT_POSTIT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem PreviousAnnotation SID_PREVIOUS_POSTIT () @@ -6366,7 +6366,7 @@ SfxVoidItem PreviousAnnotation SID_PREVIOUS_POSTIT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertGalleryPic SID_GALLERY_FORMATS (SvxGalleryItem GalleryItem SID_GALLERY_FORMATS) [ @@ -6391,7 +6391,7 @@ SfxVoidItem InsertGalleryPic SID_GALLERY_FORMATS GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertGraphic SID_INSERT_GRAPHIC (SfxStringItem FileName SID_INSERT_GRAPHIC,SfxStringItem FilterName FN_PARAM_FILTER,SfxBoolItem AsLink FN_PARAM_1,SfxStringItem Style FN_PARAM_2) [ @@ -6416,7 +6416,7 @@ SfxBoolItem InsertGraphic SID_INSERT_GRAPHIC GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertImage SID_INSERT_IMAGE () [ @@ -6441,7 +6441,7 @@ SfxVoidItem InsertImage SID_INSERT_IMAGE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertMath SID_INSERT_MATH () [ @@ -6466,7 +6466,7 @@ SfxVoidItem InsertMath SID_INSERT_MATH GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertMode SID_ATTR_INSERT [ @@ -6493,7 +6493,7 @@ SfxBoolItem InsertMode SID_ATTR_INSERT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DefaultNumbering FN_NUM_NUMBERING_ON (SfxBoolItem On FN_PARAM_1) [ @@ -6580,7 +6580,7 @@ SfxBoolItem CurrentNumListType FN_NUM_NUM_RULE_INDEX GroupId = GID_ENUMERATION; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertObject SID_INSERT_OBJECT ( SfxGlobalNameItem ClassId SID_INSERT_OBJECT ) [ @@ -6605,7 +6605,7 @@ SfxVoidItem InsertObject SID_INSERT_OBJECT GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertObjectChart SID_INSERT_DIAGRAM (SfxBoolItem ColHeaders FN_PARAM_1,SfxBoolItem RowHeaders FN_PARAM_2,SfxBoolItem InNewTable FN_PARAM_4,SfxStringItem RangeList FN_PARAM_5) [ @@ -6630,7 +6630,7 @@ SfxVoidItem InsertObjectChart SID_INSERT_DIAGRAM GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertObjectChartFromFile SID_INSERT_DIAGRAM_FROM_FILE () [ @@ -6655,7 +6655,7 @@ SfxVoidItem InsertObjectChartFromFile SID_INSERT_DIAGRAM_FROM_FILE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertPlugin SID_INSERT_PLUGIN (SfxStringItem ClassLocation FN_PARAM_2, SfxStringItem Commands FN_PARAM_3) @@ -6681,7 +6681,7 @@ SfxVoidItem InsertPlugin SID_INSERT_PLUGIN GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertSound SID_INSERT_SOUND () [ @@ -6706,7 +6706,7 @@ SfxVoidItem InsertSound SID_INSERT_SOUND GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertSymbol SID_CHARMAP (SfxStringItem Symbols SID_CHARMAP, SfxStringItem FontName SID_ATTR_SPECIALCHAR) [ @@ -6731,7 +6731,7 @@ SfxVoidItem InsertSymbol SID_CHARMAP GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertSpreadsheet SID_ATTR_TABLE () [ @@ -6756,7 +6756,7 @@ SfxVoidItem InsertSpreadsheet SID_ATTR_TABLE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertTable SID_INSERT_TABLE (SfxUInt16Item Columns SID_ATTR_TABLE_COLUMN,SfxUInt16Item Rows SID_ATTR_TABLE_ROW ) @@ -6785,7 +6785,7 @@ SfxVoidItem InsertTable SID_INSERT_TABLE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertTextFrame SID_INSERT_FRAME () [ @@ -6810,7 +6810,7 @@ SfxVoidItem InsertTextFrame SID_INSERT_FRAME GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertVideo SID_INSERT_VIDEO () [ @@ -6835,7 +6835,7 @@ SfxVoidItem InsertVideo SID_INSERT_VIDEO GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InternetDialog SID_INET_DLG () [ @@ -6860,7 +6860,7 @@ SfxVoidItem InternetDialog SID_INET_DLG GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem Intersect SID_POLY_INTERSECT () [ @@ -6885,7 +6885,7 @@ SfxVoidItem Intersect SID_POLY_INTERSECT GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SvxPostureItem Italic SID_ATTR_CHAR_POSTURE [ @@ -6912,7 +6912,7 @@ SvxPostureItem Italic SID_ATTR_CHAR_POSTURE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxPostureItem ItalicLatin SID_ATTR_CHAR_LATIN_POSTURE [ @@ -6939,7 +6939,7 @@ SvxPostureItem ItalicLatin SID_ATTR_CHAR_LATIN_POSTURE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxPostureItem ItalicCJK SID_ATTR_CHAR_CJK_POSTURE [ @@ -6966,7 +6966,7 @@ SvxPostureItem ItalicCJK SID_ATTR_CHAR_CJK_POSTURE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxPostureItem ItalicCTL SID_ATTR_CHAR_CTL_POSTURE [ @@ -6993,7 +6993,7 @@ SvxPostureItem ItalicCTL SID_ATTR_CHAR_CTL_POSTURE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem JustifyPara SID_ATTR_PARA_ADJUST_BLOCK [ @@ -7022,7 +7022,7 @@ SfxBoolItem JustifyPara SID_ATTR_PARA_ADJUST_BLOCK GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertFixedText SID_INSERT_FIXEDTEXT [ @@ -7049,7 +7049,7 @@ SfxBoolItem InsertFixedText SID_INSERT_FIXEDTEXT GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem Label SID_FM_FIXEDTEXT [ @@ -7076,7 +7076,7 @@ SfxBoolItem Label SID_FM_FIXEDTEXT GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SvxLanguageItem Language SID_ATTR_CHAR_LANGUAGE [ @@ -7103,7 +7103,7 @@ SvxLanguageItem Language SID_ATTR_CHAR_LANGUAGE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxLanguageItem LanguageLatin SID_ATTR_CHAR_LATIN_LANGUAGE [ @@ -7130,7 +7130,7 @@ SvxLanguageItem LanguageLatin SID_ATTR_CHAR_LATIN_LANGUAGE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem LastRecord SID_FM_RECORD_LAST () [ @@ -7158,7 +7158,7 @@ SfxBoolItem LastRecord SID_FM_RECORD_LAST GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem LeaveFMCreateMode SID_FM_LEAVE_CREATE (SfxBoolItem Leave SID_FM_LEAVE_CREATE) [ @@ -7183,7 +7183,7 @@ SfxVoidItem LeaveFMCreateMode SID_FM_LEAVE_CREATE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem LeaveGroup SID_LEAVE_GROUP () [ @@ -7208,7 +7208,7 @@ SfxVoidItem LeaveGroup SID_LEAVE_GROUP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem LeftPara SID_ATTR_PARA_ADJUST_LEFT [ @@ -7236,7 +7236,7 @@ SfxBoolItem LeftPara SID_ATTR_PARA_ADJUST_LEFT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxLRSpaceItem LeftRightMargin SID_ATTR_LRSPACE [ @@ -7263,7 +7263,7 @@ SvxLRSpaceItem LeftRightMargin SID_ATTR_LRSPACE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem LeftRightParaMargin SID_ATTR_PARA_LRSPACE (SvxLRSpaceItem LRSpace SID_ATTR_PARA_LRSPACE) [ @@ -7288,7 +7288,7 @@ SfxVoidItem LeftRightParaMargin SID_ATTR_PARA_LRSPACE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem LeftRightParaMargin_Vertical SID_ATTR_PARA_LRSPACE_VERTICAL (SvxLRSpaceItem LRSpace SID_ATTR_PARA_LRSPACE_VERTICAL) [ @@ -7313,7 +7313,7 @@ SfxVoidItem LeftRightParaMargin_Vertical SID_ATTR_PARA_LRSPACE_VERTICAL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem Line SID_DRAW_LINE [ @@ -7340,7 +7340,7 @@ SfxBoolItem Line SID_DRAW_LINE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem Line_Diagonal SID_DRAW_XLINE [ @@ -7367,7 +7367,7 @@ SfxBoolItem Line_Diagonal SID_DRAW_XLINE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SvxColorItem FrameLineColor SID_FRAME_LINECOLOR [ @@ -7394,7 +7394,7 @@ SvxColorItem FrameLineColor SID_FRAME_LINECOLOR GroupId = GID_FRAME; ] -//-------------------------------------------------------------------------- + XLineDashItem LineDash SID_ATTR_LINE_DASH [ @@ -7421,7 +7421,7 @@ XLineDashItem LineDash SID_ATTR_LINE_DASH GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem LineEndStyle SID_ATTR_LINEEND_STYLE (XLineStartItem LineStart SID_ATTR_LINE_START,XLineEndItem LineEnd SID_ATTR_LINE_END,SfxUInt32Item StartWidth SID_ATTR_LINE_STARTWIDTH,SfxUInt32Item EndWidth SID_ATTR_LINE_ENDWIDTH) [ @@ -7449,7 +7449,7 @@ SfxBoolItem LineEndStyle SID_ATTR_LINEEND_STYLE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxLineSpacingItem LineSpacing SID_ATTR_PARA_LINESPACE [ @@ -7502,7 +7502,7 @@ SvxULSpaceItem ULSpacing SID_ATTR_PARA_ULSPACE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxLineItem LineStyle SID_FRAME_LINESTYLE [ @@ -7529,7 +7529,7 @@ SvxLineItem LineStyle SID_FRAME_LINESTYLE GroupId = GID_FRAME; ] -//-------------------------------------------------------------------------- + XLineWidthItem LineWidth SID_ATTR_LINE_WIDTH [ @@ -7556,7 +7556,7 @@ XLineWidthItem LineWidth SID_ATTR_LINE_WIDTH GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ListBox SID_FM_LISTBOX [ @@ -7583,7 +7583,7 @@ SfxBoolItem ListBox SID_FM_LISTBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertListbox SID_INSERT_LISTBOX [ @@ -7610,7 +7610,7 @@ SfxBoolItem InsertListbox SID_INSERT_LISTBOX GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem Merge SID_POLY_MERGE () [ @@ -7635,7 +7635,7 @@ SfxVoidItem Merge SID_POLY_MERGE GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxVoidItem NewJavaModule SID_BASICIDE_NEWJAVAMODULE () [ @@ -7660,7 +7660,7 @@ SfxVoidItem NewJavaModule SID_BASICIDE_NEWJAVAMODULE GroupId = GID_MACRO; ] -//-------------------------------------------------------------------------- + SfxBoolItem NewRecord SID_FM_RECORD_NEW () [ @@ -7688,7 +7688,7 @@ SfxBoolItem NewRecord SID_FM_RECORD_NEW GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem NextRecord SID_FM_RECORD_NEXT () [ @@ -7716,7 +7716,7 @@ SfxBoolItem NextRecord SID_FM_RECORD_NEXT GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem NumericField SID_FM_NUMERICFIELD [ @@ -7743,7 +7743,7 @@ SfxBoolItem NumericField SID_FM_NUMERICFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertNumericField SID_INSERT_NUMERICFIELD [ @@ -7770,7 +7770,7 @@ SfxBoolItem InsertNumericField SID_INSERT_NUMERICFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SvxDrawAlignItem ObjectAlign SID_OBJECT_ALIGN [ @@ -7799,7 +7799,7 @@ SvxDrawAlignItem ObjectAlign SID_OBJECT_ALIGN PseudoPrefix = SID_OBJECT_ALIGN; ] -//-------------------------------------------------------------------------- + SfxVoidItem ObjectBackOne SID_FRAME_DOWN () [ @@ -7824,7 +7824,7 @@ SfxVoidItem ObjectBackOne SID_FRAME_DOWN GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ObjectForwardOne SID_FRAME_UP () [ @@ -7849,7 +7849,7 @@ SfxVoidItem ObjectForwardOne SID_FRAME_UP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem OpenReadOnly SID_FM_OPEN_READONLY [ @@ -7876,7 +7876,7 @@ SfxBoolItem OpenReadOnly SID_FM_OPEN_READONLY GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem OrderCrit SID_FM_ORDERCRIT () [ @@ -7901,7 +7901,7 @@ SfxVoidItem OrderCrit SID_FM_ORDERCRIT GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SvxOrphansItem Orphan SID_ATTR_PARA_ORPHANS [ @@ -7928,7 +7928,7 @@ SvxOrphansItem Orphan SID_ATTR_PARA_ORPHANS GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem OutlineBullet SID_OUTLINE_BULLET () [ @@ -7980,7 +7980,7 @@ SfxUInt16Item SetNumber FN_SVX_SET_NUMBER GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxUInt16Item SetBullet FN_SVX_SET_BULLET [ /* flags: */ @@ -8006,7 +8006,7 @@ SfxUInt16Item SetBullet FN_SVX_SET_BULLET GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxVoidItem OutlineCollapse SID_OUTLINE_COLLAPSE () [ @@ -8031,7 +8031,7 @@ SfxVoidItem OutlineCollapse SID_OUTLINE_COLLAPSE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem OutlineCollapseAll SID_OUTLINE_COLLAPSE_ALL () [ @@ -8056,7 +8056,7 @@ SfxVoidItem OutlineCollapseAll SID_OUTLINE_COLLAPSE_ALL GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem OutlineDown SID_OUTLINE_DOWN () [ @@ -8081,7 +8081,7 @@ SfxVoidItem OutlineDown SID_OUTLINE_DOWN GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem OutlineExpand SID_OUTLINE_EXPAND () [ @@ -8106,7 +8106,7 @@ SfxVoidItem OutlineExpand SID_OUTLINE_EXPAND GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem OutlineExpandAll SID_OUTLINE_EXPAND_ALL () [ @@ -8131,7 +8131,7 @@ SfxVoidItem OutlineExpandAll SID_OUTLINE_EXPAND_ALL GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SvxContourItem OutlineFont SID_ATTR_CHAR_CONTOUR [ @@ -8158,7 +8158,7 @@ SvxContourItem OutlineFont SID_ATTR_CHAR_CONTOUR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem OutlineFormat SID_OUTLINE_FORMAT [ @@ -8185,7 +8185,7 @@ SfxBoolItem OutlineFormat SID_OUTLINE_FORMAT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem OutlineLeft SID_OUTLINE_LEFT () [ @@ -8210,7 +8210,7 @@ SfxVoidItem OutlineLeft SID_OUTLINE_LEFT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem OutlineRight SID_OUTLINE_RIGHT () [ @@ -8235,7 +8235,7 @@ SfxVoidItem OutlineRight SID_OUTLINE_RIGHT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem OutlineUp SID_OUTLINE_UP () [ @@ -8260,7 +8260,7 @@ SfxVoidItem OutlineUp SID_OUTLINE_UP GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SvxFmtBreakItem Pagebreak SID_ATTR_PARA_PAGEBREAK [ @@ -8287,7 +8287,7 @@ SvxFmtBreakItem Pagebreak SID_ATTR_PARA_PAGEBREAK GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxPaperBinItem PagePaperBin SID_ATTR_PAGE_PAPERBIN [ @@ -8314,7 +8314,7 @@ SvxPaperBinItem PagePaperBin SID_ATTR_PAGE_PAPERBIN GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxSizeItem AttributePageSize SID_ATTR_PAGE_SIZE [ @@ -8341,7 +8341,7 @@ SvxSizeItem AttributePageSize SID_ATTR_PAGE_SIZE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxPageModelItem AttributeParaModel SID_ATTR_PARA_MODEL [ @@ -8368,7 +8368,7 @@ SvxPageModelItem AttributeParaModel SID_ATTR_PARA_MODEL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxPageItem AttributePage SID_ATTR_PAGE [ @@ -8395,7 +8395,7 @@ SvxPageItem AttributePage SID_ATTR_PAGE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxAutoKernItem PairKerning SID_ATTR_CHAR_AUTOKERN [ @@ -8422,7 +8422,7 @@ SvxAutoKernItem PairKerning SID_ATTR_CHAR_AUTOKERN GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ParagraphDialog SID_PARA_DLG () [ @@ -8447,7 +8447,7 @@ SfxVoidItem ParagraphDialog SID_PARA_DLG GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxFmtKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP [ @@ -8474,7 +8474,7 @@ SvxFmtKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxFmtSplitItem ParaSplit SID_ATTR_PARA_SPLIT [ @@ -8501,7 +8501,7 @@ SvxFmtSplitItem ParaSplit SID_ATTR_PARA_SPLIT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertPatternField SID_INSERT_PATTERNFIELD [ @@ -8528,7 +8528,7 @@ SfxBoolItem InsertPatternField SID_INSERT_PATTERNFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem PatternField SID_FM_PATTERNFIELD [ @@ -8555,7 +8555,7 @@ SfxBoolItem PatternField SID_FM_PATTERNFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem Pie SID_DRAW_PIE (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND) [ @@ -8583,7 +8583,7 @@ SfxVoidItem Pie SID_DRAW_PIE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem Pie_Unfilled SID_DRAW_PIE_NOFILL (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND) [ @@ -8611,7 +8611,7 @@ SfxVoidItem Pie_Unfilled SID_DRAW_PIE_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem PolyFormen SID_POLY_FORMEN () [ @@ -8636,7 +8636,7 @@ SfxVoidItem PolyFormen SID_POLY_FORMEN GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxBoolItem Polygon_Diagonal SID_DRAW_XPOLYGON [ @@ -8663,7 +8663,7 @@ SfxBoolItem Polygon_Diagonal SID_DRAW_XPOLYGON GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem Polygon_Diagonal_Unfilled SID_DRAW_XPOLYGON_NOFILL [ @@ -8690,7 +8690,7 @@ SfxBoolItem Polygon_Diagonal_Unfilled SID_DRAW_XPOLYGON_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem Polygon_Unfilled SID_DRAW_POLYGON_NOFILL [ @@ -8717,7 +8717,7 @@ SfxBoolItem Polygon_Unfilled SID_DRAW_POLYGON_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxPointItem Position SID_ATTR_POSITION [ @@ -8744,7 +8744,7 @@ SfxPointItem Position SID_ATTR_POSITION GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxBoolItem Preview SID_INSERT_PREVIEW [ @@ -8771,7 +8771,7 @@ SfxBoolItem Preview SID_INSERT_PREVIEW GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem PrevRecord SID_FM_RECORD_PREV () [ @@ -8799,7 +8799,7 @@ SfxBoolItem PrevRecord SID_FM_RECORD_PREV GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ProgressBar SID_INSERT_PROGRESSBAR [ @@ -8826,7 +8826,7 @@ SfxBoolItem ProgressBar SID_INSERT_PROGRESSBAR GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxObjectItem PropertyController SID_FM_PROPERTY_CONTROL [ @@ -8853,7 +8853,7 @@ SfxObjectItem PropertyController SID_FM_PROPERTY_CONTROL GroupId = ; ] -//-------------------------------------------------------------------------- + SfxBoolItem Pushbutton SID_FM_PUSHBUTTON [ @@ -8880,7 +8880,7 @@ SfxBoolItem Pushbutton SID_FM_PUSHBUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertPushbutton SID_INSERT_PUSHBUTTON [ @@ -8907,7 +8907,7 @@ SfxBoolItem InsertPushbutton SID_INSERT_PUSHBUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertFormRadio SID_INSERT_FORM_RADIO @@ -8935,7 +8935,7 @@ SfxBoolItem InsertFormRadio SID_INSERT_FORM_RADIO GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertFormCheck SID_INSERT_FORM_CHECK [ @@ -8962,7 +8962,7 @@ SfxBoolItem InsertFormCheck SID_INSERT_FORM_CHECK GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertFormList SID_INSERT_FORM_LIST [ @@ -8989,7 +8989,7 @@ SfxBoolItem InsertFormList SID_INSERT_FORM_LIST GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertFormCombo SID_INSERT_FORM_COMBO [ @@ -9015,7 +9015,7 @@ SfxBoolItem InsertFormCombo SID_INSERT_FORM_COMBO ToolBoxConfig = TRUE, GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertFormSpin SID_INSERT_FORM_SPIN [ @@ -9042,7 +9042,7 @@ SfxBoolItem InsertFormSpin SID_INSERT_FORM_SPIN GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertFormVScroll SID_INSERT_FORM_VSCROLL [ @@ -9069,7 +9069,7 @@ SfxBoolItem InsertFormVScroll SID_INSERT_FORM_VSCROLL GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertFormHScroll SID_INSERT_FORM_HSCROLL @@ -9097,7 +9097,7 @@ SfxBoolItem InsertFormHScroll SID_INSERT_FORM_HSCROLL GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem Radiobutton SID_INSERT_RADIOBUTTON [ @@ -9124,7 +9124,7 @@ SfxBoolItem Radiobutton SID_INSERT_RADIOBUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem RadioButton SID_FM_RADIOBUTTON [ @@ -9151,7 +9151,7 @@ SfxBoolItem RadioButton SID_FM_RADIOBUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ReadOnlyMode SID_READONLY_MODE [ @@ -9178,7 +9178,7 @@ SfxBoolItem ReadOnlyMode SID_READONLY_MODE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxBoolItem RecFromText SID_FM_RECORD_FROM_TEXT () [ @@ -9206,7 +9206,7 @@ SfxBoolItem RecFromText SID_FM_RECORD_FROM_TEXT GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem RecSave SID_FM_RECORD_SAVE () [ @@ -9234,7 +9234,7 @@ SfxBoolItem RecSave SID_FM_RECORD_SAVE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem RecSearch SID_FM_SEARCH () [ @@ -9262,7 +9262,7 @@ SfxVoidItem RecSearch SID_FM_SEARCH GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem Rect SID_DRAW_RECT (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y) [ @@ -9290,7 +9290,7 @@ SfxVoidItem Rect SID_DRAW_RECT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem Rect_Rounded SID_DRAW_RECT_ROUND (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y) [ @@ -9318,7 +9318,7 @@ SfxVoidItem Rect_Rounded SID_DRAW_RECT_ROUND GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem Rect_Rounded_Unfilled SID_DRAW_RECT_ROUND_NOFILL (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y) [ @@ -9346,7 +9346,7 @@ SfxVoidItem Rect_Rounded_Unfilled SID_DRAW_RECT_ROUND_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem Rect_Unfilled SID_DRAW_RECT_NOFILL (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y) [ @@ -9374,7 +9374,7 @@ SfxVoidItem Rect_Unfilled SID_DRAW_RECT_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem RecText SID_FM_RECORD_TEXT () [ @@ -9402,7 +9402,7 @@ SfxBoolItem RecText SID_FM_RECORD_TEXT GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxStringItem RecTotal SID_FM_RECORD_TOTAL () [ @@ -9430,7 +9430,7 @@ SfxStringItem RecTotal SID_FM_RECORD_TOTAL GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem RecUndo SID_FM_RECORD_UNDO () [ @@ -9458,7 +9458,7 @@ SfxBoolItem RecUndo SID_FM_RECORD_UNDO GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem Refresh SID_FM_REFRESH () [ @@ -9483,7 +9483,7 @@ SfxVoidItem Refresh SID_FM_REFRESH GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem RefreshFormControl SID_FM_REFRESH_FORM_CONTROL () [ @@ -9508,7 +9508,7 @@ SfxVoidItem RefreshFormControl SID_FM_REFRESH_FORM_CONTROL GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem RemoveFilter SID_FM_FILTER_REMOVE () [ @@ -9533,7 +9533,7 @@ SfxVoidItem RemoveFilter SID_FM_FILTER_REMOVE GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem RemoveFilterSort SID_FM_REMOVE_FILTER_SORT () [ @@ -9558,7 +9558,7 @@ SfxVoidItem RemoveFilterSort SID_FM_REMOVE_FILTER_SORT GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxSetItem ReplaceSet FID_SEARCH_REPLACESET () [ @@ -9583,7 +9583,7 @@ SfxSetItem ReplaceSet FID_SEARCH_REPLACESET GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxBoolItem RightPara SID_ATTR_PARA_ADJUST_RIGHT [ @@ -9611,7 +9611,7 @@ SfxBoolItem RightPara SID_ATTR_PARA_ADJUST_RIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxLRSpaceItem RulerBorderDistance SID_RULER_BORDER_DISTANCE [ @@ -9638,7 +9638,7 @@ SvxLRSpaceItem RulerBorderDistance SID_RULER_BORDER_DISTANCE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SvxColumnItem RulerBorders SID_RULER_BORDERS [ @@ -9665,7 +9665,7 @@ SvxColumnItem RulerBorders SID_RULER_BORDERS GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SvxColumnItem RulerBordersVertical SID_RULER_BORDERS_VERTICAL [ @@ -9692,7 +9692,7 @@ SvxColumnItem RulerBordersVertical SID_RULER_BORDERS_VERTICAL GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxPointItem RulerNullOffset SID_RULER_NULL_OFFSET [ @@ -9719,7 +9719,7 @@ SfxPointItem RulerNullOffset SID_RULER_NULL_OFFSET GroupId = ; ] -//-------------------------------------------------------------------------- + SvxPagePosSizeItem RulerPagePos SID_RULER_PAGE_POS [ @@ -9746,7 +9746,7 @@ SvxPagePosSizeItem RulerPagePos SID_RULER_PAGE_POS GroupId = ; ] -//-------------------------------------------------------------------------- + SvxProtectItem RulerProtect SID_RULER_PROTECT [ @@ -9773,7 +9773,7 @@ SvxProtectItem RulerProtect SID_RULER_PROTECT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem SbaExecuteSql SID_FM_EXECUTE () [ @@ -9798,7 +9798,7 @@ SfxVoidItem SbaExecuteSql SID_FM_EXECUTE GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxBoolItem SbaNativeSql SID_FM_NATIVESQL () [ @@ -9823,7 +9823,7 @@ SfxBoolItem SbaNativeSql SID_FM_NATIVESQL GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem Scan SID_SCAN () [ @@ -9848,7 +9848,7 @@ SfxVoidItem Scan SID_SCAN GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ScEditOptions SID_SC_EDITOPTIONS () [ @@ -9873,7 +9873,7 @@ SfxVoidItem ScEditOptions SID_SC_EDITOPTIONS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem SchEditOptions SID_SCH_EDITOPTIONS () [ @@ -9898,7 +9898,7 @@ SfxVoidItem SchEditOptions SID_SCH_EDITOPTIONS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem SdEditOptions SID_SD_EDITOPTIONS () [ @@ -9923,7 +9923,7 @@ SfxVoidItem SdEditOptions SID_SD_EDITOPTIONS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem SdGraphicOptions SID_SD_GRAPHIC_OPTIONS () [ @@ -9948,7 +9948,7 @@ SfxVoidItem SdGraphicOptions SID_SD_GRAPHIC_OPTIONS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem SearchOff FID_SEARCH_OFF (SvxSearchItem SearchItem SID_SEARCH_ITEM) [ @@ -9973,7 +9973,7 @@ SfxVoidItem SearchOff FID_SEARCH_OFF GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SearchOn FID_SEARCH_ON (SvxSearchItem SearchItem SID_SEARCH_ITEM) [ @@ -9998,7 +9998,7 @@ SfxVoidItem SearchOn FID_SEARCH_ON GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxSetItem SearchSet FID_SEARCH_SEARCHSET () [ @@ -10023,7 +10023,7 @@ SfxSetItem SearchSet FID_SEARCH_SEARCHSET GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem Select SID_SELECT () [ @@ -10048,7 +10048,7 @@ SfxVoidItem Select SID_SELECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SendToBack SID_FRAME_TO_BOTTOM () [ @@ -10073,7 +10073,7 @@ SfxVoidItem SendToBack SID_FRAME_TO_BOTTOM GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetDefault SID_SET_DEFAULT () [ @@ -10098,7 +10098,7 @@ SfxVoidItem SetDefault SID_SET_DEFAULT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetHyperlink SID_HYPERLINK_SETLINK (SvxHyperlinkItem Hyperlink SID_HYPERLINK_SETLINK) [ @@ -10123,7 +10123,7 @@ SfxVoidItem SetHyperlink SID_HYPERLINK_SETLINK GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SvxHyphenZoneItem SetHyphenZone SID_ATTR_PARA_HYPHENZONE [ @@ -10150,7 +10150,7 @@ SvxHyphenZoneItem SetHyphenZone SID_ATTR_PARA_HYPHENZONE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxLongLRSpaceItem SetLongLeftRightMargin SID_ATTR_LONG_LRSPACE [ @@ -10177,7 +10177,7 @@ SvxLongLRSpaceItem SetLongLeftRightMargin SID_ATTR_LONG_LRSPACE GroupId = ; ] -//-------------------------------------------------------------------------- + SvxLongULSpaceItem SetLongTopBottomMargin SID_ATTR_LONG_ULSPACE (SvxLongULSpaceItem Space SID_ATTR_LONG_ULSPACE) [ @@ -10205,7 +10205,7 @@ SvxLongULSpaceItem SetLongTopBottomMargin SID_ATTR_LONG_ULSPACE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetObjectToBackground SID_OBJECT_HELL () [ @@ -10230,7 +10230,7 @@ SfxVoidItem SetObjectToBackground SID_OBJECT_HELL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetObjectToForeground SID_OBJECT_HEAVEN () [ @@ -10255,7 +10255,7 @@ SfxVoidItem SetObjectToForeground SID_OBJECT_HEAVEN GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetPageMaxSize SID_ATTR_PAGE_MAXSIZE (SvxSizeItem Size SID_ATTR_PAGE_MAXSIZE) [ @@ -10280,7 +10280,7 @@ SfxVoidItem SetPageMaxSize SID_ATTR_PAGE_MAXSIZE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxShadowItem BorderShadow SID_ATTR_BORDER_SHADOW [ @@ -10307,7 +10307,7 @@ SvxShadowItem BorderShadow SID_ATTR_BORDER_SHADOW GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SdrShadowItem FillShadow SID_ATTR_FILL_SHADOW [ @@ -10334,7 +10334,7 @@ SdrShadowItem FillShadow SID_ATTR_FILL_SHADOW GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SvxShadowedItem Shadowed SID_ATTR_CHAR_SHADOWED [ @@ -10361,7 +10361,7 @@ SvxShadowedItem Shadowed SID_ATTR_CHAR_SHADOWED GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ShowFmExplorer SID_FM_SHOW_FMEXPLORER [ @@ -10389,7 +10389,7 @@ SfxBoolItem ShowFmExplorer SID_FM_SHOW_FMEXPLORER ] -//-------------------------------------------------------------------------- + SfxBoolItem ShowItemBrowser SID_SHOW_ITEMBROWSER [ @@ -10416,7 +10416,7 @@ SfxBoolItem ShowItemBrowser SID_SHOW_ITEMBROWSER GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem ShowPropBrowser SID_SHOW_PROPERTYBROWSER [ @@ -10443,7 +10443,7 @@ SfxBoolItem ShowPropBrowser SID_SHOW_PROPERTYBROWSER GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ShowProperties SID_FM_SHOW_PROPERTIES [ @@ -10470,7 +10470,7 @@ SfxBoolItem ShowProperties SID_FM_SHOW_PROPERTIES GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ShowPropertyBrowser SID_FM_SHOW_PROPERTY_BROWSER () [ @@ -10498,7 +10498,7 @@ SfxBoolItem ShowPropertyBrowser SID_FM_SHOW_PROPERTY_BROWSER GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ShowRuler SID_RULER [ @@ -10525,7 +10525,7 @@ SfxBoolItem ShowRuler SID_RULER GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem SimEditOptions SID_SIM_EDITOPTIONS () [ @@ -10550,7 +10550,7 @@ SfxVoidItem SimEditOptions SID_SIM_EDITOPTIONS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SvxSizeItem Size SID_ATTR_SIZE [ @@ -10577,7 +10577,7 @@ SvxSizeItem Size SID_ATTR_SIZE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem SmEditOptions SID_SM_EDITOPTIONS () [ @@ -10602,7 +10602,7 @@ SfxVoidItem SmEditOptions SID_SM_EDITOPTIONS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem SortDown SID_FM_SORTDOWN () [ @@ -10627,7 +10627,7 @@ SfxVoidItem SortDown SID_FM_SORTDOWN GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem Sortup SID_FM_SORTUP () [ @@ -10652,7 +10652,7 @@ SfxVoidItem Sortup SID_FM_SORTUP GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxBoolItem SpacePara1 SID_ATTR_PARA_LINESPACE_10 [ @@ -10681,7 +10681,7 @@ SfxBoolItem SpacePara1 SID_ATTR_PARA_LINESPACE_10 GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem SpacePara15 SID_ATTR_PARA_LINESPACE_15 [ @@ -10710,7 +10710,7 @@ SfxBoolItem SpacePara15 SID_ATTR_PARA_LINESPACE_15 GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem SpacePara2 SID_ATTR_PARA_LINESPACE_20 [ @@ -10739,7 +10739,7 @@ SfxBoolItem SpacePara2 SID_ATTR_PARA_LINESPACE_20 GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxKerningItem Spacing SID_ATTR_CHAR_KERNING [ @@ -10766,7 +10766,7 @@ SvxKerningItem Spacing SID_ATTR_CHAR_KERNING GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem SpellOnline SID_AUTOSPELL_CHECK [ @@ -10793,7 +10793,7 @@ SfxBoolItem SpellOnline SID_AUTOSPELL_CHECK GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem Spinbutton SID_INSERT_SPINBUTTON [ @@ -10820,7 +10820,7 @@ SfxBoolItem Spinbutton SID_INSERT_SPINBUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem Square SID_DRAW_SQUARE (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y) [ @@ -10848,7 +10848,7 @@ SfxVoidItem Square SID_DRAW_SQUARE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem Square_Rounded SID_DRAW_SQUARE_ROUND (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y) [ @@ -10876,7 +10876,7 @@ SfxVoidItem Square_Rounded SID_DRAW_SQUARE_ROUND GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem Square_Rounded_Unfilled SID_DRAW_SQUARE_ROUND_NOFILL (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y) [ @@ -10904,7 +10904,7 @@ SfxVoidItem Square_Rounded_Unfilled SID_DRAW_SQUARE_ROUND_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem Square_Unfilled SID_DRAW_SQUARE_NOFILL (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y) [ @@ -10932,7 +10932,7 @@ SfxVoidItem Square_Unfilled SID_DRAW_SQUARE_NOFILL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxUInt32Item State3D SID_3D_STATE [ @@ -10959,7 +10959,7 @@ SfxUInt32Item State3D SID_3D_STATE GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SvxCrossedOutItem Strikeout SID_ATTR_CHAR_STRIKEOUT [ @@ -10986,7 +10986,7 @@ SvxCrossedOutItem Strikeout SID_ATTR_CHAR_STRIKEOUT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem SubScript SID_SET_SUB_SCRIPT [ @@ -11013,7 +11013,7 @@ SfxBoolItem SubScript SID_SET_SUB_SCRIPT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem Substract SID_POLY_SUBSTRACT () [ @@ -11038,7 +11038,7 @@ SfxVoidItem Substract SID_POLY_SUBSTRACT GroupId = GID_MODIFY; ] -//-------------------------------------------------------------------------- + SfxBoolItem SuperScript SID_SET_SUPER_SCRIPT [ @@ -11065,7 +11065,7 @@ SfxBoolItem SuperScript SID_SET_SUPER_SCRIPT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SwEditOptions SID_SW_EDITOPTIONS () [ @@ -11090,7 +11090,7 @@ SfxVoidItem SwEditOptions SID_SW_EDITOPTIONS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem TabDialog SID_FM_TAB_DIALOG [ @@ -11120,7 +11120,7 @@ SfxBoolItem TabDialog SID_FM_TAB_DIALOG GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SvxTabStopItem Tabstops SID_ATTR_TABSTOP [ @@ -11147,7 +11147,7 @@ SvxTabStopItem Tabstops SID_ATTR_TABSTOP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxTabStopItem TabstopsVertical SID_ATTR_TABSTOP_VERTICAL [ @@ -11174,7 +11174,7 @@ SvxTabStopItem TabstopsVertical SID_ATTR_TABSTOP_VERTICAL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem TestMode SID_DIALOG_TESTMODE () [ @@ -11202,7 +11202,7 @@ SfxBoolItem TestMode SID_DIALOG_TESTMODE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem Text SID_ATTR_CHAR [ @@ -11229,7 +11229,7 @@ SfxBoolItem Text SID_ATTR_CHAR GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem DrawText SID_DRAW_TEXT [ @@ -11259,7 +11259,7 @@ SfxBoolItem DrawText SID_DRAW_TEXT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem Text_Marquee SID_DRAW_TEXT_MARQUEE [ @@ -11286,7 +11286,7 @@ SfxBoolItem Text_Marquee SID_DRAW_TEXT_MARQUEE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem TextdirectionLeftToRight SID_TEXTDIRECTION_LEFT_TO_RIGHT [ @@ -11313,7 +11313,7 @@ SfxBoolItem TextdirectionLeftToRight SID_TEXTDIRECTION_LEFT_TO_RIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem TextdirectionTopToBottom SID_TEXTDIRECTION_TOP_TO_BOTTOM [ @@ -11340,7 +11340,7 @@ SfxBoolItem TextdirectionTopToBottom SID_TEXTDIRECTION_TOP_TO_BOTTOM GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SdrTextFitToSizeTypeItem TextFitToSize SID_ATTR_TEXT_FITTOSIZE [ @@ -11367,7 +11367,7 @@ SdrTextFitToSizeTypeItem TextFitToSize SID_ATTR_TEXT_FITTOSIZE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ThesaurusDialog SID_THESAURUS () [ @@ -11392,7 +11392,7 @@ SfxVoidItem ThesaurusDialog SID_THESAURUS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem InsertTimeField SID_INSERT_TIMEFIELD [ @@ -11419,7 +11419,7 @@ SfxBoolItem InsertTimeField SID_INSERT_TIMEFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem TimeField SID_FM_TIMEFIELD [ @@ -11446,7 +11446,7 @@ SfxBoolItem TimeField SID_FM_TIMEFIELD GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ToggleObjectBezierMode SID_BEZIER_EDIT () [ @@ -11471,7 +11471,7 @@ SfxBoolItem ToggleObjectBezierMode SID_BEZIER_EDIT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem ToggleObjectRotateMode SID_OBJECT_ROTATE () [ @@ -11496,7 +11496,7 @@ SfxBoolItem ToggleObjectRotateMode SID_OBJECT_ROTATE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem ToolEdit SID_TEXTEDIT [ @@ -11523,7 +11523,7 @@ SfxBoolItem ToolEdit SID_TEXTEDIT GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxBoolItem SelectObject SID_OBJECT_SELECT [ @@ -11550,7 +11550,7 @@ SfxBoolItem SelectObject SID_OBJECT_SELECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SvxULSpaceItem TopBottomMargin SID_ATTR_ULSPACE [ @@ -11577,7 +11577,7 @@ SvxULSpaceItem TopBottomMargin SID_ATTR_ULSPACE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem TransformDialog SID_ATTR_TRANSFORM () [ @@ -11602,7 +11602,7 @@ SfxVoidItem TransformDialog SID_ATTR_TRANSFORM GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem TwainSelect SID_TWAIN_SELECT () [ @@ -11627,7 +11627,7 @@ SfxBoolItem TwainSelect SID_TWAIN_SELECT GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem TwainTransfer SID_TWAIN_TRANSFER () [ @@ -11652,7 +11652,7 @@ SfxVoidItem TwainTransfer SID_TWAIN_TRANSFER GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SvxTextLineItem Underline SID_ATTR_CHAR_UNDERLINE [ @@ -11679,7 +11679,7 @@ SvxTextLineItem Underline SID_ATTR_CHAR_UNDERLINE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxTextLineItem Overline SID_ATTR_CHAR_OVERLINE [ @@ -11706,7 +11706,7 @@ SvxTextLineItem Overline SID_ATTR_CHAR_OVERLINE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem URLButton SID_INSERT_URLBUTTON [ @@ -11733,7 +11733,7 @@ SfxBoolItem URLButton SID_INSERT_URLBUTTON GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem UseWizards SID_FM_USE_WIZARDS [ @@ -11760,7 +11760,7 @@ SfxBoolItem UseWizards SID_FM_USE_WIZARDS GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem VerticalCaption SID_DRAW_CAPTION_VERTICAL [ @@ -11787,7 +11787,7 @@ SfxBoolItem VerticalCaption SID_DRAW_CAPTION_VERTICAL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem VerticalText SID_DRAW_TEXT_VERTICAL [ @@ -11814,7 +11814,7 @@ SfxBoolItem VerticalText SID_DRAW_TEXT_VERTICAL GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem VFixedLine SID_INSERT_VFIXEDLINE [ @@ -11841,7 +11841,7 @@ SfxBoolItem VFixedLine SID_INSERT_VFIXEDLINE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ViewFormAsGrid SID_FM_VIEW_AS_GRID () [ @@ -11869,7 +11869,7 @@ SfxVoidItem ViewFormAsGrid SID_FM_VIEW_AS_GRID GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem VScrollbar SID_INSERT_VSCROLLBAR [ @@ -11896,7 +11896,7 @@ SfxBoolItem VScrollbar SID_INSERT_VSCROLLBAR GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SvxWidowsItem Widow SID_ATTR_PARA_WIDOWS [ @@ -11923,7 +11923,7 @@ SvxWidowsItem Widow SID_ATTR_PARA_WIDOWS GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem Window3D SID_3D_WIN [ @@ -11950,7 +11950,7 @@ SfxBoolItem Window3D SID_3D_WIN GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SvxWordLineModeItem WordMode SID_ATTR_CHAR_WORDLINEMODE [ @@ -11977,7 +11977,7 @@ SvxWordLineModeItem WordMode SID_ATTR_CHAR_WORDLINEMODE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + XLineColorItem XLineColor SID_ATTR_LINE_COLOR [ @@ -12004,7 +12004,7 @@ XLineColorItem XLineColor SID_ATTR_LINE_COLOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + XLineStyleItem XLineStyle SID_ATTR_LINE_STYLE [ @@ -12031,7 +12031,7 @@ XLineStyleItem XLineStyle SID_ATTR_LINE_STYLE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem Zoom100Percent SID_SIZE_REAL () [ @@ -12056,7 +12056,7 @@ SfxVoidItem Zoom100Percent SID_SIZE_REAL GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ZoomObjects SID_SIZE_OPTIMAL () [ @@ -12081,7 +12081,7 @@ SfxVoidItem ZoomObjects SID_SIZE_OPTIMAL GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ZoomOptimal SID_SIZE_ALL () [ @@ -12106,7 +12106,7 @@ SfxVoidItem ZoomOptimal SID_SIZE_ALL GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ZoomPage SID_SIZE_PAGE () [ @@ -12131,7 +12131,7 @@ SfxVoidItem ZoomPage SID_SIZE_PAGE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ZoomPageWidth SID_SIZE_PAGE_WIDTH () [ @@ -12156,7 +12156,7 @@ SfxVoidItem ZoomPageWidth SID_SIZE_PAGE_WIDTH GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ZoomVisArea SID_SIZE_VISAREA () [ @@ -12181,7 +12181,7 @@ SfxVoidItem ZoomVisArea SID_SIZE_VISAREA GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ToggleControlFocus SID_FM_TOGGLECONTROLFOCUS () [ @@ -12209,7 +12209,7 @@ SfxVoidItem ToggleControlFocus SID_FM_TOGGLECONTROLFOCUS GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem CreateFieldControl SID_FM_CREATE_FIELDCONTROL () [ @@ -12237,7 +12237,7 @@ SfxVoidItem CreateFieldControl SID_FM_CREATE_FIELDCONTROL GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem SelectMode SID_INSERT_SELECT [ @@ -12264,7 +12264,7 @@ SfxBoolItem SelectMode SID_INSERT_SELECT GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SvxParaVertAlignItem VerticalParagraphAlignment SID_PARA_VERTALIGN [ @@ -12291,7 +12291,7 @@ SvxParaVertAlignItem VerticalParagraphAlignment SID_PARA_VERTALIGN GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SvxCharReliefItem CharacterRelief SID_ATTR_CHAR_RELIEF [ @@ -12318,7 +12318,7 @@ SvxCharReliefItem CharacterRelief SID_ATTR_CHAR_RELIEF GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SvxBrushItem CharacterBackgroundPattern SID_ATTR_BRUSH_CHAR [ @@ -12345,7 +12345,7 @@ SvxBrushItem CharacterBackgroundPattern SID_ATTR_BRUSH_CHAR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxCharRotateItem CharacterRotation SID_ATTR_CHAR_ROTATED [ @@ -12372,7 +12372,7 @@ SvxCharRotateItem CharacterRotation SID_ATTR_CHAR_ROTATED GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxCharScaleWidthItem CharacterWidthScalingFactor SID_ATTR_CHAR_SCALEWIDTH [ @@ -12399,7 +12399,7 @@ SvxCharScaleWidthItem CharacterWidthScalingFactor SID_ATTR_CHAR_SCALEWIDTH GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxUInt32Item NumberFormatValue SID_ATTR_NUMBERFORMAT_VALUE [ @@ -12426,7 +12426,7 @@ SfxUInt32Item NumberFormatValue SID_ATTR_NUMBERFORMAT_VALUE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxHorJustifyItem HorizontalJustification SID_ATTR_ALIGN_HOR_JUSTIFY [ @@ -12453,7 +12453,7 @@ SvxHorJustifyItem HorizontalJustification SID_ATTR_ALIGN_HOR_JUSTIFY GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxVerJustifyItem VerticalJustification SID_ATTR_ALIGN_VER_JUSTIFY [ @@ -12480,7 +12480,7 @@ SvxVerJustifyItem VerticalJustification SID_ATTR_ALIGN_VER_JUSTIFY GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxUInt16Item AlignmentIndent SID_ATTR_ALIGN_INDENT [ @@ -12507,7 +12507,7 @@ SfxUInt16Item AlignmentIndent SID_ATTR_ALIGN_INDENT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem AlignmentHyphenation SID_ATTR_ALIGN_HYPHENATION [ @@ -12534,7 +12534,7 @@ SfxBoolItem AlignmentHyphenation SID_ATTR_ALIGN_HYPHENATION GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxInt32Item AlignmentRotation SID_ATTR_ALIGN_DEGREES [ @@ -12561,7 +12561,7 @@ SfxInt32Item AlignmentRotation SID_ATTR_ALIGN_DEGREES GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxRotateModeItem AlignmentRotationMode SID_ATTR_ALIGN_LOCKPOS [ @@ -12588,7 +12588,7 @@ SvxRotateModeItem AlignmentRotationMode SID_ATTR_ALIGN_LOCKPOS GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxMarginItem AlignmentMargin SID_ATTR_ALIGN_MARGIN [ @@ -12615,7 +12615,7 @@ SvxMarginItem AlignmentMargin SID_ATTR_ALIGN_MARGIN GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem AlignmentStacked SID_ATTR_ALIGN_STACKED [ @@ -12642,7 +12642,7 @@ SfxBoolItem AlignmentStacked SID_ATTR_ALIGN_STACKED GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ParaLeftToRight SID_ATTR_PARA_LEFT_TO_RIGHT [ @@ -12670,7 +12670,7 @@ SfxBoolItem ParaLeftToRight SID_ATTR_PARA_LEFT_TO_RIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ParaRightToLeft SID_ATTR_PARA_RIGHT_TO_LEFT [ @@ -12698,7 +12698,7 @@ SfxBoolItem ParaRightToLeft SID_ATTR_PARA_RIGHT_TO_LEFT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem TextRTL SID_RULER_TEXT_RIGHT_TO_LEFT [ /* flags: */ @@ -12724,7 +12724,7 @@ SfxBoolItem TextRTL SID_RULER_TEXT_RIGHT_TO_LEFT GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxVoidItem OpenHyperlinkOnCursor SID_OPEN_HYPERLINK () [ @@ -12795,7 +12795,7 @@ SfxBoolItem VerticalTextState SID_VERTICALTEXT_STATE GroupId = GID_APPLICATION; ] -//-------------------------------------------------------------------------- + SfxVoidItem OpenXMLFilterSettings SID_OPEN_XML_FILTERSETTINGS () [ @@ -12820,7 +12820,7 @@ SfxVoidItem OpenXMLFilterSettings SID_OPEN_XML_FILTERSETTINGS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem HangulHanjaConversion SID_HANGUL_HANJA_CONVERSION () [ @@ -12844,7 +12844,7 @@ SfxVoidItem HangulHanjaConversion SID_HANGUL_HANJA_CONVERSION ToolBoxConfig = TRUE, GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChineseConversion SID_CHINESE_CONVERSION () [ @@ -12868,7 +12868,7 @@ SfxVoidItem ChineseConversion SID_CHINESE_CONVERSION ToolBoxConfig = TRUE, GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem SpellDialog SID_SPELL_DIALOG @@ -12895,7 +12895,7 @@ SfxBoolItem SpellDialog SID_SPELL_DIALOG ToolBoxConfig = TRUE, GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SvxColumnItem RulerRows SID_RULER_ROWS [ /* flags: */ @@ -12920,7 +12920,7 @@ SvxColumnItem RulerRows SID_RULER_ROWS ToolBoxConfig = FALSE, GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SvxColumnItem RulerRowsVertical SID_RULER_ROWS_VERTICAL [ /* flags: */ @@ -12947,7 +12947,7 @@ SvxColumnItem RulerRowsVertical SID_RULER_ROWS_VERTICAL ] -//-------------------------------------------------------------------------- + SvxFontListItem FontNameList SID_ATTR_CHAR_FONTLIST () [ @@ -12972,7 +12972,7 @@ SvxFontListItem FontNameList SID_ATTR_CHAR_FONTLIST GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ExtrusionToggle SID_EXTRUSION_TOOGLE [ @@ -12995,7 +12995,7 @@ SfxBoolItem ExtrusionToggle SID_EXTRUSION_TOOGLE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem ExtrusionTiltDown SID_EXTRUSION_TILT_DOWN () [ @@ -13017,7 +13017,7 @@ SfxVoidItem ExtrusionTiltDown SID_EXTRUSION_TILT_DOWN GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem ExtrusionTiltUp SID_EXTRUSION_TILT_UP () [ @@ -13039,7 +13039,7 @@ SfxVoidItem ExtrusionTiltUp SID_EXTRUSION_TILT_UP GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem ExtrusionTiltLeft SID_EXTRUSION_TILT_LEFT () [ @@ -13061,7 +13061,7 @@ SfxVoidItem ExtrusionTiltLeft SID_EXTRUSION_TILT_LEFT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem ExtrusionTiltRight SID_EXTRUSION_TILT_RIGHT () [ @@ -13083,7 +13083,7 @@ SfxVoidItem ExtrusionTiltRight SID_EXTRUSION_TILT_RIGHT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem ExtrusionDepthFloater SID_EXTRUSION_DEPTH_FLOATER () [ @@ -13108,7 +13108,7 @@ SfxVoidItem ExtrusionDepthFloater SID_EXTRUSION_DEPTH_FLOATER GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem ExtrusionDepthDialog SID_EXTRUSION_DEPTH_DIALOG (SvxDoubleItem Depth SID_EXTRUSION_DEPTH,SfxUInt16Item Metric SID_ATTR_METRIC) [ @@ -13133,7 +13133,7 @@ SfxVoidItem ExtrusionDepthDialog SID_EXTRUSION_DEPTH_DIALOG GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem ExtrusionDirectionFloater SID_EXTRUSION_DIRECTION_FLOATER () [ @@ -13158,7 +13158,7 @@ SfxVoidItem ExtrusionDirectionFloater SID_EXTRUSION_DIRECTION_FLOATER GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem ExtrusionLightingFloater SID_EXTRUSION_LIGHTING_FLOATER () [ @@ -13183,7 +13183,7 @@ SfxVoidItem ExtrusionLightingFloater SID_EXTRUSION_LIGHTING_FLOATER GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem ExtrusionSurfaceFloater SID_EXTRUSION_SURFACE_FLOATER () [ @@ -13208,7 +13208,7 @@ SfxVoidItem ExtrusionSurfaceFloater SID_EXTRUSION_SURFACE_FLOATER GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SvxColorItem Extrusion3DColor SID_EXTRUSION_3D_COLOR [ @@ -13230,7 +13230,7 @@ SvxColorItem Extrusion3DColor SID_EXTRUSION_3D_COLOR GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SvxDoubleItem ExtrusionDepth SID_EXTRUSION_DEPTH [ @@ -13252,7 +13252,7 @@ SvxDoubleItem ExtrusionDepth SID_EXTRUSION_DEPTH GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxInt32Item ExtrusionDirection SID_EXTRUSION_DIRECTION [ @@ -13274,7 +13274,7 @@ SfxInt32Item ExtrusionDirection SID_EXTRUSION_DIRECTION GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxInt32Item ExtrusionProjection SID_EXTRUSION_PROJECTION [ @@ -13296,7 +13296,7 @@ SfxInt32Item ExtrusionProjection SID_EXTRUSION_PROJECTION GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxInt32Item ExtrusionLightingDirection SID_EXTRUSION_LIGHTING_DIRECTION [ @@ -13318,7 +13318,7 @@ SfxInt32Item ExtrusionLightingDirection SID_EXTRUSION_LIGHTING_DIRECTION GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxInt32Item ExtrusionLightingIntensity SID_EXTRUSION_LIGHTING_INTENSITY [ @@ -13340,7 +13340,7 @@ SfxInt32Item ExtrusionLightingIntensity SID_EXTRUSION_LIGHTING_INTENSITY GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxInt32Item ExtrusionSurface SID_EXTRUSION_SURFACE [ @@ -13362,7 +13362,7 @@ SfxInt32Item ExtrusionSurface SID_EXTRUSION_SURFACE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem FontworkGalleryFloater SID_FONTWORK_GALLERY_FLOATER () [ @@ -13387,7 +13387,7 @@ SfxVoidItem FontworkGalleryFloater SID_FONTWORK_GALLERY_FLOATER GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem FontworkShapeType SID_FONTWORK_SHAPE_TYPE (SfxStringItem FontworkShapeType SID_FONTWORK_SHAPE_TYPE) [ @@ -13415,7 +13415,7 @@ SfxBoolItem FontworkShapeType SID_FONTWORK_SHAPE_TYPE GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem FontworkSameLetterHeights SID_FONTWORK_SAME_LETTER_HEIGHTS [ @@ -13437,7 +13437,7 @@ SfxBoolItem FontworkSameLetterHeights SID_FONTWORK_SAME_LETTER_HEIGHTS GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem FontworkAlignmentFloater SID_FONTWORK_ALIGNMENT_FLOATER () [ @@ -13462,7 +13462,7 @@ SfxVoidItem FontworkAlignmentFloater SID_FONTWORK_ALIGNMENT_FLOATER GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem FontworkCharacterSpacingFloater SID_FONTWORK_CHARACTER_SPACING_FLOATER () [ @@ -13487,7 +13487,7 @@ SfxVoidItem FontworkCharacterSpacingFloater SID_FONTWORK_CHARACTER_SPACING_FLOAT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxInt32Item FontworkShape SID_FONTWORK_SHAPE [ /* flags: */ @@ -13508,7 +13508,7 @@ SfxInt32Item FontworkShape SID_FONTWORK_SHAPE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxInt32Item FontworkAlignment SID_FONTWORK_ALIGNMENT [ /* flags: */ @@ -13529,7 +13529,7 @@ SfxInt32Item FontworkAlignment SID_FONTWORK_ALIGNMENT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxInt32Item FontworkCharacterSpacing SID_FONTWORK_CHARACTER_SPACING [ /* flags: */ @@ -13550,7 +13550,7 @@ SfxInt32Item FontworkCharacterSpacing SID_FONTWORK_CHARACTER_SPACING GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem FontworkCharacterSpacingDialog SID_FONTWORK_CHARACTER_SPACING_DIALOG (SfxInt32Item FontworkCharacterSpacing SID_FONTWORK_CHARACTER_SPACING) [ @@ -13575,7 +13575,7 @@ SfxVoidItem FontworkCharacterSpacingDialog SID_FONTWORK_CHARACTER_SPACING_DIALOG GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxBoolItem FontworkKernCharacterPairs SID_FONTWORK_KERN_CHARACTER_PAIRS [ /* flags: */ @@ -13596,7 +13596,7 @@ SfxBoolItem FontworkKernCharacterPairs SID_FONTWORK_KERN_CHARACTER_PAIRS GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + OfaRefItem GetColorTable SID_GET_COLORLIST () [ @@ -13621,7 +13621,7 @@ OfaRefItem GetColorTable SID_GET_COLORLIST GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SpellCheckerChanged SID_SPELLCHECKER_CHANGED () [ @@ -13646,7 +13646,7 @@ SfxVoidItem SpellCheckerChanged SID_SPELLCHECKER_CHANGED GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxUInt16Item Year2000 SID_ATTR_YEAR2000 () [ @@ -13671,7 +13671,7 @@ SfxUInt16Item Year2000 SID_ATTR_YEAR2000 GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem IncrementIndent SID_INC_INDENT () [ @@ -13699,7 +13699,7 @@ SfxVoidItem IncrementIndent SID_INC_INDENT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DecrementIndent SID_DEC_INDENT () [ @@ -13727,7 +13727,7 @@ SfxVoidItem DecrementIndent SID_DEC_INDENT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxStringItem StateTableCell SID_TABLE_CELL [ @@ -13754,7 +13754,7 @@ SfxStringItem StateTableCell SID_TABLE_CELL GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem SendOutlineToImpress SID_OUTLINE_TO_IMPRESS (SfxLockBytesItem RtfOutline SID_OUTLINE_TO_IMPRESS) [ @@ -13779,7 +13779,7 @@ SfxVoidItem SendOutlineToImpress SID_OUTLINE_TO_IMPRESS GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxUInt16Item DefTabStop SID_ATTR_DEFTABSTOP [ @@ -13806,7 +13806,7 @@ SfxUInt16Item DefTabStop SID_ATTR_DEFTABSTOP GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SvxLanguageItem DocumentLanguage SID_ATTR_LANGUAGE [ @@ -13833,7 +13833,7 @@ SvxLanguageItem DocumentLanguage SID_ATTR_LANGUAGE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SvxLanguageItem DocumentLanguageCJK SID_ATTR_CHAR_CJK_LANGUAGE [ @@ -13860,7 +13860,7 @@ SvxLanguageItem DocumentLanguageCJK SID_ATTR_CHAR_CJK_LANGUAGE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SvxLanguageItem DocumentLanguageCTL SID_ATTR_CHAR_CTL_LANGUAGE [ @@ -13887,7 +13887,7 @@ SvxLanguageItem DocumentLanguageCTL SID_ATTR_CHAR_CTL_LANGUAGE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxBoolItem OptionsLocaleChanged SID_OPT_LOCALE_CHANGED [ @@ -13914,7 +13914,7 @@ SfxBoolItem OptionsLocaleChanged SID_OPT_LOCALE_CHANGED GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxVoidItem SbaBrwInsert SID_SBA_BRW_INSERT () [ @@ -13939,7 +13939,7 @@ SfxVoidItem SbaBrwInsert SID_SBA_BRW_INSERT GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxBoolItem BasicShapes SID_DRAWTBX_CS_BASIC (SfxStringItem BasicShapes SID_DRAWTBX_CS_BASIC) [ @@ -13967,7 +13967,7 @@ SfxBoolItem BasicShapes SID_DRAWTBX_CS_BASIC GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem SymbolShapes SID_DRAWTBX_CS_SYMBOL (SfxStringItem SymbolShapes SID_DRAWTBX_CS_SYMBOL) [ @@ -13995,7 +13995,7 @@ SfxBoolItem SymbolShapes SID_DRAWTBX_CS_SYMBOL GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ArrowShapes SID_DRAWTBX_CS_ARROW (SfxStringItem ArrowShapes SID_DRAWTBX_CS_ARROW) [ @@ -14023,7 +14023,7 @@ SfxBoolItem ArrowShapes SID_DRAWTBX_CS_ARROW GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART (SfxStringItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART) [ @@ -14051,7 +14051,7 @@ SfxBoolItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem CalloutShapes SID_DRAWTBX_CS_CALLOUT (SfxStringItem CalloutShapes SID_DRAWTBX_CS_CALLOUT) [ @@ -14079,7 +14079,7 @@ SfxBoolItem CalloutShapes SID_DRAWTBX_CS_CALLOUT GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem StarShapes SID_DRAWTBX_CS_STAR (SfxStringItem StarShapes SID_DRAWTBX_CS_STAR) [ @@ -14107,7 +14107,7 @@ SfxBoolItem StarShapes SID_DRAWTBX_CS_STAR GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxStringItem CustomShape SID_DRAW_CS_ID [ @@ -14152,7 +14152,7 @@ SvxDashListItem DashListState SID_DASH_LIST GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SvxLineEndListItem LineEndListState SID_LINEEND_LIST [ /* flags: */ @@ -14292,7 +14292,7 @@ SvxEmphasisMarkItem EmphasisMark SID_ATTR_CHAR_EMPHASISMARK GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ShowDataNavigator SID_FM_SHOW_DATANAVIGATOR () [ @@ -14320,7 +14320,7 @@ SfxBoolItem ShowDataNavigator SID_FM_SHOW_DATANAVIGATOR GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxObjectItem FmDataNavigatorController SID_FM_DATANAVIGATOR_CONTROL [ @@ -14347,7 +14347,7 @@ SfxObjectItem FmDataNavigatorController SID_FM_DATANAVIGATOR_CONTROL GroupId = ; ] -//-------------------------------------------------------------------------- + SfxVoidItem CommonAlignLeft SID_ALIGN_ANY_LEFT () [ @@ -14372,7 +14372,7 @@ SfxVoidItem CommonAlignLeft SID_ALIGN_ANY_LEFT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CommonAlignHorizontalCenter SID_ALIGN_ANY_HCENTER () [ @@ -14396,7 +14396,7 @@ SfxVoidItem CommonAlignHorizontalCenter SID_ALIGN_ANY_HCENTER ToolBoxConfig = FALSE, GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CommonAlignRight SID_ALIGN_ANY_RIGHT () [ @@ -14420,7 +14420,7 @@ SfxVoidItem CommonAlignRight SID_ALIGN_ANY_RIGHT ToolBoxConfig = FALSE, GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CommonAlignJustified SID_ALIGN_ANY_JUSTIFIED () [ @@ -14444,7 +14444,7 @@ SfxVoidItem CommonAlignJustified SID_ALIGN_ANY_JUSTIFIED ToolBoxConfig = FALSE, GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CommonAlignTop SID_ALIGN_ANY_TOP () [ @@ -14468,7 +14468,7 @@ SfxVoidItem CommonAlignTop SID_ALIGN_ANY_TOP ToolBoxConfig = FALSE, GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CommonAlignVerticalCenter SID_ALIGN_ANY_VCENTER () [ @@ -14492,7 +14492,7 @@ SfxVoidItem CommonAlignVerticalCenter SID_ALIGN_ANY_VCENTER ToolBoxConfig = FALSE, GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CommonAlignBottom SID_ALIGN_ANY_BOTTOM () [ @@ -14516,7 +14516,7 @@ SfxVoidItem CommonAlignBottom SID_ALIGN_ANY_BOTTOM ToolBoxConfig = FALSE, GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CommonAlignHorizontalDefault SID_ALIGN_ANY_HDEFAULT () [ @@ -14540,7 +14540,7 @@ SfxVoidItem CommonAlignHorizontalDefault SID_ALIGN_ANY_HDEFAULT ToolBoxConfig = FALSE, GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CommonAlignVerticalDefault SID_ALIGN_ANY_VDEFAULT () [ @@ -14590,7 +14590,7 @@ SfxVoidItem AVMediaToolBox SID_AVMEDIA_TOOLBOX GroupId = GID_APPLICATION; ] -//-------------------------------------------------------------------------- + SfxBoolItem BorderReducedMode SID_BORDER_REDUCED_MODE [ @@ -14617,7 +14617,7 @@ SfxBoolItem BorderReducedMode SID_BORDER_REDUCED_MODE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ColorSettings SID_COLOR_SETTINGS [ @@ -14646,7 +14646,7 @@ SfxBoolItem ColorSettings SID_COLOR_SETTINGS PseudoPrefix = SID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem MailExportFinished SID_MAIL_EXPORT_FINISHED () [ @@ -14670,7 +14670,7 @@ SfxVoidItem MailExportFinished SID_MAIL_EXPORT_FINISHED ToolBoxConfig = FALSE, GroupId = GID_EXPLORER; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertZWSP SID_INSERT_ZWSP () [ @@ -14694,7 +14694,7 @@ SfxVoidItem InsertZWSP SID_INSERT_ZWSP ToolBoxConfig = TRUE, GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertZWNBSP SID_INSERT_ZWNBSP () [ @@ -14718,7 +14718,7 @@ SfxVoidItem InsertZWNBSP SID_INSERT_ZWNBSP ToolBoxConfig = TRUE, GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertLRM SID_INSERT_LRM () [ @@ -14742,7 +14742,7 @@ SfxVoidItem InsertLRM SID_INSERT_LRM ToolBoxConfig = TRUE, GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertRLM SID_INSERT_RLM () [ @@ -14766,7 +14766,7 @@ SfxVoidItem InsertRLM SID_INSERT_RLM ToolBoxConfig = TRUE, GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertSoftHyphen FN_INSERT_SOFT_HYPHEN () [ @@ -14790,7 +14790,7 @@ SfxVoidItem InsertSoftHyphen FN_INSERT_SOFT_HYPHEN ToolBoxConfig = TRUE, GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertHardHyphen FN_INSERT_HARDHYPHEN () [ @@ -14814,7 +14814,7 @@ SfxVoidItem InsertHardHyphen FN_INSERT_HARDHYPHEN ToolBoxConfig = TRUE, GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertNonBreakingSpace FN_INSERT_HARD_SPACE () [ @@ -14839,7 +14839,7 @@ SfxVoidItem InsertNonBreakingSpace FN_INSERT_HARD_SPACE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ManageLanguage SID_BASICIDE_MANAGE_LANG () [ @@ -14864,7 +14864,7 @@ SfxVoidItem ManageLanguage SID_BASICIDE_MANAGE_LANG GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- + SfxStringItem CurrentLanguage SID_BASICIDE_CURRENT_LANG [ @@ -14989,7 +14989,7 @@ SfxBoolItem CellVertBottom SID_TABLE_VERT_BOTTOM GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxBoolItem CellVertCenter SID_TABLE_VERT_CENTER [ @@ -15016,7 +15016,7 @@ SfxBoolItem CellVertCenter SID_TABLE_VERT_CENTER GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxBoolItem CellVertTop SID_TABLE_VERT_NONE [ @@ -15187,7 +15187,7 @@ SfxVoidItem EntireColumn SID_TABLE_SELECT_COL GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem EntireRow SID_TABLE_SELECT_ROW () [ @@ -15285,7 +15285,7 @@ SfxVoidItem TableSort SID_TABLE_SORT_DIALOG GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem OpenSmartTagMenuOnCursor SID_OPEN_SMARTTAGMENU () [ @@ -15311,7 +15311,7 @@ SfxVoidItem OpenSmartTagMenuOnCursor SID_OPEN_SMARTTAGMENU GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SvxZoomSliderItem ZoomSlider SID_ATTR_ZOOMSLIDER [ @@ -15336,7 +15336,7 @@ SvxZoomSliderItem ZoomSlider SID_ATTR_ZOOMSLIDER GroupId = GID_VIEW; ] - //-------------------------------------------------------------------------- + SfxStringListItem FontNameStringList SID_FONTNAMELIST [ // flags: @@ -15360,7 +15360,7 @@ SvxZoomSliderItem ZoomSlider SID_ATTR_ZOOMSLIDER GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxVoidItem LanguageStatus SID_LANGUAGE_STATUS (SfxStringItem Language SID_LANGUAGE_STATUS) [ @@ -15388,7 +15388,7 @@ SfxVoidItem LanguageStatus SID_LANGUAGE_STATUS GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FontDialogForParagraph SID_CHAR_DLG_FOR_PARAGRAPH () @@ -15414,7 +15414,7 @@ SfxVoidItem FontDialogForParagraph SID_CHAR_DLG_FOR_PARAGRAPH GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem Grow SID_GROW_FONT_SIZE () @@ -15440,7 +15440,7 @@ SfxVoidItem Grow SID_GROW_FONT_SIZE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem Shrink SID_SHRINK_FONT_SIZE () @@ -15465,7 +15465,7 @@ SfxVoidItem Shrink SID_SHRINK_FONT_SIZE ToolBoxConfig = TRUE, GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem RecheckDocument SID_RECHECK_DOCUMENT () @@ -15491,7 +15491,7 @@ SfxVoidItem RecheckDocument SID_RECHECK_DOCUMENT GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertColumnDialog SID_TABLE_INSERT_COL_DLG () @@ -15517,7 +15517,7 @@ SfxVoidItem InsertColumnDialog SID_TABLE_INSERT_COL_DLG GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertRowDialog SID_TABLE_INSERT_ROW_DLG () @@ -15542,7 +15542,7 @@ SfxVoidItem InsertRowDialog SID_TABLE_INSERT_ROW_DLG ToolBoxConfig = FALSE, GroupId = GID_TABLE; ] -//-------------------------------------------------------------------------- + SfxVoidItem PrepareMailExport SID_MAIL_PREPAREEXPORT () [ @@ -15570,7 +15570,7 @@ SfxVoidItem PrepareMailExport SID_MAIL_PREPAREEXPORT GroupId = GID_EXPLORER; ] -//-------------------------------------------------------------------------- + SfxUInt16Item FillTransparence SID_ATTR_FILL_TRANSPARENCE [ @@ -15597,7 +15597,7 @@ SfxUInt16Item FillTransparence SID_ATTR_FILL_TRANSPARENCE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + XFillFloatTransparenceItem FillFloatTransparence SID_ATTR_FILL_FLOATTRANSPARENCE [ @@ -15624,7 +15624,7 @@ XFillFloatTransparenceItem FillFloatTransparence SID_ATTR_FILL_FLOATTRANSPARENCE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxUInt16Item LineTransparence SID_ATTR_LINE_TRANSPARENCE [ @@ -15651,10 +15651,10 @@ SfxUInt16Item LineTransparence SID_ATTR_LINE_TRANSPARENCE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + XLineJointItem LineJoint SID_ATTR_LINE_JOINT [ @@ -15681,7 +15681,7 @@ XLineJointItem LineJoint SID_ATTR_LINE_JOINT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + XLineCapItem LineCap SID_ATTR_LINE_CAP [ @@ -15708,7 +15708,7 @@ XLineCapItem LineCap SID_ATTR_LINE_CAP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + XLineStartItem LineStart SID_ATTR_LINE_START [ @@ -15735,7 +15735,7 @@ XLineStartItem LineStart SID_ATTR_LINE_START GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + XLineEndItem LineEnd SID_ATTR_LINE_END [ @@ -15762,7 +15762,7 @@ XLineEndItem LineEnd SID_ATTR_LINE_END GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxUInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X [ @@ -15789,7 +15789,7 @@ SfxUInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxUInt32Item TransformPosY SID_ATTR_TRANSFORM_POS_Y [ @@ -15816,7 +15816,7 @@ SfxUInt32Item TransformPosY SID_ATTR_TRANSFORM_POS_Y GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxUInt32Item TransformWidth SID_ATTR_TRANSFORM_WIDTH [ @@ -15843,7 +15843,7 @@ SfxUInt32Item TransformWidth SID_ATTR_TRANSFORM_WIDTH GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxUInt32Item TransformHeight SID_ATTR_TRANSFORM_HEIGHT [ @@ -15870,7 +15870,7 @@ SfxUInt32Item TransformHeight SID_ATTR_TRANSFORM_HEIGHT GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxUInt32Item TransformRotationAngle SID_ATTR_TRANSFORM_ANGLE [ @@ -15895,7 +15895,7 @@ SfxUInt32Item TransformRotationAngle SID_ATTR_TRANSFORM_ANGLE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxUInt32Item TransformRotationX SID_ATTR_TRANSFORM_ROT_X [ @@ -15920,7 +15920,7 @@ SfxUInt32Item TransformRotationX SID_ATTR_TRANSFORM_ROT_X GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxUInt32Item TransformRotationY SID_ATTR_TRANSFORM_ROT_Y [ @@ -15945,7 +15945,7 @@ SfxUInt32Item TransformRotationY SID_ATTR_TRANSFORM_ROT_Y GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ProtectPos SID_ATTR_TRANSFORM_PROTECT_POS [ @@ -15970,7 +15970,7 @@ SfxBoolItem ProtectPos SID_ATTR_TRANSFORM_PROTECT_POS GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ProtectSize SID_ATTR_TRANSFORM_PROTECT_SIZE [ @@ -15995,7 +15995,7 @@ SfxBoolItem ProtectSize SID_ATTR_TRANSFORM_PROTECT_SIZE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FlipHorizontal SID_FLIP_HORIZONTAL [ @@ -16022,7 +16022,7 @@ SfxVoidItem FlipHorizontal SID_FLIP_HORIZONTAL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FlipVertical SID_FLIP_VERTICAL [ @@ -16049,7 +16049,7 @@ SfxVoidItem FlipVertical SID_FLIP_VERTICAL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem AutomaticWidth SID_ATTR_TRANSFORM_AUTOWIDTH [ @@ -16076,7 +16076,7 @@ SfxBoolItem AutomaticWidth SID_ATTR_TRANSFORM_AUTOWIDTH GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxBoolItem AutomaticHeight SID_ATTR_TRANSFORM_AUTOHEIGHT [ @@ -16103,7 +16103,7 @@ SfxBoolItem AutomaticHeight SID_ATTR_TRANSFORM_AUTOHEIGHT GroupId = GID_SPECIAL; ] -//---------------------------------------------------------------------- + SvxLineItem BorderTLBR SID_ATTR_BORDER_DIAG_TLBR [ /* flags: */ @@ -16154,7 +16154,7 @@ SvxLineItem BorderBLTR SID_ATTR_BORDER_DIAG_BLTR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FormatCellBorders SID_CELL_FORMAT_BORDER () diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi index 6d1c9544820d..c59fa1642c43 100644 --- a/svx/sdi/svxitems.sdi +++ b/svx/sdi/svxitems.sdi @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//------------------------------------------------------------------------- + enum SvxCellHorJustifyEnum { SVX_HOR_JUSTIFY_STANDARD, @@ -37,7 +37,7 @@ enum SvxCellVerJustifyEnum }; item SvxCellVerJustifyEnum SvxCellVerJustifyEnumItem; -//------------------------------------------------------------------------- + enum SvxCellOrientationEnum { @@ -79,12 +79,12 @@ enum SvxChooseControlEnum } item SvxChooseControlEnum SvxChooseControlItem; -//------------------------------------------------------------------------- + enum SvxDrawToolEnum { SVX_SNAP_DRAW_SELECT, - // + SVX_SNAP_DRAW_LINE, SVX_SNAP_DRAW_RECT, SVX_SNAP_DRAW_ELLIPSE, @@ -102,7 +102,7 @@ enum SvxDrawToolEnum } item SvxDrawToolEnum SvxDrawToolEnumItem; -//------------------------------------------------------------------------- + enum SvxDrawAlignEnum { @@ -115,7 +115,7 @@ enum SvxDrawAlignEnum } item SvxDrawAlignEnum SvxDrawAlignEnumItem; -//------------------------------------------------------------------------- + enum SvxDrawBezierEnum { @@ -150,7 +150,7 @@ struct SvxAdjustStruct }; item SvxAdjustStruct SvxAdjustItem; -//------------------------------------------------------------------------- + enum SvxCaseMap { @@ -163,7 +163,7 @@ enum SvxCaseMap }; item SvxCaseMap SvxCaseMapItem; -//------------------------------------------------------------------------- + enum CharSet { @@ -180,7 +180,7 @@ enum CharSet CHARSET_SYMBOL }; -//------------------------------------------------------------------------- + enum FontFamily { @@ -193,7 +193,7 @@ enum FontFamily FAMILY_SYSTEM }; -//------------------------------------------------------------------------- + enum FontPitch { @@ -202,7 +202,7 @@ enum FontPitch PITCH_VARIABLE }; -//------------------------------------------------------------------------- + struct SvxFont { @@ -214,7 +214,7 @@ struct SvxFont }; item SvxFont SvxFontItem; -//------------------------------------------------------------------------- + enum FontWeight { @@ -232,7 +232,7 @@ enum FontWeight }; item FontWeight SvxWeightItem; -//------------------------------------------------------------------------- + enum FontUnderline { @@ -242,7 +242,7 @@ enum FontUnderline UNDERLINE_DOTTED }; -//------------------------------------------------------------------------- + enum FontStrikeout { @@ -251,7 +251,7 @@ enum FontStrikeout STRIKEOUT_DOUBLE }; -//------------------------------------------------------------------------- + enum FontItalic { @@ -261,7 +261,7 @@ enum FontItalic }; item FontItalic SvxPostureItem; -//------------------------------------------------------------------------- + enum SvxDbType { @@ -271,7 +271,7 @@ enum SvxDbType }; item SvxDbType SvxDbTypeItem; -//------------------------------------------------------------------------- + enum SvxLineSpace { @@ -282,7 +282,7 @@ enum SvxLineSpace }; item SvxLineSpace SvxLineSpaceItem; -//------------------------------------------------------------------------- + enum SvxInterLineSpace { @@ -293,7 +293,7 @@ enum SvxInterLineSpace }; item SvxInterLineSpace SvxInterLineSpaceItem; -//------------------------------------------------------------------------- + enum SvxBreak { @@ -308,7 +308,7 @@ enum SvxBreak }; item SvxBreak SvxBreakItem; -//------------------------------------------------------------------------- + enum BrushStyle { @@ -327,7 +327,7 @@ enum BrushStyle }; item BrushStyle BrushStyleItem; -//------------------------------------------------------------------------- + enum SvxNumType { @@ -342,7 +342,7 @@ enum SvxNumType }; item SvxNumType SvxNumTypeItem; -//------------------------------------------------------------------------- + enum SvxShadowLocation { @@ -355,7 +355,7 @@ enum SvxShadowLocation }; item SvxShadowLocation SvxShadowLocationItem; -//------------------------------------------------------------------------- + item INT16 SvxCharScaleWidthItem; item INT16 SvxParaVertAlignItem; @@ -407,7 +407,7 @@ item String avmedia_MediaItem; item BYTE SfxGlobalNameItem; -//------------------------------------------------------------------------- + struct SvxCrossedOut { @@ -433,7 +433,7 @@ struct SvxBrush }; item SvxBrush SvxBrushItem; -//------------------------------------------------------------------------- + struct SvxEscapement { @@ -443,7 +443,7 @@ struct SvxEscapement }; item SvxEscapement SvxEscapementItem; -//------------------------------------------------------------------------- + struct SvxFontHeight { @@ -453,7 +453,7 @@ struct SvxFontHeight }; item SvxFontHeight SvxFontHeightItem; -//------------------------------------------------------------------------- + struct SvxHyphenZone { @@ -464,7 +464,7 @@ struct SvxHyphenZone }; item SvxHyphenZone SvxHyphenZoneItem; -//------------------------------------------------------------------------- + struct SvxLine { INT32 LineFGColor MID_FG_COLOR; @@ -474,7 +474,7 @@ struct SvxLine }; item SvxLine SvxLineItem; -//------------------------------------------------------------------------- + struct SvxLRSpace { @@ -489,7 +489,7 @@ struct SvxLRSpace }; item SvxLRSpace SvxLRSpaceItem; -//------------------------------------------------------------------------- + struct SvxLineSpacing { @@ -498,7 +498,7 @@ struct SvxLineSpacing }; item SvxLineSpacing SvxLineSpacingItem; -//------------------------------------------------------------------------- + struct SvxPage { @@ -508,7 +508,7 @@ struct SvxPage }; item SvxPage SvxPageItem; -//------------------------------------------------------------------------- + struct SvxPagePosSize { @@ -520,7 +520,7 @@ struct SvxPagePosSize item SvxPagePosSize SvxPagePosSizeItem; -//------------------------------------------------------------------------- + struct SvxShadow { SvxShadowLocation Location MID_LOCATION; @@ -531,7 +531,7 @@ struct SvxShadow item SvxShadow SvxShadowItem; -//------------------------------------------------------------------------- + struct SvxULSpace { @@ -543,7 +543,7 @@ struct SvxULSpace }; item SvxULSpace SvxULSpaceItem -//------------------------------------------------------------------------- + struct SvxLongLRSpace { @@ -552,7 +552,7 @@ struct SvxLongLRSpace }; item SvxLongLRSpace SvxLongLRSpaceItem; -//------------------------------------------------------------------------- + struct SvxLongULSpace { @@ -561,7 +561,7 @@ struct SvxLongULSpace }; item SvxLongULSpace SvxLongULSpaceItem; -//------------------------------------------------------------------------- + struct SvxHyperlink { @@ -573,7 +573,7 @@ struct SvxHyperlink }; item SvxHyperlink SvxHyperlinkItem; -//------------------------------------------------------------------------- + struct PageModel { diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi index be1c7b94dd4d..35d117c8ff7e 100644 --- a/svx/sdi/svxslots.sdi +++ b/svx/sdi/svxslots.sdi @@ -24,7 +24,7 @@ HelpText( "Svx-Items" ) SlotIdFile( "svxslots.hrc" ) ] { - //========================================================================= + include "sfxitems.sdi" include "sfx.sdi" @@ -56,7 +56,7 @@ SlotIdFile( "svxslots.hrc" ) StateMethod = GetBckColState ; ] } - //============================================================================ + interface OLEObjects : Collection [ uuid = "BA338A43-064E-11d0-89CB-008029E4B0B1" ; diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 0c958e468a2b..5cfd48f0cebe 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -171,21 +171,21 @@ void AccessibleControlShape::Init() { // What we need to do here is merge the functionality of the AccessibleContext of our UNO control // with our own AccessibleContext-related functionality. - // + // The problem is that we do not know the interfaces our "inner" context supports - this may be any // XAccessibleXXX interface (or even any other) which makes sense for it. - // + // In theory, we could implement all possible interfaces ourself, and re-route all functionality to // the inner context (except those we implement ourself, like XAccessibleComponent). But this is in no // way future-proof - as soon as an inner context appears which implements an additional interface, // we would need to adjust our implementation to support this new interface, too. Bad idea. - // + // The usual solution for such a problem is aggregation. Aggregation means using UNO's own meachnisms // for merging an inner with an outer component, and get a component which behaves as it is exactly one. // This is what XAggregation is for. Unfortunately, aggregation requires _exact_ control over the ref count // of the inner object, which we do not have at all. // Bad, too. - // + // But there is a solution: com.sun.star.reflection.ProxyFactory. This service is able to create a proxy // for any component, which supports _exactly_ the same interfaces as the component. In addition, it can // be aggregated, as by definition the proxy's ref count is exactly 1 when returned from the factory. diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 03d5799dda80..f8601261b915 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -19,9 +19,9 @@ -// + // Global header -// + #include <svl/itemset.hxx> #include <editeng/editdata.hxx> @@ -31,9 +31,9 @@ #include <svx/svdpool.hxx> -// + // Project-local header -// + #include "AccessibleEmptyEditSource.hxx" diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index c9f37a67c7ac..53ab184c03ab 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -69,7 +69,7 @@ typedef ::com::sun::star::awt::Rectangle AwtRectangle; typedef ::com::sun::star::awt::KeyEvent AwtKeyEvent; typedef ::com::sun::star::awt::FocusEvent AwtFocusEvent; -// ============================================================================ + AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eBorder ) : Resource( SVX_RES( RID_SVXSTR_BORDER_CONTROL ) ), @@ -705,7 +705,7 @@ void AccFrameSelector::Invalidate() maPropertyListeners.disposeAndClear( aEvent ); } -// ============================================================================ + } // namespace a11y } // namespace svx diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 6f0de34fd2a0..2b9d971f8e96 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -885,7 +885,7 @@ void SAL_CALL } //===== XAccessibleSelection ============================================ -// + void SAL_CALL AccessibleShape::selectAccessibleChild( sal_Int32 ) diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx index a75e534c9b0d..985f4929d819 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.cxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx @@ -33,9 +33,9 @@ namespace accessibility { - // + // EventQueue implementation - // + AccessibleTextEventQueue::AccessibleTextEventQueue() diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 8236579d465f..bb021cca9507 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -19,9 +19,9 @@ -// + // Global header -// + #include <limits.h> @@ -49,9 +49,9 @@ #include <sfx2/viewsh.hxx> -// + // Project-local header -// + #include "AccessibleTextEventQueue.hxx" #include <svx/AccessibleTextHelper.hxx> @@ -78,9 +78,9 @@ namespace accessibility { -// + // AccessibleTextHelper_Impl declaration -// + DBG_NAME( AccessibleTextHelper_Impl ) @@ -255,9 +255,9 @@ namespace accessibility }; - // + // AccessibleTextHelper_Impl implementation - // + AccessibleTextHelper_Impl::AccessibleTextHelper_Impl() : @@ -1733,9 +1733,9 @@ namespace accessibility } - // + // AccessibleTextHelper implementation (simply forwards to impl) - // + SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 2326463e858a..d53d6e08cc84 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -246,10 +246,10 @@ void ChildrenManagerImpl::Update (bool bCreateNewObjectsOnDemand) // 4. Find all shapes in the old list that are not in the current list, // send appropriate events and remove the accessible shape. - // + // Do this *after* we have set our new list of children, because // removing a child may cause - // + // ChildDescriptor::disposeAccessibleObject --> // AccessibleContextBase::CommitChange --> // AtkListener::notifyEvent -> @@ -258,10 +258,10 @@ void ChildrenManagerImpl::Update (bool bCreateNewObjectsOnDemand) // AccessibleDrawDocumentView::getAccessibleChildCount -> // ChildrenManagerImpl::GetChildCount -> // maVisibleChildren.size() - // + // to be fired, and so the operations will take place on // the list we are trying to replace - // + RemoveNonVisibleChildren (maVisibleChildren, aChildList); aChildList.clear(); diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 66c0e5b25053..b1bd8d859b0d 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -558,17 +558,17 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha if ( pDefCustomShape ) pDefData = pDefCustomShape->pDefData; - ////////////////////// - // AdjustmentValues // - ////////////////////// + + // AdjustmentValues + const OUString sAdjustmentValues( "AdjustmentValues" ); const Any* pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sAdjustmentValues ); if ( pAny ) *pAny >>= seqAdjustmentValues; - /////////////// - // Coordsize // - /////////////// + + // Coordsize + const OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; @@ -581,41 +581,41 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha } const OUString sPath( "Path" ); - ////////////////////// - // Path/Coordinates // - ////////////////////// + + // Path/Coordinates + const OUString sCoordinates( "Coordinates" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( pAny ) *pAny >>= seqCoordinates; - ///////////////////// - // Path/GluePoints // - ///////////////////// + + // Path/GluePoints + const OUString sGluePoints( "GluePoints" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( pAny ) *pAny >>= seqGluePoints; - /////////////////// - // Path/Segments // - /////////////////// + + // Path/Segments + const OUString sSegments( "Segments" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( pAny ) *pAny >>= seqSegments; - ////////////////////// - // Path/SubViewSize // - ////////////////////// + + // Path/SubViewSize + const OUString sSubViewSize( "SubViewSize" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sSubViewSize ); if ( pAny ) *pAny >>= seqSubViewSize; - /////////////////// - // Path/StretchX // - /////////////////// + + // Path/StretchX + const OUString sStretchX( "StretchX" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( pAny ) @@ -625,9 +625,9 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha nXRef = nStretchX; } - /////////////////// - // Path/StretchY // - /////////////////// + + // Path/StretchY + const OUString sStretchY( "StretchY" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( pAny ) @@ -637,25 +637,25 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha nYRef = nStretchY; } - ///////////////////// - // Path/TextFrames // - ///////////////////// + + // Path/TextFrames + const OUString sTextFrames( "TextFrames" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( pAny ) *pAny >>= seqTextFrames; - /////////////// - // Equations // - /////////////// + + // Equations + const OUString sEquations( "Equations" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sEquations ); if ( pAny ) *pAny >>= seqEquations; - ///////////// - // Handles // - ///////////// + + // Handles + const OUString sHandles( "Handles" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sHandles ); if ( pAny ) diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index de0e70627e46..789f3f87825f 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -364,7 +364,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con // #116336# // If shapes are mirrored once (mirroring two times correct geometry again) // double-sided at the object and two-sided-lighting at the scene need to be set. - // + // #i122777# Also use double sided for two fill styles since there several 3d objects get // created with a depth of 0; one of them is the backside which needs double-sided to // get visible @@ -506,7 +506,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con // #i122777# old adaption of FillStyle bitmap size to 5-times the original size; this is not needed // anymore and was used in old times to male the fill look better when converting to 3D. Removed // from regular 3D objects for some time, also needs to be removed from CustomShapes - // + //Size aLogicalSize = aFillBmp.GetPrefSize(); //if ( aFillBmp.GetPrefMapMode() == MAP_PIXEL ) // aLogicalSize = Application::GetDefaultDevice()->PixelToLogic( aLogicalSize, MAP_100TH_MM ); @@ -659,9 +659,9 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con pScene->NbcSetTransform( aNewTransform ); - /////////// - // light // - /////////// + + // light + const OUString sBrightness( "Brightness" ); double fAmbientIntensity = GetDouble( rGeometryItem, sBrightness, 22178.0 / 655.36, NULL ) / 100.0; diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index f2e78005de0a..77574f25dd33 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -86,11 +86,11 @@ ExpressionNode::~ExpressionNode() namespace { -////////////////////// -////////////////////// + + // EXPRESSION NODES -////////////////////// -////////////////////// + + class ConstantValueExpression : public ExpressionNode { double maValue; @@ -754,11 +754,11 @@ public: } }; -//////////////////////// -//////////////////////// + + // FUNCTION PARSER -//////////////////////// -//////////////////////// + + typedef const sal_Char* StringIteratorT; @@ -942,16 +942,16 @@ public : }; // Workaround for MSVC compiler anomaly (stack trashing) -// + // The default ureal_parser_policies implementation of parse_exp // triggers a really weird error in MSVC7 (Version 13.00.9466), in // that the real_parser_impl::parse_main() call of parse_exp() // overwrites the frame pointer _on the stack_ (EBP of the calling // function gets overwritten while lying on the stack). -// + // For the time being, our parser thus can only read the 1.0E10 // notation, not the 1.0e10 one. -// + // TODO(F1): Also handle the 1.0e10 case here. template< typename T > struct custom_real_parser_policies : public ::boost::spirit::ureal_parser_policies<T> { diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index 35572b1b1b5a..d090cfe089bf 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -8283,7 +8283,7 @@ static const mso_CustomShape msoCurvedConnector5 = (SvxMSDffHandle*)mso_sptCurvedConnector5Handle, SAL_N_ELEMENTS( mso_sptCurvedConnector5Handle ) }; -/////////////////////////////teardrop//////////////////////////////////////////// +/////////////////////////////teardrop static const SvxMSDffVertPair mso_sptTearDropVert[] = { { 10800, 0 }, diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 51b270f35dd5..b959d40d5e58 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -// ----------------------------------------------------------------------- + sal_uInt32& SvxShowCharSet::getSelectedChar() { static sal_uInt32 cSelectedChar = ' '; // keeps selected character over app livetime @@ -98,7 +98,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxShowCharSet(Window *pPar return new SvxShowCharSet(pParent); } -// ----------------------------------------------------------------------- + void SvxShowCharSet::GetFocus() { @@ -106,7 +106,7 @@ void SvxShowCharSet::GetFocus() SelectIndex( nSelectedIndex, sal_True ); } -// ----------------------------------------------------------------------- + void SvxShowCharSet::LoseFocus() { @@ -114,7 +114,7 @@ void SvxShowCharSet::LoseFocus() SelectIndex( nSelectedIndex, sal_False ); } -// ----------------------------------------------------------------------- + void SvxShowCharSet::StateChanged( StateChangedType nType ) { @@ -126,7 +126,7 @@ void SvxShowCharSet::StateChanged( StateChangedType nType ) Control::StateChanged( nType ); } -// ----------------------------------------------------------------------- + void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -137,7 +137,7 @@ void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt ) Control::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- + void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -159,7 +159,7 @@ void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -173,7 +173,7 @@ void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void SvxShowCharSet::MouseMove( const MouseEvent& rMEvt ) { @@ -197,7 +197,7 @@ void SvxShowCharSet::MouseMove( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void SvxShowCharSet::Command( const CommandEvent& rCEvt ) { @@ -205,21 +205,21 @@ void SvxShowCharSet::Command( const CommandEvent& rCEvt ) Control::Command( rCEvt ); } -// ----------------------------------------------------------------------------- + sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) const { return _nPos / COLUMN_COUNT ; } -// ----------------------------------------------------------------------------- + sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) const { return _nPos % COLUMN_COUNT ; } -// ----------------------------------------------------------------------- + int SvxShowCharSet::FirstInView( void ) const { @@ -229,7 +229,7 @@ int SvxShowCharSet::FirstInView( void ) const return nIndex; } -// ----------------------------------------------------------------------- + int SvxShowCharSet::LastInView( void ) const { @@ -241,7 +241,7 @@ int SvxShowCharSet::LastInView( void ) const return nIndex; } -// ----------------------------------------------------------------------- + inline Point SvxShowCharSet::MapIndexToPixel( int nIndex ) const { @@ -250,7 +250,7 @@ inline Point SvxShowCharSet::MapIndexToPixel( int nIndex ) const int y = ((nIndex - nBase) / COLUMN_COUNT) * nY; return Point( x + m_nXGap, y + m_nYGap ); } -// ----------------------------------------------------------------------------- + int SvxShowCharSet::PixelToMapIndex( const Point& point) const { @@ -258,7 +258,7 @@ int SvxShowCharSet::PixelToMapIndex( const Point& point) const return (nBase + ((point.X() - m_nXGap)/nX) + ((point.Y() - m_nYGap)/nY) * COLUMN_COUNT); } -// ----------------------------------------------------------------------- + void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt ) { @@ -327,13 +327,13 @@ void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt ) } } -// ----------------------------------------------------------------------- + void SvxShowCharSet::Paint( const Rectangle& ) { DrawChars_Impl( FirstInView(), LastInView() ); } -// ----------------------------------------------------------------------------- + void SvxShowCharSet::DeSelect() { DrawChars_Impl(nSelectedIndex,nSelectedIndex); @@ -480,7 +480,7 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2 ) } } -// ----------------------------------------------------------------------- + void SvxShowCharSet::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) { @@ -506,7 +506,7 @@ void SvxShowCharSet::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) Invalidate(); } -// ----------------------------------------------------------------------- + sal_UCS4 SvxShowCharSet::GetSelectCharacter() const { @@ -515,7 +515,7 @@ sal_UCS4 SvxShowCharSet::GetSelectCharacter() const return getSelectedChar(); } -// ----------------------------------------------------------------------- + void SvxShowCharSet::SetFont( const Font& rFont ) { @@ -560,7 +560,7 @@ void SvxShowCharSet::SetFont( const Font& rFont ) Invalidate(); } -// ----------------------------------------------------------------------- + void SvxShowCharSet::SelectIndex( int nNewIndex, sal_Bool bFocus ) { @@ -654,7 +654,7 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, sal_Bool bFocus ) aHighHdl.Call( this ); } -// ----------------------------------------------------------------------- + void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus ) { @@ -671,7 +671,7 @@ void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus ) } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl) { @@ -698,21 +698,21 @@ IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl) return 0; } -// ----------------------------------------------------------------------- + SvxShowCharSet::~SvxShowCharSet() { if ( m_pAccessible ) ReleaseAccessible(); } -// ----------------------------------------------------------------------------- + void SvxShowCharSet::ReleaseAccessible() { m_aItems.clear(); m_pAccessible = NULL; m_xAccessible = NULL; } -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< XAccessible > SvxShowCharSet::CreateAccessible() { OSL_ENSURE(!m_pAccessible,"Accessible already created!"); @@ -720,7 +720,7 @@ void SvxShowCharSet::ReleaseAccessible() m_xAccessible = m_pAccessible; return m_xAccessible; } -// ----------------------------------------------------------------------------- + ::svx::SvxShowCharSetItem* SvxShowCharSet::ImplGetItem( int _nPos ) { ItemsMap::iterator aFind = m_aItems.find(_nPos); @@ -740,12 +740,12 @@ void SvxShowCharSet::ReleaseAccessible() return aFind->second.get(); } -// ----------------------------------------------------------------------------- + ScrollBar* SvxShowCharSet::getScrollBar() { return &aVscrollSB; } -// ----------------------------------------------------------------------- + sal_Int32 SvxShowCharSet::getMaxCharCount() const { return maFontCharMap.GetCharCount(); diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 04ac00b2f226..99a7f809d91a 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -35,7 +35,7 @@ #include <svx/ctredlin.hxx> #include "helpid.hrc" -//============================================================================ + // Local Defines and Function @@ -58,7 +58,7 @@ RedlinData::~RedlinData() { } -//============================================================================ + // class SvxRedlinEntry (Entries for list) @@ -123,7 +123,7 @@ void SvLBoxColorString::Paint( rDev.SetTextColor(a2Color); } -//============================================================================ + // class SvxRedlinTable @@ -388,7 +388,7 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, -//============================================================================ + // class SvxTPView @@ -549,7 +549,7 @@ IMPL_LINK( SvxTPView, PbClickHdl, PushButton*, pPushB ) -//============================================================================ + // class SvxTPFilter @@ -1089,7 +1089,7 @@ IMPL_LINK( SvxTPFilter, RefHandle, PushButton*, pRef ) return 0; } -//============================================================================ + // class SvxAcceptChgCtr diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index fa2ed6eb18f1..02147de3e89c 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -32,11 +32,11 @@ namespace svx { -// ============================================================================ + const long DIAL_OUTER_WIDTH = 8; -// ---------------------------------------------------------------------------- + DialControlBmp::DialControlBmp( Window& rParent ) : VirtualDevice( rParent, 0, 0 ), @@ -223,7 +223,7 @@ void DialControlBmp::DrawBackground() maRect.Right() - DIAL_OUTER_WIDTH, maRect.Bottom() - DIAL_OUTER_WIDTH ) ); } -// ---------------------------------------------------------------------------- + DialControl::DialControl_Impl::DialControl_Impl ( Window& rParent ) : mpBmpEnabled(new DialControlBmp(rParent)), @@ -264,7 +264,7 @@ void DialControl::DialControl_Impl::SetSize( const Size& rWinSize ) mpBmpBuffered->SetSize( maWinSize ); } -// ============================================================================ + DialControl::DialControl( Window* pParent, WinBits nBits ) : Control( pParent, nBits ), @@ -527,7 +527,7 @@ IMPL_LINK( DialControl, LinkedFieldModifyHdl, NumericField*, pField ) return 0; } -// ============================================================================ + DialControlWrapper::DialControlWrapper( DialControl& rDial ) : SingleControlWrapperType( rDial ) @@ -555,7 +555,7 @@ void DialControlWrapper::SetControlValue( sal_Int32 nValue ) GetControl().SetRotation( nValue ); } -// ============================================================================ + } // namespace svx diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 376897ba74a7..2a17a86697fc 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -39,7 +39,7 @@ #include <svx/dialmgr.hxx> #include <vcl/settings.hxx> -////////////////////////////////////////////////////////////////////////////// + Svx3DPreviewControl::Svx3DPreviewControl(Window* pParent, const ResId& rResId) : Control(pParent, rResId), @@ -242,7 +242,7 @@ void Svx3DPreviewControl::Set3DAttributes( const SfxItemSet& rAttr ) Resize(); } -////////////////////////////////////////////////////////////////////////////// + #define RADIUS_LAMP_PREVIEW_SIZE (4500.0) #define RADIUS_LAMP_SMALL (600.0) @@ -949,7 +949,7 @@ basegfx::B3DVector Svx3DLightControl::GetLightDirection(sal_uInt32 nNum) const return basegfx::B3DVector(); } -////////////////////////////////////////////////////////////////////////////// + SvxLightCtl3D::SvxLightCtl3D( Window* pParent, const ResId& rResId) : Control(pParent, rResId), diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index abe121487cde..fb9799d38c2e 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -102,7 +102,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxRectCtl(Window *pParent, return new SvxRectCtl(pParent); } -// ----------------------------------------------------------------------- + SvxRectCtl::~SvxRectCtl() { @@ -112,14 +112,14 @@ SvxRectCtl::~SvxRectCtl() pAccContext->release(); } -// ----------------------------------------------------------------------- + void SvxRectCtl::Resize() { Resize_Impl(); Control::Resize(); } -// ----------------------------------------------------------------------- + void SvxRectCtl::Resize_Impl() { @@ -160,7 +160,7 @@ void SvxRectCtl::Resize_Impl() Reset(); InitSettings( sal_True, sal_True ); } -// ----------------------------------------------------------------------- + void SvxRectCtl::InitRectBitmap( void ) { @@ -209,7 +209,7 @@ void SvxRectCtl::InitRectBitmap( void ) pBitmap->Replace( aColorAry1, aColorAry2, 7, NULL ); } -// ----------------------------------------------------------------------- + void SvxRectCtl::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) { @@ -278,7 +278,7 @@ void SvxRectCtl::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) { @@ -367,7 +367,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) } } -// ----------------------------------------------------------------------- + void SvxRectCtl::StateChanged( StateChangedType nType ) { @@ -379,7 +379,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType ) Window::StateChanged( nType ); } -// ----------------------------------------------------------------------- + void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1829,7 +1829,7 @@ void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_uInt16 nPos, const Bitm } } -////////////////////////////////////////////////////////////////////////////// + void SvxPreviewBase::InitSettings(bool bForeground, bool bBackground) { @@ -2046,7 +2046,7 @@ SvxXLinePreview::~SvxXLinePreview() SdrObject::Free( pFoo ); } -// ----------------------------------------------------------------------- + void SvxXLinePreview::SetSymbol(Graphic* p,const Size& s) { @@ -2054,7 +2054,7 @@ void SvxXLinePreview::SetSymbol(Graphic* p,const Size& s) maSymbolSize = s; } -// ----------------------------------------------------------------------- + void SvxXLinePreview::ResizeSymbol(const Size& s) { @@ -2065,7 +2065,7 @@ void SvxXLinePreview::ResizeSymbol(const Size& s) } } -// ----------------------------------------------------------------------- + void SvxXLinePreview::SetLineAttributes(const SfxItemSet& rItemSet) { @@ -2081,7 +2081,7 @@ void SvxXLinePreview::SetLineAttributes(const SfxItemSet& rItemSet) mpLineObjC->SetMergedItemSet(aTempSet); } -// ----------------------------------------------------------------------- + void SvxXLinePreview::Paint( const Rectangle& ) { diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 264c43314584..782fa464d0a3 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -65,27 +65,27 @@ namespace svx{ using namespace ::rtl; using namespace ::osl; -//=============================================== + TabDialog4Recovery::TabDialog4Recovery(Window* pParent) : TabDialog (pParent, SVX_RES( RID_SVX_TABDLG_DOCRECOVERY )) , m_pActualPage(m_lTabPages.begin() ) { } -//=============================================== + TabDialog4Recovery::~TabDialog4Recovery() { m_lTabPages.clear(); } -//=============================================== + void TabDialog4Recovery::addTabPage(IExtendedTabPage* pPage) { if (pPage) m_lTabPages.push_back(pPage); } -//=============================================== + short TabDialog4Recovery::Execute() { ::SolarMutexGuard aLock; @@ -126,7 +126,7 @@ short TabDialog4Recovery::Execute() } } -//=============================================== + RecoveryCore::RecoveryCore(const css::uno::Reference< css::uno::XComponentContext >& rxContext, bool bUsedForSaving) : m_xContext ( rxContext ) @@ -136,25 +136,25 @@ RecoveryCore::RecoveryCore(const css::uno::Reference< css::uno::XComponentContex impl_startListening(); } -//=============================================== + RecoveryCore::~RecoveryCore() { impl_stopListening(); } -//=============================================== + css::uno::Reference< css::uno::XComponentContext > RecoveryCore::getComponentContext() { return m_xContext; } -//=============================================== + TURLList* RecoveryCore::getURLListAccess() { return &m_lURLs; } -//=============================================== + bool RecoveryCore::isBrokenTempEntry(const TURLInfo& rInfo) { if (rInfo.TempURL.isEmpty()) @@ -171,7 +171,7 @@ bool RecoveryCore::isBrokenTempEntry(const TURLInfo& rInfo) return true; } -//=============================================== + void RecoveryCore::saveBrokenTempEntries(const OUString& rPath) { if (rPath.isEmpty()) @@ -209,7 +209,7 @@ void RecoveryCore::saveBrokenTempEntries(const OUString& rPath) } } -//=============================================== + void RecoveryCore::saveAllTempEntries(const OUString& rPath) { if (rPath.isEmpty()) @@ -247,7 +247,7 @@ void RecoveryCore::saveAllTempEntries(const OUString& rPath) } } -//=============================================== + void RecoveryCore::forgetBrokenTempEntries() { if (!m_xRealCore.is()) @@ -279,7 +279,7 @@ void RecoveryCore::forgetBrokenTempEntries() } } -//=============================================== + void RecoveryCore::forgetAllRecoveryEntries() { if (!m_xRealCore.is()) @@ -308,7 +308,7 @@ void RecoveryCore::forgetAllRecoveryEntries() } } -//=============================================== + void RecoveryCore::forgetBrokenRecoveryEntries() { if (!m_xRealCore.is()) @@ -340,19 +340,19 @@ void RecoveryCore::forgetBrokenRecoveryEntries() } } -//=============================================== + void RecoveryCore::setProgressHandler(const css::uno::Reference< css::task::XStatusIndicator >& xProgress) { m_xProgress = xProgress; } -//=============================================== + void RecoveryCore::setUpdateListener(IRecoveryUpdateListener* pListener) { m_pListener = pListener; } -//=============================================== + void RecoveryCore::doEmergencySavePrepare() { if (!m_xRealCore.is()) @@ -367,7 +367,7 @@ void RecoveryCore::doEmergencySavePrepare() m_xRealCore->dispatch(aURL, lArgs); } -//=============================================== + void RecoveryCore::doEmergencySave() { if (!m_xRealCore.is()) @@ -384,7 +384,7 @@ void RecoveryCore::doEmergencySave() m_xRealCore->dispatch(aURL, lArgs); } -//=============================================== + void RecoveryCore::doRecovery() { if (!m_xRealCore.is()) @@ -401,7 +401,7 @@ void RecoveryCore::doRecovery() m_xRealCore->dispatch(aURL, lArgs); } -//=============================================== + ERecoveryState RecoveryCore::mapDocState2RecoverState(sal_Int32 eDocState) { // ??? @@ -433,7 +433,7 @@ ERecoveryState RecoveryCore::mapDocState2RecoverState(sal_Int32 eDocState) return eRecState; } -//=============================================== + void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& aEvent) throw(css::uno::RuntimeException) { @@ -521,14 +521,14 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a m_pListener->updateItems(); } -//=============================================== + void SAL_CALL RecoveryCore::disposing(const css::lang::EventObject& /*aEvent*/) throw(css::uno::RuntimeException) { m_xRealCore.clear(); } -//=============================================== + void RecoveryCore::impl_startListening() { // listening already initialized ? @@ -549,7 +549,7 @@ void RecoveryCore::impl_startListening() m_xRealCore->addStatusListener(static_cast< css::frame::XStatusListener* >(this), aURL); } -//=============================================== + void RecoveryCore::impl_stopListening() { // Ignore it, if this instance doesn't listen currently @@ -568,7 +568,7 @@ void RecoveryCore::impl_stopListening() m_xRealCore.clear(); } -//=============================================== + css::util::URL RecoveryCore::impl_getParsedURL(const OUString& sURL) { css::util::URL aURL; @@ -580,7 +580,7 @@ css::util::URL RecoveryCore::impl_getParsedURL(const OUString& sURL) return aURL; } -//=============================================== + PluginProgressWindow::PluginProgressWindow( Window* pParent , const css::uno::Reference< css::lang::XComponent >& xProgress) : Window (pParent ) @@ -592,14 +592,14 @@ PluginProgressWindow::PluginProgressWindow( Window* setPosSizePixel( -9, 0, aParentSize.Width() + 15, aParentSize.Height() - 4 ); } -//=============================================== + PluginProgressWindow::~PluginProgressWindow() { if (m_xProgress.is()) m_xProgress->dispose(); } -//=============================================== + PluginProgress::PluginProgress( Window* pParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) { @@ -609,12 +609,12 @@ PluginProgress::PluginProgress( Window* m_xProgress = m_xProgressFactory->createStatusIndicator(); } -//=============================================== + PluginProgress::~PluginProgress() { } -//=============================================== + void SAL_CALL PluginProgress::dispose() throw(css::uno::RuntimeException) { @@ -624,19 +624,19 @@ void SAL_CALL PluginProgress::dispose() m_xProgress.clear(); } -//=============================================== + void SAL_CALL PluginProgress::addEventListener(const css::uno::Reference< css::lang::XEventListener >& ) throw(css::uno::RuntimeException) { } -//=============================================== + void SAL_CALL PluginProgress::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw(css::uno::RuntimeException) { } -//=============================================== + void SAL_CALL PluginProgress::start(const OUString&, sal_Int32 nRange) throw(css::uno::RuntimeException) @@ -645,7 +645,7 @@ void SAL_CALL PluginProgress::start(const OUString&, m_xProgress->start(OUString(), nRange); } -//=============================================== + void SAL_CALL PluginProgress::end() throw(css::uno::RuntimeException) { @@ -653,7 +653,7 @@ void SAL_CALL PluginProgress::end() m_xProgress->end(); } -//=============================================== + void SAL_CALL PluginProgress::setText(const OUString& sText) throw(css::uno::RuntimeException) { @@ -661,7 +661,7 @@ void SAL_CALL PluginProgress::setText(const OUString& sText) m_xProgress->setText(sText); } -//=============================================== + void SAL_CALL PluginProgress::setValue(sal_Int32 nValue) throw(css::uno::RuntimeException) { @@ -669,7 +669,7 @@ void SAL_CALL PluginProgress::setValue(sal_Int32 nValue) m_xProgress->setValue(nValue); } -//=============================================== + void SAL_CALL PluginProgress::reset() throw(css::uno::RuntimeException) { @@ -677,7 +677,7 @@ void SAL_CALL PluginProgress::reset() m_xProgress->reset(); } -//=============================================== + SaveDialog::SaveDialog(Window* pParent, RecoveryCore* pCore ) : IExtendedTabPage( pParent, SVX_RES( RID_SVXPAGE_DOCRECOVERY_SAVE ) ) @@ -725,19 +725,19 @@ SaveDialog::SaveDialog(Window* pParent, } } -//=============================================== + SaveDialog::~SaveDialog() { } -//=============================================== + IMPL_LINK_NOARG(SaveDialog, OKButtonHdl) { m_nResult = DLG_RET_OK; return 0; } -//=============================================== + short SaveDialog::execute() { ::SolarMutexGuard aLock; @@ -762,13 +762,13 @@ short SaveDialog::execute() return m_nResult; } -//=============================================== + void SaveDialog::setDefButton() { m_aOkBtn.GrabFocus(); } -//=============================================== + SaveProgressDialog::SaveProgressDialog(Window* pParent, RecoveryCore* pCore ) : ModalDialog ( pParent , SVX_RES( RID_SVX_MDLG_DOCRECOVERY_PROGR ) ) @@ -782,12 +782,12 @@ SaveProgressDialog::SaveProgressDialog(Window* pParent, m_xProgress = css::uno::Reference< css::task::XStatusIndicator >(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW); } -//=============================================== + SaveProgressDialog::~SaveProgressDialog() { } -//=============================================== + short SaveProgressDialog::Execute() { ::SolarMutexGuard aLock; @@ -800,12 +800,12 @@ short SaveProgressDialog::Execute() return nRet; } -//=============================================== + void SaveProgressDialog::updateItems() { } -//=============================================== + void SaveProgressDialog::stepNext(TURLInfo* ) { /* TODO @@ -816,18 +816,18 @@ void SaveProgressDialog::stepNext(TURLInfo* ) */ } -//=============================================== + void SaveProgressDialog::start() { } -//=============================================== + void SaveProgressDialog::end() { EndDialog(DLG_RET_OK); } -//=============================================== + RecovDocListEntry::RecovDocListEntry( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& sText ) @@ -835,7 +835,7 @@ RecovDocListEntry::RecovDocListEntry( SvTreeListEntry* pEntry, { } -//=============================================== + void RecovDocListEntry::Paint( const Point& aPos, SvTreeListBox& aDevice, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry) { @@ -893,7 +893,7 @@ void RecovDocListEntry::Paint( aDevice.DrawText(aPnt, *pTxt); } } -//=============================================== + RecovDocList::RecovDocList(SvSimpleTableContainer& rParent, ResMgr &rResMgr) : SvSimpleTable ( rParent ) , m_aGreenCheckImg ( ResId(IMG_GREENCHECK, rResMgr ) ) @@ -907,12 +907,12 @@ RecovDocList::RecovDocList(SvSimpleTableContainer& rParent, ResMgr &rResMgr) { } -//=============================================== + RecovDocList::~RecovDocList() { } -//=============================================== + void RecovDocList::InitEntry(SvTreeListEntry* pEntry, const OUString& rText, const Image& rImage1, @@ -927,7 +927,7 @@ void RecovDocList::InitEntry(SvTreeListEntry* pEntry, pEntry->ReplaceItem(p, 2); } -//=============================================== + short impl_askUserForWizardCancel(Window* pParent, sal_Int16 nRes) { QueryBox aQuery(pParent, SVX_RES(nRes)); @@ -937,7 +937,7 @@ short impl_askUserForWizardCancel(Window* pParent, sal_Int16 nRes) return DLG_RET_CANCEL; } -//=============================================== + RecoveryDialog::RecoveryDialog(Window* pParent, RecoveryCore* pCore ) : IExtendedTabPage( pParent , SVX_RES( RID_SVXPAGE_DOCRECOVERY_RECOVER ) ) @@ -1010,12 +1010,12 @@ RecoveryDialog::RecoveryDialog(Window* pParent, m_aFileListLB.SetCursor(pFirst, sal_True); } -//=============================================== + RecoveryDialog::~RecoveryDialog() { } -//=============================================== + short RecoveryDialog::execute() { ::SolarMutexGuard aSolarLock; @@ -1227,7 +1227,7 @@ short RecoveryDialog::execute() return DLG_RET_OK; } -//=============================================== + void RecoveryDialog::setDefButton() { if ( m_aNextBtn.IsEnabled() ) @@ -1236,12 +1236,12 @@ void RecoveryDialog::setDefButton() m_pDefButton = &m_aNextBtn; } -//=============================================== + void RecoveryDialog::start() { } -//=============================================== + void RecoveryDialog::updateItems() { sal_uIntPtr c = m_aFileListLB.GetEntryCount(); @@ -1265,7 +1265,7 @@ void RecoveryDialog::updateItems() m_aFileListLB.Update(); } -//=============================================== + void RecoveryDialog::stepNext(TURLInfo* pItem) { sal_uIntPtr c = m_aFileListLB.GetEntryCount(); @@ -1288,7 +1288,7 @@ void RecoveryDialog::stepNext(TURLInfo* pItem) } } -//=============================================== + void RecoveryDialog::end() { if ( m_pDefButton ) @@ -1299,7 +1299,7 @@ void RecoveryDialog::end() m_bWaitForCore = false; } -//=============================================== + IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl) { m_bUserDecideNext = true; @@ -1307,7 +1307,7 @@ IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl) return 0; } -//=============================================== + IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl) { if (m_eRecoveryState == RecoveryDialog::E_RECOVERY_PREPARED) @@ -1320,7 +1320,7 @@ IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl) return 0; } -//=============================================== + OUString RecoveryDialog::impl_getStatusString( const TURLInfo& rInfo ) const { OUString sStatus; @@ -1347,7 +1347,7 @@ OUString RecoveryDialog::impl_getStatusString( const TURLInfo& rInfo ) const return sStatus; } -//=============================================== + BrokenRecoveryDialog::BrokenRecoveryDialog(Window* pParent , RecoveryCore* pCore , bool bBeforeRecovery) @@ -1380,12 +1380,12 @@ BrokenRecoveryDialog::BrokenRecoveryDialog(Window* pParent , impl_refresh(); } -//=============================================== + BrokenRecoveryDialog::~BrokenRecoveryDialog() { } -//=============================================== + void BrokenRecoveryDialog::impl_refresh() { m_bExecutionNeeded = sal_False; @@ -1421,19 +1421,19 @@ void BrokenRecoveryDialog::impl_refresh() m_aOkBtn.GrabFocus(); } -//=============================================== + sal_Bool BrokenRecoveryDialog::isExecutionNeeded() { return m_bExecutionNeeded; } -//=============================================== + OUString BrokenRecoveryDialog::getSaveDirURL() { return m_sSavePath; } -//=============================================== + IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl) { OUString sPhysicalPath = comphelper::string::strip(m_aSaveDirED.GetText(), ' '); @@ -1447,21 +1447,21 @@ IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl) return 0; } -//=============================================== + IMPL_LINK_NOARG(BrokenRecoveryDialog, CancelButtonHdl) { EndDialog(DLG_RET_CANCEL); return 0; } -//=============================================== + IMPL_LINK_NOARG(BrokenRecoveryDialog, SaveButtonHdl) { impl_askForSavePath(); return 0; } -//=============================================== + void BrokenRecoveryDialog::impl_askForSavePath() { css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker = diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 6ce388eeefe3..ba2532d817d1 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -80,9 +80,9 @@ using namespace ::com::sun::star::lang; using ::com::sun::star::i18n::XBreakIterator; using ::com::sun::star::i18n::BreakIterator; -// ----------------------------------------------------------------------- + // small helper functions to set fonts -// ----------------------------------------------------------------------- + namespace { void scaleFontWidth(Font& _rFont,const OutputDevice& rOutDev,long& _n100PercentFont) @@ -90,13 +90,13 @@ namespace _rFont.SetWidth( 0 ); _n100PercentFont = rOutDev.GetFontMetric( _rFont ).GetWidth(); } - // ----------------------------------------------------------------------- + void initFont(Font& _rFont) { _rFont.SetTransparent(true); _rFont.SetAlign(ALIGN_BASELINE); } - // ----------------------------------------------------------------------- + void setFontSize(Font& _rFont) { Size aSize( _rFont.GetSize() ); @@ -104,7 +104,7 @@ namespace aSize.Width() = ( aSize.Width() * 3 ) / 5; _rFont.SetSize( aSize ); } - // ----------------------------------------------------------------------- + void calcFontHeightAnyAscent(OutputDevice* _pWin,const Font& _rFont,long& _nHeight,long& _nAscent) { if ( !_nHeight ) @@ -115,7 +115,7 @@ namespace _nAscent = aMetric.GetAscent(); } } - // ----------------------------------------------------------------------- + void setFont( const SvxFont& rNewFont, SvxFont& rImplFont ) { rImplFont = rNewFont; @@ -124,7 +124,7 @@ namespace } } -// ----------------------------------------------------------------------- + // class FontPrevWin_Impl ----------------------------------------------- @@ -420,7 +420,7 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter, _pPrinter->SetFont( aOldFont ); } -// ----------------------------------------------------------------------- + bool FontPrevWin_Impl::SetFontWidthScale( sal_uInt16 nScale ) { @@ -434,7 +434,7 @@ bool FontPrevWin_Impl::SetFontWidthScale( sal_uInt16 nScale ) } -// ----------------------------------------------------------------------- + void FontPrevWin_Impl::ScaleFontWidth( const OutputDevice& rOutDev ) { @@ -476,7 +476,7 @@ void SvxFontPrevWindow::InitSettings( sal_Bool bForeground, sal_Bool bBackground Invalidate(); } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::Init() { @@ -526,20 +526,20 @@ SvxFontPrevWindow::~SvxFontPrevWindow() delete pImpl; } -// ----------------------------------------------------------------------- + SvxFont& SvxFontPrevWindow::GetCTLFont() { return pImpl->aCTLFont; } -// ----------------------------------------------------------------------- + SvxFont& SvxFontPrevWindow::GetCJKFont() { return pImpl->aCJKFont; } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::StateChanged( StateChangedType nType ) { @@ -552,7 +552,7 @@ void SvxFontPrevWindow::StateChanged( StateChangedType nType ) Invalidate(); } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -573,7 +573,7 @@ const SvxFont& SvxFontPrevWindow::GetFont() const return pImpl->aFont; } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::SetPreviewText( const OUString& rString ) { @@ -581,14 +581,14 @@ void SvxFontPrevWindow::SetPreviewText( const OUString& rString ) pImpl->bTextInited = true; } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::SetFontNameAsPreviewText() { pImpl->bUseFontNameAsText = true; } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont& rCJKOutFont, const SvxFont& rCTLFont ) { @@ -601,7 +601,7 @@ void SvxFontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont& r Invalidate(); } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::SetColor(const Color &rColor) { @@ -609,7 +609,7 @@ void SvxFontPrevWindow::SetColor(const Color &rColor) pImpl->pColor = new Color( rColor ); Invalidate(); } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::ResetColor() { @@ -618,7 +618,7 @@ void SvxFontPrevWindow::ResetColor() Invalidate(); } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::SetBackColor(const Color &rColor) { @@ -627,14 +627,14 @@ void SvxFontPrevWindow::SetBackColor(const Color &rColor) Invalidate(); } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::UseResourceText( bool bUse ) { pImpl->bUseResText = bUse; } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::Paint( const Rectangle& ) { @@ -849,7 +849,7 @@ void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd) pImpl->cEndBracket = cEnd; } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n ) { @@ -857,7 +857,7 @@ void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n ) Invalidate(); } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::AutoCorrectFontColor( void ) { @@ -873,7 +873,7 @@ void SvxFontPrevWindow::AutoCorrectFontColor( void ) pImpl->aCTLFont.SetColor( aFontColor ); } -// ----------------------------------------------------------------------- + static bool GetWhich (const SfxItemSet &rSet, sal_uInt16 nSlot, sal_uInt16 &rWhich) { @@ -1176,7 +1176,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, Invalidate(); } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) { @@ -1421,10 +1421,10 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) Invalidate(); } -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont ) { @@ -1440,7 +1440,7 @@ void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFo } } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::SetFontStyle( const SfxItemSet& rSet, sal_uInt16 nPosture, sal_uInt16 nWeight, SvxFont& rFont ) { @@ -1459,7 +1459,7 @@ void SvxFontPrevWindow::SetFontStyle( const SfxItemSet& rSet, sal_uInt16 nPostur } } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::SetFontWidthScale( const SfxItemSet& rSet ) { @@ -1472,20 +1472,20 @@ void SvxFontPrevWindow::SetFontWidthScale( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + namespace { - // ----------------------------------------------------------------------- + void setFontEscapement(SvxFont& _rFont,sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ) { _rFont.SetPropr( nProp ); _rFont.SetProprRel( nEscProp ); _rFont.SetEscapement( nEsc ); } - // ----------------------------------------------------------------------- - // ----------------------------------------------------------------------- + + } -// ----------------------------------------------------------------------- + void SvxFontPrevWindow::SetFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ) { diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 7e75eea7d48f..add7dfbd5ce8 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -24,7 +24,7 @@ #include "svtools/treelistentry.hxx" #include "svtools/viewdataentry.hxx" -// ============================================================================ + DBG_NAME( SvLBoxFontString ); @@ -87,7 +87,7 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEnt } -// ============================================================================ + SvxFontListBox::SvxFontListBox(Window* pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) @@ -160,6 +160,6 @@ void SvxFontListBox::InitEntry( eButtonKind ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 52a992f21593..3804795b5ad8 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -38,13 +38,13 @@ using namespace editeng; namespace svx { namespace frame { -// ============================================================================ + namespace { typedef std::vector< Point > PointVec; -// ---------------------------------------------------------------------------- + // Link result structs for horizontal and vertical lines and borders. /** Result struct used by the horizontal/vertical frame link functions. @@ -128,7 +128,7 @@ struct BorderResult BorderEndResult maEnd; /// Result for end of border line (right or bottom end). }; -// ---------------------------------------------------------------------------- + // Link result structs for diagonal lines and borders. /** Result struct used by the diagonal frame link functions. @@ -166,7 +166,7 @@ struct DiagBordersResult DiagBorderResult maBLTR; /// Result for bottom-left to top-right frame border. }; -// ---------------------------------------------------------------------------- + /** A helper struct containing two points of a line. */ @@ -182,7 +182,7 @@ struct LinePoints maEnd( bTLBR ? rRect.BottomRight() : rRect.BottomLeft() ) {} }; -// ============================================================================ + /** Rounds and casts a double value to a long value. */ inline long lclD2L( double fValue ) @@ -196,7 +196,7 @@ double lclScaleValue( double nValue, double fScale, sal_uInt16 nMaxWidth ) return std::min<double>(nValue * fScale, nMaxWidth); } -// ---------------------------------------------------------------------------- + // Line width offset calculation. /** Returns the start offset of the single/primary line across the frame border. @@ -336,11 +336,11 @@ inline long lclGetBeforeBeg( const Style& rBorder ) inline long lclGetBehindEnd( const Style& rBorder ) { return rBorder.Prim() ? (lclGetEnd( rBorder ) + 256) : 0; } -// ============================================================================ + // Linking functions -// ============================================================================ -// ---------------------------------------------------------------------------- + + // Linking of single horizontal line ends. /** Calculates X offsets for the left end of a single horizontal frame border. @@ -505,7 +505,7 @@ void lclLinkLeftEnd_Gap( rResult.mnOffs2 = rResult.mnOffs1; } -// ---------------------------------------------------------------------------- + // Linking of horizontal frame border ends. /** Calculates X offsets for the left end of a horizontal frame border. @@ -557,7 +557,7 @@ void lclLinkRightEnd( rResult.Negate(); } -// ---------------------------------------------------------------------------- + // Linking of horizontal and vertical frame borders. /** Calculates X offsets for all line ends of a horizontal frame border. @@ -607,9 +607,9 @@ void lclLinkVerFrameBorder( rBFromTL.Mirror(), rBFromL, rBFromB, rBFromR, rBFromTR ); } -// ============================================================================ -// ---------------------------------------------------------------------------- + + // Linking of diagonal frame borders. /** Calculates clipping offsets for a top-left to bottom-right frame border. @@ -689,11 +689,11 @@ void lclLinkDiagFrameBorders( lclLinkBLTRFrameBorder( rResult.maBLTR, rBLTR, rBLFromT, rBLFromR, rTRFromB, rTRFromL ); } -// ============================================================================ + // Drawing functions -// ============================================================================ -// ---------------------------------------------------------------------------- + + // Simple helper functions /** Converts sub units to OutputDevice map units. */ @@ -747,8 +747,8 @@ void lclSetColorToOutDev( OutputDevice& rDev, const Color& rColor, const Color* rDev.SetFillColor( pForceColor ? *pForceColor : rColor ); } -// ---------------------------------------------------------------------------- -// ============================================================================ + + // Drawing of horizontal frame borders. /** Draws a horizontal thin or thick line into the passed output device. @@ -818,7 +818,7 @@ void lclDrawHorFrameBorder( } } -// ---------------------------------------------------------------------------- + // Drawing of vertical frame borders. /** Draws a vertical thin or thick line into the passed output device. @@ -887,7 +887,7 @@ void lclDrawVerFrameBorder( } } -// ============================================================================ + // Drawing of diagonal frame borders, incudes clipping functions. /** Returns the drawing coordinates for a diagonal thin line. @@ -922,7 +922,7 @@ LinePoints lclGetDiagLineEnds( const Rectangle& rRect, bool bTLBR, long nDiagOff return aPoints; } -// ---------------------------------------------------------------------------- + // Clipping functions for diagonal frame borders. /** Limits the clipping region to the inner area of a rectange. @@ -1005,7 +1005,7 @@ void lclPushCrossingClipRegion( OutputDevice& rDev, const Rectangle& rRect, bool rDev.IntersectClipRegion( aClipReg ); } -// ---------------------------------------------------------------------------- + // Drawing functions for diagonal frame borders. /** Draws a diagonal thin or thick line into the passed output device. @@ -1114,13 +1114,13 @@ void lclDrawDiagFrameBorders( } } -// ============================================================================ + } // namespace -// ============================================================================ + // Classes -// ============================================================================ + #define SCALEVALUE( value ) lclScaleValue( value, fScale, nMaxWidth ) @@ -1303,16 +1303,16 @@ bool operator<( const Style& rL, const Style& rR ) #undef SCALEVALUE -// ============================================================================ + // Various helper functions -// ============================================================================ + double GetHorDiagAngle( long nWidth, long nHeight ) { return atan2( static_cast< double >( std::abs( nHeight ) ), static_cast< double >( std::abs( nWidth ) ) ); } -// ============================================================================ + long GetTLDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ) { @@ -1334,7 +1334,7 @@ long GetTRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ) return -lclD2L( nVerOffs / tan( fAngle ) - nDiagOffs / sin( fAngle ) ); } -// ============================================================================ + bool CheckFrameBorderConnectable( const Style& rLBorder, const Style& rRBorder, const Style& rTFromTL, const Style& rTFromT, const Style& rTFromTR, @@ -1359,9 +1359,9 @@ bool CheckFrameBorderConnectable( const Style& rLBorder, const Style& rRBorder, ); } -// ============================================================================ + // Drawing functions -// ============================================================================ + double lcl_GetExtent( const Style& rBorder, const Style& rSide, const Style& rOpposite, long nAngleSide = 9000, long nAngleOpposite = 9000 ) @@ -1490,7 +1490,7 @@ void DrawHorFrameBorder( OutputDevice& rDev, } } -// ---------------------------------------------------------------------------- + void DrawVerFrameBorder( OutputDevice& rDev, const Point& rTPos, const Point& rBPos, const Style& rBorder, @@ -1508,7 +1508,7 @@ void DrawVerFrameBorder( OutputDevice& rDev, } } -// ============================================================================ + void DrawDiagFrameBorders( OutputDevice& rDev, const Rectangle& rRect, const Style& rTLBR, const Style& rBLTR, @@ -1525,7 +1525,7 @@ void DrawDiagFrameBorders( } } -// ============================================================================ + } // namespace frame } // namespace svx diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 87c76972d374..73bf3061234c 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -334,7 +334,7 @@ double ArrayImpl::GetVerDiagAngle( size_t nCol, size_t nRow, bool bSimple ) cons return (fAngle > 0.0) ? (F_PI2 - fAngle) : 0.0; } -// ============================================================================ + class MergedCellIterator { @@ -377,7 +377,7 @@ MergedCellIterator& MergedCellIterator::operator++() return *this; } -// ============================================================================ + #define DBG_FRAME_CHECK( cond, funcname, error ) DBG_ASSERT( cond, "svx::frame::Array::" funcname " - " error ) #define DBG_FRAME_CHECK_COL( col, funcname ) DBG_FRAME_CHECK( (col) < GetColCount(), funcname, "invalid column index" ) @@ -1351,7 +1351,7 @@ void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const #undef DBG_FRAME_CHECK_COL #undef DBG_FRAME_CHECK -// ============================================================================ + } // namespace frame } // namespace svx diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index d10a6bfd2864..114a36b29a3c 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -22,7 +22,7 @@ namespace svx { -// ============================================================================ + namespace { @@ -85,7 +85,7 @@ SvxFrameDirection FrameDirectionListBox::GetSelectEntryValue() const return lclVoidToEnum( GetEntryData( nPos ) ); } -// ============================================================================ + FrameDirListBoxWrapper::FrameDirListBoxWrapper( FrameDirListBox& rListBox ) : SingleControlWrapperType( rListBox ) @@ -113,7 +113,7 @@ void FrameDirListBoxWrapper::SetControlValue( SvxFrameDirection eValue ) GetControl().SelectEntryValue( eValue ); } -// ============================================================================ + } // namespace svx diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index c1066126e6b3..3d016f329e67 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -43,7 +43,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::com::sun::star::accessibility::XAccessible; using namespace ::com::sun::star::accessibility; -// ============================================================================ + // global functions from framebordertype.hxx FrameBorderType GetFrameBorderTypeFromIndex( size_t nIndex ) @@ -60,7 +60,7 @@ size_t GetIndexFromFrameBorderType( FrameBorderType eBorder ) return static_cast< size_t >( eBorder ) - 1; } -// ============================================================================ + namespace { @@ -79,7 +79,7 @@ const long FRAMESEL_GEOM_ADD_CLICK_OUTER = 5; /** Additional margin for click area of inner lines. */ const long FRAMESEL_GEOM_ADD_CLICK_INNER = 2; -// ---------------------------------------------------------------------------- + /** Returns the corresponding flag for a frame border. */ FrameSelFlags lclGetFlagFromType( FrameBorderType eBorder ) @@ -108,9 +108,9 @@ inline void lclPolyPolyUnion( PolyPolygon& rDest, const PolyPolygon& rSource ) } // namespace -// ============================================================================ + // FrameBorder -// ============================================================================ + FrameBorder::FrameBorder( FrameBorderType eType ) : meType( eType ), @@ -210,9 +210,9 @@ FrameBorderType FrameBorder::GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const return eBorder; } -// ============================================================================ + // FrameSelectorImpl -// ============================================================================ + FrameSelectorImpl::FrameSelectorImpl( FrameSelector& rFrameSel ) : Resource( SVX_RES( RID_SVXSTR_BORDER_CONTROL ) ), @@ -798,9 +798,9 @@ bool FrameSelectorImpl::SelectedBordersEqual() const return bEqual; } -// ============================================================================ + // FrameSelector -// ============================================================================ + FrameSelector::FrameSelector(Window* pParent) : Control(pParent, WB_BORDER|WB_TABSTOP) @@ -1270,7 +1270,7 @@ Size FrameSelector::GetOptimalSize() const return LogicToPixel(Size(61, 65), MAP_APPFONT); } -// ============================================================================ + template< typename Cont, typename Iter, typename Pred > FrameBorderIterBase< Cont, Iter, Pred >::FrameBorderIterBase( container_type& rCont ) : @@ -1287,7 +1287,7 @@ FrameBorderIterBase< Cont, Iter, Pred >& FrameBorderIterBase< Cont, Iter, Pred > return *this; } -// ============================================================================ + } // namespace svx diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index 6e095220e80b..3ac50cd11436 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -24,15 +24,15 @@ #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> -//######################################################################## + //# # //# Childwindow-Wrapper-Class # //# # -//######################################################################## + SFX_IMPL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper, SID_HYPERLINK_DIALOG) -// ----------------------------------------------------------------------- + struct MyStruct { diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx index 12d7e935b42d..7c6bf25c3931 100644 --- a/svx/source/dialog/imapimp.hxx +++ b/svx/source/dialog/imapimp.hxx @@ -21,9 +21,9 @@ #ifndef INCLUDED_SVX_SOURCE_DIALOG_IMAPIMP_HXX #define INCLUDED_SVX_SOURCE_DIALOG_IMAPIMP_HXX -// --------------- + // - IMapOwnData - -// --------------- + class IMapOwnData { diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index ae705862eedd..fb51ab3c5640 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::uno; -// ----------------------------------------------------------------------- + OUString GetDicInfoStr( const OUString& rName, const sal_uInt16 nLang, bool bNeg ) { @@ -66,9 +66,9 @@ OUString GetDicInfoStr( const OUString& rName, const sal_uInt16 nLang, bool bNeg return aTmp; } -//======================================================================== + // misc local helper functions -//======================================================================== + static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq ) { @@ -103,9 +103,9 @@ static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nL return i >= 0 && i < nLen; } -//======================================================================== + // class SvxLanguageBox -//======================================================================== + sal_uInt16 TypeToPos_Impl( LanguageType eType, const ListBox& rLb ) { diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index a32dd3d6fe03..6e4c1264d85c 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -153,7 +153,7 @@ void SvxXMeasurePreview::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void SvxXMeasurePreview::DataChanged( const DataChangedEvent& rDCEvt ) { diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 539fc65499f4..ab729cf3038e 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -243,7 +243,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) bAttrModified = sal_False; } -// ----------------------------------------------------------------------- + void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) { @@ -288,7 +288,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index c931e7b636cc..99c3bb76b22d 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -27,7 +27,7 @@ namespace svx { -// ============================================================================ + struct OrientationHelper_Impl { @@ -103,7 +103,7 @@ IMPL_LINK_NOARG(OrientationHelper_Impl, ClickHdl) return 0L; } -// ============================================================================ + OrientationHelper::OrientationHelper( DialControl& rCtrlDial, NumericField& rNfRotation, CheckBox& rCbStacked ) : mpImpl( new OrientationHelper_Impl( rCtrlDial, rCbStacked ) ) @@ -153,7 +153,7 @@ void OrientationHelper::EnableStackedTriState( bool bEnable ) mpImpl->mrCbStacked.EnableTriState( bEnable ); } -// ============================================================================ + OrientStackedWrapper::OrientStackedWrapper( OrientationHelper& rOrientHlp ) : SingleControlWrapperType( rOrientHlp ) @@ -181,7 +181,7 @@ void OrientStackedWrapper::SetControlValue( bool bValue ) GetControl().SetStackedState( bValue ? TRISTATE_TRUE : TRISTATE_FALSE ); } -// ============================================================================ + } // namespace svx diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 3f43536c46c5..6d17f81c987b 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -43,7 +43,7 @@ SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindin { } -// ----------------------------------------------------------------------- + void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index c280882cfba3..2e6c2a3f0566 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -353,10 +353,10 @@ String RID_SVXSTR_LINECAP_SQUARE Text [ en-US ] = "Line cap square"; }; -/////////////////////////////////////////////////////////////////////////////// -// + + // Reference-strings for standardcolor-table -// + /* do not translate */ String RID_SVXSTR_COLOR_BLACK_DEF @@ -490,10 +490,10 @@ String RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF Text = "Blue classic" ; }; -/////////////////////////////////////////////////////////////////////////////// -// + + // Reference-strings for standard-gradient-table -// + /* do not translate */ String RID_SVXSTR_GRDT0_DEF @@ -1255,10 +1255,10 @@ String RID_SVXSTR_GRDT69 Text [ en-US ] = "Green Gradient"; }; -/////////////////////////////////////////////////////////////////////////////// -// + + // Reference-strings for standard-hatch-table -// + /* do not translate */ String RID_SVXSTR_HATCH0_DEF @@ -1361,10 +1361,10 @@ String RID_SVXSTR_HATCH10 Text [ en-US ] = "Hatching" ; }; -/////////////////////////////////////////////////////////////////////////////// -// + + // Reference-strings for standard-bitmap-table -// + /* do not translate */ String RID_SVXSTR_BMP0_DEF @@ -1567,10 +1567,10 @@ String RID_SVXSTR_BMP21 { Text [ en-US ] = "Bitmap"; }; -/////////////////////////////////////////////////////////////////////////////// -// + + // Reference-strings for standard-dash-table -// + /* do not translate */ String RID_SVXSTR_DASH0_DEF @@ -1693,10 +1693,10 @@ String RID_SVXSTR_DASH12 Text [ en-US ] = "Line Style"; }; -/////////////////////////////////////////////////////////////////////////////// -// + + // Reference-strings for standard-line-end-table -// + /* do not translate */ String RID_SVXSTR_LEND0_DEF @@ -1891,10 +1891,10 @@ String RID_SVXSTR_LEND20 Text [ en-US ] = "Arrowhead"; }; -/////////////////////////////////////////////////////////////////////////////// -// + + // Reference-strings for standard transparence gradients -// + /* do not translate */ String RID_SVXSTR_TRASNGR0_DEF diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index e7e8aae81114..5e292c5c1bb1 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -32,9 +32,9 @@ #include <rtl/strbuf.hxx> #include <osl/nlsupport.h> -//======================================================================== + // class SvxTextEncodingBox -//======================================================================== + SvxTextEncodingBox::SvxTextEncodingBox( Window* pParent, WinBits nBits ) : ListBox( pParent, nBits ) diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx index 46464997cf55..887c7230795b 100644 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -44,7 +44,7 @@ void WrapField::Down() GetDownHdl().Call( this ); } -// ============================================================================ + } // namespace svx diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index bfa7c08f421e..b14c46deb82d 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -26,7 +26,7 @@ #include <basegfx/polygon/b3dpolygon.hxx> #include <svx/sdr/contact/viewcontactofe3dcube.hxx> -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* E3dCubeObj::CreateObjectSpecificViewContact() diff --git a/svx/source/engine3d/e3dsceneupdater.cxx b/svx/source/engine3d/e3dsceneupdater.cxx index 91f79a583e2e..b2bced05f690 100644 --- a/svx/source/engine3d/e3dsceneupdater.cxx +++ b/svx/source/engine3d/e3dsceneupdater.cxx @@ -23,7 +23,7 @@ #include <svx/scene3d.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> -////////////////////////////////////////////////////////////////////////////// + E3DModifySceneSnapRectUpdater::E3DModifySceneSnapRectUpdater(const SdrObject* pObject) : mpScene(0), diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 98ceaddc0cb7..d7834461aa8b 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -37,7 +37,7 @@ #include <basegfx/polygon/b3dpolygontools.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx> -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* E3dExtrudeObj::CreateObjectSpecificViewContact() @@ -45,14 +45,14 @@ sdr::contact::ViewContact* E3dExtrudeObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfE3dExtrude(*this); } -////////////////////////////////////////////////////////////////////////////// + sdr::properties::BaseProperties* E3dExtrudeObj::CreateObjectSpecificProperties() { return new sdr::properties::E3dExtrudeProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(E3dExtrudeObj, E3dCompoundObject); diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index d6f926c88d7f..82e07ffd629d 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -3099,7 +3099,7 @@ void Svx3DWin::UpdatePreview() aCtlLightPreview.GetSvx3DLightControl().Set3DAttributes( aSet ); } -////////////////////////////////////////////////////////////////////////////// + // document is to be reloaded, destroy remembered ItemSet void Svx3DWin::DocumentReload() { diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index d39343fec6d8..7c6ea1fcf572 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -28,11 +28,11 @@ #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <com/sun/star/uno/Sequence.h> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + class ImplPairDephAndObject { @@ -57,7 +57,7 @@ public: double getDepth() const { return mfDepth; } }; -////////////////////////////////////////////////////////////////////////////// + void getAllHit3DObjectWithRelativePoint( const basegfx::B3DPoint& rFront, @@ -96,7 +96,7 @@ void getAllHit3DObjectWithRelativePoint( } } -////////////////////////////////////////////////////////////////////////////// + E3dScene* fillViewInformation3DForCompoundObject(drawinglayer::geometry::ViewInformation3D& o_rViewInformation3D, const E3dCompoundObject& rCandidate) { @@ -158,7 +158,7 @@ E3dScene* fillViewInformation3DForCompoundObject(drawinglayer::geometry::ViewInf return pRootScene; } -////////////////////////////////////////////////////////////////////////////// + SVX_DLLPUBLIC void getAllHit3DObjectsSortedFrontToBack( const basegfx::B2DPoint& rPoint, @@ -235,7 +235,7 @@ SVX_DLLPUBLIC void getAllHit3DObjectsSortedFrontToBack( } } -////////////////////////////////////////////////////////////////////////////// + bool checkHitSingle3DObject( const basegfx::B2DPoint& rPoint, diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx index 1c43f4d01c70..961020c7927d 100644 --- a/svx/source/engine3d/helperminimaldepth3d.cxx +++ b/svx/source/engine3d/helperminimaldepth3d.cxx @@ -29,7 +29,7 @@ #include <svx/obj3d.hxx> #include <svx/scene3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -138,7 +138,7 @@ namespace drawinglayer } // end of namespace processor3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // changed to create values using VCs, Primitive3DSequence and ViewInformation3D to allow // removal of old 3D bucket geometry. There is one slight difference in the result, it's // in [0.0 .. 1.0] for Z-Depth since the scaling of the scene as 2D object is no longer diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx index 6226ba1acf04..93896707b58a 100644 --- a/svx/source/engine3d/helperminimaldepth3d.hxx +++ b/svx/source/engine3d/helperminimaldepth3d.hxx @@ -22,12 +22,12 @@ #include <sal/types.h> -////////////////////////////////////////////////////////////////////////////// + // predefines class E3dCompoundObject; -////////////////////////////////////////////////////////////////////////////// + /** support extracting the minimal depth of a 3d object in it's scene @param rObject @@ -44,7 +44,7 @@ class E3dCompoundObject; double getMinimalDepthInViewCoordinates(const E3dCompoundObject& rObject); -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SOURCE_ENGINE3D_HELPERMINIMALDEPTH3D_HXX diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 55759026f2f1..4f40c8576e5a 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -35,7 +35,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* E3dLatheObj::CreateObjectSpecificViewContact() @@ -43,14 +43,14 @@ sdr::contact::ViewContact* E3dLatheObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfE3dLathe(*this); } -////////////////////////////////////////////////////////////////////////////// + sdr::properties::BaseProperties* E3dLatheObj::CreateObjectSpecificProperties() { return new sdr::properties::E3dLatheProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(E3dLatheObj, E3dCompoundObject); diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index d3e1902a5e55..24a802c83777 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -76,7 +76,7 @@ #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <svx/e3dsceneupdater.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; @@ -164,14 +164,14 @@ SdrObject* E3dObjList::RemoveObject(sal_uIntPtr nObjNum) return pRetval; } -////////////////////////////////////////////////////////////////////////////// + sdr::properties::BaseProperties* E3dObject::CreateObjectSpecificProperties() { return new sdr::properties::E3dProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(E3dObject, SdrAttrObj); @@ -764,14 +764,14 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs) /*************************************************************************/ -////////////////////////////////////////////////////////////////////////////// + sdr::properties::BaseProperties* E3dCompoundObject::CreateObjectSpecificProperties() { return new sdr::properties::E3dCompoundProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(E3dCompoundObject, E3dObject); diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index 9f0d7b7ebd74..d0814a94bfa8 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -27,7 +27,7 @@ TYPEINIT1(E3dPolygonObj, E3dCompoundObject); -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact() diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 338d0ade7dbf..7fe7c3c31cb6 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -47,7 +47,7 @@ #include <svx/e3dsceneupdater.hxx> #include <svx/svdmodel.hxx> -////////////////////////////////////////////////////////////////////////////// + class ImpRemap3DDepth { @@ -109,7 +109,7 @@ bool ImpRemap3DDepth::operator<(const ImpRemap3DDepth& rComp) const // typedefs for a vector of ImpRemap3DDepths typedef ::std::vector< ImpRemap3DDepth > ImpRemap3DDepthVector; -////////////////////////////////////////////////////////////////////////////// + class Imp3DDepthRemapper { @@ -169,7 +169,7 @@ sal_uInt32 Imp3DDepthRemapper::RemapOrdNum(sal_uInt32 nOrdNum) const return nOrdNum; } -////////////////////////////////////////////////////////////////////////////// + // BaseProperties section sdr::properties::BaseProperties* E3dScene::CreateObjectSpecificProperties() @@ -177,7 +177,7 @@ sdr::properties::BaseProperties* E3dScene::CreateObjectSpecificProperties() return new sdr::properties::E3dSceneProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* E3dScene::CreateObjectSpecificViewContact() @@ -185,7 +185,7 @@ sdr::contact::ViewContact* E3dScene::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfE3dScene(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(E3dScene, E3dObject); diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index 1f4487b1dbc0..8454600aa89f 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -33,7 +33,7 @@ #include <svx/sdr/contact/viewcontactofe3dsphere.hxx> #include <basegfx/polygon/b3dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* E3dSphereObj::CreateObjectSpecificViewContact() @@ -41,14 +41,14 @@ sdr::contact::ViewContact* E3dSphereObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfE3dSphere(*this); } -////////////////////////////////////////////////////////////////////////////// + sdr::properties::BaseProperties* E3dSphereObj::CreateObjectSpecificProperties() { return new sdr::properties::E3dSphereProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(E3dSphereObj, E3dCompoundObject); diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx index 58e3656b3f77..38dbdaefdb08 100644 --- a/svx/source/engine3d/svx3ditems.cxx +++ b/svx/source/engine3d/svx3ditems.cxx @@ -26,12 +26,12 @@ #include <com/sun/star/drawing/ShadeMode.hpp> -////////////////////////////////////////////////////////////////////////////// + using namespace ::rtl; using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////////// + Svx3DPercentDiagonalItem::Svx3DPercentDiagonalItem(sal_uInt16 nVal) : SfxUInt16Item(SDRATTR_3DOBJ_PERCENT_DIAGONAL, nVal) {} @@ -60,7 +60,7 @@ Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal) {} -////////////////////////////////////////////////////////////////////////////// + // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry @@ -86,7 +86,7 @@ SfxPoolItem* Svx3DReducedLineGeometryItem::Create(SvStream& rIn, sal_uInt16 nIte return pRetval; } -////////////////////////////////////////////////////////////////////////////// + Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal) : SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal) @@ -260,7 +260,7 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal) : SfxUInt16Item(SDRATTR_3DSCENE_SHADE_MODE, nVal) {} -////////////////////////////////////////////////////////////////////////////// + // #107245# Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(sal_Bool bVal) @@ -285,7 +285,7 @@ SfxPoolItem* Svx3DSmoothNormalsItem::Create(SvStream& rIn, sal_uInt16 nItemVersi return pRetval; } -////////////////////////////////////////////////////////////////////////////// + // #107245# Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(sal_Bool bVal) @@ -310,7 +310,7 @@ SfxPoolItem* Svx3DSmoothLidsItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) return pRetval; } -////////////////////////////////////////////////////////////////////////////// + // #107245# Svx3DCharacterModeItem::Svx3DCharacterModeItem(sal_Bool bVal) @@ -335,7 +335,7 @@ SfxPoolItem* Svx3DCharacterModeItem::Create(SvStream& rIn, sal_uInt16 nItemVersi return pRetval; } -////////////////////////////////////////////////////////////////////////////// + // #107245# Svx3DCloseFrontItem::Svx3DCloseFrontItem(sal_Bool bVal) @@ -360,7 +360,7 @@ SfxPoolItem* Svx3DCloseFrontItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) return pRetval; } -////////////////////////////////////////////////////////////////////////////// + // #107245# Svx3DCloseBackItem::Svx3DCloseBackItem(sal_Bool bVal) @@ -385,7 +385,7 @@ SfxPoolItem* Svx3DCloseBackItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) return pRetval; } -////////////////////////////////////////////////////////////////////////////// + // Svx3DNormalsKindItem: use drawing::NormalsKind bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index efc7dd58d743..4428776ddd2d 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -71,7 +71,7 @@ TYPEINIT1(E3dView, SdrView); -////////////////////////////////////////////////////////////////////////////// + // Migrate Marking class Impl3DMirrorConstructOverlay diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index b36d6e6557d9..60c5284cab03 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -28,10 +28,10 @@ #include <sot/exchange.hxx> #include <comphelper/propertysetinfo.hxx> -//........................................................................ + namespace svx { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -43,9 +43,9 @@ namespace svx using namespace ::com::sun::star::datatransfer; using namespace ::comphelper; - //==================================================================== + //= OColumnTransferable - //==================================================================== + OColumnTransferable::OColumnTransferable(const OUString& _rDatasource ,const OUString& _rConnectionResource @@ -380,9 +380,9 @@ namespace svx } } - //==================================================================== + //= ODataAccessObjectTransferable - //==================================================================== + ODataAccessObjectTransferable::ODataAccessObjectTransferable( const OUString& _rDatasource ,const OUString& _rConnectionResource @@ -692,9 +692,9 @@ namespace svx m_aDescriptors.realloc(0); } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 815a1a2a1542..0687e6aa8bbf 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -27,10 +27,10 @@ #include <sot/exchange.hxx> #include <comphelper/propertysetinfo.hxx> -//........................................................................ + namespace svx { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -43,9 +43,9 @@ namespace svx using namespace ::com::sun::star::datatransfer; using namespace ::comphelper; - //==================================================================== + //= OComponentTransferable - //==================================================================== + OComponentTransferable::OComponentTransferable(const OUString& _rDatasourceOrLocation ,const Reference< XContent>& _xContent) @@ -148,9 +148,9 @@ namespace svx return ODataAccessDescriptor(); } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index bc6df988aad3..9d993a51b590 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -121,9 +121,9 @@ Font ImplCreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr ) return aFont; } -//================================================================== + //= FmXModifyMultiplexer -//================================================================== + FmXModifyMultiplexer::FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) @@ -159,9 +159,9 @@ void FmXModifyMultiplexer::modified(const EventObject& e) throw( RuntimeExceptio notifyEach( &XModifyListener::modified, aMulti ); } -//================================================================== + //= FmXUpdateMultiplexer -//================================================================== + FmXUpdateMultiplexer::FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) @@ -215,9 +215,9 @@ void FmXUpdateMultiplexer::updated(const EventObject &e) throw( RuntimeException } -//================================================================== + //= FmXSelectionMultiplexer -//================================================================== + FmXSelectionMultiplexer::FmXSelectionMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) @@ -253,9 +253,9 @@ void SAL_CALL FmXSelectionMultiplexer::selectionChanged( const EventObject& _rEv notifyEach( &XSelectionChangeListener::selectionChanged, aMulti ); } -//================================================================== + //= FmXContainerMultiplexer -//================================================================== + FmXContainerMultiplexer::FmXContainerMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) @@ -307,9 +307,9 @@ void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e) throw( Ru notifyEach( &XContainerListener::elementReplaced, aMulti ); } -//================================================================== + //= FmXGridControlMultiplexer -//================================================================== + FmXGridControlMultiplexer::FmXGridControlMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) @@ -344,9 +344,9 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even notifyEach( &XGridControlListener::columnChanged, aForwardedEvent ); } -//================================================================== + //= FmXGridControl -//================================================================== + Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory) @@ -1006,9 +1006,9 @@ sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) throw( Runt return xPeer.is() ? xPeer->supportsMode(Mode) : sal_False; } -//============================================================================== + //= FmXGridPeer -//============================================================================== + // helper class which prevents that in the peer's header the FmGridListener must be known class FmXGridPeer::GridListenerDelegator : public FmGridListener { @@ -1047,7 +1047,7 @@ void FmXGridPeer::GridListenerDelegator::columnChanged() m_pPeer->columnChanged(); } -//============================================================================== + Reference< XInterface > FmXGridPeer_CreateInstance(const Reference< XMultiServiceFactory>& _rxFactory) { @@ -2090,7 +2090,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext() if ( xAcc.is() ) xContext = xAcc->getAccessibleContext(); // TODO: this has a slight conceptual problem: - // + // We know that the XAccessible and XAccessibleContext implementation of the browse // box is the same (the class implements both interfaces), which, speaking strictly, // is bad here (means when a browse box acts as UnoControl): We (the FmXGridPeer) are diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 4acf5a73ab94..470a3f12bfcb 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -87,9 +87,9 @@ namespace MouseWheelBehavior = ::com::sun::star::awt::MouseWheelBehavior; const char INVALIDTEXT[] = "###"; const char OBJECTTEXT[] = "<OBJECT>"; -//================================================================== + //= helper -//================================================================== + namespace { static LineEnd getModelLineEndSetting( const Reference< XPropertySet >& _rxModel ) @@ -128,9 +128,9 @@ namespace } } -//================================================================== + //= DbGridColumn -//================================================================== + CellControllerRef DbGridColumn::s_xEmptyController; @@ -524,9 +524,9 @@ void DbGridColumn::ImplInitWindow( Window& rParent, const InitWindowFacet _eInit m_pCell->ImplInitWindow( rParent, _eInitWhat ); } -//============================================================================== + //= cell controls -//============================================================================== + TYPEINIT0( DbCellControl ) TYPEINIT1( DbLimitedLengthField, DbCellControl ) TYPEINIT1( DbTextField, DbLimitedLengthField ) @@ -1044,9 +1044,9 @@ void DbCellControl::invalidatedController() // CellModels /*************************************************************************/ -//============================================================================== + //= DbLimitedLengthField -//============================================================================== + DbLimitedLengthField::DbLimitedLengthField( DbGridColumn& _rColumn ) :DbCellControl( _rColumn ) @@ -1075,9 +1075,9 @@ void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) dynamic_cast< Edit* >( m_pPainter )->SetMaxTextLen( _nMaxLen ); } -//============================================================================== + //= DbTextField -//============================================================================== + DbTextField::DbTextField(DbGridColumn& _rColumn) :DbLimitedLengthField(_rColumn) @@ -1252,9 +1252,9 @@ void DbTextField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) m_pPainterImplementation->SetMaxTextLen( _nMaxLen ); } -//============================================================================== + //= DbFormattedField -//============================================================================== + DBG_NAME(DbFormattedField); DbFormattedField::DbFormattedField(DbGridColumn& _rColumn) @@ -1637,9 +1637,9 @@ sal_Bool DbFormattedField::commitControl() return sal_True; } -//============================================================================== + //= DbCheckBox -//============================================================================== + DbCheckBox::DbCheckBox( DbGridColumn& _rColumn ) :DbCellControl( _rColumn, sal_True ) @@ -1763,7 +1763,7 @@ OUString DbCheckBox::GetFormatText(const Reference< XColumn >& /*_rxField*/, con return OUString(); } -//============================================================================== + //= DbPatternField DbPatternField::DbPatternField( DbGridColumn& _rColumn, const Reference<XComponentContext>& _rContext ) @@ -1880,9 +1880,9 @@ sal_Bool DbPatternField::commitControl() return sal_True; } -//============================================================================== + //= DbSpinField -//============================================================================== + DbSpinField::DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign ) :DbCellControl( _rColumn ) @@ -1918,9 +1918,9 @@ CellControllerRef DbSpinField::CreateController() const return new SpinCellController( static_cast< SpinField* >( m_pWindow ) ); } -//============================================================================== + //= DbNumericField -//============================================================================== + DbNumericField::DbNumericField( DbGridColumn& _rColumn ) :DbSpinField( _rColumn ) @@ -2060,9 +2060,9 @@ sal_Bool DbNumericField::commitControl() return sal_True; } -//============================================================================== + //= DbCurrencyField -//============================================================================== + DbCurrencyField::DbCurrencyField(DbGridColumn& _rColumn) :DbSpinField( _rColumn ) @@ -2209,9 +2209,9 @@ sal_Bool DbCurrencyField::commitControl() return sal_True; } -//============================================================================== + //= DbDateField -//============================================================================== + DbDateField::DbDateField( DbGridColumn& _rColumn ) :DbSpinField( _rColumn ) @@ -2342,9 +2342,9 @@ sal_Bool DbDateField::commitControl() return sal_True; } -//============================================================================== + //= DbTimeField -//============================================================================== + DbTimeField::DbTimeField( DbGridColumn& _rColumn ) :DbSpinField( _rColumn, ::com::sun::star::awt::TextAlign::LEFT ) @@ -2454,9 +2454,9 @@ sal_Bool DbTimeField::commitControl() return sal_True; } -//============================================================================== + //= DbComboBox -//============================================================================== + DbComboBox::DbComboBox(DbGridColumn& _rColumn) :DbCellControl(_rColumn) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 01b6e490bb27..bd5f8f1b1c5a 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1677,10 +1677,10 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) // All cols k with m<k<=n have been shifted left on pos, the former col m now has pos n. // In the model this affects a range of cols x to y, where x<=m and y<=n. And the number of hidden cols // within this range is constant, so we may calculate the view pos from the model pos in the above way. - // + // for instance, let's look at a grid with six columns where the third one is hidden. this will // initially look like this : - // + // +---+---+---+---+---+---+ // model pos | 0 | 1 |*2*| 3 | 4 | 5 | // +---+---+---+---+---+---+ @@ -1688,9 +1688,9 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) // +---+---+---+---+---+---+ // view pos | 0 | 1 | - | 2 | 3 | 4 | // +---+---+---+---+---+---+ - // + // if we move the column at (view) pos 1 to (view) pos 3 we have : - // + // +---+---+---+---+---+---+ // model pos | 0 | 3 |*2*| 4 | 1 | 5 | // not reflecting the changes, yet // +---+---+---+---+---+---+ @@ -1698,9 +1698,9 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) // +---+---+---+---+---+---+ // view pos | 0 | 1 | - | 2 | 3 | 4 | // +---+---+---+---+---+---+ - // + // or, sorted by the out-of-date model positions : - // + // +---+---+---+---+---+---+ // model pos | 0 | 1 |*2*| 3 | 4 | 5 | // +---+---+---+---+---+---+ @@ -1708,11 +1708,11 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) // +---+---+---+---+---+---+ // view pos | 0 | 3 | - | 1 | 2 | 4 | // +---+---+---+---+---+---+ - // + // We know the new view pos (3) of the moved column because our base class tells us. So we look at our // model for the 4th (the pos is zero-based) visible column, it is at (model) position 4. And this is // exactly the pos where we have to re-insert our column's model, so it looks ike this : - // + // +---+---+---+---+---+---+ // model pos | 0 |*1*| 2 | 3 | 4 | 5 | // +---+---+---+---+---+---+ @@ -1720,11 +1720,11 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) // +---+---+---+---+---+---+ // view pos | 0 | - | 1 | 2 | 3 | 4 | // +---+---+---+---+---+---+ - // + // Now, all is consistent again. // (except of the hidden column : The cycling of the cols occurred on the model, not on the view. maybe // the user expected the latter but there really is no good argument against our method ;) ...) - // + // And no, this large explanation isn't just because I wanted to play a board game or something like // that. It's because it took me a while to see it myself, and the whole theme (hidden cols, model col // positions, view col positions) is really painful (at least for me) so the above pictures helped me a lot ;) diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index 41930be3ea2c..fcc6c1a85ebc 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -22,16 +22,16 @@ #include <sot/exchange.hxx> #include <tools/debug.hxx> -//........................................................................ + namespace svx { -//........................................................................ + using namespace ::com::sun::star::datatransfer; - //==================================================================== + //= OXFormsTransferable - //==================================================================== + OXFormsTransferable::OXFormsTransferable( const OXFormsDescriptor &rhs ) : m_aDescriptor(rhs) @@ -65,9 +65,9 @@ namespace svx } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 787542d8b9df..632b7433c38b 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -32,9 +32,9 @@ using namespace svxform; using namespace ::connectivity; -//========================================================================== + //= OSystemParseContext -//========================================================================== + DBG_NAME(OSystemParseContext) OSystemParseContext::OSystemParseContext() : IParseContext() @@ -151,8 +151,8 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OS } -// ============================================================================= -// ============================================================================= + + namespace { diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index 00db0c691c38..3c1371234306 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -26,10 +26,10 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <tools/urlobj.hxx> -//........................................................................ + namespace svx { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; @@ -37,9 +37,9 @@ namespace svx using namespace ::com::sun::star::ucb; using namespace ::comphelper; - //==================================================================== + //= ODADescriptorImpl - //==================================================================== + class ODADescriptorImpl { protected: @@ -272,9 +272,9 @@ namespace svx m_bSequenceOutOfDate = sal_False; } - //==================================================================== + //= ODataAccessDescriptor - //==================================================================== + ODataAccessDescriptor::ODataAccessDescriptor() :m_pImpl(new ODADescriptorImpl) @@ -405,9 +405,9 @@ namespace svx (*this)[ daDataSource ] <<= OUString(); } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 2e566a3282f3..f2143334e6bd 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -36,10 +36,10 @@ #include <vcl/button.hxx> #include <vcl/msgbox.hxx> -//........................................................................ + namespace svx { -//........................................................................ + using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -50,9 +50,9 @@ namespace svx namespace TemplateDescription = ::com::sun::star::ui::dialogs::TemplateDescription; - //==================================================================== + //= DatabaseLocationInputController_Impl - //==================================================================== + class DatabaseLocationInputController_Impl { public: @@ -263,9 +263,9 @@ namespace svx m_bNeedExistenceCheck = true; } - //==================================================================== + //= DatabaseLocationInputController - //==================================================================== + DatabaseLocationInputController::DatabaseLocationInputController( const Reference<XComponentContext>& _rContext, ::svt::OFileURLControl& _rLocationInput, PushButton& _rBrowseButton ) @@ -296,8 +296,8 @@ namespace svx return m_pImpl->getURL(); } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx index d2e0ba14745e..a40abe83bec3 100644 --- a/svx/source/form/datalistener.cxx +++ b/svx/source/form/datalistener.cxx @@ -27,10 +27,10 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::dom::events; -//............................................................................ + namespace svxform { -//............................................................................ + DataListener::DataListener( DataNavigatorWindow* pNaviWin ) : @@ -82,8 +82,8 @@ namespace svxform SAL_WARN( "svx.form", "disposing" ); } -//............................................................................ + } // namespace svxform -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 688489036221..8666be3f7a4e 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -73,10 +73,10 @@ using namespace ::svx; #define SUBMISSIONNAME "$SUBMISSIONNAME" #define BINDINGNAME "$BINDINGNAME" -//............................................................................ + namespace svxform { -//............................................................................ + // properties of instance #define PN_INSTANCE_MODEL "Instance" @@ -125,9 +125,9 @@ namespace svxform DataGroupType GetDataGroupType() const; }; - //======================================================================== + // class DataTreeListBox - //======================================================================== + DataTreeListBox::DataTreeListBox( XFormsPage* pPage, DataGroupType _eGroup, const ResId& rResId ) : SvTreeListBox( pPage, rResId ), @@ -267,9 +267,9 @@ namespace svxform Clear(); } - //======================================================================== + // class XFormsPage - //======================================================================== + XFormsPage::XFormsPage( Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ) : TabPage( pParent, SVX_RES( RID_SVX_XFORMS_TABPAGES ) ), @@ -1316,9 +1316,9 @@ namespace svxform } - //======================================================================== + // class DataNavigatorWindow - //======================================================================== + DataNavigatorWindow::DataNavigatorWindow( Window* pParent, SfxBindings* pBindings ) : Window( pParent, SVX_RES( RID_SVXWIN_DATANAVIGATOR ) ), @@ -2151,9 +2151,9 @@ namespace svxform } } - //======================================================================== + // class DataNavigator - //======================================================================== + DBG_NAME(DataNavigator) DataNavigator::DataNavigator( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) : @@ -2256,9 +2256,9 @@ namespace svxform } - //======================================================================== + // class NavigatorFrameManager - //======================================================================== + SFX_IMPL_DOCKINGWINDOW( DataNavigatorManager, SID_FM_SHOW_DATANAVIGATOR ) @@ -2276,9 +2276,9 @@ namespace svxform ( (SfxDockingWindow*)pWindow )->Initialize( _pInfo ); } - //======================================================================== + // class AddDataItemDialog - //======================================================================== + AddDataItemDialog::AddDataItemDialog(Window* pParent, ItemNode* _pNode, const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper) @@ -2759,9 +2759,9 @@ namespace svxform m_pItemFrame->set_label(sText); } - //======================================================================== + // class AddConditionDialog - //======================================================================== + AddConditionDialog::AddConditionDialog(Window* pParent, const OUString& _rPropertyName, @@ -2888,9 +2888,9 @@ namespace svxform return 0; } - //======================================================================== + // class NamespaceItemDialog - //======================================================================== + NamespaceItemDialog::NamespaceItemDialog( AddConditionDialog* _pCondDlg, @@ -3062,9 +3062,9 @@ namespace svxform } } - //======================================================================== + // class ManageNamespaceDialog - //======================================================================== + ManageNamespaceDialog::ManageNamespaceDialog(Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit) : ModalDialog(pParent, "AddNamespaceDialog", "svx/ui/addnamespacedialog.ui") @@ -3107,9 +3107,9 @@ namespace svxform return 0; } - //======================================================================== + // class AddSubmissionDialog - //======================================================================== + AddSubmissionDialog::AddSubmissionDialog( Window* pParent, ItemNode* _pNode, @@ -3329,9 +3329,9 @@ namespace svxform m_pRefBtn->Enable( m_xTempBinding.is() ); } - //======================================================================== + // class AddModelDialog - //======================================================================== + AddModelDialog::AddModelDialog(Window* pParent, bool bIsEdit) : ModalDialog(pParent, "AddModelDialog", "svx/ui/addmodeldialog.ui") @@ -3343,9 +3343,9 @@ namespace svxform SetText(get<FixedText>("alttitle")->GetText()); } - //======================================================================== + // class AddInstanceDialog - //======================================================================== + AddInstanceDialog::AddInstanceDialog(Window* pParent, bool _bEdit) : ModalDialog(pParent, "AddInstanceDialog" , "svx/ui/addinstancedialog.ui") @@ -3385,9 +3385,9 @@ namespace svxform return 0; } - //======================================================================== + // class LinkedInstanceWarningBox - //======================================================================== + LinkedInstanceWarningBox::LinkedInstanceWarningBox( Window* pParent ) : @@ -3400,9 +3400,9 @@ namespace svxform AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); } -//............................................................................ + } // namespace svxform -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx index 355d2ceac6e8..a3fea992940d 100644 --- a/svx/source/form/dbcharsethelper.cxx +++ b/svx/source/form/dbcharsethelper.cxx @@ -19,14 +19,14 @@ #include "svx/dbcharsethelper.hxx" -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= ODataAccessCharsetHelper - //==================================================================== + ODataAccessCharsetHelper::ODataAccessCharsetHelper( ) { @@ -41,9 +41,9 @@ namespace svxform return m_xCharsetHelper.is(); } -//........................................................................ + } // namespace svxform -//........................................................................ + diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index ebdc7521205f..6f288a758d0d 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -26,10 +26,10 @@ #include <rtl/instance.hxx> #include <connectivity/formattedcolumnvalue.hxx> -//........................................................................ + namespace svxform { -//........................................................................ + using namespace ::connectivity::simple; using namespace ::com::sun::star::sdbc; @@ -40,9 +40,9 @@ namespace svxform using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::container; - //==================================================================== + //= ODbtoolsClient - //==================================================================== + namespace { @@ -161,9 +161,9 @@ namespace svxform OSL_ENSURE(s_nClients >= 0,"Illegall call of revokeClient()"); } - //==================================================================== + //= OStaticDataAccessTools - //==================================================================== + OStaticDataAccessTools::OStaticDataAccessTools() { @@ -315,9 +315,9 @@ namespace svxform return bReturn; } - //==================================================================== + //= DBToolsObjectFactory - //==================================================================== + DBToolsObjectFactory::DBToolsObjectFactory() { @@ -340,9 +340,9 @@ namespace svxform } SAL_WNODEPRECATED_DECLARATIONS_POP -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx index 2804c2b6ec3c..1ce234505027 100644 --- a/svx/source/form/delayedevent.cxx +++ b/svx/source/form/delayedevent.cxx @@ -23,14 +23,14 @@ #include <osl/diagnose.h> #include <vcl/svapp.hxx> -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= DelayedEvent - //==================================================================== + void DelayedEvent::Call( void* _pArg ) { @@ -55,8 +55,8 @@ namespace svxform return m_aHandler.Call( _pArg ); } -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index c28932817f4d..d9c7b3c62908 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -71,10 +71,10 @@ using namespace ::connectivity::simple; using namespace ::connectivity; -//........................................................................ + namespace svxform { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::lang::XMultiServiceFactory; @@ -106,7 +106,7 @@ namespace svxform using ::com::sun::star::awt::XTextComponent; using ::com::sun::star::uno::Sequence; -//======================================================================== + OFilterItemExchange::OFilterItemExchange() { } @@ -135,14 +135,14 @@ OLocalExchange* OFilterExchangeHelper::createExchange() const return new OFilterItemExchange; } -//======================================================================== + TYPEINIT0(FmFilterData); Image FmFilterData::GetImage() const { return Image(); } -//======================================================================== + TYPEINIT1(FmParentData, FmFilterData); FmParentData::~FmParentData() @@ -152,7 +152,7 @@ FmParentData::~FmParentData() delete (*i); } -//======================================================================== + TYPEINIT1(FmFormItem, FmParentData); Image FmFormItem::GetImage() const @@ -167,7 +167,7 @@ Image FmFormItem::GetImage() const return aImage; } -//======================================================================== + TYPEINIT1(FmFilterItems, FmParentData); FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) const @@ -198,7 +198,7 @@ Image FmFilterItems::GetImage() const return aImage; } -//======================================================================== + TYPEINIT1(FmFilterItem, FmFilterData); FmFilterItem::FmFilterItem( FmFilterItems* pParent, @@ -224,9 +224,9 @@ Image FmFilterItem::GetImage() const return aImage; } -//======================================================================== + // Hints for communicatition between model and view -//======================================================================== + class FmFilterHint : public SfxHint { FmFilterData* m_pData; @@ -238,7 +238,7 @@ public: }; TYPEINIT1( FmFilterHint, SfxHint ); -//======================================================================== + class FmFilterInsertedHint : public FmFilterHint { sal_uLong m_nPos; // Position relative to the parent of the data @@ -253,7 +253,7 @@ public: }; TYPEINIT1( FmFilterInsertedHint, FmFilterHint ); -//======================================================================== + class FmFilterRemovedHint : public FmFilterHint { public: @@ -264,7 +264,7 @@ public: }; TYPEINIT1( FmFilterRemovedHint, FmFilterHint ); -//======================================================================== + class FmFilterTextChangedHint : public FmFilterHint { public: @@ -275,7 +275,7 @@ public: }; TYPEINIT1( FmFilterTextChangedHint, FmFilterHint ); -//======================================================================== + class FilterClearingHint : public SfxHint { public: @@ -284,7 +284,7 @@ public: }; TYPEINIT1( FilterClearingHint, SfxHint ); -//======================================================================== + class FmFilterCurrentChangedHint : public SfxHint { public: @@ -293,9 +293,9 @@ public: }; TYPEINIT1( FmFilterCurrentChangedHint, SfxHint ); -//======================================================================== + // class FmFilterAdapter, Listener an den FilterControls -//======================================================================== + class FmFilterAdapter : public ::cppu::WeakImplHelper1< XFilterControllerListener > { FmFilterModel* m_pModel; @@ -532,9 +532,9 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) m_pModel->Insert( insertPos, pFilterItems ); } -//======================================================================== + // class FmFilterModel -//======================================================================== + TYPEINIT1(FmFilterModel, FmParentData); FmFilterModel::FmFilterModel() @@ -1019,9 +1019,9 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem ) } } -//======================================================================== + // class FmFilterItemsString -//======================================================================== + class FmFilterItemsString : public SvLBoxString { public: @@ -1078,9 +1078,9 @@ void FmFilterItemsString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pE pViewData->maSize = aSize; } -//======================================================================== + // class FmFilterString -//======================================================================== + class FmFilterString : public SvLBoxString { OUString m_aName; @@ -1134,9 +1134,9 @@ void FmFilterString::Paint( rDev.DrawText( aPos, GetText() ); } -//======================================================================== + // class FmFilterNavigator -//======================================================================== + FmFilterNavigator::FmFilterNavigator( Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HASBUTTONSATROOT ) ,m_pModel( NULL ) @@ -1701,7 +1701,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt ) // every condition could be deleted except the first one if its the only one aContextMenu.EnableItem( SID_FM_DELETE, !aSelectList.empty() ); - // + sal_Bool bEdit = PTR_CAST(FmFilterItem, (FmFilterData*)pClicked->GetUserData()) != NULL && IsSelected(pClicked) && GetSelectionCount() == 1; @@ -1886,9 +1886,9 @@ void FmFilterNavigator::DeleteSelection() } -//======================================================================== + // class FmFilterNavigatorWin -//======================================================================== + FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) @@ -2018,9 +2018,9 @@ void FmFilterNavigatorWin::GetFocus() -//======================================================================== + // class FmFilterNavigatorWinMgr -//======================================================================== + SFX_IMPL_DOCKINGWINDOW( FmFilterNavigatorWinMgr, SID_FM_FILTER_NAVIGATOR ) @@ -2033,8 +2033,8 @@ FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( Window *_pParent, sal_uInt16 _ ((SfxDockingWindow*)pWindow)->Initialize( _pInfo ); } -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index db0fc3a19738..e8bd3ab4bdc3 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -75,9 +75,9 @@ using namespace ::com::sun::star::form::inspection; using ::com::sun::star::awt::XWindow; /*************************************************************************/ -//======================================================================== + //= FmPropBrwMgr -//======================================================================== + SFX_IMPL_FLOATINGWINDOW(FmPropBrwMgr, SID_FM_SHOW_PROPERTIES) @@ -91,8 +91,8 @@ FmPropBrwMgr::FmPropBrwMgr( Window* _pParent, sal_uInt16 _nId, ((SfxFloatingWindow*)pWindow)->Initialize( _pInfo ); } -//======================================================================== -//======================================================================== + + const long STD_WIN_SIZE_X = 300; const long STD_WIN_SIZE_Y = 350; @@ -186,9 +186,9 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) return SVX_RESSTR(nClassNameResourceId); } -//======================================================================== + // class FmPropBrw -//======================================================================== + DBG_NAME(FmPropBrw); FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings, diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index 45e0bc23f792..f2b907cc2b94 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -27,18 +27,18 @@ #include <com/sun/star/awt/XListBox.hpp> #include <tools/debug.hxx> -//........................................................................ + namespace svxform { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::form::validation; - //==================================================================== + //= helper - //==================================================================== + static void setUnderline( const Reference< XVclWindowPeer >& _rxPeer, const UnderlineDescriptor& _rUnderline ) { @@ -83,9 +83,9 @@ namespace svxform _rxPeer->setProperty( FM_PROP_BORDERCOLOR, makeAny( _rBoder.nBorderColor ) ); } - //==================================================================== + //= ControlBorderManager - //==================================================================== + ControlBorderManager::ControlBorderManager() :m_nFocusColor ( 0x000000FF ) @@ -423,8 +423,8 @@ namespace svxform } } -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 215ffa838aa3..2d61c9c91a44 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -40,10 +40,10 @@ #include <tools/diagnose_ex.h> #include <vcl/outdev.hxx> -//........................................................................ + namespace svxform { -//........................................................................ + using namespace ::utl; using ::com::sun::star::uno::Reference; @@ -73,7 +73,7 @@ namespace svxform namespace { - //.................................................................... + template< class INTERFACE_TYPE > Reference< INTERFACE_TYPE > getTypedModelNode( const Reference< XInterface >& _rxModelNode ) { @@ -90,7 +90,7 @@ namespace svxform } } - //.................................................................... + static bool lcl_getDocumentDefaultStyleAndFamily( const Reference< XInterface >& _rxDocument, OUString& _rFamilyName, OUString& _rStyleName ) SAL_THROW(( Exception )) { bool bSuccess = true; @@ -122,7 +122,7 @@ namespace svxform return bSuccess; } - //.................................................................... + static void lcl_initializeControlFont( const Reference< XPropertySet >& _rxModel ) { try @@ -190,9 +190,9 @@ namespace svxform } } - //==================================================================== + //= ControlLayouter - //==================================================================== + Reference< XPropertySet > ControlLayouter::getDefaultDocumentTextStyle( const Reference< XPropertySet >& _rxModel ) { @@ -311,8 +311,8 @@ namespace svxform return bUseRefDevice; } -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index cbdcd6e0ad79..ece8a92fbbfd 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -29,10 +29,10 @@ #include <tools/diagnose_ex.h> -//........................................................................ + namespace svxform { -//........................................................................ + namespace { @@ -43,7 +43,7 @@ namespace svxform using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::frame::XModule; - //.................................................................... + template< class TYPE > Reference< TYPE > getTypedModelNode( const Reference< XInterface >& _rxModelNode ) { @@ -60,7 +60,7 @@ namespace svxform } } - //.................................................................... + Reference< XModel > getDocument( const Reference< XInterface >& _rxModelNode ) { return getTypedModelNode< XModel >( _rxModelNode ); @@ -74,8 +74,8 @@ namespace svxform using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdbc; - //==================================================================== - //==================================================================== + + namespace { @@ -105,9 +105,9 @@ namespace svxform } } - //==================================================================== + //= DocumentClassification - //==================================================================== + DocumentType DocumentClassification::classifyDocument( const Reference< XModel >& _rxDocumentModel ) SAL_THROW(()) { @@ -193,8 +193,8 @@ namespace svxform return OUString(); } -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index ca1e27c06846..88756313ea72 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -28,17 +28,17 @@ #include <tools/diagnose_ex.h> -//........................................................................ + namespace svxform { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::datatransfer; - //==================================================================== + //= OLocalExchange - //==================================================================== + OLocalExchange::OLocalExchange( ) :m_bDragging( sal_False ) @@ -120,9 +120,9 @@ namespace svxform return sal_False; // do not have any formats by default } - //==================================================================== + //= OControlTransferData - //==================================================================== + OControlTransferData::OControlTransferData( ) :m_pFocusEntry( NULL ) @@ -281,9 +281,9 @@ namespace svxform } } - //==================================================================== + //= OControlExchange - //==================================================================== + OControlExchange::OControlExchange( ) { @@ -364,17 +364,17 @@ namespace svxform return s_nFormat; } - //==================================================================== + //= OControlExchangeHelper - //==================================================================== + OLocalExchange* OControlExchangeHelper::createExchange() const { return new OControlExchange; } - //==================================================================== + //= OLocalExchangeHelper - //==================================================================== + OLocalExchangeHelper::OLocalExchangeHelper(Window* _pDragSource) :m_pDragSource(_pDragSource) @@ -423,8 +423,8 @@ namespace svxform m_pTransferable->acquire(); } -//........................................................................ + } -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 610060d0335f..1c4b4183fb9d 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -71,9 +71,9 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -//======================================================================== + // class FmNavInsertedHint -//======================================================================== + TYPEINIT1( FmNavInsertedHint, SfxHint ); DBG_NAME(FmNavInsertedHint); @@ -92,9 +92,9 @@ FmNavInsertedHint::~FmNavInsertedHint() } -//======================================================================== + // class FmNavInsertedHint -//======================================================================== + TYPEINIT1( FmNavModelReplacedHint, SfxHint ); DBG_NAME(FmNavModelReplacedHint); @@ -110,9 +110,9 @@ FmNavModelReplacedHint::~FmNavModelReplacedHint() DBG_DTOR(FmNavModelReplacedHint,NULL); } -//======================================================================== + // class FmNavRemovedHint -//======================================================================== + TYPEINIT1( FmNavRemovedHint, SfxHint ); DBG_NAME(FmNavRemovedHint); @@ -129,9 +129,9 @@ FmNavRemovedHint::~FmNavRemovedHint() } -//======================================================================== + // class FmNavNameChangedHint -//======================================================================== + TYPEINIT1( FmNavNameChangedHint, SfxHint ); DBG_NAME(FmNavNameChangedHint); @@ -148,9 +148,9 @@ FmNavNameChangedHint::~FmNavNameChangedHint() DBG_DTOR(FmNavNameChangedHint,NULL); } -//======================================================================== + // class FmNavClearedHint -//======================================================================== + TYPEINIT1( FmNavClearedHint, SfxHint ); DBG_NAME(FmNavClearedHint); @@ -165,19 +165,19 @@ FmNavClearedHint::~FmNavClearedHint() DBG_DTOR(FmNavClearedHint,NULL); } -//======================================================================== + // class FmNavRequestSelectHint -//======================================================================== + TYPEINIT1(FmNavRequestSelectHint, SfxHint); -//======================================================================== + // class FmNavViewMarksChanged -//======================================================================== + TYPEINIT1(FmNavViewMarksChanged, SfxHint); -//======================================================================== + // class FmEntryDataList -//======================================================================== + DBG_NAME(FmEntryDataList); FmEntryDataList::FmEntryDataList() @@ -229,9 +229,9 @@ void FmEntryDataList::clear() maEntryDataList.clear(); } -//======================================================================== + // class FmEntryData -//======================================================================== + TYPEINIT0( FmEntryData ); DBG_NAME(FmEntryData); @@ -317,9 +317,9 @@ sal_Bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData ) } -//======================================================================== + // class FmFormData -//======================================================================== + TYPEINIT1( FmFormData, FmEntryData ); DBG_NAME(FmFormData); @@ -332,12 +332,12 @@ FmFormData::FmFormData( m_xForm( _rxForm ) { DBG_CTOR(FmEntryData,NULL); - ////////////////////////////////////////////////////////////////////// + // Images setzen m_aNormalImage = _rNormalImages.GetImage( RID_SVXIMG_FORM ); - ////////////////////////////////////////////////////////////////////// + // Titel setzen if (m_xForm.is()) { @@ -387,9 +387,9 @@ sal_Bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData ) } -//======================================================================== + // class FmControlData -//======================================================================== + TYPEINIT1( FmControlData, FmEntryData ); DBG_NAME(FmControlData); @@ -402,11 +402,11 @@ FmControlData::FmControlData( m_xFormComponent( _rxComponent ) { DBG_CTOR(FmControlData,NULL); - ////////////////////////////////////////////////////////////////////// + // Images setzen m_aNormalImage = GetImage( _rNormalImages ); - ////////////////////////////////////////////////////////////////////// + // Titel setzen Reference< XPropertySet > xSet(m_xFormComponent, UNO_QUERY); if( xSet.is() ) @@ -438,7 +438,7 @@ FmEntryData* FmControlData::Clone() Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const { - ////////////////////////////////////////////////////////////////////// + // Default-Image Image aImage = ilNavigatorImages.GetImage( RID_SVXIMG_CONTROL ); @@ -446,7 +446,7 @@ Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const if (!m_xFormComponent.is()) return aImage; - ////////////////////////////////////////////////////////////////////// + // Spezielle Control-Images sal_Int16 nObjectType = getControlTypeByObject(xInfo); switch (nObjectType) @@ -572,14 +572,14 @@ void FmControlData::ModelReplaced( m_aNormalImage = GetImage( _rNormalImages ); } -//............................................................................ + namespace svxform { -//............................................................................ - //======================================================================== + + // class NavigatorFrame - //======================================================================== + DBG_NAME(NavigatorFrame) NavigatorFrame::NavigatorFrame( SfxBindings* _pBindings, SfxChildWindow* _pMgr, @@ -681,9 +681,9 @@ namespace svxform } - //======================================================================== + // class NavigatorFrameManager - //======================================================================== + SFX_IMPL_DOCKINGWINDOW( NavigatorFrameManager, SID_FM_SHOW_FMEXPLORER ) @@ -698,8 +698,8 @@ namespace svxform ((SfxDockingWindow*)pWindow)->Initialize( _pInfo ); } -//............................................................................ + } // namespace svxform -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx index c46e421b7bfd..ce88ba7381af 100644 --- a/svx/source/form/fmitems.cxx +++ b/svx/source/form/fmitems.cxx @@ -22,9 +22,9 @@ #include <svx/svxids.hrc> #include <tools/stream.hxx> -//======================================================================== + // class FmInterfaceItem -//======================================================================== + TYPEINIT1(FmInterfaceItem, SfxPoolItem); diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 0022e9200988..8a6eca456092 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -63,7 +63,7 @@ FmFormObjFactory::FmFormObjFactory() { SdrObjFactory::InsertMakeObjectHdl(LINK(this, FmFormObjFactory, MakeObject)); - ////////////////////////////////////////////////////////////////////// + // Konfigurations-::com::sun::star::frame::Controller und NavigationBar registrieren SvxFmTbxCtlConfig::RegisterControl( SID_FM_CONFIG ); SvxFmTbxCtlAbsRec::RegisterControl( SID_FM_RECORD_ABSOLUTE ); @@ -81,7 +81,7 @@ FmFormObjFactory::FmFormObjFactory() DataNavigatorManager::RegisterChildWindow(); FmFilterNavigatorWinMgr::RegisterChildWindow(); - ////////////////////////////////////////////////////////////////////// + // Interface fuer die Formshell registrieren FmFormShell::RegisterInterface(0); diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index ef746cc93c12..08b658fa9c92 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -44,10 +44,10 @@ using std::pair; #include <set> -//........................................................................ + namespace svxform { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::script::XEventAttacherManager; @@ -70,9 +70,9 @@ namespace svxform class FormScriptingEnvironment; - //==================================================================== + //= FormScriptListener - //==================================================================== + typedef ::cppu::WeakImplHelper1 < XScriptListener > FormScriptListener_Base; @@ -137,9 +137,9 @@ namespace svxform DECL_LINK( OnAsyncScriptEvent, ScriptEvent* ); }; - //==================================================================== + //= FormScriptingEnvironment - //==================================================================== + class FormScriptingEnvironment : public IFormScriptingEnvironment { private: @@ -177,9 +177,9 @@ namespace svxform FormScriptingEnvironment& operator=( const FormScriptingEnvironment& ); // never implemented }; - //==================================================================== + //= FormScriptListener - //==================================================================== + FormScriptListener::FormScriptListener( FormScriptingEnvironment* pScriptExecutor ) :m_pScriptExecutor( pScriptExecutor ) @@ -803,9 +803,9 @@ namespace svxform return 0L; } - //==================================================================== + //= FormScriptingEnvironment - //==================================================================== + FormScriptingEnvironment::FormScriptingEnvironment( FmFormModel& _rModel ) :m_refCount( 0 ) @@ -884,9 +884,9 @@ namespace svxform namespace { - //................................................................ + //. NewStyleUNOScript - //................................................................ + class SAL_NO_VTABLE IScript { public: @@ -896,9 +896,9 @@ namespace svxform }; typedef ::boost::shared_ptr< IScript > PScript; - //................................................................ + //. NewStyleUNOScript - //................................................................ + class NewStyleUNOScript : public IScript { SfxObjectShell& m_rObjectShell; @@ -915,7 +915,7 @@ namespace svxform virtual void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult ); }; - //................................................................ + void NewStyleUNOScript::invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult ) { Sequence< sal_Int16 > aOutArgsIndex; @@ -1036,8 +1036,8 @@ namespace svxform return new FormScriptingEnvironment( _rModel ); } -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index a53998860c79..a8fff4d7569c 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -145,9 +145,9 @@ using namespace ::com::sun::star::form::runtime; using namespace ::com::sun::star::frame; using namespace ::svxform; -//======================================================================== + // class FmDesignModeChangedHint -//======================================================================== + TYPEINIT1( FmDesignModeChangedHint, SfxHint ); @@ -161,7 +161,7 @@ FmDesignModeChangedHint::~FmDesignModeChangedHint() { } -//======================================================================== + const sal_uInt32 FM_UI_FEATURE_SHOW_DATABASEBAR = 0x00000001; const sal_uInt32 FM_UI_FEATURE_SHOW_FIELD = 0x00000002; const sal_uInt32 FM_UI_FEATURE_SHOW_PROPERTIES = 0x00000004; @@ -207,7 +207,7 @@ SFX_IMPL_INTERFACE(FmFormShell, SfxShell, SVX_RES(RID_STR_FORMSHELL)) FM_UI_FEATURE_TB_FORMDESIGN ); } -//======================================================================== + TYPEINIT1(FmFormShell,SfxShell) @@ -374,7 +374,7 @@ void FmFormShell::Execute(SfxRequest &rReq) { sal_uInt16 nSlot = rReq.GetSlot(); - ////////////////////////////////////////////////////////////////////// + // MasterSlot setzen switch( nSlot ) { @@ -404,7 +404,7 @@ void FmFormShell::Execute(SfxRequest &rReq) break; } - ////////////////////////////////////////////////////////////////////// + // Identifier und Inventor des Uno-Controls setzen sal_uInt16 nIdentifier = 0; switch( nSlot ) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 85e80bb37bde..3578ef3ca3c8 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -270,12 +270,12 @@ using namespace ::com::sun::star::script; using namespace ::svxform; using namespace ::svx; -//============================================================================== + //= helper -//============================================================================== + namespace { - //.......................................................................... + void collectInterfacesFromMarkList( const SdrMarkList& _rMarkList, InterfaceBag& /* [out] */ _rInterfaces ) { _rInterfaces.clear(); @@ -313,7 +313,7 @@ namespace } } - //.......................................................................... + sal_Int16 GridView2ModelPos(const Reference< XIndexAccess>& rColumns, sal_Int16 nViewPos) { try @@ -347,7 +347,7 @@ namespace return (sal_Int16)-1; } - //.......................................................................... + void TransferEventScripts(const Reference< XControlModel>& xModel, const Reference< XControl>& xControl, const Sequence< ScriptEventDescriptor>& rTransferIfAvailable) { @@ -613,9 +613,9 @@ Reference< XForm > GetForm(const Reference< XInterface>& _rxElement) return Reference< XForm >(); } -//======================================================================== + // class FmXFormShell_Base_Disambiguation -//======================================================================== + FmXFormShell_Base_Disambiguation::FmXFormShell_Base_Disambiguation( ::osl::Mutex& _rMutex ) :FmXFormShell_BD_BASE( _rMutex ) { @@ -632,9 +632,9 @@ void SAL_CALL FmXFormShell_Base_Disambiguation::disposing() // base classes. } -//======================================================================== + // class FmXFormShell -//======================================================================== + DBG_NAME(FmXFormShell); FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) @@ -4023,8 +4023,8 @@ bool FmXFormShell::HasControlFocus() const return bHasControlFocus; } -//============================================================================== -//============================================================================== + + SearchableControlIterator::SearchableControlIterator(Reference< XInterface> xStartingPoint) :IndexAccessIterator(xStartingPoint) { @@ -4068,8 +4068,8 @@ bool SearchableControlIterator::ShouldStepInto(const Reference< XInterface>& /*x return true; } -//============================================================================== -//============================================================================== + + SFX_IMPL_MENU_CONTROL(ControlConversionMenuController, SfxBoolItem); @@ -4147,6 +4147,6 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState } } -//============================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 2a11166b00a1..fe8d704fd382 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star::beans; using namespace ::svxform; -//======================================================================== + // = FmSearchThread void FmSearchThread::run() @@ -82,7 +82,7 @@ void FmSearchThread::onTerminated() delete this; } -//======================================================================== + // = FmRecordCountListener // SMART_UNO_IMPLEMENTATION(FmRecordCountListener, UsrObject); @@ -158,7 +158,7 @@ void FmRecordCountListener::propertyChange(const ::com::sun::star::beans::Prope NotifyCurrentCount(); } -//======================================================================== + // FmSearchEngine - local classes SimpleTextWrapper::SimpleTextWrapper(const Reference< ::com::sun::star::awt::XTextComponent > & _xText) @@ -208,7 +208,7 @@ OUString CheckBoxWrapper::getCurrentText() const return OUString(); } -//======================================================================== + // = FmSearchEngine sal_Bool FmSearchEngine::MoveCursor() diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index d8c80f345b86..1bbf1ca01476 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -29,14 +29,14 @@ #include <com/sun/star/uno/Sequence.hxx> #include <svl/cjkoptions.hxx> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= TextControlCharAttribDialog - //==================================================================== + TextControlCharAttribDialog::TextControlCharAttribDialog( Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList ) : SfxTabDialog( pParent, "TextControlCharacterPropertiesDialog", @@ -90,6 +90,6 @@ namespace svx } } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx index 029b0f9d8302..32eac10dd75a 100644 --- a/svx/source/form/fmtextcontrolfeature.cxx +++ b/svx/source/form/fmtextcontrolfeature.cxx @@ -19,10 +19,10 @@ #include "fmtextcontrolfeature.hxx" -//........................................................................ + namespace svx { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -30,9 +30,9 @@ namespace svx using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; - //==================================================================== + //= FmTextControlFeature - //==================================================================== + FmTextControlFeature::FmTextControlFeature( const Reference< XDispatch >& _rxDispatcher, const URL& _rFeatureURL, SfxSlotId _nSlotId, ISlotInvalidator* _pInvalidator ) :m_xDispatcher ( _rxDispatcher ) @@ -112,8 +112,8 @@ namespace svx } } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 36914c891158..c7df62ebb3c6 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -63,10 +63,10 @@ #include <vcl/outdev.hxx> #include <osl/mutex.hxx> -//........................................................................ + namespace svx { -//........................................................................ + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -79,10 +79,10 @@ namespace svx using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; - //==================================================================== + typedef sal_uInt16 WhichId; - //==================================================================== + static SfxSlotId pTextControlSlots[] = { SID_CLIPBOARD_FORMAT_ITEMS, @@ -158,9 +158,9 @@ namespace svx 0 }; - //==================================================================== + //= FmFocusListenerAdapter - //==================================================================== + typedef ::cppu::WeakImplHelper1 < XFocusListener > FmFocusListenerAdapter_Base; class FmFocusListenerAdapter : public FmFocusListenerAdapter_Base @@ -250,9 +250,9 @@ namespace svx m_xWindow.clear(); } - //==================================================================== + //= FmMouseListenerAdapter - //==================================================================== + typedef ::cppu::WeakImplHelper1 < XMouseListener > FmMouseListenerAdapter_Base; class FmMouseListenerAdapter : public FmMouseListenerAdapter_Base @@ -278,9 +278,9 @@ namespace svx virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException); }; - //==================================================================== + //= FmMouseListenerAdapter - //==================================================================== + DBG_NAME( FmMouseListenerAdapter ) @@ -363,13 +363,13 @@ namespace svx m_xWindow.clear(); } - //==================================================================== + //= FmTextControlShell - //==================================================================== + namespace { - //.................................................................... + void lcl_translateUnoStateToItem( SfxSlotId _nSlot, const Any& _rUnoState, SfxItemSet& _rSet ) { WhichId nWhich = _rSet.GetPool()->GetWhich( _nSlot ); @@ -426,7 +426,7 @@ namespace svx } } - //.................................................................... + OUString lcl_getUnoSlotName( SfxApplication&, SfxSlotId _nSlotId ) { OUString sSlotUnoName; @@ -469,7 +469,7 @@ namespace svx return sSlotUnoName; } - //.................................................................... + bool lcl_determineReadOnly( const Reference< XControl >& _rxControl ) { bool bIsReadOnlyModel = true; @@ -498,7 +498,7 @@ namespace svx return bIsReadOnlyModel; } - //.................................................................... + static Window* lcl_getWindow( const Reference< XControl >& _rxControl ) { Window* pWindow = NULL; @@ -518,7 +518,7 @@ namespace svx return pWindow; } - //.................................................................... + bool lcl_isRichText( const Reference< XControl >& _rxControl ) { if ( !_rxControl.is() ) @@ -1266,7 +1266,7 @@ namespace svx // Another possibility would be to have dedicated shells for the slots which we might // or might not be able to serve. However, this could probably increase the number of // shells too much (In theory, nearly every slot could have an own shell then). - // + // #i51621# / 2005-08-19 / frank.schoenheit@sun.com // bool bHaveAnyServeableSlots = m_xActiveTextComponent.is() || !m_aControlFeatures.empty(); // LEM: not calling m_aControlActivatonHandler causes fdo#63695, so disable this hack for now. @@ -1379,8 +1379,8 @@ namespace svx m_rBindings.GetDispatcher()->ExecutePopup( SVX_RES( RID_FM_TEXTATTRIBUTE_MENU ) ); } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index f80c41b66ba9..92ce40ff472a 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -98,7 +98,7 @@ using namespace ::com::sun::star::form; using namespace ::svxform; using namespace ::connectivity::simple; -// ------------------------------------------------------------------------------ + namespace { static bool lcl_shouldDisplayError( const Any& _rError ) @@ -121,7 +121,7 @@ namespace } } -// ------------------------------------------------------------------------------ + void displayException(const Any& _rExcept, Window* _pParent) { // check whether we need to display it @@ -143,25 +143,25 @@ void displayException(const Any& _rExcept, Window* _pParent) } } -// ------------------------------------------------------------------------------ + void displayException(const ::com::sun::star::sdbc::SQLException& _rExcept, Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -// ------------------------------------------------------------------------------ + void displayException(const ::com::sun::star::sdbc::SQLWarning& _rExcept, Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -// ------------------------------------------------------------------------------ + void displayException(const ::com::sun::star::sdb::SQLContext& _rExcept, Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -// ------------------------------------------------------------------------------ + void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, Window* _pParent) { displayException(_rEvent.Reason, _pParent); @@ -222,7 +222,7 @@ OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& x return ::comphelper::getString(xControlModel->getPropertyValue(FM_PROP_CONTROLSOURCE)); } -//======================================================================== + // = CursorWrapper CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, sal_Bool bUseCloned) @@ -306,7 +306,7 @@ void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter) } } -//============================================================================== + DBG_NAME(FmXDisposeMultiplexer); FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< ::com::sun::star::lang::XComponent>& _rxObject, sal_Int16 _nId) @@ -357,7 +357,7 @@ void FmXDisposeMultiplexer::dispose() } } -//============================================================================== + sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject) { diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index b0d3c0a3bd80..dcc9a8277282 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -78,7 +78,7 @@ using namespace ::com::sun::star::util; using namespace ::svxform; using namespace ::svx; -//======================================================================== + TYPEINIT1(FmFormView, E3dView); @@ -96,7 +96,7 @@ void FmFormView::Init() pImpl = new FmXFormView(this); pImpl->acquire(); - ////////////////////////////////////////////////////////////////////// + // Model setzen SdrModel* pModel = GetModel(); @@ -104,7 +104,7 @@ void FmFormView::Init() if( !pModel->ISA(FmFormModel) ) return; FmFormModel* pFormModel = (FmFormModel*)pModel; - ////////////////////////////////////////////////////////////////////// + // DesignMode vom Model holen sal_Bool bInitDesignMode = pFormModel->GetOpenInDesignMode(); if ( pFormModel->OpenInDesignModeIsDefaulted( ) ) diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index c6c29adce7db..20e2ea8e3787 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -161,7 +161,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; -//======================================================================== + DBG_NAME(FormViewPageWindowAdapter) FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference<css::uno::XComponentContext>& _rContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl ) @@ -853,7 +853,7 @@ static Reference< XControl > lcl_firstFocussableControl( const Sequence< Referen namespace { - // ......................................................................... + void lcl_ensureControlsOfFormExist_nothrow( const SdrPage& _rPage, const SdrView& _rView, const Window& _rWindow, const Reference< XForm >& _rxForm ) { try @@ -1215,7 +1215,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript OUString sLabelPostfix; - //////////////////////////////////////////////////////////////// + // nur fuer Textgroesse OutputDevice* pOutDev = NULL; if (m_pView->GetActualOutDev() && m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW) @@ -1248,7 +1248,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript if ((DataType::BINARY == nDataType) || (DataType::VARBINARY == nDataType)) return NULL; - ////////////////////////////////////////////////////////////////////// + // determine the control type by examining the data type of the bound column sal_uInt16 nOBJID = 0; sal_Bool bDateNTimeField = sal_False; @@ -1316,7 +1316,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript return NULL; } - ////////////////////////////////////////////////////////////////////// + // group objects bool bCheckbox = ( OBJ_FM_CHECKBOX == nOBJID ); OSL_ENSURE( !bCheckbox || !pLabel, "FmXFormView::implCreateFieldControl: why was there a label created for a check box?" ); @@ -1368,7 +1368,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor Reference< XNumberFormats > xNumberFormats; OUString sLabelPostfix = _rDesc.szName; - //////////////////////////////////////////////////////////////// + // nur fuer Textgroesse OutputDevice* pOutDev = NULL; if (m_pView->GetActualOutDev() && m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW) @@ -1397,7 +1397,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor if ( !pOutDev ) return NULL; - ////////////////////////////////////////////////////////////////////// + // The service name decides which control should be created sal_uInt16 nOBJID = OBJ_FM_EDIT; if(OUString(_rDesc.szServiceName).equals((OUString)FM_SUN_COMPONENT_NUMERICFIELD)) @@ -1422,7 +1422,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor return NULL; } - ////////////////////////////////////////////////////////////////////// + // Now build the connection between the control and the data item. Reference< XValueBinding > xValueBinding(_rDesc.xPropSet,UNO_QUERY); Reference< XBindableValue > xBindableValue(pControl->GetUnoControlModel(),UNO_QUERY); @@ -1436,7 +1436,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor if ( bCheckbox ) return pControl; - ////////////////////////////////////////////////////////////////////// + // group objects SdrObjGroup* pGroup = new SdrObjGroup(); SdrObjList* pObjList = pGroup->GetSubList(); diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 508e88ab0bf7..9e9859f6dfbc 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -49,10 +49,10 @@ #include <set> -//........................................................................ + namespace svxform { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -94,9 +94,9 @@ namespace svxform namespace ColumnValue = ::com::sun::star::sdbc::ColumnValue; namespace WritingMode2 = ::com::sun::star::text::WritingMode2; - //==================================================================== + //= FormControlFactory_Data - //==================================================================== + struct FormControlFactory_Data { Reference<XComponentContext> m_xContext; @@ -107,9 +107,9 @@ namespace svxform } }; - //==================================================================== + //= FormControlFactory - //==================================================================== + FormControlFactory::FormControlFactory( const Reference<XComponentContext>& _rContext ) :m_pData( new FormControlFactory_Data( _rContext ) ) @@ -147,7 +147,7 @@ namespace svxform namespace { - //.................................................................... + static OUString lcl_getUniqueLabel_nothrow( const Reference< XPropertySet >& _rxControlModel, const OUString& _rBaseLabel ) { OUString sLabel( _rBaseLabel ); @@ -191,7 +191,7 @@ namespace svxform return sLabel; } - //.................................................................... + static Sequence< PropertyValue > lcl_getDataSourceIndirectProperties( const Reference< XPropertySet >& _rxControlModel, const Reference<XComponentContext>& _rContext ) { @@ -230,7 +230,7 @@ namespace svxform return aInfo; } - //.................................................................... + static const sal_Char* aCharacterAndParagraphProperties[] = { "CharFontName", @@ -361,7 +361,7 @@ namespace svxform NULL }; - //.................................................................... + static void lcl_initializeCharacterAttributes( const Reference< XPropertySet >& _rxModel ) { try @@ -566,7 +566,7 @@ namespace svxform try { - //////////////////////////////////////////////////////////////////////// + // if the field has a numeric format, and the model has a "Scale" property, sync it Reference< XPropertySetInfo > xFieldPSI( _rxDatabaseField->getPropertySetInfo(), UNO_SET_THROW ); Reference< XPropertySetInfo > xModelPSI( _rxControlModel->getPropertySetInfo(), UNO_SET_THROW ); @@ -591,7 +591,7 @@ namespace svxform _rxControlModel->setPropertyValue( FM_PROP_DECIMAL_ACCURACY, aScaleVal ); } - //////////////////////////////////////////////////////////////////////// + // minimum and maximum of the control according to the type of the database field sal_Int32 nDataType = DataType::OTHER; OSL_VERIFY( _rxDatabaseField->getPropertyValue( FM_PROP_FIELDTYPE ) >>= nDataType ); @@ -636,7 +636,7 @@ namespace svxform _rxControlModel->setPropertyValue( FM_PROP_VALUEMAX, aValue ); } - //////////////////////////////////////////////////////////////////////// + // a check box can be tristate if and only if the column it is bound to is nullable sal_Int16 nClassId = FormComponentType::CONTROL; OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId ); @@ -722,8 +722,8 @@ namespace svxform return sName; } -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 325765178b81..40cfa4cdac23 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -208,9 +208,9 @@ namespace svxform namespace FormFeature = ::com::sun::star::form::runtime::FormFeature; namespace DataType = ::com::sun::star::sdbc::DataType; -//============================================================================== + // ColumnInfo -//============================================================================== + struct ColumnInfo { // information about the column itself @@ -246,9 +246,9 @@ struct ColumnInfo } }; -//============================================================================== + //= ColumnInfoCache -//============================================================================== + class ColumnInfoCache { public: @@ -426,9 +426,9 @@ const ColumnInfo& ColumnInfoCache::getColumnInfo( size_t _pos ) return m_aColumns[ _pos ]; } -//================================================================== + // OParameterContinuation -//================================================================== + class OParameterContinuation : public OInteraction< XInteractionSupplyParameters > { Sequence< PropertyValue > m_aValues; @@ -448,9 +448,9 @@ void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyVal m_aValues = _rValues; } -//================================================================== + // FmXAutoControl -//================================================================== + struct FmFieldInfo { OUString aFieldName; @@ -463,9 +463,9 @@ struct FmFieldInfo {xField->getPropertyValue(FM_PROP_NAME) >>= aFieldName;} }; -//================================================================== + // FmXAutoControl -//================================================================== + class FmXAutoControl: public UnoControl { @@ -523,7 +523,7 @@ struct UpdateAllListeners : public ::std::unary_function< Reference< XDispatch > return true; } }; -//.............................................................................. + IMPL_LINK( FormController, OnInvalidateFeatures, void*, /*_pNotInterestedInThisParam*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1571,7 +1571,7 @@ void FormController::modified( const EventObject& _rEvent ) throw( RuntimeExcept // (this case may happen if somebody moves the scroll wheel of the mouse over a control // which does not have the focus) // 85511 - 29.05.2001 - frank.schoenheit@germany.sun.com - // + // also, it happens when an image control gets a new image by double-clicking it // #i88458# / 2009-01-12 / frank.schoenheit@sun.com Reference< XWindow > xControlWindow( _rEvent.Source, UNO_QUERY_THROW ); diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 67bddcdd7f33..abfc90a582a2 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -39,10 +39,10 @@ #include <functional> #include <algorithm> -//........................................................................ + namespace svx { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XComponentContext; @@ -65,9 +65,9 @@ namespace svx namespace FormFeature = ::com::sun::star::form::runtime::FormFeature; - //==================================================================== + //= FeatureSlotTranslation - //==================================================================== + namespace { struct FeatureDescription @@ -78,7 +78,7 @@ namespace svx }; typedef ::std::vector< FeatureDescription > FeatureDescriptions; - //................................................................ + const FeatureDescriptions& getFeatureDescriptions() { static FeatureDescriptions s_aFeatureDescriptions; @@ -120,7 +120,7 @@ namespace svx namespace { - //................................................................ + struct MatchFeatureDescriptionByURL : public ::std::unary_function< FeatureDescription, bool > { const OUString& m_rURL; @@ -132,7 +132,7 @@ namespace svx } }; - //................................................................ + struct MatchFeatureDescriptionBySlotId : public ::std::unary_function< FeatureDescription, bool > { sal_Int32 m_nSlotId; @@ -144,7 +144,7 @@ namespace svx } }; - //................................................................ + struct MatchFeatureDescriptionByFormFeature : public ::std::unary_function< FeatureDescription, bool > { sal_Int32 m_nFormFeature; @@ -156,7 +156,7 @@ namespace svx } }; - //................................................................ + struct FormFeatureToSlotId : public ::std::unary_function< sal_Int16, sal_Int32 > { sal_Int32 operator()( sal_Int16 _FormFeature ) @@ -192,9 +192,9 @@ namespace svx return ( pos != rDescriptions.end() ) ? pos->nSlotId : -1; } - //==================================================================== + //= ControllerFeatures - //==================================================================== + ControllerFeatures::ControllerFeatures( IControllerFeatureInvalidation* _pInvalidationCallback ) :m_pInvalidationCallback( _pInvalidationCallback ) @@ -235,9 +235,9 @@ namespace svx } } - //==================================================================== + //= FormControllerHelper - //==================================================================== + FormControllerHelper::FormControllerHelper( const Reference< XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback ) :m_pInvalidationCallback( _pInvalidationCallback ) @@ -517,8 +517,8 @@ namespace svx return bCanDo; } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index 79a2aa1c490f..4ad42eca158c 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -21,10 +21,10 @@ #include <tools/debug.hxx> -//........................................................................ + namespace svxform { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -46,9 +46,9 @@ namespace svxform using ::com::sun::star::frame::XDispatchProvider; using ::com::sun::star::lang::EventObject; - //======================================================================== + //= DispatchInterceptionMultiplexer - //======================================================================== + DBG_NAME(DispatchInterceptionMultiplexer) @@ -194,8 +194,8 @@ namespace svxform } } -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index bb47ba7aa61e..2fcb9fbbbe2a 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -23,10 +23,10 @@ #include <comphelper/namedvaluecollection.hxx> #include <tools/diagnose_ex.h> -//........................................................................ + namespace svx { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -35,9 +35,9 @@ namespace svx using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::runtime; - //==================================================================== + //= OSingleFeatureDispatcher - //==================================================================== + OSingleFeatureDispatcher::OSingleFeatureDispatcher( const URL& _rFeatureURL, const sal_Int16 _nFormFeature, const Reference< XFormOperations >& _rxFormOperations, ::osl::Mutex& _rMutex ) @@ -208,8 +208,8 @@ namespace svx throw DisposedException( OUString(), *const_cast< OSingleFeatureDispatcher* >( this ) ); } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index 5e969a2799fc..c2bb99dbfa2f 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -23,18 +23,18 @@ #include <svx/svxids.hrc> -//........................................................................ + namespace svxform { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; - //==================================================================== + //= FormToolboxes - //==================================================================== + FormToolboxes::FormToolboxes( const Reference< XFrame >& _rxFrame ) { @@ -96,8 +96,8 @@ namespace svxform return aToolBarResStr; } -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 9920907f5420..1497ccf06339 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -29,10 +29,10 @@ #include <cppuhelper/supportsservice.hxx> #include <comphelper/processfactory.hxx> -//........................................................................ + namespace svxform { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -55,9 +55,9 @@ namespace svxform using namespace ::com::sun::star; - //==================================================================== + //= LegacyFormController - //==================================================================== + typedef ::cppu::WeakImplHelper2 < form::XFormController , XServiceInfo > LegacyFormController_Base; diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 6433330d4ca7..ad410ed56ef2 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -52,10 +52,10 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include "svtools/treelistentry.hxx" -//............................................................................ + namespace svxform { -//............................................................................ + #define DROP_ACTION_TIMER_INITIAL_TICKS 10 // solange dauert es, bis das Scrollen anspringt @@ -78,9 +78,9 @@ namespace svxform using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::sdb; - //======================================================================== + // helper - //======================================================================== + typedef ::std::map< Reference< XInterface >, SdrObject*, ::comphelper::OInterfaceCompare< XInterface > > MapModelToShape; @@ -113,9 +113,9 @@ namespace svxform } } - //======================================================================== + // class NavigatorTree - //======================================================================== + NavigatorTree::NavigatorTree( Window* pParent ) @@ -427,7 +427,7 @@ namespace svxform // jetzt alles, was disabled wurde, wech aContextMenu.RemoveDisabledEntries(true, true); - ////////////////////////////////////////////////////////// + // OpenReadOnly setzen aContextMenu.CheckItem( SID_FM_OPEN_READONLY, pFormModel->GetOpenInDesignMode() ); @@ -592,7 +592,7 @@ namespace svxform { SvTreeListBox::Clear(); - ////////////////////////////////////////////////////////////////////// + // Default-Eintrag "Formulare" Image aRootImage( m_aNavigatorImages.GetImage( RID_SVXIMG_FORMS ) ); m_pRootEntry = InsertEntry( SVX_RESSTR(RID_STR_FORMS), aRootImage, aRootImage, @@ -615,7 +615,7 @@ namespace svxform SvTreeListEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos ) { - ////////////////////////////////////////////////////////////////////// + // Aktuellen Eintrag einfuegen SvTreeListEntry* pParentEntry = FindEntry( pEntryData->GetParent() ); SvTreeListEntry* pNewEntry; @@ -630,12 +630,12 @@ namespace svxform pEntryData->GetNormalImage(), pEntryData->GetNormalImage(), pParentEntry, sal_False, nRelPos, pEntryData ); - ////////////////////////////////////////////////////////////////////// + // Wenn Root-Eintrag Root expandieren if( !pParentEntry ) Expand( m_pRootEntry ); - ////////////////////////////////////////////////////////////////////// + // Children einfuegen FmEntryDataList* pChildList = pEntryData->GetChildList(); size_t nChildCount = pChildList->size(); @@ -1324,14 +1324,14 @@ namespace svxform void NavigatorTree::NewForm( SvTreeListEntry* pParentEntry ) { - ////////////////////////////////////////////////////////////////////// + // ParentFormData holen if( !IsFormEntry(pParentEntry) ) return; FmFormData* pParentFormData = (FmFormData*)pParentEntry->GetUserData(); - ////////////////////////////////////////////////////////////////////// + // Neue Form erzeugen Reference<XComponentContext> xContext = comphelper::getProcessComponentContext(); Reference< XForm > xNewForm(xContext->getServiceManager()->createInstanceWithContext(FM_SUN_COMPONENT_FORM, xContext), UNO_QUERY); @@ -1340,7 +1340,7 @@ namespace svxform FmFormData* pNewFormData = new FmFormData( xNewForm, m_aNavigatorImages, pParentFormData ); - ////////////////////////////////////////////////////////////////////// + // Namen setzen OUString aName = GenerateName(pNewFormData); pNewFormData->SetText(aName); @@ -1360,11 +1360,11 @@ namespace svxform } - ////////////////////////////////////////////////////////////////////// + // Form einfuegen GetNavModel()->Insert( pNewFormData, LIST_APPEND, sal_True ); - ////////////////////////////////////////////////////////////////////// + // Neue Form als aktive Form setzen FmFormShell* pFormShell = GetNavModel()->GetFormShell(); if( pFormShell ) @@ -1377,7 +1377,7 @@ namespace svxform } GetNavModel()->SetModified(); - ////////////////////////////////////////////////////////////////////// + // In EditMode schalten SvTreeListEntry* pNewEntry = FindEntry( pNewFormData ); EditEntry( pNewEntry ); @@ -1386,7 +1386,7 @@ namespace svxform FmControlData* NavigatorTree::NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName ) { - ////////////////////////////////////////////////////////////////////// + // ParentForm holen if (!GetNavModel()->GetFormShell()) return NULL; @@ -1396,7 +1396,7 @@ namespace svxform FmFormData* pParentFormData = (FmFormData*)pParentEntry->GetUserData();; Reference< XForm > xParentForm( pParentFormData->GetFormIface()); - ////////////////////////////////////////////////////////////////////// + // Neue Component erzeugen Reference<XComponentContext> xContext = comphelper::getProcessComponentContext(); Reference<XFormComponent> xNewComponent( xContext->getServiceManager()->createInstanceWithContext(rServiceName, xContext), UNO_QUERY); @@ -1405,7 +1405,7 @@ namespace svxform FmControlData* pNewFormControlData = new FmControlData( xNewComponent, m_aNavigatorImages, pParentFormData ); - ////////////////////////////////////////////////////////////////////// + // Namen setzen FmFormView* pFormView = GetNavModel()->GetFormShell()->GetFormView(); SdrPageView* pPageView = pFormView->GetSdrPageView(); @@ -1415,14 +1415,14 @@ namespace svxform pNewFormControlData->SetText( sName ); - ////////////////////////////////////////////////////////////////////// + // FormComponent einfuegen GetNavModel()->Insert( pNewFormControlData, LIST_APPEND, sal_True ); GetNavModel()->SetModified(); if (bEditName) { - ////////////////////////////////////////////////////////////////////// + // In EditMode schalten SvTreeListEntry* pNewEntry = FindEntry( pNewFormControlData ); Select( pNewEntry, sal_True ); @@ -1438,7 +1438,7 @@ namespace svxform const sal_uInt16 nMaxCount = 99; OUString aNewName; - ////////////////////////////////////////////////////////////////////// + // BasisNamen erzeugen OUString aBaseName; if( pEntryData->ISA(FmFormData) ) @@ -1446,7 +1446,7 @@ namespace svxform else if( pEntryData->ISA(FmControlData) ) aBaseName = SVX_RESSTR( RID_STR_CONTROL ); - ////////////////////////////////////////////////////////////////////// + // Neuen Namen erstellen FmFormData* pFormParentData = (FmFormData*)pEntryData->GetParent(); @@ -1992,7 +1992,7 @@ namespace svxform FmControlData* pControlData = (FmControlData*)pSelectionLoop->GetUserData(); if (pControlData) { - ///////////////////////////////////////////////////////////////// + // Beim HiddenControl kann kein Object selektiert werden Reference< XFormComponent > xFormComponent( pControlData->GetFormComponent()); if (!xFormComponent.is()) @@ -2076,7 +2076,7 @@ namespace svxform ::std::set< Reference< XFormComponent > > aObjects; CollectObjects(pFormData,bDeep,aObjects); - ////////////////////////////////////////////////////////////////////// + // In der Page das entsprechende SdrObj finden und selektieren FmFormView* pFormView = pFormShell->GetFormView(); SdrPageView* pPageView = pFormView->GetSdrPageView(); @@ -2140,7 +2140,7 @@ namespace svxform if( !pFormShell ) return; - ////////////////////////////////////////////////////////////////////// + // In der Page das entsprechende SdrObj finden und selektieren FmFormView* pFormView = pFormShell->GetFormView(); Reference< XFormComponent > xFormComponent( pControlData->GetFormComponent()); @@ -2187,9 +2187,9 @@ namespace svxform } } -//............................................................................ + } // namespace svxform -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 1f0b60cc79e4..685d2248975c 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -39,10 +39,10 @@ #include <tools/diagnose_ex.h> #include <com/sun/star/container/XContainer.hpp> -//............................................................................ + namespace svxform { -//............................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -53,9 +53,9 @@ namespace svxform using namespace ::com::sun::star::script; using namespace ::com::sun::star::sdb; - //======================================================================== + // class OFormComponentObserver - //======================================================================== + OFormComponentObserver::OFormComponentObserver(NavigatorTreeModel* _pModel) :m_pNavModel(_pModel) @@ -174,7 +174,7 @@ namespace svxform m_bCanUndo = sal_False; - ////////////////////////////////////////////////////////// + // EntryData loeschen FmEntryData* pEntryData = m_pNavModel->FindData( _rxElement, m_pNavModel->GetRootList(), sal_True ); if (pEntryData) @@ -191,9 +191,9 @@ namespace svxform Remove( xElement ); } - //======================================================================== + // class NavigatorTreeModel - //======================================================================== + NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages ) @@ -210,7 +210,7 @@ namespace svxform NavigatorTreeModel::~NavigatorTreeModel() { - ////////////////////////////////////////////////////////////////////// + // Als Listener abmelden if( m_pFormShell) { @@ -245,11 +245,11 @@ namespace svxform if(xForms.is()) xForms->removeContainerListener((XContainerListener*)m_pPropChangeList); - ////////////////////////////////////////////////////////////////////// + // RootList loeschen GetRootList()->clear(); - ////////////////////////////////////////////////////////////////////// + // UI benachrichtigen FmNavClearedHint aClearedHint; Broadcast( aClearedHint ); @@ -333,13 +333,13 @@ namespace svxform m_pFormModel->EndUndo(); } - ////////////////////////////////////////////////////////////////////// + // Als PropertyChangeListener anmelden Reference< XPropertySet > xSet(xElement, UNO_QUERY); if( xSet.is() ) xSet->addPropertyChangeListener( FM_PROP_NAME, m_pPropChangeList ); - ////////////////////////////////////////////////////////////////////// + // Daten aus Model entfernen if (pEntry->ISA(FmFormData)) { @@ -353,7 +353,7 @@ namespace svxform else GetRootList()->insert( pEntry, nRelPos ); - ////////////////////////////////////////////////////////////////////// + // UI benachrichtigen FmNavInsertedHint aInsertedHint( pEntry, nRelPos ); Broadcast( aInsertedHint ); @@ -366,7 +366,7 @@ namespace svxform void NavigatorTreeModel::Remove(FmEntryData* pEntry, sal_Bool bAlterModel) { - ////////////////////////////////////////////////////////////////////// + // Form und Parent holen if (!pEntry || !m_pFormModel) return; @@ -435,13 +435,13 @@ namespace svxform else { GetRootList()->remove( pEntry ); - ////////////////////////////////////////////////////////////////////// + // Wenn keine Form mehr in der Root, an der Shell CurForm zuruecksetzen if ( !GetRootList()->size() ) m_pFormShell->GetImpl()->forgetCurrentForm(); } - ////////////////////////////////////////////////////////////////////// + // UI benachrichtigen FmNavRemovedHint aRemovedHint( pEntry ); Broadcast( aRemovedHint ); @@ -456,7 +456,7 @@ namespace svxform void NavigatorTreeModel::RemoveForm(FmFormData* pFormData) { - ////////////////////////////////////////////////////////////////////// + // Form und Parent holen if (!pFormData || !m_pFormModel) return; @@ -466,7 +466,7 @@ namespace svxform { FmEntryData* pEntryData = pChildList->at( --i ); - ////////////////////////////////////////////////////////////////////// + // Child ist Form -> rekursiver Aufruf if( pEntryData->ISA(FmFormData) ) RemoveForm( (FmFormData*)pEntryData); @@ -474,7 +474,7 @@ namespace svxform RemoveFormComponent((FmControlData*) pEntryData); } - ////////////////////////////////////////////////////////////////////// + // Als PropertyChangeListener abmelden Reference< XPropertySet > xSet( pFormData->GetPropertySet() ); if ( xSet.is() ) @@ -488,12 +488,12 @@ namespace svxform void NavigatorTreeModel::RemoveFormComponent(FmControlData* pControlData) { - ////////////////////////////////////////////////////////////////////// + // Control und Parent holen if (!pControlData) return; - ////////////////////////////////////////////////////////////////////// + // Als PropertyChangeListener abmelden Reference< XPropertySet > xSet( pControlData->GetPropertySet() ); if (xSet.is()) @@ -503,7 +503,7 @@ namespace svxform void NavigatorTreeModel::ClearBranch( FmFormData* pParentData ) { - ////////////////////////////////////////////////////////////////////// + // Alle Eintraege dieses Zweiges loeschen FmEntryDataList* pChildList = pParentData->GetChildList(); @@ -520,7 +520,7 @@ namespace svxform void NavigatorTreeModel::FillBranch( FmFormData* pFormData ) { - ////////////////////////////////////////////////////////////// + // Forms aus der Root einfuegen if( pFormData == NULL ) { @@ -539,13 +539,13 @@ namespace svxform pSubFormData = new FmFormData( xSubForm, m_aNormalImages, pFormData ); Insert( pSubFormData, LIST_APPEND ); - ////////////////////////////////////////////////////////////// + // Neuer Branch, wenn SubForm wiederum Subforms enthaelt FillBranch( pSubFormData ); } } - ////////////////////////////////////////////////////////////// + // Componenten einfuegen else { @@ -568,7 +568,7 @@ namespace svxform pSubFormData = new FmFormData(xSubForm, m_aNormalImages, pFormData); Insert(pSubFormData, LIST_APPEND); - ////////////////////////////////////////////////////////////// + // Neuer Branch, wenn SubForm wiederum Subforms enthaelt FillBranch(pSubFormData); } @@ -588,7 +588,7 @@ namespace svxform if (pFormData) return; - ////////////////////////////////////////////////////////// + // ParentData setzen Reference< XInterface > xIFace( xForm->getParent()); Reference< XForm > xParentForm(xIFace, UNO_QUERY); @@ -603,7 +603,7 @@ namespace svxform void NavigatorTreeModel::InsertFormComponent(const Reference< XFormComponent > & xComp, sal_uInt32 nRelPos) { - ////////////////////////////////////////////////////////// + // ParentData setzen Reference< XInterface > xIFace( xComp->getParent()); Reference< XForm > xForm(xIFace, UNO_QUERY); @@ -619,11 +619,11 @@ namespace svxform if (!FindData(xComp, pParentData->GetChildList(),sal_False)) { - ////////////////////////////////////////////////////////// + // Neue EntryData setzen FmEntryData* pNewEntryData = new FmControlData( xComp, m_aNormalImages, pParentData ); - ////////////////////////////////////////////////////////// + // Neue EntryData einfuegen Insert( pNewEntryData, nRelPos ); } @@ -841,7 +841,7 @@ namespace svxform void NavigatorTreeModel::UpdateContent( const Reference< css::form::XForms > & xForms ) { - ////////////////////////////////////////////////////////////////////// + // Model von der Root aufwaerts neu fuellen Clear(); if (xForms.is()) @@ -863,13 +863,13 @@ namespace svxform void NavigatorTreeModel::UpdateContent( FmFormShell* pShell ) { - ////////////////////////////////////////////////////////////////////// + // Wenn Shell sich nicht veraendert hat, nichts machen FmFormPage* pNewPage = pShell ? pShell->GetCurPage() : NULL; if ((pShell == m_pFormShell) && (m_pFormPage == pNewPage)) return; - ////////////////////////////////////////////////////////////////////// + // Als Listener abmelden if( m_pFormShell ) { @@ -880,7 +880,7 @@ namespace svxform Clear(); } - ////////////////////////////////////////////////////////////////////// + // Vollupdate m_pFormShell = pShell; if (m_pFormShell) @@ -890,7 +890,7 @@ namespace svxform } else m_pFormPage = NULL; - ////////////////////////////////////////////////////////////////////// + // Als Listener neu anmelden if( m_pFormShell ) { @@ -904,7 +904,7 @@ namespace svxform Reference< XIndexContainer > NavigatorTreeModel::GetFormComponents( FmFormData* pFormData ) { - ////////////////////////////////////////////////////////////////////// + // Von der Form Components holen if (pFormData) return Reference< XIndexContainer > (pFormData->GetFormIface(), UNO_QUERY); @@ -915,11 +915,11 @@ namespace svxform sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const OUString& rNewText ) { - ////////////////////////////////////////////////////////////////////// + // Wenn Name schon vorhanden, Fehlermeldung pEntryData->SetText( rNewText ); - ////////////////////////////////////////////////////////////////////// + // PropertySet besorgen Reference< XFormComponent > xFormComponent; @@ -940,7 +940,7 @@ namespace svxform Reference< XPropertySet > xSet(xFormComponent, UNO_QUERY); if( !xSet.is() ) return sal_False; - ////////////////////////////////////////////////////////////////////// + // Namen setzen xSet->setPropertyValue( FM_PROP_NAME, makeAny(rNewText) ); @@ -971,9 +971,9 @@ namespace svxform return NULL; } -//............................................................................ + } // namespace svxform -//............................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index 6db70cd93e95..fdab67e51f78 100644 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx @@ -19,10 +19,10 @@ #include "sdbdatacolumn.hxx" -//.............................................................................. + namespace svxform { -//.............................................................................. + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -32,9 +32,9 @@ namespace svxform using namespace ::com::sun::star::io; using namespace ::com::sun::star::container; - //========================================================================== + //= DataColumn - a class wrapping an object implementing a sdb::DataColumn service - //========================================================================== + DataColumn::DataColumn(const Reference< ::com::sun::star::beans::XPropertySet>& _rxIFace) { m_xPropertySet = _rxIFace; @@ -272,8 +272,8 @@ namespace svxform m_xColumnUpdate->updateNumericObject(x, scale); } - //.............................................................................. + } // namespace svxform -//.............................................................................. + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index 315d7a210766..34e2bd92027c 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -20,17 +20,17 @@ #include "sqlparserclient.hxx" #include "svx/ParseContext.hxx" -//........................................................................ + namespace svxform { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - //==================================================================== + //= OSQLParserClient - //==================================================================== + OSQLParserClient::OSQLParserClient(const Reference< XComponentContext >& rxContext) { @@ -45,9 +45,9 @@ namespace svxform return m_xParser.is(); } -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx index 00b9118801e1..4fe922c5a7ad 100644 --- a/svx/source/form/stringlistresource.cxx +++ b/svx/source/form/stringlistresource.cxx @@ -21,12 +21,12 @@ #include <tools/rcid.h> -//........................................................................ + namespace svx { - //==================================================================== + //= StringListResource - //==================================================================== + StringListResource::StringListResource( const ResId& _rResId ) :Resource( _rResId ) @@ -46,8 +46,8 @@ namespace svx FreeResource(); } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 44124b542431..93cbfbde5f42 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -108,9 +108,9 @@ static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< conta _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); } } -//================================================================== + // class FmFieldWinListBox -//================================================================== + DBG_NAME(FmFieldWinListBox) FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent ) @@ -177,9 +177,9 @@ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi } } -//======================================================================== + // class FmFieldWinData -//======================================================================== + DBG_NAME(FmFieldWinData); FmFieldWinData::FmFieldWinData() @@ -193,9 +193,9 @@ FmFieldWinData::~FmFieldWinData() DBG_DTOR(FmFieldWinData,NULL); } -//======================================================================== + // class FmFieldWin -//======================================================================== + DBG_NAME(FmFieldWin); FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent) @@ -415,7 +415,7 @@ void FmFieldWin::Resize() Size aOutputSize( GetOutputSizePixel() ); - ////////////////////////////////////////////////////////////////////// + // Groesse der ::com::sun::star::form::ListBox anpassen Point aLBPos( LISTBOX_BORDER, LISTBOX_BORDER ); diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index b811af0dd194..9dbbada23014 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -48,9 +48,9 @@ using namespace ::com::sun::star::frame; using ::com::sun::star::beans::XPropertySet; -//======================================================================== + // class SvxFmAbsRecWin -//======================================================================== + SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pController ) @@ -112,9 +112,9 @@ void SvxFmAbsRecWin::KeyInput( const KeyEvent& rKeyEvent ) NumericField::KeyInput( rKeyEvent ); } -//======================================================================== + // class SvxFmTbxCtlConfig -//======================================================================== + struct MapSlotToCmd { @@ -223,7 +223,7 @@ SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow() void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ ) { - ////////////////////////////////////////////////////////////////////// + // Click auf den Button SID_FM_CONFIG in der ObjectBar if ( nLastSlot ) { @@ -245,9 +245,9 @@ void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ ) } -//======================================================================== + // class SvxFmTbxCtlAbsRec -//======================================================================== + SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item ); DBG_NAME(SvxFmTbxCtlAbsRec); @@ -284,7 +284,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons if (!bEnable) pWin->SetText(OUString()); - ////////////////////////////////////////////////////////////////////// + // Enablen/disablen des Fensters pToolBox->EnableItem(nId, bEnable); SfxToolBoxControl::StateChanged( nSID, eState,pState ); @@ -299,9 +299,9 @@ Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) } -//======================================================================== + // SvxFmTbxCtlRecText -//======================================================================== + SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem ); DBG_NAME(SvxFmTbxCtlRecText); @@ -333,9 +333,9 @@ Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent ) } -//======================================================================== + // SvxFmTbxCtlRecFromText -//======================================================================== + SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecFromText, SfxBoolItem ); DBG_NAME(SvxFmTbxCtlRecFromText); @@ -366,9 +366,9 @@ Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent ) } -//======================================================================== + // SvxFmTbxCtlRecTotal -//======================================================================== + DBG_NAME(SvxFmTbxCtlRecTotal); SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem ); @@ -402,7 +402,7 @@ Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent ) void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - ////////////////////////////////////////////////////////////////////// + // Setzen des FixedTextes if (GetSlotId() != SID_FM_RECORD_TOTAL) return; @@ -420,9 +420,9 @@ void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, co SfxToolBoxControl::StateChanged( nSID, eState,pState ); } -//======================================================================== + // SvxFmTbxNextRec -//======================================================================== + SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxNextRec, SfxBoolItem ); @@ -438,9 +438,9 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& r rTbx.SetSettings(aSettings, sal_True); } -//======================================================================== + // SvxFmTbxPrevRec -//======================================================================== + SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxPrevRec, SfxBoolItem ); diff --git a/svx/source/form/typeconversionclient.cxx b/svx/source/form/typeconversionclient.cxx index 0ab81ee54875..14cb2d6f0053 100644 --- a/svx/source/form/typeconversionclient.cxx +++ b/svx/source/form/typeconversionclient.cxx @@ -19,14 +19,14 @@ #include "typeconversionclient.hxx" -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= OTypeConversionClient - //==================================================================== + OTypeConversionClient::OTypeConversionClient() { @@ -41,9 +41,9 @@ namespace svxform return m_xTypeConversion.is(); } -//........................................................................ + } // namespace svxform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 866fa7c9792b..4a8b2592f9c9 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -25,10 +25,10 @@ #include "datanavi.hxx" #include <vcl/msgbox.hxx> -//........................................................................ + namespace svxform { -//........................................................................ + #define PROPERTY_ID_BINDING 5724 #define PROPERTY_ID_FORM_MODEL 5725 @@ -40,9 +40,9 @@ namespace svxform using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xforms; - //==================================================================== + //= OAddConditionDialog - //==================================================================== + Reference< XInterface > SAL_CALL OAddConditionDialog_Create( const Reference< XMultiServiceFactory > & _rxORB ) { @@ -63,9 +63,9 @@ namespace svxform return OUString("org.openoffice.comp.svx.OAddConditionDialog"); } - //==================================================================== + //= OAddConditionDialog - //==================================================================== + OAddConditionDialog::OAddConditionDialog( const Reference< XComponentContext >& _rxORB ) :OAddConditionDialogBase( _rxORB ) @@ -174,8 +174,8 @@ namespace svxform m_sConditionValue = static_cast< AddConditionDialog* >( m_pDialog )->GetCondition(); } -//........................................................................ + } // namespace svxformv -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index dd1744a30d77..3209caa80788 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -381,43 +381,43 @@ void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt ) SetItemText(nId, aItemTextTitle); //SgaObject* pObj = mpTheme->AcquireObject( nId - 1 ); - // + //if( pObj ) //{ // const Rectangle& rRect = rUDEvt.GetRect(); // const Size aSize(rRect.GetWidth(), rRect.GetHeight()); // const BitmapEx aBitmapEx(pObj->createPreviewBitmapEx(aSize)); // const Size aBitmapExSizePixel(aBitmapEx.GetSizePixel()); - // + // if(!aBitmapEx.IsEmpty()) // { // const Point aPos( // ((aSize.Width() - aBitmapExSizePixel.Width()) >> 1) + rRect.Left(), // ((aSize.Height() - aBitmapExSizePixel.Height()) >> 1) + rRect.Top()); // OutputDevice* pDev = rUDEvt.GetDevice(); - // + // if(aBitmapEx.IsTransparent()) // { // // draw checkered background // drawTransparenceBackground(*pDev, aPos, aBitmapExSizePixel); // } - // + // pDev->DrawBitmapEx(aPos, aBitmapEx); // } - // + // //const Rectangle& rRect = rUDEvt.GetRect(); // //OutputDevice* pDev = rUDEvt.GetDevice(); // //Graphic aGraphic; // //bool bTransparent(false); - // // + // //if( pObj->IsThumbBitmap() ) // //{ // // BitmapEx aBitmapEx; - // // + // // if( pObj->GetObjKind() == SGA_OBJ_SOUND ) // // { // // Bitmap aTemp = pObj->GetThumbBmp().GetBitmap(); - // // + // // aTemp.Replace( COL_LIGHTMAGENTA, COL_WHITE ); // // aBitmapEx = BitmapEx(aTemp); // // } @@ -426,12 +426,12 @@ void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt ) // // aBitmapEx = pObj->GetThumbBmp(); // // bTransparent = aBitmapEx.IsTransparent(); // // } - // // + // // if( ( pDev->GetBitCount() <= 8 ) && ( aBitmapEx.GetBitCount() >= 8 ) ) // // { // // aBitmapEx.Dither( BMP_DITHER_FLOYD ); // // } - // // + // // aGraphic = aBitmapEx; // //} // //else @@ -439,9 +439,9 @@ void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt ) // // aGraphic = pObj->GetThumbMtf(); // // bTransparent = true; // //} - // // + // //Size aSize( aGraphic.GetSizePixel( pDev ) ); - // // + // //if ( aSize.Width() && aSize.Height() ) // //{ // // if( ( aSize.Width() > rRect.GetWidth() ) || ( aSize.Height() > rRect.GetHeight() ) ) @@ -449,7 +449,7 @@ void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt ) // // Point aNewPos; // // const double fBmpWH = (double) aSize.Width() / aSize.Height(); // // const double fThmpWH = (double) rRect.GetWidth() / rRect.GetHeight(); - // // + // // // Bitmap an Thumbgroesse anpassen // // if ( fBmpWH < fThmpWH ) // // { @@ -462,19 +462,19 @@ void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt ) // // aSize.Height()= (long) ( rRect.GetWidth() / fBmpWH ); // // } // // } - // // + // // const Point aPos( ( ( rRect.GetWidth() - aSize.Width() ) >> 1 ) + rRect.Left(), // // ( ( rRect.GetHeight() - aSize.Height() ) >> 1 ) + rRect.Top() ); - // // + // // if(bTransparent) // // { // // // draw checkered background // // drawTransparenceBackground(*pDev, aPos, aSize); // // } - // // + // // aGraphic.Draw( pDev, aPos, aSize ); // //} - // + // SetItemText( nId, GalleryBrowser2::GetItemText( *mpTheme, *pObj, GALLERY_ITEM_TITLE) ); // mpTheme->ReleaseObject( pObj ); //} @@ -696,37 +696,37 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa //SgaObject* pObj = mpTheme->AcquireObject( mnCurRow ); - // + //if( pObj ) //{ // const long nTextPosY = rRect.Top() + ( ( rRect.GetHeight() - rDev.GetTextHeight() ) >> 1 ); - // + // if( GALLERY_BRWBOX_TITLE == nColumnId ) // { // const Size aSize(rRect.GetHeight(), rRect.GetHeight()); // const BitmapEx aBitmapEx(pObj->createPreviewBitmapEx(aSize)); // const Size aBitmapExSizePixel(aBitmapEx.GetSizePixel()); - // + // if(!aBitmapEx.IsEmpty()) // { // const Point aPos( // ((aSize.Width() - aBitmapExSizePixel.Width()) >> 1) + rRect.Left(), // ((aSize.Height() - aBitmapExSizePixel.Height()) >> 1) + rRect.Top()); - // + // if(aBitmapEx.IsTransparent()) // { // // draw checkered background // drawTransparenceBackground(rDev, aPos, aBitmapExSizePixel); // } - // + // rDev.DrawBitmapEx(aPos, aBitmapEx); // } - // - // + + // //Rectangle aOutputRect( rRect.TopLeft(), Size( rRect.GetHeight(), rRect.GetHeight() ) ); // //GraphicObject aGrfObj; // //bool bTransparent(false); - // // + // //if( pObj->GetObjKind() == SGA_OBJ_SOUND ) // //{ // // aGrfObj = Graphic( BitmapEx( GAL_RESID( RID_SVXBMP_GALLERY_MEDIA ) ) ); @@ -734,7 +734,7 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa // //else if( pObj->IsThumbBitmap() ) // //{ // // const BitmapEx aBitmapEx(pObj->GetThumbBmp()); - // // + // // bTransparent = aBitmapEx.IsTransparent(); // // aGrfObj = Graphic(aBitmapEx); // //} @@ -743,9 +743,9 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa // // aGrfObj = Graphic( pObj->GetThumbMtf() ); // // bTransparent = true; // //} - // // + // //Size aSize( rDev.LogicToPixel( aGrfObj.GetPrefSize(), aGrfObj.GetPrefMapMode() ) ); - // // + // //if( aSize.Width() && aSize.Height() ) // //{ // // if( ( aSize.Width() > aOutputRect.GetWidth() ) || ( aSize.Height() > aOutputRect.GetHeight() ) ) @@ -753,7 +753,7 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa // // Point aNewPos; // // const double fBmpWH = (double) aSize.Width() / aSize.Height(); // // const double fThmpWH = (double) aOutputRect.GetWidth() / aOutputRect.GetHeight(); - // // + // // // Bitmap an Thumbgroesse anpassen // // if ( fBmpWH < fThmpWH ) // // { @@ -766,22 +766,22 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa // // aSize.Height()= (long) ( aOutputRect.GetWidth() / fBmpWH ); // // } // // } - // // + // // aSize.Width() = Max( aSize.Width(), 4L ); // // aSize.Height() = Max( aSize.Height(), 4L ); - // // + // // const Point aPos( ( ( aOutputRect.GetWidth() - aSize.Width() ) >> 1 ) + aOutputRect.Left(), // // ( ( aOutputRect.GetHeight() - aSize.Height() ) >> 1 ) + aOutputRect.Top() ); - // // + // // if(bTransparent) // // { // // // draw checkered background // // drawTransparenceBackground(rDev, aPos, aSize); // // } - // // + // // aGrfObj.Draw( &rDev, aPos, aSize ); // //} - // + // // aOutputRect.Right() is here rRect.Left() + rRect.GetHeight() // rDev.DrawText( Point( rRect.Left() + rRect.GetHeight() + 6, nTextPosY ), GalleryBrowser2::GetItemText( *mpTheme, *pObj, GALLERY_ITEM_TITLE ) ); // } @@ -789,7 +789,7 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa // { // rDev.DrawText( Point( rRect.Left(), nTextPosY ), GalleryBrowser2::GetItemText( *mpTheme, *pObj, GALLERY_ITEM_PATH ) ); // } - // + // mpTheme->ReleaseObject( pObj ); //} } diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 9dd4325876fc..7e26b7e55e7d 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -44,7 +44,7 @@ class FrameSelector; namespace a11y { -// ============================================================================ + class AccFrameSelector : public ::cppu::WeakImplHelper5< @@ -132,7 +132,7 @@ private: ::comphelper::AccessibleEventNotifier::TClientId mnClientId; }; -// ============================================================================ + } // namespace a11y } // namespace svx diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index d1c0962e2ad1..05b051cbf651 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -87,9 +87,9 @@ namespace svx class SvxShowCharSetItemAcc; - // ---------------- + // - SvxShowCharSetItem - - // ---------------- + /** Simple struct to hold some information about the single items of the table. */ struct SvxShowCharSetItem @@ -109,14 +109,14 @@ namespace svx void ClearAccessible(); }; - // ----------------------------------------------------------------------------- + typedef ::cppu::ImplHelper2 < ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleTable > OAccessibleHelper_Base; - // --------------- + // - SvxShowCharSetAcc - - // --------------- + /** The table implemtentation of the vcl control. */ @@ -203,9 +203,9 @@ namespace svx virtual ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds( ) throw (::com::sun::star::uno::RuntimeException); }; - // ---------------- + // - SvxShowCharSetItemAcc - - // ---------------- + /** The child implementation of the table. */ class SvxShowCharSetItemAcc : public ::comphelper::OAccessibleComponentHelper, diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx index 3a4caae826f6..993e0ab626d2 100644 --- a/svx/source/inc/datalistener.hxx +++ b/svx/source/inc/datalistener.hxx @@ -24,10 +24,10 @@ #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/xml/dom/events/XEventListener.hpp> -//............................................................................ + namespace svxform { -//............................................................................ + class DataNavigatorWindow; @@ -63,9 +63,9 @@ namespace svxform virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); }; -//............................................................................ + } // namespace svxform -//............................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_DATALISTENER_HXX diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index d9d91c046edb..3d8f0348c6f6 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -56,11 +56,11 @@ class FmFormShell; -//======================================================================== -//............................................................................ + + namespace svxform { -//............................................................................ + enum DataGroupType { @@ -111,7 +111,7 @@ namespace svxform typedef std::vector< XContainer_ref > ContainerList; typedef std::vector< XEventTarget_ref > EventTargetList; - //======================================================================== + class DataTreeListBox : public SvTreeListBox { private: @@ -230,7 +230,7 @@ namespace svxform } }; - //======================================================================== + class XFormsPage : public TabPage { private: @@ -300,7 +300,7 @@ namespace svxform inline XFormsUIHelper1_ref GetXFormsHelper( void ) const { return m_xUIHelper; } }; - //======================================================================== + typedef std::vector< XFormsPage* > PageList; typedef ::rtl::Reference < DataListener > DataListener_ref; @@ -370,7 +370,7 @@ namespace svxform inline void DisableNotify( bool _bDisable ) { m_bIsNotifyDisabled = _bDisable; } }; - //======================================================================== + class DataNavigator : public SfxDockingWindow, public SfxControllerItem { private: @@ -395,7 +395,7 @@ namespace svxform const SfxPoolItem* pState ); }; - //======================================================================== + class SVX_DLLPUBLIC DataNavigatorManager : public SfxChildWindow { public: @@ -404,7 +404,7 @@ namespace svxform SFX_DECL_CHILDWINDOW( DataNavigatorManager ); }; - //======================================================================== + class AddDataItemDialog : public ModalDialog { private: @@ -461,7 +461,7 @@ namespace svxform void InitText( DataItemType _eType ); }; - //======================================================================== + class AddConditionDialog : public ModalDialog { private: @@ -494,7 +494,7 @@ namespace svxform } }; - //======================================================================== + class NamespaceItemDialog : public ModalDialog { private: @@ -522,7 +522,7 @@ namespace svxform ~NamespaceItemDialog(); }; - //======================================================================== + class ManageNamespaceDialog : public ModalDialog { private: @@ -546,7 +546,7 @@ namespace svxform OUString GetURL() const { return m_pUrlED->GetText(); } }; - //======================================================================== + class AddSubmissionDialog : public ModalDialog { private: @@ -584,7 +584,7 @@ namespace svxform inline const XSubmission_ref& GetNewSubmission() const { return m_xNewSubmission; } }; - //======================================================================== + class AddModelDialog : public ModalDialog { private: @@ -601,7 +601,7 @@ namespace svxform void SetModifyDoc( const bool bModify ) { m_pModifyCB->Check( bModify ); } }; - //======================================================================== + class AddInstanceDialog : public ModalDialog { private: @@ -633,16 +633,16 @@ namespace svxform void SetLinkInstance( bool _bLink ) { m_pLinkInstanceCB->Check( _bLink != false ); } }; - //======================================================================== + class LinkedInstanceWarningBox : public MessBox { public: LinkedInstanceWarningBox( Window* pParent ); }; -//............................................................................ + } // namespace svxform -//............................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index c2633af42954..20eb2e27dd40 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -22,14 +22,14 @@ #include <tools/link.hxx> -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= DelayedEvent - //==================================================================== + /** small class which encapsulates posting a Link instance as ApplicationUserEvent No thread safety at all here, just a little saving of code to type multiple times @@ -73,9 +73,9 @@ namespace svxform DelayedEvent& operator=( const DelayedEvent& ); // never implemented }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_DELAYEDEVENT_HXX diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 626a9e648796..3fcf91a291f0 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -78,7 +78,7 @@ namespace svx{ namespace DocRecovery{ -//=============================================== + enum EDocStates { /* TEMP STATES */ @@ -106,7 +106,7 @@ enum EDocStates E_SUCCEDED = 512 }; -//=============================================== + enum ERecoveryState { E_SUCCESSFULLY_RECOVERED, @@ -116,7 +116,7 @@ enum ERecoveryState E_NOT_RECOVERED_YET }; -//=============================================== + struct TURLInfo { public: @@ -160,10 +160,10 @@ struct TURLInfo {} }; -//=============================================== + typedef ::std::vector< TURLInfo > TURLList; -//=============================================== + class IRecoveryUpdateListener { public: @@ -184,14 +184,14 @@ class IRecoveryUpdateListener ~IRecoveryUpdateListener() {} }; -//=============================================== + class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener > { - //------------------------------------------- + // types, const public: - //------------------------------------------- + // member private: @@ -219,28 +219,28 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener */ bool m_bListenForSaving; - //------------------------------------------- + // native interface public: - //--------------------------------------- + /** @short TODO */ RecoveryCore(const css::uno::Reference< css::uno::XComponentContext >& rxContext, bool bUsedForSaving); - //--------------------------------------- + /** @short TODO */ virtual ~RecoveryCore(); - //--------------------------------------- + /** @short TODO */ virtual css::uno::Reference< css::uno::XComponentContext > getComponentContext(); - //--------------------------------------- + /** @short TODO */ virtual TURLList* getURLListAccess(); - //--------------------------------------- + /** @short TODO */ static bool isBrokenTempEntry(const TURLInfo& rInfo); virtual void saveBrokenTempEntries(const OUString& sSaveDir); @@ -249,25 +249,25 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener virtual void forgetAllRecoveryEntries(); void forgetBrokenRecoveryEntries(); - //--------------------------------------- + /** @short TODO */ virtual void setProgressHandler(const css::uno::Reference< css::task::XStatusIndicator >& xProgress); - //--------------------------------------- + /** @short TODO */ virtual void setUpdateListener(IRecoveryUpdateListener* pListener); - //--------------------------------------- + /** @short TODO */ virtual void doEmergencySavePrepare(); virtual void doEmergencySave(); virtual void doRecovery(); - //--------------------------------------- + /** @short TODO */ static ERecoveryState mapDocState2RecoverState(sal_Int32 eDocState); - //------------------------------------------- + // uno interface public: @@ -279,26 +279,26 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException); - //------------------------------------------- + // helper private: - //--------------------------------------- + /** @short starts listening on the internal EmergencySave/AutoRecovery core. */ void impl_startListening(); - //--------------------------------------- + /** @short stop listening on the internal EmergencySave/AutoRecovery core. */ void impl_stopListening(); - //--------------------------------------- + /** @short TODO */ css::util::URL impl_getParsedURL(const OUString& sURL); }; -//=============================================== + class PluginProgressWindow : public Window { private: @@ -316,7 +316,7 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat css::lang::XComponent > { - //------------------------------------------- + // member private: @@ -327,24 +327,24 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat PluginProgressWindow* m_pPlugProgressWindow; - //------------------------------------------- + // native interface public: - //--------------------------------------- + /** @short TODO */ PluginProgress( Window* pParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); - //--------------------------------------- + /** @short TODO */ virtual ~PluginProgress(); - //------------------------------------------- + // uno interface public: - //--------------------------------------- + // XStatusIndicator virtual void SAL_CALL start(const OUString& sText , sal_Int32 nRange) @@ -362,7 +362,7 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat virtual void SAL_CALL reset() throw(css::uno::RuntimeException); - //--------------------------------------- + // XComponent virtual void SAL_CALL dispose() throw(css::uno::RuntimeException); @@ -374,16 +374,16 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat throw(css::uno::RuntimeException); }; -//=============================================== + class IExtendedTabPage : public TabPage { - //------------------------------------------- + // member protected: short m_nResult; - //------------------------------------------- + // interface public: @@ -406,17 +406,17 @@ class IExtendedTabPage : public TabPage typedef ::std::vector< IExtendedTabPage* > TTabPageList; -//=============================================== + class TabDialog4Recovery : public TabDialog { - //------------------------------------------- + // member private: TTabPageList m_lTabPages; TTabPageList::iterator m_pActualPage; - //------------------------------------------- + // interface public: @@ -427,10 +427,10 @@ class TabDialog4Recovery : public TabDialog virtual short Execute(); }; -//=============================================== + class SaveDialog : public IExtendedTabPage { - //------------------------------------------- + // member private: @@ -445,11 +445,11 @@ class SaveDialog : public IExtendedTabPage RecoveryCore* m_pCore; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short create all child controls of this dialog. @descr The dialog isnt shown nor it starts any @@ -468,26 +468,26 @@ class SaveDialog : public IExtendedTabPage SaveDialog(Window* pParent, RecoveryCore* pCore ); - //--------------------------------------- + /** @short free all controls and used memory. */ virtual ~SaveDialog(); - //--------------------------------------- + /** @short TODO*/ virtual short execute(); - //--------------------------------------- + /** @short TODO*/ virtual void setDefButton(); DECL_LINK(OKButtonHdl, void*); }; -//=============================================== + class SaveProgressDialog : public ModalDialog , public IRecoveryUpdateListener { - //------------------------------------------- + // member private: @@ -502,11 +502,11 @@ class SaveProgressDialog : public ModalDialog // @short TODO css::uno::Reference< css::task::XStatusIndicator > m_xProgress; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short create all child controls of this dialog. @descr The dialog isnt shown nor it starts any @@ -523,11 +523,11 @@ class SaveProgressDialog : public ModalDialog SaveProgressDialog(Window* pParent, RecoveryCore* pCore ); - //--------------------------------------- + /** @short free all controls and used memory. */ virtual ~SaveProgressDialog(); - //--------------------------------------- + /** @short start the emergency save operation. */ virtual short Execute(); @@ -538,27 +538,27 @@ class SaveProgressDialog : public ModalDialog virtual void end(); }; -//=============================================== + class RecovDocListEntry : public SvLBoxString { public: - //--------------------------------------- + /** @short TODO */ RecovDocListEntry( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& sText ); - //--------------------------------------- + /** @short TODO */ virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); }; -//=============================================== + class RecovDocList : public SvSimpleTable { - //------------------------------------------- + // member public: @@ -572,18 +572,18 @@ class RecovDocList : public SvSimpleTable OUString m_aRecovInProgrStr; OUString m_aNotRecovYetStr; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short TODO */ RecovDocList(SvSimpleTableContainer& rParent, ResMgr& rResMgr); - //--------------------------------------- + /** @short TODO */ virtual ~RecovDocList(); - //--------------------------------------- + /** @short TODO */ virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rText, @@ -592,11 +592,11 @@ class RecovDocList : public SvSimpleTable SvLBoxButtonKind eButtonKind); }; -//=============================================== + class RecoveryDialog : public IExtendedTabPage , public IRecoveryUpdateListener { - //------------------------------------------- + // member private: FixedText m_aTitleFT; @@ -635,52 +635,52 @@ class RecoveryDialog : public IExtendedTabPage bool m_bUserDecideNext; bool m_bWasRecoveryStarted; - //------------------------------------------- + // member public: - //--------------------------------------- + /** @short TODO */ RecoveryDialog(Window* pParent, RecoveryCore* pCore ); - //--------------------------------------- + /** @short TODO */ virtual ~RecoveryDialog(); - //--------------------------------------- + // IRecoveryUpdateListener virtual void updateItems(); virtual void stepNext(TURLInfo* pItem); virtual void start(); virtual void end(); - //--------------------------------------- + /** @short TODO */ virtual short execute(); - //--------------------------------------- + /** @short TODO*/ virtual void setDefButton(); - //------------------------------------------- + // helper private: - //--------------------------------------- + /** @short TODO */ DECL_LINK(NextButtonHdl, void*); DECL_LINK(CancelButtonHdl, void*); - //--------------------------------------- + /** @short TODO */ OUString impl_getStatusString( const TURLInfo& rInfo ) const; }; -//=============================================== + class BrokenRecoveryDialog : public ModalDialog { - //------------------------------------------- + // member private: FixedText m_aDescrFT; @@ -698,49 +698,49 @@ class BrokenRecoveryDialog : public ModalDialog bool m_bBeforeRecovery; sal_Bool m_bExecutionNeeded; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short TODO */ BrokenRecoveryDialog(Window* pParent , RecoveryCore* pCore , bool bBeforeRecovery); - //--------------------------------------- + /** @short TODO */ virtual ~BrokenRecoveryDialog(); - //--------------------------------------- + /** @short TODO */ virtual sal_Bool isExecutionNeeded(); - //--------------------------------------- + /** @short TODO */ virtual OUString getSaveDirURL(); - //------------------------------------------- + // helper private: - //--------------------------------------- + /** @short TODO */ void impl_refresh(); - //--------------------------------------- + /** @short TODO */ DECL_LINK(SaveButtonHdl, void*); - //--------------------------------------- + /** @short TODO */ DECL_LINK(OkButtonHdl, void*); - //--------------------------------------- + /** @short TODO */ DECL_LINK(CancelButtonHdl, void*); - //--------------------------------------- + /** @short TODO */ void impl_askForSavePath(); }; diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index adc474e2c1d4..1ee7cf3151b2 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -43,19 +43,19 @@ class FmFormShell; -//........................................................................ + namespace svxform { -//........................................................................ + class FmFilterItem; class FmFilterItems; class FmParentData; class FmFilterAdapter; -//======================================================================== + // data structure for the filter model -//======================================================================== + class FmFilterData { FmParentData* m_pParent; @@ -76,7 +76,7 @@ public: virtual Image GetImage() const; }; -//======================================================================== + class FmParentData : public FmFilterData { protected: @@ -92,7 +92,7 @@ public: ::std::vector< FmFilterData* >& GetChildren() { return m_aChildren; } }; -//======================================================================== + // Item representing the forms and subforms class FmFormItem : public FmParentData { @@ -120,7 +120,7 @@ public: virtual Image GetImage() const; }; -//======================================================================== + class FmFilterItems : public FmParentData { public: @@ -132,7 +132,7 @@ public: virtual Image GetImage() const; }; -//======================================================================== + class FmFilterItem : public FmFilterData { OUString m_aFieldName; @@ -153,7 +153,7 @@ public: virtual Image GetImage() const; }; -//======================================================================== + class FmFilterModel : public FmParentData ,public SfxBroadcaster ,public ::svxform::OSQLParserClient @@ -196,8 +196,8 @@ protected: void Update(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, FmParentData* pParent); }; -//======================================================================== -//======================================================================== + + class OFilterItemExchange : public OLocalExchange { ::std::vector<FmFilterItem*> m_aDraggedEntries; @@ -225,9 +225,9 @@ inline sal_Bool OFilterItemExchange::hasFormat( const DataFlavorExVector& _rForm return OLocalExchange::hasFormat( _rFormats, getFormatId() ); } -//==================================================================== + //= OFilterExchangeHelper -//==================================================================== + class OFilterExchangeHelper : public OLocalExchangeHelper { public: @@ -239,7 +239,7 @@ protected: virtual OLocalExchange* createExchange() const; }; -//======================================================================== + class FmFilterNavigator : public SvTreeListBox, public SfxListener { enum DROP_ACTION{ DA_SCROLLUP, DA_SCROLLDOWN, DA_EXPANDNODE }; @@ -313,7 +313,7 @@ private: using SvTreeListBox::Insert; }; -//======================================================================== + class FmFilterNavigatorWin : public SfxDockingWindow, public SfxControllerItem { private: @@ -339,7 +339,7 @@ public: virtual void GetFocus(); }; -//======================================================================== + class FmFilterNavigatorWinMgr : public SfxChildWindow { public: @@ -348,9 +348,9 @@ public: SFX_DECL_CHILDWINDOW( FmFilterNavigatorWinMgr ); }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FILTNAV_HXX diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index 4afe9ea66971..d7954e26e276 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -29,7 +29,7 @@ #include <sfx2/childwin.hxx> #include "svx/fmtools.hxx" -//======================================================================== + class FmPropBrwMgr : public SfxChildWindow { public: @@ -39,7 +39,7 @@ public: class SfxBindings; class FmFormShell; -//======================================================================== + class FmPropBrw : public SfxFloatingWindow, public SfxControllerItem { sal_Bool m_bInitialStateChange; diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 0886ec9f82d2..29c6e64a5803 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -32,10 +32,10 @@ namespace com { namespace sun { namespace star { namespace form { namespace vali class XValidatableFormComponent; } } } } } -//........................................................................ + namespace svxform { -//........................................................................ + typedef sal_Int16 ControlStatus; @@ -44,9 +44,9 @@ namespace svxform #define CONTROL_STATUS_MOUSE_HOVER 0x02 #define CONTROL_STATUS_INVALID 0x04 - //==================================================================== + //= BorderDescriptor - //==================================================================== + struct BorderDescriptor { sal_Int16 nBorderType; @@ -64,9 +64,9 @@ namespace svxform } }; - //==================================================================== + //= UnderlineDescriptor - //==================================================================== + struct UnderlineDescriptor { sal_Int16 nUnderlineType; @@ -91,9 +91,9 @@ namespace svxform } }; - //==================================================================== + //= ControlData - //==================================================================== + struct ControlData : public BorderDescriptor, UnderlineDescriptor { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl; @@ -113,9 +113,9 @@ namespace svxform } }; - //==================================================================== + //= ControlBorderManager - //==================================================================== + /** manages the dynamic border color for form controls Used by the <type>FormController</type>, this class manages the dynamic changes in the @@ -146,7 +146,7 @@ namespace svxform ControlData m_aMouseHoverControl; ControlBag m_aInvalidControls; - // ---------------- + // attributes sal_Int32 m_nFocusColor; sal_Int32 m_nMouseHoveColor; @@ -250,9 +250,9 @@ namespace svxform ) const; }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx index db2ad9a6b8cf..8b191253ba95 100644 --- a/svx/source/inc/fmcontrollayout.hxx +++ b/svx/source/inc/fmcontrollayout.hxx @@ -25,14 +25,14 @@ #include "fmdocumentclassification.hxx" #include <unotools/confignode.hxx> -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= ControlLayouter - //==================================================================== + class ControlLayouter { public: @@ -73,9 +73,9 @@ namespace svxform ); }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx index 471037188f71..03ada7d4f133 100644 --- a/svx/source/inc/fmdocumentclassification.hxx +++ b/svx/source/inc/fmdocumentclassification.hxx @@ -22,14 +22,14 @@ #include <com/sun/star/frame/XModel.hpp> -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= DocumentType - //==================================================================== + enum DocumentType { eTextDocument, @@ -44,9 +44,9 @@ namespace svxform eUnknownDocumentType }; - //==================================================================== + //= DocumentClassification - //==================================================================== + class DocumentClassification { public: @@ -69,9 +69,9 @@ namespace svxform ); }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 86cc18a14caf..059be325fe15 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -33,21 +33,21 @@ class SvTreeListEntry; -//======================================================================== + class SvTreeListBox; -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + typedef ::std::set< SvTreeListEntry* > ListBoxEntrySet; - //==================================================================== + //= OLocalExchange - //==================================================================== + class SVX_DLLPUBLIC OLocalExchange : public TransferableHelper { private: @@ -91,9 +91,9 @@ namespace svxform } }; - //==================================================================== + //= OLocalExchangeHelper - //==================================================================== + /// a helper for navigator windows (SvTreeListBox'es) which allow DnD within themself class SVX_DLLPUBLIC OLocalExchangeHelper { @@ -124,9 +124,9 @@ namespace svxform SVX_DLLPRIVATE void implReset(); }; - //==================================================================== + //= OControlTransferData - //==================================================================== + class OControlTransferData { private: @@ -200,16 +200,16 @@ namespace svxform getFormsRoot() const { return m_xFormsRoot; } }; - //==================================================================== + inline const DataFlavorExVector& OControlTransferData::GetDataFlavorExVector() const { const_cast< OControlTransferData* >( this )->updateFormats( ); return m_aCurrentFormats; } - //==================================================================== + //= OControlExchange - //==================================================================== + class OControlExchange : public OLocalExchange, public OControlTransferData { public: @@ -229,9 +229,9 @@ namespace svxform virtual void AddSupportedFormats(); }; - //==================================================================== + //= OControlExchangeHelper - //==================================================================== + class OControlExchangeHelper : public OLocalExchangeHelper { public: @@ -244,8 +244,8 @@ namespace svxform virtual OLocalExchange* createExchange() const; }; - //==================================================================== - //==================================================================== + + inline sal_Bool OControlExchange::hasFieldExchangeFormat( const DataFlavorExVector& _rFormats ) { return hasFormat( _rFormats, getFieldExchangeFormatId() ); @@ -261,9 +261,9 @@ namespace svxform return hasFormat( _rFormats, getHiddenControlModelsFormatId() ); } -//........................................................................ + } // namespace svxform -//........................................................................ + #endif diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 5b5c2898f0ad..5b872b9ccd28 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -59,7 +59,7 @@ class FmFormModel; class FmFormView; class SdrMarkList; -//======================================================================== + class FmEntryData; class FmNavInsertedHint : public SfxHint { @@ -75,7 +75,7 @@ public: sal_uInt32 GetRelPos() const { return nPos; } }; -//======================================================================== + class FmNavModelReplacedHint : public SfxHint { FmEntryData* pEntryData; // die Daten des Eintrages, der ein neues Model bekommen hat @@ -88,7 +88,7 @@ public: FmEntryData* GetEntryData() const { return pEntryData; } }; -//======================================================================== + class FmNavRemovedHint : public SfxHint { FmEntryData* pEntryData; @@ -101,7 +101,7 @@ public: FmEntryData* GetEntryData() const { return pEntryData; } }; -//======================================================================== + class FmNavNameChangedHint : public SfxHint { FmEntryData* pEntryData; @@ -116,7 +116,7 @@ public: OUString GetNewName() const { return aNewName; } }; -//======================================================================== + class FmNavClearedHint : public SfxHint { public: @@ -125,7 +125,7 @@ public: virtual ~FmNavClearedHint(); }; -//======================================================================== + class FmNavViewMarksChanged : public SfxHint { FmFormView* pView; @@ -137,7 +137,7 @@ public: FmFormView* GetAffectedView() { return pView; } }; -//======================================================================== + class FmEntryDataList; class FmEntryData { @@ -194,7 +194,7 @@ public: } }; -//======================================================================== + typedef ::std::vector< FmEntryData* > FmEntryDataBaseList; class FmEntryDataList @@ -215,7 +215,7 @@ public: void clear(); }; -//======================================================================== + // FmNavRequestSelectHint - jemand teilt dem NavigatorTree mit, dass er bestimmte Eintraege selektieren soll typedef std::set<FmEntryData*> FmEntryDataArray; @@ -236,7 +236,7 @@ public: FmEntryDataArray& GetItems() { return m_arredToSelect; } }; -//======================================================================== + class FmFormData : public FmEntryData { ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > m_xForm; @@ -269,7 +269,7 @@ public: }; -//======================================================================== + class FmControlData : public FmEntryData { ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > m_xFormComponent; @@ -298,16 +298,16 @@ public: }; -//======================================================================== -//............................................................................ + + namespace svxform { -//............................................................................ + class NavigatorTreeModel; - //======================================================================== + // class OFormComponentObserver - //======================================================================== + class OFormComponentObserver :public ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::container::XContainerListener @@ -342,9 +342,9 @@ namespace svxform void Remove( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ); }; - //======================================================================== + //= NavigatorTreeModel - //======================================================================== + class NavigatorTreeModel : public SfxBroadcaster ,public SfxListener { @@ -407,7 +407,7 @@ namespace svxform virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; - //======================================================================== + typedef std::set<SvTreeListEntry*> SvLBoxEntrySortedArray; class NavigatorTree : public SvTreeListBox, public SfxListener @@ -560,7 +560,7 @@ namespace svxform sal_Bool doingKeyboardCut( ) const { return m_bKeyboardCut; } }; - //======================================================================== + class NavigatorFrame : public SfxDockingWindow, public SfxControllerItem { private: @@ -585,7 +585,7 @@ namespace svxform void FillInfo( SfxChildWinInfo& rInfo ) const; }; - //======================================================================== + class SVX_DLLPUBLIC NavigatorFrameManager : public SfxChildWindow { public: @@ -594,9 +594,9 @@ namespace svxform SFX_DECL_CHILDWINDOW( NavigatorFrameManager ); }; -//............................................................................ + } // namespace svxform -//............................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FMEXPL_HXX diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index d01e1e1dad75..72a9e3156d3c 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx @@ -23,7 +23,7 @@ #include <svl/poolitem.hxx> #include <comphelper/uno3.hxx> -//================================================================== + class FmInterfaceItem : public SfxPoolItem { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInterface; diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 09b4218bb03e..8f6a755c2f16 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -24,9 +24,9 @@ #include <com/sun/star/form/XForms.hpp> #include <com/sun/star/script/ScriptEventDescriptor.hpp> -//================================================================== + // FmFormObj -//================================================================== + class FmFormObj: public SdrUnoObj { ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > aEvts; // events des Objects diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 29dec86e43a4..3a5d6b3915d3 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -40,11 +40,11 @@ class FmFormObj; class FmFormPage; class SdrObject; -//================================================================== + // FmFormPageImpl // lauscht an allen Containern, um festzustellen, wann Objecte // eingefuegt worden sind und wann diese entfernt wurden -//================================================================== + class SVX_DLLPRIVATE FmFormPageImpl { diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx index 3fcf67ec9f7a..8d86f2520d68 100644 --- a/svx/source/inc/fmscriptingenv.hxx +++ b/svx/source/inc/fmscriptingenv.hxx @@ -24,14 +24,14 @@ #include <rtl/ref.hxx> class FmFormModel; -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= IFormScriptingEnvironment - //==================================================================== + /** describes the interface implemented by a component which handles scripting requirements in a form/control environment. */ @@ -76,14 +76,14 @@ namespace svxform }; typedef ::rtl::Reference< IFormScriptingEnvironment > PFormScriptingEnvironment; - //==================================================================== + /** creates a default component implementing the IFormScriptingEnvironment interface */ PFormScriptingEnvironment createDefaultFormScriptingEnvironment( FmFormModel& _rFormModel ); -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FMSCRIPTINGENV_HXX diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 53c6a3cb65a4..4d89f83fd47d 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -85,7 +85,7 @@ typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::X #define FORMS_UNLOAD 0x0001 // unload #define FORMS_ASYNC 0x0002 // do this async -//============================================================================== + // a class iterating through all fields of a form which are bound to a field // sub forms are ignored, grid columns (where the grid is a direct child of the form) are included class FmXBoundFormFieldIterator : public ::comphelper::IndexAccessIterator @@ -99,7 +99,7 @@ protected: }; class FmFormPage; -//======================================================================== + struct FmLoadAction { FmFormPage* pPage; @@ -113,7 +113,7 @@ struct FmLoadAction } }; -//======================================================================== + class SfxViewFrame; typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::container::XContainerListener @@ -121,7 +121,7 @@ typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::beans::XPropertyCh , ::com::sun::star::form::XFormControllerListener > FmXFormShell_BD_BASE; -//======================================================================== + class FmXFormShell_Base_Disambiguation : public FmXFormShell_BD_BASE { using ::com::sun::star::beans::XPropertyChangeListener::disposing; @@ -130,13 +130,13 @@ protected: virtual void SAL_CALL disposing(); }; -//======================================================================== + namespace svx { class FmTextControlShell; } -//======================================================================== + typedef FmXFormShell_Base_Disambiguation FmXFormShell_BASE; typedef ::utl::ConfigItem FmXFormShell_CFGBASE; @@ -517,7 +517,7 @@ private: */ void impl_RemoveElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); - // --------------------------------------------------- + // asyncronous cursor actions/navigation slot handling public: @@ -536,13 +536,13 @@ protected: DECL_LINK( OnLoadForms, FmFormPage* ); }; -//------------------------------------------------------------------------------ + inline sal_Bool FmXFormShell::IsSelectionUpdatePending() { return m_aMarkTimer.IsActive(); } -// ======================================================================== + // = ein Iterator, der ausgehend von einem Interface ein Objekt sucht, dessen // = ::com::sun::star::beans::Property-Set eine ControlSource- sowie eine BoundField-Eigenschaft hat, // = wobei letztere einen Wert ungleich NULL haben muss. @@ -570,7 +570,7 @@ public: virtual void Invalidate() { IndexAccessIterator::Invalidate(); m_sCurrentValue = OUString(); } }; -// ======================================================================== + typedef boost::ptr_vector<SfxStatusForwarder> StatusForwarderArray; class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl { diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index 81e78bb1d187..ef3c562b7e42 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -24,14 +24,14 @@ #include <sfx2/tabdlg.hxx> #include <editeng/flstitem.hxx> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= TextControlCharAttribDialog - //==================================================================== + class TextControlCharAttribDialog : public SfxTabDialog { private: @@ -52,9 +52,9 @@ namespace svx public: TextControlParaAttribDialog(Window* _pParent, const SfxItemSet& _rCoreSet); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLDIALOGS_HXX diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx index df17c5186b6b..b84845be3838 100644 --- a/svx/source/inc/fmtextcontrolfeature.hxx +++ b/svx/source/inc/fmtextcontrolfeature.hxx @@ -27,14 +27,14 @@ #include <cppuhelper/implbase1.hxx> #include "fmslotinvalidator.hxx" -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= FmTextControlFeature - //==================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::frame::XStatusListener > FmTextControlFeature_Base; @@ -87,9 +87,9 @@ namespace svx virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index 8c7771dae967..c2b99c5da4a3 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -42,18 +42,18 @@ class SfxBindings; class SfxViewFrame; class SfxApplication; -//........................................................................ + namespace svx { -//........................................................................ + class FmFocusListenerAdapter; class FmTextControlFeature; class FmMouseListenerAdapter; - //==================================================================== + //= IFocusObserver - //==================================================================== + class IFocusObserver { public: @@ -64,9 +64,9 @@ namespace svx ~IFocusObserver() {} }; - //==================================================================== + //= IFocusObserver - //==================================================================== + class IContextRequestObserver { public: @@ -76,9 +76,9 @@ namespace svx ~IContextRequestObserver() {} }; - //==================================================================== + //= FmTextControlShell - //==================================================================== + class FmTextControlShell :public IFocusObserver ,public ISlotInvalidator ,public IContextRequestObserver @@ -211,9 +211,9 @@ namespace svx DECL_LINK( OnInvalidateClipboard, void* ); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index e2f0fe11d0d7..9bb222bb4c39 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -45,9 +45,9 @@ class FmFormModel; class FmFormObj; class SdrObject; -//================================================================== + // FmUndoPropertyAction -//================================================================== + class FmUndoPropertyAction: public SdrUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xObj; @@ -65,9 +65,9 @@ public: }; -//================================================================== + // FmUndoContainerAction -//================================================================== + class FmUndoContainerAction: public SdrUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > @@ -108,9 +108,9 @@ protected: void implReRemove( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); }; -//================================================================== + // FmUndoModelReplaceAction -//================================================================== + class FmUndoModelReplaceAction : public SdrUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> m_xReplaced; @@ -128,7 +128,7 @@ public: static void DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced ); }; -//======================================================================== + class SVX_DLLPRIVATE FmXUndoEnvironment : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::container::XContainerListener diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index c589c23ff41b..6a00d829efb8 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -77,9 +77,9 @@ namespace svx { struct OXFormsDescriptor; } -//================================================================== + // FormViewPageWindowAdapter -//================================================================== + typedef ::cppu::WeakImplHelper2 < ::com::sun::star::container::XIndexAccess , ::com::sun::star::form::runtime::XFormControllerContext > FormViewPageWindowAdapter_Base; @@ -139,9 +139,9 @@ typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::awt: , ::comphelper::OInterfaceCompare< ::com::sun::star::awt::XControlContainer > > MapControlContainerToSetOfForms; class SdrModel; -//================================================================== + // FmXFormView -//================================================================== + class FmXFormView : public ::cppu::WeakImplHelper3< ::com::sun::star::form::XFormControllerListener, ::com::sun::star::awt::XFocusListener, diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index b76fe9230cae..92466f827ab7 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -39,14 +39,14 @@ namespace comphelper { class ComponentContext; } -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= FormControlFactory - //==================================================================== + struct FormControlFactory_Data; class FormControlFactory @@ -105,9 +105,9 @@ namespace svxform ::std::auto_ptr< FormControlFactory_Data > m_pData; }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FORMCONTROLFACTORY_HXX diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 1cc77a9f81a8..bdbc021a0b20 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -126,9 +126,9 @@ namespace svxform , ::com::sun::star::form::runtime::XFeatureInvalidation > FormController_BASE; - //================================================================== + // FormController - //================================================================== + class ColumnInfoCache; class FormController :public ::comphelper::OBaseMutex ,public FormController_BASE diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index b2f48cba54e9..3699c1afe14c 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -30,14 +30,14 @@ #include <vector> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= FeatureSlotTranslation - //==================================================================== + class FeatureSlotTranslation { public: @@ -51,9 +51,9 @@ namespace svx static sal_Int32 getSlotIdForFormFeature( sal_Int16 _nFormFeature ); }; - //==================================================================== + //= IControllerFeatureInvalidation - //==================================================================== + class IControllerFeatureInvalidation { public: @@ -72,9 +72,9 @@ namespace svx ~IControllerFeatureInvalidation() {} }; - //==================================================================== + //= ControllerFeatures - //==================================================================== + class FormControllerHelper; /** easier access to an FormControllerHelper instance */ @@ -132,9 +132,9 @@ namespace svx inline FormControllerHelper& operator*() { return *m_pImpl; } }; - //==================================================================== + //= FormControllerHelper - //==================================================================== + typedef ::cppu::WeakImplHelper2 < ::com::sun::star::form::runtime::XFeatureInvalidation , ::com::sun::star::sdb::XSQLErrorListener > FormControllerHelper_Base; @@ -230,9 +230,9 @@ namespace svx FormControllerHelper& operator=( const FormControllerHelper& ); // never implemented }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FORMCONTROLLING_HXX diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index 5262cbd64f77..6ee7e152b458 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -26,14 +26,14 @@ #include <cppuhelper/compbase2.hxx> #include <comphelper/uno3.hxx> -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= DispatchInterceptor - //==================================================================== + class DispatchInterceptor { public: @@ -48,9 +48,9 @@ namespace svxform ~DispatchInterceptor() {} }; - //==================================================================== + //= - //==================================================================== + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::frame::XDispatchProviderInterceptor , ::com::sun::star::lang::XEventListener > DispatchInterceptionMultiplexer_BASE; @@ -106,9 +106,9 @@ namespace svxform void ImplDetach(); }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_FORMDISPATCHINTERCEPTOR_HXX diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx index 75d419d8c2b9..0eac23d4a191 100644 --- a/svx/source/inc/formfeaturedispatcher.hxx +++ b/svx/source/inc/formfeaturedispatcher.hxx @@ -27,14 +27,14 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/interfacecontainer.hxx> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= OSingleFeatureDispatcher - //==================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::frame::XDispatch > OSingleFeatureDispatcher_Base; @@ -121,9 +121,9 @@ namespace svx void getUnoState( ::com::sun::star::frame::FeatureStateEvent& /* [out] */ _rState ) const; }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index c9372708fae0..05c8f94d6111 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -30,7 +30,7 @@ namespace svx { namespace a11y { class AccFrameSelector; } -// ============================================================================ + class FrameBorder { @@ -85,7 +85,7 @@ private: bool mbSelected; /// true = Border selected in control. }; -// ============================================================================ + typedef std::vector< FrameBorder* > FrameBorderPtrVec; @@ -227,7 +227,7 @@ struct FrameSelectorImpl : public Resource bool SelectedBordersEqual() const; }; -// ============================================================================ + /** Dummy predicate for frame border iterators to use all borders in a container. */ struct FrameBorderDummy_Pred @@ -293,7 +293,7 @@ typedef FrameBorderIterBase< const FrameBorderPtrVec, FrameBorderPtrVec::const_i typedef FrameBorderIterBase< FrameBorderPtrVec, FrameBorderPtrVec::iterator, FrameBorderSelected_Pred > SelFrameBorderIter; -// ============================================================================ + } // namespace svx diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index df3d10d11ecf..db1deda56b3f 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -51,18 +51,18 @@ class DbCellControl; class Edit; class FmXGridCell; -//================================================================== + // FmMutexHelper -//================================================================== + class FmMutexHelper { protected: ::osl::Mutex m_aMutex; }; -//================================================================== + // DbGridColumn, Spaltenbeschreibung -//================================================================== + class DbGridColumn { friend class DbGridControl; @@ -195,11 +195,11 @@ private: void impl_toggleScriptManager_nothrow( bool _bAttach ); }; -//================================================================== + // DbCellControl, liefert die Daten fuer einen CellController // wird in der Regel nur f\FCr komplexe Controls wie z.B ComboBoxen // benoetigt -//================================================================== + class DbCellControl :public ::svxform::OTypeConversionClient ,public ::svxform::OStaticDataAccessTools @@ -344,28 +344,28 @@ private: void implAdjustEnabled( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); }; -//================================================================== -//------------------------------------------------------------------ + + inline sal_Bool DbCellControl::isValuePropertyLocked() const { return m_bAccessingValueProperty; } -//------------------------------------------------------------------ + inline void DbCellControl::lockValueProperty() { OSL_ENSURE( !isValuePropertyLocked(), "DbCellControl::lockValueProperty: not to be nested!" ); m_bAccessingValueProperty = sal_True; } -//------------------------------------------------------------------ + inline void DbCellControl::unlockValueProperty() { OSL_ENSURE( isValuePropertyLocked(), "DbCellControl::lockValueProperty: not locked so far!" ); m_bAccessingValueProperty = sal_False; } -//================================================================== + /** a field which is bound to a column which supports the MaxTextLen property */ class DbLimitedLengthField : public DbCellControl @@ -388,7 +388,7 @@ protected: virtual void implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ); }; -//================================================================== + class DbTextField : public DbLimitedLengthField { ::svt::IEditImplementation* m_pEdit; @@ -422,7 +422,7 @@ protected: virtual void implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ); }; -//================================================================== + class DbFormattedField : public DbLimitedLengthField { protected: @@ -450,7 +450,7 @@ protected: virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException); }; -//================================================================== + class DbCheckBox : public DbCellControl { public: @@ -471,7 +471,7 @@ protected: virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ); }; -//================================================================== + class DbComboBox : public DbCellControl { sal_Int16 m_nKeyType; @@ -498,7 +498,7 @@ protected: virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException); }; -//================================================================== + class DbListBox :public DbCellControl { sal_Bool m_bBound : 1; @@ -526,7 +526,7 @@ protected: virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException); }; -//================================================================== + class DbPatternField : public DbCellControl { public: @@ -555,7 +555,7 @@ private: css::uno::Reference<css::uno::XComponentContext> m_xContext; }; -//================================================================== + class DbSpinField : public DbCellControl { private: @@ -579,7 +579,7 @@ protected: ) = 0; }; -//================================================================== + class DbDateField : public DbSpinField { public: @@ -604,7 +604,7 @@ protected: virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); }; -//================================================================== + class DbTimeField : public DbSpinField { public: @@ -629,7 +629,7 @@ protected: virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); }; -//================================================================== + class DbCurrencyField : public DbSpinField { sal_Int16 m_nScale; @@ -658,7 +658,7 @@ protected: virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); }; -//================================================================== + class DbNumericField : public DbSpinField { public: @@ -683,7 +683,7 @@ protected: void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); }; -//================================================================== + class DbFilterField :public DbCellControl ,public ::svxform::OSQLParserClient @@ -726,9 +726,9 @@ protected: DECL_LINK( OnClick, void* ); }; -//================================================================== + // Base class providing the access to a grid cell -//================================================================== + typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::XControl , ::com::sun::star::form::XBoundControl > FmXGridCell_Base; @@ -832,7 +832,7 @@ private: DECL_LINK( OnWindowEvent, VclWindowEvent* ); }; -//================================================================== + class FmXDataCell : public FmXGridCell { public: @@ -855,7 +855,7 @@ protected: void UpdateFromColumn(); }; -//================================================================== + class FmXTextCell : public FmXDataCell { protected: @@ -889,7 +889,7 @@ public: {return m_pCellControl->GetFormatText(_rxField, xFormatter, ppColor);} }; -//================================================================== + typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::XTextComponent , ::com::sun::star::form::XChangeBroadcaster > FmXEditCell_Base; @@ -947,7 +947,7 @@ private: void onTextChanged(); }; -//================================================================== + typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::XCheckBox , ::com::sun::star::awt::XButton > FmXCheckBoxCell_Base; @@ -993,7 +993,7 @@ protected: virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); }; -//================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XListBox > FmXListBoxCell_Base; class FmXListBoxCell :public FmXTextCell @@ -1047,7 +1047,7 @@ protected: DECL_LINK( OnDoubleClick, void* ); }; -//================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XComboBox > FmXComboBoxCell_Base; class FmXComboBoxCell :public FmXTextCell @@ -1090,7 +1090,7 @@ protected: virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); }; -//================================================================== + typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::XTextComponent , ::com::sun::star::lang::XUnoTunnel > FmXFilterCell_Base; diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx index 96dfc57ea6ba..a3881dad6510 100644 --- a/svx/source/inc/gridcols.hxx +++ b/svx/source/inc/gridcols.hxx @@ -45,7 +45,7 @@ #define TYPE_TEXTFIELD 8 #define TYPE_TIMEFIELD 9 -//------------------------------------------------------------------------------ + sal_Int32 getColumnTypeByModelName(const OUString& aModelName); diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx index bad688cf22f9..6ddbbc56fb4e 100644 --- a/svx/source/inc/recoveryui.hxx +++ b/svx/source/inc/recoveryui.hxx @@ -37,7 +37,7 @@ namespace svxdr = ::svx::DocRecovery; class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo , css::frame::XSynchronousDispatch > // => XDispatch! { - //------------------------------------------- + // const, types, etcpp. private: @@ -50,7 +50,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo E_DO_CRASHREPORT }; - //------------------------------------------- + // member private: @@ -66,19 +66,19 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo /** @short TODO */ css::uno::Reference< css::task::XStatusIndicatorFactory > m_xProgressFactory; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short TODO */ RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >& xContext); - //--------------------------------------- + /** @short TODO */ virtual ~RecoveryUI(); - //--------------------------------------- + // css.lang.XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -90,12 +90,12 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); - //--------------------------------------- + virtual com::sun::star::uno::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw(css::uno::RuntimeException); - //--------------------------------------- + // css.frame.XDispatch virtual void SAL_CALL dispatch(const css::util::URL& aURL , @@ -109,14 +109,14 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo const css::util::URL& aURL ) throw(css::uno::RuntimeException); - //--------------------------------------- + // XServiceInfo helper static OUString st_getImplementationName(); static css::uno::Sequence< OUString > st_getSupportedServiceNames(); static css::uno::Reference< css::uno::XInterface > SAL_CALL st_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - //------------------------------------------- + // helper private: diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index 60c1300261f5..e85091caa5d4 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -25,14 +25,14 @@ #include <com/sun/star/sdb/XColumnUpdate.hpp> #include <osl/diagnose.h> -//.............................................................................. + namespace svxform { -//.............................................................................. - //========================================================================== + + //= DataColumn - a class wrapping an object implementing a sdb::DataColumn service - //========================================================================== + class DataColumn { // interfaces needed for sddb::Column @@ -127,8 +127,8 @@ namespace svxform #endif // INCLUDED_SVX_SOURCE_INC_SDBDATACOLUMN_HXX -//.............................................................................. + } // namespace svxform -//.............................................................................. + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index 107edf7280b9..93bb336f8e26 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -24,14 +24,14 @@ #include "svx/ParseContext.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= OSQLParserClient - //==================================================================== + class SVX_DLLPUBLIC OSQLParserClient : public ODbtoolsClient ,public ::svxform::OParseContextClient { @@ -62,9 +62,9 @@ namespace svxform } }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx index 613c3f81966c..0a404f354b81 100644 --- a/svx/source/inc/stringlistresource.hxx +++ b/svx/source/inc/stringlistresource.hxx @@ -25,14 +25,14 @@ #include <memory> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= StringListResource - //==================================================================== + /** loads a list of strings from a resource, where the resource is of type RSC_RESOURCE, and has sub resources of type string, numbered from 1 to n */ @@ -70,9 +70,9 @@ namespace svx ::std::vector< OUString > m_aStrings; }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_STRINGLISTRESOURCE_HXX diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 71a4e2a3de45..32a9672d1e51 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -30,7 +30,7 @@ #include <svtools/transfer.hxx> #include "svx/dbtoolsclient.hxx" -//================================================================== + class FmFieldWin; class FmFieldWinListBox :public SvTreeListBox @@ -57,7 +57,7 @@ protected: using SvTreeListBox::ExecuteDrop; }; -//======================================================================== + class FmFormShell; class FmFieldWinData { @@ -66,7 +66,7 @@ public: ~FmFieldWinData(); }; -//======================================================================== + class FmFieldWin :public SfxFloatingWindow ,public SfxControllerItem ,public ::comphelper::OPropertyChangeListener @@ -119,7 +119,7 @@ protected: using SfxFloatingWindow::StateChanged; }; -//======================================================================== + class FmFieldWinMgr : public SfxChildWindow { public: diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index d8c7e2e6fbb5..d0d78912ed93 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -25,7 +25,7 @@ #include <vcl/button.hxx> -//======================================================================== + class SvxFmAbsRecWin : public NumericField { SfxToolBoxControl* m_pController; @@ -42,7 +42,7 @@ protected: }; -//======================================================================== + class SvxFmConfigWin : public SfxPopupWindow { private: @@ -57,7 +57,7 @@ public: }; -//======================================================================== + class SvxFmTbxCtlConfig : public SfxToolBoxControl { private: @@ -79,7 +79,7 @@ public: virtual SfxPopupWindow* CreatePopupWindow(); }; -//======================================================================== + class FixedText; class SvxFmTbxCtlAbsRec : public SfxToolBoxControl { @@ -95,7 +95,7 @@ public: const SfxPoolItem* pState ); }; -//======================================================================== + class SvxFmTbxCtlRecText : public SfxToolBoxControl { public: @@ -107,7 +107,7 @@ public: virtual Window* CreateItemWindow( Window* pParent ); }; -//======================================================================== + class SvxFmTbxCtlRecFromText : public SfxToolBoxControl { public: @@ -119,7 +119,7 @@ public: virtual Window* CreateItemWindow( Window* pParent ); }; -//======================================================================== + class SvxFmTbxCtlRecTotal : public SfxToolBoxControl { FixedText* pFixedText; @@ -135,7 +135,7 @@ public: const SfxPoolItem* pState ); }; -//======================================================================== + class SvxFmTbxNextRec : public SfxToolBoxControl { public: @@ -143,7 +143,7 @@ public: SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -//======================================================================== + class SvxFmTbxPrevRec : public SfxToolBoxControl { public: diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx index c21f2b1e06fa..68bebd91d04c 100644 --- a/svx/source/inc/typeconversionclient.hxx +++ b/svx/source/inc/typeconversionclient.hxx @@ -22,14 +22,14 @@ #include "svx/dbtoolsclient.hxx" -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= OTypeConversionClient - //==================================================================== + class OTypeConversionClient : public ODbtoolsClient { protected: @@ -40,7 +40,7 @@ namespace svxform public: OTypeConversionClient(); - // -------------------------------------------------------- + inline ::com::sun::star::util::Date getStandardDate() const { ::com::sun::star::util::Date aReturn; @@ -49,7 +49,7 @@ namespace svxform return aReturn; } - // -------------------------------------------------------- + inline double getValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant, const ::com::sun::star::util::Date& _rNullDate ) const @@ -60,7 +60,7 @@ namespace svxform return nReturn; } - // -------------------------------------------------------- + inline OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, @@ -75,9 +75,9 @@ namespace svxform } }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_TYPECONVERSIONCLIENT_HXX diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index 2e1d48f2d93f..61296b1e939a 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -24,14 +24,14 @@ #include <svtools/genericunodialog.hxx> #include <comphelper/proparrhlp.hxx> -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= OAddConditionDialog - //==================================================================== + typedef ::svt::OGenericUnoDialog OAddConditionDialogBase; class OAddConditionDialog :public OAddConditionDialogBase @@ -74,9 +74,9 @@ namespace svxform virtual void executedDialog(sal_Int16 _nExecutionResult); }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_SOURCE_INC_XFM_ADDCONDITION_HXX diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index ace0d31fad9b..91c2282343c7 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -30,11 +30,11 @@ TYPEINIT1_FACTORY( SvxBitmapListItem, SfxPoolItem , new SvxBitmapListItem ); TYPEINIT1_FACTORY( SvxDashListItem, SfxPoolItem , new SvxDashListItem ); TYPEINIT1_FACTORY( SvxLineEndListItem, SfxPoolItem , new SvxLineEndListItem ); -//================================================================== -// + + // SvxColorListItem -// -//================================================================== + + SvxColorListItem::SvxColorListItem() { @@ -98,11 +98,11 @@ bool svtype::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) \ QUERY_PUT_IMPL( SvxColorListItem, ColorList ) -//================================================================== -// + + // SvxGradientListItem -// -//================================================================== + + SvxGradientListItem::SvxGradientListItem() { @@ -151,11 +151,11 @@ SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxGradientListItem, GradientList ) -//================================================================== -// + + // SvxHatchListItem -// -//================================================================== + + SvxHatchListItem::SvxHatchListItem() { @@ -205,11 +205,11 @@ SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxHatchListItem, HatchList ) -//================================================================== -// + + // SvxBitmapListItem -// -//================================================================== + + SvxBitmapListItem::SvxBitmapListItem() { @@ -252,11 +252,11 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxBitmapListItem, BitmapList ) -//================================================================== -// + + // SvxDashListItem -// -//================================================================== + + SvxDashListItem::SvxDashListItem() : pDashList( 0 ) @@ -300,11 +300,11 @@ SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxDashListItem, DashList ) -//================================================================== -// + + // SvxLineEndListItem -// -//================================================================== + + SvxLineEndListItem::SvxLineEndListItem() { diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index f4921b7be86b..df4b83ac1c44 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -///////////////////////////////////////////////////////////////// + SFX_IMPL_TOOLBOX_CONTROL( SvxClipBoardControl, SfxVoidItem /*SfxUInt16Item*/ ); @@ -147,6 +147,6 @@ void SvxClipBoardControl::DelPopup() } -///////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx index 48f28849f7fc..58e2ac34fa0f 100644 --- a/svx/source/sdr/animation/animationstate.cxx +++ b/svx/source/sdr/animation/animationstate.cxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/animatedprimitive2d.hxx> #include <drawinglayer/animation/animationtiming.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx index 25153a1200a5..10d79563b3ef 100644 --- a/svx/source/sdr/animation/objectanimator.cxx +++ b/svx/source/sdr/animation/objectanimator.cxx @@ -20,7 +20,7 @@ #include <svx/sdr/animation/objectanimator.hxx> #include <svx/sdr/animation/animationstate.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index 9e306dd06e62..d7d44184c78a 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -21,7 +21,7 @@ #include <vector> -////////////////////////////////////////////////////////////////////////////// + // event class namespace sdr @@ -66,7 +66,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + // eventlist class namespace sdr @@ -152,7 +152,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + // scheduler class namespace sdr diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx b/svx/source/sdr/attribute/sdrfilltextattribute.cxx index 80dfd67efa54..7dae8201a8a6 100644 --- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx +++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx @@ -20,7 +20,7 @@ #include <svx/sdr/attribute/sdrfilltextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index b0ee633c9938..fd1467f0b0b8 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -45,7 +45,7 @@ #include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx> #include <com/sun/star/drawing/LineCap.hpp> -////////////////////////////////////////////////////////////////////////////// + // helper to get line, stroke and transparence attributes from SfxItemSet namespace @@ -140,7 +140,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx index 43384b15d964..659cd3ea28af 100644 --- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx @@ -22,7 +22,7 @@ #include <drawinglayer/attribute/lineattribute.hxx> #include <drawinglayer/attribute/strokeattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx index 555a51199080..9f52a9d747b5 100644 --- a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx @@ -20,7 +20,7 @@ #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx index f267153cdbf7..4268c8bff26c 100644 --- a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx @@ -20,7 +20,7 @@ #include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx index a1dbd1badedc..44b084a2e76a 100644 --- a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx @@ -20,7 +20,7 @@ #include <svx/sdr/attribute/sdrshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx index ee5e1a2b027c..e6f6a6deb141 100644 --- a/svx/source/sdr/attribute/sdrtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrtextattribute.cxx @@ -26,7 +26,7 @@ #include <editeng/flditem.hxx> #include <svx/sdr/properties/properties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx index 72d7aa779640..13e434c5aed7 100644 --- a/svx/source/sdr/contact/displayinfo.cxx +++ b/svx/source/sdr/contact/displayinfo.cxx @@ -19,7 +19,7 @@ #include <svx/sdr/contact/displayinfo.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index 46fec7ed0509..1d3dca64c04c 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -26,11 +26,11 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/animation/objectanimator.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 28c4be55265e..493ad02d3e5d 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -28,7 +28,7 @@ #include <drawinglayer/processor2d/processor2dtools.hxx> #include <svx/unoapi.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -45,7 +45,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -167,7 +167,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index bbc69ed7a4ab..e5f0b7a42276 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -35,11 +35,11 @@ #include <drawinglayer/processor2d/processor2dtools.hxx> #include <svx/unoapi.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx index e1d3087913d3..98db5cfb51f2 100644 --- a/svx/source/sdr/contact/sdrmediawindow.hxx +++ b/svx/source/sdr/contact/sdrmediawindow.hxx @@ -23,9 +23,9 @@ namespace sdr { namespace contact { -// ------------------ + // - SdrMediaWindow - -// ------------------ + class ViewObjectContactOfSdrMediaObj; diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index ff89ac6eaf39..b6c64c3ef1a7 100644 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx @@ -28,7 +28,7 @@ #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <tools/debug.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -255,7 +255,7 @@ namespace sdr return 0L; } - ////////////////////////////////////////////////////////////////////////////// + // primitive stuff drawinglayer::primitive2d::Primitive2DSequence ViewContact::createViewIndependentPrimitive2DSequence() const diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx index 392b1286e1ae..f4f22b98ff67 100644 --- a/svx/source/sdr/contact/viewcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewcontactofe3d.cxx @@ -30,7 +30,7 @@ #include <drawinglayer/attribute/sdrlightattribute3d.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace { @@ -67,7 +67,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx index b6883dd1be3a..5a99ff820009 100644 --- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx @@ -25,7 +25,7 @@ #include <svx/sdr/primitive3d/sdrattributecreator3d.hxx> #include <basegfx/range/b3drange.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx index 12cbd9679b12..fd5bd0fc5ddb 100644 --- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx @@ -25,7 +25,7 @@ #include <svx/sdr/primitive3d/sdrattributecreator3d.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx index ef8425c5282d..6899bf77f1fa 100644 --- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx @@ -25,7 +25,7 @@ #include <svx/sdr/primitive3d/sdrattributecreator3d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx index d59d0c2c538d..25fa18f61bb7 100644 --- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx @@ -26,7 +26,7 @@ #include <basegfx/polygon/b3dpolygon.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index 4e3c60410774..e82bcdc97bba 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -34,11 +34,11 @@ #include <drawinglayer/primitive3d/transformprimitive3d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace { @@ -136,7 +136,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx index 927444afb143..fdc5e6f11604 100644 --- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx @@ -24,7 +24,7 @@ #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/primitive3d/sdrattributecreator3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index af3609f9291b..a5d65724396b 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -46,7 +46,7 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx index ce1e92373064..4bed2eac6a6b 100644 --- a/svx/source/sdr/contact/viewcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewcontactofgroup.cxx @@ -28,7 +28,7 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx index 96f7c1d3afa9..0732c71ef5a4 100644 --- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx @@ -36,7 +36,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx index 210de687a48a..ec7ae8eca5ca 100644 --- a/svx/source/sdr/contact/viewcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx @@ -29,7 +29,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 3f06f2c5a243..95f9e008ab9c 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx @@ -24,7 +24,7 @@ #include <svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -////////////////////////////////////////////////////////////////////////////// + // includes for special text box shadow (SC) #include <svl/itemset.hxx> @@ -36,7 +36,7 @@ #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx index 5289f5e3a734..146ed9cf5505 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx @@ -26,7 +26,7 @@ #include <svx/sxciaitm.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx index 8385fb05a07d..47e61c0c4a7f 100644 --- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx @@ -24,7 +24,7 @@ #include <svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx index 869d248bbf37..ab391477f676 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx @@ -29,7 +29,7 @@ #include <svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx> #include <svx/sxmtpitm.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 72c4c608cf97..551a09eeea28 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -34,7 +34,7 @@ #include <svx/sdrpaintwindow.hxx> #include <svx/svdhdl.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -137,7 +137,7 @@ namespace sdr return &GetSdrObject(); } - ////////////////////////////////////////////////////////////////////////////// + // primitive stuff // add Gluepoints (if available) diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 7aa29cb5a47b..372988e68049 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -29,7 +29,7 @@ #include <svx/obj3d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx index 9be07d1c25f4..4f852cbdacbb 100644 --- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx @@ -34,7 +34,7 @@ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <svx/charthelper.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index ff5bed42ca2d..265cd6d03eff 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -41,7 +41,7 @@ #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -68,7 +68,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -106,7 +106,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -188,7 +188,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -269,7 +269,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -312,7 +312,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -381,7 +381,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -435,7 +435,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -490,7 +490,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -523,7 +523,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -556,7 +556,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -700,12 +700,12 @@ namespace sdr // Only add front versions of grid and helplines since no visibility test is done, // so adding the back incarnations is not necessary. This makes the Front // visualisation the default when no visibility tests are done. - // + // Since we have no view here, no grid and helpline definitions are available currently. The used // methods at ViewContactOfHelplines and ViewContactOfGrid return only empty sequences and // do not need to be called ATM. This may change later if grid or helpline info gets // model data (it should not). Keeping the lines commented to hold this hint. - // + // drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfGridFront.getViewIndependentPrimitive2DSequence()); // drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfHelplinesFront.getViewIndependentPrimitive2DSequence()); diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index f3cc4e2c4ac5..db0a39f15ffd 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx @@ -25,7 +25,7 @@ #include <svx/sdr/primitive2d/sdrpathprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx index b4088772039f..fd0e6b005bf0 100644 --- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx @@ -27,7 +27,7 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <svx/svdmodel.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactoftextobj.cxx b/svx/source/sdr/contact/viewcontactoftextobj.cxx index c4bdd6aef8eb..e35c3bdf51af 100644 --- a/svx/source/sdr/contact/viewcontactoftextobj.cxx +++ b/svx/source/sdr/contact/viewcontactoftextobj.cxx @@ -20,7 +20,7 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdotext.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index 60ffec16afbd..840b97a9f427 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -36,9 +36,9 @@ #include <drawinglayer/primitive2d/controlprimitive2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> -//........................................................................ + namespace sdr { namespace contact { -//........................................................................ + using ::com::sun::star::awt::XControl; using ::com::sun::star::uno::Reference; @@ -48,9 +48,9 @@ namespace sdr { namespace contact { using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Exception; - //==================================================================== + //= ViewContactOfUnoControl - //==================================================================== + class ViewContactOfUnoControl_Impl { public: @@ -72,9 +72,9 @@ namespace sdr { namespace contact { { } - //==================================================================== + //= ViewContactOfUnoControl - //==================================================================== + DBG_NAME( ViewContactOfUnoControl ) ViewContactOfUnoControl::ViewContactOfUnoControl( SdrUnoObj& _rUnoObject ) @@ -166,8 +166,8 @@ namespace sdr { namespace contact { } } -//........................................................................ + } } // namespace sdr::contact -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofvirtobj.cxx b/svx/source/sdr/contact/viewcontactofvirtobj.cxx index 1008af516a4b..a43c641cf34f 100644 --- a/svx/source/sdr/contact/viewcontactofvirtobj.cxx +++ b/svx/source/sdr/contact/viewcontactofvirtobj.cxx @@ -25,7 +25,7 @@ #include <vcl/outdev.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -52,12 +52,12 @@ namespace sdr // sub-hierarchy, even when they are group objects. This is necessary // to avoid that the same VOCs will be added to the draw hierarchy // twice which leads to problems. - // + // This solution is only a first solution to get things running. Later // this needs to be replaced with creating real VOCs for the objects // referenced by virtual objects to avoid the 'trick' of setting the // offset for painting at the destination OutputDevive. - // + // As can be seen, with primitives, the problem will be solved using // a transformPrimitive, so this solution can stay with primitives. return 0L; diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index d0705428eeb5..6a18ad65a8f9 100644 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx @@ -33,11 +33,11 @@ #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace { @@ -155,7 +155,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx index f929aec52d06..828b990d8cf3 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx @@ -26,10 +26,10 @@ #include <drawinglayer/primitive2d/embedded3dprimitive2d.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx index 196e2d7a7fda..b105137e0621 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx @@ -29,11 +29,11 @@ #include <svx/sdr/contact/viewobjectcontactofe3d.hxx> #include <basegfx/tools/canvastools.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace { @@ -53,7 +53,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index b0c4d7cc4f31..09a01158b925 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -26,7 +26,7 @@ #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -67,7 +67,7 @@ namespace sdr } // end of namespace event } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx index 724b77ea5ba4..688e5c5c589c 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx @@ -27,11 +27,11 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <svx/svdobj.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx index 7f9f7a355afb..20b84e4564c5 100644 --- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx @@ -29,7 +29,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index e830bf8199b2..7dc5b7e03989 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -34,11 +34,11 @@ #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -196,7 +196,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index 62dd879c8c21..8a4a20b7dd96 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -31,7 +31,7 @@ #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { namespace contact { diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx index 77c97cd431d0..3466acfbd393 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx @@ -28,7 +28,7 @@ #include "fmobj.hxx" -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx index cad3b14d9df3..d0fbbeb8ef62 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx @@ -31,11 +31,11 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx index 3a93368ffcec..d336a7dd734b 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx @@ -32,11 +32,11 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <svx/sdr/primitive2d/sdrprimitivetools.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -94,7 +94,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -164,7 +164,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -199,7 +199,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -270,7 +270,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -321,7 +321,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -362,7 +362,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -414,7 +414,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -461,7 +461,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -547,7 +547,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -652,7 +652,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 0659051844a3..8022252c32e7 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -103,9 +103,9 @@ form controls being in redlining or in hidden section are visible in alive-mode */ -//........................................................................ + namespace sdr { namespace contact { -//........................................................................ + using namespace ::com::sun::star::awt::InvalidateStyle; using ::com::sun::star::uno::Reference; @@ -141,9 +141,9 @@ namespace sdr { namespace contact { using ::com::sun::star::container::ContainerEvent; using ::com::sun::star::uno::Any; - //==================================================================== + //= ControlHolder - //==================================================================== + class ControlHolder { private: @@ -310,9 +310,9 @@ namespace sdr { namespace contact { return aZoom; } - //==================================================================== + //= UnoControlContactHelper - //==================================================================== + class UnoControlContactHelper { public: @@ -388,9 +388,9 @@ namespace sdr { namespace contact { _rControl.clear(); } - //==================================================================== + //= IPageViewAccess - //==================================================================== + /** interface encapsulating access to an SdrPageView, stripped down to the methods we really need */ class IPageViewAccess @@ -413,9 +413,9 @@ namespace sdr { namespace contact { ~IPageViewAccess() {} }; - //==================================================================== + //= SdrPageViewAccess - //==================================================================== + /** is a ->IPageViewAccess implementation based on a real ->SdrPageView instance */ class SdrPageViewAccess : public IPageViewAccess @@ -453,9 +453,9 @@ namespace sdr { namespace contact { return m_rPageView.GetVisibleLayers().IsSet( _nLayerID ); } - //==================================================================== + //= InvisibleControlViewAccess - //==================================================================== + /** is a ->IPageViewAccess implementation which can be used to create an invisble control for an arbitrary window */ @@ -502,9 +502,9 @@ namespace sdr { namespace contact { return false; } - //==================================================================== + //= DummyPageViewAccess - //==================================================================== + /** is a ->IPageViewAccess implementation which can be used to create a control for an arbitrary non-Window device @@ -545,9 +545,9 @@ namespace sdr { namespace contact { return true; } - //==================================================================== + //= ViewObjectContactOfUnoControl_Impl - //==================================================================== + typedef ::cppu::WeakImplHelper4 < XWindowListener , XPropertyChangeListener , XContainerListener @@ -864,9 +864,9 @@ namespace sdr { namespace contact { ViewObjectContactOfUnoControl_Impl& operator=( const ViewObjectContactOfUnoControl_Impl& ); // never implemented }; - //==================================================================== + //= LazyControlCreationPrimitive2D - //==================================================================== + class LazyControlCreationPrimitive2D : public ::drawinglayer::primitive2d::BufferedDecompositionPrimitive2D { private: @@ -919,9 +919,9 @@ namespace sdr { namespace contact { ::basegfx::B2DHomMatrix m_aTransformation; }; - //==================================================================== + //= ViewObjectContactOfUnoControl_Impl - //==================================================================== + DBG_NAME( ViewObjectContactOfUnoControl_Impl ) ViewObjectContactOfUnoControl_Impl::ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl ) @@ -1122,7 +1122,7 @@ namespace sdr { namespace contact { // Creating the control triggered an Window::Update on some of its child windows, which triggered a // Paint on parent of the grid control (e.g. the SwEditWin), which triggered a reentrant call to this method, // which it is not really prepared for. - // + // /me thinks that re-entrance should be caught on a higher level, i.e. the Drawing Layer should not allow // reentrant paint requests. For the moment, until /me can discuss this with AW, catch it here. // 2009-08-27 / #i104544# frank.schoenheit@sun.com @@ -1587,9 +1587,9 @@ namespace sdr { namespace contact { } } - //==================================================================== + //= LazyControlCreationPrimitive2D - //==================================================================== + bool LazyControlCreationPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const { @@ -1700,9 +1700,9 @@ namespace sdr { namespace contact { ImplPrimitive2DIDBlock( LazyControlCreationPrimitive2D, PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D ) - //==================================================================== + //= ViewObjectContactOfUnoControl - //==================================================================== + DBG_NAME( ViewObjectContactOfUnoControl ) ViewObjectContactOfUnoControl::ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact ) @@ -1876,9 +1876,9 @@ namespace sdr { namespace contact { flushPrimitive2DSequence(); } - //==================================================================== + //= UnoControlPrintOrPreviewContact - //==================================================================== + DBG_NAME( UnoControlPrintOrPreviewContact ) UnoControlPrintOrPreviewContact::UnoControlPrintOrPreviewContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact ) @@ -1901,8 +1901,8 @@ namespace sdr { namespace contact { return ViewObjectContactOfUnoControl::createPrimitive2DSequence( rDisplayInfo ); } -//........................................................................ + } } // namespace sdr::contact -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactredirector.cxx b/svx/source/sdr/contact/viewobjectcontactredirector.cxx index ab18ff577bfa..375e0fb4da80 100644 --- a/svx/source/sdr/contact/viewobjectcontactredirector.cxx +++ b/svx/source/sdr/contact/viewobjectcontactredirector.cxx @@ -21,7 +21,7 @@ #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/viewcontact.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index 9dab9cb7b921..0c31a9dd1be5 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -24,7 +24,7 @@ #include <algorithm> #include <tools/debug.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -43,7 +43,7 @@ namespace sdr } // end of namespace mixer } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -117,7 +117,7 @@ namespace sdr } // end of namespace mixer } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx index 7ea80b607a6f..3e351d54818c 100644 --- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx +++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx @@ -23,7 +23,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/overlay/overlaytools.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx index 31aca7ab198a..702db3a18bdc 100644 --- a/svx/source/sdr/overlay/overlaybitmapex.cxx +++ b/svx/source/sdr/overlay/overlaybitmapex.cxx @@ -23,7 +23,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/overlay/overlaytools.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx index bb126d9c7818..c24de94c66d6 100644 --- a/svx/source/sdr/overlay/overlaycrosshair.cxx +++ b/svx/source/sdr/overlay/overlaycrosshair.cxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlaytools.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx index f0dee820a8d8..f54046cbbfa6 100644 --- a/svx/source/sdr/overlay/overlayhelpline.cxx +++ b/svx/source/sdr/overlay/overlayhelpline.cxx @@ -23,7 +23,7 @@ #include <svx/sdr/overlay/overlaytools.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx index fa9d2d0c8cc1..c1967d7bc825 100644 --- a/svx/source/sdr/overlay/overlayline.cxx +++ b/svx/source/sdr/overlay/overlayline.cxx @@ -26,7 +26,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 6bb912ecff92..bcd2818d8fa5 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -27,11 +27,11 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index 1ff7cb927937..dabb5cc539c0 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -29,7 +29,7 @@ #include <vcl/cursor.hxx> #include <vcl/dibtools.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -148,7 +148,7 @@ namespace sdr //Region aRegionPixel(rRegionPixel); //RegionHandle aRegionHandle(aRegionPixel.BeginEnumRects()); //Rectangle aRegionRectanglePixel; - // + //while(aRegionPixel.GetEnumRects(aRegionHandle, aRegionRectanglePixel)) //{ #ifdef DBG_U//TIL @@ -160,17 +160,17 @@ namespace sdr // getOutputDevice().SetFillColor(); // getOutputDevice().DrawRect(aRegionRectanglePixel); // } -#endif // +#endif // // restore the area // const Point aTopLeft(aRegionRectanglePixel.TopLeft()); // const Size aSize(aRegionRectanglePixel.GetSize()); - // + // getOutputDevice().DrawOutDev( // aTopLeft, aSize, // destination // aTopLeft, aSize, // source // maBufferDevice); //} - // + //aRegionPixel.EndEnumRects(aRegionHandle); // restore MapModes @@ -230,20 +230,20 @@ namespace sdr //RegionHandle aRegionHandle(aRegion.BeginEnumRects()); //Rectangle aRegionRectanglePixel; - // + //while(aRegion.GetEnumRects(aRegionHandle, aRegionRectanglePixel)) //{ // // for each rectangle, save the area // Point aTopLeft(aRegionRectanglePixel.TopLeft()); // Size aSize(aRegionRectanglePixel.GetSize()); - // + // maBufferDevice.DrawOutDev( // aTopLeft, aSize, // destination // aTopLeft, aSize, // source // rSource); - // + //} - // + //aRegion.EndEnumRects(aRegionHandle); // restore MapModes diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 292cb5a0c220..8a5c53cdd0f4 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -28,7 +28,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -183,7 +183,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx index 4907198d7d0c..5b949c3be81a 100644 --- a/svx/source/sdr/overlay/overlayobjectlist.cxx +++ b/svx/source/sdr/overlay/overlayobjectlist.cxx @@ -29,7 +29,7 @@ #include <drawinglayer/processor2d/hittestprocessor2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx index f85021c7e797..cacb03f52b93 100644 --- a/svx/source/sdr/overlay/overlaypolypolygon.cxx +++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx @@ -24,7 +24,7 @@ #include <svx/sdr/overlay/overlaymanager.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx index 33dcbc3a19b4..c62234355dd0 100644 --- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx +++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx @@ -22,7 +22,7 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx index 557179d15e47..e3e7c8f7b1e3 100644 --- a/svx/source/sdr/overlay/overlayrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrectangle.cxx @@ -27,7 +27,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -121,4 +121,4 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx index 496cec8d320f..6ccaf890c95e 100644 --- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx @@ -26,7 +26,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index 1f2a39671c98..e5de59702ade 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -30,7 +30,7 @@ #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index da248ac5166d..b63eb2cb51ea 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -32,7 +32,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -123,7 +123,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -196,7 +196,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -330,7 +330,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -448,7 +448,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index ec597167aa84..43afc3a83f21 100644 --- a/svx/source/sdr/overlay/overlaytriangle.cxx +++ b/svx/source/sdr/overlay/overlaytriangle.cxx @@ -27,7 +27,7 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 0e58190801b1..ea4bbb9ed2c3 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -76,7 +76,7 @@ #include <svx/sdr/attribute/sdrfilltextattribute.hxx> #include <com/sun/star/drawing/LineCap.hpp> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -210,7 +210,7 @@ namespace drawinglayer } // end of anonymous namespace } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index 769d3ace3f8e..e8334a9964cd 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -24,11 +24,11 @@ #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index 7bd7649a6851..dc49f629a777 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -25,11 +25,11 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index b48dc9fe81bc..c5c8271ffa94 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -25,11 +25,11 @@ #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -62,7 +62,7 @@ namespace drawinglayer // 3D shapes shadow will be set at the individual created // visualisation objects and be visualized by the 3d renderer // as a single shadow. - // + // The shadow for AutoShapes could be handled uniformely by not setting any // shadow items at the helper model objects and only adding shadow here for // 2D and 3D (and it works, too), but this would lead to two 3D scenes for diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index 486d26df9054..5d48cbc6b454 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -45,11 +45,11 @@ #include <drawinglayer/attribute/sdrlinestartendattribute.hxx> #include <drawinglayer/attribute/sdrshadowattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index 6139d84d1c4f..2c7c3839a1dc 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -27,11 +27,11 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -138,7 +138,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index e76d1f413802..86dce144e026 100644 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx @@ -29,11 +29,11 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index 6fe747a1aaee..9f0ca124c114 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -24,11 +24,11 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index 024336e85e4c..17aad02941eb 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -28,7 +28,7 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index 7f213fa2a724..001e053585cc 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -24,11 +24,11 @@ #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx index bc4296f504b8..518af371d4fe 100644 --- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx +++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx @@ -22,7 +22,7 @@ #include <osl/mutex.hxx> #include <vcl/lazydelete.hxx> -////////////////////////////////////////////////////////////////////////////// + // helper methods namespace drawinglayer diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index 8568589faafe..c5aa91fe120e 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -25,11 +25,11 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index cf8dc1ce4fdb..18e13a0d5db7 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -32,11 +32,11 @@ #include <svx/svdoutl.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace { @@ -84,7 +84,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -245,7 +245,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -298,7 +298,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -354,7 +354,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -431,7 +431,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -480,7 +480,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer - ////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index 8e51e25bbffb..d81a89b412ed 100644 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx @@ -28,7 +28,7 @@ #include <drawinglayer/attribute/materialattribute3d.hxx> #include <drawinglayer/attribute/sdrobjectattribute3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index a9d047922711..484a1d1e475a 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -43,7 +43,7 @@ // #114265# #include <svl/smplhint.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index 6dc2bfcf66cc..8e9f856ededb 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -24,7 +24,7 @@ #include <editeng/eeitem.hxx> #include <svx/svdocapt.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index 7a916b847eec..7b80fdbafb54 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -26,7 +26,7 @@ #include <svx/sxcikitm.hxx> #include <svx/sxciaitm.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index b5c04880031d..76b1c71e0911 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -24,7 +24,7 @@ #include <editeng/eeitem.hxx> #include <svx/svdoedge.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 6309e5bcf909..0cc2ab1a89c1 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -26,7 +26,7 @@ #include <svl/whiter.hxx> #include <svl/smplhint.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index f4f810cc0118..0679dc38abce 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -28,7 +28,7 @@ #include <svx/svdpool.hxx> #include <editeng/eeitem.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx index c265ca926eb3..d116e88bb706 100644 --- a/svx/source/sdr/properties/e3dcompoundproperties.cxx +++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx @@ -22,7 +22,7 @@ #include <svx/obj3d.hxx> #include <svx/scene3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx index 211868b33572..021df870bf61 100644 --- a/svx/source/sdr/properties/e3dextrudeproperties.cxx +++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx @@ -21,7 +21,7 @@ #include <svl/itemset.hxx> #include <svx/extrud3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx index 3ba9f104b0d3..e7ec4457fe94 100644 --- a/svx/source/sdr/properties/e3dlatheproperties.cxx +++ b/svx/source/sdr/properties/e3dlatheproperties.cxx @@ -21,7 +21,7 @@ #include <svl/itemset.hxx> #include <svx/lathe3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx index bf368d1cd938..49a39caea9a6 100644 --- a/svx/source/sdr/properties/e3dproperties.cxx +++ b/svx/source/sdr/properties/e3dproperties.cxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/obj3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 830accbd501d..b6a22e3cb8a3 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -24,7 +24,7 @@ #include <svx/scene3d.hxx> #include <svx/svditer.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx index e2f72d37ebfa..81154b02a338 100644 --- a/svx/source/sdr/properties/e3dsphereproperties.cxx +++ b/svx/source/sdr/properties/e3dsphereproperties.cxx @@ -21,7 +21,7 @@ #include <svl/itemset.hxx> #include <svx/sphere3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index 957856c820b1..2db4aa294333 100644 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx @@ -24,7 +24,7 @@ #include <svx/svdobj.hxx> #include <svx/svdpool.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index ad12924a1009..4b509634fe12 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -25,7 +25,7 @@ #include <svx/svdograf.hxx> #include <svx/sdgcpitm.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index cfd960878a12..6b449e5dc0ca 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -26,7 +26,7 @@ #include <svx/svdpool.hxx> #include <svx/svdpage.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index 5c4d9ab7b564..352f96780d5d 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -25,7 +25,7 @@ #include <svx/svditer.hxx> #include <vcl/region.hxx> -////////////////////////////////////////////////////////////////////////////// + // class to remember broadcast start positions namespace sdr @@ -91,7 +91,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index eb1f14397046..a172f9d08922 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -31,7 +31,7 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx index 02ab254a890e..9ae5bd19c87c 100644 --- a/svx/source/sdr/properties/oleproperties.cxx +++ b/svx/source/sdr/properties/oleproperties.cxx @@ -23,7 +23,7 @@ #include <svx/xfillit0.hxx> #include <svx/xlineit0.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index e96a537e790c..89714eacbc3a 100644 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx @@ -22,7 +22,7 @@ #include <svx/svdobj.hxx> #include <svx/svdpool.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index a4bbb722f3ae..2057a21e0bbf 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -24,7 +24,7 @@ #include <svx/svditer.hxx> #include <svx/xfillit0.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx index 313a3662324d..dcd6e943ef54 100644 --- a/svx/source/sdr/properties/rectangleproperties.cxx +++ b/svx/source/sdr/properties/rectangleproperties.cxx @@ -20,7 +20,7 @@ #include <svx/sdr/properties/rectangleproperties.hxx> #include <svx/svdorect.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 9c766548c073..fc1c7c850678 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -36,7 +36,7 @@ #include <svx/xlnwtit.hxx> #include <svx/svdpool.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src index 888d33bb1f50..c0be9722a459 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.src +++ b/svx/source/sidebar/area/AreaPropertyPanel.src @@ -170,7 +170,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR }; FixedText FT_TRGR_BORDER { - Size = MAP_APPFONT ( CONTROL_WIDTH * 2 + POPUPPANEL_MARGIN_HORIZONTAL + CONTROL_SPACING_HORIZONTAL, FIXED_TEXT_HEIGHT ) ; // + Size = MAP_APPFONT ( CONTROL_WIDTH * 2 + POPUPPANEL_MARGIN_HORIZONTAL + CONTROL_SPACING_HORIZONTAL, FIXED_TEXT_HEIGHT ) ; Text [ en-US ] = "~Border:"; }; MetricField MTR_TRGR_BORDER @@ -188,7 +188,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR Last = 100 ; SpinSize = 5 ; }; - //===================================================================================================================================== + ToolBox BTN_LEFT_SECOND { diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index af33a5414160..7a773eeb2154 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -31,12 +31,12 @@ using namespace css; using namespace cssu; using ::sfx2::sidebar::Theme; -////////////////////////////////////////////////////////////////////////////// + // namespace open namespace svx { namespace sidebar { -////////////////////////////////////////////////////////////////////////////// + GraphicPropertyPanel::GraphicPropertyPanel( Window* pParent, @@ -65,13 +65,13 @@ GraphicPropertyPanel::GraphicPropertyPanel( Initialize(); } -////////////////////////////////////////////////////////////////////////////// + GraphicPropertyPanel::~GraphicPropertyPanel() { } -////////////////////////////////////////////////////////////////////////////// + void GraphicPropertyPanel::Initialize() { @@ -124,7 +124,7 @@ void GraphicPropertyPanel::Initialize() -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK( GraphicPropertyPanel, ModifyBrightnessHdl, void *, EMPTYARG ) { @@ -134,7 +134,7 @@ IMPL_LINK( GraphicPropertyPanel, ModifyBrightnessHdl, void *, EMPTYARG ) return 0L; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK( GraphicPropertyPanel, ModifyContrastHdl, void *, EMPTYARG ) { @@ -144,7 +144,7 @@ IMPL_LINK( GraphicPropertyPanel, ModifyContrastHdl, void *, EMPTYARG ) return 0L; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK( GraphicPropertyPanel, ModifyTransHdl, void *, EMPTYARG ) { @@ -154,7 +154,7 @@ IMPL_LINK( GraphicPropertyPanel, ModifyTransHdl, void *, EMPTYARG ) return 0L; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl ) { @@ -164,7 +164,7 @@ IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl ) return 0L; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK( GraphicPropertyPanel, RedHdl, void*, EMPTYARG ) { @@ -174,7 +174,7 @@ IMPL_LINK( GraphicPropertyPanel, RedHdl, void*, EMPTYARG ) return 0L; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK( GraphicPropertyPanel, GreenHdl, void*, EMPTYARG ) { @@ -184,7 +184,7 @@ IMPL_LINK( GraphicPropertyPanel, GreenHdl, void*, EMPTYARG ) return 0L; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(GraphicPropertyPanel, BlueHdl, void *, EMPTYARG) { @@ -194,7 +194,7 @@ IMPL_LINK(GraphicPropertyPanel, BlueHdl, void *, EMPTYARG) return 0L; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(GraphicPropertyPanel, GammaHdl, void *, EMPTYARG) { @@ -204,7 +204,7 @@ IMPL_LINK(GraphicPropertyPanel, GammaHdl, void *, EMPTYARG) return 0L; } -////////////////////////////////////////////////////////////////////////////// + void GraphicPropertyPanel::SetupIcons(void) { @@ -218,7 +218,7 @@ void GraphicPropertyPanel::SetupIcons(void) } } -////////////////////////////////////////////////////////////////////////////// + GraphicPropertyPanel* GraphicPropertyPanel::Create ( Window* pParent, @@ -238,7 +238,7 @@ GraphicPropertyPanel* GraphicPropertyPanel::Create ( pBindings); } -////////////////////////////////////////////////////////////////////////////// + void GraphicPropertyPanel::DataChanged( const DataChangedEvent& rEvent) @@ -248,7 +248,7 @@ void GraphicPropertyPanel::DataChanged( SetupIcons(); } -////////////////////////////////////////////////////////////////////////////// + void GraphicPropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, @@ -458,17 +458,17 @@ void GraphicPropertyPanel::NotifyItemUpdate( -////////////////////////////////////////////////////////////////////////////// + SfxBindings* GraphicPropertyPanel::GetBindings() { return mpBindings; } -////////////////////////////////////////////////////////////////////////////// + // namespace close }} // end of namespace ::svx::sidebar -////////////////////////////////////////////////////////////////////////////// + // eof diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx index b9808f1b2126..78c49ce12f4d 100644 --- a/svx/source/sidebar/line/LineWidthControl.hxx +++ b/svx/source/sidebar/line/LineWidthControl.hxx @@ -50,7 +50,7 @@ private: MetricField maMFWidth; SfxMapUnit meMapUnit; OUString* rStr; - OUString mstrPT; // + OUString mstrPT; long mnCustomWidth; bool mbCustom; bool mbColseByEdit; diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 5d317f1b19d1..51c157f41f49 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -422,7 +422,7 @@ void SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt ) //End } -//=============================================================================================== + SvxNumValueSet3::SvxNumValueSet3( Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ) diff --git a/svx/source/src/app.src b/svx/source/src/app.src index b3293416502e..e33edf7fbbb5 100644 --- a/svx/source/src/app.src +++ b/svx/source/src/app.src @@ -20,7 +20,7 @@ #include <svx/svxids.hrc> #include "app.hrc" - //---------------------------------------------------------------------------- + String RID_APPTITLE { Text = "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION" ; diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index f0bdfeb24525..9981df534c05 100644 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx @@ -25,7 +25,7 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <tools/helpers.hxx> -////////////////////////////////////////////////////////////////////////////// + void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, const SdrObject* pObj) { @@ -176,7 +176,7 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons rV.maPositionB = aEndPos; } -////////////////////////////////////////////////////////////////////////////// + void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, GradTransGradient& rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst) diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index 6a293eac792a..6f027a4a79e8 100644 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx @@ -29,7 +29,7 @@ #include <svx/svdpagv.hxx> #include <svx/sdr/contact/viewcontact.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // #i101872# new Object HitTest as View-tooling SdrObject* SdrObjectPrimitiveHit( @@ -88,7 +88,7 @@ SdrObject* SdrObjectPrimitiveHit( return pResult; } -///////////////////////////////////////////////////////////////////// + SdrObject* SdrObjListPrimitiveHit( const SdrObjList& rList, @@ -112,7 +112,7 @@ SdrObject* SdrObjListPrimitiveHit( return pRetval; } -///////////////////////////////////////////////////////////////////// + bool ViewObjectContactPrimitiveHit( const sdr::contact::ViewObjectContact& rVOC, diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx index 9e8e80dd768f..8331c338b2a0 100644 --- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx +++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx @@ -26,7 +26,7 @@ #include <svx/xfillit0.hxx> #include <svl/itemset.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 3f8010a205bf..cfab3ffcd208 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -36,12 +36,12 @@ #include <svx/fmview.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + using namespace ::rtl; using namespace ::com::sun::star; -//////////////////////////////////////////////////////////////////////////////////////////////////// + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SdrPageWindow::GetControlContainer( bool _bCreateIfNecessary ) const { @@ -178,7 +178,7 @@ void SdrPageWindow::PrepareRedraw(const Region& rReg) GetPaintWindow().SetRedrawRegion(rReg); } -////////////////////////////////////////////////////////////////////////////// + // clip test #ifdef CLIPPER_TEST #include <svx/svdopath.hxx> @@ -264,7 +264,7 @@ namespace } // end of anonymous namespace #endif // CLIPPER_TEST -////////////////////////////////////////////////////////////////////////////// + void SdrPageWindow::RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedirector) const { diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 1367c0b110ea..b8b973d55edf 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -50,7 +50,7 @@ void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrPreRenderDevice::SdrPreRenderDevice(OutputDevice& rOriginal) : mrOutputDevice(rOriginal) @@ -127,12 +127,12 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const Region& rExpandedRegion) // // for each rectangle, copy the area // const Point aTopLeft(aRegionRectanglePixel.TopLeft()); // const Size aSize(aRegionRectanglePixel.GetSize()); -// + // mrOutputDevice.DrawOutDev( // aTopLeft, aSize, // aTopLeft, aSize, // maPreRenderDevice); -// + //#ifdef DBG_UTIL // // #i74769# // static bool bDoPaintForVisualControlRegion(false); @@ -145,14 +145,14 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const Region& rExpandedRegion) // } //#endif // } -// + // aRegionPixel.EndEnumRects(aRegionHandle); mrOutputDevice.EnableMapMode(bMapModeWasEnabledDest); maPreRenderDevice.EnableMapMode(bMapModeWasEnabledSource); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrPaintWindow::impCreateOverlayManager() { diff --git a/svx/source/svdraw/sdrundomanager.cxx b/svx/source/svdraw/sdrundomanager.cxx index f2a00c553d5f..cd83720ca2a4 100644 --- a/svx/source/svdraw/sdrundomanager.cxx +++ b/svx/source/svdraw/sdrundomanager.cxx @@ -18,7 +18,7 @@ #include <svx/sdrundomanager.hxx> -////////////////////////////////////////////////////////////////////////////// + SdrUndoManager::SdrUndoManager(sal_uInt16 nMaxUndoActionCount) : EditUndoManager(nMaxUndoActionCount) @@ -131,5 +131,5 @@ bool SdrUndoManager::isTextEditActive() const return maEndTextEditHdl.IsSet(); } -////////////////////////////////////////////////////////////////////////////// + // eof diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 403a8d1d9def..410c4e0bf4f3 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -641,9 +641,9 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) rItemName = ResId( nResId, *pResMgr ); } -//////////////////////////////////////////////////////////////////////////////// + // FractionItem -//////////////////////////////////////////////////////////////////////////////// + TYPEINIT1_AUTOFACTORY(SdrFractionItem,SfxPoolItem); @@ -709,9 +709,9 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const return new SdrFractionItem(Which(),GetValue()); } -//////////////////////////////////////////////////////////////////////////////// + // ScaleItem -//////////////////////////////////////////////////////////////////////////////// + TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem); @@ -751,9 +751,9 @@ SfxPoolItem* SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const return new SdrScaleItem(Which(),GetValue()); } -//////////////////////////////////////////////////////////////////////////////// + // OnOffItem -//////////////////////////////////////////////////////////////////////////////// + TYPEINIT1_AUTOFACTORY(SdrOnOffItem,SfxBoolItem); @@ -993,9 +993,9 @@ SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres, return ePres; } -//////////////////////////////////////////////////////////////////////////////// + // items of the legend object -//////////////////////////////////////////////////////////////////////////////// + TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem); @@ -1049,9 +1049,9 @@ SfxItemPresentation SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation eP return ePres; } -//////////////////////////////////////////////////////////////////////////////// + // MiscItems -//////////////////////////////////////////////////////////////////////////////// + // FitToSize TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem); diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 79985a59ee47..da1407a5d027 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -41,7 +41,7 @@ #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + class ImplConnectMarkerOverlay { @@ -116,7 +116,7 @@ ImplConnectMarkerOverlay::~ImplConnectMarkerOverlay() // OverlayManager and deletes them. } -//////////////////////////////////////////////////////////////////////////////////////////////////// + class ImpSdrCreateViewExtraData { @@ -177,11 +177,11 @@ void ImpSdrCreateViewExtraData::HideOverlay() maObjects.clear(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + // CreateView -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + void SdrCreateView::ImpClearConnectMarker() { @@ -876,7 +876,7 @@ void SdrCreateView::HideCreateObj() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index 83572a43cadc..b2282bd28ee5 100644 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx @@ -25,12 +25,12 @@ #include <svx/svddrgv.hxx> #include <svx/svddrgmt.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrDragView; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragMovHdl class SdrDragMovHdl : public SdrDragMethod @@ -51,7 +51,7 @@ public: virtual Pointer GetSdrDragPointer() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragRotate class SdrDragRotate : public SdrDragMethod @@ -77,7 +77,7 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragShear class SdrDragShear : public SdrDragMethod @@ -106,7 +106,7 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragMirror class SdrDragMirror : public SdrDragMethod @@ -133,7 +133,7 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragGradient class SdrDragGradient : public SdrDragMethod @@ -159,7 +159,7 @@ public: virtual void CancelSdrDrag(); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragCrook class SdrDragCrook : public SdrDragMethod @@ -211,7 +211,7 @@ public: virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragDistort class SdrDragDistort : public SdrDragMethod @@ -245,7 +245,7 @@ public: virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragCrop // derive from SdrDragObjOwn to have handles aligned to object when it @@ -262,7 +262,7 @@ public: virtual Pointer GetSdrDragPointer() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SOURCE_SVDRAW_SVDDRGM1_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index ef56971f09d7..4f800764454c 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -72,7 +72,7 @@ #include <map> #include <vector> -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrDragEntry::SdrDragEntry() : mbAddToTransparent(false) @@ -83,7 +83,7 @@ SdrDragEntry::~SdrDragEntry() { } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrDragEntryPolyPolygon::SdrDragEntryPolyPolygon(const basegfx::B2DPolyPolygon& rOriginalPolyPolygon) : SdrDragEntry(), @@ -136,7 +136,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPolyPolygon::createPr return aRetval; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrDragEntrySdrObject::SdrDragEntrySdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) : SdrDragEntry(), @@ -203,7 +203,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntrySdrObject::createPrim return rVOC.getPrimitive2DSequenceHierarchy(aDisplayInfo); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrDragEntryPrimitive2DSequence::SdrDragEntryPrimitive2DSequence( const drawinglayer::primitive2d::Primitive2DSequence& rSequence, @@ -229,7 +229,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPrimitive2DSequence:: return drawinglayer::primitive2d::Primitive2DSequence(&aTransformPrimitive2D, 1); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrDragEntryPointGlueDrag::SdrDragEntryPointGlueDrag(const std::vector< basegfx::B2DPoint >& rPositions, bool bIsPointDrag) : maPositions(rPositions), @@ -299,7 +299,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPointGlueDrag::create return aRetval; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT0(SdrDragMethod); @@ -962,7 +962,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragMethod::AddConnectorOverla return aRetval; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrDragMovHdl,SdrDragMethod); @@ -1178,7 +1178,7 @@ Pointer SdrDragMovHdl::GetSdrDragPointer() const return Pointer(POINTER_REFHAND); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrDragObjOwn,SdrDragMethod); @@ -1489,7 +1489,7 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const return Pointer(POINTER_MOVE); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrDragMove,SdrDragMethod); @@ -1764,7 +1764,7 @@ Pointer SdrDragMove::GetSdrDragPointer() const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrDragResize,SdrDragMethod); @@ -2101,7 +2101,7 @@ Pointer SdrDragResize::GetSdrDragPointer() const return Pointer(POINTER_MOVE); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrDragRotate,SdrDragMethod); @@ -2238,7 +2238,7 @@ Pointer SdrDragRotate::GetSdrDragPointer() const return Pointer(POINTER_ROTATE); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrDragShear,SdrDragMethod); @@ -2520,7 +2520,7 @@ Pointer SdrDragShear::GetSdrDragPointer() const return Pointer(POINTER_HSHEAR); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrDragMirror,SdrDragMethod); @@ -2651,7 +2651,7 @@ Pointer SdrDragMirror::GetSdrDragPointer() const return Pointer(POINTER_MIRROR); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrDragGradient, SdrDragMethod); @@ -2812,7 +2812,7 @@ Pointer SdrDragGradient::GetSdrDragPointer() const return Pointer(POINTER_REFHAND); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrDragCrook,SdrDragMethod); @@ -3486,7 +3486,7 @@ Pointer SdrDragCrook::GetSdrDragPointer() const return Pointer(POINTER_CROOK); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrDragDistort,SdrDragMethod); @@ -3640,7 +3640,7 @@ void SdrDragDistort::applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPol _MovAllPoints(rTarget); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrDragCrop,SdrDragResize); @@ -3847,9 +3847,9 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/) // the crop item. It implies unrotated objects, so create the unrotated original // erctangle and the unrotated modified rectangle. Latter can in case of shear and/or // rotation not be fetched by using - // + //Rectangle aNewRect( pObj->GetLogicRect() ); - // + // as it was done before because the top-left of that new rect *will* have an offset // caused by the evtl. existing shear and/or rotation, so calculate a unrotated // rectangle how it would be as a result when appling the unit coordinate change diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 84967e31150e..3c0a96bb195d 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -42,11 +42,11 @@ using namespace sdr; -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + // DragView -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + void SdrDragView::ImpClearVars() { @@ -191,7 +191,7 @@ sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const return sal_False; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const { @@ -823,7 +823,7 @@ void SdrDragView::HideDragObj() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrDragView::SetNoDragXorPolys(sal_Bool bOn) { diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 575e2c6ac806..a2e509779fd4 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -101,7 +101,7 @@ SdrEditView::~SdrEditView() { } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrLayer* SdrEditView::InsertNewLayer(const OUString& rName, sal_uInt16 nPos) { @@ -282,7 +282,7 @@ void SdrEditView::DeleteLayer(const OUString& rName) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrEditView::EndUndo() { @@ -357,9 +357,9 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Possibilities -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrEditView::MarkListHasChanged() { @@ -650,7 +650,7 @@ void SdrEditView::CheckPossibilities() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrEditView::ForceMarkedObjToAnotherPage() { @@ -951,7 +951,7 @@ void SdrEditView::CopyMarkedObj() MarkListHasChanged(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions) { @@ -1026,7 +1026,7 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO if (bMark) MarkObj(pNewObj,&rPV); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrEditView::IsUndoEnabled() const { diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 83519a79b1ee..4f3bd09846dc 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -61,11 +61,11 @@ #include <svx/xlnstwit.hxx> #include <svx/xlnwtit.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + // EditView -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy) { @@ -702,7 +702,7 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto EndUndo(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/) { @@ -1231,7 +1231,7 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDo } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { @@ -1275,7 +1275,7 @@ sal_Bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRe } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SfxItemSet SdrEditView::GetGeoAttrFromMarked() const { @@ -1740,7 +1740,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) EndUndo(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrEditView::IsAlignPossible() const { // at least two selected objects, at least one of them movable diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index f05d650d7801..c6e53420dea7 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -536,9 +536,9 @@ void SdrEditView::ImpCheckToTopBtmPossible() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Combine -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrEditView::ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) const { @@ -1346,9 +1346,9 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly) EndUndo(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Dismantle -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, sal_Bool bMakeLines) const { @@ -1660,9 +1660,9 @@ void SdrEditView::DismantleMarkedObjects(sal_Bool bMakeLines) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Group -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrEditView::GroupMarked(const SdrObject* pUserGrp) { @@ -1780,9 +1780,9 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Ungroup -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrEditView::UnGroupMarked() { @@ -1880,9 +1880,9 @@ void SdrEditView::UnGroupMarked() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // ConvertToPoly -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea) { @@ -1969,9 +1969,9 @@ void SdrEditView::ConvertMarkedToPolyObj(sal_Bool bLineToArea) ImpConvertTo(sal_False, bLineToArea); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Metafile Import -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) { diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 73193f646456..283d36920df3 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -60,7 +60,7 @@ #include <svx/sdr/overlay/overlaytools.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrObjEditView::ImpClearVars() { @@ -98,7 +98,7 @@ SdrObjEditView::~SdrObjEditView() delete mpOldTextEditUndoManager; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrObjEditView::IsAction() const { @@ -152,7 +152,7 @@ void SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) pTextEditOutliner->SetDefTab(pMod->GetDefaultTabulator()); } if (eKind==HINT_DEFFONTHGTCHG) { - // ... + } if (eKind==HINT_MODELSAVED) { pTextEditOutliner->ClearModifyFlag(); @@ -283,9 +283,9 @@ void SdrObjEditView::ModelHasChanged() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // TextEdit -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) const { @@ -1078,7 +1078,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) return eRet; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // info about TextEdit. Default is sal_False. bool SdrObjEditView::IsTextEdit() const { @@ -1091,7 +1091,7 @@ SdrPageView* SdrObjEditView::GetTextEditPageView() const return pTextEditPV; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + OutlinerView* SdrObjEditView::ImpFindOutlinerView(Window* pWin) const { @@ -1191,7 +1191,7 @@ sal_Bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const return bOk; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) { @@ -1356,7 +1356,7 @@ sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) return SdrGlueEditView::Command(rCEvt,pWin); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const { @@ -1668,7 +1668,7 @@ sal_Bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDon return SdrGlueEditView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin) { @@ -1702,9 +1702,9 @@ sal_Bool SdrObjEditView::IsTextEditInSelectionMode() const return pTextEditOutliner!=NULL && pTextEditOutliner->IsInSelectionMode(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // MacroMode -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 753559a70493..cacf6d842d84 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -92,7 +92,7 @@ const LocaleDataWrapper* SdrGlobalData::GetLocaleData() pLocaleData = GetSysLocale()->GetLocaleDataPtr(); return pLocaleData; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + OLEObjCache::OLEObjCache() : std::vector<SdrOle2Obj*>() @@ -205,7 +205,7 @@ sal_Bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj) //#i80528# The old mechanism is completely useless, only taking into account if // in all views the GrafDraft feature is used. This will nearly never have been the // case since no one ever used this option. - // + // A much better (and working) criteria would be the VOC contact count. // The question is what will happen when i make it work now suddenly? I // will try it for 2.4. @@ -227,7 +227,7 @@ IMPL_LINK(OLEObjCache, UnloadCheckHdl, AutoTimer*, /*pTim*/) return 0; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrLinkList::Clear() { @@ -276,7 +276,7 @@ void SdrLinkList::RemoveLink(const Link& rLink) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) { @@ -373,7 +373,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) return bRetval; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrEngineDefaults::SdrEngineDefaults(): aFontName( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ).GetName() ), @@ -394,7 +394,7 @@ SdrEngineDefaults& SdrEngineDefaults::GetDefaults() return *rGlobalData.pDefaults; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel ) { @@ -411,7 +411,7 @@ SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel ) return pOutl; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrLinkList& ImpGetUserMakeObjHdl() @@ -426,7 +426,7 @@ SdrLinkList& ImpGetUserMakeObjUserDataHdl() return rGlobalData.aUserMakeObjUserDataHdl; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + ResMgr* ImpGetResMgr() { @@ -441,14 +441,14 @@ ResMgr* ImpGetResMgr() return rGlobalData.pResMgr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + OUString ImpGetResStr(sal_uInt16 nResID) { return ResId(nResID, *ImpGetResMgr()).toString(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -458,7 +458,7 @@ namespace sdr } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE) { @@ -546,7 +546,7 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRange return pNewWhichTable; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SvdProgressInfo::SvdProgressInfo( Link *_pLink ) { @@ -623,7 +623,7 @@ void SvdProgressInfo::ReportError() pLink->Call((void *)1L); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // #i101872# isolate GetTextEditBackgroundColor to tooling; it will anyways only be used as long // as text edit is not running on overlay diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 43820f20427b..070acad5f771 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -71,7 +71,7 @@ #include <svx/svditer.hxx> #include <svx/svdogrp.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport( SdrModel& rModel, @@ -1128,7 +1128,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScaleAction& rAct) InsertObj(pGraf); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct ) { @@ -1178,7 +1178,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct ) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void ImpSdrGDIMetaFileImport::DoAction(MetaLineColorAction& rAct) { @@ -1213,7 +1213,7 @@ void ImpSdrGDIMetaFileImport::MapScaling() mnMapScalingOfs = nAnz; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pMtf ) { diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index c6c37d42ba56..40d873790c1d 100644 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -25,9 +25,9 @@ #include <vcl/virdev.hxx> #include <svx/svdobj.hxx> -//************************************************************ + // Forward Declarations -//************************************************************ + class SfxItemSet; class SdrObjList; @@ -36,9 +36,9 @@ class SdrPage; class SdrObject; class SvdProgressInfo; -//************************************************************ + // Helper Class ImpSdrGDIMetaFileImport -//************************************************************ + class ImpSdrGDIMetaFileImport { diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index bc72272a4755..62aa11fca68a 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -29,7 +29,7 @@ #include <svx/svdtrans.hxx> #include <svx/svdobj.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrGlueEditView::ImpClearVars() { @@ -45,7 +45,7 @@ SdrGlueEditView::~SdrGlueEditView() { } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { @@ -89,7 +89,7 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst if (!bConst && nMarkAnz!=0) pMod->SetChanged(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*) { @@ -128,7 +128,7 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bO EndUndo(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*) { @@ -165,7 +165,7 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(sal_Bool bOn) EndUndo(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*) { @@ -265,7 +265,7 @@ void SdrGlueEditView::DeleteMarkedGluePoints() pMod->SetChanged(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrGlueEditView::ImpCopyMarkedGluePoints() { @@ -315,7 +315,7 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() pMod->SetChanged(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { @@ -351,7 +351,7 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo if (nMarkAnz!=0) pMod->SetChanged(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + static void ImpMove(Point& rPt, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/) { @@ -371,7 +371,7 @@ void SdrGlueEditView::MoveMarkedGluePoints(const Size& rSiz, bool bCopy) AdjustMarkHdl(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + static void ImpResize(Point& rPt, const void* p1, const void* p2, const void* p3, const void* /*p4*/, const void* /*p5*/) { @@ -390,7 +390,7 @@ void SdrGlueEditView::ResizeMarkedGluePoints(const Point& rRef, const Fraction& AdjustMarkHdl(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + static void ImpRotate(Point& rPt, const void* p1, const void* /*p2*/, const void* p3, const void* p4, const void* /*p5*/) { diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 4a95b145f7f4..41b37ae0e885 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -260,7 +260,7 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrO return aRect.IsInside(rPnt); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrGluePointList::Clear() { diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 160125880a08..dd8338585f07 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -65,7 +65,7 @@ #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // #i15222# // Due to the resource problems in Win95/98 with bitmap resources I // will change this handle bitmap providing class. Old version was splitting @@ -92,7 +92,7 @@ public: const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd=0); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #define KIND_COUNT (14) #define INDEX_COUNT (6) #define INDIVIDUAL_COUNT (5) @@ -265,7 +265,7 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrHdl::SdrHdl(): pObj(NULL), @@ -915,7 +915,7 @@ void SdrHdl::onMouseLeave() { } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // class SdrHdlColor SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, sal_Bool bLum) @@ -1074,7 +1074,7 @@ void SdrHdlColor::SetSize(const Size& rNew) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // class SdrHdlGradient SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad) @@ -1258,7 +1258,7 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, sal_Bool bSetItemOnObject, } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrHdlLine::~SdrHdlLine() {} @@ -1318,7 +1318,7 @@ Pointer SdrHdlLine::GetPointer() const return Pointer(POINTER_REFHAND); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrHdlBezWgt::~SdrHdlBezWgt() {} @@ -1380,7 +1380,7 @@ void SdrHdlBezWgt::CreateB2dIAObject() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + E3dVolumeMarker::E3dVolumeMarker(const basegfx::B2DPolyPolygon& rWireframePoly) { @@ -1430,7 +1430,7 @@ void E3dVolumeMarker::CreateB2dIAObject() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + ImpEdgeHdl::~ImpEdgeHdl() { @@ -1554,7 +1554,7 @@ sal_Bool ImpEdgeHdl::IsHorzDrag() const return sal_False; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + ImpMeasureHdl::~ImpMeasureHdl() { @@ -1629,7 +1629,7 @@ Pointer ImpMeasureHdl::GetPointer() const return Pointer(POINTER_NOTALLOWED); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + ImpTextframeHdl::ImpTextframeHdl(const Rectangle& rRect) : SdrHdl(rRect.TopLeft(),HDL_MOVE), @@ -1693,7 +1693,7 @@ void ImpTextframeHdl::CreateB2dIAObject() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + static bool ImpSdrHdlListSorter(SdrHdl* const& lhs, SdrHdl* const& rhs) { @@ -1842,7 +1842,7 @@ extern "C" int SAL_CALL ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrHdlList::TravelFocusHdl(sal_Bool bForward) { @@ -2023,7 +2023,7 @@ void SdrHdlList::ResetFocusHdl() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrHdlList::SdrHdlList(SdrMarkView* pV) : mnFocusIndex(CONTAINER_ENTRY_NOTFOUND), @@ -2208,9 +2208,9 @@ SdrHdl* SdrHdlList::GetHdl(SdrHdlKind eKind1) const return pRet; } -// -------------------------------------------------------------------- + // SdrCropHdl -// -------------------------------------------------------------------- + SdrCropHdl::SdrCropHdl( const Point& rPnt, @@ -2223,7 +2223,7 @@ SdrCropHdl::SdrCropHdl( { } -// -------------------------------------------------------------------- + BitmapEx SdrCropHdl::GetHandlesBitmap() { @@ -2233,7 +2233,7 @@ BitmapEx SdrCropHdl::GetHandlesBitmap() return *pModernBitmap; } -// -------------------------------------------------------------------- + BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ) { @@ -2275,7 +2275,7 @@ BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ) return aRetval; } -// -------------------------------------------------------------------- + void SdrCropHdl::CreateB2dIAObject() { @@ -2353,7 +2353,7 @@ void SdrCropHdl::CreateB2dIAObject() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // with the correction of crop handling I could get rid of the extra mirroring flag, adapted stuff // accordingly diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index 5806a7da4d38..2c366e7b4e89 100644 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -25,7 +25,7 @@ #include <tools/poly.hxx> #include <vcl/lineinfo.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + Pointer SdrHelpLine::GetPointer() const { diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 5f9993b8d855..403ac8039c4b 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -400,7 +400,7 @@ void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt) if (nKeyCode==KEY_RETURN) { if (BegChangeEntry(nPos)) bAusgewertet = true; } else if (nKeyCode==KEY_ESCAPE) { - // ... + } else if (rKEvt.GetKeyCode().GetModifier()==KEY_SHIFT+KEY_MOD1+KEY_MOD2) { // Ctrl if (nKeyCode==KEY_SHIFT+KEY_MOD1+KEY_MOD2+KEY_W) { bWhichesButNames=!bWhichesButNames; diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index e8f3fdc45e28..2d80d61f4e3f 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -141,9 +141,9 @@ bool SdrLayer::operator==(const SdrLayer& rCmpLayer) const && maName == rCmpLayer.maName); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrLayerAdmin -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent): aLayer(), diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 5b23f25cbf29..b329b7f1e267 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -18,7 +18,7 @@ */ -//////////////////////////////////////////////////////////////////////////////////////////////////// + #include <svx/svdmark.hxx> #include <svx/svdetc.hxx> @@ -32,14 +32,14 @@ #include "svx/svdstr.hrc" #include "svx/svdglob.hxx" -//////////////////////////////////////////////////////////////////////////////////////////////////// + #include <svx/obj3d.hxx> #include <svx/scene3d.hxx> #include <svl/brdcst.hxx> #include <svx/svdoedge.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrMark::SdrMark(SdrObject* pNewObj, SdrPageView* pNewPageView) : mpSelectedSdrObject(pNewObj), @@ -218,7 +218,7 @@ sal_Bool SdrMark::operator==(const SdrMark& rMark) const return bRet; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + static bool ImpSdrMarkListSorter(SdrMark* const& lhs, SdrMark* const& rhs) { @@ -243,7 +243,7 @@ static bool ImpSdrMarkListSorter(SdrMark* const& lhs, SdrMark* const& rhs) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrMarkList::ForceSort() const { @@ -357,7 +357,7 @@ sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const // Since relying on OrdNums is not allowed for the selection because objects in the // selection may not be inserted in a list if they are e.g. modified ATM, i changed // this loop to just look if the object pointer is in the selection. - // + // Problem is that GetOrdNum() which is const, internally casts to non-const and // hardly sets the OrdNum member of the object (nOrdNum) to 0 (ZERO) if the object // is not inserted in a object list. @@ -774,7 +774,7 @@ sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const return bFnd; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 4a1f5582c5e2..b1d4a05445bb 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -90,7 +90,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -//////////////////////////////////////////////////////////////////////////////////////////////////// + struct SdrModelImpl { @@ -98,7 +98,7 @@ struct SdrModelImpl SdrUndoFactory* mpUndoFactory; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + DBG_NAME(SdrModel) TYPEINIT1(SdrModel,SfxBroadcaster); @@ -359,7 +359,7 @@ void SdrModel::SetReadOnly(bool bYes) bReadOnly=bYes; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nAnz) { @@ -1536,7 +1536,7 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) Broadcast(aHint); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, @@ -1828,7 +1828,7 @@ void SdrModel::setLock( bool bLock ) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSet, SdrModel* pNewModel ) { @@ -1888,7 +1888,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrModel::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { @@ -2047,7 +2047,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImpleme return theSdrModelUnoTunnelImplementationId::get().getSeq(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrHint,SfxHint); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index f06b00a526a3..4ecd12bb8c7a 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -52,7 +52,7 @@ #include <editeng/editdata.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Migrate Marking of Objects, Points and GluePoints class ImplMarkingOverlay @@ -117,11 +117,11 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition } } -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + // MarkView -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + void SdrMarkView::ImpClearVars() { @@ -207,7 +207,7 @@ void SdrMarkView::ModelHasChanged() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrMarkView::IsAction() const { @@ -278,7 +278,7 @@ void SdrMarkView::TakeActionRect(Rectangle& rRect) const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrMarkView::ClearPageView() { @@ -309,7 +309,7 @@ void SdrMarkView::HideSdrPage() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrMarkView::BegMarkObj(const Point& rPnt, sal_Bool bUnmark) { @@ -368,7 +368,7 @@ void SdrMarkView::BrkMarkObj() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrMarkView::BegMarkPoints(const Point& rPnt, sal_Bool bUnmark) { @@ -434,7 +434,7 @@ void SdrMarkView::BrkMarkPoints() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark) { @@ -1276,7 +1276,7 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { @@ -1994,7 +1994,7 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const return aMarkedObjRect; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal, sal_uInt16 nOpt) const { @@ -2020,7 +2020,7 @@ void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, rStr = rStr.replaceFirst("%2", OUString::number( nVal )); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrMarkView::EnterMarkedGroup() { @@ -2051,7 +2051,7 @@ sal_Bool SdrMarkView::EnterMarkedGroup() return bRet; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrMarkView::MarkListHasChanged() { @@ -2074,7 +2074,7 @@ void SdrMarkView::MarkListHasChanged() ImpSetGlueVisible4(bOneEdgeMarked); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrMarkView::SetMoveOutside(sal_Bool bOn) { diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index cff986f89f18..63f9b5ee57d3 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -26,9 +26,9 @@ #include <svx/svdpage.hxx> #include "svddrgm1.hxx" -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Point Selection -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrMarkView::HasMarkablePoints() const { @@ -258,7 +258,7 @@ sal_Bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/) ForceUndirtyMrkPnt(); sal_Bool bChgd=sal_False; SortMarkedObjects(); - // ... + if (bChgd) { MarkListHasChanged(); } @@ -282,9 +282,9 @@ void SdrMarkView::SetPlusHandlesAlwaysVisible(bool bOn) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // ImpSetPointsRects() is for PolyPoints and GluePoints! -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrMarkView::ImpSetPointsRects() const { @@ -312,9 +312,9 @@ void SdrMarkView::ImpSetPointsRects() const ((SdrMarkView*)this)->bMarkedPointsRectsDirty=false; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // UndirtyMrkPnt() is for PolyPoints and GluePoints! -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrMarkView::UndirtyMrkPnt() const { @@ -379,7 +379,7 @@ void SdrMarkView::UndirtyMrkPnt() const ((SdrMarkView*)this)->bMrkPntDirty=false; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrMarkView::HasMarkableGluePoints() const { @@ -585,7 +585,7 @@ sal_Bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, sal_Bool /*bPrev* ForceUndirtyMrkPnt(); sal_Bool bChgd=sal_False; SortMarkedObjects(); - // ... + if (bChgd) { MarkListHasChanged(); } diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 2bc7f5d55a3b..70ead2ba1c25 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -403,7 +403,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS return pRetval; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine() const { @@ -693,7 +693,7 @@ std::vector< SdrCustomShapeInteraction > SdrObjCustomShape::GetInteractionHandle return xRet; } -////////////////////////////////////////////////////////////////////////////// + // BaseProperties section #define DEFAULT_MINIMUM_SIGNED_COMPARE ((sal_Int32)0x80000000) #define DEFAULT_MAXIMUM_SIGNED_COMPARE ((sal_Int32)0x7fffffff) @@ -897,9 +897,9 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > seqAdjustmentValues; - ////////////////////// - // AdjustmentValues // - ////////////////////// + + // AdjustmentValues + const OUString sAdjustmentValues( "AdjustmentValues" ); const Any* pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sAdjustmentValues ); if ( pAny ) @@ -933,9 +933,9 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) aPropVal.Value <<= seqAdjustmentValues; aGeometryItem.SetPropertyValue( aPropVal ); - /////////////// - // Coordsize // - /////////////// + + // Coordsize + const OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; @@ -955,9 +955,9 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) const OUString sPath( "Path" ); - ////////////////////// - // Path/Coordinates // - ////////////////////// + + // Path/Coordinates + const OUString sCoordinates( "Coordinates" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( !pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices ) @@ -976,7 +976,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - // Path/GluePoints // + // Path/GluePoints const OUString sGluePoints( "GluePoints" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( !pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints ) @@ -994,7 +994,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - // Path/Segments // + // Path/Segments const OUString sSegments( "Segments" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( !pAny && pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements ) @@ -1014,7 +1014,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - // Path/StretchX // + // Path/StretchX const OUString sStretchX( "StretchX" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( !pAny && pDefCustomShape ) @@ -1028,7 +1028,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) } } - // Path/StretchY // + // Path/StretchY const OUString sStretchY( "StretchY" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( !pAny && pDefCustomShape ) @@ -1042,7 +1042,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) } } - // Path/TextFrames // + // Path/TextFrames const OUString sTextFrames( "TextFrames" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( !pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect ) @@ -1064,7 +1064,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - // Equations // + // Equations const OUString sEquations( "Equations" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations ); if ( !pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation ) @@ -1081,7 +1081,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) aGeometryItem.SetPropertyValue( aPropVal ); } - // Handles // + // Handles const OUString sHandles( "Handles" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles ); if ( !pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles ) @@ -1191,7 +1191,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_SEGMENTS : { - // Path/Segments // + // Path/Segments const OUString sSegments( "Segments" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( pAny ) @@ -1425,7 +1425,7 @@ sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const return sal_uInt16(OBJ_CUSTOMSHAPE); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrObjCustomShape::RecalcSnapRect() { @@ -1717,7 +1717,7 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, bool InvalidateRenderGeometry(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const { @@ -1745,7 +1745,7 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const return aGP; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // #i38892# void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() @@ -1868,7 +1868,7 @@ SdrGluePointList* SdrObjCustomShape::ForceGluePointList() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_uInt32 SdrObjCustomShape::GetHdlCount() const { @@ -1909,7 +1909,7 @@ SdrHdl* SdrObjCustomShape::GetHdl( sal_uInt32 nHdlNum ) const return pH; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrObjCustomShape::hasSpecialDrag() const { @@ -2130,7 +2130,7 @@ bool SdrObjCustomShape::applySpecialDrag(SdrDragStat& rDrag) return true; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat ) { @@ -2225,7 +2225,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*r return GetLineGeometry( this, sal_False ); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // in context with the SdrObjCustomShape the SdrTextAutoGrowHeightItem == true -> Resize Shape to fit text, // the SdrTextAutoGrowWidthItem == true -> Word wrap text in Shape diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index 535f15d87768..9ebd5409aa3e 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -72,14 +72,14 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include "svx/xlinjoit.hxx" -////////////////////////////////////////////////////////////////////////////// + sdr::properties::BaseProperties* SdrAttrObj::CreateObjectSpecificProperties() { return new sdr::properties::AttributeProperties(*this); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrAttrObj,SdrObject); @@ -119,7 +119,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel) GetProperties().SetModel(pOldModel, pNewModel); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // syntactical sugar for ItemSet accesses void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 4a0d63c894ef..09d473230a0b 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -129,7 +129,7 @@ using namespace ::com::sun::star; -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT0(SdrObjUserCall); @@ -148,7 +148,7 @@ SdrObjMacroHitRec::SdrObjMacroHitRec() : nTol(0), bDown(false) {} -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT0(SdrObjUserData); @@ -256,7 +256,7 @@ void SdrObjUserDataList::DeleteUserData(size_t nNum) maList.erase(maList.begin()+nNum); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + DBG_NAME(SdrObjGeoData); @@ -278,7 +278,7 @@ SdrObjGeoData::~SdrObjGeoData() delete pGPL; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT0(SdrObjPlusData); @@ -352,7 +352,7 @@ SdrObjTransformInfoRec::SdrObjTransformInfoRec() : bCanConvToPathLineToArea(true), bCanConvToPolyLineToArea(true) {} -////////////////////////////////////////////////////////////////////////////// + // BaseProperties section sdr::properties::BaseProperties* SdrObject::CreateObjectSpecificProperties() @@ -371,7 +371,7 @@ sdr::properties::BaseProperties& SdrObject::GetProperties() const return *mpProperties; } -////////////////////////////////////////////////////////////////////////////// + // ObjectUser section void SdrObject::AddObjectUser(sdr::ObjectUser& rNewUser) @@ -388,7 +388,7 @@ void SdrObject::RemoveObjectUser(sdr::ObjectUser& rOldUser) } } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrObject::CreateObjectSpecificViewContact() @@ -414,14 +414,14 @@ void SdrObject::ActionChanged() const GetViewContact().ActionChanged(); } -////////////////////////////////////////////////////////////////////////////// + void SdrObject::SetBoundRectDirty() { aOutRect = Rectangle(); } -////////////////////////////////////////////////////////////////////////////// + DBG_NAME(SdrObject); TYPEINIT1(SdrObject,SfxListener); @@ -1395,7 +1395,7 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const return aTmpRect; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrObject::hasSpecialDrag() const { @@ -1452,7 +1452,7 @@ basegfx::B2DPolyPolygon SdrObject::getSpecialDragPoly(const SdrDragStat& /*rDrag return basegfx::B2DPolyPolygon(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Create bool SdrObject::BegCreate(SdrDragStat& rStat) { @@ -1992,7 +1992,7 @@ bool SdrObject::IsMacroHit(const SdrObjMacroHitRec& rRec) const return CheckMacroHit(rRec) != NULL; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrObjGeoData* SdrObject::NewGeoData() const { @@ -2069,7 +2069,7 @@ void SdrObject::SetGeoData(const SdrObjGeoData& rGeo) SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // ItemSet access const SfxItemSet& SdrObject::GetObjectItemSet() const @@ -2383,7 +2383,7 @@ void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRe } // Broadcasting while setting attributes is managed by the AttrObj. -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrObject::IsNode() const { @@ -2501,7 +2501,7 @@ SdrObject* SdrObject::GetConnectedNode(bool /*bTail1*/) const return NULL; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void extractLineContourFromPrimitive2DSequence( const drawinglayer::primitive2d::Primitive2DSequence& rxSequence, @@ -2528,7 +2528,7 @@ void extractLineContourFromPrimitive2DSequence( } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash) const { @@ -2824,7 +2824,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, bool bForceLineDash) return pRet; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const { @@ -2846,14 +2846,14 @@ SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const return pRet; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrObject* SdrObject::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const { return NULL; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrObject::SetInserted(bool bIns) { @@ -2921,7 +2921,7 @@ void SdrObject::SetVisible(bool bVisible) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_uInt16 SdrObject::GetUserDataCount() const { @@ -3171,14 +3171,14 @@ void SdrObject::notifyShapePropertyChange( const ::svx::ShapeProperty _eProperty return pSvxShape->getShapePropertyChangeNotifier().notifyPropertyChange( _eProperty ); } -//////////////////////////////////////////////////////////////////////////////////////////////////// -// + + // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear // transforms like Scale, ShearX, ShearY, Rotate and Translate are supported. -// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. sal_Bool SdrObject::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index d02856bbd9cd..3a91a5630981 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -56,7 +56,7 @@ #include <svx/xpoly.hxx> #include <svx/xpool.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + enum EscDir {LKS,RTS,OBN,UNT}; @@ -171,7 +171,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi rDir=eBestDir; } -////////////////////////////////////////////////////////////////////////////// + // BaseProperties section sdr::properties::BaseProperties* SdrCaptionObj::CreateObjectSpecificProperties() @@ -179,7 +179,7 @@ sdr::properties::BaseProperties* SdrCaptionObj::CreateObjectSpecificProperties() return new sdr::properties::CaptionProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrCaptionObj::CreateObjectSpecificViewContact() @@ -187,7 +187,7 @@ sdr::contact::ViewContact* SdrCaptionObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfSdrCaptionObj(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrCaptionObj,SdrRectObj); @@ -303,7 +303,7 @@ SdrHdl* SdrCaptionObj::GetHdl(sal_uInt32 nHdlNum) const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrCaptionObj::hasSpecialDrag() const { @@ -415,7 +415,7 @@ OUString SdrCaptionObj::getSpecialDragComment(const SdrDragStat& rDrag) const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrCaptionObj::ImpGetCaptParams(ImpCaptParams& rPara) const { diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index d52714617bb1..21d47318ab62 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -50,7 +50,7 @@ #include <svx/xlnwtit.hxx> #include <svx/xpool.hxx> -////////////////////////////////////////////////////////////////////////////// + Point GetWinkPnt(const Rectangle& rR, long nWink) { @@ -88,7 +88,7 @@ Point GetWinkPnt(const Rectangle& rR, long nWink) return aRetval; } -////////////////////////////////////////////////////////////////////////////// + // BaseProperties section sdr::properties::BaseProperties* SdrCircObj::CreateObjectSpecificProperties() @@ -96,7 +96,7 @@ sdr::properties::BaseProperties* SdrCircObj::CreateObjectSpecificProperties() return new sdr::properties::CircleProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrCircObj::CreateObjectSpecificViewContact() @@ -104,7 +104,7 @@ sdr::contact::ViewContact* SdrCircObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfSdrCircObj(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrCircObj,SdrRectObj); @@ -469,7 +469,7 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const return pH; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrCircObj::hasSpecialDrag() const { @@ -615,7 +615,7 @@ OUString SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void ImpCircUser::SetCreateParams(SdrDragStat& rStat) { @@ -1067,7 +1067,7 @@ void SdrCircObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) ImpSetAttrToCircInfo(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrCircObj::ImpSetAttrToCircInfo() { diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 29801861f98d..bce9fed9fcd8 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -48,7 +48,7 @@ #include <svx/xpoly.hxx> #include <svx/xpool.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrObjConnection::~SdrObjConnection() { @@ -147,7 +147,7 @@ long SdrEdgeInfoRec::ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon else return rPt.X(); } -////////////////////////////////////////////////////////////////////////////// + // BaseProperties section sdr::properties::BaseProperties* SdrEdgeObj::CreateObjectSpecificProperties() @@ -155,7 +155,7 @@ sdr::properties::BaseProperties* SdrEdgeObj::CreateObjectSpecificProperties() return new sdr::properties::ConnectorProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrEdgeObj::CreateObjectSpecificViewContact() @@ -163,7 +163,7 @@ sdr::contact::ViewContact* SdrEdgeObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfSdrEdgeObj(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrEdgeObj,SdrTextObj); @@ -1292,7 +1292,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec else cForm='C'; } } else cForm='4'; // else is case 3 with 5 lines - } else cForm='?'; // + } else cForm='?'; // more shapes: if (bInfo) { pInfo->cOrthoForm=cForm; @@ -1810,7 +1810,7 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const return pHdl; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrEdgeObj::hasSpecialDrag() const { @@ -1961,7 +1961,7 @@ OUString SdrEdgeObj::getSpecialDragComment(const SdrDragStat& rDrag) const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMethod, bool bTail1, bool bTail2, bool bDetail) const { diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index bc942710f733..403e57d8c1da 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -271,7 +271,7 @@ sdr::properties::BaseProperties* SdrGrafObj::CreateObjectSpecificProperties() return new sdr::properties::GraphicProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrGrafObj::CreateObjectSpecificViewContact() @@ -279,7 +279,7 @@ sdr::contact::ViewContact* SdrGrafObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfGraphic(*this); } -////////////////////////////////////////////////////////////////////////////// + // check if SVG and if try to get ObjectInfoPrimitive2D and extract info void SdrGrafObj::onGraphicChanged() diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 6453cb9a6ef8..59255e269d05 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -49,7 +49,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + // BaseProperties section sdr::properties::BaseProperties* SdrObjGroup::CreateObjectSpecificProperties() @@ -57,7 +57,7 @@ sdr::properties::BaseProperties* SdrObjGroup::CreateObjectSpecificProperties() return new sdr::properties::GroupProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrObjGroup::CreateObjectSpecificViewContact() @@ -65,7 +65,7 @@ sdr::contact::ViewContact* SdrObjGroup::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfGroup(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrObjGroup,SdrObject); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index d58f5936b517..5f31c1897b28 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -72,7 +72,7 @@ #include <svx/xpoly.hxx> #include <unotools/syslocale.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrMeasureObjGeoData::SdrMeasureObjGeoData() {} SdrMeasureObjGeoData::~SdrMeasureObjGeoData() {} @@ -195,7 +195,7 @@ OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind return aStr; } -////////////////////////////////////////////////////////////////////////////// + // BaseProperties section sdr::properties::BaseProperties* SdrMeasureObj::CreateObjectSpecificProperties() @@ -203,7 +203,7 @@ sdr::properties::BaseProperties* SdrMeasureObj::CreateObjectSpecificProperties() return new sdr::properties::MeasureProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact() @@ -211,7 +211,7 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfSdrMeasureObj(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrMeasureObj,SdrTextObj); @@ -799,7 +799,7 @@ SdrHdl* SdrMeasureObj::GetHdl(sal_uInt32 nHdlNum) const return pHdl; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrMeasureObj::hasSpecialDrag() const { @@ -970,7 +970,7 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c } // switch } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrMeasureObj::BegCreate(SdrDragStat& rStat) { @@ -1376,7 +1376,7 @@ sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const return (sal_uInt16)eRet; } -////////////////////////////////////////////////////////////////////////////// + // #i97878# // TRGetBaseGeometry/TRSetBaseGeometry needs to be based on two positions, // same as line geometry in SdrPathObj. Thus needs to be overloaded and diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index fd6cd89d9b10..24199a9929a1 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -42,9 +42,9 @@ using namespace ::com::sun::star; -// --------------- + // - SdrMediaObj - -// --------------- + // Note: the temp file is read only, until it is deleted! // It may be shared between multiple documents in case of copy/paste, @@ -68,7 +68,7 @@ struct SdrMediaObj::Impl TYPEINIT1( SdrMediaObj, SdrRectObj ); -// ------------------------------------------------------------------------------ + SdrMediaObj::SdrMediaObj() : SdrRectObj() @@ -76,7 +76,7 @@ SdrMediaObj::SdrMediaObj() { } -// ------------------------------------------------------------------------------ + SdrMediaObj::SdrMediaObj( const Rectangle& rRect ) : SdrRectObj( rRect ) @@ -84,27 +84,27 @@ SdrMediaObj::SdrMediaObj( const Rectangle& rRect ) { } -// ------------------------------------------------------------------------------ + SdrMediaObj::~SdrMediaObj() { } -// ------------------------------------------------------------------------------ + bool SdrMediaObj::HasTextEdit() const { return false; } -// ------------------------------------------------------------------------------ + sdr::contact::ViewContact* SdrMediaObj::CreateObjectSpecificViewContact() { return new ::sdr::contact::ViewContactOfSdrMediaObj( *this ); } -// ------------------------------------------------------------------------------ + void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const { @@ -130,14 +130,14 @@ void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const rInfo.bCanConvToPolyLineToArea = false; } -// ------------------------------------------------------------------------------ + sal_uInt16 SdrMediaObj::GetObjIdentifier() const { return sal_uInt16( OBJ_MEDIA ); } -// ------------------------------------------------------------------------------ + OUString SdrMediaObj::TakeObjNameSingul() const { @@ -156,14 +156,14 @@ OUString SdrMediaObj::TakeObjNameSingul() const return sName.makeStringAndClear(); } -// ------------------------------------------------------------------------------ + OUString SdrMediaObj::TakeObjNamePlural() const { return ImpGetResStr(STR_ObjNamePluralMEDIA); } -// ------------------------------------------------------------------------------ + SdrMediaObj* SdrMediaObj::Clone() const { @@ -194,7 +194,7 @@ uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() return m_pImpl->m_xCachedSnapshot; } -// ------------------------------------------------------------------------------ + void SdrMediaObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly /* = false */ ) { @@ -240,7 +240,7 @@ void SdrMediaObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly / } } -// ------------------------------------------------------------------------------ + void SdrMediaObj::setURL( const OUString& rURL, const OUString& rReferer ) { @@ -250,14 +250,14 @@ void SdrMediaObj::setURL( const OUString& rURL, const OUString& rReferer ) setMediaProperties( aURLItem ); } -// ------------------------------------------------------------------------------ + const OUString& SdrMediaObj::getURL() const { return m_pImpl->m_MediaProperties.getURL(); } -// ------------------------------------------------------------------------------ + void SdrMediaObj::setMediaProperties( const ::avmedia::MediaItem& rState ) { @@ -265,21 +265,21 @@ void SdrMediaObj::setMediaProperties( const ::avmedia::MediaItem& rState ) static_cast< ::sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).executeMediaItem( getMediaProperties() ); } -// ------------------------------------------------------------------------------ + const ::avmedia::MediaItem& SdrMediaObj::getMediaProperties() const { return m_pImpl->m_MediaProperties; } -// ------------------------------------------------------------------------------ + Size SdrMediaObj::getPreferredSize() const { return static_cast< ::sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).getPreferredSize(); } -// ------------------------------------------------------------------------------ + uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream() { diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index a93152a9a611..e5df7443b781 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -591,7 +591,7 @@ void SdrLightEmbeddedClient_Impl::setWindow(const uno::Reference< awt::XWindow > m_xWindow = _xWindow; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SdrEmbedObjectLink : public sfx2::SvBaseLink { @@ -668,7 +668,7 @@ void SdrEmbedObjectLink::Closed() SvBaseLink::Closed(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SdrOle2ObjImpl { @@ -696,7 +696,7 @@ public: } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Predicate determining whether the given OLE is an internal math // object @@ -720,7 +720,7 @@ static bool ImplIsMathObj( const uno::Reference < embed::XEmbeddedObject >& rObj } } -////////////////////////////////////////////////////////////////////////////// + // BaseProperties section sdr::properties::BaseProperties* SdrOle2Obj::CreateObjectSpecificProperties() @@ -728,7 +728,7 @@ sdr::properties::BaseProperties* SdrOle2Obj::CreateObjectSpecificProperties() return new sdr::properties::OleProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact() @@ -2217,14 +2217,14 @@ sal_Bool SdrOle2Obj::AddOwnLightClient() return sal_True; } -////////////////////////////////////////////////////////////////////////////// + Graphic SdrOle2Obj::GetEmptyOLEReplacementGraphic() { return Graphic(BitmapEx(ResId(BMP_SVXOLEOBJ, *ImpGetResMgr()))); } -////////////////////////////////////////////////////////////////////////////// + void SdrOle2Obj::SetWindow(const com::sun::star::uno::Reference < com::sun::star::awt::XWindow >& _xWindow) { diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index fb141c6551e6..dfa4ca4e12e2 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -32,7 +32,7 @@ #include <svx/sdr/properties/pageproperties.hxx> #include <svx/sdr/contact/viewcontactofpageobj.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // BaseProperties section sdr::properties::BaseProperties* SdrPageObj::CreateObjectSpecificProperties() @@ -40,7 +40,7 @@ sdr::properties::BaseProperties* SdrPageObj::CreateObjectSpecificProperties() return new sdr::properties::PageProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrPageObj::CreateObjectSpecificViewContact() @@ -48,7 +48,7 @@ sdr::contact::ViewContact* SdrPageObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfPageObj(*this); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // this method is called form the destructor of the referenced page. // do all necessary action to forget the page. It is not necessary to call // RemovePageUser(), that is done form the destructor. @@ -64,7 +64,7 @@ void SdrPageObj::PageInDestruction(const SdrPage& rPage) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrPageObj,SdrObject); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index ad7816ed6e2e..6ff84ff1c738 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -1768,7 +1768,7 @@ void SdrPathObj::ImpForceKind() else { // #i10659#, for polys with more than 2 points. - // + // Here i again need to fix something, because when Path-Polys are Copy-Pasted // between Apps with different measurements (e.g. 100TH_MM and TWIPS) there is // a scaling loop started from SdrExchangeView::Paste. In itself, this is not @@ -1777,7 +1777,7 @@ void SdrPathObj::ImpForceKind() // through Rect2Poly - Poly2Rect does something badly wrong since that cycle is // BASED on aRect. That cycle is triggered in SdrTextObj::NbcResize() which is called // from the local Resize() implementation. - // + // Basic problem is that the member aRect in SdrTextObj basically is a unrotated // text rectangle for the text object itself and methods at SdrTextObj do handle it // in that way. Many draw objects derived from SdrTextObj 'abuse' aRect as SnapRect @@ -2864,14 +2864,14 @@ void SdrPathObj::impDeleteDAC() const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// -// + + // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear // transforms like Scale, ShearX, ShearY, Rotate and Translate are supported. -// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. sal_Bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 937c35d51c07..09ff4b176cb5 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -44,7 +44,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -////////////////////////////////////////////////////////////////////////////// + // BaseProperties section sdr::properties::BaseProperties* SdrRectObj::CreateObjectSpecificProperties() @@ -52,7 +52,7 @@ sdr::properties::BaseProperties* SdrRectObj::CreateObjectSpecificProperties() return new sdr::properties::RectangleProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrRectObj::CreateObjectSpecificViewContact() @@ -60,7 +60,7 @@ sdr::contact::ViewContact* SdrRectObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfSdrRectObj(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrRectObj,SdrTextObj); @@ -377,7 +377,7 @@ SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nHdlNum) const return pH; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrRectObj::hasSpecialDrag() const { @@ -468,7 +468,7 @@ OUString SdrRectObj::getSpecialDragComment(const SdrDragStat& rDrag) const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + basegfx::B2DPolyPolygon SdrRectObj::TakeCreatePoly(const SdrDragStat& rDrag) const { diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 59861fd8c16c..01f63c1c4899 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -60,11 +60,11 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include "svdconv.hxx" -////////////////////////////////////////////////////////////////////////////// + using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + // BaseProperties section sdr::properties::BaseProperties* SdrTextObj::CreateObjectSpecificProperties() @@ -72,7 +72,7 @@ sdr::properties::BaseProperties* SdrTextObj::CreateObjectSpecificProperties() return new sdr::properties::TextProperties(*this); } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrTextObj::CreateObjectSpecificViewContact() @@ -80,7 +80,7 @@ sdr::contact::ViewContact* SdrTextObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfTextObj(*this); } -////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrTextObj,SdrAttrObj); @@ -1349,7 +1349,7 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg ); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + OutlinerParaObject* SdrTextObj::GetOutlinerParaObject() const { @@ -1568,14 +1568,14 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// -// + + // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear // transforms like Scale, ShearX, ShearY, Rotate and Translate are supported. -// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. sal_Bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const @@ -1736,7 +1736,7 @@ bool SdrTextObj::IsRealyEdited() const return pEdtOutl && pEdtOutl->IsModified(); } -///////////////////////////////////////////////////////////////////////////////////////////////// + // moved inlines here form hxx long SdrTextObj::GetEckenradius() const @@ -1960,8 +1960,8 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) static_cast< sdr::properties::TextProperties& >(GetProperties()).SetObjectItemNoBroadcast(rItem); } -///////////////////////////////////////////////////////////////////////////////////////////////// -// + + // The concept of the text object: // ~~~~~~~~~~~~~~~~~~~~~~~~ // Attributes/Variations: @@ -1976,17 +1976,17 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // - enum horizontal text anchoring left,center,right,justify/block,Stretch(ni) // - enum vertical text anchoring top, middle, bottom, block, stretch(ni) // - enum ticker text (if it is not FontWork) -// + // Every derived object is either a text frame (bTextFrame=sal_True) // or a drawing object with a caption (bTextFrame=sal_False). -// + // Default anchoring for text frames: // SDRTEXTHORZADJUST_BLOCK, SDRTEXTVERTADJUST_TOP // = static Pool defaults // Default anchoring for drawing objects with a caption: // SDRTEXTHORZADJUST_CENTER, SDRTEXTVERTADJUST_CENTER // via "hard" attribution of SdrAttrObj -// + // Every object derived from SdrTextObj must return an "UnrotatedSnapRect" // (->TakeUnrotatedSnapRect()) (the reference point for the rotation is the top // left of the rectangle (aGeo.nDrehWink)) which is the basis for anchoring @@ -1999,11 +1999,11 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // be larger than the anchoring area, for text frames on the other hand, it is // always of the same or a smaller size (except when there are negative text // frame margins). -// + // FitToSize takes priority over text anchoring and AutoGrowHeight/Width. When // FitToSize is turned on, the painting area is always equal to the anchoring // area. Additionally, FitToSize doesn't allow automatic line breaks. -// + // ContourTextFrame: // - long rotation angle // - long text frame margins (maybe later) @@ -2013,7 +2013,7 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // - enum horizontal text anchoring (maybe later, for now: left, centered) // - enum vertical text anchoring (maybe later, for now: top) // - enum ticker text (maybe later, maybe even with correct clipping) -// + // When making changes, check these: // - Paint // - HitTest @@ -2023,7 +2023,7 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // - ModelChanged (e. g. through a neighboring View or rulers) while editing // - FillColorChanged while editin // - and many more... -// -///////////////////////////////////////////////////////////////////////////////////////////////// + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 3ca4219f406a..417cacca12ea 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -50,7 +50,7 @@ #include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -////////////////////////////////////////////////////////////////////////////// + // helpers namespace @@ -669,7 +669,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + // primitive decompositions void SdrTextObj::impDecomposeContourTextPrimitive( @@ -1176,7 +1176,7 @@ void SdrTextObj::impDecomposeStretchTextPrimitive( rTarget = aConverter.getPrimitive2DSequence(); } -////////////////////////////////////////////////////////////////////////////// + // timing generators #define ENDLESS_LOOP (0xffffffff) #define ENDLESS_TIME ((double)0xffffffff) diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index fbbbba71744d..42657e0385a9 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -40,7 +40,7 @@ #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> -////////////////////////////////////////////////////////////////////////////// + // primitive decomposition helpers #include <basegfx/polygon/b2dlinegeometry.hxx> @@ -57,13 +57,13 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> #include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::i18n; -////////////////////////////////////////////////////////////////////////////// + // PathTextPortion helper namespace @@ -161,7 +161,7 @@ namespace }; } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + // TextBreakup helper namespace @@ -202,7 +202,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + // TextBreakup one poly and one paragraph helper namespace @@ -560,7 +560,7 @@ namespace }; } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + // primitive decomposition helpers namespace @@ -667,7 +667,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + // primitive decomposition void SdrTextObj::impDecomposePathTextPrimitive( diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 40bd221f1332..7e81766c2e90 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -62,7 +62,7 @@ SdrHdl* SdrTextObj::GetHdl(sal_uInt32 nHdlNum) const return pH; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrTextObj::hasSpecialDrag() const { @@ -82,7 +82,7 @@ Rectangle SdrTextObj::ImpDragCalcRect(const SdrDragStat& rDrag) const if (aGeo.nDrehWink!=0) RotatePoint(aPos,aTmpRect.TopLeft(),-aGeo.nSin,aGeo.nCos); // Unshear: if (aGeo.nShearWink!=0) ShearPoint(aPos,aTmpRect.TopLeft(),-aGeo.nTan); - // + bool bLft=(eHdl==HDL_UPLFT || eHdl==HDL_LEFT || eHdl==HDL_LWLFT); bool bRgt=(eHdl==HDL_UPRGT || eHdl==HDL_RIGHT || eHdl==HDL_LWRGT); bool bTop=(eHdl==HDL_UPRGT || eHdl==HDL_UPPER || eHdl==HDL_UPLFT); @@ -143,7 +143,7 @@ Rectangle SdrTextObj::ImpDragCalcRect(const SdrDragStat& rDrag) const return aTmpRect; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // drag bool SdrTextObj::applySpecialDrag(SdrDragStat& rDrag) @@ -178,7 +178,7 @@ OUString SdrTextObj::getSpecialDragComment(const SdrDragStat& /*rDrag*/) const return aStr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Create bool SdrTextObj::BegCreate(SdrDragStat& rStat) diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 34170cf86cee..5da632bcce9f 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -295,7 +295,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) SetGlueReallyAbsolute(false); } -////////////////////////////////////////////////////////////////////////////// + SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const { @@ -418,7 +418,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const return pRetval; } -////////////////////////////////////////////////////////////////////////////// + SdrObject* SdrTextObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const { diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 202c79199024..10f643ab2b69 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -54,18 +54,18 @@ using namespace ::com::sun::star; using namespace ::sdr::contact; -//************************************************************ + // Defines -//************************************************************ -//************************************************************ + + // Helper class SdrControlEventListenerImpl -//************************************************************ + #include <com/sun/star/lang/XEventListener.hpp> #include <cppuhelper/implbase1.hxx> -// ============================================================================= + class SdrControlEventListenerImpl : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener > { protected: @@ -105,14 +105,14 @@ void SdrControlEventListenerImpl::StartListening(const uno::Reference< lang::XCo xComp->addEventListener(this); } -// ============================================================================= + struct SdrUnoObjDataHolder { mutable ::rtl::Reference< SdrControlEventListenerImpl > pEventListener; }; -// ============================================================================= + namespace { void lcl_ensureControlVisibility( SdrView* _pView, const SdrUnoObj* _pObject, bool _bVisible ) @@ -148,9 +148,9 @@ namespace } } -//************************************************************ + // SdrUnoObj -//************************************************************ + TYPEINIT1(SdrUnoObj, SdrRectObj); @@ -346,7 +346,7 @@ void SdrUnoObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti } } -// ----------------------------------------------------------------------------- + bool SdrUnoObj::hasSpecialDrag() const { @@ -386,7 +386,7 @@ SdrObject* SdrUnoObj::getFullDragClone() const return pRetval; } -// ----------------------------------------------------------------------------- + void SdrUnoObj::NbcSetLayer( SdrLayerID _nLayer ) { if ( GetLayer() == _nLayer ) diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 658c223bb48f..3f383ae4c153 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -29,21 +29,21 @@ #include <svx/svddrgv.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const { return rRefObj.GetProperties(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // #i27224# sdr::contact::ViewContact* SdrVirtObj::CreateObjectSpecificViewContact() { return new sdr::contact::ViewContactOfVirtObj(*this); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrVirtObj,SdrObject); @@ -60,7 +60,7 @@ SdrVirtObj::~SdrVirtObj() rRefObj.DelReference(*this); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + const SdrObject& SdrVirtObj::GetReferencedObj() const { @@ -86,7 +86,7 @@ void SdrVirtObj::NbcSetAnchorPos(const Point& rAnchorPos) aAnchor=rAnchorPos; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrVirtObj::SetModel(SdrModel* pNewModel) { @@ -203,7 +203,7 @@ basegfx::B2DPolyPolygon SdrVirtObj::TakeXorPoly() const return aPolyPolygon; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_uInt32 SdrVirtObj::GetHdlCount() const { @@ -273,7 +273,7 @@ void SdrVirtObj::AddToHdlList(SdrHdlList& rHdlList) const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrVirtObj::hasSpecialDrag() const { @@ -328,7 +328,7 @@ OUString SdrVirtObj::getSpecialDragComment(const SdrDragStat& rDrag) const return rRefObj.getSpecialDragComment(rDrag); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrVirtObj::BegCreate(SdrDragStat& rStat) { @@ -361,7 +361,7 @@ basegfx::B2DPolyPolygon SdrVirtObj::TakeCreatePoly(const SdrDragStat& rDrag) con // TODO: we don't handle offsets yet! } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrVirtObj::NbcMove(const Size& rSiz) { @@ -393,7 +393,7 @@ void SdrVirtObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear SetRectsDirty(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrVirtObj::Move(const Size& rSiz) { @@ -444,7 +444,7 @@ void SdrVirtObj::Shear(const Point& rRef, long nWink, double tn, bool bVShear) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrVirtObj::RecalcSnapRect() { @@ -479,7 +479,7 @@ void SdrVirtObj::NbcSetSnapRect(const Rectangle& rRect) rRefObj.NbcSetSnapRect(aR); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + const Rectangle& SdrVirtObj::GetLogicRect() const { @@ -506,7 +506,7 @@ void SdrVirtObj::NbcSetLogicRect(const Rectangle& rRect) rRefObj.NbcSetLogicRect(aR); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + long SdrVirtObj::GetRotateAngle() const { @@ -518,7 +518,7 @@ long SdrVirtObj::GetShearAngle(bool bVertical) const return rRefObj.GetShearAngle(bVertical); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_uInt32 SdrVirtObj::GetSnapPointCount() const { @@ -555,7 +555,7 @@ void SdrVirtObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i) SetRectsDirty(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrObjGeoData* SdrVirtObj::NewGeoData() const { @@ -573,7 +573,7 @@ void SdrVirtObj::RestGeoData(const SdrObjGeoData& rGeo) SetRectsDirty(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrObjGeoData* SdrVirtObj::GetGeoData() const { @@ -588,7 +588,7 @@ void SdrVirtObj::SetGeoData(const SdrObjGeoData& rGeo) SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrVirtObj::NbcReformatText() { @@ -600,7 +600,7 @@ void SdrVirtObj::ReformatText() rRefObj.ReformatText(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + bool SdrVirtObj::HasMacro() const { diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 2bb7ca0a0653..bdf8b0c668b9 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1070,7 +1070,7 @@ void SdrObjList::RemoveObjectFromContainer ( -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrPageGridFrameList::Clear() { @@ -1081,7 +1081,7 @@ void SdrPageGridFrameList::Clear() aList.clear(); } -////////////////////////////////////////////////////////////////////////////// + // PageUser section void SdrPage::AddPageUser(sdr::PageUser& rNewUser) @@ -1098,7 +1098,7 @@ void SdrPage::RemovePageUser(sdr::PageUser& rOldUser) } } -////////////////////////////////////////////////////////////////////////////// + // DrawContact section sdr::contact::ViewContact* SdrPage::CreateObjectSpecificViewContact() @@ -1117,7 +1117,7 @@ sdr::contact::ViewContact& SdrPage::GetViewContact() const return *mpViewContact; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrPageProperties::ImpRemoveStyleSheet() { @@ -1245,7 +1245,7 @@ SfxStyleSheet* SdrPageProperties::GetStyleSheet() const return mpStyleSheet; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrPage,SdrObjList); DBG_NAME(SdrPage) @@ -1643,7 +1643,7 @@ void SdrPage::SetModel(SdrModel* pNewModel) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // #i68775# React on PageNum changes (from Model in most cases) void SdrPage::SetPageNum(sal_uInt16 nNew) @@ -1685,7 +1685,7 @@ void SdrPage::SetChanged() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // MasterPage interface void SdrPage::TRG_SetMasterPage(SdrPage& rNew) @@ -1876,7 +1876,7 @@ void SdrPage::ActionChanged() const } } -////////////////////////////////////////////////////////////////////////////// + // sdr::Comment interface const SdrPageProperties* SdrPage::getCorrectSdrPageProperties() const @@ -1891,7 +1891,7 @@ const SdrPageProperties* SdrPage::getCorrectSdrPageProperties() const } } -////////////////////////////////////////////////////////////////////////////// + // use new redirector instead of pPaintProc StandardCheckVisisbilityRedirector::StandardCheckVisisbilityRedirector() diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index a24725875f77..cad1c672886a 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star; DBG_NAME(SdrPageView); -//////////////////////////////////////////////////////////////////////////////////////////////////// + // interface to SdrPageWindow SdrPageWindow* SdrPageView::FindPageWindow(SdrPaintWindow& rPaintWindow) const @@ -137,7 +137,7 @@ SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld) return 0L; } -////////////////////////////////////////////////////////////////////////////// + SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView) : mrView(rNewView), @@ -269,7 +269,7 @@ void SdrPageView::InvalidateAllWin() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrPageView::PrePaint() { @@ -313,7 +313,7 @@ void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rRe } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // #i74769# use SdrPaintWindow directly void SdrPageView::setPreparedPageWindow(SdrPageWindow* pKnownTarget) @@ -419,7 +419,7 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor) { diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 0a40eba5675c..51ce7be3fd6d 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -62,7 +62,7 @@ using namespace ::rtl; using namespace ::com::sun::star; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // interface to SdrPaintWindow SdrPaintWindow* SdrPaintView::FindPaintWindow(const OutputDevice& rOut) const @@ -118,7 +118,7 @@ OutputDevice* SdrPaintView::GetFirstOutputDevice() const return 0L; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1( SvxViewHint, SfxHint ); @@ -133,7 +133,7 @@ SvxViewHint::HintType SvxViewHint::GetHintType (void) const } -//////////////////////////////////////////////////////////////////////////////////////////////////// + BitmapEx convertMetafileToBitmapEx( const GDIMetaFile& rMtf, @@ -159,7 +159,7 @@ BitmapEx convertMetafileToBitmapEx( return aBitmapEx; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT2(SdrPaintView,SfxListener,SfxRepeatTarget); @@ -258,7 +258,7 @@ SdrPaintView::~SdrPaintView() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { @@ -302,7 +302,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_ InvalidateAllWin(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + IMPL_LINK_NOARG_INLINE_START(SdrPaintView, ImpComeBackHdl) { @@ -345,7 +345,7 @@ void SdrPaintView::ModelHasChanged() #endif } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrPaintView::IsAction() const { @@ -372,7 +372,7 @@ void SdrPaintView::TakeActionRect(Rectangle&) const { } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // info about TextEdit. Default is sal_False. bool SdrPaintView::IsTextEdit() const { @@ -385,7 +385,7 @@ SdrPageView* SdrPaintView::GetTextEditPageView() const return 0L; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_uInt16 SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const { @@ -429,7 +429,7 @@ void SdrPaintView::SetActualWin(const OutputDevice* pWin) TheresNewMapMode(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrPaintView::ClearPageView() { @@ -573,7 +573,7 @@ void SdrPaintView::PrePaint() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // #define SVX_REPAINT_TIMER_TEST void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) @@ -632,14 +632,14 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::c //RegionHandle aRegionHandle(aOptimizedRepaintRegion.BeginEnumRects()); //Rectangle aRegionRectangle; - // + //while(aOptimizedRepaintRegion.GetEnumRects(aRegionHandle, aRegionRectangle)) //{ // pWindow->SetLineColor(COL_LIGHTGREEN); // pWindow->SetFillColor(); // pWindow->DrawRect(aRegionRectangle); //} - // + //aOptimizedRepaintRegion.EndEnumRects(aRegionHandle); } #endif @@ -706,7 +706,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::c #endif // SVX_REPAINT_TIMER_TEST } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // #i72889# SdrPaintWindow* SdrPaintView::BeginCompleteRedraw(OutputDevice* pOut) @@ -773,7 +773,7 @@ void SdrPaintView::EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFo } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect) { @@ -857,7 +857,7 @@ Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& return aOptimizedRepaintRegion; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const { @@ -880,7 +880,7 @@ void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/) { @@ -1120,7 +1120,7 @@ sal_Bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontR return sal_True; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + #ifdef DBG_UTIL void SdrPaintView::ShowItemBrowser(sal_Bool bShow) diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index af394839baa2..9d20c70a7bb4 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -35,7 +35,7 @@ using namespace sdr; -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrPolyEditView::ImpResetPolyPossibilityFlags() { @@ -576,7 +576,7 @@ void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { @@ -651,7 +651,7 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/) { @@ -672,7 +672,7 @@ void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz, bool bCopy) AdjustMarkHdl(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* p2, const void* p3, const void* /*p4*/, const void* /*p5*/) { @@ -693,7 +693,7 @@ void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFac AdjustMarkHdl(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* /*p2*/, const void* p3, const void* p4, const void* /*p5*/) { diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 4bdc12c38ff8..4f1238a027ce 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -33,7 +33,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdrpaintwindow.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + class ImplPageOriginOverlay { // The OverlayObjects @@ -95,7 +95,7 @@ void ImplPageOriginOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + class ImplHelpLineOverlay { // The OverlayObjects @@ -220,7 +220,7 @@ SdrSnapView::~SdrSnapView() BrkDragHelpLine(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrSnapView::IsAction() const { @@ -272,7 +272,7 @@ void SdrSnapView::TakeActionRect(Rectangle& rRect) const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + Point SdrSnapView::GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const { @@ -459,7 +459,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrSnapView::BegSetPageOrg(const Point& rPnt) { @@ -516,7 +516,7 @@ void SdrSnapView::BrkSetPageOrg() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const { diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index fe82180f53ab..379cee04ba2d 100644 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -27,7 +27,7 @@ String STR_ObjNamePluralNONE { Text [ en-US ] = "draw objects" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulGRUP { Text [ en-US ] = "group object" ; @@ -44,7 +44,7 @@ String STR_ObjNamePluralGRUPEMPTY { Text [ en-US ] = "Blank group objects" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulLINE { Text [ en-US ] = "Line" ; @@ -65,7 +65,7 @@ String STR_ObjNamePluralLINE { Text [ en-US ] = "Lines" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulRECT { Text [ en-US ] = "Rectangle" ; @@ -130,7 +130,7 @@ String STR_ObjNamePluralRAUTERND { Text [ en-US ] = "Rounded rhombuses" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulCIRC { Text [ en-US ] = "Circle" ; @@ -195,7 +195,7 @@ String STR_ObjNamePluralCCUTE { Text [ en-US ] = "Ellipse Segments" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulPOLY { Text [ en-US ] = "Polygon" ; @@ -268,7 +268,7 @@ String STR_ObjNamePluralCOMBFILL { Text [ en-US ] = "Curve objects" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulNATSPLN { Text [ en-US ] = "Natural Spline" ; @@ -285,7 +285,7 @@ String STR_ObjNamePluralPERSPLN { Text [ en-US ] = "Periodic Splines" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulTEXT { Text [ en-US ] = "Text Frame" ; @@ -334,7 +334,7 @@ String STR_ObjNamePluralOUTLINETEXT { Text [ en-US ] = "Outline Texts" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulGRAF { Text [ en-US ] = "graphic" ; @@ -440,7 +440,7 @@ String STR_ObjNamePluralGRAFMACLNK Text [ en-US ] = "Linked Mac graphics" ; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Svg support String STR_ObjNameSingulGRAFSVG @@ -452,7 +452,7 @@ String STR_ObjNamePluralGRAFSVG Text [ en-US ] = "SVGs" ; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulOLE2 { @@ -482,7 +482,7 @@ String STR_ObjOLE2NamePrefix { Text [ en-US ] = "Object" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulFrame { Text [ en-US ] = "Frame" ; @@ -495,7 +495,7 @@ String STR_ObjFrameNamePrefix { Text [ en-US ] = "Frame" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulEDGE { Text [ en-US ] = "Object Connectors" ; @@ -512,7 +512,7 @@ String STR_ObjNamePluralCAPTION { Text [ en-US ] = "Callouts" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ObjNameSingulPAGE { Text [ en-US ] = "Preview object" ; @@ -546,9 +546,9 @@ String STR_ObjNameSingulPlural Text [ en-US ] = "draw object(s)" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////// + + + // New in 537: names for 3D objects String STR_ObjNameSingulCube3d @@ -626,9 +626,9 @@ String STR_ObjNamePluralSphere3d Text [ en-US ] = "spheres"; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////// + + + String STR_EditWithCopy { @@ -1116,9 +1116,9 @@ String STR_StandardLayerName { Text [ en-US ] = "Standard" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////// + + + String STR_ItemValON { Text [ en-US ] = "on" ; @@ -1135,7 +1135,7 @@ String STR_ItemValNO { Text [ en-US ] = "No" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ItemValCAPTIONTYPE1 { Text [ en-US ] = "Type 1" ; @@ -1164,7 +1164,7 @@ String STR_ItemValCAPTIONESCBESTFIT { Text [ en-US ] = "Automatic" ; }; - /////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ItemValFITTOSIZENONE { Text [ en-US ] = "Off" ; @@ -1181,7 +1181,7 @@ String STR_ItemValFITTOSIZERESIZEAT { Text [ en-US ] = "Use hard attributes" ; }; - /////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ItemValTEXTVADJTOP { Text [ en-US ] = "Top" ; @@ -1222,7 +1222,7 @@ String STR_ItemValTEXTHADJSTRETCH { Text [ en-US ] = "Stretched" ; }; - /////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ItemValTEXTANI_NONE { Text [ en-US ] = "off" ; @@ -1259,7 +1259,7 @@ String STR_ItemValTEXTANI_DOWN { Text [ en-US ] = "down" ; }; - /////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ItemValEDGE_ORTHOLINES { Text [ en-US ] = "Standard Connector" ; @@ -1276,7 +1276,7 @@ String STR_ItemValEDGE_BEZIER { Text [ en-US ] = "Curved Connector" ; }; - /////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ItemValMEASURE_STD { Text [ en-US ] = "Standard" ; @@ -1321,7 +1321,7 @@ String STR_ItemValMEASURETEXT_VERTICALCEN { Text [ en-US ] = "centered" ; }; - /////////////////////////////////////////////////////////////////////////////////////////////////// + String STR_ItemValCIRC_FULL { Text [ en-US ] = "full circle" ; @@ -1338,8 +1338,8 @@ String STR_ItemValCIRC_ARC { Text [ en-US ] = "Arc" ; }; - /////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////// + + String STR_ItemNam_SHADOW { Text [ en-US ] = "Shadow" ; @@ -1568,9 +1568,9 @@ String STR_ItemNam_SHEARANGLE { Text [ en-US ] = "Shear angle" ; }; - //////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////// + + + // End of cached strings // Now: bitmaps: diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 45c89018347f..10ea4007a055 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -304,7 +304,7 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen } return 0.0; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { @@ -375,7 +375,7 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { @@ -401,7 +401,7 @@ void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rR } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + long GetAngle(const Point& rPnt) { @@ -466,7 +466,7 @@ long GetLen(const Point& rPnt) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void GeoStat::RecalcSinCos() { @@ -490,7 +490,7 @@ void GeoStat::RecalcTan() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo) { @@ -546,7 +546,7 @@ void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo) rRect=Rectangle(aPt0,aRU); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho) { @@ -577,7 +577,7 @@ void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + long BigMulDiv(long nVal, long nMul, long nDiv) { @@ -628,7 +628,7 @@ void Kuerzen(Fraction& rF, unsigned nDigits) rF=Fraction(nMul,nDiv); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // How many eU units fit into a mm, respectively an inch? // Or: How many mm, respectively inches, are there in an eU (and then give me the inverse) @@ -712,7 +712,7 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD) return aRet; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // 1 mile = 8 furlong = 63.360" = 1.609.344,0mm // 1 furlong = 10 chains = 7.920" = 201.168,0mm @@ -1103,7 +1103,7 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, OUString& rStr) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 2e1ab7a01027..940e83ec5aec 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -42,7 +42,7 @@ #include <svx/svdograf.hxx> #include <svx/sdr/contact/viewcontactofgraphic.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // iterates over all views and unmarks this SdrObject if it is marked static void ImplUnmarkObject( SdrObject* pObj ) @@ -54,7 +54,7 @@ static void ImplUnmarkObject( SdrObject* pObj ) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(SdrUndoAction,SfxUndoAction); @@ -95,7 +95,7 @@ OUString SdrUndoAction::GetSdrRepeatComment(SdrView& /*rView*/) const return OUString(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod) : SdrUndoAction(rNewMod), @@ -552,7 +552,7 @@ OUString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const return aStr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrUndoMoveObj::~SdrUndoMoveObj() {} @@ -596,7 +596,7 @@ OUString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const return aStr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj) : SdrUndoObj(rNewObj) @@ -676,7 +676,7 @@ OUString SdrUndoGeoObj::GetComment() const return aStr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SdrUndoObjList::ObjListListener : public SfxListener { @@ -788,7 +788,7 @@ void SdrUndoObjList::SetOrdNum(sal_uInt32 nOrdNum_) nOrdNum = nOrdNum_; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrUndoRemoveObj::Undo() { @@ -840,7 +840,7 @@ SdrUndoRemoveObj::~SdrUndoRemoveObj() { } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrUndoInsertObj::Undo() { @@ -890,7 +890,7 @@ void SdrUndoInsertObj::Redo() ImpShowPageOfThisObject(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrUndoDelObj::TryToFlushGraphicContent() { @@ -962,7 +962,7 @@ OUString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const return aStr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrUndoNewObj::Undo() { @@ -1082,7 +1082,7 @@ void SdrUndoReplaceObj::SetOldOwner(bool bNew) bOldOwner = bNew; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + OUString SdrUndoCopyObj::GetComment() const { @@ -1091,7 +1091,7 @@ OUString SdrUndoCopyObj::GetComment() const return aStr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // #i11702# SdrUndoObjectLayerChange::SdrUndoObjectLayerChange(SdrObject& rObj, SdrLayerID aOldLayer, SdrLayerID aNewLayer) @@ -1113,7 +1113,7 @@ void SdrUndoObjectLayerChange::Redo() ImpShowPageOfThisObject(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) : SdrUndoObj(rNewObj) @@ -1157,7 +1157,7 @@ OUString SdrUndoObjOrdNum::GetComment() const return aStr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText) : SdrUndoObj(rNewObj) @@ -1383,7 +1383,7 @@ SdrUndoLayer::~SdrUndoLayer() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrUndoNewLayer::Undo() { @@ -1408,7 +1408,7 @@ OUString SdrUndoNewLayer::GetComment() const return ImpGetResStr(STR_UndoNewLayer); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrUndoDelLayer::Undo() { @@ -1433,7 +1433,7 @@ OUString SdrUndoDelLayer::GetComment() const return ImpGetResStr(STR_UndoDelLayer); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrUndoMoveLayer::Undo() { @@ -1523,7 +1523,7 @@ void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, rStr = ImpGetResStr(nStrCacheID); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrUndoPageList::SdrUndoPageList(SdrPage& rNewPg) : SdrUndoPage(rNewPg) @@ -1540,7 +1540,7 @@ SdrUndoPageList::~SdrUndoPageList() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg) : SdrUndoPageList(rNewPg) @@ -1623,7 +1623,7 @@ bool SdrUndoDelPage::CanSdrRepeat(SdrView& /*rView*/) const return false; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrUndoNewPage::Undo() { @@ -1646,7 +1646,7 @@ OUString SdrUndoNewPage::GetComment() const return aStr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + OUString SdrUndoCopyPage::GetComment() const { @@ -1672,7 +1672,7 @@ bool SdrUndoCopyPage::CanSdrRepeat(SdrView& /*rView*/) const return false; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrUndoSetPageNum::Undo() { @@ -1707,7 +1707,7 @@ SdrUndoPageMasterPage::~SdrUndoPageMasterPage() { } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrUndoPageRemoveMasterPage::SdrUndoPageRemoveMasterPage(SdrPage& rChangedPage) : SdrUndoPageMasterPage(rChangedPage) @@ -1735,7 +1735,7 @@ OUString SdrUndoPageRemoveMasterPage::GetComment() const return aStr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrUndoPageChangeMasterPage::SdrUndoPageChangeMasterPage(SdrPage& rChangedPage) : SdrUndoPageMasterPage(rChangedPage), @@ -1780,7 +1780,7 @@ OUString SdrUndoPageChangeMasterPage::GetComment() const return aStr; } -/////////////////////////////////////////////////////////////////////// + SdrUndoFactory::~SdrUndoFactory(){} // shapes SdrUndoAction* SdrUndoFactory::CreateUndoMoveObject( SdrObject& rObject ) diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 45aaca34f978..a7e73b1ada11 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -50,7 +50,7 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <drawinglayer/processor2d/contourextractor2d.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrViewEvent::SdrViewEvent() : pHdl(NULL), @@ -88,7 +88,7 @@ SdrViewEvent::~SdrViewEvent() { } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // helper class for all D&D overlays void SdrDropMarkerOverlay::ImplCreateOverlays( diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index f9b738aa84c5..f4021a7c2545 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -28,7 +28,7 @@ #include <svl/brdcst.hxx> #include <svx/sdrpaintwindow.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + void SdrViewIter::ImpInitVars() { @@ -38,7 +38,7 @@ void SdrViewIter::ImpInitVars() mpAktView = 0L; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrViewIter::SdrViewIter(const SdrPage* pPage, sal_Bool bNoMasterPage) { @@ -49,7 +49,7 @@ SdrViewIter::SdrViewIter(const SdrPage* pPage, sal_Bool bNoMasterPage) ImpInitVars(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrViewIter::SdrViewIter(const SdrObject* pObject, sal_Bool bNoMasterPage) { @@ -67,7 +67,7 @@ SdrViewIter::SdrViewIter(const SdrObject* pObject, sal_Bool bNoMasterPage) ImpInitVars(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const { @@ -135,7 +135,7 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const } } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrView* SdrViewIter::ImpFindView() { @@ -176,7 +176,7 @@ SdrView* SdrViewIter::ImpFindView() return mpAktView; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrView* SdrViewIter::FirstView() { @@ -184,7 +184,7 @@ SdrView* SdrViewIter::FirstView() return ImpFindView(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrView* SdrViewIter::NextView() { diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index d62f4c685ada..91f631f5b4fb 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -55,7 +55,7 @@ #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/displayinfo.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + SdrExchangeView::SdrExchangeView(SdrModel* pModel1, OutputDevice* pOut): SdrObjEditView(pModel1,pOut) @@ -523,7 +523,7 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked) const return aBmp; } -// ----------------------------------------------------------------------------- + GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool bNoVDevIfOneMtfMarked) const { @@ -585,7 +585,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool bNoVDevIfOneMtfMarked) co return aMtf; } -// ----------------------------------------------------------------------------- + Graphic SdrExchangeView::GetAllMarkedGraphic() const { @@ -602,7 +602,7 @@ Graphic SdrExchangeView::GetAllMarkedGraphic() const return aRet; } -// ----------------------------------------------------------------------------- + Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* pObj ) { @@ -670,7 +670,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* return aRet; } -// ----------------------------------------------------------------------------- + ::std::vector< SdrObject* > SdrExchangeView::GetMarkedObjects() const { @@ -709,7 +709,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* return aRetval; } -// ----------------------------------------------------------------------------- + void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const { @@ -725,7 +725,7 @@ void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const } } -// ----------------------------------------------------------------------------- + SdrModel* SdrExchangeView::GetMarkedObjModel() const { @@ -778,7 +778,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const return pNeuMod; } -// ----------------------------------------------------------------------------- + sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) { @@ -786,7 +786,7 @@ sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) return sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) { @@ -794,7 +794,7 @@ sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) return sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/) { diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 4e3e04c9ca97..ea686169cca3 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -32,7 +32,7 @@ #include "editeng/unotext.hxx" #include "svx/svdtext.hxx" -// ----------------------------------------------------------------------------- + class SfxItemSet; class OutlinerParaObject; @@ -42,11 +42,11 @@ namespace sdr { namespace properties { class TextProperties; } } -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + class SVX_DLLPUBLIC Cell : public SdrText, public SvxUnoTextBase, @@ -234,7 +234,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::table::XTable > mxTable; }; -// ----------------------------------------------------------------------------- + } } diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx index b90937640758..989447de1d4b 100644 --- a/svx/source/table/cellcursor.hxx +++ b/svx/source/table/cellcursor.hxx @@ -25,15 +25,15 @@ #include <cppuhelper/implbase2.hxx> #include "cellrange.hxx" -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { struct CellPos; -// ----------------------------------------------------------------------------- + // CellCursor -// ----------------------------------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper2< CellRange, ::com::sun::star::table::XCellCursor, ::com::sun::star::table::XMergeableCellRange > CellCursorBase; diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx index 969c97a76c6e..2c18882a7165 100644 --- a/svx/source/table/cellrange.hxx +++ b/svx/source/table/cellrange.hxx @@ -25,13 +25,13 @@ #include "tablemodel.hxx" -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // CellRange -// ----------------------------------------------------------------------------- + class CellRange : public ::cppu::WeakAggImplHelper1< ::com::sun::star::table::XCellRange >, public ICellRange { diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index a9c4fa049dd6..52b9d9caa8b7 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -33,12 +33,12 @@ namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + typedef std::vector< ::com::sun::star::beans::Property > PropertyVector; typedef boost::unordered_map< OUString, ::sal_uInt32, OUStringHash, ::std::equal_to< OUString > > PropertyMap; -// ----------------------------------------------------------------------------- + class FastPropertySetInfo : public ::cppu::WeakAggImplHelper1< ::com::sun::star::beans::XPropertySetInfo > { @@ -61,7 +61,7 @@ private: PropertyMap maMap; }; -// ----------------------------------------------------------------------------- + class FastPropertySet : public ::cppu::WeakAggImplHelper3< ::com::sun::star::beans::XPropertySet, ::com::sun::star::beans::XMultiPropertySet, ::com::sun::star::beans::XFastPropertySet > { diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 4dd6a56a42df..1becdf49422e 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -2262,7 +2262,7 @@ SdrHdl* SdrTableObj::GetHdl(sal_uInt32 nHdlNum) const return pRetval; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Draging bool SdrTableObj::hasSpecialDrag() const @@ -2389,7 +2389,7 @@ basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag return aRetval; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Create diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index e8379f6b5147..b9f3f59a2010 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -27,13 +27,13 @@ #include "propertyset.hxx" #include "tablemodel.hxx" -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // TableColumn -// ----------------------------------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper2< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableColumnBase; diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx index ba6057adf4f0..6a6a67e116c1 100644 --- a/svx/source/table/tablecolumns.hxx +++ b/svx/source/table/tablecolumns.hxx @@ -25,13 +25,13 @@ #include "tablemodel.hxx" -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // TableColumns -// ----------------------------------------------------------------------------- + class TableColumns : public ::cppu::WeakAggImplHelper1< ::com::sun::star::table::XTableColumns > { diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index bd8419c3415d..4ee398dacde6 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -500,7 +500,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) if( mxTable.is() ) try { - // + bool bInsertAfter = true; sal_uInt16 nCount = 0; if( pArgs ) diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 72ad4ff0d357..adaa2c7c4b58 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -199,7 +199,7 @@ void TableEdgeHdl::CreateB2dIAObject() } } -////////////////////////////////////////////////////////////////////////////// + OverlayTableEdge::OverlayTableEdge( const basegfx::B2DPolyPolygon& rPolyPolygon, bool bVisible ) : OverlayObject(Color(COL_GRAY)) @@ -244,7 +244,7 @@ drawinglayer::primitive2d::Primitive2DSequence OverlayTableEdge::createOverlayOb return aRetval; } -// ==================================================================== + TableBorderHdl::TableBorderHdl( const Rectangle& rRect, @@ -310,7 +310,7 @@ void TableBorderHdl::CreateB2dIAObject() } } -////////////////////////////////////////////////////////////////////////////// + } // end of namespace table } // end of namespace sdr diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx index 89d1c24716dc..654e7b849458 100644 --- a/svx/source/table/tablehandles.hxx +++ b/svx/source/table/tablehandles.hxx @@ -24,7 +24,7 @@ #include <svx/svdhdl.hxx> -// -------------------------------------------------------------------- + namespace sdr { namespace table { diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index d2ec7309792e..aab0f403d747 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -487,7 +487,7 @@ sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribu if( nIndex == (nCount-1) ) n = nDistributed; // for last entitie, use up rest else - n = (nDistribute * rLayout.mnSize) / nCurrentWidth; // + n = (nDistribute * rLayout.mnSize) / nCurrentWidth; nDistributed -= n; rLayout.mnSize += n; diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index 1d3d4469e59e..bef1c87e5c49 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -34,7 +34,7 @@ class Rectangle; -// ----------------------------------------------------------------------------- + namespace editeng { class SvxBorderLine; @@ -50,9 +50,9 @@ bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedCol, sal_Int typedef std::vector< editeng::SvxBorderLine* > BorderLineVector; typedef std::vector< BorderLineVector > BorderLineMap; -// ----------------------------------------------------------------------------- + // TableModel -// ----------------------------------------------------------------------------- + class TableLayouter { diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index 290b6987cad2..84b3445a524c 100644 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx @@ -30,15 +30,15 @@ #include <comphelper/listenernotification.hxx> #include "celltypes.hxx" -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { class SdrTableObj; -// ----------------------------------------------------------------------------- + // ICellRange -// ----------------------------------------------------------------------------- + /** base class for each object implementing an XCellRange */ class ICellRange @@ -54,9 +54,9 @@ protected: ~ICellRange() {} }; -// ----------------------------------------------------------------------------- + // TableModel -// ----------------------------------------------------------------------------- + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::table::XTable, ::com::sun::star::util::XBroadcaster > TableModelBase; diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 40252c8961e4..cead2c77a9cd 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -27,13 +27,13 @@ #include "propertyset.hxx" #include "tablemodel.hxx" -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // TableRow -// ----------------------------------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper2< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableRowBase; diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx index 784e5374d7ea..1d62b1799a52 100644 --- a/svx/source/table/tablerows.hxx +++ b/svx/source/table/tablerows.hxx @@ -25,13 +25,13 @@ #include "tablemodel.hxx" -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // TableRows -// ----------------------------------------------------------------------------- + class TableRows : public ::cppu::WeakAggImplHelper1< ::com::sun::star::table::XTableRows > { diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index b692de271b4c..a9578ffc2eef 100644 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -35,7 +35,7 @@ namespace sdr { namespace properties { class OutlinerParaObject; -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { @@ -80,7 +80,7 @@ private: bool mbUndo; }; -// ----------------------------------------------------------------------------- + class InsertRowUndo : public SdrUndoAction { @@ -98,7 +98,7 @@ private: bool mbUndo; }; -// ----------------------------------------------------------------------------- + class RemoveRowUndo : public SdrUndoAction { @@ -116,7 +116,7 @@ private: bool mbUndo; }; -// ----------------------------------------------------------------------------- + class InsertColUndo : public SdrUndoAction { @@ -135,7 +135,7 @@ private: bool mbUndo; }; -// ----------------------------------------------------------------------------- + class RemoveColUndo : public SdrUndoAction { @@ -154,7 +154,7 @@ private: bool mbUndo; }; -// ----------------------------------------------------------------------------- + class TableColumnUndo : public SdrUndoAction { @@ -186,7 +186,7 @@ private: bool mbHasRedoData; }; -// ----------------------------------------------------------------------------- + class TableRowUndo : public SdrUndoAction { @@ -219,7 +219,7 @@ private: bool mbHasRedoData; }; -// ----------------------------------------------------------------------------- + class TableStyleUndo : public SdrUndoAction { diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index a5325eb6b4b4..2558d12014c8 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -41,12 +41,12 @@ #include "cell.hxx" #include "tablelayouter.hxx" -////////////////////////////////////////////////////////////////////////////// + using editeng::SvxBorderLine; using namespace com::sun::star; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -145,7 +145,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -458,7 +458,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx index a3886339541d..0ebfa4e19873 100644 --- a/svx/source/table/viewcontactoftableobj.hxx +++ b/svx/source/table/viewcontactoftableobj.hxx @@ -22,10 +22,10 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -57,7 +57,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index 6b4753de25b1..a2de66af1948 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -22,7 +22,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -////////////////////////////////////////////////////////////////////////////// + SvxColorValueSet::SvxColorValueSet(Window* _pParent, WinBits nWinStyle) : ValueSet(_pParent, nWinStyle) diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index cdad609a676a..14dffdaf8ba5 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//======================================================================== + // class SvxColorWindow_Impl -------------------------------------------------- -//======================================================================== + #ifndef INCLUDED_SVX_SOURCE_TBXCTRLS_COLORWINDOW_HXX #define INCLUDED_SVX_SOURCE_TBXCTRLS_COLORWINDOW_HXX @@ -30,9 +30,9 @@ #include <com/sun/star/frame/XFrame.hpp> #include <svx/SvxColorValueSet.hxx> -//======================================================================== + // class SvxColorWindow_Impl -------------------------------------------------- -//======================================================================== + class SvxColorWindow_Impl : public SfxPopupWindow { diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index aafeed7b7bfe..9dd93cd2a308 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -44,7 +44,7 @@ #include "colorwindow.hxx" #include "extrusiondepthdialog.hxx" -//////////// + //using ::svtools::ToolbarMenu; @@ -232,9 +232,9 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl ) return 0; } -// ======================================================================= + // ExtrusionDirectionControl -// ======================================================================= + ExtrusionDirectionControl::ExtrusionDirectionControl( const Reference< XComponentContext >& rxContext @@ -486,9 +486,9 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) return 0; } -// ======================================================================= + // ExtrusionDirectionControl -// ======================================================================= + ExtrusionDepthController::ExtrusionDepthController( const Reference< XComponentContext >& rxContext @@ -751,7 +751,7 @@ IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl ) return 0; } -// ======================================================================== + ExtrusionLightingControl::ExtrusionLightingControl( const Reference< XComponentContext >& rxContext @@ -894,7 +894,7 @@ IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl) return 0; } -// ======================================================================== + ExtrusionSurfaceControl::ExtrusionSurfaceControl( const Reference< XComponentContext >& rxContext @@ -955,7 +955,7 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames( return ExtrusionSurfaceControl_getSupportedServiceNames(); } -//======================================================================== + SFX_IMPL_TOOLBOX_CONTROL( ExtrusionColorControl, SvxColorItem ); diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index b2cbf39f4ea1..6dc5a40534a6 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -33,7 +33,7 @@ class ValueSet; -//======================================================================== + namespace svx { @@ -64,7 +64,7 @@ private: }; -//======================================================================== + class ExtrusionDirectionControl : public svt::PopupWindowController { @@ -80,7 +80,7 @@ public: using svt::PopupWindowController::createPopupWindow; }; -//======================================================================== + class ExtrusionDepthWindow : public svtools::ToolbarMenu { @@ -112,7 +112,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; -//======================================================================== + class ExtrusionDepthController : public svt::PopupWindowController { @@ -128,7 +128,7 @@ public: using svt::PopupWindowController::createPopupWindow; }; -//======================================================================== + class ExtrusionLightingWindow : public svtools::ToolbarMenu { @@ -163,7 +163,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; -//======================================================================== + class ExtrusionLightingControl : public svt::PopupWindowController { @@ -179,7 +179,7 @@ public: using svt::PopupWindowController::createPopupWindow; }; -//======================================================================== + class ExtrusionSurfaceWindow : public svtools::ToolbarMenu { @@ -203,7 +203,7 @@ public: virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); }; -//======================================================================== + class ExtrusionSurfaceControl : public svt::PopupWindowController { @@ -219,7 +219,7 @@ public: using svt::PopupWindowController::createPopupWindow; }; -//======================================================================== + } #endif diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index c99830464191..44ed0d6ba93b 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -77,7 +77,7 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId addStatusListener( OUString( ".uno:BitmapListState" )); } -//======================================================================== + SvxFillToolBoxControl::~SvxFillToolBoxControl() { @@ -88,7 +88,7 @@ SvxFillToolBoxControl::~SvxFillToolBoxControl() delete pBitmapItem; } -//======================================================================== + void SvxFillToolBoxControl::StateChanged( @@ -214,7 +214,7 @@ void SvxFillToolBoxControl::StateChanged( } } -//======================================================================== + void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) { @@ -461,7 +461,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) } } -//======================================================================== + Window* SvxFillToolBoxControl::CreateItemWindow( Window *pParent ) { diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index c1c6365c3546..4a6bb2939057 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -300,9 +300,9 @@ void FontWorkShapeTypeControl::Select( sal_Bool ) } -// ======================================================================== + // FontworkAlignmentWindow -// ======================================================================== + class FontworkAlignmentWindow : public ToolbarMenu { @@ -423,9 +423,9 @@ IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl) return 0; } -// ======================================================================== + // FontworkAlignmentControl -// ======================================================================== + class FontworkAlignmentControl : public svt::PopupWindowController { @@ -661,9 +661,9 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl) return 0; } -// ======================================================================== + // FontworkCharacterSpacingControl -// ======================================================================== + class FontworkCharacterSpacingControl : public svt::PopupWindowController { diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 2f87062297c8..caaf1b071c43 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -30,10 +30,10 @@ #include <vcl/toolbox.hxx> #include <vcl/settings.hxx> -//............................................................................. + namespace svx { -//............................................................................. + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -106,8 +106,8 @@ void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState SfxToolBoxControl::StateChanged( nSID, eState, pState ); } -//............................................................................. + } //namespace svx -//............................................................................. + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/grafctrl.src b/svx/source/tbxctrls/grafctrl.src index 0fb164ab5e55..163c8ab60d47 100644 --- a/svx/source/tbxctrls/grafctrl.src +++ b/svx/source/tbxctrls/grafctrl.src @@ -105,9 +105,9 @@ FloatingWindow RID_SVXTBX_GRFFILTER }; }; -// ----------- + // - Strings - -// ----------- + String RID_SVXSTR_UNDO_GRAFMODE { diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 9591a1c9ae94..ef667913f1a1 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -53,9 +53,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; #define LOGICAL_EDIT_HEIGHT 12 -//======================================================================== + // SvxLineBox -//======================================================================== + SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : LineLB( pParent, nBits ), @@ -258,9 +258,9 @@ void SvxLineBox::FillControl() } } -//======================================================================== + // SvxColorBox -//======================================================================== + SvxColorBox::SvxColorBox( Window* pParent, @@ -449,9 +449,9 @@ void SvxColorBox::ReleaseFocus_Impl() } } -//======================================================================== + // SvxMetricField -//======================================================================== + SvxMetricField::SvxMetricField( Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) @@ -629,9 +629,9 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt ) MetricField::DataChanged( rDCEvt ); } -//======================================================================== + // SvxFillTypeBox -//======================================================================== + SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) : FillTypeLB( pParent, nBits | WB_TABSTOP ), @@ -721,9 +721,9 @@ void SvxFillTypeBox::ReleaseFocus_Impl() } } -//======================================================================== + // SvxFillAttrBox -//======================================================================== + SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) : diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index aa44b89d9afd..c849f8988257 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::frame; class SvxPopupWindowListBox; -///////////////////////////////////////////////////////////////// + class SvxPopupWindowListBox : public SfxPopupWindow { @@ -85,7 +85,7 @@ public: /*virtual*/Window* GetPreferredKeyInputWindow(); }; -///////////////////////////////////////////////////////////////// + SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx ) : SfxPopupWindow( nSlotId, Reference< XFrame >(), SVX_RES( RID_SVXTBX_UNDO_REDO_CTRL ) ), @@ -144,7 +144,7 @@ Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow() return pListBox->GetPreferredKeyInputWindow(); } -///////////////////////////////////////////////////////////////// + SvxListBoxControl::SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ), @@ -236,7 +236,7 @@ IMPL_LINK_NOARG(SvxListBoxControl, SelectHdl) return 0; } -///////////////////////////////////////////////////////////////// + SFX_IMPL_TOOLBOX_CONTROL( SvxUndoRedoControl, SfxStringItem ); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 78303aa1ff86..d2a6d51b0ed8 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -69,7 +69,7 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, addStatusListener( OUString( ".uno:DashListState" )); } -//======================================================================== + SvxLineStyleToolBoxControl::~SvxLineStyleToolBoxControl() { @@ -77,7 +77,7 @@ SvxLineStyleToolBoxControl::~SvxLineStyleToolBoxControl() delete pDashItem; } -//======================================================================== + void SvxLineStyleToolBoxControl::StateChanged ( @@ -120,7 +120,7 @@ void SvxLineStyleToolBoxControl::StateChanged ( } } -//======================================================================== + void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) { @@ -188,7 +188,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) } } -//======================================================================== + Window* SvxLineStyleToolBoxControl::CreateItemWindow( Window *pParent ) { @@ -208,13 +208,13 @@ SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl( addStatusListener( OUString( ".uno:MetricUnit" )); } -//======================================================================== + SvxLineWidthToolBoxControl::~SvxLineWidthToolBoxControl() { } -//======================================================================== + void SvxLineWidthToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) @@ -255,7 +255,7 @@ void SvxLineWidthToolBoxControl::StateChanged( } } -//======================================================================== + Window* SvxLineWidthToolBoxControl::CreateItemWindow( Window *pParent ) { @@ -275,13 +275,13 @@ SvxLineColorToolBoxControl::SvxLineColorToolBoxControl( addStatusListener( OUString( ".uno:ColorTableState" )); } -//======================================================================== + SvxLineColorToolBoxControl::~SvxLineColorToolBoxControl() { } -//======================================================================== + void SvxLineColorToolBoxControl::StateChanged( @@ -315,7 +315,7 @@ void SvxLineColorToolBoxControl::StateChanged( Update( pState ); } -//======================================================================== + void SvxLineColorToolBoxControl::Update( const SfxPoolItem* pState ) { @@ -333,7 +333,7 @@ void SvxLineColorToolBoxControl::Update( const SfxPoolItem* pState ) } } -//======================================================================== + Window* SvxLineColorToolBoxControl::CreateItemWindow( Window *pParent ) { @@ -572,8 +572,8 @@ void SvxLineEndWindow::Resize() void SvxLineEndWindow::Resizing( Size& rNewSize ) { Size aBitmapSize = aBmpSize; // -> Member - aBitmapSize.Width() += 6; // - aBitmapSize.Height() += 6; // + aBitmapSize.Width() += 6; + aBitmapSize.Height() += 6; Size aItemSize = aLineEndSet.CalcItemSizePixel( aBitmapSize ); // -> Member //Size aOldSize = GetOutputSizePixel(); // for width diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index c40c639fb248..17f88bfb073b 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -121,9 +121,9 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxFrameLineStyleToolBoxControl, SvxLineItem ); SFX_IMPL_TOOLBOX_CONTROL( SvxFrameLineColorToolBoxControl, SvxColorItem ); SFX_IMPL_TOOLBOX_CONTROL( SvxSimpleUndoRedoController, SfxStringItem ); -//======================================================================== + // class SvxStyleBox_Impl ----------------------------------------------------- -//======================================================================== + class SvxStyleBox_Impl : public ComboBox @@ -171,9 +171,9 @@ private: void ReleaseFocus(); }; -//======================================================================== + // class SvxFontNameBox -------------------------------------------------- -//======================================================================== + class SvxFontNameBox_Impl : public FontNameBox { @@ -230,9 +230,9 @@ public: SAL_WNODEPRECATED_DECLARATIONS_POP }; -//======================================================================== + // class SvxFrameWindow_Impl -------------------------------------------------- -//======================================================================== + // SelectHdl needs the Modifiers, get them in MouseButtonUp @@ -281,9 +281,9 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; -//======================================================================== + // class SvxLineWindow_Impl --------------------------------------------------- -//======================================================================== + class SvxLineWindow_Impl : public SfxPopupWindow { private: @@ -304,11 +304,11 @@ public: virtual SfxPopupWindow* Clone() const; }; -//######################################################################## + // Helper classes: -//======================================================================== + // class SfxStyleControllerItem ------------------------------------------ -//======================================================================== + class SvxStyleToolBoxControl; class SfxStyleControllerItem_Impl : public SfxStatusListener @@ -326,9 +326,9 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener SvxStyleToolBoxControl& rControl; }; -//======================================================================== + // class SvxStyleBox_Impl ----------------------------------------------------- -//======================================================================== + SvxStyleBox_Impl::SvxStyleBox_Impl(Window* pParent, const OUString& rCommand, @@ -791,9 +791,9 @@ static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl return bChanged; } -//======================================================================== + // class SvxFontNameBox_Impl -------------------------------------------------- -//======================================================================== + SvxFontNameBox_Impl::SvxFontNameBox_Impl( Window* pParent, const Reference< XDispatchProvider >& rDispatchProvider,const Reference< XFrame >& _xFrame, WinBits nStyle ) : @@ -1069,9 +1069,9 @@ void SvxFontNameBox_Impl::Select() } } -//======================================================================== + // class SvxColorWindow_Impl -------------------------------------------------- -//======================================================================== + #ifndef WB_NO_DIRECTSELECT #define WB_NO_DIRECTSELECT ((WinBits)0x04000000) #endif @@ -1261,9 +1261,9 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co } } -//======================================================================== + // class SvxFrameWindow_Impl -------------------------------------------------- -//======================================================================== + SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : @@ -1542,9 +1542,9 @@ bool SvxFrameWindow_Impl::Close() return SfxPopupWindow::Close(); } -//======================================================================== + // class SvxLineWindow_Impl -------------------------------------------------- -//======================================================================== + static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) { return SvxBorderLine::threeDMediumColor( aMain ); @@ -1685,12 +1685,12 @@ void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) -//######################################################################## + // Helper classes -//======================================================================== + // class SfxStyleControllerItem_Impl ------------------------------------------ -//======================================================================== + SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl( const Reference< XDispatchProvider >& rDispatchProvider, @@ -1731,11 +1731,11 @@ void SfxStyleControllerItem_Impl::StateChanged( } } -//######################################################################## -//======================================================================== + + // class SvxStyleToolBoxControl ------------------------------------------ -//======================================================================== + struct SvxStyleToolBoxControl::Impl { @@ -2240,9 +2240,9 @@ Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent ) return pBox; } -//======================================================================== + // class SvxFontNameToolBoxControl --------------------------------------- -//======================================================================== + SvxFontNameToolBoxControl::SvxFontNameToolBoxControl( sal_uInt16 nSlotId, @@ -2301,9 +2301,9 @@ Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent ) return pBox; } -//======================================================================== + // class SvxFontColorToolBoxControl -------------------------------------- -//======================================================================== + SvxFontColorToolBoxControl::SvxFontColorToolBoxControl( sal_uInt16 nSlotId, @@ -2376,9 +2376,9 @@ void SvxFontColorToolBoxControl::StateChanged( rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); } -//======================================================================== + // class SvxColorToolBoxControl -------------------------------- -//======================================================================== + SvxColorToolBoxControl::SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : @@ -2448,9 +2448,9 @@ void SvxColorToolBoxControl::StateChanged( rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); } -//======================================================================== + // class SvxColorExtToolBoxControl ---------------------------------------- -//======================================================================== + /* Note: The initial color shown on the button is set in /core/svx/source/tbxctrls/tbxcolorupdate.cxx (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) . @@ -2629,9 +2629,9 @@ void SvxColorExtToolBoxControl::Select( sal_Bool ) Dispatch( aCommand, aArgs ); } -//======================================================================== + // class SvxFrameToolBoxControl ------------------------------------------ -//======================================================================== + SvxFrameToolBoxControl::SvxFrameToolBoxControl( sal_uInt16 nSlotId, @@ -2683,9 +2683,9 @@ void SvxFrameToolBoxControl::StateChanged( : TRISTATE_FALSE ); } -//======================================================================== + // class SvxFrameLineStyleToolBoxControl --------------------------------- -//======================================================================== + SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl( sal_uInt16 nSlotId, @@ -2733,9 +2733,9 @@ void SvxFrameLineStyleToolBoxControl::StateChanged( : TRISTATE_FALSE ); } -//======================================================================== + // class SvxFrameLineColorToolBoxControl --------------------------------- -//======================================================================== + SvxFrameLineColorToolBoxControl::SvxFrameLineColorToolBoxControl( sal_uInt16 nSlotId, @@ -2805,9 +2805,9 @@ void SvxFrameLineColorToolBoxControl::StateChanged( } } -//======================================================================== + // class SvxSimpleUndoRedoController ------------------------------------- -//======================================================================== + SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) @@ -2837,7 +2837,7 @@ void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, rBox.EnableItem( GetId(), eState != SFX_ITEM_DISABLED ); } -//======================================================================== + static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ) { diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 8897f3115738..31e670f09409 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -113,9 +113,9 @@ private: void ReleaseFocus_Impl(); }; -//======================================================================== + // class SvxFontSizeBox_Impl -------------------------------------------------- -//======================================================================== + SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( Window* _pParent, @@ -284,9 +284,9 @@ void SvxFontSizeBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) FontSizeBox::DataChanged( rDCEvt ); } -//======================================================================== + // class FontHeightToolBoxControl -//======================================================================== + FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< uno::XComponentContext >& rxContext ) : svt::ToolboxController( rxContext, diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 13eff22a4e48..7455437b3933 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -78,9 +78,9 @@ SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow() return NULL; } -//======================================================================== + // XSubToolbarController -//======================================================================== + ::sal_Bool SAL_CALL SvxTbxCtlAlign::opensSubToolbar() throw (::com::sun::star::uno::RuntimeException) { diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index b83be60f60ef..77b9190e5aed 100644 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -22,10 +22,10 @@ #include <sfx2/viewfrm.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -//........................................................................ + namespace svx { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -34,9 +34,9 @@ namespace svx #define TOOLBAR_RESNAME "private:resource/toolbar/" #define PROPNAME_LAYOUTMANAGER "LayoutManager" - //==================================================================== + //= ToolboxAccess - //==================================================================== + ToolboxAccess::ToolboxAccess( const ::rtl::OUString& rToolboxName ) : m_bDocking ( false ), @@ -100,8 +100,8 @@ namespace svx return ( m_xLayouter.is() && m_xLayouter->isElementVisible( m_sToolboxResName ) ); } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index f561fb9e7746..f57e61a95e79 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -26,14 +26,14 @@ #include <vcl/settings.hxx> #include <tools/debug.hxx> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= ToolboxButtonColorUpdater - //==================================================================== + /* Note: The initial color shown on the button is set in /core/svx/source/tbxctrls/tbxcolorupdate.cxx (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) . @@ -173,8 +173,8 @@ namespace svx } } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 8743580b333d..c8f41080e045 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -45,10 +45,10 @@ #include <vcl/svapp.hxx> #include "helpid.hrc" -//............................................................................. + namespace textconversiondlgs { -//............................................................................. + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -825,8 +825,8 @@ IMPL_LINK(ChineseDictionaryDialog, HeaderBarClick, HeaderBar*, pHeaderBar) return 0; } -//............................................................................. + } //end namespace -//............................................................................. + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 6ec4d864bb9f..3273633c3173 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -35,12 +35,12 @@ #include <vector> -//............................................................................. + namespace textconversiondlgs { -//............................................................................. -//----------------------------------------------------------------------------- + + /** */ @@ -176,9 +176,9 @@ private: css::uno::Reference<css::uno::XComponentContext> m_xContext; }; -//............................................................................. + } //end namespace -//............................................................................. + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index 44f731b69315..f5648f800408 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -253,8 +253,8 @@ void SAL_CALL ChineseTranslation_UnoDialog::removeVetoableChangeListener( const //only not bound properties -> ignore listener } -//............................................................................. + } //end namespace -//............................................................................. + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index f7fa906dadad..37fc31e3ee15 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -30,12 +30,12 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase5.hxx> -//............................................................................. + namespace textconversiondlgs { -//............................................................................. -//------------------------------------------------------------------------- + + /** This class provides the chinese translation dialog as an uno component. It can be created via lang::XMultiComponentFactory::createInstanceWithContext @@ -129,9 +129,9 @@ private: cppu::OInterfaceContainerHelper m_aDisposeEventListeners; }; -//............................................................................. + } //end namespace -//............................................................................. + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 37b53f16dbf9..5f279266d399 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -28,10 +28,10 @@ #include <unotools/linguprops.hxx> #include "helpid.hrc" -//............................................................................. + namespace textconversiondlgs { -//............................................................................. + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -122,8 +122,8 @@ IMPL_LINK_NOARG(ChineseTranslationDialog, DictionaryHdl) return 0; } -//............................................................................. + } //end namespace -//............................................................................. + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 76dd970b9aae..999e31adb92d 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -26,12 +26,12 @@ // header for class RadioButton #include <vcl/button.hxx> -//............................................................................. + namespace textconversiondlgs { -//............................................................................. -//----------------------------------------------------------------------------- + + /** */ class ChineseDictionaryDialog; @@ -63,9 +63,9 @@ private: ChineseDictionaryDialog* m_pDictionaryDialog; }; -//............................................................................. + } //end namespace -//............................................................................. + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index 9519ad9bcc21..4d0c17f04929 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -36,7 +36,7 @@ static const struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetran // component exports extern "C" { -//================================================================================================== + SAL_DLLPUBLIC_EXPORT void * SAL_CALL textconversiondlgs_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { @@ -44,6 +44,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL textconversiondlgs_component_getFactory( pImplName, pServiceManager, pRegistryKey , g_entries_unodialogs_chinesetranslation ); } } -//========================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 6c74a99386fc..c6d1ad904331 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -247,7 +247,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( ) return getCount() != 0; } -/////////////////////////////////////////////////////////////////////// + class SvxUnoXColorTable : public SvxUnoXPropertyTable { @@ -309,7 +309,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( return aServices; } -/////////////////////////////////////////////////////////////////////// + class SvxUnoXLineEndTable : public SvxUnoXPropertyTable { @@ -382,7 +382,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceName return aServices; } -/////////////////////////////////////////////////////////////////////// + class SvxUnoXDashTable : public SvxUnoXPropertyTable { @@ -463,7 +463,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( return aServices; } -/////////////////////////////////////////////////////////////////////// + class SvxUnoXHatchTable : public SvxUnoXPropertyTable { @@ -539,7 +539,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( return aServices; } -/////////////////////////////////////////////////////////////////////// + class SvxUnoXGradientTable : public SvxUnoXPropertyTable { @@ -627,7 +627,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNam return aServices; } -/////////////////////////////////////////////////////////////////////// + class SvxUnoXBitmapTable : public SvxUnoXPropertyTable { diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index dfdb83596669..3054ad3e36a5 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -195,7 +195,7 @@ css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL& return aRet; } -//=============================================== + void SAL_CALL RecoveryUI::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException) @@ -204,14 +204,14 @@ void SAL_CALL RecoveryUI::dispatch(const css::util::URL& dispatchWithReturnValue(aURL, lArguments); } -//=============================================== + void SAL_CALL RecoveryUI::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw(css::uno::RuntimeException) { // TODO OSL_FAIL("RecoveryUI::addStatusListener()\nNot implemented yet!"); } -//=============================================== + void SAL_CALL RecoveryUI::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw(css::uno::RuntimeException) { @@ -237,7 +237,7 @@ static OUString GetCrashConfigDir() return ustrValue; } -//=============================================== + #if defined(WNT) #define LCKFILE "crashdat.lck" @@ -252,7 +252,7 @@ static OUString GetUnsentURL() return aURL; } -//=============================================== + static bool delete_pending_crash() { @@ -274,7 +274,7 @@ RecoveryUI::EJob RecoveryUI::impl_classifyJob(const css::util::URL& aURL) return m_eJob; } -//=============================================== + sal_Bool RecoveryUI::impl_doEmergencySave() { // create core service, which implements the real "emergency save" algorithm. @@ -296,7 +296,7 @@ sal_Bool RecoveryUI::impl_doEmergencySave() return (nRet==DLG_RET_OK_AUTOLUNCH); } -//=============================================== + void RecoveryUI::impl_doRecovery() { // create core service, which implements the real "emergency save" algorithm. @@ -324,7 +324,7 @@ void RecoveryUI::impl_doRecovery() delete_pending_crash(); } -//=============================================== + void RecoveryUI::impl_showAllRecoveredDocs() { diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 9be6beb08904..f28ff180c43f 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -102,7 +102,7 @@ public: }; -// ==================================================================== + class SvxTableShape : public SvxShape { diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index b208dfbfcb5c..612586455660 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -40,10 +40,10 @@ namespace }; } -//........................................................................ + namespace svx { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -67,16 +67,16 @@ namespace svx , OUStringHash > PropertyChangeListenerContainer; - //==================================================================== + //= IPropertyValueProvider - //==================================================================== + IPropertyValueProvider::~IPropertyValueProvider() { } - //==================================================================== + //= PropertyChangeNotifier_Data - //==================================================================== + struct PropertyChangeNotifier_Data { ::cppu::OWeakObject& m_rContext; @@ -89,9 +89,9 @@ namespace svx { } }; - //==================================================================== + //= PropertyValueProvider - //==================================================================== + OUString PropertyValueProvider::getPropertyName() const { @@ -105,9 +105,9 @@ namespace svx _out_rValue = xContextProps->getPropertyValue( getPropertyName() ); } - //==================================================================== + //= PropertyChangeNotifier - //==================================================================== + PropertyChangeNotifier::PropertyChangeNotifier( ::cppu::OWeakObject& _rOwner, ::osl::Mutex& _rMutex ) :m_pData( new PropertyChangeNotifier_Data( _rOwner, _rMutex ) ) @@ -187,8 +187,8 @@ namespace svx m_pData->m_aPropertyChangeListeners.disposeAndClear( aEvent ); } -//........................................................................ + } // namespace svx -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 627019725cc3..5af2ac07428b 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -23,7 +23,7 @@ #include "svx/svdotable.hxx" #include <svx/svdpool.hxx> -/////////////////////////////////////////////////////////////////////// + using namespace ::osl; diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index cc62ba4a0d0f..153a348121d6 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -53,19 +53,19 @@ #include <com/sun/star/text/textfield/Type.hpp> -//-//////////////////////////////////////////////////////////////////// +//- using namespace ::rtl; using namespace ::osl; using namespace ::com::sun::star; -//-//////////////////////////////////////////////////////////////////// +//- #define QUERYINT( xint ) \ if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \ aAny <<= uno::Reference< xint >(this) -//-//////////////////////////////////////////////////////////////////// +//- class SvxUnoDrawPagesAccess : public ::cppu::WeakImplHelper2< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo > { @@ -93,7 +93,7 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; -//-//////////////////////////////////////////////////////////////////// +//- static const SvEventDescription* ImplGetSupportedMacroItems() { @@ -107,7 +107,7 @@ static const SvEventDescription* ImplGetSupportedMacroItems() return aMacroDescriptionsImpl; } -//-//////////////////////////////////////////////////////////////////// +//- /** fills the given EventObject from the given SdrHint. @returns @@ -251,8 +251,6 @@ uno::Sequence< OUString > SvxUnoDrawMSFactory::concatServiceNames( uno::Sequence return aSeq; } - -/// SvxUnoDrawingModel::SvxUnoDrawingModel( SdrModel* pDoc ) throw() : mpDoc( pDoc ) { @@ -586,9 +584,9 @@ uno::Reference< com::sun::star::ucb::XAnyCompare > SAL_CALL SvxUnoDrawingModel:: return SvxCreateNumRuleCompare(); } -//============================================================================= + // class SvxUnoDrawPagesAccess -//============================================================================= + SvxUnoDrawPagesAccess::SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) throw() : mrModel(rMyModel) @@ -753,6 +751,6 @@ com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCr } } -/////////////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 5dd9ed6f136a..986c290e4544 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1177,13 +1177,13 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount return false; } -////////////////////////////////////////////////////////////////////////////// + // #i122649# Some comments on the below arrays: // - They need to have the same order and count of items // - They are used to translate between translated and non-translated color names // - To make longer names be found which start with the same basic string, // these have to be in front of others -// + // It would be nice to: // - evtl. organize these in a single array with 2-dimensional inner to elliminate // the possibility to define it wrong @@ -1277,7 +1277,7 @@ static const sal_uInt16 SvxUnoColorNameResId[] = RID_SVXSTR_COLOR_TANGO_ALUMINIUM }; -////////////////////////////////////////////////////////////////////////////// + bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) throw() { @@ -1373,7 +1373,7 @@ OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rA return rApiName; } -/////////////////////////////////////////////////////////////////////// + comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nServiceId ) throw() { diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index bc4f6fafccd2..bf042fcccd28 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1726,7 +1726,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte return true; } -/////////////////////////////////////////////////////////////////////// + SvxShapeCaption::SvxShapeCaption( SdrObject* pObj ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CAPTION), getSvxMapProvider().GetPropertySet(SVXMAP_CAPTION, SdrObject::GetGlobalDrawObjectItemPool()) ) diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 96ce7103a8e9..2ceea1e86ab1 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -52,7 +52,7 @@ #include "svx/svdstr.hrc" #include <vcl/wmf.hxx> -/////////////////////////////////////////////////////////////////////// + using namespace ::osl; using namespace ::rtl; @@ -63,7 +63,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; -/////////////////////////////////////////////////////////////////////// + SvxOle2Shape::SvxOle2Shape( SdrObject* pObject ) throw() : SvxShapeText( pObject, getSvxMapProvider().GetMap(SVXMAP_OLE2), getSvxMapProvider().GetPropertySet(SVXMAP_OLE2,SdrObject::GetGlobalDrawObjectItemPool()) ) @@ -566,7 +566,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(OUString& rHexCLSID) return aClassName; } -/////////////////////////////////////////////////////////////////////// + SvxAppletShape::SvxAppletShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_APPLET), getSvxMapProvider().GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool()) ) @@ -639,7 +639,7 @@ bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemP } } -/////////////////////////////////////////////////////////////////////// + SvxPluginShape::SvxPluginShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_PLUGIN), getSvxMapProvider().GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) ) @@ -712,7 +712,7 @@ bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemP } } -/////////////////////////////////////////////////////////////////////// + SvxFrameShape::SvxFrameShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_FRAME), getSvxMapProvider().GetPropertySet(SVXMAP_FRAME, SdrObject::GetGlobalDrawObjectItemPool()) ) diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 96a456600f33..3c72deaa3ed1 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -379,7 +379,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { // #104157# Update maTextOffset, object has changed // #105196#, #105203#: Cannot call that // here, - // since TakeTextRect() (called from there) // + // since TakeTextRect() (called from there) // changes outliner content. // UpdateOutliner(); @@ -399,7 +399,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) // will replace the Notifer for current editable cell. It // is totally wrong. So add check here to avoid the // incorrect replacement of notifer. - // + // Currently it only happens on the editsource of // AccessibleCell if (mpObject && mpText) diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index 13259843295e..c415ba7dae56 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -33,9 +33,9 @@ namespace unogallery { class GalleryTheme; } namespace unogallery { -// --------------- + // - GalleryItem - -// --------------- + class GalleryItem : public ::cppu::OWeakAggObject, public ::com::sun::star::lang::XServiceInfo, @@ -97,9 +97,9 @@ private: GalleryItem& operator=( const GalleryItem& ); }; -// ----------------------- + // - GalleryDrawingModel - -// ----------------------- + class GalleryDrawingModel : public SvxUnoDrawingModel { diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index 5359d14c0b75..bc40daeb7de2 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -34,9 +34,9 @@ namespace unogallery { class GalleryItem; } namespace unogallery { -// ---------------- + // - GalleryTheme - -// ---------------- + class GalleryTheme : public ::cppu::WeakImplHelper2< ::com::sun::star::gallery::XGalleryTheme, diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index 4f0270c5761f..079d88aff1a5 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -141,7 +141,7 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp return SvxDrawingLayerExport( pModel, xOut, xComponent ); } -//-//////////////////////////////////////////////////////////////////// +//- sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStream>& xInputStream, const Reference< lang::XComponent >& xComponent ) { diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 111192300a00..aba306026912 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -142,7 +142,7 @@ private: XMLImageStyle maImageStyle; }; -/////////////////////////////////////////////////////////////////////// + // #110680# SvxXMLXTableExportComponent::SvxXMLXTableExportComponent( @@ -428,13 +428,13 @@ void SvxXMLXTableExportComponent::_ExportAutoStyles() {} void SvxXMLXTableExportComponent::_ExportMasterStyles() {} void SvxXMLXTableExportComponent::_ExportContent() {} -/////////////////////////////////////////////////////////////////////// + SvxXMLTableEntryExporter::~SvxXMLTableEntryExporter() { } -/////////////////////////////////////////////////////////////////////// + SvxXMLColorEntryExporter::SvxXMLColorEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ) @@ -459,7 +459,7 @@ void SvxXMLColorEntryExporter::exportEntry( const OUString& rStrName, const Any& SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_COLOR, sal_True, sal_True ); } -/////////////////////////////////////////////////////////////////////// + SvxXMLLineEndEntryExporter::SvxXMLLineEndEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maMarkerStyle( rExport ) @@ -475,7 +475,7 @@ void SvxXMLLineEndEntryExporter::exportEntry( const OUString& rStrName, const An maMarkerStyle.exportXML( rStrName, rValue ); } -/////////////////////////////////////////////////////////////////////// + SvxXMLDashEntryExporter::SvxXMLDashEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maDashStyle( rExport ) @@ -491,7 +491,7 @@ void SvxXMLDashEntryExporter::exportEntry( const OUString& rStrName, const Any& maDashStyle.exportXML( rStrName, rValue ); } -/////////////////////////////////////////////////////////////////////// + SvxXMLHatchEntryExporter::SvxXMLHatchEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maHatchStyle( rExport ) @@ -507,7 +507,7 @@ void SvxXMLHatchEntryExporter::exportEntry( const OUString& rStrName, const Any& maHatchStyle.exportXML( rStrName, rValue ); } -/////////////////////////////////////////////////////////////////////// + SvxXMLGradientEntryExporter::SvxXMLGradientEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maGradientStyle( rExport ) @@ -523,7 +523,7 @@ void SvxXMLGradientEntryExporter::exportEntry( const OUString& rStrName, const A maGradientStyle.exportXML( rStrName, rValue ); } -/////////////////////////////////////////////////////////////////////// + SvxXMLBitmapEntryExporter::SvxXMLBitmapEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ) diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index b19345c04f94..9f64a8eb96b2 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -74,11 +74,11 @@ sal_Char const sXML_np__draw_ooo[] = "___draw"; sal_Char const sXML_np__ooo[] = "__ooo"; sal_Char const sXML_np__xlink[] = "__xlink"; -/////////////////////////////////////////////////////////////////////// + enum SvxXMLTableImportContextEnum { stice_unknown, stice_color, stice_marker, stice_dash, stice_hatch, stice_gradient, stice_bitmap }; -/////////////////////////////////////////////////////////////////////// + class SvxXMLTableImportContext : public SvXMLImportContext { @@ -105,7 +105,7 @@ private: bool mbOOoFormat; }; -/////////////////////////////////////////////////////////////////////// + SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, bool bOOoFormat ) : SvXMLImportContext( rImport, nPrfx, rLName ), mxTable( xTable ), meContext( eContext ), @@ -324,7 +324,7 @@ void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& r } } -/////////////////////////////////////////////////////////////////////// + // #110680# SvxXMLXTableImport::SvxXMLXTableImport( diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index 856fe4a74c2f..24dc3c9fef3e 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star; -/////////////////////////////////////////////////////////////////////// + enum CompareStatus { CMP_NOTYET = 0, CMP_EQUAL = 1, CMP_NOTEQUAL = 2, CMP_NOTAVAILABLE = 3 }; static ColorData gColors[] = { COL_BLACK, COL_GREEN, COL_RED, COL_CYAN }; @@ -473,9 +473,9 @@ void Atom::compare( Atom* pAtom ) } } -////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////// + + class AtomBoxString : public SvLBoxString { @@ -504,7 +504,7 @@ public: }; -////////////////////////////////////////////////////////////////////// + class AtomContainerTreeListBox : public SvTreeListBox { @@ -705,7 +705,7 @@ void AtomContainerTreeListBox::InsertAtom( const Atom* pAtom, SvTreeListEntry* p } } -/////////////////////////////////////////////////////////////////////// + extern void load_config( const OUString& rPath ); @@ -760,7 +760,7 @@ Atom* PPTDocument::getRootAtom() const return mpAtom; } -/////////////////////////////////////////////////////////////////////// + class MSViewerWorkWindow : public WorkWindow { diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index 62ba86ace1ad..1e06d0433a4c 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -45,11 +45,11 @@ using ::com::sun::star::io::IOException; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -/////////////////////////////////////////////////////////////////////// + AtomConfigMap gAtomConfigMap; -/////////////////////////////////////////////////////////////////////// + class ConfigHandler : public ::cppu::WeakAggImplHelper1<XDocumentHandler> { @@ -336,7 +336,7 @@ void load_config( const OUString& rPath ) } } -/////////////////////////////////////////////////////////////////////// + OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) const { @@ -459,7 +459,7 @@ OUString ElementConfig::dump_float( SvStream& rStream, sal_Size& nLength ) return aRet; } -/////////////////////////////////////////////////////////////////////// + OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLength ) const { @@ -525,7 +525,7 @@ OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLength ) return aRet; } -/////////////////////////////////////////////////////////////////////// + OUString SwitchElementConfig::format( SvStream& rStream, sal_Size& nLength ) const { diff --git a/svx/workben/msview/xmlconfig.hxx b/svx/workben/msview/xmlconfig.hxx index 4ae10e005b7a..b9696023cf28 100644 --- a/svx/workben/msview/xmlconfig.hxx +++ b/svx/workben/msview/xmlconfig.hxx @@ -24,7 +24,7 @@ #include <list> #include <boost/shared_ptr.hpp> -/////////////////////////////////////////////////////////////////////// + enum ElementConfigType { ECT_HEXDUMP, ECT_BYTE, ECT_UINT, ECT_UNISTRING, ETC_FLOAT, ETC_CONTAINER }; @@ -53,7 +53,7 @@ private: typedef boost::shared_ptr< ElementConfig > ElementConfigPtr; typedef std::list< ElementConfigPtr > ElementConfigList; -/////////////////////////////////////////////////////////////////////// + class ElementValueConfig : public ElementConfig { @@ -66,7 +66,7 @@ private: OUString maValue; }; -/////////////////////////////////////////////////////////////////////// + class ElementConfigContainer : public ElementConfig { @@ -84,7 +84,7 @@ protected: ElementConfigList maElementConfigList; }; -/////////////////////////////////////////////////////////////////////// + class CaseElementConfig : public ElementConfigContainer { @@ -97,7 +97,7 @@ private: OUString maValue; }; -/////////////////////////////////////////////////////////////////////// + class SwitchElementConfig : public ElementConfigContainer { @@ -107,7 +107,7 @@ public: virtual OUString format( SvStream& rStream, sal_Size& nLength ) const; }; -/////////////////////////////////////////////////////////////////////// + class AtomConfig : public ElementConfigContainer { |