diff options
Diffstat (limited to 'svx/inc')
539 files changed, 3035 insertions, 1853 deletions
diff --git a/svx/inc/dgdefs_.hxx b/svx/inc/dgdefs_.hxx index 2965587f2e..18436c3ac4 100644 --- a/svx/inc/dgdefs_.hxx +++ b/svx/inc/dgdefs_.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -339,3 +340,5 @@ #define layctrl_0c SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) #define layctrl_0f SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) #define layctrl_10 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/dialdll.hxx b/svx/inc/dialdll.hxx index f5b3532603..7d01b3cc9c 100644 --- a/svx/inc/dialdll.hxx +++ b/svx/inc/dialdll.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index a8ad139bae..5226f35838 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ class E3dScene; /************************************************************************* |* -|* Parameter fuer Interaktion eines 3D-Objektes +|* Parameters for the interaction of a 3D object |* \************************************************************************/ class E3dDragMethodUnit @@ -67,7 +68,7 @@ public: /************************************************************************* |* -|* Ableitung von SdrDragMethod fuer 3D-Objekte +|* Derivative of SdrDragMethod for 3D objects |* \************************************************************************/ @@ -104,7 +105,7 @@ public: /************************************************************************* |* -|* Ableitung von SdrDragMethod zum Drehen von 3D-Objekten +|* Derivative of SdrDragMethod for spinning 3D objects |* \************************************************************************/ @@ -127,7 +128,7 @@ public: /************************************************************************* |* -|* Ableitung von SdrDragMethod zum Verschieben von 3D-Subobjekten +|* Derivative of SdrDragMethod for moving 3D sub-objects |* \************************************************************************/ @@ -151,3 +152,5 @@ public: #endif // _E3D_DRAGMT3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/drawuiks.hxx b/svx/inc/drawuiks.hxx index 1f6c84efb0..84bc939055 100644 --- a/svx/inc/drawuiks.hxx +++ b/svx/inc/drawuiks.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ #define SD_UIK_PRESENTATION_STYLES UIK_DRAWING(60) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc index aa1c142d79..2c7c7860ba 100644 --- a/svx/inc/float3d.hrc +++ b/svx/inc/float3d.hrc @@ -26,8 +26,6 @@ ************************************************************************/ #include <svx/dialogs.hrc> -//#define FLT_WIN_3D 827 - #define BTN_GEO 2 #define BTN_REPRESENTATION 3 #define BTN_LIGHT 4 @@ -43,12 +41,12 @@ #define CTL_PREVIEW 12 #define CTL_LIGHT_PREVIEW 13 -// Geometrie +// Geomerty #define FT_HORIZONTAL 24 #define NUM_HORIZONTAL 25 #define FT_VERTICAL 26 #define NUM_VERTICAL 27 -#define FL_SEGMENTS 28 +#define FL_SEGMENTS 28 #define FT_PERCENT_DIAGONAL 29 #define MTR_PERCENT_DIAGONAL 30 #define FT_BACKSCALE 31 @@ -57,32 +55,32 @@ #define MTR_END_ANGLE 34 #define FT_DEPTH 35 #define MTR_DEPTH 36 -#define FL_GEOMETRIE 37 +#define FL_GEOMETRIE 37 #define BTN_NORMALS_OBJ 38 #define BTN_NORMALS_FLAT 39 #define BTN_NORMALS_SPHERE 40 #define BTN_TWO_SIDED_LIGHTING 41 #define BTN_NORMALS_INVERT 42 -#define FL_NORMALS 43 +#define FL_NORMALS 43 #define BTN_DOUBLE_SIDED 44 -// Darstellung +// Depiction/Appearance #define FT_SHADEMODE 45 #define LB_SHADEMODE 46 #define BTN_SHADOW_3D 47 #define FT_SLANT 48 #define MTR_SLANT 49 -#define FL_SHADOW 50 +#define FL_SHADOW 50 #define FT_DISTANCE 51 #define MTR_DISTANCE 52 #define FT_FOCAL_LENGTH 53 #define MTR_FOCAL_LENGTH 54 -#define FL_CAMERA 55 -#define FL_REPRESENTATION 56 +#define FL_CAMERA 55 +#define FL_REPRESENTATION 56 -// Beleuchtung +// Lighting #define BTN_LIGHT_1 60 #define BTN_LIGHT_2 61 #define BTN_LIGHT_3 62 @@ -100,13 +98,13 @@ #define LB_LIGHT_7 74 #define LB_LIGHT_8 75 #define BTN_LIGHT_COLOR 76 -#define FT_LIGHTSOURCE 77 +#define FT_LIGHTSOURCE 77 #define LB_AMBIENTLIGHT 78 #define BTN_AMBIENT_COLOR 79 -#define FT_AMBIENTLIGHT 80 -#define FL_LIGHT 81 +#define FT_AMBIENTLIGHT 80 +#define FL_LIGHT 81 -// Texturen +// Textures #define FT_TEX_KIND 90 #define BTN_TEX_LUMINANCE 91 #define BTN_TEX_COLOR 92 @@ -124,11 +122,10 @@ #define BTN_TEX_OBJECT_Y 104 #define FT_TEX_FILTER 105 #define BTN_TEX_FILTER 106 -#define FL_TEXTURE 107 +#define FL_TEXTURE 107 // Material -//#define CTL_MATERIAL 110 -#define FL_MATERIAL 111 +#define FL_MATERIAL 111 #define FT_MAT_COLOR 112 #define LB_MAT_COLOR 113 @@ -141,44 +138,6 @@ #define BTN_SPECULAR_COLOR 120 #define FT_MAT_SPECULAR_INTENSITY 121 #define MTR_MAT_SPECULAR_INTENSITY 122 -#define FL_MAT_SPECULAR 123 +#define FL_MAT_SPECULAR 123 #define FT_MAT_FAVORITES 124 #define LB_MAT_FAVORITES 125 - - -//#define BTN_MAT_FAVORITES 125 -//#define BTN_MAT_EDITOR 126 - - -// high contrast -#define BMP_GEO_H 130 -#define BMP_REPRESENTATION_H 131 -#define BMP_LIGHT_H 132 -#define BMP_TEXTURE_H 133 -#define BMP_MATERIAL_H 134 -#define BMP_UPDATE_H 135 -#define BMP_ASSIGN_H 136 -#define BMP_CHANGE_TO_3D_H 137 -#define BMP_LATHE_OBJ_H 138 -#define BMP_PERSPECTIVE_H 139 -#define BMP_NORMALS_OBJ_H 142 -#define BMP_NORMALS_FLAT_H 143 -#define BMP_NORMALS_SPHERE_H 144 -#define BMP_NORMALS_INVERT_H 145 -#define BMP_TWO_SIDED_LIGHTING_H 146 -#define BMP_DOUBLE_SIDED_H 147 -#define BMP_SHADOW_3D_H 148 -#define BMP_3DLIGHT_H 149 -#define BMP_LIGHT_COLOR_H 150 -#define BMP_AMBIENT_COLOR_H 151 -#define BMP_TEX_LUMINANCE_H 152 -#define BMP_TEX_COLOR_H 153 -#define BMP_TEX_REPLACE_H 154 -#define BMP_TEX_MODULATE_H 155 -#define BMP_TEX_BLEND_H 156 -#define BMP_TEX_OBJECT_H 157 -#define BMP_TEX_PARALLEL_H 158 -#define BMP_TEX_CIRCLE_H 159 -#define BMP_TEX_FILTER_H 160 -#define BMP_COLORDLG_H 161 - diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc index 13912923c1..37a59a8d03 100644 --- a/svx/inc/fontworkgallery.hrc +++ b/svx/inc/fontworkgallery.hrc @@ -51,22 +51,12 @@ #define STR_CHARS_SPACING_KERN_PAIRS 12 #define IMG_FONTWORK_ALIGN_LEFT_16 1 -#define IMG_FONTWORK_ALIGN_LEFT_16_H 2 #define IMG_FONTWORK_ALIGN_LEFT_26 3 -#define IMG_FONTWORK_ALIGN_LEFT_26_H 4 #define IMG_FONTWORK_ALIGN_CENTER_16 5 -#define IMG_FONTWORK_ALIGN_CENTER_16_H 6 #define IMG_FONTWORK_ALIGN_CENTER_26 7 -#define IMG_FONTWORK_ALIGN_CENTER_26_H 8 #define IMG_FONTWORK_ALIGN_RIGHT_16 9 -#define IMG_FONTWORK_ALIGN_RIGHT_16_H 10 #define IMG_FONTWORK_ALIGN_RIGHT_26 11 -#define IMG_FONTWORK_ALIGN_RIGHT_26_H 12 #define IMG_FONTWORK_ALIGN_WORD_16 13 -#define IMG_FONTWORK_ALIGN_WORD_16_H 14 #define IMG_FONTWORK_ALIGN_WORD_26 15 -#define IMG_FONTWORK_ALIGN_WORD_26_H 16 #define IMG_FONTWORK_ALIGN_STRETCH_16 17 -#define IMG_FONTWORK_ALIGN_STRETCH_16_H 18 #define IMG_FONTWORK_ALIGN_STRETCH_26 19 -#define IMG_FONTWORK_ALIGN_STRETCH_26_H 20 diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 65ca239e5a..23b8cd42f4 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index a22cce8e3a..5bd548855b 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -81,8 +81,6 @@ #define RID_SVXBMP_THEME_DEFAULT (RID_SVX_GALLERY_START + 54) #define RID_SVXIMG_GALLERY_VIEW_ICON (RID_SVX_GALLERY_START + 56) #define RID_SVXIMG_GALLERY_VIEW_LIST (RID_SVX_GALLERY_START + 57) -#define RID_SVXIMG_GALLERY_VIEW_ICON_HC (RID_SVX_GALLERY_START + 58) -#define RID_SVXIMG_GALLERY_VIEW_LIST_HC (RID_SVX_GALLERY_START + 59) // Gallery-Bitmaps fuer Sounds #define RID_SVXBMP_GALLERY_SOUND_0 (RID_SVX_GALLERY_START + 61) diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 3dd7994848..91de8cf4cf 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -236,3 +237,5 @@ public: virtual SgaObjKind GetObjKind() const { return SGA_OBJ_INET; } }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc index 63866a8e0f..adf0837dbb 100644 --- a/svx/inc/galtheme.hrc +++ b/svx/inc/galtheme.hrc @@ -68,10 +68,116 @@ #define RID_GALLERYSTR_THEME_SCREENBEANS (RID_GALLERYSTR_THEME_START + 35) #define RID_GALLERYSTR_THEME_DUMMY5 (RID_GALLERYSTR_THEME_START + 36) + #define RID_GALLERYSTR_THEME_FONTWORK (RID_GALLERYSTR_THEME_START + 37) #define RID_GALLERYSTR_THEME_FONTWORK_VERTICAL (RID_GALLERYSTR_THEME_START + 38) +#define RID_GALLERYSTR_THEME_SHAPES_POLYGONS (RID_GALLERYSTR_THEME_START + 39) +#define RID_GALLERYSTR_THEME_SHAPES_1 (RID_GALLERYSTR_THEME_START + 40) +#define RID_GALLERYSTR_THEME_SHAPES_2 (RID_GALLERYSTR_THEME_START + 41) +#define RID_GALLERYSTR_THEME_ANIMALS (RID_GALLERYSTR_THEME_START + 42) +#define RID_GALLERYSTR_THEME_CARS (RID_GALLERYSTR_THEME_START + 43) +#define RID_GALLERYSTR_THEME_BUGS (RID_GALLERYSTR_THEME_START + 44) +#define RID_GALLERYSTR_THEME_CISCO_OTHER (RID_GALLERYSTR_THEME_START + 45) +#define RID_GALLERYSTR_THEME_CISCO_MEDIA (RID_GALLERYSTR_THEME_START + 46) +#define RID_GALLERYSTR_THEME_CISCO_PRODUCTS (RID_GALLERYSTR_THEME_START + 47) +#define RID_GALLERYSTR_THEME_CISCO_WAN_LAN (RID_GALLERYSTR_THEME_START + 48) +#define RID_GALLERYSTR_THEME_DOMINO_USUAL (RID_GALLERYSTR_THEME_START + 49) +#define RID_GALLERYSTR_THEME_DOMINO_NUMBERED (RID_GALLERYSTR_THEME_START + 50) +#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_1 (RID_GALLERYSTR_THEME_START + 51) +#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_2 (RID_GALLERYSTR_THEME_START + 52) +#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_3 (RID_GALLERYSTR_THEME_START + 53) +#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_4 (RID_GALLERYSTR_THEME_START + 54) +#define RID_GALLERYSTR_THEME_ELECTRONICS_CIRCUIT (RID_GALLERYSTR_THEME_START + 55) +#define RID_GALLERYSTR_THEME_ELECTRONICS_SIGNS (RID_GALLERYSTR_THEME_START + 56) +#define RID_GALLERYSTR_THEME_ELECTRONICS_GAUGES (RID_GALLERYSTR_THEME_START + 57) +#define RID_GALLERYSTR_THEME_PEOPLE_1 (RID_GALLERYSTR_THEME_START + 58) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_OVERLAY (RID_GALLERYSTR_THEME_START + 59) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_FURNITURES (RID_GALLERYSTR_THEME_START + 60) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_BUILDINGS (RID_GALLERYSTR_THEME_START + 61) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_BATHROOM_KITCHEN (RID_GALLERYSTR_THEME_START + 62) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_KITCHEN (RID_GALLERYSTR_THEME_START + 63) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_WINDOWS_DOORS (RID_GALLERYSTR_THEME_START + 64) +#define RID_GALLERYSTR_THEME_FLOWCHARTS_1 (RID_GALLERYSTR_THEME_START + 65) +#define RID_GALLERYSTR_THEME_FLOWCHARTS_2 (RID_GALLERYSTR_THEME_START + 66) +#define RID_GALLERYSTR_THEME_FORALSTUDIOA (RID_GALLERYSTR_THEME_START + 67) +#define RID_GALLERYSTR_THEME_PHOTOS_FAUNA (RID_GALLERYSTR_THEME_START + 68) +#define RID_GALLERYSTR_THEME_PHOTOS_BUILDINGS (RID_GALLERYSTR_THEME_START + 69) +#define RID_GALLERYSTR_THEME_PHOTOS_PLANTS (RID_GALLERYSTR_THEME_START + 70) +#define RID_GALLERYSTR_THEME_PHOTOS_STATUES (RID_GALLERYSTR_THEME_START + 71) +#define RID_GALLERYSTR_THEME_PHOTOS_LANDSCAPES (RID_GALLERYSTR_THEME_START + 72) +#define RID_GALLERYSTR_THEME_PHOTOS_CITIES (RID_GALLERYSTR_THEME_START + 73) +#define RID_GALLERYSTR_THEME_PHOTOS_FLOWERS (RID_GALLERYSTR_THEME_START + 74) +#define RID_GALLERYSTR_THEME_THERAPEUTICS_GENERAL (RID_GALLERYSTR_THEME_START + 75) +#define RID_GALLERYSTR_THEME_WEATHER (RID_GALLERYSTR_THEME_START + 76) +#define RID_GALLERYSTR_THEME_VECHILES (RID_GALLERYSTR_THEME_START + 77) +#define RID_GALLERYSTR_THEME_SIGNS (RID_GALLERYSTR_THEME_START + 78) +#define RID_GALLERYSTR_THEME_BLUE_MAN (RID_GALLERYSTR_THEME_START + 79) +#define RID_GALLERYSTR_THEME_CHEMISTRY_AMINO_ACIDS (RID_GALLERYSTR_THEME_START + 80) +#define RID_GALLERYSTR_THEME_LOGICAL_SIGNS (RID_GALLERYSTR_THEME_START + 81) +#define RID_GALLERYSTR_THEME_LOGICAL_GATES (RID_GALLERYSTR_THEME_START + 82) +#define RID_GALLERYSTR_THEME_LOGOS (RID_GALLERYSTR_THEME_START + 83) +#define RID_GALLERYSTR_THEME_SMILES (RID_GALLERYSTR_THEME_START + 84) +#define RID_GALLERYSTR_THEME_ARROWS_1 (RID_GALLERYSTR_THEME_START + 85) +#define RID_GALLERYSTR_THEME_CLOCK_01_CLOCK (RID_GALLERYSTR_THEME_START + 86) +#define RID_GALLERYSTR_THEME_CLOCK_02_CLOCK (RID_GALLERYSTR_THEME_START + 87) +#define RID_GALLERYSTR_THEME_CLOCK_03_CLOCK (RID_GALLERYSTR_THEME_START + 88) +#define RID_GALLERYSTR_THEME_CLOCK_04_CLOCK (RID_GALLERYSTR_THEME_START + 89) +#define RID_GALLERYSTR_THEME_CLOCK_05_CLOCK (RID_GALLERYSTR_THEME_START + 90) +#define RID_GALLERYSTR_THEME_CLOCK_06_CLOCK (RID_GALLERYSTR_THEME_START + 91) +#define RID_GALLERYSTR_THEME_CLOCK_07_CLOCK (RID_GALLERYSTR_THEME_START + 92) +#define RID_GALLERYSTR_THEME_CLOCK_08_CLOCK (RID_GALLERYSTR_THEME_START + 93) +#define RID_GALLERYSTR_THEME_CLOCK_09_CLOCK (RID_GALLERYSTR_THEME_START + 94) +#define RID_GALLERYSTR_THEME_CLOCK_10_CLOCK (RID_GALLERYSTR_THEME_START + 95) +#define RID_GALLERYSTR_THEME_CLOCK_11_CLOCK (RID_GALLERYSTR_THEME_START + 96) +#define RID_GALLERYSTR_THEME_CLOCK_12_CLOCK (RID_GALLERYSTR_THEME_START + 97) +#define RID_GALLERYSTR_THEME_PNEUMATIC_PARTS (RID_GALLERYSTR_THEME_START + 98) +#define RID_GALLERYSTR_THEME_COMPUTER_GENERAL (RID_GALLERYSTR_THEME_START + 99) +#define RID_GALLERYSTR_THEME_COMPUTER_NETWORK (RID_GALLERYSTR_THEME_START + 100) +#define RID_GALLERYSTR_THEME_COMPUTER_NETWORK_DEVICES (RID_GALLERYSTR_THEME_START + 101) +#define RID_GALLERYSTR_THEME_COMPUTER_WIFI (RID_GALLERYSTR_THEME_START + 102) +#define RID_GALLERYSTR_THEME_NUMBERS (RID_GALLERYSTR_THEME_START + 103) +#define RID_GALLERYSTR_THEME_SIGNS_DANGER (RID_GALLERYSTR_THEME_START + 104) +#define RID_GALLERYSTR_THEME_OBJECTS (RID_GALLERYSTR_THEME_START + 105) +#define RID_GALLERYSTR_THEME_MAPS_AFRICA (RID_GALLERYSTR_THEME_START + 106) +#define RID_GALLERYSTR_THEME_MAPS_UNITED_STATES_OF_AMERICA (RID_GALLERYSTR_THEME_START + 107) +#define RID_GALLERYSTR_THEME_MAPS_AUSTRALIA (RID_GALLERYSTR_THEME_START + 108) +#define RID_GALLERYSTR_THEME_MAPS_ASIA (RID_GALLERYSTR_THEME_START + 109) +#define RID_GALLERYSTR_THEME_MAPS_SOUTH_AMERICA (RID_GALLERYSTR_THEME_START + 110) +#define RID_GALLERYSTR_THEME_MAPS_EUROPE (RID_GALLERYSTR_THEME_START + 111) +#define RID_GALLERYSTR_THEME_MAPS_EUROPE_1 (RID_GALLERYSTR_THEME_START + 112) +#define RID_GALLERYSTR_THEME_MAPS_FRANCE (RID_GALLERYSTR_THEME_START + 113) +#define RID_GALLERYSTR_THEME_MAPS_FRANCE_COUNTRIES (RID_GALLERYSTR_THEME_START + 114) +#define RID_GALLERYSTR_THEME_MAPS_SIGNS (RID_GALLERYSTR_THEME_START + 115) +#define RID_GALLERYSTR_THEME_MAPS_CANADA (RID_GALLERYSTR_THEME_START + 116) +#define RID_GALLERYSTR_THEME_MAPS_CONTINENTS (RID_GALLERYSTR_THEME_START + 117) +#define RID_GALLERYSTR_THEME_MAPS_MIDDLE_EAST (RID_GALLERYSTR_THEME_START + 118) +#define RID_GALLERYSTR_THEME_MAPS_MIDDLE_AMERICA (RID_GALLERYSTR_THEME_START + 119) +#define RID_GALLERYSTR_THEME_MAPS_MIDDLE_AGES (RID_GALLERYSTR_THEME_START + 120) +#define RID_GALLERYSTR_THEME_MAPS_MEXICO (RID_GALLERYSTR_THEME_START + 121) +#define RID_GALLERYSTR_THEME_MAPS_ANCIENT_TIMES (RID_GALLERYSTR_THEME_START + 122) +#define RID_GALLERYSTR_THEME_MAPS_SYMBOLS (RID_GALLERYSTR_THEME_START + 123) +#define RID_GALLERYSTR_THEME_MAPS_HISTORY_1900 (RID_GALLERYSTR_THEME_START + 124) +#define RID_GALLERYSTR_THEME_MAPS_WORLD (RID_GALLERYSTR_THEME_START + 125) +#define RID_GALLERYSTR_THEME_CROPS (RID_GALLERYSTR_THEME_START + 126) +#define RID_GALLERYSTR_THEME_FRACTIONS (RID_GALLERYSTR_THEME_START + 127) +#define RID_GALLERYSTR_THEME_FLAGS_1 (RID_GALLERYSTR_THEME_START + 128) +#define RID_GALLERYSTR_THEME_MUSIC_INSTRUMENTS (RID_GALLERYSTR_THEME_START + 129) +#define RID_GALLERYSTR_THEME_MUSIC_SHEET_MUSIC (RID_GALLERYSTR_THEME_START + 130) +#define RID_GALLERYSTR_THEME_SPECIAL_PICTOGRAMM (RID_GALLERYSTR_THEME_START + 131) +#define RID_GALLERYSTR_THEME_PHOTOS_CELEBRATION (RID_GALLERYSTR_THEME_START + 132) +#define RID_GALLERYSTR_THEME_PHOTOS_FOODSANDDRINKS (RID_GALLERYSTR_THEME_START + 133) +#define RID_GALLERYSTR_THEME_PHOTOS_HUMANS (RID_GALLERYSTR_THEME_START + 134) +#define RID_GALLERYSTR_THEME_PHOTOS_OBJECTS (RID_GALLERYSTR_THEME_START + 135) +#define RID_GALLERYSTR_THEME_PHOTOS_SPACE (RID_GALLERYSTR_THEME_START + 136) +#define RID_GALLERYSTR_THEME_PHOTOS_TRAVEL (RID_GALLERYSTR_THEME_START + 137) +#define RID_GALLERYSTR_THEME_OPENOFFICEORG_LOGOS (RID_GALLERYSTR_THEME_START + 138) +#define RID_GALLERYSTR_THEME_RELIGION (RID_GALLERYSTR_THEME_START + 139) +#define RID_GALLERYSTR_THEME_BUILDINGS (RID_GALLERYSTR_THEME_START + 140) +#define RID_GALLERYSTR_THEME_HOMEPAGE2 (RID_GALLERYSTR_THEME_START + 141) +#define RID_GALLERYSTR_THEME_ELEMENTSBULLETS2 (RID_GALLERYSTR_THEME_START + 142) + #define RID_GALLERYSTR_THEME_FIRST RID_GALLERYSTR_THEME_3D -#define RID_GALLERYSTR_THEME_LAST RID_GALLERYSTR_THEME_FONTWORK_VERTICAL +#define RID_GALLERYSTR_THEME_LAST RID_GALLERYSTR_THEME_ELEMENTSBULLETS2 #endif diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index 09cc85f8bc..6cb5d4fe4c 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -958,15 +958,15 @@ };\ MenuItem\ {\ - ITEM_HELP_SUPPORTPAGE\ + ITEM_SHOW_LICENSE\ };\ MenuItem\ {\ - ITEM_HELP_ONLINE_REGISTRATION\ + Separator = TRUE ; \ };\ MenuItem\ {\ - Separator = TRUE ; \ + ITEM_SHOW_CREDITS\ };\ MenuItem\ {\ diff --git a/svx/inc/lightdlg.hxx b/svx/inc/lightdlg.hxx index fe00bcf0e5..b179163289 100644 --- a/svx/inc/lightdlg.hxx +++ b/svx/inc/lightdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,14 +36,12 @@ #include <sfx2/tabdlg.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <svx/dlgctrl.hxx> /************************************************************************* |* -|* 3D-Tab-Dialog +|* 3D TabDialog |* \************************************************************************/ @@ -58,7 +57,7 @@ public: /************************************************************************* |* -|* 3D-SingleTab-Dialog +|* 3D SingleTabDialog |* \************************************************************************/ class Svx3DSingleTabDialog : public SfxSingleTabDialog @@ -73,3 +72,4 @@ public: #endif // _SVX_LIGHT3D_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/pch/precompiled_svx.cxx b/svx/inc/pch/precompiled_svx.cxx index 52e0e91754..88354384ce 100644 --- a/svx/inc/pch/precompiled_svx.cxx +++ b/svx/inc/pch/precompiled_svx.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_svx.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index e5d10ec002..aeacde6f1f 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -689,6 +690,7 @@ #include "osl/nlsupport.h" #include "osl/process.h" #include "osl/security.hxx" +#include "osl/thread.hxx" #include "rsc/rscsfx.hxx" #include "rtl/bootstrap.hxx" #include "rtl/cipher.h" @@ -698,6 +700,7 @@ #include "rtl/logfile.hxx" #include "rtl/math.hxx" #include "rtl/memory.h" +#include "rtl/ref.hxx" #include "rtl/tencinfo.h" #include "rtl/textenc.h" #include "rtl/ustrbuf.hxx" @@ -706,6 +709,7 @@ #include "sal/config.h" #include "sal/main.h" #include "sal/types.h" +#include "salhelper/simplereferenceobject.hxx" #include "sfx2/bindings.hxx" #include "sfx2/ctrlitem.hxx" #include "sfx2/dispatch.hxx" @@ -960,3 +964,4 @@ //---MARKER--- #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx index 19e735265b..42af07adde 100644 --- a/svx/inc/sjctrl.hxx +++ b/svx/inc/sjctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,33 +28,22 @@ #ifdef SOLAR_JAVA -#ifndef _SFXSFXJS_HXX #include <sfx2/sfxjs.hxx> -#endif class VCControl; class VCForm; class VCManager; class VCRadioManager; - -// Basis-Klasse aller VCControl-Wrapper-Klassen -// Haelt Verweis auf das Control und handelt einige gemeinsame Properties +// Base class of all VCControl wrapper classes +// Keeps reference to the Control and handles some common properties class ImpSjJScriptControlBase { protected: VCControl* pControl; public: - // Beibehalten bis zum Vollupdate - /* - String getName() const; - void setName( const String & aStrg ); - String getValue() const; - String getType() const; - */ - - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- String ImpGetName() const; void ImpSetName( const String & aStrg ); @@ -61,7 +51,7 @@ class ImpSjJScriptControlBase void ImpSetValue( const String & aStrg ); String ImpGetType() const; - // Konstruktor + // Constructor ImpSjJScriptControlBase::ImpSjJScriptControlBase( VCControl* _pControl ); }; @@ -71,40 +61,40 @@ class ImpSjJScriptControlBase class ImpSjJScriptButtonObject : public SjJScriptButtonObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual void setValue( const String & aStrg ); virtual String getType() const; - // Methoden des Objektes + // Methods of the object virtual void click(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnClick_Fct() const; virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual String getOnClick() const; virtual void setOnClick( const String & aSourceStrg ); void onClick(); - // Konstruktor + // constructor ImpSjJScriptButtonObject( VCControl* _pControl, SjJSbxObject * p ); }; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// PasswordControl (Edit-Control zur Password-Eingabe) +// PasswordControl (edit control for entering password) class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; @@ -114,16 +104,16 @@ class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject, ImpSjJScriptC virtual void setDefaultValue( const String & aStrg ); virtual void setValue( const String & aStrg ); - // Methoden des Objektes + // Methods of the object virtual void focus(); virtual void blur(); virtual void select(); // Events (C++ --> Java) //---------------------- - // keine ! + // none! - // Konstruktor + // construktor ImpSjJScriptPasswordObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -132,9 +122,9 @@ class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject, ImpSjJScriptC class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; @@ -144,28 +134,27 @@ class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptC virtual void setChecked( BOOL bCheck ); virtual BOOL getDefaultChecked() const; virtual void setDefaultChecked( BOOL bCheck ); - // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); - // Methoden des Objektes + // Methods of the object virtual void click(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnClick_Fct() const; virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual String getOnClick() const; virtual void setOnClick( const String & aSourceStrg ); void onClick(); - // Konstruktor + // construktor ImpSjJScriptCheckboxObject( VCControl* _pControl, SjJSbxObject * p ); }; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Wrapper-Klasse fuer RadioArray +// Wrapper class for RadioArray class ImpSjJScriptRadioArray: public SjJSbxArrayObject { VCRadioManager* pMgr; @@ -174,7 +163,7 @@ public: SjJSbxObject* ImpSjJScriptRadioArray::getElement( INT32 nIndex ) const; SjJSbxObject* ImpSjJScriptRadioArray::getElement_String( const String & aName ) const; - // Konstruktor + // construktor ImpSjJScriptRadioArray::ImpSjJScriptRadioArray( VCRadioManager* _pMgr, SjJSbxObject * p ); }; @@ -183,37 +172,33 @@ public: class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual String getType() const; - // Properties von SjJScriptCheckboxObject + // Properties of SjJScriptCheckboxObject virtual BOOL getChecked() const; virtual void setChecked( BOOL bCheck ); virtual BOOL getDefaultChecked() const; virtual void setDefaultChecked( BOOL bCheck ); - // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); - // yyy Raus zum inkompatiblen - //virtual INT32 getLength(); - - // Methoden des Objektes + // Methods of the object virtual void click(); // Events (C++ --> Java) - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnClick_Fct() const; virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual String getOnClick() const; virtual void setOnClick( const String & aSourceStrg ); void onClick(); - // Konstruktor + // Constructor ImpSjJScriptRadioObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -222,9 +207,9 @@ class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControl class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; @@ -234,17 +219,13 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr virtual INT32 getSelectedIndex() const; virtual void setSelectedIndex( INT32 nNo ); - // liefert eine Array von Option-Objekten - //yyy Raus zum inkompatiblen - //virtual SjJSbxArrayObject * getOptions(); - - // Methoden des Objektes + // Methods of the object virtual void focus(); virtual void blur(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnBlur_Fct() const; virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual SjJScriptFunctionObject* getOnChange_Fct() const; @@ -261,23 +242,20 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr virtual void setOnFocus( const String & aSourceStrg ); void onFocus(); - // SjJSbxArrayObject-Methoden + // SjJSbxArrayObject methods virtual INT32 getLength() const; - // Zugriff "uber den Index + // Access through the index virtual SjJSbxObject * getElement( INT32 nIndex ) const; - // Zugriff "uber den Namen - // native Java-Methoden k"onnen (noch) nicht "uberladen werden - //virtual SjJSbxObject * getElement_String( const String & aName ) const; - // Konstruktor + // Constructor ImpSjJScriptSelectObject( VCControl* _pControl, SjJSbxObject * p ); - // zum Setzen von Eintr"agen am Objket (zum Aufruf von Java aus) 15.1.1997 + // for setting entries of the object (to be called from Java) virtual void setOption( INT32 nIndex, const String & aOptionText, const String & aOptionValue, BOOL bDefaultSelected, BOOL bSelected ); - // Schnittstelle fuer die Properties der Option-Objekte + // interface for the properties of the option objects virtual BOOL getOptionDefaultSelected( INT32 nIndex ) const; virtual void setOptionDefaultSelected( BOOL bSelected, INT32 nIndex ); virtual BOOL getOptionSelected( INT32 nIndex ) const; @@ -290,13 +268,11 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Wieso von Controlbase abgeleitet? - class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptControlBase { USHORT nListBoxIndex; public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- virtual BOOL getdefaultSelected() const; virtual void setdefaultSelected( BOOL bSelected ); @@ -304,53 +280,44 @@ class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptContr virtual BOOL getSelected() const; virtual void setSelected( BOOL bSelected ); - - //yyy Zum Vollupdate raus: - /* - virtual INT32 getSelectedIndex() const; - virtual void setSelectedIndex( INT32 nNo ); - */ - - virtual String getText() const; virtual void setText( const String & sText ); - // getValue() wird in der Basisklasse definiert virtual String getValue() const; virtual void setValue( const String & aStrg ); - // DUMMY-Methoden + // DUMMY methods virtual String getName() const { return "";} virtual void setName( const String &s) { } virtual String getType() const { return "";} - // Methoden des Objektes - // keine ! + // Methods of the object + // none ! // Events (C++ --> Java) //---------------------- - // keine ! + // none ! - // Konstruktor + // Constructor ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, USHORT _nListBoxIndex ); }; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Eigene Klasse fuer forms-Array anlegen +// Separate class for forms array class SjJSbxFormsArray: public SfxJSArray { VCManager* pManager; public: - // SjJSbxArrayObject-Methoden + // SjJSbxArrayObject methods virtual INT32 getLength() const; - // Zugriff "uber den Index + // access through the index virtual SjJSbxObject * getElement( INT32 nIndex ) const; - // Zugriff "uber den Namen - // native Java-Methoden k"onnen (noch) nicht "uberladen werden + // access through the name + // cannot overload native java methods (yet) virtual SjJSbxObject * getElement_String( const String & aName ) const; - // Konstruktor + // Constructor SjJSbxFormsArray( VCManager * _pManager, SjJSbxObject * p ); }; @@ -359,9 +326,9 @@ class SjJSbxFormsArray: public SfxJSArray class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; @@ -369,17 +336,16 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa virtual String getDefaultValue() const; virtual void setDefaultValue( const String & aStrg ); - // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); - // Methoden des Objektes + // Methods of the object virtual void focus(); virtual void blur(); virtual void select(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnBlur_Fct() const; virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual SjJScriptFunctionObject* getOnChange_Fct() const; @@ -401,7 +367,7 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa virtual void setOnSelect( const String & aSourceStrg ); void onSelect(); - // Konstruktor + // Constructor ImpSjJScriptTextObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -410,9 +376,9 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; @@ -420,17 +386,16 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC virtual String getDefaultValue() const; virtual void setDefaultValue( const String & aStrg ); - // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); - // Methoden des Objektes + // Methods of the object virtual void focus(); virtual void blur(); virtual void select(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnBlur_Fct() const; virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual SjJScriptFunctionObject* getOnChange_Fct() const; @@ -452,7 +417,7 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC virtual void setOnSelect( const String & aSourceStrg ); void onSelect(); - // Konstruktor + // Constructor ImpSjJScriptTextareaObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -460,30 +425,30 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC class ImpSjJScriptSubmitObject : public SjJScriptSubmitObject, ImpSjJScriptControlBase { - // Identisch mit ButtonObject + // identically equal to ButtonObject public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual void setValue( const String & aStrg ); virtual String getType() const; - // Methoden des Objektes + // Methods of the object virtual void click(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnClick_Fct() const; virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual String getOnClick() const; virtual void setOnClick( const String & aSourceStrg ); void onClick(); - // Konstruktor + // Constructor ImpSjJScriptSubmitObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -491,30 +456,30 @@ class ImpSjJScriptSubmitObject : public SjJScriptSubmitObject, ImpSjJScriptContr class ImpSjJScriptResetObject : public SjJScriptResetObject, ImpSjJScriptControlBase { - // Identisch mit ButtonObject + // identically equal to ButtonObject public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual void setValue( const String & aStrg ); virtual String getType() const; - // Methoden des Objektes + // Methods of the object virtual void click(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnClick_Fct() const; virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual String getOnClick() const; virtual void setOnClick( const String & aSourceStrg ); void onClick(); - // Konstruktor + // Constructor ImpSjJScriptResetObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -523,25 +488,24 @@ class ImpSjJScriptResetObject : public SjJScriptResetObject, ImpSjJScriptControl class ImpSjJScriptHiddenObject : public SjJScriptHiddenObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual String getType() const; - // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); - // Methoden des Objektes - // keine ! + // Methods of the object + // none ! // Events (C++ --> Java) //---------------------- - // keine ! + // none ! - // Konstruktor + // Constructor ImpSjJScriptHiddenObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -550,22 +514,22 @@ class ImpSjJScriptHiddenObject : public SjJScriptHiddenObject, ImpSjJScriptContr class ImpSjJScriptFileUploadObject : public SjJScriptFileUploadObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual String getType() const; - // Methoden des Objektes - // keine ! + // Methods of the object + // none ! // Events (C++ --> Java) //---------------------- - // keine ! + // none ! - // Konstruktor + // Constructor ImpSjJScriptFileUploadObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -576,7 +540,7 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject VCForm* pVCForm; public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- virtual String getName() const; virtual void setName( const String & aStrg ); @@ -592,26 +556,18 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject virtual String getTarget() const; virtual void setTarget( const String & sValue ); - // SjJSbxArrayObject-Methoden + // SjJSbxArrayObject methods INT32 getLength() const; SjJSbxObject* getElement( INT32 nIndex ) const; SjJSbxObject* getElement_String( const String & aName ) const; - // liefert ein Array-Objekt mit Elementen vom Typ JScriptAbstractControlsObject - // yyy Raus zum inkompatiblen - //virtual SjJSbxArrayObject * getElements(); - - // Zugriff ueber den Namen eines Controls (falls ein Name zugeordnet ist) - // yyy Raus zum inkompatiblen - //virtual SjJSbxObject * getElement( const String & aName ); - - // Methoden des Objektes + // Methods of the object virtual void submit(); virtual void reset(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnSubmit_Fct() const; virtual void setOnSubmit_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual SjJScriptFunctionObject* getOnReset_Fct() const; @@ -623,8 +579,10 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject virtual void setOnReset( const String & aSourceStrg ); void onReset(); - // Konstruktor + // Constructor ImpSjJScriptFormObject( VCForm* _pVCForm, SjJSbxObject * p ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index a48f552f88..b46d695f3f 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,11 +51,11 @@ friend class ImpItemEdit; USHORT nLastWhich; USHORT nLastWhichOben; USHORT nLastWhichUnten; - FASTBOOL bWhichesButNames; - FASTBOOL bDontHideIneffectiveItems; - FASTBOOL bDontSortItems; - FASTBOOL bShowWhichIds; - FASTBOOL bShowRealValues; + bool bWhichesButNames; + bool bDontHideIneffectiveItems; + bool bDontSortItems; + bool bShowWhichIds; + bool bShowRealValues; private: #if _SOLAR__PRIVATE void ImpCtor(); @@ -70,7 +71,7 @@ protected: virtual void DoubleClick(const BrowserMouseEvent&); virtual void KeyInput(const KeyEvent& rEvt); virtual void Select(); - virtual void SetDirty(); // wird z.B. bei Modusumschaltungen gerufen + virtual void SetDirty(); // is called for example in mode switches virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); public: @@ -80,8 +81,8 @@ public: void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); ULONG GetCurrentPos() const; USHORT GetCurrentWhich() const; - virtual FASTBOOL BegChangeEntry(ULONG nPos); - virtual FASTBOOL EndChangeEntry(); + virtual bool BegChangeEntry(ULONG nPos); + virtual bool EndChangeEntry(); virtual void BrkChangeEntry(); /** GetCellText returns the text at the given position @@ -114,7 +115,7 @@ public: virtual void GetFocus(); void Clear() { aBrowse.Clear(); } void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse.SetAttributes(pAttr,p2ndSet); } - void SetFloatingMode(FASTBOOL /*bOn*/) {} + void SetFloatingMode(bool /*bOn*/) {} const _SdrItemBrowserControl& GetBrowserControl() const { return aBrowse; } _SdrItemBrowserControl& GetBrowserControl() { return aBrowse; } }; @@ -124,7 +125,7 @@ class SdrView; class SdrItemBrowser: public _SdrItemBrowserWindow { Timer aIdleTimer; SdrView* pView; - FASTBOOL bDirty; + bool bDirty; private: static Window* ImpGetViewWin(SdrView& rView); DECL_LINK(IdleHdl,Timer*); @@ -142,3 +143,4 @@ public: #endif //_SVDIBROW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svdpomv.hxx b/svx/inc/svdpomv.hxx index 74c33052b4..8a35638621 100644 --- a/svx/inc/svdpomv.hxx +++ b/svx/inc/svdpomv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ public: #endif //_SVDPOMV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svdshort.hxx b/svx/inc/svdshort.hxx index f0f9789d77..f2b21b37b7 100644 --- a/svx/inc/svdshort.hxx +++ b/svx/inc/svdshort.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,4 @@ #endif //_SVDSHORT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/svx/inc/svx/AccessibleControlShape.hxx index d7049043de..42518561c8 100644 --- a/svx/inc/svx/AccessibleControlShape.hxx +++ b/svx/inc/svx/AccessibleControlShape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -214,3 +215,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/svx/inc/svx/AccessibleGraphicShape.hxx index c1131fa746..efd568138f 100644 --- a/svx/inc/svx/AccessibleGraphicShape.hxx +++ b/svx/inc/svx/AccessibleGraphicShape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx index c8136ca4b9..77aead6fd3 100644 --- a/svx/inc/svx/AccessibleOLEShape.hxx +++ b/svx/inc/svx/AccessibleOLEShape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,9 @@ #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX #define _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX -#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_MANAGER_HXX #include <svx/AccessibleShape.hxx> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_ #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#endif #include "svx/svxdllapi.h" namespace accessibility { @@ -131,3 +128,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx index 59a601c5a4..edd01a314f 100755..100644 --- a/svx/inc/svx/AccessibleShape.hxx +++ b/svx/inc/svx/AccessibleShape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -408,3 +409,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleShapeInfo.hxx b/svx/inc/svx/AccessibleShapeInfo.hxx index 23f4eb0085..15271ef95a 100644 --- a/svx/inc/svx/AccessibleShapeInfo.hxx +++ b/svx/inc/svx/AccessibleShapeInfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleShapeTreeInfo.hxx b/svx/inc/svx/AccessibleShapeTreeInfo.hxx index 2610a58a2f..1ba7fa48bd 100644 --- a/svx/inc/svx/AccessibleShapeTreeInfo.hxx +++ b/svx/inc/svx/AccessibleShapeTreeInfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -214,3 +215,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/svx/inc/svx/AccessibleTableShape.hxx index 0f89805d9f..2da3859c44 100644 --- a/svx/inc/svx/AccessibleTableShape.hxx +++ b/svx/inc/svx/AccessibleTableShape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/svx/inc/svx/AccessibleTextHelper.hxx index c577b8d2f7..ae52362029 100644 --- a/svx/inc/svx/AccessibleTextHelper.hxx +++ b/svx/inc/svx/AccessibleTextHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -429,3 +430,5 @@ namespace accessibility } // end of namespace accessibility #endif /* _SVX_ACCESSILE_TEXT_HELPER_HXX_ */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx index 70f466b6eb..95e61a649f 100644 --- a/svx/inc/svx/ActionDescriptionProvider.hxx +++ b/svx/inc/svx/ActionDescriptionProvider.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ChildrenManager.hxx b/svx/inc/svx/ChildrenManager.hxx index 0fefc121cf..8230d566df 100644 --- a/svx/inc/svx/ChildrenManager.hxx +++ b/svx/inc/svx/ChildrenManager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -214,3 +215,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx index 1ab616b7a6..4b951aaee0 100644 --- a/svx/inc/svx/DescriptionGenerator.hxx +++ b/svx/inc/svx/DescriptionGenerator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -215,3 +216,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx index 9853b5f1b7..568f533385 100644 --- a/svx/inc/svx/EnhancedCustomShape2d.hxx +++ b/svx/inc/svx/EnhancedCustomShape2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -219,3 +220,4 @@ class EnhancedCustomShape2d : public SfxItemSet }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx index 4e83dd757a..7383bfa5f5 100644 --- a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -212,3 +213,5 @@ private: } #endif /* _ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/EnhancedCustomShapeGeometry.hxx b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx index 1961227844..4c16eb1bf7 100644 --- a/svx/inc/svx/EnhancedCustomShapeGeometry.hxx +++ b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ SVX_DLLPUBLIC sal_Bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType ); SVX_DLLPUBLIC const mso_CustomShape* GetCustomShapeContent( MSO_SPT eSpType ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/IAccessibleParent.hxx b/svx/inc/svx/IAccessibleParent.hxx index b817e611ab..2f07103ef5 100644 --- a/svx/inc/svx/IAccessibleParent.hxx +++ b/svx/inc/svx/IAccessibleParent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ public: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/IAccessibleViewForwarder.hxx b/svx/inc/svx/IAccessibleViewForwarder.hxx index 5291a7f8f4..ee787a9a8e 100644 --- a/svx/inc/svx/IAccessibleViewForwarder.hxx +++ b/svx/inc/svx/IAccessibleViewForwarder.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,5 @@ public: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/svx/inc/svx/IAccessibleViewForwarderListener.hxx index 4a49e4fe7c..db771fa8b3 100644 --- a/svx/inc/svx/IAccessibleViewForwarderListener.hxx +++ b/svx/inc/svx/IAccessibleViewForwarderListener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ public: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx index fc589e3586..fa90223515 100644 --- a/svx/inc/svx/ParseContext.hxx +++ b/svx/inc/svx/ParseContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,4 @@ namespace svxform +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx index dbbca94edc..55bd2df172 100755..100644 --- a/svx/inc/svx/ShapeTypeHandler.hxx +++ b/svx/inc/svx/ShapeTypeHandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -235,3 +236,5 @@ private: } // end of namespace accessible #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/SmartTagCtl.hxx b/svx/inc/svx/SmartTagCtl.hxx index 08e80c153e..e0c12228f6 100644 --- a/svx/inc/svx/SmartTagCtl.hxx +++ b/svx/inc/svx/SmartTagCtl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx index d6ad34ee74..898d2407aa 100644 --- a/svx/inc/svx/SmartTagItem.hxx +++ b/svx/inc/svx/SmartTagItem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,8 +79,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; // leer virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; // leer - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& GetActionComponentsSequence() const { return maActionComponentsSequence; } const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& GetActionIndicesSequence() const { return maActionIndicesSequence; } @@ -94,3 +95,4 @@ public: #endif // #ifndef _SVX_SMARTTAGITEM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx index 6dc8e484de..1559cad536 100644 --- a/svx/inc/svx/SmartTagMgr.hxx +++ b/svx/inc/svx/SmartTagMgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -232,3 +233,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx index f050ed2ac1..af440c0e8a 100644 --- a/svx/inc/svx/SpellDialogChildWindow.hxx +++ b/svx/inc/svx/SpellDialogChildWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,3 +124,5 @@ protected: } // end of namespace ::svx #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/svx/inc/svx/SvxShapeTypes.hxx index 403ad6726e..1f7f08faf2 100644 --- a/svx/inc/svx/SvxShapeTypes.hxx +++ b/svx/inc/svx/SvxShapeTypes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX #define _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX -#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX #include <svx/ShapeTypeHandler.hxx> -#endif #include <com/sun/star/accessibility/XAccessible.hpp> namespace accessibility { @@ -86,3 +85,5 @@ extern ShapeTypeDescriptor aSvxShapeTypeList[]; } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/UnoNamespaceMap.hxx b/svx/inc/svx/UnoNamespaceMap.hxx index 05a92f7c06..eaa7712863 100644 --- a/svx/inc/svx/UnoNamespaceMap.hxx +++ b/svx/inc/svx/UnoNamespaceMap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,5 @@ SVX_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > } #endif // _SVX_UNONAMESPACEMAP_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/XPropertyTable.hxx b/svx/inc/svx/XPropertyTable.hxx index 13d870991c..45d8db0f25 100644 --- a/svx/inc/svx/XPropertyTable.hxx +++ b/svx/inc/svx/XPropertyTable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx index faf381d8a2..cb14fa25f0 100644 --- a/svx/inc/svx/algitem.hxx +++ b/svx/inc/svx/algitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,77 +40,6 @@ class SvStream; //------------------------------------------------------------------------ - - -class SVX_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem -{ -public: - TYPEINFO(); - - SvxHorJustifyItem( const USHORT nId ); - - SvxHorJustifyItem( - const SvxCellHorJustify eJustify /*= SVX_HOR_JUSTIFY_STANDARD*/, - const USHORT nId ); - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - - inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) - { - SetValue( rHorJustify.GetValue() ); - return *this; - } -}; - - -//------------------------------------------------------------------------ - - -class SVX_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem -{ -public: - TYPEINFO(); - - SvxVerJustifyItem( const USHORT nId ); - - SvxVerJustifyItem( - const SvxCellVerJustify eJustify /*= SVX_VER_JUSTIFY_STANDARD*/, - const USHORT nId ); - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - - inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) - { - SetValue( rVerJustify.GetValue() ); - return *this; - } -}; - - -//------------------------------------------------------------------------ - class SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem { public: @@ -128,8 +58,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual USHORT GetValueCount() const; virtual String GetValueText( USHORT nVal ) const; @@ -176,8 +106,8 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); INT16 GetLeftMargin() const {return nLeftMargin; } BOOL SetLeftMargin(INT16 nLeft); @@ -200,3 +130,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/anchorid.hxx b/svx/inc/svx/anchorid.hxx index a7c814b8f4..516aebd18b 100644 --- a/svx/inc/svx/anchorid.hxx +++ b/svx/inc/svx/anchorid.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,13 +31,15 @@ enum SvxAnchorIds { - SVX_OBJ_AT_CNTNT = 0x01, //Absatzgebundener Rahmen - SVX_OBJ_IN_CNTNT = 0x02, //Zeichengebundener Rahmen - SVX_OBJ_PAGE = 0x04, //Seitengebundener Rahmen - SVX_OBJ_AT_FLY = 0x08 //Rahmengebundener Rahmen -// SVX_OBJ_AUTO_CNTNT = 0x10 //Automatisch positionierter, absatzgebundener Rahmen + SVX_OBJ_AT_CNTNT = 0x01, // Frame bound to paragraph + SVX_OBJ_IN_CNTNT = 0x02, // Frame bound to character + SVX_OBJ_PAGE = 0x04, // Frame bound to page + SVX_OBJ_AT_FLY = 0x08 // Frame bound to other frame +// SVX_OBJ_AUTO_CNTNT = 0x10 // Automatically positioned frame bound to paragraph }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx index 8a8241323a..59ce59b860 100644 --- a/svx/inc/svx/bmpmask.hxx +++ b/svx/inc/svx/bmpmask.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,7 +61,7 @@ public: /************************************************************************* |* -|* Ableitung vom SfxChildWindow als 'Beh"alter' f"ur Float +|* Derivative from SfxChildWindow as 'container' for Float |* \************************************************************************/ @@ -127,7 +128,6 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow SvxBmpMaskSelectItem aSelItem; Image maImgPipette; - Image maImgPipetteH; virtual BOOL Close(); @@ -198,3 +198,4 @@ private: #endif // _BMPMASK_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx index ee4bd71039..0f1a8aba37 100644 --- a/svx/inc/svx/camera3d.hxx +++ b/svx/inc/svx/camera3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ /************************************************************************* |* -|* Kamera-Ableitung +|* Camera derivative |* \************************************************************************/ @@ -50,14 +51,14 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D double fFocalLength; double fBankAngle; - FASTBOOL bAutoAdjustProjection; + bool bAutoAdjustProjection; public: Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt, double fFocalLen = 35.0, double fBankAng = 0); Camera3D(); - // Anfangswerte wieder herstellen + // Reset to default values void Reset(); void SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt, @@ -71,24 +72,26 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D const basegfx::B3DPoint& GetLookAt() const { return aLookAt; } void SetPosAndLookAt(const basegfx::B3DPoint& rNewPos, const basegfx::B3DPoint& rNewLookAt); - // Brennweite in mm + // Focal length in mm void SetFocalLength(double fLen); void SetFocalLengthWithCorrect(double fLen); double GetFocalLength() const { return fFocalLength; } - // Neigung links/rechts + // Bank angle links/rechts void SetBankAngle(double fAngle); double GetBankAngle() const { return fBankAngle; } - // Um die Kameraposition drehen, LookAt wird dabei veraendert + // For rotating the camera position. Changes LookAt. void Rotate(double fHAngle, double fVAngle); - // Um den Blickpunkt drehen, Position wird dabei veraendert + // For changing the point of view. Changes the position. void RotateAroundLookAt(double fHAngle, double fVAngle); - void SetAutoAdjustProjection(FASTBOOL bAdjust = TRUE) + void SetAutoAdjustProjection(bool bAdjust = true) { bAutoAdjustProjection = bAdjust; } - FASTBOOL IsAutoAdjustProjection() const { return bAutoAdjustProjection; } + bool IsAutoAdjustProjection() const { return bAutoAdjustProjection; } }; #endif // _CAMERA3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx index 43d5272719..ba66b9df30 100644 --- a/svx/inc/svx/charmap.hxx +++ b/svx/inc/svx/charmap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,8 +34,8 @@ #include <vcl/metric.hxx> #include <vcl/scrbar.hxx> #include <map> -#include <tools/shl.hxx> //add CHINA001 -#include <tools/debug.hxx> //add CHINA001 +#include <tools/shl.hxx> +#include <tools/debug.hxx> #include "svx/svxdllapi.h" // define ---------------------------------------------------------------- @@ -138,3 +139,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx index 4aefcf2791..c69f9bd390 100644 --- a/svx/inc/svx/checklbx.hxx +++ b/svx/inc/svx/checklbx.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <svtools/svtreebx.hxx> #include <svtools/svlbitm.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include "svx/svxdllapi.h" // class SvxCheckListBox ------------------------------------------------- @@ -62,8 +61,7 @@ public: SvxCheckListBox( Window* pParent, WinBits nWinStyle = 0 ); SvxCheckListBox( Window* pParent, const ResId& rResId ); SvxCheckListBox( Window* pParent, const ResId& rResId, - const Image& rNormalStaticImage, - const Image& rHighContrastStaticImage ); + const Image& rNormalStaticImage ); ~SvxCheckListBox(); void InsertEntry ( const String& rStr, @@ -92,3 +90,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx index 129e7e747f..4ce6daea7b 100644 --- a/svx/inc/svx/chrtitem.hxx +++ b/svx/inc/svx/chrtitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -274,8 +275,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); USHORT GetValueCount() const { return CHTXTORDER_COUNT; } SvxChartTextOrder GetValue() const @@ -355,11 +356,8 @@ public: SvxDoubleItem(SvStream& rIn, USHORT nId ); SvxDoubleItem(const SvxDoubleItem& rItem); - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - - + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, @@ -383,3 +381,4 @@ public: #endif // _SVX_CHRTITEM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx index 4ad3933603..48651a9e26 100644 --- a/svx/inc/svx/clipboardctl.hxx +++ b/svx/inc/svx/clipboardctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx index a55b929610..03b9bc6aee 100644 --- a/svx/inc/svx/clipfmtitem.hxx +++ b/svx/inc/svx/clipfmtitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,9 +51,9 @@ public: SvxClipboardFmtItem( const SvxClipboardFmtItem& ); virtual ~SvxClipboardFmtItem(); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); - + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + void AddClipbrdFormat( ULONG nId, USHORT nPos = USHRT_MAX ); void AddClipbrdFormat( ULONG nId, const String& rName, USHORT nPos = USHRT_MAX ); @@ -65,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx index 5ffcab526d..e37363a95b 100644 --- a/svx/inc/svx/colrctrl.hxx +++ b/svx/inc/svx/colrctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,7 +76,7 @@ public: /************************************************************************* |* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Controller +|* Derivation from SfxChildWindow as "container" for Controller |* \************************************************************************/ @@ -109,7 +110,6 @@ private: Size aColorSize; Size aItemSize; -//#if 0 // _SOLAR__PRIVATE void FillValueSet(); void SetSize(); DECL_LINK( SelectHdl, void * ); @@ -119,7 +119,6 @@ private: the keyboard. */ virtual void GetFocus (void); -//#endif protected: virtual BOOL Close(); @@ -143,3 +142,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/connctrl.hxx b/svx/inc/svx/connctrl.hxx index 6ba07e23ae..5bd0160031 100644 --- a/svx/inc/svx/connctrl.hxx +++ b/svx/inc/svx/connctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _CTRL_HXX //autogen #include <vcl/ctrl.hxx> -#endif #include "svx/svxdllapi.h" class SfxItemSet; @@ -75,3 +74,4 @@ public: #endif // _SVX_CONNCTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx index 17c31d6d5e..742e16b66e 100644 --- a/svx/inc/svx/contdlg.hxx +++ b/svx/inc/svx/contdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,7 @@ /************************************************************************* |* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Float +|* Derivation from SfxChildWindow as "container" for Float |* \************************************************************************/ @@ -59,12 +60,6 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow class SvxSuperContourDlg; -/************************************************************************* -|* -|* -|* -\************************************************************************/ - class SvxContourDlgItem : public SfxControllerItem { SvxSuperContourDlg& rDlg; @@ -78,26 +73,17 @@ public: SvxContourDlgItem( USHORT nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings ); }; -/************************************************************************* -|* -|* -|* -\************************************************************************/ - class SVX_DLLPUBLIC SvxContourDlg : public SfxFloatingWindow { using Window::Update; SvxSuperContourDlg* pSuperClass; -//#if 0 // _SOLAR__PRIVATE protected: void SetSuperClass( SvxSuperContourDlg& rSuperClass ) { pSuperClass = &rSuperClass; } -//#endif // __PRIVATE - public: SvxContourDlg( SfxBindings *pBindings, SfxChildWindow *pCW, @@ -140,3 +126,4 @@ public: #endif // _REDUCED_CONTDLG_HXX_ #endif // _CONTDLG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index 853fd75470..56a561b1ac 100644 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,12 +29,8 @@ #ifndef _SVX_CTREDLIN_HXX #define _SVX_CTREDLIN_HXX -#ifndef _MOREBTN_HXX //autogen #include <vcl/morebtn.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> #include <vcl/lstbox.hxx> @@ -57,7 +54,7 @@ #define FLT_DATE_SAVE 5 -// Struct fuer Datums-Sortierung +// Struct for sorting data class SVX_DLLPUBLIC RedlinData { @@ -76,7 +73,7 @@ public: virtual ~SvxRedlinEntry(); }; -// Klasse fuer die Darstellung von schriftabhaengigen Strings +// Class for the representation of Strings depending on the font class SvLBoxColorString : public SvLBoxString { private: @@ -147,7 +144,7 @@ public: BOOL IsValidCalcEntry(const String& ,RedlinData *pUserData); BOOL IsValidWriterEntry(const String& ,RedlinData *pUserData); - // keine NULL-Ptr. ueberpruefung { + // no NULL-pointer checking { BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment); BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime); BOOL IsValidComment(const String* pComment); @@ -250,13 +247,13 @@ public: String GetComment()const; - // Methoden fuer Calc { + // Methods for Calc { void SetRange(const String& rString); String GetRange() const; void HideRange(BOOL bHide=TRUE); void DisableRange(BOOL bFlag=TRUE); void SetFocusToRange(); - // } Methoden fuer Calc + // } Methods for Calc void HideClocks(BOOL bHide=TRUE); void DisableRef(BOOL bFlag); @@ -293,7 +290,7 @@ public: const Link& GetModifyCommentHdl() const { return aModifyComLink; } - // Methoden fuer Calc { + // Methods for Calc { void SetModifyRangeHdl( const Link& rLink ) { aModifyRefLink = rLink; } const Link& GetModifyRangeHdl() const { return aModifyRefLink; } @@ -303,7 +300,7 @@ public: void Enable( bool bEnable = true, bool bChild = true ); void Disable( bool bChild = true ); - // } Methoden fuer Calc + // } Methods for Calc }; @@ -429,3 +426,4 @@ public: #endif // _SVX_CTREDLIN_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx index 39be134f0d..5049bda27c 100644 --- a/svx/inc/svx/cube3d.hxx +++ b/svx/inc/svx/cube3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,13 +35,13 @@ /************************************************************************* |* |* | -|* 3D-Quader erzeugen; aPos: Zentrum oder links, unten, hinten |__ -|* (abhaengig von bPosIsCenter) / -|* Mit nSideFlags kann angegeben werden, ob nur ein Teil der -|* Quaderflaechen erzeugt werden kann; die entsprechenden Bits -|* sind in dem enum definiert. Das Flag bDblSided legt fest, -|* ob die erzeugten Flaechen doppelseitig sind (nur sinnvoll, -|* wenn nicht alle Flaechen erzeugt wurden). +|* Create a 3D cuboid; aPos: Center oder left, bottom, behind |__ +|* (depending on bPosIsCenter) / +|* nSideFlags indicates, if only some of the cuboid surfaces can +|* be created; the corresponding bits are defined in the enum. +|* The flag bDblSided indicates whether the created surfaces are +|* two-sided (which only makes sense if not all of the surfaces were +|* created). |* \************************************************************************/ @@ -74,7 +75,7 @@ public: virtual void operator=(const SdrObject&); - // Lokale Parameter setzen mit Geometrieneuerzeugung + // Set local parameters with geometry recreation void SetCubePos(const basegfx::B3DPoint& rNew); const basegfx::B3DPoint& GetCubePos() { return aCubePos; } @@ -87,9 +88,11 @@ public: void SetSideFlags(UINT16 nNew); UINT16 GetSideFlags() { return nSideFlags; } - // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". + // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; }; #endif // _E3D_CUBE3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx index b73432b6c5..ec972e0dd8 100644 --- a/svx/inc/svx/dataaccessdescriptor.hxx +++ b/svx/inc/svx/dataaccessdescriptor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,3 +163,4 @@ namespace svx #endif // _SVX_DATACCESSDESCRIPTOR_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/databaselocationinput.hxx b/svx/inc/svx/databaselocationinput.hxx index 77e93297e6..adbaf9ed5a 100644 --- a/svx/inc/svx/databaselocationinput.hxx +++ b/svx/inc/svx/databaselocationinput.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ namespace svx //........................................................................ #endif // SVX_DATABASELOCATIONINPUT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx index 736dee6e72..352913bf5e 100644 --- a/svx/inc/svx/databaseregistrationui.hxx +++ b/svx/inc/svx/databaseregistrationui.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,5 @@ namespace svx //........................................................................ #endif // SVX_DATABASE_REGISTRATION_UI_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dbaexchange.hxx b/svx/inc/svx/dbaexchange.hxx index 003a07ae2b..7a6ce675f3 100644 --- a/svx/inc/svx/dbaexchange.hxx +++ b/svx/inc/svx/dbaexchange.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -297,3 +298,4 @@ namespace svx #endif // _SVX_DBAEXCHANGE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dbaobjectex.hxx b/svx/inc/svx/dbaobjectex.hxx index b82fa273f0..446822a2e4 100644 --- a/svx/inc/svx/dbaobjectex.hxx +++ b/svx/inc/svx/dbaobjectex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,4 @@ namespace svx #endif // SVX_DBAOBJECTEX_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx index 8d1c4b7f5c..ce6bffd3a9 100755..100644 --- a/svx/inc/svx/dbcharsethelper.hxx +++ b/svx/inc/svx/dbcharsethelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ namespace svxform #endif // SVX_DBCHARSETCLIENT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx index 22e2ab820e..9144f64cda 100755..100644 --- a/svx/inc/svx/dbtoolsclient.hxx +++ b/svx/inc/svx/dbtoolsclient.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,7 +57,7 @@ namespace svxform static oslModule s_hDbtoolsModule; static ::connectivity::simple::createDataAccessToolsFactoryFunction s_pFactoryCreationFunc; - //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time) + mutable BOOL m_bCreateAlready; private: @@ -233,3 +234,4 @@ namespace svxform #endif // SVX_DBTOOLSCLIENT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/def3d.hxx b/svx/inc/svx/def3d.hxx index 056291f8ad..93931feca6 100644 --- a/svx/inc/svx/def3d.hxx +++ b/svx/inc/svx/def3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,7 +40,7 @@ const double EPSILON = 1e-06; #define DEG2RAD(fAngle) (fPiDiv180 * (fAngle)) //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -//+++ 3D-Hilfsfunktionen +++++++++++++++++++++++++++++++++++++++++++++++++ +//+++ 3D helper functions ++++++++++++++++++++++++++++++++++++++++++++++++ //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ enum E3dDragConstraint { E3DDRAG_CONSTR_X = 0x0001, @@ -52,3 +53,5 @@ enum E3dDragConstraint { E3DDRAG_CONSTR_X = 0x0001, }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx index 2c95c76c06..41e8754e68 100644 --- a/svx/inc/svx/deflt3d.hxx +++ b/svx/inc/svx/deflt3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,29 +36,29 @@ /************************************************************************* |* -|* Klasse zum verwalten der 3D-Default Attribute +|* Class for managing the 3D default attributes |* \************************************************************************/ class SVX_DLLPUBLIC E3dDefaultAttributes { private: - // Compound-Objekt + // Compound object Color aDefaultAmbientColor; BOOL bDefaultCreateNormals; BOOL bDefaultCreateTexture; - // Cube-Objekt + // Cube object basegfx::B3DPoint aDefaultCubePos; basegfx::B3DVector aDefaultCubeSize; UINT16 nDefaultCubeSideFlags; BOOL bDefaultCubePosIsCenter; - // Sphere-Objekt + // Sphere object basegfx::B3DPoint aDefaultSphereCenter; basegfx::B3DVector aDefaultSphereSize; - // Lathe-Objekt + // Lathe object long nDefaultLatheEndAngle; BOOL bDefaultLatheSmoothed; BOOL bDefaultLatheSmoothFrontBack; @@ -65,7 +66,7 @@ private: BOOL bDefaultLatheCloseFront; BOOL bDefaultLatheCloseBack; - // Extrude-Objekt + // Extrude object BOOL bDefaultExtrudeSmoothed; BOOL bDefaultExtrudeSmoothFrontBack; BOOL bDefaultExtrudeCharacterMode; @@ -73,14 +74,14 @@ private: BOOL bDefaultExtrudeCloseBack; public: - // Konstruktor + // Construktor E3dDefaultAttributes(); - // Defaults zuruecksetzen + // Reset to defaults void Reset(); - // Getter/Setter fuer Default-Werte aller 3D-Objekte - // Compound-Objekt + // Getter/Setter for default values of all 3D objects + // Compound object const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; } void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; } @@ -89,7 +90,7 @@ public: BOOL GetDefaultCreateTexture() const { return bDefaultCreateTexture; } void SetDefaultCreateTexture(const BOOL bNew) { bDefaultCreateTexture = bNew; } - // Cube-Objekt + // Cube object const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; } void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; } const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; } @@ -99,13 +100,13 @@ public: BOOL GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; } void SetDefaultCubePosIsCenter(const BOOL bNew) { bDefaultCubePosIsCenter = bNew; } - // Sphere-Objekt + // Sphere object const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; } void SetDefaultSphereCenter(const basegfx::B3DPoint& rNew) { aDefaultSphereCenter = rNew; } const basegfx::B3DVector& GetDefaultSphereSize() { return aDefaultSphereSize; } void SetDefaultSphereSize(const basegfx::B3DPoint& rNew) { aDefaultSphereSize = rNew; } - // Lathe-Objekt + // Lathe object long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; } void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; } BOOL GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; } @@ -119,7 +120,7 @@ public: BOOL GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; } void SetDefaultLatheCloseBack(const BOOL bNew) { bDefaultLatheCloseBack = bNew; } - // Extrude-Objekt + // Extrude object BOOL GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; } void SetDefaultExtrudeSmoothed(const BOOL bNew) { bDefaultExtrudeSmoothed = bNew; } BOOL GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; } @@ -133,3 +134,5 @@ public: }; #endif // _E3D_DEFLT3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx index 23da0627fc..5ead2c2b68 100644 --- a/svx/inc/svx/dialcontrol.hxx +++ b/svx/inc/svx/dialcontrol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,3 +137,4 @@ typedef sfx::ItemControlConnection< sfx::Int32ItemWrapper, DialControlWrapper > #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dialmgr.hxx b/svx/inc/svx/dialmgr.hxx index 94c2a238b0..0cc242191c 100644 --- a/svx/inc/svx/dialmgr.hxx +++ b/svx/inc/svx/dialmgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,4 @@ struct SVX_DLLPUBLIC DialogsResMgr #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 07d56108b7..d7522d3e40 100755 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -189,10 +189,7 @@ #define RID_SVXIMAGE_LIGHT_ON (RID_SVX_START + 210) #define RID_SVXIMAGE_LIGHT_OFF (RID_SVX_START + 211) -#define RID_SVXIMAGE_LIGHT_ON_H (RID_SVX_START + 212) -#define RID_SVXIMAGE_LIGHT_OFF_H (RID_SVX_START + 213) #define RID_SVXIMAGE_COLORDLG (RID_SVX_START + 214) -#define RID_SVXIMAGE_COLORDLG_H (RID_SVX_START + 215) #define RID_SVXFLOAT3D_FAVORITE (RID_SVX_START + 73) #define RID_SVXFLOAT3D_FIX_X (RID_SVX_START + 74) @@ -202,35 +199,31 @@ #define RID_SVXFLOAT3D_FIX_G (RID_SVX_START + 78) #define RID_SVXFLOAT3D_FIX_B (RID_SVX_START + 84) -// Ids fuer FrameBitmaps durch ImageList ersetzt -// 67 bis 72 frei +// 67 to 72 free -// ResId fuer den Gitter- und Raster-Dialog +// ResId for the grid dialog #define RID_SVXDLG_GRID (RID_SVX_START + 79) -// ResId's fuer FontMenu-Controls +// ResId's for the FontMenu controls #define RID_MN_FONTSIZE (RID_SVX_START + 80) -// ResId's fuer Undo-TbxControls +// ResId's for Undo-TbxControls #define RID_SVXTBX_UNDO (RID_SVX_START + 81) -// ResId fuer Zoom-Popup-Menue +// ResId for zoom popup menu #define RID_SVXMNU_ZOOM (RID_SVX_START + 82) -// ResId fuer Funktions-Popup-Menue +// ResId for funktion popup menue #define RID_SVXMNU_PSZ_FUNC (RID_SVX_START + 83) #define RID_SVXMNU_XMLSECSTATBAR (RID_SVX_START + 84) -// ResId fuer Position- und Size-Bitmap +// ResId for position and size bitmap #define RID_SVXBMP_POSITION (RID_SVX_START + 85) #define RID_SVXBMP_SIZE (RID_SVX_START + 86) #define RID_SVXBMP_SIGNET (RID_SVX_START + 87) -#define RID_SVXBMP_SIGNET_H (RID_SVX_START + 88) #define RID_SVXBMP_SIGNET_BROKEN (RID_SVX_START + 89) -#define RID_SVXBMP_SIGNET_BROKEN_H (RID_SVX_START + 90) #define RID_SVXBMP_SIGNET_NOTVALIDATED (RID_SVX_START + 91) -#define RID_SVXBMP_SIGNET_NOTVALIDATED_H (RID_SVX_START + 92) #define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START + 67) #define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 68) @@ -242,13 +235,13 @@ // Resource mit Bitmaps fuer die CheckListBox #define RID_CHECKLISTBOX_BITMAPS (RID_SVX_START + 91) -// Menu fuers Lineal +// Menu for the ruler #define RID_SVXMN_RULER (RID_SVX_START + 92) -// FontWork-Dialog +// FontWork dialog #define RID_SVXDLG_FONTWORK (RID_SVX_START + 93) -// FontWork-ValueSet-Bitmaps +// FontWork ValueSet bitmaps #define RID_SVXBMP_FONTWORK_FORM1 (RID_SVX_START + 94) #define RID_SVXBMP_FONTWORK_FORM2 (RID_SVX_START + 95) #define RID_SVXBMP_FONTWORK_FORM3 (RID_SVX_START + 96) @@ -269,7 +262,7 @@ #define RID_SVXCTRL_COLOR (RID_SVX_START + 117) -// fuer ToolboxControl-Style +// for Toolbox-Control style #define RID_SVXTBX_STYLE (RID_SVX_START + 120) #define RID_SVXDLG_HYPERLINK (RID_SVX_START + 140) @@ -320,20 +313,20 @@ // Ids fuer Autokorrektur #define RID_SVX_AUTOCORR (RID_SVX_START + 192) -// Auswahl ext. Linguitik +// Choice for external linguistics #define RID_SVX_OPT_EXT_LINGU (RID_SVX_START + 193) // TabPage und Dialog f"ur LDAP-Server #define RID_SVXPAGE_LDAP (RID_SVX_START + 204) #define RID_SVXDLG_LDAP (RID_SVX_START + 205) -// Dialog fuer Funktionen +// Dialog for functions #define RID_SVXDLG_CALCFUNC (RID_SVX_START + 206) // QueryBox for Exit Recovery Wizard #define RID_SVXQB_EXIT_RECOVERY (RID_SVX_START + 215) -// ResId fuer den ImportGraphic-Dialog +// ResId for the ImportGraphic dialog #define RID_SVXRES_IMPORTGRAPHIC (RID_SVX_START + 499) @@ -380,11 +373,11 @@ // Strings ------------------------------------------------------------------ -// Strings fuer die Sprachen (HM-Abhaengig) +// Strings for the language #define RID_SVXSTR_LANGUAGE_BEGIN (RID_SVX_START + 0) #define RID_SVXSTR_LANGUAGE_ALL (RID_SVX_START + 15) -// Messages im DBMgr-Bereich +// Messages for the DBMgr #define RID_SVXSTR_DBINI (RID_SVX_START + 60) #define RID_SVXSTR_DBDRV (RID_SVX_START + 61) #define RID_SVXSTR_NODBDRV (RID_SVX_START + 62) @@ -399,14 +392,14 @@ #define RID_SVXSTR_INVALID_RECORD (RID_SVX_START + 71) #define RID_SVXSTR_NOSET_MATCHING (RID_SVX_START + 72) -// Strings aus dem Suchen-Dialog +// Strings from the search dialog #define RID_SVXSTR_SEARCH_STYLES (RID_SVX_START + 80) #define RID_SVXSTR_SEARCH (RID_SVX_START + 81) #define RID_SVXSTR_REPLACE (RID_SVX_START + 82) #define RID_SVXSTR_FULLSIZE (RID_SVX_START + 144) -// ResIds fuer die verschiedenen Strings des PageDlgs +// ResIds for the PageDialog #define RID_SVXSTR_CALC_PAGE (RID_SVX_START + 146) #define RID_SVXSTR_DRAW_PAGE (RID_SVX_START + 147) @@ -420,17 +413,17 @@ #define RID_SVXSTR_MORE (RID_SVX_START + 198) -// Strings der UndoTbxControls +// Strings for the UndoTbxControls #define RID_SVXSTR_UNDO (RID_SVX_START + 200) #define RID_SVXSTR_REDO (RID_SVX_START + 201) #define RID_SVXSTR_ACTION (RID_SVX_START + 202) #define RID_SVXSTR_ACTIONS (RID_SVX_START + 203) -// Strings fuer Insert/Overwrite +// Strings for insert/overwrite #define RID_SVXSTR_INSERT_TEXT (RID_SVX_START + 210) #define RID_SVXSTR_OVERWRITE_TEXT (RID_SVX_START + 211) -// Strings fuer Selection Mode +// Strings for the selection mode #define RID_SVXSTR_SELMODE_STD (RID_SVX_START + 212) #define RID_SVXSTR_SELMODE_ER (RID_SVX_START + 213) #define RID_SVXSTR_SELMODE_ERG (RID_SVX_START + 214) @@ -443,10 +436,10 @@ // weitere ID bei 219 -// String-ResId fuer den ImportGraphic-Dialog +// String-ResId for the ImportGraphic dialog #define RID_SVXSTR_ALL_FILES (RID_SVX_START + 241) -// Strings des Lineals +// Strings for the ruler #define RID_SVXSTR_RULER_START (RID_SVX_START + 245) #define RID_SVXSTR_RULER_TAB_LEFT (RID_SVX_START + 245) #define RID_SVXSTR_RULER_TAB_RIGHT (RID_SVX_START + 246) @@ -471,7 +464,7 @@ #define RID_SVXSTR_FONTWORK_FORM12 (RID_SVX_START + 272) #define RID_SVXSTR_FONTWORK_UNDOCREATE (RID_SVX_START + 273) -// Farben-Strings +// Color strings #define RID_SVXSTR_BLACK (RID_SVX_START + 275) #define RID_SVXSTR_BLUE (RID_SVX_START + 276) #define RID_SVXSTR_GREEN (RID_SVX_START + 277) @@ -491,7 +484,7 @@ #define RID_SVXSTR_BLUEGREY (RID_SVX_START + 291) #define RID_SVXSTR_ORANGE (RID_SVX_START + 292) -// Linienenden-Strings +// Line endings strings #define RID_SVXSTR_ARROW (RID_SVX_START + 300) #define RID_SVXSTR_SQUARE (RID_SVX_START + 301) #define RID_SVXSTR_CIRCLE (RID_SVX_START + 302) @@ -505,7 +498,7 @@ // Hyperlink-Dlg #define RID_SVXMN_HYPERLINK (RID_SVX_START + 321) -// Hyperlink-QueryBoxen +// Hyperlink query boxes #define RID_SVXQB_NOCONNECT (RID_SVX_START + 322) #define RID_SVXQB_DONTEXIST (RID_SVX_START + 323) //color configuration @@ -523,18 +516,18 @@ #define RID_SVXSTR_MEM_ERROR (RID_SVX_START + 415) #define RID_SVXSTR_DLG_TITLE_INFO (RID_SVX_START + 416) -// Define - Bereich fuer BmpMaskierung -// !!! aus diesem Bereich keine Defines benutzen !!! +// Define - Region for bitmap masking +// !!! don't use defines from this region !!! #define RID_SVX_BMPMASK_START (RID_SVX_START + 420) #define RID_SVX_BMPMASK_END (RID_SVX_START + 440) -// Define - Bereich fuer IMAP-Editor -// !!! aus diesem Bereich keine Defines benutzen !!! +// Define - Region for IMAP editor +// !!! don't use defines from this region !!! #define RID_SVX_IMAP_START (RID_SVX_START + 450) #define RID_SVX_IMAP_END (RID_SVX_START + 460) -// Define - Bereich fuer Contour-Editor -// !!! aus diesem Bereich keine Defines benutzen !!! +// Define - Region for contour editor +// !!! don't use defines from this region !!! #define RID_SVX_CONTOUR_START (RID_SVX_START + 461) #define RID_SVX_CONTOUR_END (RID_SVX_START + 471) @@ -1049,5 +1042,11 @@ #define OFA_TP_TABPROPERTIES_TEXT (RID_OFA_START + 245) #define OFA_TP_HELPERPROG (RID_OFA_START + 249) -#endif +#define SVX_OOO_BUILD_START (RID_SVX_START + 1200) + +#define RID_SVXBMP_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 1) +#define RID_SVXBMP_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 2) +#define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 3) +#define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 4) +#endif diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx index fe06fdfc2d..d56a3991f8 100644 --- a/svx/inc/svx/dlgctl3d.hxx +++ b/svx/inc/svx/dlgctl3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,7 +131,7 @@ public: virtual void SetObjectType(sal_uInt16 nType); - // User Callback eintragen + // register user callback void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; } void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; } void SetChangeCallback(Link aNew) { maChangeCallback = aNew; } @@ -169,7 +170,7 @@ private: ScrollBar maVerScroller; PushButton maSwitcher; - // Callback bei interaktiven Aenderungen + // callback for interactive changes Link maUserInteractiveChangeCallback; Link maUserSelectionChangeCallback; @@ -178,17 +179,17 @@ public: SvxLightCtl3D( Window* pParent, WinBits nStyle = 0); ~SvxLightCtl3D(); - // Reagiere auf Groessenaenderungen + // react to size changes virtual void Resize(); void NewLayout(); - // Selektion auf Gueltigkeit pruefen + // check the selection for validity void CheckSelection(); - // Um weitere Einstellungen nach Aussen zu bringen... + // bring further settings to the outside world Svx3DLightControl& GetSvx3DLightControl() { return maLightControl; } - // User Callback eintragen + // register user callback void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; } void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; } @@ -203,7 +204,7 @@ protected: DECL_LINK( ScrollBarMove, void*); DECL_LINK( ButtonPress, void*); - // Lokale Parameter Initialisieren + // initialize local parameters void Init(); void move( double fDeltaHor, double fDeltaVer ); @@ -213,3 +214,5 @@ protected: ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx index a6c2d52f41..9c4fffd326 100644 --- a/svx/inc/svx/dlgctrl.hxx +++ b/svx/inc/svx/dlgctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,8 +63,8 @@ namespace com { namespace sun { namespace star { namespace awt { /************************************************************************* |* -|* Von SfxTabPage abgeleitet, um vom Control ueber virtuelle Methode -|* benachrichtigt werden zu koennen. +|* Derived from SfxTabPage for being able to get notified through the +|* virtual method from the control. |* \************************************************************************/ class SvxTabPage : public SfxTabPage @@ -78,8 +79,8 @@ public: /************************************************************************* |* -|* Control zur Darstellung und Auswahl der Eckpunkte (und Mittelpunkt) -|* eines Objekts +|* Control for display and selection of the corner and center points of +|* an object |* \************************************************************************/ typedef UINT16 CTL_STATE; @@ -110,7 +111,6 @@ protected: Bitmap* pBitmap; CTL_STATE m_nState; - // #103516# Added a possibility to completely disable this control sal_Bool mbCompleteDisable; RECT_POINT GetRPFromPoint( Point ) const; @@ -149,15 +149,14 @@ public: RECT_POINT GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& rPixelPoint ) const; - // #103516# Added a possibility to completely disable this control sal_Bool IsCompletelyDisabled() const { return mbCompleteDisable; } void DoCompletelyDisable(sal_Bool bNew); }; /************************************************************************* |* -|* Control zur Darstellung und Auswahl des Winkels der Eckpunkte -|* eines Objekts +|* Control for display and selecton of the angle of the corner points +|* of an object |* \************************************************************************/ class SvxAngleCtl : public SvxRectCtl @@ -181,7 +180,7 @@ public: /************************************************************************* |* -|* Preview-Control zur Darstellung von Bitmaps +|* Preview control for the display of bitmaps |* \************************************************************************/ @@ -207,7 +206,7 @@ public: /************************************************************************* |* -|* Control zum Editieren von Bitmaps +|* Control for editing bitmaps |* \************************************************************************/ class SVX_DLLPUBLIC SvxPixelCtl : public Control @@ -253,7 +252,7 @@ public: /************************************************************************* |* -|* ColorLB kann mit Farben und Namen gefuellt werden +|* ColorLB can be filled with colors and names |* \************************************************************************/ class SVX_DLLPUBLIC ColorLB : public ColorListBox @@ -348,7 +347,7 @@ private: /************************************************************************* |* -|* FillAttrLB vereint alle Fuellattribute in einer ListBox +|* FillAttrLB unites all fill attributes an a ListBox |* \************************************************************************/ class FillAttrLB : public ColorListBox @@ -474,7 +473,6 @@ private: SdrObject* mpLineObjB; SdrObject* mpLineObjC; - //#58425# Symbole auf einer Linie (z.B. StarChart) Graphic* mpGraphic; sal_Bool mbWithSymbol; Size maSymbolSize; @@ -537,3 +535,4 @@ public: #endif // _SVX_DLG_CTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/drawitem.hxx b/svx/inc/svx/drawitem.hxx index 2a816bc13c..cac8a37b87 100644 --- a/svx/inc/svx/drawitem.hxx +++ b/svx/inc/svx/drawitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,8 +59,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); XColorTable* GetColorTable() const { return pColorTable; } void SetColorTable( XColorTable* pTable ) { @@ -92,8 +93,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); XGradientList* GetGradientList() const { return pGradientList; } void SetGradientList( XGradientList* pList ) { @@ -127,8 +128,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); XHatchList* GetHatchList() const { return pHatchList; } void SetHatchList( XHatchList* pList ) { @@ -162,8 +163,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); XBitmapList* GetBitmapList() const { return pBitmapList; } void SetBitmapList( XBitmapList* pList ) { @@ -197,8 +198,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); XDashList* GetDashList() const { return pDashList; } void SetDashList( XDashList* pList ); @@ -231,8 +232,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); XLineEndList* GetLineEndList() const { return pLineEndList; } void SetLineEndList( XLineEndList* pList ) { @@ -244,3 +245,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dstribut_enum.hxx b/svx/inc/svx/dstribut_enum.hxx index e9e3dfce04..6238bf991f 100644 --- a/svx/inc/svx/dstribut_enum.hxx +++ b/svx/inc/svx/dstribut_enum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,10 +28,6 @@ #ifndef _SVX_DSTRIBUT_ENUM_HXX #define _SVX_DSTRIBUT_ENUM_HXX -/************************************************************************* -|* -\************************************************************************/ - enum SvxDistributeHorizontal { SvxDistributeHorizontalNone = 0, @@ -51,3 +48,4 @@ enum SvxDistributeVertical #endif // _SVX_DSTRIBUT_ENUM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx index 5d22acf2ac..266cdbaeda 100644 --- a/svx/inc/svx/e3ditem.hxx +++ b/svx/inc/svx/e3ditem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,8 +55,8 @@ public: virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const; virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); const basegfx::B3DVector& GetValue() const { return aVal; } void SetValue( const basegfx::B3DVector& rNewVal ) { @@ -71,3 +72,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/e3dsceneupdater.hxx b/svx/inc/svx/e3dsceneupdater.hxx index d395bceaef..473ca1f230 100644 --- a/svx/inc/svx/e3dsceneupdater.hxx +++ b/svx/inc/svx/e3dsceneupdater.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ public: }; #endif // _E3D_SCENEUPDATER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx index 1c5e595fde..131c4aac6d 100644 --- a/svx/inc/svx/e3dundo.hxx +++ b/svx/inc/svx/e3dundo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,7 @@ class E3dView; /************************************************************************\ |* -|* Basisklasse fuer alle 3D-Undo-Aktionen. +|* Base class for all 3D undo actions. |* \************************************************************************/ class E3dUndoAction : public SdrUndoAction @@ -62,7 +63,7 @@ class E3dUndoAction : public SdrUndoAction /************************************************************************\ |* -|* Undo fuer 3D-Rotation ueber die Rotationsmatrizen (ob das wohl klappt ?) +|* Undo for 3D rotation through the rotation matrices |* \************************************************************************/ class E3dRotateUndoAction : public E3dUndoAction @@ -91,7 +92,7 @@ class E3dRotateUndoAction : public E3dUndoAction /************************************************************************\ |* -|* Undo fuer 3D-Attribute (Implementiert ueber Set3DAttributes()) +|* Undo for 3D attributes (implemented using Set3DAttributes()) |* \************************************************************************/ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction @@ -122,3 +123,5 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction }; #endif // _E3D_CUBE3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc index 828ed6c124..2008375dde 100644 --- a/svx/inc/svx/exthelpid.hrc +++ b/svx/inc/svx/exthelpid.hrc @@ -28,6 +28,8 @@ #define _SVX_EXTHELPID_HRC // include --------------------------------------------------------------- +#include <svl/solar.hrc> + // these HIDs are used in SVX and also in other modules, mainly CUI // the reason is that different controls have the same help texts assigned // but are implemented in different libraries @@ -35,8 +37,19 @@ // are moved to this exported (delivered) hrc file // Help-Ids -------------------------------------------------------------- -#define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE" -#define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE" +#define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0) +#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1) + +// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here! + +// ----------------------------------------------------------------------- +// Overrun check --------------------------------------------------------- +// ----------------------------------------------------------------------- + +#define ACT_SVX_EXT_HID_END (HID_SVX_EXT0_START + 1) +#if ACT_SVX_EXT_HID_END > HID_SVX_EXT0_END +#error Resource-Ueberlauf in #line, #file +#endif #endif diff --git a/svx/inc/svx/exthelpid.hrc.orig b/svx/inc/svx/exthelpid.hrc.orig new file mode 100644 index 0000000000..2008375dde --- /dev/null +++ b/svx/inc/svx/exthelpid.hrc.orig @@ -0,0 +1,55 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVX_EXTHELPID_HRC +#define _SVX_EXTHELPID_HRC +// include --------------------------------------------------------------- + +#include <svl/solar.hrc> + +// these HIDs are used in SVX and also in other modules, mainly CUI +// the reason is that different controls have the same help texts assigned +// but are implemented in different libraries +// to avoid "exporting" the whole HID list only those few ones that are shared +// are moved to this exported (delivered) hrc file + +// Help-Ids -------------------------------------------------------------- +#define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0) +#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1) + +// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here! + +// ----------------------------------------------------------------------- +// Overrun check --------------------------------------------------------- +// ----------------------------------------------------------------------- + +#define ACT_SVX_EXT_HID_END (HID_SVX_EXT0_START + 1) +#if ACT_SVX_EXT_HID_END > HID_SVX_EXT0_END +#error Resource-Ueberlauf in #line, #file +#endif + +#endif + diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx index 73a4fc7645..8454acf04d 100644 --- a/svx/inc/svx/extrud3d.hxx +++ b/svx/inc/svx/extrud3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,18 +94,18 @@ public: virtual void operator=(const SdrObject&); - // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". + // TakeObjName...() is for the display in the UI (for example "3 frames selected") virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - // Lokale Parameter setzen/lesen mit Geometrieneuerzeugung + // set/get local parameters with geometry regeneration void SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew); const basegfx::B2DPolyPolygon &GetExtrudePolygon() { return maExtrudePolygon; } - // Aufbrechen virtual BOOL IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; #endif // _E3D_EXTRUD3D_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/extrusionbar.hxx b/svx/inc/svx/extrusionbar.hxx index 87b93ccd38..f33748836b 100644 --- a/svx/inc/svx/extrusionbar.hxx +++ b/svx/inc/svx/extrusionbar.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,5 @@ public: } #endif // _SVX_EXTRUSION_BAR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx index 4e0b001950..bcfc8dcc05 100644 --- a/svx/inc/svx/f3dchild.hxx +++ b/svx/inc/svx/f3dchild.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,7 @@ /************************************************************************* |* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer 3D Window +|* Derived from SfxChildWindow as "container" for 3D Window |* \************************************************************************/ @@ -49,3 +50,4 @@ class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow #endif // _SVX_F3DCHILD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index 1e2bcc5fab..73b5c69a54 100644 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,7 @@ class ListBox; /************************************************************************* |* -|* Klassen fuer Flaechenattribute (Controls und Controller) +|* Class for surface attributes (controls and controller) |* \************************************************************************/ @@ -91,11 +92,9 @@ private: Size aLogicalAttrSize; Timer aDelayTimer; -//#if 0 // _SOLAR__PRIVATE DECL_LINK( DelayHdl, Timer * ); DECL_LINK( SelectFillTypeHdl, ListBox * ); DECL_LINK( SelectFillAttrHdl, ListBox * ); -//#endif virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: FillControl( Window* pParent, WinBits nStyle = 0 ); @@ -106,3 +105,4 @@ public: #endif // _FILLCTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx index b56d69fd02..0be00e027f 100644 --- a/svx/inc/svx/flagsdef.hxx +++ b/svx/inc/svx/flagsdef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,7 +82,7 @@ enum SvxModeType // define ---------------------------------------------------------------- // 1/2 cm in TWIPS -// wird auch fuer Minimalgrosse der LayFrms aller Arten benutzt +// Is also used for minimum size of LayFrms of any kind #define MM50 283 //from original svx/inc/paragrph.hxx //--------------from original svx/inc/tabstpge.hxx @@ -101,3 +102,5 @@ enum SvxModeType //----- #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx index 3b3793b1d0..6697d08714 100644 --- a/svx/inc/svx/float3d.hxx +++ b/svx/inc/svx/float3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,12 +30,8 @@ #define _SVX_FLOAT3D_HXX #include <sfx2/ctrlitem.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <sfx2/dockwin.hxx> #ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> @@ -84,7 +81,7 @@ private: ImageButton aBtnUpdate; ImageButton aBtnAssign; -// Geometrie +// geometry FixedText aFtPercentDiagonal; MetricField aMtrPercentDiagonal; FixedText aFtBackscale; @@ -110,7 +107,7 @@ private: ImageButton aBtnDoubleSided; -// Darstellung +// presentation FixedText aFtShademode; ListBox aLbShademode; ImageButton aBtnShadow3d; @@ -124,7 +121,7 @@ private: FixedLine aFLCamera; FixedLine aFLRepresentation; -// Beleuchtung +// lighting ImageButton aBtnLight1; ImageButton aBtnLight2; ImageButton aBtnLight3; @@ -153,7 +150,7 @@ private: FixedLine aFLLight; -// Texturen +// Textures FixedText aFtTexKind; ImageButton aBtnTexLuminance; ImageButton aBtnTexColor; @@ -173,8 +170,8 @@ private: ImageButton aBtnTexFilter; FixedLine aFLTexture; -// Material -// Materialeditor +// material +// material editor FixedText aFtMatFavorites; ListBox aLbMatFavorites; FixedText aFtMatColor; @@ -191,21 +188,21 @@ private: FixedLine aFLMatSpecular; FixedLine aFLMaterial; -// Unterer Teil +// bottom part ImageButton aBtnConvertTo3D; ImageButton aBtnLatheObject; ImageButton aBtnPerspective; Svx3DPreviewControl aCtlPreview; SvxLightCtl3D aCtlLightPreview; -// der Rest ... +// the rest ... Image aImgLightOn; Image aImgLightOff; BOOL bUpdate; ViewType3D eViewType; Size aSize; - // Model, Page, View etc. fuer Favoriten + // Model, Page, View etc. for favourites FmFormModel* pModel; FmFormPage* pFmPage; VirtualDevice* pVDev; @@ -274,7 +271,7 @@ public: /************************************************************************* |* -|* ControllerItem fuer 3D-Window (Floating/Docking) +|* Controller item for 3D Window (Floating/Docking) |* \************************************************************************/ @@ -292,7 +289,7 @@ class Svx3DCtrlItem : public SfxControllerItem /************************************************************************* |* -|* ControllerItem fuer Status eines Slots +|* ControllerItem for State of a Slot |* (SID_CONVERT_TO_3D, SID_CONVERT_TO_3D_LATHE_FAST) |* \************************************************************************/ @@ -311,3 +308,4 @@ public: #endif // _SVX_FLOAT3D_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmdmod.hxx b/svx/inc/svx/fmdmod.hxx index 4926d1ecb2..a38f561d6d 100644 --- a/svx/inc/svx/fmdmod.hxx +++ b/svx/inc/svx/fmdmod.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ public: #endif // _SVX_FMDMOD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx index 29931235df..990c90c4be 100644 --- a/svx/inc/svx/fmdpage.hxx +++ b/svx/inc/svx/fmdpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,21 +41,19 @@ class SVX_DLLPUBLIC SvxFmDrawPage :public SvxDrawPage { protected: - // Erzeugen eines SdrObjects anhand einer Description. Kann von - // abgeleiteten Klassen dazu benutzt werden, eigene ::com::sun::star::drawing::Shapes zu - // unterstuetzen (z.B. Controls) + // Creating a SdrObject based on a Description. Cann be used by derived classes to + // support own ::com::sun::star::drawing::Shapes (for example Controls) virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape )throw (); - // Die folgende Methode wird gerufen, wenn ein SvxShape-Objekt angelegt - // werden soll. abgeleitete Klassen koennen hier eine Ableitung oder - // ein ein SvxShape aggregierendes Objekt anlegen. + // The following method is called when a SvxShape object should be created. + // Derived classes can create a derivation or an object aggregating SvxShape. virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (); public: SvxFmDrawPage( SdrPage* pPage ); virtual ~SvxFmDrawPage() throw (); - // UNO Anbindung + // UNO connection DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); @@ -74,3 +73,4 @@ public: #endif // _SVX_FMDPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmglob.hxx b/svx/inc/svx/fmglob.hxx index c07362f37d..c2289cbe51 100644 --- a/svx/inc/svx/fmglob.hxx +++ b/svx/inc/svx/fmglob.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ const sal_uInt32 FmFormInventor = sal_uInt32('F')*0x00000001+ sal_uInt32('1')*0x01000000; const sal_uInt16 OBJ_FM_CONTROL = ::com::sun::star::form::FormComponentType::CONTROL; - // fuer FormularKomponenten + // for form components const sal_uInt16 OBJ_FM_EDIT = ::com::sun::star::form::FormComponentType::TEXTFIELD; const sal_uInt16 OBJ_FM_BUTTON = ::com::sun::star::form::FormComponentType::COMMANDBUTTON; const sal_uInt16 OBJ_FM_FIXEDTEXT = ::com::sun::star::form::FormComponentType::FIXEDTEXT; @@ -64,3 +65,4 @@ const sal_uInt16 OBJ_FM_NAVIGATIONBAR = ::com::sun::star::form::FormComponen #endif // _FM_FMGLOB_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx index e9bf83ad12..f7f969e91b 100644 --- a/svx/inc/svx/fmgridcl.hxx +++ b/svx/inc/svx/fmgridcl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,23 +142,23 @@ public: sal_Int32 GetSelectedColumn() const; - /** return the name of the specified object. + /** return the name of the specified object. @param eObjType The type to ask for @param _nPosition The position of a tablecell (index position), header bar colum/row cell - @return - The name of the specified object. + @return + The name of the specified object. */ virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; - /** return the description of the specified object. + /** return the description of the specified object. @param eObjType The type to ask for @param _nPosition The position of a tablecell (index position), header bar colum/row cell - @return - The description of the specified object. + @return + The description of the specified object. */ virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; @@ -214,3 +215,4 @@ protected: #endif // _SVX_FMGRIDCL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx index 4ee8aa89c9..c6a9d2d967 100644 --- a/svx/inc/svx/fmgridif.hxx +++ b/svx/inc/svx/fmgridif.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -232,7 +233,7 @@ public: FmXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); virtual ~FmXGridControl(); - // UNO Anbindung + // UNO connection DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); @@ -317,12 +318,12 @@ public: protected: virtual FmXGridPeer* imp_CreatePeer(Window* pParent); - // ImplCreatePeer waere besser ;) geht aber nicht, da dann nicht exportiert + // ImplCreatePeer would be better, but doesn't work because it's not exported }; //================================================================== -// FmXGridPeer -> Peer fuers Gridcontrol +// FmXGridPeer -> Peer for the Gridcontrol //================================================================== typedef ::comphelper::ImplHelper19 < ::com::sun::star::form::XGridPeer, ::com::sun::star::form::XBoundComponent, @@ -385,7 +386,7 @@ public: // spaeter Constructor, immer nach dem realen Constructor zu rufen ! void Create(Window* pParent, WinBits nStyle); -// UNO Anbindung +// UNO connection DECLARE_UNO3_DEFAULTS(FmXGridPeer, VCLXWindow); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); @@ -549,3 +550,4 @@ protected: #endif // _SVX_FMGRID_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx index ee5c157d47..d4dfef4951 100644 --- a/svx/inc/svx/fmmodel.hxx +++ b/svx/inc/svx/fmmodel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,13 +61,13 @@ public: FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); FmFormModel(const XubString& rPath, SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); - FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, FASTBOOL bUseExtColorTable); + FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable); FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, - FASTBOOL bUseExtColorTable); + bool bUseExtColorTable); virtual ~FmFormModel(); - virtual SdrPage* AllocPage(FASTBOOL bMasterPage); + virtual SdrPage* AllocPage(bool bMasterPage); virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); virtual SdrPage* RemovePage(sal_uInt16 nPgNum); virtual void MovePage(USHORT nPgNum, USHORT nNewPos); @@ -100,3 +101,4 @@ private: #endif // _FM_FMMODEL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmobjfac.hxx b/svx/inc/svx/fmobjfac.hxx index 7e59fa175b..b2767b6258 100644 --- a/svx/inc/svx/fmobjfac.hxx +++ b/svx/inc/svx/fmobjfac.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ public: #endif // _FM_FMOBJFAC_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx index 12296f64c1..0160e22c50 100644 --- a/svx/inc/svx/fmpage.hxx +++ b/svx/inc/svx/fmpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,7 @@ class StarBASIC; class FmFormModel; -class FmFormPageImpl; // haelt die Liste aller Forms +class FmFormPageImpl; // contains a list of all forms FORWARD_DECLARE_INTERFACE(container,XNameContainer) @@ -52,7 +53,7 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage public: TYPEINFO(); - FmFormPage(FmFormModel& rModel,StarBASIC*, FASTBOOL bMasterPage=sal_False); + FmFormPage(FmFormModel& rModel,StarBASIC*, bool bMasterPage=sal_False); FmFormPage(const FmFormPage& rPage); ~FmFormPage(); @@ -66,7 +67,7 @@ public: virtual SdrObject* RemoveObject(ULONG nObjNum); - // Zugriff auf alle Formulare + // access to all forms const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& GetForms( bool _bForceCreate = true ) const; #ifndef SVX_LIGHT @@ -85,3 +86,4 @@ public: #endif // _SVX_FMPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmresids.hrc b/svx/inc/svx/fmresids.hrc index 08982d8444..158ed6c1f5 100644 --- a/svx/inc/svx/fmresids.hrc +++ b/svx/inc/svx/fmresids.hrc @@ -35,7 +35,6 @@ // ImageList-Id's ----------------------------------------------------------- #define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) -#define RID_SVXIMGLIST_FMEXPL_HC (RID_FORMS_START + 2) // Image-Id's ----------------------------------------------------------- //#define SID_FMSLOTS_START (SID_SVX_START + 592) -> svxids.hrc diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx index 63ab4b85e7..b943e452af 100644 --- a/svx/inc/svx/fmsearch.hxx +++ b/svx/inc/svx/fmsearch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,21 +34,13 @@ #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> #include <tools/link.hxx> @@ -71,25 +64,27 @@ SVX_DLLPUBLIC sal_Bool IsSearchableControl( const ::com::sun::star::uno::Referen struct FmFoundRecordInformation { - ::com::sun::star::uno::Any aPosition; // Bookmark des Datensatzes, in dem der Text gefunden wurde - sal_Int16 nFieldPos; // dito : die relative Position der Spalte (im Stringnamen in Feldliste im Constructor) - sal_Int16 nContext; // Kontext, in dem gesucht und gefunden wurde (falls die aktuelle Suche verschiedene solche kennt) + ::com::sun::star::uno::Any aPosition; // bookmark of the record in which the text was found + sal_Int16 nFieldPos; // ditto : the relative position of the column (in the string name of the field list in the constructor) + sal_Int16 nContext; // the context in which was searched and found (if the current search knows several contexts) }; // =================================================================================================== -// = struct FmSearchContext - Informationen fuer Suche in verschiedenen Kontexten +// = struct FmSearchContext - informations for the search in different contexts // =================================================================================================== struct FmSearchContext { // [in] - sal_Int16 nContext; // die Nummer des Kontextes + sal_Int16 nContext; // the number of the context // [out] - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xCursor; // der Iterator fuer diesen Kontext - String strUsedFields; // eine Liste von durch ';' getrennten Feldnamen + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xCursor; // the iterator for the context + String strUsedFields; // a list of field names separeted by ';' ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > - arrFields; // die korrespondierenden Text-Interfaces fuer die Felder in strUsedFields + arrFields; // the corresponding text interfaces for the fields in strUsedFields String sFieldDisplayNames; // if not empty : names to be displayed for the searchable fields (must have the same token count as strUsedFields !) }; #endif // _FMSEARCH_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx index 911ac0a78b..9f7380e031 100644 --- a/svx/inc/svx/fmshell.hxx +++ b/svx/inc/svx/fmshell.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <sfx2/module.hxx> #include <vcl/event.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/fmview.hxx> #include "svx/svxdllapi.h" @@ -91,14 +90,13 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell sal_uInt16 m_nLastSlot; sal_Bool m_bDesignMode : 1; - sal_Bool m_bHasForms : 1; // Flag welches festhaelt, ob Formulare auf einer Seite - // vorhanden sind, nur für den DesignMode, siehe UIFeatureChanged! + sal_Bool m_bHasForms : 1; // flag storing if the forms on a page exist, + // only for the DesignMode, see UIFeatureChanged! - // die Markierungen einer FormView haben sich geaendert ... + // the marks of a FormView have changed... void NotifyMarkListChanged(FmFormView*); - // (die FormView selber ist kein Broadcaster, deshalb kann sie den Formular-Explorer, den dieses - // Ereignis interesiert, nicht sauber verstaendigen (sie koennte sich lediglich von der Application - // das Navigator-Fenster geben lassen, aber das wollen wir ja nicht, ge ? ...)) + // (the FormView itself is not a broadcaster, therefore it can't always correctly notify the + // form explorer who is interested in the event) class FormShellWaitObject { @@ -179,7 +177,7 @@ public: protected: void GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich); - // gibt es ein Formular auf der aktuellen Seite? + // is there a form on the current page? void DetermineForms(sal_Bool bInvalidate); void impl_setDesignMode( sal_Bool bDesign); }; @@ -189,3 +187,5 @@ protected: // *************************************************************************************************** #endif // _SVX_FMSHELL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx index 743dbfa378..6ba0bd062f 100644 --- a/svx/inc/svx/fmsrccfg.hxx +++ b/svx/inc/svx/fmsrccfg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -154,3 +155,4 @@ namespace svxform #endif // _FMSRCCF_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx index 8621ac19e0..15d3becc5a 100644 --- a/svx/inc/svx/fmsrcimp.hxx +++ b/svx/inc/svx/fmsrcimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,7 +54,7 @@ // =================================================================================================== class FmSearchEngine; -class FmSearchThread : public ::vos::OThread +class FmSearchThread : public ::osl::Thread { FmSearchEngine* m_pEngine; Link m_aTerminationHdl; @@ -399,3 +400,4 @@ private: #endif // _FMSRCIMP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx index cccc48b8bf..dda53d3ab5 100644 --- a/svx/inc/svx/fmview.hxx +++ b/svx/inc/svx/fmview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -164,3 +165,4 @@ private: #endif // _FML_FMVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx index 5ba448e344..e94329ef52 100644 --- a/svx/inc/svx/fntctl.hxx +++ b/svx/inc/svx/fntctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,13 +47,11 @@ private: FontNameMenu* pMenu; Menu& rParent; -//#if 0 // _SOLAR__PRIVATE SVX_DLLPRIVATE void FillMenu(); DECL_LINK( MenuSelect, FontNameMenu * ); SVX_DLLPRIVATE virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); -//#endif public: SvxFontMenuControl( USHORT nId, Menu&, SfxBindings& ); @@ -67,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index 20badbeb75..3690d291e8 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <editeng/svxfont.hxx> #include "svx/svxdllapi.h" -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif // forward --------------------------------------------------------------- @@ -58,7 +57,7 @@ public: virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - // Aus Effizienz-gr"unden nicht const + // for reasons of efficiency not const SvxFont& GetFont(); const SvxFont& GetFont() const; void SetFont( const SvxFont& rFont ); @@ -88,3 +87,4 @@ public: #endif // #ifndef _SVX_FNTCTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx index 5b46d28ab5..1413e39751 100644 --- a/svx/inc/svx/fntszctl.hxx +++ b/svx/inc/svx/fntszctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,9 +47,7 @@ private: Menu& rParent; SfxStatusForwarder aFontNameForwarder; -//#if 0 // _SOLAR__PRIVATE DECL_LINK( MenuSelect, FontSizeMenu * ); -//#endif protected: virtual void StateChanged( USHORT nSID, SfxItemState eState, @@ -67,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx index e8bcd3777c..6cbcee90dd 100644 --- a/svx/inc/svx/fontlb.hxx +++ b/svx/inc/svx/fontlb.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef SVX_FONTLB_HXX #define SVX_FONTLB_HXX -#ifndef _SVTABBOX_HXX #include <svtools/svtabbx.hxx> -#endif #include <vcl/virdev.hxx> #include "svx/svxdllapi.h" #include <layout/layout.hxx> @@ -136,3 +135,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx index 756b76c868..10f311ed04 100644 --- a/svx/inc/svx/fontwork.hxx +++ b/svx/inc/svx/fontwork.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,12 +30,8 @@ // include --------------------------------------------------------------- -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/valueset.hxx> #include <sfx2/dockwin.hxx> #include <sfx2/ctrlitem.hxx> @@ -62,7 +59,7 @@ class XFormTextShadowYValItem; /************************************************************************* |* -|* ControllerItem fuer Fontwork +|* ControllerItem for Fontwork |* \************************************************************************/ @@ -82,7 +79,7 @@ public: /************************************************************************* |* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Fontwork-Dialog +|* Derived from SfxChildWindow as "container" for fontwork dialog |* \************************************************************************/ @@ -95,7 +92,7 @@ class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow /************************************************************************* |* -|* Floating Window zur Attributierung von Texteffekten +|* Floating window for setting attributes of text effects |* \************************************************************************/ @@ -137,7 +134,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow long nSaveShadowSize; ImageList maImageList; - ImageList maImageListH; const XColorTable* pColorTable; @@ -195,3 +191,4 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow #endif // _SVX_FONTWORK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fontworkbar.hxx b/svx/inc/svx/fontworkbar.hxx index 8b63d0ee79..24ed76812e 100644 --- a/svx/inc/svx/fontworkbar.hxx +++ b/svx/inc/svx/fontworkbar.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,5 @@ public: } #endif // _SVX_FONTWORK_BAR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx index 81e7031a37..6f73ecd1a4 100644 --- a/svx/inc/svx/formatpaintbrushctrl.hxx +++ b/svx/inc/svx/formatpaintbrushctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ private: } //namespace svx //............................................................................. #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/framebordertype.hxx b/svx/inc/svx/framebordertype.hxx index ffd4ce06ce..e35cdd19a4 100644 --- a/svx/inc/svx/framebordertype.hxx +++ b/svx/inc/svx/framebordertype.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ size_t GetIndexFromFrameBorderType( FrameBorderType eBorder ); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx index 660fd17ab0..5e30028ce4 100644 --- a/svx/inc/svx/framelink.hxx +++ b/svx/inc/svx/framelink.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,10 @@ #include <tools/gen.hxx> #include <tools/color.hxx> #include "svx/svxdllapi.h" +#include <vcl/outdev.hxx> +#include <editeng/borderline.hxx> class OutputDevice; -class SvxBorderLine; namespace svx { namespace frame { @@ -112,20 +114,20 @@ class SVX_DLLPUBLIC Style { public: /** Constructs an invisible frame style. */ - inline explicit Style() : meRefMode( REFMODE_CENTERED ), mnPrim( 0 ), mnDist( 0 ), mnSecn( 0 ), mbDotted( false ) {} + inline explicit Style() : meRefMode( REFMODE_CENTERED ), mnPrim( 0 ), mnDist( 0 ), mnSecn( 0 ), mnDashing( SOLID ) {} /** Constructs a frame style with passed line widths. */ inline explicit Style( sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ) : - meRefMode( REFMODE_CENTERED ), mbDotted( false ) + meRefMode( REFMODE_CENTERED ), mnDashing( SOLID ) { Set( nP, nD, nS ); } /** Constructs a frame style with passed color and line widths. */ - inline explicit Style( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ) : - meRefMode( REFMODE_CENTERED ), mbDotted( false ) + inline explicit Style( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS, SvxBorderStyle nDashing = SOLID ) : + meRefMode( REFMODE_CENTERED ), mnDashing( nDashing ) { Set( rColor, nP, nD, nS ); } /** Constructs a frame style from the passed SvxBorderLine struct. */ - inline explicit Style( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false ) : + inline explicit Style( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) : meRefMode( REFMODE_CENTERED ) { Set( rBorder, fScale, nMaxWidth ); } /** Constructs a frame style from the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */ - inline explicit Style( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false ) : + inline explicit Style( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) : meRefMode( REFMODE_CENTERED ) { Set( pBorder, fScale, nMaxWidth ); } inline RefMode GetRefMode() const { return meRefMode; } @@ -133,7 +135,7 @@ public: inline sal_uInt16 Prim() const { return mnPrim; } inline sal_uInt16 Dist() const { return mnDist; } inline sal_uInt16 Secn() const { return mnSecn; } - inline bool Dotted() const { return mbDotted; } + inline SvxBorderStyle Dashing() const { return mnDashing; } /** Returns the total width of this frame style. */ inline sal_uInt16 GetWidth() const { return mnPrim + mnDist + mnSecn; } @@ -146,16 +148,16 @@ public: /** Sets the frame style to the passed line widths. */ void Set( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ); /** Sets the frame style to the passed SvxBorderLine struct. */ - void Set( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false ); + void Set( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ); /** Sets the frame style to the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */ - void Set( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false ); + void Set( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ); /** Sets a new reference point handling mode, does not modify other settings. */ inline void SetRefMode( RefMode eRefMode ) { meRefMode = eRefMode; } /** Sets a new color, does not modify other settings. */ inline void SetColor( const Color& rColor ) { maColor = rColor; } /** Sets whether to use dotted style for single hair lines. */ - inline void SetDotted( bool bDotted ) { mbDotted = bDotted; } + inline void SetDashing( SvxBorderStyle nDashing ) { mnDashing = nDashing; } /** Scales the style by the specified scaling factor. Ensures that visible lines keep visible. */ Style& ScaleSelf( double fScale, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ); @@ -173,7 +175,7 @@ private: sal_uInt16 mnPrim; /// Width of primary (single, left, or top) line. sal_uInt16 mnDist; /// Distance between primary and secondary line. sal_uInt16 mnSecn; /// Width of secondary (right or bottom) line. - bool mbDotted; /// true = Draw dotted lines; false = Draw solid lines. + SvxBorderStyle mnDashing; }; bool operator==( const Style& rL, const Style& rR ); @@ -725,3 +727,4 @@ SVX_DLLPUBLIC void DrawDiagFrameBorders( #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/framelinkarray.hxx b/svx/inc/svx/framelinkarray.hxx index fb36019d52..2b0e7b0c82 100644 --- a/svx/inc/svx/framelinkarray.hxx +++ b/svx/inc/svx/framelinkarray.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -535,3 +536,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx index c56b363d58..b9239ccfb5 100644 --- a/svx/inc/svx/frmdirlbox.hxx +++ b/svx/inc/svx/frmdirlbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SVX_FRMDIRLBOX_HXX #define _SVX_FRMDIRLBOX_HXX -#ifndef _LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif #include <sfx2/itemconnect.hxx> #include <editeng/frmdir.hxx> #include "svx/svxdllapi.h" @@ -104,3 +103,4 @@ typedef sfx::ItemControlConnection< FrameDirItemWrapper, FrameDirListBoxWrapper #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx index 22100d3e0a..20a3fad699 100644 --- a/svx/inc/svx/frmsel.hxx +++ b/svx/inc/svx/frmsel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,6 +33,7 @@ #include <tools/color.hxx> #include <vcl/ctrl.hxx> #include <vcl/bitmap.hxx> +#include <editeng/borderline.hxx> #include <svx/framebordertype.hxx> #include "svx/svxdllapi.h" @@ -128,7 +130,8 @@ public: /** Returns true, if all visible frame borders have equal widths. @descr Ignores hidden and "don't care" frame borders. On success, returns the widths in the passed parameters. */ - bool GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSec ) const; + bool GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSec, + SvxBorderStyle& rnStyle ) const; /** Returns true, if all visible frame borders have equal color. @descr Ignores hidden and "don't care" frame borders. On success, returns the color in the passed parameter. */ @@ -159,7 +162,8 @@ public: void SelectAllVisibleBorders( bool bSelect = true ); /** Sets the passed line widths to all selected frame borders (in twips). */ - void SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSec ); + void SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSec, + SvxBorderStyle nStyle ); /** Sets the passed color to all selected frame borders. */ void SetColorToSelection( const Color& rColor ); @@ -202,3 +206,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx index 01ba5ce90b..a639fd7ac6 100644 --- a/svx/inc/svx/galbrws.hxx +++ b/svx/inc/svx/galbrws.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ public: }; #endif // _SVX_GALBRWS_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/galctrl.hxx b/svx/inc/svx/galctrl.hxx index a5a74d5881..9352bfbc53 100644 --- a/svx/inc/svx/galctrl.hxx +++ b/svx/inc/svx/galctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -189,3 +190,5 @@ public: }; #endif // _SVX_GALCTRL_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx index 2f42bc32fe..27fd7eeca6 100644 --- a/svx/inc/svx/gallery.hxx +++ b/svx/inc/svx/gallery.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,10 +85,116 @@ #define GALLERY_THEME_EDUCATION 33 #define GALLERY_THEME_TROUBLE 34 #define GALLERY_THEME_SCREENBEANS 35 -#define GALLERY_THEME_FONTWORK 36 -#define GALLERY_THEME_FONTWORK_VERTICAL 37 -#define GALLERY_THEME_DUMMY5 38 +#define GALLERY_THEME_DUMMY5 36 + +#define GALLERY_THEME_FONTWORK 37 +#define GALLERY_THEME_FONTWORK_VERTICAL 38 + +#define GALLERY_THEME_SHAPES_POLYGONS 39 +#define GALLERY_THEME_SHAPES_1 40 +#define GALLERY_THEME_SHAPES_2 41 +#define GALLERY_THEME_ANIMALS 42 +#define GALLERY_THEME_CARS 43 +#define GALLERY_THEME_BUGS 44 +#define GALLERY_THEME_CISCO_OTHER 45 +#define GALLERY_THEME_CISCO_MEDIA 46 +#define GALLERY_THEME_CISCO_PRODUCTS 47 +#define GALLERY_THEME_CISCO_WAN_LAN 48 +#define GALLERY_THEME_DOMINO_USUAL 49 +#define GALLERY_THEME_DOMINO_NUMBERED 50 +#define GALLERY_THEME_ELECTRONICS_PARTS_1 51 +#define GALLERY_THEME_ELECTRONICS_PARTS_2 52 +#define GALLERY_THEME_ELECTRONICS_PARTS_3 53 +#define GALLERY_THEME_ELECTRONICS_PARTS_4 54 +#define GALLERY_THEME_ELECTRONICS_CIRCUIT 55 +#define GALLERY_THEME_ELECTRONICS_SIGNS 56 +#define GALLERY_THEME_ELECTRONICS_GAUGES 57 +#define GALLERY_THEME_PEOPLE_1 58 +#define GALLERY_THEME_ARCHITECTURE_OVERLAY 59 +#define GALLERY_THEME_ARCHITECTURE_FURNITURES 60 +#define GALLERY_THEME_ARCHITECTURE_BUILDINGS 61 +#define GALLERY_THEME_ARCHITECTURE_BATHROOM_KITCHEN 62 +#define GALLERY_THEME_ARCHITECTURE_KITCHEN 63 +#define GALLERY_THEME_ARCHITECTURE_WINDOWS_DOORS 64 +#define GALLERY_THEME_FLOWCHARTS_1 65 +#define GALLERY_THEME_FLOWCHARTS_2 66 +#define GALLERY_THEME_FORALSTUDIOA 67 +#define GALLERY_THEME_PHOTOS_FAUNA 68 +#define GALLERY_THEME_PHOTOS_BUILDINGS 69 +#define GALLERY_THEME_PHOTOS_PLANTS 70 +#define GALLERY_THEME_PHOTOS_STATUES 71 +#define GALLERY_THEME_PHOTOS_LANDSCAPES 72 +#define GALLERY_THEME_PHOTOS_CITIES 73 +#define GALLERY_THEME_PHOTOS_FLOWERS 74 +#define GALLERY_THEME_THERAPEUTICS_GENERAL 75 +#define GALLERY_THEME_WEATHER 76 +#define GALLERY_THEME_VECHILES 77 +#define GALLERY_THEME_SIGNS 78 +#define GALLERY_THEME_BLUE_MAN 79 +#define GALLERY_THEME_CHEMISTRY_AMINO_ACIDS 80 +#define GALLERY_THEME_LOGICAL_SIGNS 81 +#define GALLERY_THEME_LOGICAL_GATES 82 +#define GALLERY_THEME_LOGOS 83 +#define GALLERY_THEME_SMILES 84 +#define GALLERY_THEME_ARROWS_1 85 +#define GALLERY_THEME_CLOCK_01_CLOCK 86 +#define GALLERY_THEME_CLOCK_02_CLOCK 87 +#define GALLERY_THEME_CLOCK_03_CLOCK 88 +#define GALLERY_THEME_CLOCK_04_CLOCK 89 +#define GALLERY_THEME_CLOCK_05_CLOCK 90 +#define GALLERY_THEME_CLOCK_06_CLOCK 91 +#define GALLERY_THEME_CLOCK_07_CLOCK 92 +#define GALLERY_THEME_CLOCK_08_CLOCK 93 +#define GALLERY_THEME_CLOCK_09_CLOCK 94 +#define GALLERY_THEME_CLOCK_10_CLOCK 95 +#define GALLERY_THEME_CLOCK_11_CLOCK 96 +#define GALLERY_THEME_CLOCK_12_CLOCK 97 +#define GALLERY_THEME_PNEUMATIC_PARTS 98 +#define GALLERY_THEME_COMPUTER_GENERAL 99 +#define GALLERY_THEME_COMPUTER_NETWORK 100 +#define GALLERY_THEME_COMPUTER_NETWORK_DEVICES 101 +#define GALLERY_THEME_COMPUTER_WIFI 102 +#define GALLERY_THEME_NUMBERS 103 +#define GALLERY_THEME_SIGNS_DANGER 104 +#define GALLERY_THEME_OBJECTS 105 +#define GALLERY_THEME_MAPS_AFRICA 106 +#define GALLERY_THEME_MAPS_UNITED_STATES_OF_AMERICA 107 +#define GALLERY_THEME_MAPS_AUSTRALIA 108 +#define GALLERY_THEME_MAPS_ASIA 109 +#define GALLERY_THEME_MAPS_SOUTH_AMERICA 110 +#define GALLERY_THEME_MAPS_EUROPE 111 +#define GALLERY_THEME_MAPS_EUROPE_1 112 +#define GALLERY_THEME_MAPS_FRANCE 113 +#define GALLERY_THEME_MAPS_FRANCE_COUNTRIES 114 +#define GALLERY_THEME_MAPS_SIGNS 115 +#define GALLERY_THEME_MAPS_CANADA 116 +#define GALLERY_THEME_MAPS_CONTINENTS 117 +#define GALLERY_THEME_MAPS_MIDDLE_EAST 118 +#define GALLERY_THEME_MAPS_MIDDLE_AMERICA 119 +#define GALLERY_THEME_MAPS_MIDDLE_AGES 120 +#define GALLERY_THEME_MAPS_MEXICO 121 +#define GALLERY_THEME_MAPS_ANCIENT_TIMES 122 +#define GALLERY_THEME_MAPS_SYMBOLS 123 +#define GALLERY_THEME_MAPS_HISTORY_1900 124 +#define GALLERY_THEME_MAPS_WORLD 125 +#define GALLERY_THEME_CROPS 126 +#define GALLERY_THEME_FRACTIONS 127 +#define GALLERY_THEME_FLAGS_1 128 +#define GALLERY_THEME_MUSIC_INSTRUMENTS 129 +#define GALLERY_THEME_MUSIC_SHEET_MUSIC 130 +#define GALLERY_THEME_SPECIAL_PICTOGRAMM 131 +#define GALLERY_THEME_PHOTOS_CELEBRATION 132 +#define GALLERY_THEME_PHOTOS_FOODSANDDRINKS 133 +#define GALLERY_THEME_PHOTOS_HUMANS 134 +#define GALLERY_THEME_PHOTOS_OBJECTS 135 +#define GALLERY_THEME_PHOTOS_SPACE 136 +#define GALLERY_THEME_PHOTOS_TRAVEL 137 +#define GALLERY_THEME_OPENOFFICEORG_LOGOS 138 +#define GALLERY_THEME_RELIGION 139 +#define GALLERY_THEME_BUILDINGS 140 +#define GALLERY_THEME_HOMEPAGE2 141 +#define GALLERY_THEME_ELEMENTSBULLETS2 142 // ------------------- // - GalleryExplorer - @@ -172,3 +279,5 @@ public: }; #endif // _GALLERY_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index 6cd5ca8589..7ab2c3a711 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,6 +38,7 @@ #include <cstdio> #include <list> +#include <vector> // --------------------- // - GalleryThemeEntry - @@ -58,17 +60,17 @@ private: BOOL bImported; BOOL bModified; BOOL bThemeNameFromResource; - + GalleryThemeEntry(); INetURLObject ImplGetURLIgnoreCase( const INetURLObject& rURL ) const; - -public: - + +public: + GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName, UINT32 nFileNumber, BOOL bReadOnly, BOOL bImported, BOOL bNewFile, UINT32 nId, BOOL bThemeNameFromResource ); ~GalleryThemeEntry() {}; - + const String& GetThemeName() const { return aName; } UINT32 GetFileNumber() const { return nFileNumber; } @@ -81,18 +83,18 @@ public: BOOL IsDefault() const; BOOL IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; } - + BOOL IsModified() const { return bModified; } void SetModified( BOOL bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); } - + void SetName( const String& rNewName ); BOOL IsNameFromResource() const { return bThemeNameFromResource; } - + UINT32 GetId() const { return nId; } void SetId( UINT32 nNewId, BOOL bResetThemeName ); }; -DECLARE_LIST( GalleryThemeList, GalleryThemeEntry* ) +typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; // --------------------------- // - GalleryImportThemeEntry - @@ -105,7 +107,8 @@ struct GalleryImportThemeEntry INetURLObject aURL; String aImportName; }; -DECLARE_LIST( GalleryImportThemeList, GalleryImportThemeEntry* ) + +typedef ::std::vector< GalleryImportThemeEntry* > GalleryImportThemeList; // ----------------------------------------------------------------------------- @@ -135,12 +138,12 @@ private: rtl_TextEncoding nReadTextEncoding; ULONG nLastFileNumber; BOOL bMultiPath; - + void ImplLoad( const String& rMultiPath ); void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly ); void ImplLoadImports(); void ImplWriteImportList(); - + SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const String& rThemeName ); GalleryThemeEntry* ImplGetThemeEntry( ULONG nThemeId ); GalleryImportThemeEntry* ImplGetImportThemeEntry( const String& rImportName ); @@ -154,11 +157,12 @@ private: public: SVX_DLLPUBLIC static Gallery* GetGalleryInstance(); - - ULONG GetThemeCount() const { return aThemeList.Count(); } - const GalleryThemeEntry* GetThemeInfo( ULONG nPos ) { return aThemeList.GetObject( nPos ); } + + size_t GetThemeCount() const { return aThemeList.size(); } + const GalleryThemeEntry* GetThemeInfo( size_t nPos ) + { return nPos < aThemeList.size() ? aThemeList[ nPos ] : NULL; } const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } - + SVX_DLLPUBLIC BOOL HasTheme( const String& rThemeName ); String GetThemeName( ULONG nThemeId ) const; @@ -173,11 +177,13 @@ public: public: INetURLObject GetImportURL( const String& rThemeName ); - + const INetURLObject& GetUserURL() const { return aUserURL; } const INetURLObject& GetRelativeURL() const { return aRelURL; } - + BOOL IsMultiPath() const { return bMultiPath; } }; #endif // _SVX_GALLERY1_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index 57f98ccca9..0ddeb41bf5 100644 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -260,3 +261,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 6a51190ce6..8ddb7e0968 100644 --- a/svx/inc/svx/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,7 +60,12 @@ struct GalleryObject BOOL bDummy; }; -DECLARE_LIST( GalleryObjectList, GalleryObject* ) +typedef ::std::vector< GalleryObject* > GalleryObjectList; + +class GalleryThemeEntry; +class SgaObject; +class FmFormModel; +class ListBox; class GalleryThemeEntry; class SgaObject; @@ -85,8 +91,8 @@ struct GalDragParams class Gallery; class GalleryProgress; -namespace unogallery -{ +namespace unogallery +{ class GalleryTheme; class GalleryItem; } @@ -114,12 +120,20 @@ private: void ImplCreateSvDrawStorage(); SVX_DLLPUBLIC SgaObject* ImplReadSgaObject( GalleryObject* pEntry ); - BOOL ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, GalleryObject* pExistentEntry ); + BOOL ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ); void ImplRead(); void ImplWrite(); - const GalleryObject* ImplGetGalleryObject( ULONG nPos ) const { return aObjectList.GetObject( nPos ); } + const GalleryObject* ImplGetGalleryObject( size_t nPos ) const + { return ( nPos < aObjectList.size() ) ? aObjectList[ nPos ] : NULL; } SVX_DLLPUBLIC const GalleryObject* ImplGetGalleryObject( const INetURLObject& rURL ); - ULONG ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); } + + size_t ImplGetGalleryObjectPos( const GalleryObject* pObj ) const + { + for ( size_t i = 0, n = aObjectList.size(); i < n; ++i ) + if ( pObj == aObjectList[ i ] ) + return i; + return size_t(-1); + } INetURLObject ImplGetURL( const GalleryObject* pObject ) const; INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat = CVT_UNKNOWN ); void ImplSetModified( BOOL bModified ); @@ -133,14 +147,14 @@ public: static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly ); - ULONG GetObjectCount() const { return aObjectList.Count(); } + size_t GetObjectCount() const { return aObjectList.size(); } - SVX_DLLPUBLIC SgaObject* AcquireObject( ULONG nPos ); + SVX_DLLPUBLIC SgaObject* AcquireObject( size_t nPos ); SVX_DLLPUBLIC void ReleaseObject( SgaObject* pObj ); SVX_DLLPUBLIC BOOL InsertObject( const SgaObject& rObj, ULONG nPos = LIST_APPEND ); - SVX_DLLPUBLIC BOOL RemoveObject( ULONG nPos ); - BOOL ChangeObjectPos( ULONG nOldPos, ULONG nNewPos ); + SVX_DLLPUBLIC BOOL RemoveObject( size_t nPos ); + BOOL ChangeObjectPos( size_t nOldPos, size_t nNewPos ); SVX_DLLPUBLIC const String& GetName() const; const String& GetRealName() const; @@ -166,7 +180,7 @@ public: void LockBroadcaster() { mnBroadcasterLockCount++; } SVX_DLLPUBLIC void UnlockBroadcaster( ULONG nUpdatePos = 0 ); BOOL IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; } - + void SetDragPos( ULONG nPos ) { nDragPos = nPos; } ULONG GetDragPos() const { return nDragPos; } @@ -229,3 +243,5 @@ SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme ); SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/globl3d.hxx b/svx/inc/svx/globl3d.hxx index 0d965bdd2a..4ec9f1ba2d 100644 --- a/svx/inc/svx/globl3d.hxx +++ b/svx/inc/svx/globl3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,6 @@ #include <tools/solar.h> -//#define ESODEBUG #define E3D_STREAMING const double PrecisionLimit = 1.0e-14; @@ -51,3 +51,5 @@ const UINT16 E3D_COMPOUNDOBJ_ID = 8; const UINT16 E3D_POLYGONOBJ_ID = 9; #endif // _E3D_GLOBL3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx index 97d8de5782..f621e9ddd5 100644 --- a/svx/inc/svx/grafctrl.hxx +++ b/svx/inc/svx/grafctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -189,3 +190,5 @@ public: }; #endif // _SVX_GRAFCTRL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx index ade161ab2c..6a19b85bfc 100644 --- a/svx/inc/svx/graphctl.hxx +++ b/svx/inc/svx/graphctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,12 +37,6 @@ #include <svx/svdview.hxx> #include <svx/svdobj.hxx> -/************************************************************************* -|* -|* -|* -\************************************************************************/ - class GraphCtrlUserCall; class SvxGraphCtrlAccessibleContext; @@ -140,13 +135,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; -//#if 0 // _SOLAR__PRIVATE - -/************************************************************************* -|* -|* -|* -\************************************************************************/ class GraphCtrlUserCall : public SdrObjUserCall { @@ -160,12 +148,6 @@ public: virtual void Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect ); }; -/************************************************************************* -|* -|* -|* -\************************************************************************/ - class GraphCtrlView : public SdrView { GraphCtrl& rGraphCtrl; @@ -187,7 +169,6 @@ public: virtual ~GraphCtrlView() {}; }; -//#endif // __PRIVATE - #endif // _GRAPHCTL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx index f25d37c8e4..8d42a26cda 100644 --- a/svx/inc/svx/grfcrop.hxx +++ b/svx/inc/svx/grfcrop.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,7 @@ public: USHORT ); virtual ~SvxGrfCrop(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" from SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const; virtual SvStream& Store(SvStream &, USHORT nIVer) const; @@ -53,10 +54,10 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, + BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, + BYTE nMemberId = 0 ); void SetLeft( sal_Int32 nVal ) { nLeft = nVal; } void SetRight( sal_Int32 nVal ) { nRight = nVal; } @@ -78,3 +79,5 @@ public: #endif // _GRFATR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx index e754b32ced..599261c3ad 100644 --- a/svx/inc/svx/grfflt.hxx +++ b/svx/inc/svx/grfflt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/timer.hxx> #include <vcl/dialog.hxx> #include <vcl/group.hxx> @@ -67,3 +66,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx index 496891c758..df211e56e7 100644 --- a/svx/inc/svx/gridctrl.hxx +++ b/svx/inc/svx/gridctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,16 +39,15 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <tools/date.hxx> #include <tools/ref.hxx> #include <svtools/editbrowsebox.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/propmultiplex.hxx> #include <svtools/transfer.hxx> #include "svx/svxdllapi.h" +#include <vector> class DbGridControl; class CursorWrapper; @@ -58,7 +58,7 @@ namespace svxform { class DataColumn; } -DECLARE_LIST(DbDataColumns, ::svxform::DataColumn*) +typedef ::std::vector< ::svxform::DataColumn* > DbDataColumns; enum GridRowStatus { @@ -69,17 +69,17 @@ enum GridRowStatus }; //================================================================== -// DbGridRow, Zeilenbeschreibung +// DbGridRow, description of rows //================================================================== class DbGridRow : public SvRefBase { - ::com::sun::star::uno::Any m_aBookmark; // ::com::sun::star::text::Bookmark der Zeile, kann gesetzt sein - DbDataColumns m_aVariants; + ::com::sun::star::uno::Any m_aBookmark; // ::com::sun::star::text::Bookmark of the row, can be set + DbDataColumns m_aVariants; GridRowStatus m_eStatus; - sal_Bool m_bIsNew; - // Zeile ist nicht mehr gueltig, - // wird bei der naechsten positionierung entfernt + sal_Bool m_bIsNew; + // row is no longer valid + // is removed on the next positioning public: DbGridRow():m_eStatus(GRS_CLEAN), m_bIsNew(sal_True) { } DbGridRow(CursorWrapper* pCur, sal_Bool bPaintCursor); @@ -87,9 +87,8 @@ public: ~DbGridRow(); - // da GetField auf Geschwindigkeit getuned ist vorher immer noch hasField verwenden - sal_Bool HasField(sal_uInt32 nPos) const {return nPos < m_aVariants.Count();} - const ::svxform::DataColumn& GetField(sal_uInt32 nPos) const { return *m_aVariants.GetObject(nPos); } + sal_Bool HasField(sal_uInt32 nPos) const { return nPos < m_aVariants.size(); } + const ::svxform::DataColumn& GetField(sal_uInt32 nPos) const { return *m_aVariants[ nPos ]; } void SetStatus(GridRowStatus _eStat) { m_eStatus = _eStat; } GridRowStatus GetStatus() const { return m_eStatus; } @@ -108,7 +107,7 @@ SV_DECL_REF(DbGridRow) // DbGridControl //================================================================== class DbGridColumn; -DECLARE_LIST(DbGridColumns, DbGridColumn*) +typedef ::std::vector< DbGridColumn* > DbGridColumns; //================================================================== class FmGridListener @@ -161,23 +160,23 @@ public: // zusaetzliche Controls FixedText m_aRecordText; - AbsolutePos m_aAbsolute; // AbsolutePositionierung + AbsolutePos m_aAbsolute; // absolute positioning FixedText m_aRecordOf; FixedText m_aRecordCount; - ImageButton m_aFirstBtn; // ImageButton fuer 'gehe zum ersten Datensatz' - ImageButton m_aPrevBtn; // ImageButton fuer 'gehe zum vorhergehenden Datensatz' - ImageButton m_aNextBtn; // ImageButton fuer 'gehe zum naechsten Datensatz' - ImageButton m_aLastBtn; // ImageButton fuer 'gehe zum letzten Datensatz' - ImageButton m_aNewBtn; // ImageButton fuer 'gehe zum neuen Datensatz' + ImageButton m_aFirstBtn; // ImageButton for 'go to the first record' + ImageButton m_aPrevBtn; // ImageButton for 'go to the previous record' + ImageButton m_aNextBtn; // ImageButton for 'go to the next record' + ImageButton m_aLastBtn; // ImageButton for 'go to the last record' + ImageButton m_aNewBtn; // ImageButton for 'go to a new record' sal_uInt16 m_nDefaultWidth; sal_Int32 m_nCurrentPos; sal_Bool m_bPositioning; // protect PositionDataSource against recursion public: - // StatusIds fuer Controls der Bar - // wichtig fuers Invalidieren + // StatusIds for Controls of the Bar + // important for invalidation enum State { RECORD_TEXT = 1, @@ -193,7 +192,7 @@ public: NavigationBar(Window* pParent, WinBits nStyle = 0); - // Status Methoden fuer Controls + // Status methods for Controls void InvalidateAll(sal_Int32 nCurrentPos = -1, sal_Bool bAll = sal_False); void InvalidateState(sal_uInt16 nWhich) {SetState(nWhich);} void SetState(sal_uInt16 nWhich); @@ -215,8 +214,8 @@ public: friend class DbGridControl::NavigationBar; public: - // diese Optionen werden verodert und geben an, welche der einzelnen feature - // freigegeben werden koennen, default ist readonly also 0 + // these options are or'ed and indicate, which of the single + // features can be released, default is readonly which means 0 enum Option { OPT_READONLY = 0x00, @@ -233,14 +232,14 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; - DbGridColumns m_aColumns; // Spaltenbeschreibung + DbGridColumns m_aColumns; // Column description NavigationBar m_aBar; - DbGridRowRef m_xDataRow; // Zeile die modifiziert werden kann - // kommt vom DatenCursor - DbGridRowRef m_xSeekRow, // Zeile die von Iterator gesetzt wird - // kommt vom DatenCursor + DbGridRowRef m_xDataRow; // Row which can be modified + // comes from the data cursor + DbGridRowRef m_xSeekRow, // Row to which the iterator can set + // comes from the data cursor - m_xEmptyRow; // Datensatz zum einfuegen + m_xEmptyRow; // record set to insert sal_uInt32 m_nAsynAdjustEvent; @@ -263,17 +262,16 @@ private: FmGridListener* m_pGridListener; protected: - CursorWrapper* m_pDataCursor; // Cursor fuer Updates - CursorWrapper* m_pSeekCursor; // Cursor zum Seeken + CursorWrapper* m_pDataCursor; // Cursor for Updates + CursorWrapper* m_pSeekCursor; // Cursor for Seeking private: - // dieses sind Laufvariablen - DbGridRowRef m_xCurrentRow; // Row an der aktuellen Zeile - DbGridRowRef m_xPaintRow; // Row die gerade drgestellt werden soll - sal_Int32 m_nSeekPos; // Position des SeekCursors - sal_Int32 m_nTotalCount; // wird gesetzt, wenn der DatenCursor mit dem Zählen der - // Datensätze fertig ist - // initial Wert ist -1 + // iteration variables + DbGridRowRef m_xCurrentRow; + DbGridRowRef m_xPaintRow; // Row to be displayed + sal_Int32 m_nSeekPos; // Position of the SeekCursor + sal_Int32 m_nTotalCount; // is set when the data cursor finished counting the + // records. Initial value is -1 osl::Mutex m_aDestructionSafety; osl::Mutex m_aAdjustSafety; @@ -281,9 +279,9 @@ private: m_aNullDate; // NullDate of the Numberformatter; BrowserMode m_nMode; - sal_Int32 m_nCurrentPos; // Aktuelle Position; - sal_uInt32 m_nDeleteEvent; // EventId fuer asychrone Loeschen von Zeilen - sal_uInt16 m_nOptions; // Was kann das Control (Insert, Update, Delete) + sal_Int32 m_nCurrentPos; // Current position; + sal_uInt32 m_nDeleteEvent; // EventId for asychronous deletion of rows + sal_uInt16 m_nOptions; // What is the able to do (Insert, Update, Delete) // default readonly sal_uInt16 m_nOptionMask; // the mask of options to be enabled in setDataSource // (with respect to the data source capabilities) @@ -306,7 +304,7 @@ private: sal_Bool m_bHideScrollbars : 1; protected: - sal_Bool m_bUpdating : 1; // werden gerade updates durchgefuehrt + sal_Bool m_bUpdating : 1; // are any updates being executed right now? protected: virtual sal_Bool SeekRow(long nRow); @@ -401,8 +399,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& getNumberFormatter() const {return m_xFormatter;} - // die Datenquelle - // die Optionen koennen die Updatefaehigkeiten noch einschraenken, nicht erweitern + // the data source + // the options can restrict but not extend the update abilities virtual void setDataSource(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& rCursor, sal_uInt16 nOpts = OPT_INSERT | OPT_UPDATE | OPT_DELETE); virtual void Dispatch(sal_uInt16 nId); @@ -414,18 +412,18 @@ public: sal_Bool HasHandle() const {return m_bHandle;} void InsertHandleColumn(); - /// welche Position hat die Spalte mit der Id in der ::com::sun::star::sdbcx::View, die Handle-Column zahelt nicht mit + // which position does the column with the id in the ::com::sun::star::sdbcx::View have, the handle column doesn't count sal_uInt16 GetViewColumnPos( sal_uInt16 nId ) const { sal_uInt16 nPos = GetColumnPos(nId); return (nPos==(sal_uInt16)-1) ? GRID_COLUMN_NOT_FOUND : nPos-1; } - /** welche Position hat die Spalte mit der Id in m_aColumns, also dem von GetColumns gelieferten ::com::sun::star::sdbcx::Container ? - (unterscheidet sich u.U. von der von GetViewColumnPos gelieferten, wenn es versteckt Spalten gibt) - */ + // which position does the column with the id in m_aColumns have, that means the ::com::sun::star::sdbcx::Container + // returned from the GetColumns (may be different from the position returned by GetViewColumnPos + // if there are hidden columns) sal_uInt16 GetModelColumnPos( sal_uInt16 nId ) const; - /// Anzahl der Spalten im Model + // the number of columns in the model sal_uInt16 GetViewColCount() const { return ColCount() - 1; } - sal_uInt16 GetModelColCount() const { return (sal_uInt16)m_aColumns.Count(); } - /// umgekehrt zu GetViewColumnPos : Id zu Position, die erste Nicht-Handle-Column hat die Position 0 + sal_uInt16 GetModelColCount() const { return (sal_uInt16)m_aColumns.size(); } + // reverse to GetViewColumnPos: Id of position, the first non-handle column has position 0 sal_uInt16 GetColumnIdFromViewPos( sal_uInt16 nPos ) const { return GetColumnId(nPos + 1); } sal_uInt16 GetColumnIdFromModelPos( sal_uInt16 nPos ) const; @@ -452,7 +450,7 @@ public: const com::sun::star::util::Date& getNullDate() const {return m_aNullDate;} - // Positionierung + // positioning void MoveToPosition(sal_uInt32 nPos); void MoveToFirst(); void MoveToNext(); @@ -460,15 +458,17 @@ public: void MoveToLast(); void AppendNew(); - // Abgleich der Cursor falls von außen der DatenCursor verschoben wurde - // Flag bedeutet ob ein Abgleich es Rowcounts vorgenommen werden soll + // adjustment of the cursors in case the data cursor has been + // moved from the outside. + // the flag indicates if an adjustment of the row count should be + // done as well void AdjustDataSource(sal_Bool bFull = sal_False); void Undo(); virtual void BeginCursorAction(); virtual void EndCursorAction(); - // wird die aktuelle Zeile neu gesetzt + // is the current line being updated sal_Bool IsUpdating() const {return m_bUpdating;} virtual void RowRemoved( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True ); @@ -480,15 +480,16 @@ public: sal_Bool getDisplaySynchron() const { return m_bSynchDisplay; } void setDisplaySynchron(sal_Bool bSync); void forceSyncDisplay(); - // wenn das auf sal_False gesetzt wird, laeuft die Anzeige nicht mehr mit der aktuellen Cursor-Position synchron - // (soll heissen, in AdjustDataSource wird nicht in die zur CursorPosition gehoerenden Zeile gesprungen) - // wer das benutzt, sollte bitte wissen, was er tut, da zum Beispiel die Eingabe von Daten in einer Zeile auf der Anzeige, - // die gar nicht mit der Position des Cursors synchron ist, ziemlich kritisch sein koennte + // when set to sal_False, the display is no longer in sync with the current cursor position + // (means that in AdjustDataSource we are jumping to a row not belonging to CursorPosition) + // when using this, you should know what you are doing, because for example entering data + // in a row in the display that is not in sync with the position of the cursor can be very critical sal_Bool isForcedROController() const { return m_bForceROController; } void forceROController(sal_Bool bForce); - // Setzt man das auf sal_True, hat das GridControl immer einen ::com::sun::star::frame::Controller, der allerdings read-only ist. Ausserdem - // wird die Edit-Zeile des Controllers so eingestellt, dass sie ihre Selektion bei Fokus-Verlust weiterhin anzeigt. + // when set to sal_True, the GridControl always has a ::com::sun::star::frame::Controler which is + // read-only though. Additionally, the edit row of the controller is configured in a way + // that its selection stays displayed on focus loss. const DbGridRowRef& GetCurrentRow() const {return m_xCurrentRow;} @@ -570,7 +571,7 @@ public: protected: void RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_Bool bUpdateCursor); sal_Bool SeekCursor(long nRow, sal_Bool bAbsolute = sal_False); - void RemoveColumns(); // aufraeumen eigener strukturen + void RemoveColumns(); // cleaning of own structures void AdjustRows(); sal_Int32 AlignSeekCursor(); sal_Bool SetCurrent(long nNewRow); @@ -579,10 +580,10 @@ protected: virtual void DeleteSelectedRows(); sal_Bool IsValid(const DbGridRowRef& _xRow) const {return _xRow && _xRow->IsValid();} - // Zeile an der gerade eingefuegt wird + // row which is currently being appended sal_Bool IsCurrentAppending() const; - // Leerzeile zum Einfuegen + // empty row for insertion sal_Bool IsInsertionRow(long nRow) const; void SetSeekPos(sal_Int32 nPos) {m_nSeekPos = nPos;} @@ -621,3 +622,4 @@ SV_IMPL_REF(DbGridRow); #endif // _SVX_GRIDCTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index 7efa978285..fb1087370d 100644 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,17 +32,11 @@ #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svx/pagectrl.hxx> #include "svx/svxdllapi.h" @@ -90,7 +85,7 @@ protected: SfxItemSet* pBBSet; BOOL bDisableQueryBox; BOOL bEnableBackgroundSelector; - FASTBOOL bInReset; + bool bInReset; void InitHandler(); DECL_LINK( TurnOnHdl, CheckBox*); @@ -134,3 +129,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/helperhittest3d.hxx b/svx/inc/svx/helperhittest3d.hxx index 15550281b6..630f6cd4f8 100644 --- a/svx/inc/svx/helperhittest3d.hxx +++ b/svx/inc/svx/helperhittest3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,5 @@ bool checkHitSingle3DObject( #endif // INCLUDED_SVX_HELPERHITTEST_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx index 1beecda742..13b6b1d8d7 100644 --- a/svx/inc/svx/hlnkitem.hxx +++ b/svx/inc/svx/hlnkitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,8 +75,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); const String& GetName() const { return sName; } void SetName(const String& rName) { sName = rName; } @@ -108,3 +109,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/svx/inc/svx/htmlmode.hxx.orig index ca106ba8ee..a701d03d39 100644 --- a/svx/inc/svx/extrusioncolorcontrol.hxx +++ b/svx/inc/svx/htmlmode.hxx.orig @@ -24,33 +24,28 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#ifndef _SVX_HTMLMODE_HXX +#define _SVX_HTMLMODE_HXX + +#include <sfx2/htmlmode.hxx> + +#endif + + + + + + + + + + -#ifndef _SVX_EXTRUSIONCOLORCONTROL_HXX -#define _SVX_EXTRUSIONCOLORCONTROL_HXX -#include <sfx2/tbxctrl.hxx> -#include "svx/svxdllapi.h" -#include "svx/tbxcolorupdate.hxx" -namespace svx { -class SVX_DLLPUBLIC ExtrusionColorControl : public SfxToolBoxControl -{ -private: - ToolboxButtonColorUpdater* mpBtnUpdater; -public: - SFX_DECL_TOOLBOX_CONTROL(); - ExtrusionColorControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); - ~ExtrusionColorControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); -}; -} -#endif // _SVX_EXTRUSIONCOLORCONTROL_HXX diff --git a/svx/inc/svx/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx index 457cb7c5e6..fc286e2389 100644 --- a/svx/inc/svx/hyperdlg.hxx +++ b/svx/inc/svx/hyperdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ public: #endif // _SVX_TAB_HYPERLINK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/hyprlink.hxx b/svx/inc/svx/hyprlink.hxx index 0a1f5ad95a..b37c2cf2b2 100644 --- a/svx/inc/svx/hyprlink.hxx +++ b/svx/inc/svx/hyprlink.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,4 @@ public: #endif // _SVX_DLG_HYPERLINK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ifaceids.hxx b/svx/inc/svx/ifaceids.hxx index dfa106a9d4..58001a9b9b 100644 --- a/svx/inc/svx/ifaceids.hxx +++ b/svx/inc/svx/ifaceids.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx index dc587513b8..fbe4ba36c5 100644 --- a/svx/inc/svx/imapdlg.hxx +++ b/svx/inc/svx/imapdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,26 +35,17 @@ #include <sfx2/ctrlitem.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include "svx/svxdllapi.h" +#include <vector> #ifndef _GOMISC_HXX @@ -63,12 +55,12 @@ class ImageMap; /************************************************************************* |* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Float +|* Derivation from SfxChildWindow as "container" for float |* \************************************************************************/ class Graphic; -class TargetList; +typedef ::std::vector< String* > TargetList; class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow { @@ -135,7 +127,6 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow ComboBox maCbbTarget; StatusBar aStbStatus; ImageList maImageList; - ImageList maImageListH; Size aLastSize; IMapWindow* pIMapWnd; @@ -209,3 +200,4 @@ public: #endif // _IMAPDLG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/insctrl.hxx b/svx/inc/svx/insctrl.hxx index c1e43e59fa..139b0197e2 100644 --- a/svx/inc/svx/insctrl.hxx +++ b/svx/inc/svx/insctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/svx/inc/svx/ipolypolygoneditorcontroller.hxx index b81e74e2d6..a35f29c44d 100644 --- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx +++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,20 +36,20 @@ // Defines //************************************************************ -enum SdrPathSmoothKind {SDRPATHSMOOTH_DONTCARE, // nur fuer Statusabfrage - SDRPATHSMOOTH_ANGULAR, // Eckig - SDRPATHSMOOTH_ASYMMETRIC, // unsymmetrisch, normales Smooth - SDRPATHSMOOTH_SYMMETRIC}; // symmetrisch +enum SdrPathSmoothKind {SDRPATHSMOOTH_DONTCARE, // only for status query + SDRPATHSMOOTH_ANGULAR, // angular + SDRPATHSMOOTH_ASYMMETRIC, // asymmetric, normal Smooth + SDRPATHSMOOTH_SYMMETRIC}; // symmetric -enum SdrPathSegmentKind {SDRPATHSEGMENT_DONTCARE, // nur fuer Statusabfrage - SDRPATHSEGMENT_LINE, // gerader Streckenabschnitt - SDRPATHSEGMENT_CURVE, // Kurvenabschnitt (Bezier) - SDRPATHSEGMENT_TOGGLE}; // nur fuer Set: Toggle +enum SdrPathSegmentKind {SDRPATHSEGMENT_DONTCARE, // only for status query + SDRPATHSEGMENT_LINE, // straight path segment + SDRPATHSEGMENT_CURVE, // curve path segment (Bezier) + SDRPATHSEGMENT_TOGGLE}; // only for Set: Toggle -enum SdrObjClosedKind {SDROBJCLOSED_DONTCARE, // nur fuer Statusabfrage - SDROBJCLOSED_OPEN, // Objekte geoeffnet (Linie, Polyline, ...) - SDROBJCLOSED_CLOSED, // Objekte geschlossen (Polygon, ...) - SDROBJCLOSED_TOGGLE}; // nur fuer Set: Toggle (not implemented yet) +enum SdrObjClosedKind {SDROBJCLOSED_DONTCARE, // only for status query + SDROBJCLOSED_OPEN, // non-closed object (line, polyline, ...) + SDROBJCLOSED_CLOSED, // closed object (polygon, ...) + SDROBJCLOSED_TOGGLE}; // only for Set: Toggle (not implemented yet) class IPolyPolygonEditorController { @@ -74,3 +75,4 @@ public: #endif //_SDR_IPOLYPOLYGONEDITORCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx index 85d67a6ca6..4aaa636ef1 100644 --- a/svx/inc/svx/itemwin.hxx +++ b/svx/inc/svx/itemwin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,7 +43,6 @@ class SfxObjectShell; class SvxLineBox : public LineLB { - BmpColorMode meBmpMode; USHORT nCurPos; Timer aDelayTimer; Size aLogicalSize; @@ -56,7 +56,7 @@ class SvxLineBox : public LineLB void ReleaseFocus_Impl(); #endif public: - SvxLineBox( Window* pParent, + SvxLineBox( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); ~SvxLineBox(); @@ -92,7 +92,7 @@ class SvxColorBox : public ColorLB #endif public: - SvxColorBox( Window* pParent, + SvxColorBox( Window* pParent, const rtl::OUString& rCommand, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); @@ -127,14 +127,14 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField protected: virtual void Modify(); virtual void Down(); - virtual void Up(); // Nur zur Sicherheit + virtual void Up(); // just to be sure virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: - SvxMetricField( Window* pParent, + SvxMetricField( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); ~SvxMetricField(); @@ -195,3 +195,4 @@ private: #endif // #ifndef _SVX_ITEMWIN_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx index a1f78a6a04..30a394befd 100644 --- a/svx/inc/svx/langbox.hxx +++ b/svx/inc/svx/langbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,9 +52,9 @@ class SvtLanguageTable; #define LANG_LIST_SPELL_USED 0x0200 #define LANG_LIST_HYPH_USED 0x0400 #define LANG_LIST_THES_USED 0x0800 -#define LANG_LIST_ALSO_PRIMARY_ONLY 0x1000 // Do not exclude primary-only - // languages that do not form a - // locale, such as Arabic as +#define LANG_LIST_ALSO_PRIMARY_ONLY 0x1000 // Do not exclude primary-only + // languages that do not form a + // locale, such as Arabic as // opposed to Arabic-Egypt. @@ -67,7 +68,6 @@ public: private: Image m_aNotCheckedImage; Image m_aCheckedImage; - Image m_aCheckedImageHC; String m_aAllString; com::sun::star::uno::Sequence< INT16 > *m_pSpellUsedLang; SvtLanguageTable* m_pLangTable; @@ -105,10 +105,6 @@ namespace layout class SvxLanguageBoxImpl; class SVX_DLLPUBLIC SvxLanguageBox : public ListBox { - /*DECL_GET_IMPL( SvxLanguageBox ); - DECL_CONSTRUCTORS( SvxLanguageBox, ListBox, WB_BORDER ); - DECL_GET_WINDOW (SvxLanguageBox);*/ - public: SvxLanguageBox( Context*, const char*, BOOL bCheck = FALSE ); ~SvxLanguageBox (); @@ -126,3 +122,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx index eb1ce3e118..00e6fe829e 100644 --- a/svx/inc/svx/lathe3d.hxx +++ b/svx/inc/svx/lathe3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,11 +34,11 @@ /************************************************************************* |* -|* 3D-Rotationsobjekt aus uebergebenem 2D-Polygon erzeugen +|* Create a 3D rotation object from a passed 2D polygon |* -|* Das aPolyPoly3D wird in nHSegments-Schritten um die Achse rotiert. -|* nVSegments gibt die Anzahl der Linien von aPolyPoly3D an und stellt damit -|* quasi eine vertikale Segmentierung dar. +|* The aPolyPoly3D is rotated around its axis in nHSegments steps. +|* nVSegments contains the number of lines of aPolyPoly3D and therefore +|* is effectively a vertical segmentation. |* \************************************************************************/ @@ -105,18 +106,19 @@ private: virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; - // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". + // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - // Lokale Parameter setzen/lesen mit Geometrieneuerzeugung + // set/get local parameters with geometry recreation void SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew); const basegfx::B2DPolyPolygon& GetPolyPoly2D() { return maPolyPoly2D; } - // Aufbrechen + // break up virtual BOOL IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; #endif // _E3D_LATHE3D_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/layctrl.hxx b/svx/inc/svx/layctrl.hxx index 26e3f1fc74..37beb62cb3 100644 --- a/svx/inc/svx/layctrl.hxx +++ b/svx/inc/svx/layctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ class SVX_DLLPUBLIC SvxTableToolBoxControl : public SfxToolBoxControl { private: - FASTBOOL bEnabled; + bool bEnabled; public: virtual SfxPopupWindowType GetPopupWindowType() const; @@ -58,7 +59,7 @@ public: class SVX_DLLPUBLIC SvxColumnsToolBoxControl : public SfxToolBoxControl { - FASTBOOL bEnabled; + bool bEnabled; public: virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); @@ -77,3 +78,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx index 0a699a72aa..8483146ab4 100644 --- a/svx/inc/svx/lboxctrl.hxx +++ b/svx/inc/svx/lboxctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/linectrl.hxx b/svx/inc/svx/linectrl.hxx index 3daef66ffd..3045a55141 100644 --- a/svx/inc/svx/linectrl.hxx +++ b/svx/inc/svx/linectrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -173,3 +174,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/measctrl.hxx b/svx/inc/svx/measctrl.hxx index 00e061b08e..79efb8e1d6 100644 --- a/svx/inc/svx/measctrl.hxx +++ b/svx/inc/svx/measctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _CTRL_HXX //autogen #include <vcl/ctrl.hxx> -#endif #include "svx/svxdllapi.h" @@ -68,3 +67,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/modctrl.hxx b/svx/inc/svx/modctrl.hxx index c03617ed55..fd4133083c 100644 --- a/svx/inc/svx/modctrl.hxx +++ b/svx/inc/svx/modctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,6 +33,8 @@ #include <sfx2/stbitem.hxx> #include "svx/svxdllapi.h" +#include <boost/shared_ptr.hpp> + // class SvxModifyControl ------------------------------------------------ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl @@ -39,7 +42,8 @@ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl public: virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); + virtual void Paint( const UserDrawEvent& rUsrEvt ); + virtual void DoubleClick(); SFX_DECL_STATUSBAR_CONTROL(); @@ -48,13 +52,11 @@ public: static ULONG GetDefItemWidth(const StatusBar& rStb); private: - BOOL bState; - -#ifdef _SVX_MODCTRL_CXX - SVX_DLLPRIVATE void DrawItemText_Impl(); -#endif + struct ImplData; + ::boost::shared_ptr<ImplData> mpImpl; }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx index a20eecf424..ca5d8ccc8d 100644 --- a/svx/inc/svx/msdffdef.hxx +++ b/svx/inc/svx/msdffdef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <tools/solar.h> #include <tools/stream.hxx> -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif #include <tools/string.hxx> #include <tools/gen.hxx> #include "svx/svxdllapi.h" @@ -249,7 +248,7 @@ #define DFF_msofbtSelection 0xF119 // an FDGSL followed by the SPIDs of the shapes in the selection X 0 -// Werte fuer den ULONG im DFF_PST_TextHeaderAtom +// Values for the ULONG in DFF_PST_TextHeaderAtom enum DFF_TextHeader { DFFTH_TITLE, DFFTH_BODY, @@ -580,7 +579,7 @@ enum DFF_TextHeader { #define DFF_PBit_Print 0x00000001 //--------------------------------------------------------------------------- -// Dreh- und Angelpunkt: der Shape-Typ +// linchpin: the shape type //--------------------------------------------------------------------------- typedef enum { @@ -792,10 +791,10 @@ typedef enum mso_sptNil = mso_sptMax } MSO_SPT; -// verschiedene enums aus der OfficeDraw-Doku, Appendix D - Anfang +// different enums from the OfficeDraw documentation, Appendix D - beginning // -// beachte: in Abweichung von der MS-Doku beginnen alle -// mit "mso_" statt mit "mso" +// note: in opposite to the MS documentation, they all +// start with "mso_" instead of "mso" // enum MSO_ShapePath { mso_shapeLines, // A line of straight segments @@ -1098,7 +1097,7 @@ typedef enum { } MSO_BLIPUSAGE; typedef enum { // GEL provided types... - mso_blipERROR = 0, // An error occured during loading + mso_blipERROR = 0, // An error occurred during loading mso_blipUNKNOWN, // An unknown blip type mso_blipEMF, // Windows Enhanced Metafile mso_blipWMF, // Windows Metafile diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index 94e4660a13..bf69daaa18 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,8 +65,9 @@ enum SvxNumberValueType // define ---------------------------------------------------------------- -#define CAT_ALL 0 // Reihenfolge der Kategorie- -#define CAT_USERDEFINED 1 // ListBox-Eintraege in der TabPage +// sort order of the category ListBox entries in the TabPage +#define CAT_ALL 0 +#define CAT_USERDEFINED 1 #define CAT_NUMBER 2 #define CAT_PERCENT 3 #define CAT_CURRENCY 4 @@ -171,7 +173,7 @@ public: String& rPreviewStr, Color*& rpFontColor ); - void MakePrevStringFromVal( const String& rFormatStr, //@ 19.09.97 + void MakePrevStringFromVal( const String& rFormatStr, String& rPreviewStr, Color*& rpFontColor, double nValue); @@ -218,7 +220,7 @@ public: void GetCurrencyFormats(SvStrings& rList); private: - static const double DEFAULT_NUMVALUE; // 123456789 + static const double DEFAULT_NUMVALUE; SvNumberFormatter* pFormatter; SvNumberFormatTable* pCurFmtTable; @@ -265,3 +267,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx index 94177b5928..0ecde44dc5 100644 --- a/svx/inc/svx/numinf.hxx +++ b/svx/inc/svx/numinf.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,8 +39,7 @@ /* -[Beschreibung] -Dieses Item dient als Transport-Medium fuer einen Number-Formatter. +This item is used as a transport medium for a number formatter */ class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem @@ -98,3 +98,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx index 63915d0500..69600123d4 100644 --- a/svx/inc/svx/numvset.hxx +++ b/svx/inc/svx/numvset.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,9 +59,6 @@ struct SvxBmpItemInfo USHORT nItemId; }; -/*-----------------09/09/97 01:05pm----------------- - ---------------------------------------------------*/ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet { Color aLineColor; @@ -101,10 +99,6 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet const com::sun::star::lang::Locale& rLocale); }; -/*-----------------13.02.97 09.32------------------- - ---------------------------------------------------*/ - class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet { String sBullets; @@ -120,15 +114,12 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet Timer& GetFormatTimer() {return aFormatTimer;} public: - SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, const List& rStrNames*/); + SvxBmpNumValueSet( Window* pParent, const ResId& rResId); ~SvxBmpNumValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); }; -/*-----------------02.12.97 10:31------------------- - ---------------------------------------------------*/ class SvxNumberingPreview : public Window { @@ -163,3 +154,4 @@ class SvxNumberingPreview : public Window #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx index 775c3fbb58..c5b4378e1a 100644 --- a/svx/inc/svx/obj3d.hxx +++ b/svx/inc/svx/obj3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,7 +46,7 @@ #include "svx/svxdllapi.h" //************************************************************ -// Vorausdeklarationen +// Forward declaration //************************************************************ class SfxPoolItem; @@ -65,22 +66,22 @@ namespace sdr { namespace properties { /************************************************************************* |* -|* GeoData relevant fuer Undo-Actions +|* GeoData relevant for undo actions |* \************************************************************************/ class E3DObjGeoData : public SdrObjGeoData { public: - basegfx::B3DRange maLocalBoundVol; // umschliessendes Volumen des Objekts - basegfx::B3DHomMatrix maTransformation; // lokale Transformation + basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object + basegfx::B3DHomMatrix maTransformation; // lokal transformations E3DObjGeoData() {} }; /************************************************************************* |* -|* Liste fuer 3D-Objekte +|* List for 3D objects |* \************************************************************************/ @@ -100,7 +101,7 @@ public: /************************************************************************* |* -|* Basisklasse fuer 3D-Objekte +|* Base class for 3D objects |* \************************************************************************/ @@ -110,7 +111,7 @@ private: // to allow sdr::properties::E3dProperties access to StructureChanged() friend class sdr::properties::E3dProperties; - // Aus der E3dObjList und E3dDragMethod alles erlauben + // Allow everything for E3dObjList and E3dDragMethod friend class E3dObjList; friend class E3dDragMethod; @@ -119,9 +120,9 @@ private: E3dObjList maSubList; // Subliste (Childobjekte) - basegfx::B3DRange maLocalBoundVol; // umschliessendes Volumen des Objekts (aus geometrieerzeugung) - basegfx::B3DHomMatrix maTransformation; // lokale Transformation - basegfx::B3DHomMatrix maFullTransform; // globale Transformation (inkl. Parents) + basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object (from the geometry generation) + basegfx::B3DHomMatrix maTransformation; // local transformation + basegfx::B3DHomMatrix maFullTransform; // global transformation (including. parents) // Flags unsigned mbTfHasChanged : 1; @@ -164,7 +165,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual SdrObjList* GetSubList() const; - // 3D-Objekt in die Gruppe einfuegen; Eigentumsuebergang! + // Insert 3D object into the group; transfer to other owner! virtual void Insert3DObj(E3dObject* p3DObj); void Remove3DObj(E3dObject* p3DObj); @@ -174,23 +175,24 @@ public: const basegfx::B3DRange& GetBoundVolume() const; void InvalidateBoundVolume(); - // komplette Transformation inklusive aller Parents berechnen + // calculate complete transformation including all parents const basegfx::B3DHomMatrix& GetFullTransform() const; - // Transformationsmatrix abfragen bzw. (zurueck)setzen + // get and (re)set transformation matrix const basegfx::B3DHomMatrix& GetTransform() const; virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix); virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix); - // [FG] 2D-Rotationen, werden hier als Rotationen um die Z-Achse, die in den Bildschirm zeigt, - // implementiert plus eine Verschiebung der Scene. Dies bedeutet auch die Scene (E3dScene) - // muss diese Routine in der Klasse als virtual definieren. + // 2D rotations, are implemented as a rotation around the Z axis + // which is vertical to the screen, plus a shift of the scene. + // This means that also the scene (E3dScene) must define this + // routine as virtual in its class. virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); // get wireframe polygon for local object. No transform is applied. basegfx::B3DPolyPolygon CreateWireframe() const; - // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". + // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; USHORT GetLogicalGroup() { return 0; } @@ -200,22 +202,22 @@ public: virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); - // Selektion Setzen/Lesen + // get/set the selection bool GetSelected() const { return mbIsSelected; } void SetSelected(bool bNew); - // Aufbrechen + // break up virtual BOOL IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; /************************************************************************* |* -|* Klasse fuer alle zusammengesetzen Objekte (Cube, Lathe, Scene, Extrude) -|* Diese Klasse erspart ein paar ISA-Abfragen und sie beschleunigt das -|* Verhalten ungemein, da alle Attribute usw. fuer die untergeordneten -|* Polygone hierueber gehalten werden. Die Polygone duerfen nur Attribute -|* halten, wenn sie direkt einer Szene untergeordnet sind. +|* Class for all compound objects (Cube, Lathe, Scene, Extrude) +|* This class saves some ISA queries and accelerates the behaviour +|* significantly, because all the attributes etc. are kept through this. +|* The polygons may only keep attributes if they are directly +|* subordinated to the scene. |* \************************************************************************/ @@ -234,7 +236,7 @@ protected: // Material des Objektes Color aMaterialAmbientColor; - // Attribute zur Geometrieerzeugung + // attributes for geometry creation unsigned bCreateNormals : 1; unsigned bCreateTexture : 1; @@ -307,22 +309,23 @@ public : virtual UINT16 GetObjIdentifier() const; virtual void RecalcSnapRect(); - // Parameter Geometrieerzeugung setzen/lesen + // set/get parameters for geometry creation BOOL GetCreateNormals() const { return bCreateNormals; } void SetCreateNormals(BOOL bNew); BOOL GetCreateTexture() const { return bCreateTexture; } void SetCreateTexture(BOOL bNew); - // Copy-Operator + // copy operator virtual void operator=(const SdrObject&); - // Material des Objektes + // material of the object const Color& GetMaterialAmbientColor() const { return aMaterialAmbientColor; } void SetMaterialAmbientColor(const Color& rColor); - // #110988# sal_Bool IsAOrdNumRemapCandidate(E3dScene*& prScene) const; }; #endif // _E3D_OBJ3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/objfac3d.hxx b/svx/inc/svx/objfac3d.hxx index 34dcb8b094..9cb7ecb526 100644 --- a/svx/inc/svx/objfac3d.hxx +++ b/svx/inc/svx/objfac3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ /************************************************************************* |* -|* Factory fuer Chart-spezifische Objekte +|* Factory for chart-specific objects |* \************************************************************************/ @@ -54,3 +55,5 @@ public: #endif // _OBJFAC3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx index 668990b383..766c8ee776 100644 --- a/svx/inc/svx/ofaitem.hxx +++ b/svx/inc/svx/ofaitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx index c3afa9c847..85efb6104a 100644 --- a/svx/inc/svx/optgenrl.hxx +++ b/svx/inc/svx/optgenrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,7 +28,7 @@ #ifndef _SVX_OPTGENRL_HXX #define _SVX_OPTGENRL_HXX -// Defines for setting the fokus of a Edit via a slot from external. +// Defines for setting the focus of a Edit via a slot from external. #define UNKNOWN_EDIT ((USHORT)0) #define COMPANY_EDIT ((USHORT)1) #define FIRSTNAME_EDIT ((USHORT)2) @@ -47,4 +48,4 @@ #endif // #ifndef _SVX_OPTGENRL_HXX - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/optgrid.hxx b/svx/inc/svx/optgrid.hxx index 9fbd0098e9..f10267b02f 100644 --- a/svx/inc/svx/optgrid.hxx +++ b/svx/inc/svx/optgrid.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,7 +141,7 @@ private: FixedText aDivisionPointY; CheckBox aCbxSynchronize; - FixedLine aGrpDrawGrid; // Neu + FixedLine aGrpDrawGrid; protected: //these controls are used in draw and impress @@ -164,7 +165,6 @@ protected: private: BOOL bAttrModified; -// BOOL bEqualGrid; // Neu #ifdef _SVX_OPTGRID_CXX DECL_LINK( ClickRotateHdl_Impl, void * ); @@ -178,3 +178,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/orienthelper.hxx b/svx/inc/svx/orienthelper.hxx index 1ffb1bb855..0b315add63 100644 --- a/svx/inc/svx/orienthelper.hxx +++ b/svx/inc/svx/orienthelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,4 @@ typedef sfx::ItemControlConnection< sfx::BoolItemWrapper, OrientStackedWrapper > #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx index 3fcdecfda1..0f35022d5c 100644 --- a/svx/inc/svx/pagectrl.hxx +++ b/svx/inc/svx/pagectrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -168,3 +169,4 @@ public: #endif // #ifndef _SVX_PAGECTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx index d2921d1559..68d774674a 100644 --- a/svx/inc/svx/pageitem.hxx +++ b/svx/inc/svx/pageitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,10 +35,6 @@ #include "svx/svxdllapi.h" -/*-------------------------------------------------------------------- - Beschreibung: SvxNumType - --------------------------------------------------------------------*/ - enum SvxNumType { SVX_CHARS_UPPER_LETTER, @@ -51,7 +48,7 @@ enum SvxNumType }; /*-------------------------------------------------------------------- - Beschreibung: Benutzung der Seite + usage of the page --------------------------------------------------------------------*/ enum SvxPageUsage @@ -65,24 +62,21 @@ enum SvxPageUsage }; /*-------------------------------------------------------------------- - Beschreibung: Teile der Seitenbeschreibung + parts of the page description --------------------------------------------------------------------*/ - - /* -[Beschreibung] -Dieses Item beschreibt ein Seiten-Attribut (Name der Vorlage, Numerierung, -Portrait oder Landscape, Layout). +This item describes a page attribute (name of the template, enumeration, +portait or landscape, layout) */ class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem { private: - String aDescName; // Name der Vorlage - SvxNumType eNumType; // Numerierung - BOOL bLandscape; // Portrait / Landscape - USHORT eUse; // Layout + String aDescName; // name of the template + SvxNumType eNumType; // enumeration + BOOL bLandscape; // portrait / landscape + USHORT eUse; // layout public: @@ -98,23 +92,23 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxPoolItem* Create( SvStream&, USHORT ) const; virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; - // Ausrichtung + // orientation USHORT GetPageUsage() const { return eUse; } void SetPageUsage(USHORT eU) { eUse= eU; } BOOL IsLandscape() const { return bLandscape; } void SetLandscape(BOOL bL) { bLandscape = bL; } - // Numerierung + // enumeration SvxNumType GetNumType() const { return eNumType; } void SetNumType(SvxNumType eNum) { eNumType = eNum; } - // Name des Descriptors + // name of the descriptor const String& GetDescName() const { return aDescName; } void SetDescName(const String& rStr) { aDescName = rStr; } }; @@ -122,16 +116,9 @@ public: /*-------------------------------------------------------------------- - Beschreibung: Container fuer Header/Footer-Attribute + container for header/footer attributes --------------------------------------------------------------------*/ - - -/* -[Beschreibung] -Dieses Item dient als Container fuer Header- und Footer-Attribute. -*/ - class SVX_DLLPUBLIC SvxSetItem: public SfxSetItem { public: @@ -155,3 +142,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx index 3a40b616b1..70f5aa720d 100644 --- a/svx/inc/svx/paraprev.hxx +++ b/svx/inc/svx/paraprev.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,18 +55,18 @@ private: Size aWinSize; Size aSize; - // Einzuege + // indentation long nLeftMargin; long nRightMargin; short nFirstLineOfst; - // Abstaende + // distances USHORT nUpper; USHORT nLower; - // Ausrichtung + // adjustment SvxAdjust eAdjust; - // Letzte Zeile im Blocksatz + // last line in justification SvxAdjust eLastLine; - // Zeilenabstand + // line distance SvxPrevLineSpace eLine; USHORT nLineVal; @@ -111,3 +112,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/passwd.hxx b/svx/inc/svx/passwd.hxx index 617c89014d..5913851720 100644 --- a/svx/inc/svx/passwd.hxx +++ b/svx/inc/svx/passwd.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,17 +32,11 @@ #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include "svx/svxdllapi.h" // class SvxPasswordDialog ----------------------------------------------- @@ -84,3 +79,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx index b6f5ec7802..50dd94c5d1 100644 --- a/svx/inc/svx/pfiledlg.hxx +++ b/svx/inc/svx/pfiledlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ public: #endif // _SVX_PFILEDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx index 2078925c44..9fd19a225b 100644 --- a/svx/inc/svx/polygn3d.hxx +++ b/svx/inc/svx/polygn3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ public: }; #endif // _E3D_POLYGON3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/polypolygoneditor.hxx b/svx/inc/svx/polypolygoneditor.hxx index 28bd40e318..1fc8ba162e 100644 --- a/svx/inc/svx/polypolygoneditor.hxx +++ b/svx/inc/svx/polypolygoneditor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx index f0f33110e3..0471fe9e46 100644 --- a/svx/inc/svx/polysc3d.hxx +++ b/svx/inc/svx/polysc3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ /************************************************************************* |* -|* 3D-Szene mit Darstellung durch 2D-Polygone +|* 3D scene displayed through 2D polygons |* \************************************************************************/ @@ -48,3 +49,5 @@ public: }; #endif // _E3D_POLYSC3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/postattr.hxx b/svx/inc/svx/postattr.hxx index 466baf121b..15d9456229 100644 --- a/svx/inc/svx/postattr.hxx +++ b/svx/inc/svx/postattr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,8 +38,7 @@ /* -[Beschreibung] -Dieses Item beschreibt das Autoren-Kuerzel eines Notizzettels. +The author shorthand symbol of a note */ class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem @@ -69,8 +69,7 @@ public: /* -[Beschreibung] -Dieses Item beschreibt das Datum eines Notizzettels. +The date of a note */ class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem @@ -100,8 +99,7 @@ public: /* -[Beschreibung] -Dieses Item beschreibt den Text eines Notizzettels. +The text of a note */ class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem @@ -112,7 +110,7 @@ public: SvxPostItTextItem( USHORT nWhich ); SvxPostItTextItem( const String& rText, USHORT nWhich ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" vom SfxPoolItem virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -131,3 +129,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/prtqry.hxx b/svx/inc/svx/prtqry.hxx index e3d7867a23..29d61a419c 100644 --- a/svx/inc/svx/prtqry.hxx +++ b/svx/inc/svx/prtqry.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx index a0f3fa725f..08f49670f2 100644 --- a/svx/inc/svx/pszctrl.hxx +++ b/svx/inc/svx/pszctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/rectenum.hxx b/svx/inc/svx/rectenum.hxx index 538a4f2738..d8edbc5511 100644 --- a/svx/inc/svx/rectenum.hxx +++ b/svx/inc/svx/rectenum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,5 @@ enum CTL_STYLE #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/relfld.hxx b/svx/inc/svx/relfld.hxx index 15863f498e..1a5e9dd913 100644 --- a/svx/inc/svx/relfld.hxx +++ b/svx/inc/svx/relfld.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,19 +30,11 @@ // include --------------------------------------------------------------- -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include "svx/svxdllapi.h" // class SvxRelativeField ------------------------------------------------ -/* - [Beschreibung] - - "Ahnlich der Klasse FontSizeBox. Abgeleitet von der Klasse MetricField. - Zus"atzliche Funktionalit"at: relative Angaben. -*/ class SVX_DLLPUBLIC SvxRelativeField : public MetricField { @@ -71,3 +64,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx index 6b281d3e80..157ab6e715 100644 --- a/svx/inc/svx/rotmodit.hxx +++ b/svx/inc/svx/rotmodit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ #include "svx/svxdllapi.h" //---------------------------------------------------------------------------- -// Ausrichtung bei gedrehtem Text +// Alignment with rotated text enum SvxRotateMode { @@ -60,10 +61,11 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx index 51f83c79ac..2a1453b5ea 100644 --- a/svx/inc/svx/rubydialog.hxx +++ b/svx/inc/svx/rubydialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,12 +33,8 @@ #include <sfx2/childwin.hxx> #include <sfx2/basedlgs.hxx> #include <vcl/lstbox.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <vcl/scrbar.hxx> #include <com/sun/star/uno/Reference.h> @@ -202,3 +199,4 @@ public: #endif // _SVX_RUBYDLG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx index b82213e69a..67dc379f09 100644 --- a/svx/inc/svx/ruler.hxx +++ b/svx/inc/svx/ruler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,33 +53,33 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener using Window::Notify; SvxRulerItem **pCtrlItem; - SvxLongLRSpaceItem *pLRSpaceItem; //Linker und Rechter Rand - SfxRectangleItem *pMinMaxItem; //Maxima fuers Draggen - SvxLongULSpaceItem *pULSpaceItem; //Oberer und Unterer Rand - SvxTabStopItem *pTabStopItem; //Tabstops - SvxLRSpaceItem *pParaItem; //Absaetze - SvxLRSpaceItem *pParaBorderItem; //Border distance - SvxPagePosSizeItem *pPagePosItem; //Seitenabstaende zum Lineal - SvxColumnItem *pColumnItem; //Spalten - SvxObjectItem *pObjectItem; //Objekt + SvxLongLRSpaceItem *pLRSpaceItem; // left and right edge + SfxRectangleItem *pMinMaxItem; // maxima for dragging + SvxLongULSpaceItem *pULSpaceItem; // upper and lower edge + SvxTabStopItem *pTabStopItem; // tab stops + SvxLRSpaceItem *pParaItem; // paragraphs + SvxLRSpaceItem *pParaBorderItem; // border distance + SvxPagePosSizeItem *pPagePosItem; // page distance to the rule + SvxColumnItem *pColumnItem; // columns + SvxObjectItem *pObjectItem; // object Window *pEditWin; SvxRuler_Impl *pRuler_Imp; BOOL bAppSetNullOffset :1; BOOL bHorz :1; - long lLogicNullOffset; // in logischen Koordinaten - long lAppNullOffset; // in logischen Koordinaten - long lMinFrame; // minimale Framebreite in Pixel + long lLogicNullOffset; // in logic coordinates + long lAppNullOffset; // in logic coordinates + long lMinFrame; // minimal frame width in pixels long lInitialDragPos; USHORT nFlags; enum { NONE = 0x0000, DRAG_OBJECT = 0x0001, - // letzte Spalte verkleinern, Shift + // reduce size of the last column, shift DRAG_OBJECT_SIZE_LINEAR = 0x0002, DRAG_OBJECT_SIZE_PROPORTIONAL = 0x0004, // proportional, Ctrl - // nur aktuelle Zeile (Tabelle; Shift-Ctrl) + // only current line (table; Shift-Ctrl) DRAG_OBJECT_ACTLINE_ONLY = 0x0008, - // aktuell gleiche Tastenbelegung + // currently same key assignment DRAG_OBJECT_LEFT_INDENT_ONLY = DRAG_OBJECT_SIZE_PROPORTIONAL } nDragType; @@ -87,8 +88,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener USHORT nTabBufSize; long lDefTabDist; long lTabPos; - RulerTab *pTabs; // Tabpositionen in Pixel - RulerIndent *pIndents; // Absatzraender in Pixel + RulerTab *pTabs; // tab positions in pixel + RulerIndent *pIndents; // paragraph margins in pixel RulerBorder *pBorders; USHORT nBorderCount; RulerBorder *pObjectBorders; @@ -99,33 +100,32 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener BOOL bValid; BOOL bListening; BOOL bActive; -//#if 0 // _SOLAR__PRIVATE void StartListening_Impl(); long GetCorrectedDragPos( BOOL bLeft = TRUE, BOOL bRight = TRUE ); void DrawLine_Impl(long &lTabPos, int, BOOL Hori=TRUE); USHORT GetObjectBordersOff(USHORT nIdx) const; - // Seitenr"ander oder umgebender Rahmen + // page borders or surrounding frame void UpdateFrame(const SvxLongLRSpaceItem *); void UpdateFrame(const SvxLongULSpaceItem *); void UpdateFrameMinMax(const SfxRectangleItem *); - // Absatzeinzuege + // paragraph indentations void UpdatePara(const SvxLRSpaceItem *); // Border distance void UpdateParaBorder(const SvxLRSpaceItem *); // Tabs void Update(const SvxTabStopItem *); - // Seitenposition und -breite + // page position and width void Update(const SvxPagePosSizeItem *); - // Spalten + // columns void Update(const SvxColumnItem *, USHORT nSID); - // Object Selektion + // object selection void Update(const SvxObjectItem *); - // Protect + // protect void Update( const SvxProtectItem* ); // left-to-right text void UpdateTextRTL( const SfxBoolItem* ); - // Absatzeinzuege + // paragraph indentations void UpdatePara(); void UpdateTabs(); void UpdatePage(); @@ -154,9 +154,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener long ConvertSizeLogic(long lSize) const; long GetFirstLineIndent() const; -// long GetLogicFirstLineIndent() const; long GetLeftIndent() const; -// long GetLogicLeftIndent() const; long GetRightIndent() const; long GetLogicRightIndent() const; long GetPageWidth() const; @@ -194,7 +192,6 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener USHORT GetNextVisible(USHORT nColumn); USHORT GetPrevVisible(USHORT nColumn); -//#endif void Update(); @@ -215,8 +212,8 @@ protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - // Berechnung der Grenzwerte fuer Objectgrenzen - // Werte sind bezogen auf die Seite + // calculation of boundary values for object borders + // values refer to the page virtual BOOL CalcLimits(long &nMax1, long &nMax2, BOOL bFirst) const; BOOL IsActLastColumn( BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const ; @@ -253,7 +250,7 @@ public: void SetDefTabDist(long); long GetDefTabDist() const; - // Setzen / Erfragen NullOffset in logischen Einheiten + // set/get NullOffset in logic units void SetNullOffsetLogic(long lOff = 0); long GetNullOffsetLogic() const { return lAppNullOffset; } @@ -268,3 +265,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/rulritem.hxx b/svx/inc/svx/rulritem.hxx index 7a3d42eebf..e7a9a43d8d 100644 --- a/svx/inc/svx/rulritem.hxx +++ b/svx/inc/svx/rulritem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,14 +39,14 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem { - long lLeft; // nLeft oder der neg. Erstzeileneinzug - long lRight; // der unproblematische rechte Rand + long lLeft; // nLeft or the negativ first-line indentation + long lRight; // the unproblematic right edge protected: virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -74,14 +75,14 @@ public: class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem { - long lLeft; // nLeft oder der neg. Erstzeileneinzug - long lRight; // der unproblematische rechte Rand + long lLeft; // nLeft or the negative first-line indentation + long lRight; // the unproblematic right edge protected: virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -115,8 +116,8 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem long lHeight; protected: virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -143,9 +144,9 @@ public: struct SvxColumnDescription { - long nStart; /* Spaltenbeginn */ - long nEnd; /* Spaltenende */ - BOOL bVisible; /* Sichtbarkeit */ + long nStart; /* Start of the column */ + long nEnd; /* End of the column */ + BOOL bVisible; /* Visibility */ long nEndMin; //min. possible position of end long nEndMax; //max. possible position of end @@ -190,13 +191,13 @@ typedef SvPtrarr SvxColumns; class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem { - SvxColumns aColumns;// Spaltenarray - long nLeft, // Linker Rand bei Tabelle - nRight; // Rechter Rand bei Tabelle; bei Spalten immer gleich - // zum umgebenden Rahmen - USHORT nActColumn; // die aktuelle Spalte - BOOL bTable; // Tabelle? - BOOL bOrtho; // Gleichverteilte Spalten + SvxColumns aColumns;// Column array + long nLeft, // Left edge for the table + nRight; // Right edge for the table; for columns always + // equal to the surrounding frame + USHORT nActColumn; // the current column + BOOL bTable; // table? + BOOL bOrtho; // evenly spread columns void DeleteAndDestroyColumns(); @@ -210,15 +211,15 @@ protected: String &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); public: TYPEINFO(); - // rechter Rand des umgebenden Rahmens - // nLeft, nRight jeweils der Abstand zum umgebenden Rahmen - SvxColumnItem(USHORT nAct = 0); // Spalten + // right edge of the surrounding frame + // nLeft, nRight each the distance to the surrounding frame + SvxColumnItem(USHORT nAct = 0); // columns SvxColumnItem(USHORT nActCol, - USHORT nLeft, USHORT nRight = 0); // Tabelle mit Raendern + USHORT nLeft, USHORT nRight = 0); // table with borders SvxColumnItem(const SvxColumnItem &); ~SvxColumnItem(); @@ -251,7 +252,7 @@ public: BOOL IsOrtho () const { return FALSE ; } BOOL IsConsistent() const { return nActColumn < aColumns.Count(); } - long GetVisibleRight() const;// rechter sichtbare Rand der aktuellen Spalte + long GetVisibleRight() const;// right visible edge of the current column }; // class SvxObjectItem --------------------------------------------------- @@ -259,11 +260,11 @@ public: class SVX_DLLPUBLIC SvxObjectItem : public SfxPoolItem { private: - long nStartX; /* Beginn in X-Richtung */ - long nEndX; /* Ende in X-Richtung */ - long nStartY; /* Beginn in Y-Richtung */ - long nEndY; /* Ende in Y-Richtung */ - BOOL bLimits; /* Grenzwertkontrolle durch die Applikation */ + long nStartX; /* Start in x direction */ + long nEndX; /* End in x direction */ + long nStartY; /* Start in y direction */ + long nEndY; /* Ende in y direction */ + BOOL bLimits; /* boundary limit control by the application */ protected: virtual int operator==( const SfxPoolItem& ) const; @@ -274,8 +275,8 @@ protected: String &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); private: SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i. public: @@ -301,3 +302,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx index 3021447ed6..bd0dc40091 100644 --- a/svx/inc/svx/scene3d.hxx +++ b/svx/inc/svx/scene3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,7 +46,7 @@ namespace drawinglayer { namespace geometry { /************************************************************************* |* -|* GeoData relevant fuer Undo-Actions +|* GeoData relevant for undo actions |* \************************************************************************/ @@ -57,12 +58,11 @@ public: E3DSceneGeoData() {} }; -// #110988# class Imp3DDepthRemapper; /************************************************************************* |* -|* Basisklasse fuer 3D-Szenen +|* base class for 3D scenes |* \************************************************************************/ @@ -80,7 +80,6 @@ protected: B3dCamera aCameraSet; Camera3D aCamera; - // #110988# Imp3DDepthRemapper* mp3DDepthRemapper; // Flag to determine if only selected objects should be drawn @@ -96,7 +95,6 @@ protected: protected: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); - // #110988# void ImpCleanup3DDepthMapper(); public: @@ -112,7 +110,6 @@ public: virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - // #110988# sal_uInt32 RemapOrdNum(sal_uInt32 nOrdNum) const; // Perspective: enum ProjectionType { PR_PARALLEL, PR_PERSPECTIVE } @@ -225,28 +222,30 @@ public: virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); void RotateScene(const Point& rRef, long nWink, double sn, double cs); - // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". + // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - // Transformationen rausgeben + // get transformations B3dCamera& GetCameraSet() { return aCameraSet; } - // Aufbrechen + // break up virtual BOOL IsBreakObjPossible(); basegfx::B3DVector GetShadowPlaneDirection() const; void SetShadowPlaneDirection(const basegfx::B3DVector& rVec); - // Polygon das waehrend des Erzeugens aufgezogen wird + // polygon which is built during creation virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; // create moves - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); // true=Xor muss repainted werden + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); }; #endif // _E3D_SCENE3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx index 952664d6bf..7804858691 100644 --- a/svx/inc/svx/sdangitm.hxx +++ b/svx/inc/svx/sdangitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx index 81abd5ec63..418023d60e 100644 --- a/svx/inc/svx/sdasaitm.hxx +++ b/svx/inc/svx/sdasaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,8 +65,8 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); #ifdef SDR_ISPOOLABLE @@ -80,3 +81,4 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index c0a4aac44e..3f8a599ad9 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,8 +100,8 @@ private: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const; @@ -144,3 +145,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sderitm.hxx b/svx/inc/svx/sderitm.hxx index 0d09bb29a6..6f3d8b7bb3 100644 --- a/svx/inc/svx/sderitm.hxx +++ b/svx/inc/svx/sderitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdgcoitm.hxx b/svx/inc/svx/sdgcoitm.hxx index 69807c148c..7cf1431b77 100644 --- a/svx/inc/svx/sdgcoitm.hxx +++ b/svx/inc/svx/sdgcoitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ public: }; #endif // _SDGCOITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdgcpitm.hxx b/svx/inc/svx/sdgcpitm.hxx index dd01de87f8..24fc7cf6ce 100644 --- a/svx/inc/svx/sdgcpitm.hxx +++ b/svx/inc/svx/sdgcpitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif // _SDGCPITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx index 122e38c87e..e25e5beecf 100644 --- a/svx/inc/svx/sdggaitm.hxx +++ b/svx/inc/svx/sdggaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,8 +49,10 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; #endif // _SDGGAITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdginitm.hxx b/svx/inc/svx/sdginitm.hxx index aa175ee728..c20f7298e6 100644 --- a/svx/inc/svx/sdginitm.hxx +++ b/svx/inc/svx/sdginitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ public: }; #endif // _SDGINITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdgluitm.hxx b/svx/inc/svx/sdgluitm.hxx index 8ba0c1a507..27103ded00 100644 --- a/svx/inc/svx/sdgluitm.hxx +++ b/svx/inc/svx/sdgluitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif // _SDGLUITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index 0924028e26..d5b1163a51 100644 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ public: }; #endif // _SDGMOITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdgtritm.hxx b/svx/inc/svx/sdgtritm.hxx index ad3895df1f..7b981fc670 100644 --- a/svx/inc/svx/sdgtritm.hxx +++ b/svx/inc/svx/sdgtritm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif // _SDGTRITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index a1b4904176..a061707b15 100644 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,8 +34,8 @@ //------------------------------------------------------------ // class SdrAngleItem -// Fuer alle Metriken. GetPresentation liefert dann bei -// Value=2500 z.B. ein "25mm". +// For all metrics. GetPresentation returns for example for +// Value=2500 a "25mm". //------------------------------------------------------------ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: @@ -44,8 +45,8 @@ public: SdrMetricItem(USHORT nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual FASTBOOL HasMetrics() const; - virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); + virtual bool HasMetrics() const; + virtual bool ScaleMetrics(long nMul, long nDiv); virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -59,3 +60,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index 01980c7b24..d5697bfb77 100644 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,8 +34,8 @@ //------------------------------------------------------------ // class SdrOnOffItem -// hier liefert GetValueTextByVal() "an" oder "aus" -// anstelle von "TRUE" und "FALSE" +// here GetValueTextByVal() returns "an" or "aus" instead +// of "TRUE" or "FALSE" //------------------------------------------------------------ class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: @@ -56,3 +57,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx index 8e373039f5..efff82005b 100644 --- a/svx/inc/svx/sdprcitm.hxx +++ b/svx/inc/svx/sdprcitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ //------------------------------------------------------------ // class SdrPercentItem -// Ganze Prozente von 0 +// Integer percents of 0 //------------------------------------------------------------ class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item @@ -55,7 +56,7 @@ public: //------------------------------------------------------------ // class SdrSignedPercentItem -// Ganze Prozente von +/- +// Integer percents of +/- //------------------------------------------------------------ class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item @@ -77,3 +78,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/animation/animationstate.hxx b/svx/inc/svx/sdr/animation/animationstate.hxx index 58e3bf8601..92ceb14ecd 100644 --- a/svx/inc/svx/sdr/animation/animationstate.hxx +++ b/svx/inc/svx/sdr/animation/animationstate.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,5 @@ namespace sdr #endif //_SDR_ANIMATION_ANIMATIONSTATE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/animation/objectanimator.hxx b/svx/inc/svx/sdr/animation/objectanimator.hxx index 801da79f05..0b4e1de23c 100644 --- a/svx/inc/svx/sdr/animation/objectanimator.hxx +++ b/svx/inc/svx/sdr/animation/objectanimator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,5 @@ namespace sdr #endif //_SDR_ANIMATION_OBJECTANIMATOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx b/svx/inc/svx/sdr/animation/scheduler.hxx index a1b167ca97..82efaf6f3d 100644 --- a/svx/inc/svx/sdr/animation/scheduler.hxx +++ b/svx/inc/svx/sdr/animation/scheduler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,7 +59,7 @@ namespace sdr // get/set time sal_uInt32 GetTime() const; - void SetTime(sal_uInt32 nNew); + void SVX_DLLPUBLIC SetTime(sal_uInt32 nNew); // execute event virtual void Trigger(sal_uInt32 nTime) = 0; @@ -142,7 +143,7 @@ namespace sdr void checkTimeout(); // insert/remove events, wrapper to EventList methods - void InsertEvent(Event* pNew); + void SVX_DLLPUBLIC InsertEvent(Event* pNew); void RemoveEvent(Event* pOld); // get/set pause @@ -157,3 +158,5 @@ namespace sdr #endif //_SDR_ANIMATION_SCHEDULER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx index 7328320ad6..4f91c9123e 100644 --- a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,5 @@ namespace drawinglayer #endif // _SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx index ff6de4176c..15fd5e93df 100644 --- a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ namespace drawinglayer #endif // _SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx index a31c6b1617..a7daac23de 100644 --- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,6 +76,7 @@ namespace drawinglayer SdrTextVertAdjust aSdrTextVertAdjust, bool bContour, bool bFitToSize, + bool bAutoFit, bool bHideContour, bool bBlink, bool bScroll, @@ -128,3 +130,5 @@ namespace drawinglayer #endif // _SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/displayinfo.hxx b/svx/inc/svx/sdr/contact/displayinfo.hxx index 870eda9dc8..6d4535d9d5 100644 --- a/svx/inc/svx/sdr/contact/displayinfo.hxx +++ b/svx/inc/svx/sdr/contact/displayinfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,5 @@ namespace sdr #endif //_SDR_CONTACT_DISPLAYINFO_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/objectcontact.hxx b/svx/inc/svx/sdr/contact/objectcontact.hxx index 8fad111b7d..28fc931423 100644 --- a/svx/inc/svx/sdr/contact/objectcontact.hxx +++ b/svx/inc/svx/sdr/contact/objectcontact.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -227,3 +228,5 @@ namespace sdr #endif //_SDR_CONTACT_OBJECTCONTACT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx index b34df0bffb..14a607cf4d 100644 --- a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,3 +152,5 @@ namespace sdr #endif //_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx index 875f9dddd6..c8badbcf26 100644 --- a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx +++ b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,3 +152,5 @@ namespace sdr #endif //_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/objectcontacttools.hxx b/svx/inc/svx/sdr/contact/objectcontacttools.hxx index 13a7d626f7..3b46a26085 100644 --- a/svx/inc/svx/sdr/contact/objectcontacttools.hxx +++ b/svx/inc/svx/sdr/contact/objectcontacttools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ namespace sdr #endif //_SDR_CONTACT_OBJECTCONTACTTOOLS_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/svx/inc/svx/sdr/contact/viewcontact.hxx index cddf2ef7e7..d61b7defff 100644 --- a/svx/inc/svx/sdr/contact/viewcontact.hxx +++ b/svx/inc/svx/sdr/contact/viewcontact.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -170,3 +171,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx index 841fa98cb9..08cf6a1436 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -118,3 +119,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx index 43f8c8cd96..8e6abc00f4 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -69,3 +68,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx index 493ba8d79a..bb847b5a31 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -69,3 +68,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx index 20987d603c..40b55a3245 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -69,3 +68,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx index 48741625a3..5edcda4924 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -69,3 +68,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx index 7c0d792e68..25b6947553 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx index a14b252d01..cfed0a6fbd 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -69,3 +68,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx index f760c86858..308cb76c44 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx index 44880a60d9..03dc36135d 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx index 9fafa5d959..fdd039d25f 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx index d14a57f3c9..322ed7c3c6 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx index eed299b929..a2e4067017 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx index cf5b661711..96cb4ccbf1 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx index 3e1e877172..babcb8ce48 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx index 704690ca1c..0d4339b6bd 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 47dbc7cfbc..3b7816cc7d 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// #endif //_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx index 2b3e21a67a..c3600d1b14 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx index 00ad86ec3a..614e5f04fd 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx index f0dfc7a3f1..d99052e385 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,7 +65,7 @@ namespace sdr // scaling (e.g. for EmptyPresObj's), the correct graphic and other stuff. It is used from // createViewIndependentPrimitive2DSequence with false, and with evtl. HighContrast true // from the VOC which knows that - drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters(bool bHighContrast) const; + drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters() const; protected: // This method is responsible for creating the graphical visualisation data @@ -79,3 +80,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx index de7053d921..ad4c9ca95d 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -309,3 +310,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx index 657c39c038..5265910ab6 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx index 78e2949ac0..f8de886596 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx index febfde890e..470a2339cc 100644 --- a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx index 7ca76eafdc..a85051fecb 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ namespace sdr { namespace contact { #endif // SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx index cd05842528..13e18311d9 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx index 44fb3346f1..3b586068a1 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,3 +156,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx index a2e71aa5a8..b559ff59ab 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx index 9252e7d749..be1b344481 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx index 21183af187..2b9ba7bcce 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx index c4da9afd4b..b654aea38f 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx index 775914396b..29464cbff9 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx index 24042ccbaf..2dc87105a7 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index e706b4236b..1db6c82185 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// #endif // _SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index 6b6ac662e6..2e31417ba3 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx index 99b481b9fb..5baef0b96a 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx index c23d814c1c..9e6aa4d086 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -244,3 +245,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx index 99f885edb2..4dbb923cfc 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,4 @@ namespace sdr { namespace contact { #endif // SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx index be18142d6e..dfdc079150 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/event/eventhandler.hxx b/svx/inc/svx/sdr/event/eventhandler.hxx index 43900b0b56..a64c5639a4 100644 --- a/svx/inc/svx/sdr/event/eventhandler.hxx +++ b/svx/inc/svx/sdr/event/eventhandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,5 @@ namespace sdr #endif //_SDR_EVENT_EVENTHANDLER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx index 9c0ee2fa29..cb1a553496 100644 --- a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx index 6824803ce7..cdd5e73626 100644 --- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx +++ b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYBITMAPEX_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx index 99e92bdce0..70f004bf3e 100644 --- a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx +++ b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx index 1dae45c670..2c441efa41 100644 --- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx +++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYHATCHRECT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx index 14c1f46a36..7b91f547c1 100644 --- a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx +++ b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYHELPLINE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayline.hxx b/svx/inc/svx/sdr/overlay/overlayline.hxx index cc555ec36c..3810f48b4a 100644 --- a/svx/inc/svx/sdr/overlay/overlayline.hxx +++ b/svx/inc/svx/sdr/overlay/overlayline.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYLINE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaymanager.hxx b/svx/inc/svx/sdr/overlay/overlaymanager.hxx index d51cbc1720..ba8bfdd142 100644 --- a/svx/inc/svx/sdr/overlay/overlaymanager.hxx +++ b/svx/inc/svx/sdr/overlay/overlaymanager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYMANAGER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx index abf5460651..6bc231f9eb 100644 --- a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayobject.hxx b/svx/inc/svx/sdr/overlay/overlayobject.hxx index 2ac427da51..7d8aee9331 100644 --- a/svx/inc/svx/sdr/overlay/overlayobject.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobject.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -201,3 +202,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYOBJECT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx index f1fd91468b..68d3338f28 100644 --- a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYLINE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx index d082fb62b7..6de641a5ab 100644 --- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYOBJECTLIST_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx index c828c50d73..90e8e90c92 100644 --- a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index 483e61ab85..af8de0f536 100644 --- a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx index 57ac6bf761..04cd459441 100644 --- a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx +++ b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYROOLINGRECTANGLE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayselection.hxx b/svx/inc/svx/sdr/overlay/overlayselection.hxx index 37fbebf1dc..019e33ff78 100644 --- a/svx/inc/svx/sdr/overlay/overlayselection.hxx +++ b/svx/inc/svx/sdr/overlay/overlayselection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYSELECTION_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaytools.hxx b/svx/inc/svx/sdr/overlay/overlaytools.hxx index e3d376dd59..924e4fdb01 100644 --- a/svx/inc/svx/sdr/overlay/overlaytools.hxx +++ b/svx/inc/svx/sdr/overlay/overlaytools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -276,3 +277,5 @@ namespace drawinglayer #endif //_SDR_OVERLAY_OVERLAYTOOLS_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx index a0aaa4a346..eea5d4e095 100644 --- a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx +++ b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYTRIANGLE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx index 7b4b05a53c..7aa8ea03fa 100644 --- a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_PRIMITIVEFACTORY2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx index 56881364da..c1e9b87bc6 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx index be6ac39390..9ec9276099 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 670b05882d..85808f592d 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index 438551480e..dfa235b7ea 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDCUSTOMSHAPEPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx index 6b24c5b18e..30cd545b1a 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx index 9ebec978cf..fcbc65c8b0 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -118,3 +119,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx index 052dda33ac..5aa15b3bd4 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx index fca73f4a68..2d314f13b6 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,3 +132,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx index 89415c7ecf..b85cca7b35 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx index 8dc7b41802..1bf6cf4ba2 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,7 +26,7 @@ * ************************************************************************/ -#ifndef INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX +#ifndef INCLUDED_SDR_PRIMITIVE2D_SdrOleContentPrimitive2D_HXX #define INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX #include <drawinglayer/primitive2d/baseprimitive2d.hxx> @@ -54,9 +55,6 @@ namespace drawinglayer // be expensive, e.g. triggering chart creation) sal_uInt32 mnGraphicVersion; - // bitfield - unsigned mbHighContrast : 1; - protected: // local decomposition. virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; @@ -64,9 +62,9 @@ namespace drawinglayer public: SdrOleContentPrimitive2D( const SdrOle2Obj& rSdrOle2Obj, - const basegfx::B2DHomMatrix& rObjectTransform, - sal_uInt32 nGraphicVersion, - bool bHighContrast); + const basegfx::B2DHomMatrix& rObjectTransform, + sal_uInt32 nGraphicVersion + ); // compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const; @@ -77,7 +75,6 @@ namespace drawinglayer // data access const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; } sal_uInt32 getGraphicVersion() const { return mnGraphicVersion; } - bool getHighContrast() const { return mbHighContrast; } // provide unique ID DeclPrimitrive2DIDBlock() @@ -90,3 +87,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx index 1b77622831..cee3071dcf 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx index 1b034b56ef..67a314fd8b 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_PRIMITIVETOOLS_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx index ef63701576..a201132212 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx index 145fdd6d3c..d5d9b45980 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -300,6 +301,49 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// +namespace drawinglayer +{ + namespace primitive2d + { + class SdrAutoFitTextPrimitive2D : public SdrTextPrimitive2D + { + private: + ::basegfx::B2DHomMatrix maTextRangeTransform; // text range transformation from unit range ([0.0 .. 1.0]) to text range + + // bitfield + unsigned mbWordWrap : 1; // for CustomShapes text layout + + protected: + // local decomposition. + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + + public: + SdrAutoFitTextPrimitive2D( + const SdrText* pSdrText, + const OutlinerParaObject& rOutlinerParaObjectPtr, + const ::basegfx::B2DHomMatrix& rTextRangeTransform, + bool bWordWrap); + + // get data + const basegfx::B2DHomMatrix& getTextRangeTransform() const { return maTextRangeTransform; } + bool getWordWrap() const { return mbWordWrap; } + + // compare operator + virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + + // transformed clone operator + virtual SdrTextPrimitive2D* createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const; + + // provide unique ID + DeclPrimitrive2DIDBlock() + }; + } // end of namespace primitive2d +} // end of namespace drawinglayer + +////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx index 7833fa5994..d0dbd968f8 100644 --- a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,6 +56,7 @@ #define PRIMITIVE2D_ID_OVERLAYROLLINGRECTANGLEPRIMITIVE (PRIMITIVE2D_ID_RANGE_SVX| 20) #define PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 21) #define PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 22) +#define PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 23) ////////////////////////////////////////////////////////////////////////////// @@ -62,3 +64,5 @@ ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx index 58c5b73420..8859a77925 100644 --- a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx +++ b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ namespace drawinglayer #endif //_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/svx/inc/svx/sdr/properties/attributeproperties.hxx index 2d363895bc..bb7343ab21 100644 --- a/svx/inc/svx/sdr/properties/attributeproperties.hxx +++ b/svx/inc/svx/sdr/properties/attributeproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ namespace sdr #endif //_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/captionproperties.hxx b/svx/inc/svx/sdr/properties/captionproperties.hxx index 6083fd8101..e3aaee1b8a 100644 --- a/svx/inc/svx/sdr/properties/captionproperties.hxx +++ b/svx/inc/svx/sdr/properties/captionproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace sdr #endif // _SDR_PROPERTIES_CAPTIONPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/circleproperties.hxx b/svx/inc/svx/sdr/properties/circleproperties.hxx index 90f96638d6..abca379f97 100644 --- a/svx/inc/svx/sdr/properties/circleproperties.hxx +++ b/svx/inc/svx/sdr/properties/circleproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace sdr #endif //_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/connectorproperties.hxx b/svx/inc/svx/sdr/properties/connectorproperties.hxx index 905e268e26..d68a96bfba 100644 --- a/svx/inc/svx/sdr/properties/connectorproperties.hxx +++ b/svx/inc/svx/sdr/properties/connectorproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ namespace sdr #endif //_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/customshapeproperties.hxx b/svx/inc/svx/sdr/properties/customshapeproperties.hxx index 664a675422..397635d375 100644 --- a/svx/inc/svx/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/svx/sdr/properties/customshapeproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ namespace sdr #endif //_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/defaultproperties.hxx b/svx/inc/svx/sdr/properties/defaultproperties.hxx index 93981e0b71..e150fd6d47 100644 --- a/svx/inc/svx/sdr/properties/defaultproperties.hxx +++ b/svx/inc/svx/sdr/properties/defaultproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ namespace sdr #endif //_SDR_PROPERTIES_DEFAULTPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx index 7e51cbdf4e..07667f0afd 100644 --- a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ namespace sdr #endif // _SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx index 4f87548a9d..9e1bff92eb 100644 --- a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ namespace sdr #endif // _SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx index 2a31e0e6e7..fe859472d1 100644 --- a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ namespace sdr #endif // _SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dproperties.hxx b/svx/inc/svx/sdr/properties/e3dproperties.hxx index d19517ab1e..22dc6f83dc 100644 --- a/svx/inc/svx/sdr/properties/e3dproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ namespace sdr #endif // _SDR_PROPERTIES_E3DPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx index c02cbbbd6b..cd45eb59b5 100644 --- a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ namespace sdr #endif // _SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx index 50263d78c9..2b8baf09cf 100644 --- a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ namespace sdr // eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/emptyproperties.hxx b/svx/inc/svx/sdr/properties/emptyproperties.hxx index f62f5dab74..598f087c85 100644 --- a/svx/inc/svx/sdr/properties/emptyproperties.hxx +++ b/svx/inc/svx/sdr/properties/emptyproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ namespace sdr #endif //_SDR_PROPERTIES_EMPTYPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/graphicproperties.hxx b/svx/inc/svx/sdr/properties/graphicproperties.hxx index 77ca1ef2ae..8fe3fa2b48 100644 --- a/svx/inc/svx/sdr/properties/graphicproperties.hxx +++ b/svx/inc/svx/sdr/properties/graphicproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace sdr #endif //_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/groupproperties.hxx b/svx/inc/svx/sdr/properties/groupproperties.hxx index e0fc636274..8c74997b2f 100644 --- a/svx/inc/svx/sdr/properties/groupproperties.hxx +++ b/svx/inc/svx/sdr/properties/groupproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,5 @@ namespace sdr #endif //_SDR_PROPERTIES_GROUPPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/itemsettools.hxx b/svx/inc/svx/sdr/properties/itemsettools.hxx index 05d5cc46f0..65a3fe53c5 100644 --- a/svx/inc/svx/sdr/properties/itemsettools.hxx +++ b/svx/inc/svx/sdr/properties/itemsettools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ namespace sdr #endif //_SDR_PROPERTIES_ITEMSETTOOLS_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/measureproperties.hxx b/svx/inc/svx/sdr/properties/measureproperties.hxx index 783b06dedd..93f1d040a8 100644 --- a/svx/inc/svx/sdr/properties/measureproperties.hxx +++ b/svx/inc/svx/sdr/properties/measureproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace sdr #endif //_SDR_PROPERTIES_MEASUREPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/pageproperties.hxx b/svx/inc/svx/sdr/properties/pageproperties.hxx index 0b1dc0ada3..6463cc3988 100644 --- a/svx/inc/svx/sdr/properties/pageproperties.hxx +++ b/svx/inc/svx/sdr/properties/pageproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ namespace sdr // eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/properties.hxx b/svx/inc/svx/sdr/properties/properties.hxx index dfd5b07d7e..63b7209e91 100644 --- a/svx/inc/svx/sdr/properties/properties.hxx +++ b/svx/inc/svx/sdr/properties/properties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -195,3 +196,5 @@ namespace sdr #endif //_SDR_PROPERTIES_PROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/rectangleproperties.hxx b/svx/inc/svx/sdr/properties/rectangleproperties.hxx index 7a50f3f3e8..abb0deada2 100644 --- a/svx/inc/svx/sdr/properties/rectangleproperties.hxx +++ b/svx/inc/svx/sdr/properties/rectangleproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ namespace sdr #endif //_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx b/svx/inc/svx/sdr/properties/textproperties.hxx index 1787af922d..e8b25922dd 100644 --- a/svx/inc/svx/sdr/properties/textproperties.hxx +++ b/svx/inc/svx/sdr/properties/textproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ namespace sdr #endif //_SDR_PROPERTIES_TEXTPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/table/tabledesign.hxx b/svx/inc/svx/sdr/table/tabledesign.hxx index 4a020cfccb..6751143307 100644 --- a/svx/inc/svx/sdr/table/tabledesign.hxx +++ b/svx/inc/svx/sdr/table/tabledesign.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ extern SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::contain #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrcomment.hxx b/svx/inc/svx/sdrcomment.hxx index 5fcb069e3e..85c30e7e27 100644 --- a/svx/inc/svx/sdrcomment.hxx +++ b/svx/inc/svx/sdrcomment.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ namespace sdr #endif //_SDR_COMMENT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrhittesthelper.hxx b/svx/inc/svx/sdrhittesthelper.hxx index 431a879eab..16c5bcaf69 100644 --- a/svx/inc/svx/sdrhittesthelper.hxx +++ b/svx/inc/svx/sdrhittesthelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,5 @@ SVX_DLLPUBLIC bool ViewObjectContactPrimitiveHit( ///////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx index 1aef4e4bbf..ea2974a867 100644 --- a/svx/inc/svx/sdrmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ namespace sdr #endif //_SDR_MASTERPAGEDESCRIPTOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrobjectfilter.hxx.orig b/svx/inc/svx/sdrobjectfilter.hxx.orig new file mode 100644 index 0000000000..01565eff07 --- /dev/null +++ b/svx/inc/svx/sdrobjectfilter.hxx.orig @@ -0,0 +1,58 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2009 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ + +#ifndef SDROBJECTFILTER_HXX +#define SDROBJECTFILTER_HXX + +#include "svx/svxdllapi.h" + +/** === begin UNO includes === **/ +/** === end UNO includes === **/ + +class SdrObject; + +//........................................................................ +namespace svx +{ +//........................................................................ + + //==================================================================== + //= SdrObjectFilter + //==================================================================== + /** specifies a boolean predicate on the set of all SdrObjects - vulgo a filter. + */ + class SVX_DLLPUBLIC SAL_NO_VTABLE ISdrObjectFilter + { + public: + virtual bool includeObject( const SdrObject& i_rObject ) const = 0; + + virtual ~ISdrObjectFilter() = 0; + }; + +//........................................................................ +} // namespace svx +//........................................................................ + +#endif // SDROBJECTFILTER_HXX diff --git a/svx/inc/svx/sdrobjectuser.hxx b/svx/inc/svx/sdrobjectuser.hxx index 750dcc083c..bc2a26f56c 100644 --- a/svx/inc/svx/sdrobjectuser.hxx +++ b/svx/inc/svx/sdrobjectuser.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace sdr #endif //_SDR_OBJECTUSER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrpageuser.hxx b/svx/inc/svx/sdrpageuser.hxx index 63bae1f04a..da0d42669a 100644 --- a/svx/inc/svx/sdrpageuser.hxx +++ b/svx/inc/svx/sdrpageuser.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace sdr #endif //_SDR_PAGEUSER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx index fdc57f7998..7d28e5c936 100644 --- a/svx/inc/svx/sdrpagewindow.hxx +++ b/svx/inc/svx/sdrpagewindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,7 +93,6 @@ class SVX_DLLPUBLIC SdrPageWindow void* mpDummy; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > mxControlContainer; - // #110094# ObjectContact section sdr::contact::ObjectContact* CreateViewSpecificObjectContact(); public: @@ -141,3 +141,5 @@ typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector; //////////////////////////////////////////////////////////////////////////////////////////////////// #endif //_SDRPAGEWINDOW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx index 5b2224dfa8..8be3874bbf 100644 --- a/svx/inc/svx/sdrpaintwindow.hxx +++ b/svx/inc/svx/sdrpaintwindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDRPAINTWINDOW_HXX #define _SDRPAINTWINDOW_HXX -#ifndef _VIRDEV_HXX //autogen #include <vcl/virdev.hxx> -#endif #include "svx/svxdllapi.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -165,3 +164,4 @@ typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector; #endif //_SDRPAINTWINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdshcitm.hxx b/svx/inc/svx/sdshcitm.hxx index fa42352873..2ba0f39a44 100644 --- a/svx/inc/svx/sdshcitm.hxx +++ b/svx/inc/svx/sdshcitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,7 +41,8 @@ public: SdrShadowColorItem(const String& rName, const Color& rTheColor): XColorItem(SDRATTR_SHADOWCOLOR,rName,rTheColor) {} -// SdrShadowColorItem(SvStream& rIn): XColorItem(SDRATTR_SHADOWCOLOR,rIn) {} }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx index 13fb76bcb0..64ad547cb3 100644 --- a/svx/inc/svx/sdshitm.hxx +++ b/svx/inc/svx/sdshitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef _SDSHITM_HXX #define _SDSHITM_HXX -#ifndef _SDOOITEM_HXX #include <svx/sdooitm.hxx> -#endif #include <svx/svddef.hxx> //------------------------------ @@ -42,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdshtitm.hxx b/svx/inc/svx/sdshtitm.hxx index 56b4a5d4af..200a352a67 100644 --- a/svx/inc/svx/sdshtitm.hxx +++ b/svx/inc/svx/sdshtitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdsxyitm.hxx b/svx/inc/svx/sdsxyitm.hxx index 73b517d462..5a1a70c2a2 100644 --- a/svx/inc/svx/sdsxyitm.hxx +++ b/svx/inc/svx/sdsxyitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx index d157330438..773cf0207e 100644 --- a/svx/inc/svx/sdtaaitm.hxx +++ b/svx/inc/svx/sdtaaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,10 +39,12 @@ public: SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual FASTBOOL HasMetrics() const; - virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); + virtual bool HasMetrics() const; + virtual bool ScaleMetrics(long nMul, long nDiv); virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx index 43e34abbbd..bde531d20f 100644 --- a/svx/inc/svx/sdtacitm.hxx +++ b/svx/inc/svx/sdtacitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,7 @@ #include <svl/intitem.hxx> #include <svx/svddef.hxx> -// Anzahl der Durchlaeufe. 0=Endlos. +// Number of loops. 0=infinite. class SdrTextAniCountItem: public SfxUInt16Item { public: SdrTextAniCountItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {} @@ -38,3 +39,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx index 66eded48ae..b44e5ecc6e 100644 --- a/svx/inc/svx/sdtaditm.hxx +++ b/svx/inc/svx/sdtaditm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,11 +48,11 @@ public: SdrTextAniDirectionItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 4; } + virtual USHORT GetValueCount() const; SdrTextAniDirection GetValue() const { return (SdrTextAniDirection)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueTextByPos(USHORT nPos) const; @@ -59,3 +60,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtagitm.hxx b/svx/inc/svx/sdtagitm.hxx index be89a2bcb5..2b873350fd 100644 --- a/svx/inc/svx/sdtagitm.hxx +++ b/svx/inc/svx/sdtagitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtaiitm.hxx b/svx/inc/svx/sdtaiitm.hxx index 905766cfe2..d1c7c0ff95 100644 --- a/svx/inc/svx/sdtaiitm.hxx +++ b/svx/inc/svx/sdtaiitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx index 07a823d8e1..45d063fbe3 100644 --- a/svx/inc/svx/sdtaitm.hxx +++ b/svx/inc/svx/sdtaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,12 +36,11 @@ // class SdrTextVertAdjustItem //------------------------------ -// Implementiert werden zunaechst nur TOP und CENTER, neustens auch BOTTOM -enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // Kopfbuendig (so wie man es normalerweise kennt) - SDRTEXTVERTADJUST_CENTER, // Zentriert (z.B. fuer die Titeltexte im Draw) - SDRTEXTVERTADJUST_BOTTOM, // Fussbuendig - SDRTEXTVERTADJUST_BLOCK // #103516# support vertical full with supported now - /*,SDRTEXTVERTADJUST_STRETCH*/}; // Auch die Buchstaben in der Hoehe verzerren (ni) +enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally used) + SDRTEXTVERTADJUST_CENTER, // centered (for example for the title texts in Draw) + SDRTEXTVERTADJUST_BOTTOM, // aligned to bottom + SDRTEXTVERTADJUST_BLOCK // support vertical full with supported now + /*,SDRTEXTVERTADJUST_STRETCH*/}; // also stretch letters in their height (ni) class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem { public: @@ -52,8 +52,8 @@ public: virtual USHORT GetValueCount() const; // { return 5; } SdrTextVertAdjust GetValue() const { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueTextByPos(USHORT nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; @@ -63,11 +63,11 @@ public: // class SdrTextHorzAdjustItem //------------------------------ -enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // Linksbuendig verankert - SDRTEXTHORZADJUST_CENTER, // Zentriert (z.B. fuer die Titeltexte im Draw) - SDRTEXTHORZADJUST_RIGHT, // Rechtsbuendig verankert - SDRTEXTHORZADJUST_BLOCK // So wie es frueher war: Gesamte Textrahmenbreite verwenden, Absatzformatierung macht wieder Sinn - /*,SDRTEXTHORZADJUST_STRETCH*/}; // FitToSize in X-Richtung (ni). +enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted + SDRTEXTHORZADJUST_CENTER, // centered (for example for title texts in Draw) + SDRTEXTHORZADJUST_RIGHT, // right adjusted + SDRTEXTHORZADJUST_BLOCK // use the whole text frame width + /*,SDRTEXTHORZADJUST_STRETCH*/}; // FitToSize in X direction (ni). class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem { public: @@ -76,14 +76,16 @@ public: SdrTextHorzAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 5; } + virtual USHORT GetValueCount() const; SdrTextHorzAdjust GetValue() const { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueTextByPos(USHORT nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx index bf6b495d12..ff00264f9d 100644 --- a/svx/inc/svx/sdtakitm.hxx +++ b/svx/inc/svx/sdtakitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,11 +96,13 @@ public: virtual USHORT GetValueCount() const; // { return 5; } SdrTextAniKind GetValue() const { return (SdrTextAniKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueTextByPos(USHORT nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx index b1d1715f4b..bbeaa28bb0 100644 --- a/svx/inc/svx/sdtayitm.hxx +++ b/svx/inc/svx/sdtayitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtcfitm.hxx b/svx/inc/svx/sdtcfitm.hxx index d11e0834e7..7ccddfcd9d 100644 --- a/svx/inc/svx/sdtcfitm.hxx +++ b/svx/inc/svx/sdtcfitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtditm.hxx b/svx/inc/svx/sdtditm.hxx index f303873e17..3c4b9b74d8 100644 --- a/svx/inc/svx/sdtditm.hxx +++ b/svx/inc/svx/sdtditm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx index a551bcc840..aa3ce73c45 100644 --- a/svx/inc/svx/sdtfchim.hxx +++ b/svx/inc/svx/sdtfchim.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,8 +47,8 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); #ifdef SDR_ISPOOLABLE SVX_DLLPRIVATE virtual int IsPoolable() const; @@ -55,3 +56,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx index 362f444d3d..45fec5134b 100644 --- a/svx/inc/svx/sdtfsitm.hxx +++ b/svx/inc/svx/sdtfsitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,19 +32,21 @@ #include <svx/svddef.hxx> #include "svx/svxdllapi.h" -enum SdrFitToSizeType {SDRTEXTFIT_NONE, // - kein FitToSize - SDRTEXTFIT_PROPORTIONAL, // - Alle Buchstaben proportional umgroessern - SDRTEXTFIT_ALLLINES, // - Zus. jede Zeile separat in der Breite stretchen - SDRTEXTFIT_RESIZEATTR}; // - Bei Rahmenumgroesserung (ausser Autogrow) wird - // die Schriftgroesse umattributiert (hart) +enum SdrFitToSizeType { + SDRTEXTFIT_NONE, // - no fit-to-size + SDRTEXTFIT_PROPORTIONAL, // - resize all glyhs proportionally + // (might scale anisotrophically) + SDRTEXTFIT_ALLLINES, // - like SDRTEXTFIT_PROPORTIONAL, but + // scales each line separately + SDRTEXTFIT_AUTOFIT}; // - mimics PPT's automatic adaption of + // font size to text rect - comparable + // to SDRTEXTFIT_PROPORTIONAL, but + // scales isotrophically -// Bei SDRTEXTFIT_PROPORTIONAL und SDRTEXTFIT_ALLLINES gibt es kein AutoGrow und -// keine automatischen Umbrueche. -// Ist SDRTEXTFIT_RESIZEATTR gesetzt, so wird beim umgroessern des Textrahmens -// (ausser bei AutoGrow) die Schrift durch harte Attributierung ebenfalls -// umgegroessert. -// Bei AutoGrowingWidth gibt es ebenfalls keine automatischen Umbrueche (erst bei -// TextMaxFrameWidth). +// No AutoGrow and no automatic line breaks for +// SDRTEXTFIT_PROPORTIONAL and SDRTEXTFIT_ALLLINES. +// No automatic line breaks for AutoGrowingWidth as well (only if +// TextMaxFrameWidth is reached). //-------------------------------- // class SdrTextFitToSizeTypeItem @@ -58,8 +61,8 @@ public: virtual USHORT GetValueCount() const; // { return 4; } SdrFitToSizeType GetValue() const { return (SdrFitToSizeType)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueTextByPos(USHORT nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; @@ -69,3 +72,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtmfitm.hxx b/svx/inc/svx/sdtmfitm.hxx index 154cc9c02d..00d8c4f14f 100644 --- a/svx/inc/svx/sdtmfitm.hxx +++ b/svx/inc/svx/sdtmfitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index 7b39551988..863270393c 100644 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/selctrl.hxx b/svx/inc/svx/selctrl.hxx index 77c8f91898..ab22210bde 100644 --- a/svx/inc/svx/selctrl.hxx +++ b/svx/inc/svx/selctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/selectioncontroller.hxx b/svx/inc/svx/selectioncontroller.hxx index 301929b91e..3a114ea7c6 100644 --- a/svx/inc/svx/selectioncontroller.hxx +++ b/svx/inc/svx/selectioncontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,4 @@ public: #endif //_SELECTIONCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/shapeproperty.hxx b/svx/inc/svx/shapeproperty.hxx index ccd041888a..be8c710520 100755..100644 --- a/svx/inc/svx/shapeproperty.hxx +++ b/svx/inc/svx/shapeproperty.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -57,3 +58,5 @@ namespace svx //........................................................................ #endif // SVX_SHAPEPROPERTY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/svx/inc/svx/shapepropertynotifier.hxx index 01ceed36a8..504bcae8d5 100644 --- a/svx/inc/svx/shapepropertynotifier.hxx +++ b/svx/inc/svx/shapepropertynotifier.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -146,3 +147,5 @@ namespace svx //........................................................................ #endif // SVX_PROPERTYCHANGENOTIFIER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index 19cf26d3dc..bde1a83d38 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,17 +29,11 @@ #ifndef _SVX_SIMPTABL_HXX #define _SVX_SIMPTABL_HXX -#ifndef _MOREBTN_HXX //autogen #include <vcl/morebtn.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> #include <vcl/lstbox.hxx> @@ -178,3 +173,4 @@ public: #endif // _SVX_SIMPTABL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx index 0d02126497..99c6730289 100644 --- a/svx/inc/svx/sphere3d.hxx +++ b/svx/inc/svx/sphere3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ public: }; #endif // _E3D_SPHERE3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx index cc92f4848f..0bbf42a8de 100644 --- a/svx/inc/svx/splitcelldlg.hxx +++ b/svx/inc/svx/splitcelldlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index f767586559..690188e940 100644 --- a/svx/inc/svx/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,10 +89,10 @@ public: SearchAttrItem& GetObject( USHORT nPos ) const { return SrchAttrItemList::GetObject( nPos ); } - // der Pointer auf das Item wird nicht kopiert!!! (also nicht l"oschen) + // the pointer to the item is not being copierd, so don't delete void Insert( const SearchAttrItem& rItem ) { SrchAttrItemList::Insert( rItem, SrchAttrItemList::Count() ); } - // l"oscht die Pointer auf die Items + // deletes the pointer to the items void Remove( USHORT nPos, USHORT nLen = 1 ); }; @@ -120,10 +121,10 @@ public: /* {k:\svx\prototyp\dialog\svx/srchdlg.hxx} - [Beschreibung] - In diesem Modeless-Dialog werden die Attribute einer Suche eingestellt - und damit eine Suche gestartet. Es sind mehrere Sucharten - ( Suchen, Alle suchen, Ersetzen, Alle ersetzen ) m"oglich. + [Description] + In this modeless dialog the attributes for a search are configured + and a search is started from it. Several search types + (search, search all, replace, replace all) are possible. [Items] <SvxSearchItem><SID_ATTR_SEARCH> @@ -160,6 +161,8 @@ public: INT32 GetTransliterationFlags() const; + void SetSaveToModule(bool b); + private: FixedText aSearchText; ComboBox aSearchLB; @@ -218,9 +221,9 @@ private: BOOL bSearch; BOOL bFormat; USHORT nOptions; - FASTBOOL bSet; - FASTBOOL bReadOnly; - FASTBOOL bConstruct; + bool bSet; + bool bReadOnly; + bool bConstruct; ULONG nModifyFlag; String aStylesStr; String aLayoutStr; @@ -300,3 +303,4 @@ inline BOOL SvxSearchDialog::HasReplaceAttributes() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/stddlg.hxx b/svx/inc/svx/stddlg.hxx index 8e24ae54e2..5b6faca80c 100644 --- a/svx/inc/svx/stddlg.hxx +++ b/svx/inc/svx/stddlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ protected: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx index 0a8c4fe7f7..6b5eb42c6d 100644 --- a/svx/inc/svx/strarray.hxx +++ b/svx/inc/svx/strarray.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _RESARY_HXX //autogen #include <tools/resary.hxx> -#endif #include "svx/svxdllapi.h" // class SvxStringArray ------------------------------------------------- @@ -51,3 +50,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/svx/inc/svx/subtoolboxcontrol.hxx index 735e677d4f..eb041e478a 100644 --- a/svx/inc/svx/subtoolboxcontrol.hxx +++ b/svx/inc/svx/subtoolboxcontrol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx index 50cb575ede..d05d4cd1c5 100644 --- a/svx/inc/svx/svdattr.hxx +++ b/svx/inc/svx/svdattr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,25 +43,15 @@ #include <svx/sdshtitm.hxx> #include <svx/sdsxyitm.hxx> #include <svx/sdtaaitm.hxx> -#ifndef _SDTACITM_HXX #include <svx/sdtacitm.hxx> -#endif -#ifndef _SDTACITM_HXX #include <svx/sdtaditm.hxx> -#endif #include <svx/sdtagitm.hxx> #include <svx/sdtaiitm.hxx> #include <svx/sdtaitm.hxx> -#ifndef _SDTAKITM_HXX #include <svx/sdtakitm.hxx> -#endif #include <svx/sdtayitm.hxx> -#ifndef SDTCFITM_HXX #include <svx/sdtcfitm.hxx> -#endif -#ifndef _SDTDITM_HXX #include <svx/sdtditm.hxx> -#endif #include <svx/sdtfsitm.hxx> #include <svx/sdtmfitm.hxx> #include <svx/sdynitm.hxx> @@ -74,3 +65,4 @@ #include <svx/sdasaitm.hxx> #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdattrx.hxx b/svx/inc/svx/svdattrx.hxx index cf1f8e4762..188824c381 100644 --- a/svx/inc/svx/svdattrx.hxx +++ b/svx/inc/svx/svdattrx.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <svx/sxcaitm.hxx> #include <svx/sxcecitm.hxx> -#ifndef _SXCGIITM_HXX #include <svx/sxcgitm.hxx> -#endif #include <svx/sxciaitm.hxx> #include <svx/sxcikitm.hxx> #include <svx/sxcllitm.hxx> @@ -44,13 +43,9 @@ #include <svx/sxelditm.hxx> #include <svx/sxenditm.hxx> -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif -#ifndef _SXLAYITM_HXX #include <svx/sxlayitm.hxx> -#endif #include <svx/sxlogitm.hxx> #include <svx/sxmbritm.hxx> #include <svx/sxmfsitm.hxx> @@ -58,9 +53,7 @@ #include <svx/sxmoitm.hxx> #include <svx/sxmovitm.hxx> -#ifndef _SXMSIITM_HXX #include <svx/sxmsitm.hxx> -#endif #include <svx/sxmspitm.hxx> #include <svx/sxmsuitm.hxx> #include <svx/sxmtaitm.hxx> @@ -83,3 +76,5 @@ #include <svx/sxtraitm.hxx> #endif //_SVDATTRX_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx index ddcfd87707..fac8f2ab78 100644 --- a/svx/inc/svx/svdcrtv.hxx +++ b/svx/inc/svx/svdcrtv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -207,3 +208,4 @@ public: #endif //_SVDCRTV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx index a7215fc763..08902c1980 100644 --- a/svx/inc/svx/svddef.hxx +++ b/svx/inc/svx/svddef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -311,3 +312,4 @@ #endif // _SVDDEF_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx index 0b3c7a52de..c2d4248a6e 100644 --- a/svx/inc/svx/svddrag.hxx +++ b/svx/inc/svx/svddrag.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,11 +70,11 @@ protected: Point aReservePoint4; Rectangle aReserveRect1; Rectangle aReserveRect2; - FASTBOOL bEndDragChangesAttributes; - FASTBOOL bEndDragChangesGeoAndAttributes; - FASTBOOL bMouseIsUp; - FASTBOOL aReserveBool3; - FASTBOOL aReserveBool4; + bool bEndDragChangesAttributes; + bool bEndDragChangesGeoAndAttributes; + bool bMouseIsUp; + bool aReserveBool3; + bool aReserveBool4; long aReserveLong1; long aReserveLong2; long aReserveLong3; @@ -83,21 +84,21 @@ protected: void* aReservePtr3; void* aReservePtr4; - FASTBOOL bShown; // Xor sichrbar? + bool bShown; // Xor sichrbar? USHORT nMinMov; // Soviel muss erstmal minimal bewegt werden - FASTBOOL bMinMoved; // MinMove durchbrochen? + bool bMinMoved; // MinMove durchbrochen? - FASTBOOL bHorFixed; // nur Vertikal draggen - FASTBOOL bVerFixed; // nur Horizontal draggen - FASTBOOL bWantNoSnap; // TRUE=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet + bool bHorFixed; // nur Vertikal draggen + bool bVerFixed; // nur Horizontal draggen + bool bWantNoSnap; // TRUE=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet // werden soll. Entsprechend wird auch NoSnapPos in den Buffer geschrieben. - FASTBOOL bOrtho4; - FASTBOOL bOrtho8; + bool bOrtho4; + bool bOrtho8; SdrDragMethod* pDragMethod; protected: - void Clear(FASTBOOL bLeaveOne); + void Clear(bool bLeaveOne); Point& Pnt(ULONG nNum) { return *((Point*)aPnts.GetObject(nNum)); } //public: SdrDragStatUserData* pUser; // Userdata @@ -129,50 +130,50 @@ public: void SetHdl(SdrHdl* pH) { pHdl=pH; } SdrDragStatUserData* GetUser() const { return pUser; } void SetUser(SdrDragStatUserData* pU) { pUser=pU; } - FASTBOOL IsShown() const { return bShown; } - void SetShown(FASTBOOL bOn) { bShown=bOn; } + bool IsShown() const { return bShown; } + void SetShown(bool bOn) { bShown=bOn; } - FASTBOOL IsMinMoved() const { return bMinMoved; } + bool IsMinMoved() const { return bMinMoved; } void SetMinMoved() { bMinMoved=TRUE; } void ResetMinMoved() { bMinMoved=FALSE; } void SetMinMove(USHORT nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; } USHORT GetMinMove() const { return nMinMov; } - FASTBOOL IsHorFixed() const { return bHorFixed; } - void SetHorFixed(FASTBOOL bOn) { bHorFixed=bOn; } - FASTBOOL IsVerFixed() const { return bVerFixed; } - void SetVerFixed(FASTBOOL bOn) { bVerFixed=bOn; } + bool IsHorFixed() const { return bHorFixed; } + void SetHorFixed(bool bOn) { bHorFixed=bOn; } + bool IsVerFixed() const { return bVerFixed; } + void SetVerFixed(bool bOn) { bVerFixed=bOn; } // Hier kann das Obj sagen: "Ich will keinen Koordinatenfang!" // z.B. fuer den Winkel des Kreisbogen... - FASTBOOL IsNoSnap() const { return bWantNoSnap; } - void SetNoSnap(FASTBOOL bOn=TRUE) { bWantNoSnap=bOn; } + bool IsNoSnap() const { return bWantNoSnap; } + void SetNoSnap(bool bOn = true) { bWantNoSnap=bOn; } // Und hier kann das Obj sagen welches Ortho (wenn ueberhaupt eins) // sinnvoll auf ihm angewendet werden kann. // Ortho4 bedeutet Ortho in 4 Richtungen (fuer Rect und Cirt) - FASTBOOL IsOrtho4Possible() const { return bOrtho4; } - void SetOrtho4Possible(FASTBOOL bOn=TRUE) { bOrtho4=bOn; } + bool IsOrtho4Possible() const { return bOrtho4; } + void SetOrtho4Possible(bool bOn = true) { bOrtho4=bOn; } // Ortho8 bedeutet Ortho in 8 Richtungen (fuer Linien) - FASTBOOL IsOrtho8Possible() const { return bOrtho8; } - void SetOrtho8Possible(FASTBOOL bOn=TRUE) { bOrtho8=bOn; } + bool IsOrtho8Possible() const { return bOrtho8; } + void SetOrtho8Possible(bool bOn = true) { bOrtho8=bOn; } // Wird vom gedraggten Objekt gesetzt - FASTBOOL IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; } - void SetEndDragChangesAttributes(FASTBOOL bOn) { bEndDragChangesAttributes=bOn; } - FASTBOOL IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; } - void SetEndDragChangesGeoAndAttributes(FASTBOOL bOn) { bEndDragChangesGeoAndAttributes=bOn; } + bool IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; } + void SetEndDragChangesAttributes(bool bOn) { bEndDragChangesAttributes=bOn; } + bool IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; } + void SetEndDragChangesGeoAndAttributes(bool bOn) { bEndDragChangesGeoAndAttributes=bOn; } // Wird von der View gesetzt und kann vom Obj ausgewertet werden - FASTBOOL IsMouseDown() const { return !bMouseIsUp; } - void SetMouseDown(FASTBOOL bDown) { bMouseIsUp=!bDown; } + bool IsMouseDown() const { return !bMouseIsUp; } + void SetMouseDown(bool bDown) { bMouseIsUp=!bDown; } Point KorregPos(const Point& rNow, const Point& rPrev) const; void Reset(const Point& rPnt); void NextMove(const Point& rPnt); - void NextPoint(FASTBOOL bSaveReal=FALSE); + void NextPoint(bool bSaveReal=FALSE); void PrevPoint(); - FASTBOOL CheckMinMoved(const Point& rPnt); + bool CheckMinMoved(const Point& rPnt); long GetDX() const { return GetNow().X()-GetPrev().X(); } long GetDY() const { return GetNow().Y()-GetPrev().Y(); } Fraction GetXFact() const; @@ -190,3 +191,4 @@ public: #endif //_SVDDRAG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svddrgmt.hxx b/svx/inc/svx/svddrgmt.hxx index 3511930594..2e5f7ffaf6 100644 --- a/svx/inc/svx/svddrgmt.hxx +++ b/svx/inc/svx/svddrgmt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,7 +52,7 @@ class SdrDragStat; ////////////////////////////////////////////////////////////////////////////// -class SdrDragEntry +class SVX_DLLPUBLIC SdrDragEntry { private: // bitfield @@ -322,3 +323,5 @@ public: #endif //_SVDDRGMT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx index d973c8b878..9b0accba03 100644 --- a/svx/inc/svx/svddrgv.hxx +++ b/svx/inc/svx/svddrgv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -319,3 +320,4 @@ public: #endif //_SVDDRGV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx index 88ea8fc715..55e4b5c601 100644 --- a/svx/inc/svx/svdedtv.hxx +++ b/svx/inc/svx/svdedtv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -459,3 +460,4 @@ public: #endif //_SVDEDTV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx index 1c16f444c3..6f66e12829 100644 --- a/svx/inc/svx/svdedxv.hxx +++ b/svx/inc/svx/svdedxv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -304,3 +305,4 @@ protected: #endif //_SVDEDXV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index 3abbde007a..a5d107c81f 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <tools/string.hxx> #include <tools/contnr.hxx> -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <tools/shl.hxx> #include <editeng/outliner.hxx> #include "svx/svxdllapi.h" @@ -125,7 +124,7 @@ public: class SfxItemSet; // Liefert eine Ersatzdarstellung fuer einen XFillStyle // Bei XFILL_NONE gibt's FALSE und rCol bleibt unveraendert. -SVX_DLLPUBLIC FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); +SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); // Ein Container fuer USHORTs (im Prinzip ein dynamisches Array) class UShortCont { @@ -146,9 +145,7 @@ class ContainerSorter { protected: Container& rCont; private: -//#if 0 // _SOLAR__PRIVATE void ImpSubSort(long nL, long nR) const; -//#endif // __PRIVATE public: ContainerSorter(Container& rNewCont): rCont(rNewCont) {} void DoSort(ULONG a=0, ULONG b=0xFFFFFFFF) const; @@ -163,12 +160,11 @@ private: // damit keiner vergessen wird virtual void Is1stLessThan2nd(const void* pElem1, const void* pElem2) const; -// virtual FASTBOOL Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL; +// virtual bool Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL; }; //////////////////////////////////////////////////////////////////////////////////////////////////// -//#if 0 // _SOLAR__PRIVATE #define SDRHDC_SAVEPEN 1 /* Save Linecolor */ #define SDRHDC_SAVEBRUSH 2 /* Save Fillcolorn */ #define SDRHDC_SAVEFONT 4 /* Save Font */ @@ -186,13 +182,12 @@ class ImpSdrHdcMerk Color* pLineColorMerk; USHORT nMode; public: - ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode=SDRHDC_SAVEALL, FASTBOOL bAutoMerk=TRUE); + ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode=SDRHDC_SAVEALL, bool bAutoMerk = true); ~ImpSdrHdcMerk(); void Save(const OutputDevice& rOut); - FASTBOOL IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } + bool IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } void Restore(OutputDevice& rOut, USHORT nMask=SDRHDC_SAVEALL) const; }; -//#endif // __PRIVATE //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -275,7 +270,7 @@ public: const Link& GetLink(unsigned nNum) const { return *((Link*)(aList.GetObject(nNum))); } void InsertLink(const Link& rLink, unsigned nPos=0xFFFF); void RemoveLink(const Link& rLink); - FASTBOOL HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; } + bool HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; } }; // Fuer die Factory in SvdObj.CXX @@ -354,3 +349,5 @@ SVX_DLLPUBLIC Color GetTextEditBackgroundColor(const SdrObjEditView& rView); ///////////////////////////////////////////////////////////////////// #endif //_SVDETC_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdfield.hxx b/svx/inc/svx/svdfield.hxx index 1673ca172c..bb323a7bb5 100644 --- a/svx/inc/svx/svdfield.hxx +++ b/svx/inc/svx/svdfield.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,3 +35,4 @@ void SVX_DLLPUBLIC SdrRegisterFieldClasses(); #endif //_SVDFIELD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdglev.hxx b/svx/inc/svx/svdglev.hxx index d2613c0ea3..d47f01fc70 100644 --- a/svx/inc/svx/svdglev.hxx +++ b/svx/inc/svx/svdglev.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,4 @@ public: #endif //_SVDGLEV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdglob.hxx b/svx/inc/svx/svdglob.hxx index 396ab1cff5..8aca60b0e0 100644 --- a/svx/inc/svx/svdglob.hxx +++ b/svx/inc/svx/svdglob.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,7 @@ #include <svx/svxdllapi.h> //************************************************************ -// Vorausdeklarationen +// forward declaration //************************************************************ class Link; @@ -48,7 +49,7 @@ class ImpSdrStrCache; // Defines //************************************************************ -// Den zur App passenden Resourcemanager holen +// Get the resource manager for the app ResMgr* ImpGetResMgr(); class SdrResId: ResId { @@ -56,14 +57,15 @@ public: SdrResId(USHORT nId): ResId(nId,*ImpGetResMgr()) {} }; -// ResourceCache fuer haeuffig benoetigte Strings -// gecachet werden globale String-Resourcen mit den -// IDs von SDR_StringCacheBegin (256) bis -// SDR_StringCacheEnd (weiss ich grad' nicht). -// Hierzu siehe auch SvdStr.Hrc +// ResourceCache for frequently used strings. +// Global string resources with the IDs from +// SDR_StringCacheBegin (256) to SDR_StringCacheEnd +// are cached. +// See also SvdStr.Hrc SVX_DLLPUBLIC String ImpGetResStr(sal_uInt16 nResID); //////////////////////////////////////////////////////////////////////////////////////////////////// #endif //_SVDGLOB_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx index 34d2ec3125..6be0640aea 100644 --- a/svx/inc/svx/svdglue.hxx +++ b/svx/inc/svx/svdglue.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,12 +70,12 @@ class SVX_DLLPUBLIC SdrGluePoint { USHORT nEscDir; USHORT nId; USHORT nAlign; - FASTBOOL bNoPercent:1; - FASTBOOL bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - FASTBOOL bUserDefined:1; // #i38892# + sal_uInt8 bNoPercent:1; + sal_uInt8 bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt + sal_uInt8 bUserDefined:1; // #i38892# public: SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=FALSE; bReallyAbsolute=FALSE; bUserDefined=TRUE; } - SdrGluePoint(const Point& rNewPos, FASTBOOL bNewPercent=TRUE, USHORT nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=FALSE; bUserDefined=TRUE; } + SdrGluePoint(const Point& rNewPos, bool bNewPercent=TRUE, USHORT nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=FALSE; bUserDefined=TRUE; } bool operator==(const SdrGluePoint& rCmpGP) const { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; } bool operator!=(const SdrGluePoint& rCmpGP) const { return !operator==(rCmpGP); } const Point& GetPos() const { return aPos; } @@ -83,15 +84,15 @@ public: void SetEscDir(USHORT nNewEsc) { nEscDir=nNewEsc; } USHORT GetId() const { return nId; } void SetId(USHORT nNewId) { nId=nNewId; } - bool IsPercent() const { return !bNoPercent; } - void SetPercent(FASTBOOL bOn) { bNoPercent=!bOn; } + bool IsPercent() const { return bNoPercent ? false : true; } + void SetPercent(bool bOn) { bNoPercent = !bOn; } // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - FASTBOOL IsReallyAbsolute() const { return bReallyAbsolute; } - void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj); + bool IsReallyAbsolute() const { return bReallyAbsolute ? true : false; } + void SetReallyAbsolute(bool bOn, const SdrObject& rObj); // #i38892# - FASTBOOL IsUserDefined() const { return bUserDefined; } - void SetUserDefined(FASTBOOL bNew) { bUserDefined = bNew; } + bool IsUserDefined() const { return bUserDefined ? true : false; } + void SetUserDefined(bool bNew) { bUserDefined = bNew ? true : false; } USHORT GetAlign() const { return nAlign; } void SetAlign(USHORT nAlg) { nAlign=nAlg; } @@ -100,7 +101,7 @@ public: USHORT GetVertAlign() const { return nAlign&0xFF00; } void SetVertAlign(USHORT nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); } void Draw(OutputDevice& rOut, const SdrObject* pObj) const; - FASTBOOL IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; + bool IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; Point GetAbsolutePos(const SdrObject& rObj) const; void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj); @@ -111,7 +112,7 @@ public: void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj); - void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj); + void Shear (const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj); }; #define SDRGLUEPOINT_NOTFOUND 0xFFFF @@ -134,14 +135,14 @@ public: SdrGluePoint& operator[](USHORT nPos) { return *GetObject(nPos); } const SdrGluePoint& operator[](USHORT nPos) const { return *GetObject(nPos); } USHORT FindGluePoint(USHORT nId) const; - USHORT HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack=FALSE, FASTBOOL bNext=FALSE, USHORT nId0=0) const; + USHORT HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack=FALSE, bool bNext = false, USHORT nId0=0) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj); + void SetReallyAbsolute(bool bOn, const SdrObject& rObj); void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj); - void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj); + void Shear (const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj); }; @@ -149,3 +150,4 @@ public: #endif //_SVDGLUE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 777117c925..c25a525acb 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <tools/gen.hxx> -#ifndef _POINTR_HXX //autogen #include <vcl/pointr.hxx> -#endif #include <tools/contnr.hxx> #ifndef _SOLAR_HRC @@ -69,7 +68,7 @@ class MouseEvent; // Modus selektiert wird. // HDL_MOVE...HDL_LWRGT muessen im enum immer zusammen stehen bleiben! -enum SdrHdlKind +enum SdrHdlKind { HDL_MOVE, // Handle zum Verschieben des Objekts HDL_UPLFT, // Oben links @@ -153,7 +152,7 @@ class SVX_DLLPUBLIC SdrHdl friend class SdrHdlList; // #101928# - BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine, sal_Bool bIsHighContrast); + BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine ); protected: SdrObject* pObj; // Gehoert das Handle zu einem Objekt? @@ -176,7 +175,7 @@ protected: unsigned bSelect : 1; // Ein selektierter Polygonpunkt? unsigned b1PixMore : 1; // True=Handle wird 1 Pixel groesser dargestellt unsigned bPlusHdl : 1; // u.a. fuer Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ... - + bool mbMoveOutside; // forces this handle to be moved outside of the selection rectangle // create marker for this kind @@ -190,7 +189,7 @@ private: protected: ::sdr::overlay::OverlayObject* CreateOverlayObject( - const basegfx::B2DPoint& rPos, + const basegfx::B2DPoint& rPos, BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, Point aMoveOutsideOffset = Point()); BitmapMarkerKind GetNextBigger(BitmapMarkerKind eKnd) const; @@ -527,8 +526,9 @@ protected: BitmapEx GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ); - static BitmapEx GetHandlesBitmap( bool bIsFineHdl, bool bIsHighContrast ); + static BitmapEx GetHandlesBitmap( bool bIsFineHdl ); }; #endif //_SVDHDL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx index d1b5896118..c5782d167b 100644 --- a/svx/inc/svx/svdhlpln.hxx +++ b/svx/inc/svx/svdhlpln.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <tools/color.hxx> #include <tools/gen.hxx> -#ifndef _POINTR_HXX //autogen #include <vcl/pointr.hxx> -#endif #include <tools/contnr.hxx> #include "svx/svxdllapi.h" @@ -68,7 +67,7 @@ public: const Point& GetPos() const { return aPos; } Pointer GetPointer() const; - FASTBOOL IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const; + bool IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const; // OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben Rectangle GetBoundRect(const OutputDevice& rOut) const; @@ -105,3 +104,4 @@ public: #endif //_SVDHLPLN_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svditer.hxx b/svx/inc/svx/svditer.hxx index dcae622822..7228516125 100644 --- a/svx/inc/svx/svditer.hxx +++ b/svx/inc/svx/svditer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,9 +38,9 @@ class SdrObject; class SdrMarkList; // SdrObjListIter methods: -// IM_FLAT : Flach ueber die Liste -// IM_DEEPWITHGROUPS : Mit rekursivem Abstieg, Next() liefert auch Gruppenobjekte -// IM_DEEPNOGROUPS : Mit rekursivem Abstieg, Next() liefert keine Gruppenobjekte +// IM_FLAT : Flat over the list +// IM_DEEPWITHGROUPS : With recursive descent parser, Next() also returns group objects +// IM_DEEPNOGROUPS : With recursive descent parser, Next() returns no group objects enum SdrIterMode { IM_FLAT, IM_DEEPWITHGROUPS, IM_DEEPNOGROUPS}; class SVX_DLLPUBLIC SdrObjListIter @@ -79,3 +80,4 @@ public: #endif //_SVDITER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svditext.hxx b/svx/inc/svx/svditext.hxx index 8032e5ad93..a2d3169aeb 100644 --- a/svx/inc/svx/svditext.hxx +++ b/svx/inc/svx/svditext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,3 +36,4 @@ #endif // _SVDITEXT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx index f6edf9f229..a32ca1b8eb 100644 --- a/svx/inc/svx/svdlayer.hxx +++ b/svx/inc/svx/svdlayer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,7 @@ class SdrModel; -class SVX_DLLPUBLIC SdrLayer +class SVX_DLLPUBLIC SdrLayer { friend class SdrLayerAdmin; protected: @@ -69,8 +70,8 @@ public: // Einem SdrLayer kann man sagen dass er ein (der) Standardlayer sein soll. // Es wird dann laenderspeziefisch der passende Name gesetzt. SetName() // setzt das Flag "StandardLayer" ggf. zurueck auf "Userdefined". - void SetStandardLayer(FASTBOOL bStd=TRUE); - FASTBOOL IsStandardLayer() const { return nType==1; } + void SetStandardLayer(bool bStd = true); + bool IsStandardLayer() const { return nType==1; } }; // Beim Aendern von Layerdaten muss man derzeit @@ -124,9 +125,9 @@ public: USHORT GetLayerPos(SdrLayer* pLayer) const; - SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); } - const SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) const; - SdrLayerID GetLayerID(const String& rName, FASTBOOL bInherited) const; + SdrLayer* GetLayer(const String& rName, bool bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); } + const SdrLayer* GetLayer(const String& rName, bool bInherited) const; + SdrLayerID GetLayerID(const String& rName, bool bInherited) const; SdrLayer* GetLayerPerID(USHORT nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); } const SdrLayer* GetLayerPerID(USHORT nID) const; @@ -158,3 +159,4 @@ bInherited: #endif //_SVDLAYER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx index 90e8c286a6..25f7120ef0 100644 --- a/svx/inc/svx/svdmark.hxx +++ b/svx/inc/svx/svdmark.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -410,3 +411,5 @@ namespace sdr #endif //_SVDMARK_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index a80908756f..7d6d9a4697 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,7 +52,7 @@ class OutputDevice; #include <vcl/field.hxx> #include "svx/svxdllapi.h" -#include <vos/ref.hxx> +#include <rtl/ref.hxx> #if defined(UNX) || defined(WNT) #define DEGREE_CHAR ((sal_Unicode)176) /* 0xB0 = Ansi */ @@ -167,11 +168,11 @@ public: // Flag um nach dem Laden des Pools Aufzuraeumen (d.h. die RefCounts // neu zu bestimmen und unbenutztes wegzuwerfen). FALSE == aktiv -#define LOADREFCOUNTS (FALSE) +#define LOADREFCOUNTS (false) struct SdrDocumentStreamInfo { - FASTBOOL mbDeleteAfterUse; + bool mbDeleteAfterUse; String maUserData; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorageRef; BOOL mbDummy1 : 1; @@ -196,12 +197,12 @@ protected: String aUIUnitStr; // see above Fraction aUIUnitFact; // see above int nUIUnitKomma; // see above - FASTBOOL bUIOnlyKomma; // see above + bool bUIOnlyKomma; // see above SdrLayerAdmin* pLayerAdmin; SfxItemPool* pItemPool; - FASTBOOL bMyPool; // zum Aufraeumen von pMyPool ab 303a - comphelper::IEmbeddedHelper* + bool bMyPool; // zum Aufraeumen von pMyPool ab 303a + comphelper::IEmbeddedHelper* m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell SdrOutliner* pDrawOutliner; // ein Outliner zur Textausgabe SdrOutliner* pHitTestOutliner;// ein Outliner fuer den HitTest @@ -220,25 +221,25 @@ protected: bool mbUndoEnabled; // If false no undo is recorded or we are during the execution of an undo action USHORT nProgressPercent; // fuer den ProgressBar-Handler USHORT nLoadVersion; // Versionsnummer der geladenen Datei - FASTBOOL bExtColorTable; // Keinen eigenen ColorTable + bool bExtColorTable; // Keinen eigenen ColorTable sal_Bool mbChanged; - FASTBOOL bInfoChanged; - FASTBOOL bPagNumsDirty; - FASTBOOL bMPgNumsDirty; - FASTBOOL bPageNotValid; // TRUE=Doc ist nur ObjektTraeger. Page ist nicht gueltig. - FASTBOOL bSavePortable; // Metafiles portabel speichern - FASTBOOL bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen - FASTBOOL bReadOnly; - FASTBOOL bTransparentTextFrames; - FASTBOOL bSaveCompressed; - FASTBOOL bSwapGraphics; - FASTBOOL bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode - FASTBOOL bSaveOLEPreview; // save preview metafile of OLE objects + bool bInfoChanged; + bool bPagNumsDirty; + bool bMPgNumsDirty; + bool bPageNotValid; // TRUE=Doc ist nur ObjektTraeger. Page ist nicht gueltig. + bool bSavePortable; // Metafiles portabel speichern + bool bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen + bool bReadOnly; + bool bTransparentTextFrames; + bool bSaveCompressed; + bool bSwapGraphics; + bool bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode + bool bSaveOLEPreview; // save preview metafile of OLE objects UINT16 nStreamCompressMode; // Komprimiert schreiben? UINT16 nStreamNumberFormat; UINT16 nDefaultTabulator; UINT32 nMaxUndoCount; - FASTBOOL bSaveNative; + bool bSaveNative; BOOL bStarDrawPreviewMode; @@ -279,10 +280,10 @@ public: UINT16 mnHandoutPageCount; UINT16 nReserveUInt6; UINT16 nReserveUInt7; - FASTBOOL mbModelLocked; - FASTBOOL mbKernAsianPunctuation; - FASTBOOL mbAddExtLeading; - FASTBOOL mbInDestruction; + bool mbModelLocked; + bool mbKernAsianPunctuation; + bool mbAddExtLeading; + bool mbInDestruction; // Zeiger auf Paletten, Listen und Tabellen XColorTable* pColorTable; @@ -310,8 +311,7 @@ private: // Nicht implementiert: SVX_DLLPRIVATE SdrModel(const SdrModel& rSrcModel); SVX_DLLPRIVATE void operator=(const SdrModel& rSrcModel); - SVX_DLLPRIVATE FASTBOOL operator==(const SdrModel& rCmpModel) const; -//#if 0 // _SOLAR__PRIVATE + SVX_DLLPRIVATE bool operator==(const SdrModel& rCmpModel) const; SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo); SVX_DLLPRIVATE void ImpSetUIUnit(); SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit = FALSE ); @@ -321,16 +321,13 @@ private: SVX_DLLPRIVATE void ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts = true); -//#endif // __PRIVATE // this is a weak reference to a possible living api wrapper for this model ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoModel; public: -//#if 0 // _SOLAR__PRIVATE - FASTBOOL IsPasteResize() const { return bPasteResize; } - void SetPasteResize(FASTBOOL bOn) { bPasteResize=bOn; } -//#endif // __PRIVATE + bool IsPasteResize() const { return bPasteResize; } + void SetPasteResize(bool bOn) { bPasteResize=bOn; } TYPEINFO(); // Steckt man hier seinen eigenen Pool rein, so wird die Klasse auch // Aktionen an ihm vornehmen (Put(),Remove()). Bei Zerstoerung von @@ -345,13 +342,13 @@ public: // Wahl des Pools. SdrModel(SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS); SdrModel(const String& rPath, SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS); - SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); - SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); + SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); + SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); virtual ~SdrModel(); void ClearModel(sal_Bool bCalledFromDestructor); // Hier kann man erfragen, ob das Model gerade eingrstreamt wird - FASTBOOL IsLoading() const { return sal_False /*BFS01 bLoading */; } + bool IsLoading() const { return sal_False /*BFS01 bLoading */; } // Muss z.B. ueberladen werden, um das Swappen/LoadOnDemand von Grafiken // zu ermoeglichen. Wird rbDeleteAfterUse auf TRUE gesetzt, so wird // die SvStream-Instanz vom Aufrufer nach Gebrauch destruiert. @@ -364,7 +361,7 @@ public: void BurnInStyleSheetAttributes(); // Wer sich von SdrPage ableitet muss sich auch von SdrModel ableiten // und diese beiden VM AllocPage() und AllocModel() ueberladen... - virtual SdrPage* AllocPage(FASTBOOL bMasterPage); + virtual SdrPage* AllocPage(bool bMasterPage); virtual SdrModel* AllocModel() const; // Aenderungen an den Layern setzen das Modified-Flag und broadcasten am Model! @@ -449,17 +446,17 @@ public: const Fraction& GetUIUnitFact() const { return aUIUnitFact; } const String& GetUIUnitStr() const { return aUIUnitStr; } int GetUIUnitKomma() const { return nUIUnitKomma; } - FASTBOOL IsUIOnlyKomma() const { return bUIOnlyKomma; } + bool IsUIOnlyKomma() const { return bUIOnlyKomma; } static void TakeUnitStr(FieldUnit eUnit, String& rStr); - void TakeMetricStr(long nVal, String& rStr, FASTBOOL bNoUnitChars=FALSE, sal_Int32 nNumDigits = -1) const; - void TakeWinkStr(long nWink, String& rStr, FASTBOOL bNoDegChar=FALSE) const; - void TakePercentStr(const Fraction& rVal, String& rStr, FASTBOOL bNoPercentChar=FALSE) const; + void TakeMetricStr(long nVal, String& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const; + void TakeWinkStr(long nWink, String& rStr, bool bNoDegChar = false) const; + void TakePercentStr(const Fraction& rVal, String& rStr, bool bNoPercentChar = false) const; // RecalcPageNums wird idR. nur von der Page gerufen. - FASTBOOL IsPagNumsDirty() const { return bPagNumsDirty; }; - FASTBOOL IsMPgNumsDirty() const { return bMPgNumsDirty; }; - void RecalcPageNums(FASTBOOL bMaster); + bool IsPagNumsDirty() const { return bPagNumsDirty; }; + bool IsMPgNumsDirty() const { return bMPgNumsDirty; }; + void RecalcPageNums(bool bMaster); // Nach dem Insert gehoert die Page dem SdrModel. virtual void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF); virtual void DeletePage(USHORT nPgNum); @@ -493,28 +490,28 @@ public: // PageNotValid bedeutet, dass das Model lediglich Objekte traegt die zwar // auf einer Page verankert sind, die Page aber nicht gueltig ist. Diese // Kennzeichnung wird fuers Clipboard/Drag&Drop benoetigt. - FASTBOOL IsPageNotValid() const { return bPageNotValid; } - void SetPageNotValid(FASTBOOL bJa=TRUE) { bPageNotValid=bJa; } + bool IsPageNotValid() const { return bPageNotValid; } + void SetPageNotValid(bool bJa = true) { bPageNotValid=bJa; } // Schaltet man dieses Flag auf TRUE, so werden Grafikobjekte // portabel gespeichert. Es findet dann beim Speichern ggf. // eine implizite Wandlung von Metafiles statt. // Default=FALSE. Flag ist nicht persistent. - FASTBOOL IsSavePortable() const { return bSavePortable; } - void SetSavePortable(FASTBOOL bJa=TRUE) { bSavePortable=bJa; } + bool IsSavePortable() const { return bSavePortable; } + void SetSavePortable(bool bJa = true) { bSavePortable=bJa; } // Schaltet man dieses Flag auf TRUE, so werden // Pixelobjekte (stark) komprimiert gespeichert. // Default=FALSE. Flag ist nicht persistent. - FASTBOOL IsSaveCompressed() const { return bSaveCompressed; } - void SetSaveCompressed(FASTBOOL bJa=TRUE) { bSaveCompressed=bJa; } + bool IsSaveCompressed() const { return bSaveCompressed; } + void SetSaveCompressed(bool bJa = true) { bSaveCompressed=bJa; } // Schaltet man dieses Flag auf TRUE, so werden // Grafikobjekte mit gesetztem Native-Link // native gespeichert. // Default=FALSE. Flag ist nicht persistent. - FASTBOOL IsSaveNative() const { return bSaveNative; } - void SetSaveNative(FASTBOOL bJa=TRUE) { bSaveNative=bJa; } + bool IsSaveNative() const { return bSaveNative; } + void SetSaveNative(bool bJa = true) { bSaveNative=bJa; } // Schaltet man dieses Flag auf TRUE, so werden die Grafiken // von Grafikobjekten: @@ -525,13 +522,13 @@ public: // Damit das funktioniert, muss die virtuelle Methode // GetDocumentStream() ueberladen werden. // Default=FALSE. Flag ist nicht persistent. - FASTBOOL IsSwapGraphics() const { return bSwapGraphics; } - void SetSwapGraphics(FASTBOOL bJa=TRUE); + bool IsSwapGraphics() const { return bSwapGraphics; } + void SetSwapGraphics(bool bJa = true); void SetSwapGraphicsMode(ULONG nMode) { nSwapGraphicsMode = nMode; } ULONG GetSwapGraphicsMode() const { return nSwapGraphicsMode; } - FASTBOOL IsSaveOLEPreview() const { return bSaveOLEPreview; } - void SetSaveOLEPreview( FASTBOOL bSet) { bSaveOLEPreview = bSet; } + bool IsSaveOLEPreview() const { return bSaveOLEPreview; } + void SetSaveOLEPreview( bool bSet) { bSaveOLEPreview = bSet; } // Damit die Bildschirmausgabe von Bitmaps (insbesondere bei gedrehten) // etwas schneller wird, werden sie gecachet. Diesen Cache kann man mit @@ -540,14 +537,14 @@ public: // in's Undo, so wird der Cache fuer dieses Objekt sofort ausgeschaltet // (Speicher sparen). // Default=Cache eingeschaltet. Flag ist nicht persistent. - FASTBOOL IsBitmapCaching() const { return !bNoBitmapCaching; } - void SetBitmapCaching(FASTBOOL bJa=TRUE) { bNoBitmapCaching=!bJa; } + bool IsBitmapCaching() const { return !bNoBitmapCaching; } + void SetBitmapCaching(bool bJa = true) { bNoBitmapCaching=!bJa; } // Defaultmaessig (FALSE) kann man Textrahmen ohne Fuellung durch // Mausklick selektieren. Nach Aktivierung dieses Flags trifft man sie // nur noch in dem Bereich, wo sich auch tatsaechlich Text befindet. - FASTBOOL IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; } - void SetPickThroughTransparentTextFrames(FASTBOOL bOn) { bTransparentTextFrames=bOn; } + bool IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; } + void SetPickThroughTransparentTextFrames(bool bOn) { bTransparentTextFrames=bOn; } // Darf denn das Model ueberhaupt veraendert werden? // Wird nur von den Possibility-Methoden der View ausgewerdet. @@ -555,8 +552,8 @@ public: // Sollte ueberladen werden und entsprechend des ReadOnly-Status des Files // TRUE oder FALSE liefern (Methode wird oeffters gerufen, also ein Flag // verwenden!). - virtual FASTBOOL IsReadOnly() const; - virtual void SetReadOnly(FASTBOOL bYes); + virtual bool IsReadOnly() const; + virtual void SetReadOnly(bool bYes); // Vermischen zweier SdrModel. Zu beachten sei, dass rSourceModel nicht // const ist. Die Pages werden beim einfuegen nicht kopiert, sondern gemoved. @@ -576,13 +573,13 @@ public: virtual void Merge(SdrModel& rSourceModel, USHORT nFirstPageNum=0, USHORT nLastPageNum=0xFFFF, USHORT nDestPos=0xFFFF, - FASTBOOL bMergeMasterPages=FALSE, FASTBOOL bAllMasterPages=FALSE, - FASTBOOL bUndo=TRUE, FASTBOOL bTreadSourceAsConst=FALSE); + bool bMergeMasterPages = false, bool bAllMasterPages = false, + bool bUndo = true, bool bTreadSourceAsConst = false); // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,FALSE,FALSE,bUndo,!bMoveNoCopy); void CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, USHORT nDestPos, - FASTBOOL bUndo=TRUE, FASTBOOL bMoveNoCopy=FALSE); + bool bUndo = true, bool bMoveNoCopy = false); // Mit BegUndo() / EndUndo() ist es moeglich beliebig viele UndoActions // beliebig tief zu klammern. Als Kommentar der @@ -617,13 +614,13 @@ public: ULONG GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; } const SfxUndoAction* GetRedoAction(ULONG nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); } - FASTBOOL Undo(); - FASTBOOL Redo(); - FASTBOOL Repeat(SfxRepeatTarget&); + bool Undo(); + bool Redo(); + bool Repeat(SfxRepeatTarget&); // Hier kann die Applikation einen Handler setzen, der die auflaufenden // UndoActions einsammelt. Der Handler hat folgendes Aussehen: - // void __EXPORT NotifyUndoActionHdl(SfxUndoAction* pUndoAction); + // void NotifyUndoActionHdl(SfxUndoAction* pUndoAction); // Beim Aufruf des Handlers findet eine Eigentumsuebereignung statt; die // UndoAction gehoert somit dem Handler, nicht mehr dem SdrModel. void SetNotifyUndoActionHdl(const Link& rLink) { aUndoLink=rLink; } @@ -645,7 +642,7 @@ public: // Hier kann man einen Handler setzen der beim Streamen mehrfach gerufen // wird und ungefaehre Auskunft ueber den Fortschreitungszustand der // Funktion gibt. Der Handler muss folgendes Aussehen haben: - // void __EXPORT class::IOProgressHdl(const USHORT& nPercent); + // void class::IOProgressHdl(const USHORT& nPercent); // Der erste Aufruf des Handlers erfolgt grundsaetzlich mit 0, der letzte // mit 100. Dazwischen erfolgen maximal 99 Aufrufe mit Werten 1...99. // Man kann also durchaus bei 0 den Progressbar Initiallisieren und bei @@ -681,7 +678,7 @@ public: // Methode TRUE, andernfalls FALSE. // Dieser Check steht nur zur Verfuegung, wenn die Engine mit DBG_UTIL // uebersetzt wurde. Andernfalls liefert die Methode immer TRUE. (ni) - FASTBOOL CheckConsistence() const; + bool CheckConsistence() const; void SetStarDrawPreviewMode(BOOL bPreview); BOOL IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } @@ -694,11 +691,11 @@ public: // these functions are used by the api to disable repaints during a // set of api calls. - BOOL isLocked() const { return (BOOL)mbModelLocked; } - void setLock( BOOL bLock ); + bool isLocked() const { return mbModelLocked; } + void setLock( bool bLock ); - void SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars ); - vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; + void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); + rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; void SetCharCompressType( UINT16 nType ); UINT16 GetCharCompressType() const { return mnCharCompressType; } @@ -711,7 +708,7 @@ public: void ReformatAllTextObjects(); - FASTBOOL HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const; + bool HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const; SdrOutliner* createOutliner( USHORT nOutlinerMode ); void disposeOutliner( SdrOutliner* pOutliner ); @@ -769,3 +766,4 @@ Die Klasse SdrModel ist der Kopf des Datenmodells der StarView Drawing-Engine. ///////////////////////////////////////////////////////////////////////////////////////////////// */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx index f961177bfd..896a239e76 100644 --- a/svx/inc/svx/svdmrkv.hxx +++ b/svx/inc/svx/svdmrkv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -537,3 +538,4 @@ public: #endif //_SVDMRKV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx index 572212c2fb..239f345909 100644 --- a/svx/inc/svx/svdoashp.hxx +++ b/svx/inc/svx/svdoashp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -124,7 +125,7 @@ public: void ImpCheckCustomGluePointsAreAdded(); // returns the new text rect that corresponds to the current logic rect, the return value can be empty if nothing changed. - Rectangle ImpCalculateTextFrame( const FASTBOOL bHgt, const FASTBOOL bWdt ); + Rectangle ImpCalculateTextFrame( const bool bHgt, const bool bWdt ); public: // #i37011# @@ -187,7 +188,7 @@ public: virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void SetSnapRect(const Rectangle& rRect); virtual void SetLogicRect(const Rectangle& rRect); @@ -195,7 +196,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcSetLogicRect(const Rectangle& rRect); @@ -208,21 +209,21 @@ public: virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual FASTBOOL BegCreate( SdrDragStat& rStat ); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); // #i37448# - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BegCreate( SdrDragStat& rStat ); + virtual bool MovCreate(SdrDragStat& rStat); // #i37448# + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const; - virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE); - virtual FASTBOOL IsAutoGrowHeight() const; - virtual FASTBOOL IsAutoGrowWidth() const; + virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; + virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); + virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); + virtual bool IsAutoGrowHeight() const; + virtual bool IsAutoGrowWidth() const; virtual void SetVerticalWriting( sal_Bool bVertical ); virtual sal_Bool BegTextEdit( SdrOutliner& rOutl ); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit( SdrOutliner& rOutl ); virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; virtual void operator=(const SdrObject& rObj); @@ -263,3 +264,4 @@ public: #endif //_SVDOASHP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx index 4ca52d79e8..63899a2ae9 100644 --- a/svx/inc/svx/svdoattr.hxx +++ b/svx/inc/svx/svdoattr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,4 @@ public: #endif //_SVDOATTR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index ae3bea80b4..8dd6551c3a 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -183,7 +184,7 @@ public: const SetOfByte* pVisiLayer; const SdrPageView* pPageView; USHORT nTol; - FASTBOOL bDown; + bool bDown; public: SdrObjMacroHitRec() @@ -236,11 +237,11 @@ public: UINT32 GetInventor() const { return nInventor; } UINT16 GetId() const { return nIdentifier; } - virtual FASTBOOL HasMacro (const SdrObject* pObj) const; + virtual bool HasMacro (const SdrObject* pObj) const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; - virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); + virtual bool DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; }; @@ -522,8 +523,8 @@ protected: void ImpForcePlusData() { if (pPlusData==NULL) pPlusData=NewPlusData(); } - String GetWinkStr(long nWink, FASTBOOL bNoDegChar=FALSE) const; - String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, FASTBOOL bNoUnitChars=FALSE) const; + String GetWinkStr(long nWink, bool bNoDegChar = false) const; + String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const; // bNotMyself=TRUE bedeutet: Nur die ObjList auf Dirty setzen, nicht mich. // Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect @@ -596,7 +597,7 @@ public: // Ein solcher Referenzpunkt ist z.B. der Punkt eines Symbols, der // der beim Einfuegen des Symbols auf das Raster gefangen werden soll // oder der Fixpunkt eines Bildes innerhalb eines Animationsobjektes. - virtual FASTBOOL HasRefPoint() const; + virtual bool HasRefPoint() const; virtual Point GetRefPoint() const; virtual void SetRefPoint(const Point& rPnt); @@ -757,10 +758,10 @@ public: // BckCreate() -> Letztes EndCreate() rueckgaengig machen (z.B. letzten // Polygonpunkt wieder loeschen). // RetrunCode: TRUE=Weiter gehts, FALSE=Create dadurch abgebrochen. - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); // damit holt man sich den Pointer, der das Createn dieses Objekts symbolisiert @@ -778,13 +779,13 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear); virtual void Move (const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void Shear (const Point& rRef, long nWink, double tn, bool bVShear); // Die relative Position eines Zeichenobjektes ist die Entfernung der // linken oberen Eche des logisch umschliessenden Rechtecks (SnapRect) @@ -821,7 +822,7 @@ public: // Drehwinkel und Shear virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const; + virtual long GetShearAngle(bool bVertical = false) const; // Zum Fangen von/auf ausgezeichneten Punkten eines Obj (Polygonpunkte, // Kreismittelpunkt, ...) @@ -864,7 +865,7 @@ public: void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems = sal_False); // NotPersistAttr fuer Layer, ObjName, geometrische Transformationen, ... - void TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const; + void TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const; void ApplyNotPersistAttr(const SfxItemSet& rAttr); void NbcApplyNotPersistAttr(const SfxItemSet& rAttr); @@ -875,7 +876,7 @@ public: SfxStyleSheet* GetStyleSheet() const; // TextEdit - virtual FASTBOOL HasTextEdit() const; + virtual bool HasTextEdit() const; // Return==TRUE: TextEditMode gestartet virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); @@ -892,11 +893,11 @@ public: void BurnInStyleSheetAttributes(); // Macrofaehigkeit, z.B. ein Rechteck als PushButton. - virtual FASTBOOL HasMacro() const; + virtual bool HasMacro() const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; - virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec); + virtual bool DoMacro (const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; sal_Bool IsMacroHit(const SdrObjMacroHitRec& rRec) const { return CheckMacroHit(rRec)!=NULL; } @@ -917,7 +918,7 @@ public: // Beim Verschieben/Resizen der Kante wird dagegen die Verbindung // geloesst. // Objekt ist ein Knoten? - virtual FASTBOOL IsNode() const; + virtual bool IsNode() const; // Automatische Klebepunkte: // je 4 Scheitelpunkt- und Eckpositionen muss ein Knotenobjekt liefern @@ -935,19 +936,19 @@ public: virtual SdrGluePointList* ForceGluePointList(); // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - void SetGlueReallyAbsolute(FASTBOOL bOn); + void SetGlueReallyAbsolute(bool bOn); void NbcRotateGluePoints(const Point& rRef, long nWink, double sn, double cs); void NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2); - void NbcShearGluePoints (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + void NbcShearGluePoints (const Point& rRef, long nWink, double tn, bool bVShear); // Objekt ist eine Kante? - virtual FASTBOOL IsEdge() const; + virtual bool IsEdge() const; // bTail1=TRUE: Linienanfang, sonst LinienEnde // pObj=NULL: Disconnect - virtual void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj); - virtual void DisconnectFromNode(FASTBOOL bTail1); - virtual SdrObject* GetConnectedNode(FASTBOOL bTail1) const; + virtual void ConnectToNode(bool bTail1, SdrObject* pObj); + virtual void DisconnectFromNode(bool bTail1); + virtual SdrObject* GetConnectedNode(bool bTail1) const; /** sets the writing mode of the object's context @@ -1184,3 +1185,4 @@ typedef tools::WeakReference< SdrObject > SdrObjectWeakRef; #endif //_SVDOBJ_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx index dd1e33c1ec..4a6ae09b98 100644 --- a/svx/inc/svx/svdocapt.hxx +++ b/svx/inc/svx/svdocapt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -118,10 +119,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -169,3 +170,4 @@ public: #endif //_SVDOCAPT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx index c7ff437385..0d692db288 100644 --- a/svx/inc/svx/svdocirc.hxx +++ b/svx/inc/svx/svdocirc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,7 +83,7 @@ private: SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // Werte in den Pool kopieren // Liefert TRUE, wenn das Painten ein XPolygon erfordert. - SVX_DLLPRIVATE FASTBOOL PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc + SVX_DLLPRIVATE bool PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc SVX_DLLPRIVATE virtual void RecalcXPoly(); protected: @@ -126,17 +127,17 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; virtual void NbcMove(const Size& aSiz); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear); virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; protected: @@ -151,3 +152,4 @@ public: #endif //_SVDOCIRC_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx index 57ad25b0bf..9ebd7028fb 100644 --- a/svx/inc/svx/svdoedge.hxx +++ b/svx/inc/svx/svdoedge.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,7 +74,7 @@ public: SVX_DLLPUBLIC ~SdrObjConnection(); void ResetVars(); - FASTBOOL TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsolutePos) const; + bool TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsolutePos) const; inline void SetBestConnection( BOOL rB ) { bBestConn = rB; }; inline void SetBestVertex( BOOL rB ) { bBestVertex = rB; }; @@ -126,7 +127,7 @@ public: Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode); const Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) const { return ((SdrEdgeInfoRec*)this)->ImpGetLineVersatzPoint(eLineCode); } USHORT ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; - FASTBOOL ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; + bool ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal); long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; }; @@ -208,10 +209,10 @@ protected: XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1, const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2, ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const; - static FASTBOOL ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL); + static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL); USHORT ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const; - FASTBOOL ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte - void ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt); + bool ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte + void ImpSetTailPoint(bool bTail1, const Point& rPt); void ImpUndirtyEdgeTrack(); // eventuelle Neuberechnung des Verbindungsverlaufs void ImpDirtyEdgeTrack(); // invalidate connector path, so it will be recalculated next time void ImpSetAttrToEdgeInfo(); // Werte vom Pool nach aEdgeInfo kopieren @@ -223,26 +224,26 @@ public: SdrEdgeObj(); virtual ~SdrEdgeObj(); - SdrObjConnection& GetConnection(FASTBOOL bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } + SdrObjConnection& GetConnection(bool bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual UINT16 GetObjIdentifier() const; virtual const Rectangle& GetCurrentBoundRect() const; virtual const Rectangle& GetSnapRect() const; - virtual FASTBOOL IsNode() const; + virtual bool IsNode() const; virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const; virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const; virtual const SdrGluePointList* GetGluePointList() const; virtual SdrGluePointList* ForceGluePointList(); - virtual FASTBOOL IsEdge() const; + virtual bool IsEdge() const; // bTail1=TRUE: Linienanfang, sonst LinienEnde // pObj=NULL: Disconnect void SetEdgeTrackDirty() { bEdgeTrackDirty=TRUE; } - void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj); - void DisconnectFromNode(FASTBOOL bTail1); - SdrObject* GetConnectedNode(FASTBOOL bTail1) const; - const SdrObjConnection& GetConnection(FASTBOOL bTail1) const { return *(bTail1 ? &aCon1 : &aCon2); } - FASTBOOL CheckNodeConnection(FASTBOOL bTail1) const; + void ConnectToNode(bool bTail1, SdrObject* pObj); + void DisconnectFromNode(bool bTail1); + SdrObject* GetConnectedNode(bool bTail1) const; + const SdrObjConnection& GetConnection(bool bTail1) const { return *(bTail1 ? &aCon1 : &aCon2); } + bool CheckNodeConnection(bool bTail1) const; virtual void RecalcSnapRect(); virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; @@ -273,10 +274,10 @@ public: // #102344# Added missing implementation virtual void NbcSetAnchorPos(const Point& rPnt); - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -434,3 +435,4 @@ public: #endif //_SVDOEDGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index e18e879b2d..de77d5a6d1 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -188,14 +189,14 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear); virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcSetLogicRect(const Rectangle& rRect); virtual SdrObjGeoData* NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); - FASTBOOL HasGDIMetaFile() const; + bool HasGDIMetaFile() const; const GDIMetaFile* GetGDIMetaFile() const; virtual void SetPage(SdrPage* pNewPage); @@ -226,3 +227,4 @@ public: #endif //_SVDOGRAF_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx index bd99b55d86..1f3a6046a3 100644 --- a/svx/inc/svx/svdogrp.hxx +++ b/svx/inc/svx/svdogrp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,7 +57,7 @@ protected: long nShearWink; Point aRefPoint; // Referenzpunkt innerhalb der Objektgruppe - FASTBOOL bRefPoint; // Ist ein RefPoint gesetzt? + bool bRefPoint; // Ist ein RefPoint gesetzt? public: TYPEINFO(); @@ -71,7 +72,7 @@ public: virtual void SetObjList(SdrObjList* pNewObjList); virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); - virtual FASTBOOL HasRefPoint() const; + virtual bool HasRefPoint() const; virtual Point GetRefPoint() const; virtual void SetRefPoint(const Point& rPnt); virtual SdrObjList* GetSubList() const; @@ -90,16 +91,16 @@ public: // special drag methods virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const; + virtual long GetShearAngle(bool bVertical = false) const; virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void SetAnchorPos(const Point& rPnt); virtual void SetRelativePos(const Point& rPnt); virtual void SetSnapRect(const Rectangle& rRect); @@ -109,7 +110,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void NbcSetAnchorPos(const Point& rPnt); virtual void NbcSetRelativePos(const Point& rPnt); virtual void NbcSetSnapRect(const Rectangle& rRect); @@ -123,3 +124,4 @@ public: #endif //_SVDOGRP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx index f46c6147a8..ddab8e37a1 100644 --- a/svx/inc/svx/svdomeas.hxx +++ b/svx/inc/svx/svdomeas.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,7 +78,7 @@ protected: Point aPt1; Point aPt2; - FASTBOOL bTextDirty; + bool bTextDirty; protected: void ImpTakeAttr(ImpMeasureRec& rRec) const; @@ -116,10 +117,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -128,7 +129,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual long GetRotateAngle() const; virtual void RecalcSnapRect(); @@ -144,7 +145,7 @@ public: virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual const Size& GetTextSize() const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; @@ -152,8 +153,8 @@ public: virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); virtual OutlinerParaObject* GetOutlinerParaObject() const; - virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, - FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; + virtual bool CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, + bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; // #i97878# virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; @@ -215,3 +216,4 @@ public: #endif //_SVDOMEAS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx index 914100f1f4..cccd7e308c 100644 --- a/svx/inc/svx/svdomedia.hxx +++ b/svx/inc/svx/svdomedia.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,7 +54,7 @@ public: virtual ~SdrMediaObj(); - virtual FASTBOOL HasTextEdit() const; + virtual bool HasTextEdit() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual UINT16 GetObjIdentifier() const; @@ -91,3 +92,5 @@ private: }; #endif //_SVDOMEDIA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx index 9312adde08..3f3cf3b911 100644 --- a/svx/inc/svx/svdoole2.hxx +++ b/svx/inc/svx/svdoole2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,10 +86,10 @@ protected: public: TYPEINFO(); - SdrOle2Obj(FASTBOOL bFrame_=FALSE); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_=FALSE); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, FASTBOOL bFrame_=FALSE); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_=FALSE); + SdrOle2Obj(bool bFrame_ = false); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, bool bFrame_ = false); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, bool bFrame_ = false); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, bool bFrame_ = false); virtual ~SdrOle2Obj(); // access to svt::EmbeddedObjectRef @@ -117,7 +118,7 @@ public: // spaeter wieder abfragen kann (SD braucht das fuer Praesentationsobjekte). void SetProgName(const String& rNam) { aProgName=rNam; } const String& GetProgName() const { return aProgName; } - FASTBOOL IsEmpty() const; + bool IsEmpty() const; void SetObjRef(const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rNewObjRef); com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObjRef() const; @@ -188,3 +189,4 @@ public: #endif //_SVDOOLE2_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdopage.hxx b/svx/inc/svx/svdopage.hxx index 5b8d2661f7..789251ccb2 100644 --- a/svx/inc/svx/svdopage.hxx +++ b/svx/inc/svx/svdopage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,4 @@ public: #endif //_SVDOPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx index 471f5208f6..3327719875 100644 --- a/svx/inc/svx/svdopath.hxx +++ b/svx/inc/svx/svdopath.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,10 +116,10 @@ public: virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; Pointer GetCreatePointer() const; @@ -131,7 +132,7 @@ public: virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact); virtual void NbcRotate(const Point& rRefPnt, long nAngle, double fSin, double fCos); virtual void NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2); - virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, bool bVShear); virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; @@ -193,3 +194,4 @@ public: #endif //_SVDOPATH_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx index b817b8e98f..354afb7552 100644 --- a/svx/inc/svx/svdorect.hxx +++ b/svx/inc/svx/svdorect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,7 +64,7 @@ protected: protected: // Liefert TRUE, wenn das Painten ein Polygon erfordert. - FASTBOOL PaintNeedsXPoly(long nEckRad) const; + bool PaintNeedsXPoly(long nEckRad) const; protected: XPolygon ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const; @@ -120,9 +121,9 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual FASTBOOL DoMacro(const SdrObjMacroHitRec& rRec); + virtual bool DoMacro(const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const; @@ -135,3 +136,4 @@ public: #endif //_SVDORECT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx index 5a84101265..9c67f4e872 100644 --- a/svx/inc/svx/svdotable.hxx +++ b/svx/inc/svx/svdotable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -201,19 +202,19 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, ::Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; + virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; - virtual FASTBOOL IsAutoGrowHeight() const; + virtual bool IsAutoGrowHeight() const; long GetMinTextFrameHeight() const; long GetMaxTextFrameHeight() const; - virtual FASTBOOL IsAutoGrowWidth() const; + virtual bool IsAutoGrowWidth() const; long GetMinTextFrameWidth() const; long GetMaxTextFrameWidth() const; - virtual FASTBOOL IsFontwork() const; + virtual bool IsFontwork() const; virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); @@ -221,8 +222,8 @@ public: virtual UINT16 GetObjIdentifier() const; virtual void SetChanged(); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const; - virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE); + virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; + virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; virtual void operator=(const SdrObject& rObj); @@ -250,10 +251,10 @@ public: virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -340,3 +341,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx index 0592401aaa..967a7ddcc9 100644 --- a/svx/inc/svx/svdotext.hxx +++ b/svx/inc/svx/svdotext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,6 +60,7 @@ namespace drawinglayer { namespace primitive2d { class SdrContourTextPrimitive2D; class SdrPathTextPrimitive2D; class SdrBlockTextPrimitive2D; + class SdrAutoFitTextPrimitive2D; class SdrStretchTextPrimitive2D; }} @@ -254,6 +256,9 @@ protected: // Flag for allowing text animation. Default is sal_true. BOOL mbTextAnimationAllowed : 1; + // flag for preventing recursive onEditOutlinerStatusEvent calls + BOOL mbInDownScale : 1; + SdrOutliner& ImpGetDrawOutliner() const; private: @@ -261,12 +266,14 @@ private: // #101029#: Extracted from ImpGetDrawOutliner() SVX_DLLPRIVATE void ImpInitDrawOutliner( SdrOutliner& rOutl ) const; // #101029#: Extracted from Paint() - SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( FASTBOOL bContourFrame, - SdrOutliner& rOutliner, - Rectangle& rTextRect, - Rectangle& rAnchorRect, - Rectangle& rPaintRect, + SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( bool bContourFrame, + SdrOutliner& rOutliner, + Rectangle& rTextRect, + Rectangle& rAnchorRect, + Rectangle& rPaintRect, Fraction& aFitXKorreg ) const; + void ImpAutoFitText( SdrOutliner& rOutliner ) const; + static void ImpAutoFitText( SdrOutliner& rOutliner, const Size& rShapeSize, bool bIsVerticalWriting ); SVX_DLLPRIVATE SdrObject* ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const; SVX_DLLPRIVATE void ImpLinkAnmeldung(); SVX_DLLPRIVATE void ImpLinkAbmeldung(); @@ -276,9 +283,9 @@ private: protected: bool ImpCanConvTextToCurve() const; SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, sal_Bool bClosed, sal_Bool bBezier, sal_Bool bNoSetAttr = sal_False) const; - SdrObject* ImpConvertAddText(SdrObject* pObj, FASTBOOL bBezier) const; + SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const; void ImpSetTextStyleSheetListeners(); - void ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& rTextRect, const Rectangle& rAnchorRect, Fraction& rFitXKorreg) const; + void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const; void ImpJustifyRect(Rectangle& rRect) const; void ImpCheckShear(); Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; @@ -291,14 +298,14 @@ protected: virtual SdrObjGeoData* NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); - FASTBOOL NbcSetEckenradius(long nRad); - FASTBOOL NbcSetAutoGrowHeight(bool bAuto); - FASTBOOL NbcSetMinTextFrameHeight(long nHgt); - FASTBOOL NbcSetMaxTextFrameHeight(long nHgt); - FASTBOOL NbcSetAutoGrowWidth(bool bAuto); - FASTBOOL NbcSetMinTextFrameWidth(long nWdt); - FASTBOOL NbcSetMaxTextFrameWidth(long nWdt); - FASTBOOL NbcSetFitToSize(SdrFitToSizeType eFit); + bool NbcSetEckenradius(long nRad); + bool NbcSetAutoGrowHeight(bool bAuto); + bool NbcSetMinTextFrameHeight(long nHgt); + bool NbcSetMaxTextFrameHeight(long nHgt); + bool NbcSetAutoGrowWidth(bool bAuto); + bool NbcSetMinTextFrameWidth(long nWdt); + bool NbcSetMaxTextFrameWidth(long nWdt); + bool NbcSetFitToSize(SdrFitToSizeType eFit); // Konstruktoren fuer beschriftete Zeichenobjekte SdrTextObj(); @@ -330,20 +337,24 @@ public: // Eine Attributierung kann nur am Textrahmen vollzogen werden. void SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); void ReleaseTextLink(); - FASTBOOL IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; } - FASTBOOL ReloadLinkedText(FASTBOOL bForceLoad=FALSE); - FASTBOOL LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); + bool IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; } + bool ReloadLinkedText(bool bForceLoad = false); + bool LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const; - virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE); + virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; + virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); + virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); void NbcResizeTextAttributes(const Fraction& xFact, const Fraction& yFact); - FASTBOOL IsTextFrame() const { return bTextFrame; } - FASTBOOL IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } + bool IsTextFrame() const { return bTextFrame; } + bool IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } + /// returns true if the PPT autofit of text into shape bounds is enabled. implies IsFitToSize()==false! + bool IsAutoFit() const; + /// returns true if the old feature for fitting shape content should into shape is enabled. implies IsAutoFit()==false! + bool IsFitToSize() const; SdrObjKind GetTextKind() const { return eTextKind; } virtual bool HasText() const; - FASTBOOL HasEditText() const; + bool HasEditText() const; sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); } /** returns the currently active text. */ @@ -364,8 +375,8 @@ public: /** returns the index of the text that contains the given point or -1 */ virtual sal_Int32 CheckTextHit(const Point& rPnt) const; - void SetDisableAutoWidthOnDragging(FASTBOOL bOn) { bDisableAutoWidthOnDragging=bOn; } - FASTBOOL IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; } + void SetDisableAutoWidthOnDragging(bool bOn) { bDisableAutoWidthOnDragging=bOn; } + bool IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; } void NbcSetText(const String& rStr); void SetText(const String& rStr); void NbcSetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat); @@ -377,16 +388,16 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; const GeoStat& GetGeoStat() const { return aGeo; } long GetEckenradius() const; - virtual FASTBOOL IsAutoGrowHeight() const; + virtual bool IsAutoGrowHeight() const; long GetMinTextFrameHeight() const; long GetMaxTextFrameHeight() const; - virtual FASTBOOL IsAutoGrowWidth() const; + virtual bool IsAutoGrowWidth() const; long GetMinTextFrameWidth() const; long GetMaxTextFrameWidth() const; @@ -394,13 +405,13 @@ public: const Rectangle &GetGeoRect() const { return aRect; } // Feststellen, ob TextFontwork - virtual FASTBOOL IsFontwork() const; + virtual bool IsFontwork() const; // Soll die Fontwork-Kontour versteckt werden? - FASTBOOL IsHideContour() const; + bool IsHideContour() const; // Textfluss innerhalb Kontur - FASTBOOL IsContourTextFrame() const; + bool IsContourTextFrame() const; // Horizontale Textausrichtung SdrTextHorzAdjust GetTextHorizontalAdjust(const SfxItemSet& rSet) const; @@ -435,7 +446,7 @@ public: virtual void NbcSetLogicRect(const Rectangle& rRect); virtual const Rectangle& GetLogicRect() const; virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const; + virtual long GetShearAngle(bool bVertical = false) const; virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; @@ -448,10 +459,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -460,9 +471,9 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual FASTBOOL HasTextEdit() const; + virtual bool HasTextEdit() const; virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit(SdrOutliner& rOutl); @@ -480,8 +491,8 @@ public: virtual void NbcReformatText(); virtual void ReformatText(); - virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, - FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; + virtual bool CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, + bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; @@ -582,6 +593,10 @@ public: drawinglayer::primitive2d::Primitive2DSequence& rTarget, const drawinglayer::primitive2d::SdrBlockTextPrimitive2D& rSdrBlockTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; + void impDecomposeAutoFitTextPrimitive( + drawinglayer::primitive2d::Primitive2DSequence& rTarget, + const drawinglayer::primitive2d::SdrAutoFitTextPrimitive2D& rSdrAutofitTextPrimitive, + const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; void impDecomposeStretchTextPrimitive( drawinglayer::primitive2d::Primitive2DSequence& rTarget, const drawinglayer::primitive2d::SdrStretchTextPrimitive2D& rSdrStretchTextPrimitive, @@ -608,3 +623,4 @@ public: #endif //_SVDOTEXT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx index e8b2eaf3bc..36a53e7554 100644 --- a/svx/inc/svx/svdouno.hxx +++ b/svx/inc/svx/svdouno.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/awt/XControl.hpp> -#ifndef _COM_SUN_STAR_AWT_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #include <com/sun/star/awt/XControlContainer.hpp> #include "svx/svxdllapi.h" #include <svx/svdorect.hxx> @@ -161,3 +160,4 @@ private: #endif // _SVDOUNO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdoutl.hxx b/svx/inc/svx/svdoutl.hxx index 817a94dab1..b0ff54caab 100644 --- a/svx/inc/svx/svdoutl.hxx +++ b/svx/inc/svx/svdoutl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ public: #endif //_SVDOUTL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx index 8568b284e5..d92b57e72d 100644 --- a/svx/inc/svx/svdovirt.hxx +++ b/svx/inc/svx/svdovirt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,10 +103,10 @@ public: virtual bool supportsFullDrag() const; virtual SdrObject* getFullDragClone() const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; @@ -113,13 +114,13 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void RecalcSnapRect(); virtual const Rectangle& GetSnapRect() const; @@ -131,7 +132,7 @@ public: virtual void NbcSetLogicRect(const Rectangle& rRect); virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const; + virtual long GetShearAngle(bool bVertical = false) const; virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; @@ -147,11 +148,11 @@ public: virtual void NbcReformatText(); virtual void ReformatText(); - virtual FASTBOOL HasMacro() const; + virtual bool HasMacro() const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; - virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec); + virtual bool DoMacro (const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; // OD 30.06.2003 #108784# - virtual <GetOffset()> returns Point(0,0) @@ -163,3 +164,4 @@ public: #endif //_SVDOVIRT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx index c65c5eb5a6..09f623f741 100644 --- a/svx/inc/svx/svdpage.hxx +++ b/svx/inc/svx/svdpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,7 +87,7 @@ class SVX_DLLPUBLIC SdrObjList private: typedef ::std::vector<SdrObject*> SdrObjectContainerType; SdrObjectContainerType maList; - + protected: friend class SdrObjListIter; friend class SdrEditView; @@ -97,8 +98,8 @@ friend class SdrEditView; Rectangle aOutRect; Rectangle aSnapRect; SdrObjListKind eListKind; - FASTBOOL bObjOrdNumsDirty; - FASTBOOL bRectsDirty; + bool bObjOrdNumsDirty; + bool bRectsDirty; protected: virtual void RecalcRects(); @@ -131,7 +132,7 @@ public: virtual void SetModel(SdrModel* pNewModel); // Neuberechnung der Objekt-Ordnungsnummern void RecalcObjOrdNums(); - FASTBOOL IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } + bool IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND , const SdrInsertReason* pReason=NULL ); @@ -169,7 +170,7 @@ public: SdrObject* GetObj(ULONG nNum) const; // Gelinkte Seite oder gelinktes Gruppenobjekt - virtual FASTBOOL IsReadOnly() const; + virtual bool IsReadOnly() const; // Zaehlt alle Objekte inkl. Objekte in Objektgruppen, ... ULONG CountAllObjects() const; @@ -480,7 +481,7 @@ public: virtual SdrPage* Clone(SdrModel* pNewModel) const; bool IsMasterPage() const { return mbMaster; } void SetInserted(bool bNew = true); - FASTBOOL IsInserted() const { return mbInserted; } + bool IsInserted() const { return mbInserted; } virtual void SetChanged(); // #i68775# React on PageNum changes (from Model in most cases) @@ -519,10 +520,8 @@ public: void TRG_SetMasterPageVisibleLayers(const SetOfByte& rNew); sdr::contact::ViewContact& TRG_GetMasterPageDescriptorViewContact() const; -//#if 0 // _SOLAR__PRIVATE protected: void TRG_ImpMasterPageRemoved(const SdrPage& rRemovedPage); -//#endif // __PRIVATE public: // Aenderungen an den Layern setzen nicht das Modified-Flag ! @@ -532,11 +531,11 @@ public: // GetBitmap und GetMetafile sind noch nicht implementiert. // Bitmap in Bildschirmaufloesung und -farbtiefe aus den Objekten der // Page erzeugen. - Bitmap GetBitmap(FASTBOOL bTrimBorders=TRUE) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); } - Bitmap GetBitmap(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=TRUE) const; + Bitmap GetBitmap(bool bTrimBorders = true) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); } + Bitmap GetBitmap(const SetOfByte& rVisibleLayers, bool bTrimBorders = true) const; // Metafile aus den Objekten der Page erzeugen - GDIMetaFile GetMetaFile(FASTBOOL bTrimBorders=TRUE) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); } - GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=TRUE); + GDIMetaFile GetMetaFile(bool bTrimBorders = true) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); } + GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, bool bTrimBorders = true); virtual String GetLayoutName() const; @@ -559,7 +558,7 @@ public: virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const; - FASTBOOL HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const; + bool HasTransparentObjects( BOOL bCheckForAlphaChannel = false ) const; /** *deprecated* returns an averaged background color of this page */ // #i75566# GetBackgroundColor -> GetPageBackgroundColor @@ -616,3 +615,4 @@ public: #endif //_SVDPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index 3efadcda2c..864aa75dd7 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -295,3 +296,5 @@ public: //////////////////////////////////////////////////////////////////////////////////////////////////// #endif //_SVDPAGV_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index efc0df0262..c9bfd21637 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -578,3 +579,4 @@ public: #endif //_SVDPNTV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx index 7e5b68174c..65641a2174 100644 --- a/svx/inc/svx/svdpoev.hxx +++ b/svx/inc/svx/svdpoev.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,4 @@ public: #endif //_SVDPOEV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdpool.hxx b/svx/inc/svx/svdpool.hxx index c90f6b762b..7cec1665cc 100644 --- a/svx/inc/svx/svdpool.hxx +++ b/svx/inc/svx/svdpool.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ public: #endif // _SVDPOOL_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdsnpv.hxx b/svx/inc/svx/svdsnpv.hxx index 25803c0c55..6c1ac12259 100644 --- a/svx/inc/svx/svdsnpv.hxx +++ b/svx/inc/svx/svdsnpv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -243,8 +244,8 @@ public: // - Linie behaelt beim Draggen ihren Winkel bei und wird nur (ni) // verlaengert bzw. verkuerzt. // Defaultmaessig ist Ortho ausgeschaltet. Persistent. - void SetOrtho(BOOL bOn) { bOrtho=bOn; } // unvollstaendig - BOOL IsOrtho() const { return bOrtho; } + void SetOrtho(bool bOn) { bOrtho=bOn; } // unvollstaendig + bool IsOrtho() const { return bOrtho; } // BigOrtho hat nur Relevanz wenn Ortho eingeschaltet ist. // Beispiel: Ein Rechteck wird mit eingeschaltetem Ortho (also ein Quadrat) @@ -256,8 +257,8 @@ public: // tetem BigOrtho bekaeme man dagegen ein Quadrat der Kantenlaenge 80. // Gleiches gilt auch fuer Resize. // Defaultmaessig ist BigOrtho eingeschaltet. Persistent. - void SetBigOrtho(BOOL bOn) { bBigOrtho=bOn; } - BOOL IsBigOrtho() const { return bBigOrtho; } + void SetBigOrtho(bool bOn) { bBigOrtho=bOn; } + bool IsBigOrtho() const { return bBigOrtho; } // bei MoveOnlyDragging=TRUE wird bei Resize/Rotate/Shear/Mirror/Crook // nur das Zentrum der markierten Objekte transformiert. Groesse, Form @@ -336,3 +337,4 @@ public: #endif //_SVDSNPV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdsob.hxx b/svx/inc/svx/svdsob.hxx index ca5bfd4154..5b75195028 100644 --- a/svx/inc/svx/svdsob.hxx +++ b/svx/inc/svx/svdsob.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,3 +132,4 @@ inline SvStream& operator>>(SvStream& rIn, SetOfByte& rSet) #endif // _SVDSOB_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdstr.hrc b/svx/inc/svx/svdstr.hrc index f5997b030b..85827266c3 100644 --- a/svx/inc/svx/svdstr.hrc +++ b/svx/inc/svx/svdstr.hrc @@ -27,10 +27,8 @@ #define SDR_ResourceBegin 2560 -//////////////////////////////////////////////////////////////////////////////////////////////////// -// Achtung: Alle Strings zwischen SDR_StringCacheBegin und -// SDR_StringCacheEnd muessen buendig aneinander liegen. -//BFS06#define SDR_StringCacheBegin (SDR_ResourceBegin) +// Attention: All strings between SDR_StringCacheBegin and +// SDR_StringCacheEnd must be aligned next to each other. #define STR_ObjNameBegin (SDR_ResourceBegin) #define STR_ObjNameSingulNONE (STR_ObjNameBegin + 0) @@ -155,7 +153,6 @@ #define STR_ObjNameSingulUno (STR_ObjNameBegin +119) #define STR_ObjNamePluralUno (STR_ObjNameBegin +120) -// Neu ab 537: Namen fuer 3D-Objekte #define STR_ObjNameSingulCube3d (STR_ObjNameBegin + 121) #define STR_ObjNamePluralCube3d (STR_ObjNameBegin + 122) #define STR_ObjNameSingulExtrude3d (STR_ObjNameBegin + 123) @@ -166,7 +163,6 @@ #define STR_ObjNamePluralLathe3d (STR_ObjNameBegin + 128) #define STR_ObjNameSingulObj3d (STR_ObjNameBegin + 129) #define STR_ObjNamePluralObj3d (STR_ObjNameBegin + 130) -//BFS01#define STR_ObjNameSingulPoly3d (STR_ObjNameBegin + 131) #define STR_ObjNamePluralPoly3d (STR_ObjNameBegin + 132) #define STR_ObjNameSingulScene3d (STR_ObjNameBegin + 133) #define STR_ObjNamePluralScene3d (STR_ObjNameBegin + 134) @@ -322,11 +318,10 @@ #define STR_UndoDelLayer (STR_UndoBegin +14) #define STR_UndoMovLayer (STR_UndoBegin +15) -// --> OD 2009-07-09 #i73249# +// #i73249# #define STR_UndoObjName (STR_UndoBegin +16) #define STR_UndoObjTitle (STR_UndoBegin +17) #define STR_UndoObjDescription (STR_UndoBegin +18) -// <-- #define STR_UndoEnd (STR_UndoObjDescription) @@ -400,12 +395,6 @@ #define STR_ItemNam_SHADOWTRANSPARENCE (STR_ItemNamBegin + 4) #define STR_ItemNam_SHADOW3D (STR_ItemNamBegin + 5) #define STR_ItemNam_SHADOWPERSP (STR_ItemNamBegin + 6) -//BFS01#define STR_ItemNam_SHADOWRESERVE1 (STR_ItemNamBegin + 7) -//BFS01#define STR_ItemNam_SHADOWRESERVE2 (STR_ItemNamBegin + 8) -//BFS01#define STR_ItemNam_SHADOWRESERVE3 (STR_ItemNamBegin + 9) -//BFS01#define STR_ItemNam_SHADOWRESERVE4 (STR_ItemNamBegin + 10) -//BFS01#define STR_ItemNam_SHADOWRESERVE5 (STR_ItemNamBegin + 11) -//BFS01#define STR_ItemNamSET_SHADOW (STR_ItemNamBegin + 12) #define STR_ItemNam_CAPTIONTYPE (STR_ItemNamBegin + 13) #define STR_ItemNam_CAPTIONFIXEDANGLE (STR_ItemNamBegin + 14) #define STR_ItemNam_CAPTIONANGLE (STR_ItemNamBegin + 15) @@ -416,13 +405,6 @@ #define STR_ItemNam_CAPTIONESCABS (STR_ItemNamBegin + 20) #define STR_ItemNam_CAPTIONLINELEN (STR_ItemNamBegin + 21) #define STR_ItemNam_CAPTIONFITLINELEN (STR_ItemNamBegin + 22) -//BFS01#define STR_ItemNam_CAPTIONRESERVE1 (STR_ItemNamBegin + 23) -//BFS01#define STR_ItemNam_CAPTIONRESERVE2 (STR_ItemNamBegin + 24) -//BFS01#define STR_ItemNam_CAPTIONRESERVE3 (STR_ItemNamBegin + 25) -//BFS01#define STR_ItemNam_CAPTIONRESERVE4 (STR_ItemNamBegin + 26) -//BFS01#define STR_ItemNam_CAPTIONRESERVE5 (STR_ItemNamBegin + 27) -//BFS01#define STR_ItemNamSET_CAPTION (STR_ItemNamBegin + 28) -//BFS01#define STR_ItemNamSET_OUTLINER (STR_ItemNamBegin + 29) #define STR_ItemNam_ECKENRADIUS (STR_ItemNamBegin + 30) #define STR_ItemNam_TEXT_LEFTDIST (STR_ItemNamBegin + 31) @@ -471,27 +453,12 @@ #define STR_ItemNamEnd (STR_ItemNam_SHEARANGLE) #define STR_ItemEnd STR_ItemNamEnd -// 64 Resource-Id's reserviert fuer kompatible Erweiterungen -//BFS06#define STR_SvDraw_CacheReserve_Begin (STR_ItemEnd+1) -//BFS06#define STR_SvDraw_CacheReserve_End (STR_SvDraw_CacheReserve_Begin+63) -//BFS06#define SDR_StringCacheEnd (STR_SvDraw_CacheReserve_Begin-1) - -//BFS06#define STR_ErrorBegin (STR_SvDraw_CacheReserve_End+1) -//BFS06#define STR_ErrorBegin (STR_ItemEnd+1) -//BFS06#define STR_SvDraw_ErrorReserve_Begin (STR_ErrorBegin + 2) -// hier ist Platz fuer 30 Eintraege -//BFS06#define STR_SvDraw_ErrorReserve_End (STR_SvDraw_ErrorReserve_Begin + 29) -//BFS06#define STR_ErrorEnd STR_SvDraw_ErrorReserve_End -//BFS06#define STR_ErrorEnd (STR_ErrorBegin + 2) - -// 22-05-98: 2 Eintraege fuer die Bitmaps von der StrErrorReserve abgeknapst -//BFS06#define BMAP_Begin (STR_ErrorEnd+1) #define BMAP_Begin (STR_ItemEnd+1) #define BMAP_GrafikEi (BMAP_Begin +0) #define BMAP_GrafikDe (BMAP_Begin +1) #define BMAP_End (BMAP_GrafikDe) -// Strings fuer den Vorlagen-Dialog +// Strings for the template dialog #define SIP_Begin (BMAP_End) #define SIP_UNKNOWN_ATTR (SIP_Begin + 0) @@ -561,7 +528,6 @@ #define SIP_XA_FTRESERVED4 (SIP_Begin + 64) #define SIP_XA_FTRESERVED5 (SIP_Begin + 65) #define SIP_XA_FTRESERVED_LAST (SIP_Begin + 66) -//BFS01#define SIP_XATTRSET_TEXT (SIP_Begin + 67) #define SIP_SA_SHADOW (SIP_Begin + 68) #define SIP_SA_SHADOWCOLOR (SIP_Begin + 69) #define SIP_SA_SHADOWXDIST (SIP_Begin + 70) @@ -569,12 +535,6 @@ #define SIP_SA_SHADOWTRANSPARENCE (SIP_Begin + 72) #define SIP_SA_SHADOW3D (SIP_Begin + 73) #define SIP_SA_SHADOWPERSP (SIP_Begin + 74) -//BFS01#define SIP_SA_SHADOWRESERVE1 (SIP_Begin + 75) -//BFS01#define SIP_SA_SHADOWRESERVE2 (SIP_Begin + 76) -//BFS01#define SIP_SA_SHADOWRESERVE3 (SIP_Begin + 77) -//BFS01#define SIP_SA_SHADOWRESERVE4 (SIP_Begin + 78) -//BFS01#define SIP_SA_SHADOWRESERVE5 (SIP_Begin + 79) -//BFS01#define SIP_SDRATTRSET_SHADOW (SIP_Begin + 80) #define SIP_SA_CAPTIONTYPE (SIP_Begin + 81) #define SIP_SA_CAPTIONFIXEDANGLE (SIP_Begin + 82) #define SIP_SA_CAPTIONANGLE (SIP_Begin + 83) @@ -585,13 +545,6 @@ #define SIP_SA_CAPTIONESCABS (SIP_Begin + 88) #define SIP_SA_CAPTIONLINELEN (SIP_Begin + 89) #define SIP_SA_CAPTIONFITLINELEN (SIP_Begin + 90) -//BFS01#define SIP_SA_CAPTIONRESERVE1 (SIP_Begin + 91) -//BFS01#define SIP_SA_CAPTIONRESERVE2 (SIP_Begin + 92) -//BFS01#define SIP_SA_CAPTIONRESERVE3 (SIP_Begin + 93) -//BFS01#define SIP_SA_CAPTIONRESERVE4 (SIP_Begin + 94) -//BFS01#define SIP_SA_CAPTIONRESERVE5 (SIP_Begin + 95) -//BFS01#define SIP_SDRATTRSET_CAPTION (SIP_Begin + 96) -//BFS01#define SIP_SDRATTRSET_OUTLINER (SIP_Begin + 97) #define SIP_SA_ECKENRADIUS (SIP_Begin + 98) #define SIP_SA_TEXT_MINFRAMEHEIGHT (SIP_Begin + 99) #define SIP_SA_TEXT_AUTOGROWHEIGHT (SIP_Begin + 100) @@ -621,7 +574,6 @@ #define SIP_SA_AUTOGROWSIZE (SIP_Begin + 124) #define SIP_SA_RESERVE18 (SIP_Begin + 125) #define SIP_SA_RESERVE19 (SIP_Begin + 126) -//BFS01#define SIP_SDRATTRSET_MISC (SIP_Begin + 127) #define SIP_SA_EDGEKIND (SIP_Begin + 128) #define SIP_SA_EDGENODE1HORZDIST (SIP_Begin + 129) #define SIP_SA_EDGENODE1VERTDIST (SIP_Begin + 130) @@ -633,15 +585,6 @@ #define SIP_SA_EDGELINE1DELTA (SIP_Begin + 136) #define SIP_SA_EDGELINE2DELTA (SIP_Begin + 137) #define SIP_SA_EDGELINE3DELTA (SIP_Begin + 138) -//BFS01#define SIP_SA_EDGERESERVE02 (SIP_Begin + 139) -//BFS01#define SIP_SA_EDGERESERVE03 (SIP_Begin + 140) -//BFS01#define SIP_SA_EDGERESERVE04 (SIP_Begin + 141) -//BFS01#define SIP_SA_EDGERESERVE05 (SIP_Begin + 142) -//BFS01#define SIP_SA_EDGERESERVE06 (SIP_Begin + 143) -//BFS01#define SIP_SA_EDGERESERVE07 (SIP_Begin + 144) -//BFS01#define SIP_SA_EDGERESERVE08 (SIP_Begin + 145) -//BFS01#define SIP_SA_EDGERESERVE09 (SIP_Begin + 146) -//BFS01#define SIP_SDRATTRSET_EDGE (SIP_Begin + 147) #define SIP_SA_MEASUREKIND (SIP_Begin + 148) #define SIP_SA_MEASURETEXTHPOS (SIP_Begin + 149) #define SIP_SA_MEASURETEXTVPOS (SIP_Begin + 150) @@ -666,7 +609,6 @@ #define SIP_SA_MEASURERESERVE05 (SIP_Begin + 169) #define SIP_SA_MEASURERESERVE06 (SIP_Begin + 170) #define SIP_SA_MEASURERESERVE07 (SIP_Begin + 171) -//BFS01#define SIP_SDRATTRSET_MEASURE (SIP_Begin + 172) #define SIP_SA_CIRCKIND (SIP_Begin + 173) #define SIP_SA_CIRCSTARTANGLE (SIP_Begin + 174) #define SIP_SA_CIRCENDANGLE (SIP_Begin + 175) @@ -753,18 +695,13 @@ #define SIP_SA_GRAFRESERVE4 (SIP_Begin + 255) #define SIP_SA_GRAFRESERVE5 (SIP_Begin + 256) #define SIP_SA_GRAFRESERVE6 (SIP_Begin + 257) -//BFS01#define SIP_SDRATTRSET_GRAF (SIP_Begin + 258) #define SIP_SA_MARKERS (SIP_Begin + 258) #define SIP_SA_PAGESHADOW35X35 (SIP_Begin + 259) #define SIP_SA_FINE_MARKERS (SIP_Begin + 260) -// #100499# #define BMP_SVXOLEOBJ (SIP_Begin + 261) -// #101928# -#define SIP_SA_ACCESSIBILITY_MARKERS (SIP_Begin + 262) - #define STR_TABLE_ATTR (SIP_Begin + 263) #define STR_TABLE_AUTOFMT (SIP_Begin + 264) #define STR_TABLE_INSCOL (SIP_Begin + 265) @@ -780,11 +717,7 @@ #define STR_TABLE_STYLE_SETTINGS (SIP_Begin + 275) #define SIP_SA_CROP_MARKERS (SIP_Begin + 276) #define SIP_SA_CROP_FINE_MARKERS (SIP_Begin + 277) -#define SIP_SA_ACCESSIBILITY_CROP_MARKERS (SIP_Begin + 278) -#define SIP_End (SIP_SA_ACCESSIBILITY_CROP_MARKERS) +#define SIP_End (SIP_SA_CROP_FINE_MARKERS) #define SDR_ResourceEnd (SIP_End) - -//////////////////////////////////////////////////////////////////////////////////////////////////// - diff --git a/svx/inc/svx/svdtext.hxx b/svx/inc/svx/svdtext.hxx index 9fac9b3082..0443012b00 100644 --- a/svx/inc/svx/svdtext.hxx +++ b/svx/inc/svx/svdtext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ private: #endif //_SVDTEXT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx index c6c2271917..c7718fcb27 100644 --- a/svx/inc/svx/svdtrans.hxx +++ b/svx/inc/svx/svdtrans.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <tools/poly.hxx> #include <tools/fract.hxx> -#ifndef _MAPMOD_HXX //autogen #include <vcl/mapmod.hxx> -#endif #include <tools/string.hxx> #include "svx/svxdllapi.h" @@ -68,7 +67,7 @@ inline void MovePoly(PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(), void MoveXPoly(XPolygon& rPoly, const Size& S); void MoveXPoly(XPolyPolygon& rPoly, const Size& S); -SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, FASTBOOL bNoJustify=FALSE); +SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bNoJustify = false); inline void ResizePoint(Point& rPnt, const Point& rRef, Fraction xFact, Fraction yFact); void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); @@ -83,43 +82,43 @@ void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs); // MirrorRect macht nur Sinn bei Spiegelachsen // mit einem durch 45 Degree teilbaren Winkel! -void MirrorRect(Rectangle& rRect, const Point& rRef1, const Point& rRef2, FASTBOOL bNoJustify); // ni. +void MirrorRect(Rectangle& rRect, const Point& rRef1, const Point& rRef2, bool bNoJustify); // ni. void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2); void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2); void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2); void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2); void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2); -inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShear=FALSE); -SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE); -void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE); -void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE); -void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE); +inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear = false); +SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear = false); +void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false); +void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false); +void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false); // rPnt.X bzw rPnt.Y wird auf rCenter.X bzw. rCenter.Y gesetzt! // anschliessend muss rPnt nur noch um rCenter gedreht werden. // Der Rueckgabewinkel ist ausnahmsweise in Rad. -inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad, FASTBOOL bVertical); +inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad, bool bVertical); // Die folgenden Methoden behandeln einen Punkt eines XPolygons, wobei die // benachbarten Kontrollpunkte des eigentlichen Punktes ggf. in pC1/pC2 // uebergeben werden. Ueber rSin/rCos wird gleichzeitig sin(nWink) und cos(nWink) // zurueckgegeben. // Der Rueckgabewinkel ist hier ebenfalls in Rad. double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, - const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert); + const Point& rRad, double& rSin, double& rCos, bool bVert); double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, - const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert); + const Point& rRad, double& rSin, double& rCos, bool bVert); double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, - const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert, + const Point& rRad, double& rSin, double& rCos, bool bVert, const Rectangle rRefRect); -void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert); -void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert); -void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect); +void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); +void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); +void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect); -void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert); -void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert); -void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect); +void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); +void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); +void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect); /**************************************************************************************************/ /* Inline */ @@ -141,7 +140,7 @@ inline void RotatePoint(Point& rPnt, const Point& rRef, double sn, double cs) rPnt.Y()=Round(rRef.Y()+dy*cs-dx*sn); } -inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShear) +inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear) { if (!bVShear) { // Horizontal if (rPnt.Y()!=rRef.Y()) { // sonst nicht noetig @@ -154,7 +153,7 @@ inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShe } } -inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad, FASTBOOL bVertical) +inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad, bool bVertical) { double nWink; if (bVertical) { @@ -237,8 +236,8 @@ public: Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo); void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo); -SVX_DLLPUBLIC void OrthoDistance8(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho); -SVX_DLLPUBLIC void OrthoDistance4(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho); +SVX_DLLPUBLIC void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho); +SVX_DLLPUBLIC void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho); // Multiplikation und anschliessende Division. // Rechnung und Zwischenergebnis sind BigInt. @@ -271,20 +270,20 @@ FrPair GetMapFactor(MapUnit eS, FieldUnit eD); FrPair GetMapFactor(FieldUnit eS, MapUnit eD); FrPair GetMapFactor(FieldUnit eS, FieldUnit eD); -inline FASTBOOL IsMetric(MapUnit eU) { +inline bool IsMetric(MapUnit eU) { return (eU==MAP_100TH_MM || eU==MAP_10TH_MM || eU==MAP_MM || eU==MAP_CM); } -inline FASTBOOL IsInch(MapUnit eU) { +inline bool IsInch(MapUnit eU) { return (eU==MAP_1000TH_INCH || eU==MAP_100TH_INCH || eU==MAP_10TH_INCH || eU==MAP_INCH || eU==MAP_POINT || eU==MAP_TWIP); } -inline FASTBOOL IsMetric(FieldUnit eU) { +inline bool IsMetric(FieldUnit eU) { return (eU==FUNIT_MM || eU==FUNIT_CM || eU==FUNIT_M || eU==FUNIT_KM || eU==FUNIT_100TH_MM); } -inline FASTBOOL IsInch(FieldUnit eU) { +inline bool IsInch(FieldUnit eU) { return (eU==FUNIT_TWIP || eU==FUNIT_POINT || eU==FUNIT_PICA || eU==FUNIT_INCH || eU==FUNIT_FOOT || eU==FUNIT_MILE); } @@ -294,9 +293,9 @@ class SVX_DLLPUBLIC SdrFormatter { long nMul_; long nDiv_; short nKomma_; - FASTBOOL bSrcFU; - FASTBOOL bDstFU; - FASTBOOL bDirty; + bool bSrcFU; + bool bDstFU; + bool bDirty; MapUnit eSrcMU; MapUnit eDstMU; FieldUnit eSrcFU; @@ -324,3 +323,4 @@ public: #endif //_SVDTRANS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdtypes.hxx b/svx/inc/svx/svdtypes.hxx index 5f7842ca64..75ed074a60 100644 --- a/svx/inc/svx/svdtypes.hxx +++ b/svx/inc/svx/svdtypes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,7 +118,7 @@ enum SdrObjListKind {SDROBJLIST_UNKNOWN =0x00, // Unbekannt // Hier haben zur Not noch 8 weitere Pagetypen Platz }; // fuer die Surrogate reserviert -inline FASTBOOL SdrIsPageKind(SdrObjListKind eK) { return eK>=SDROBJLIST_DRAWPAGE && eK<=0x1A; } +inline bool SdrIsPageKind(SdrObjListKind eK) { return eK>=SDROBJLIST_DRAWPAGE && eK<=0x1A; } //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -167,3 +168,4 @@ enum SdrRepeatFunc {SDRREPFUNC_OBJ_NONE, #endif //_SVDTYPES_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 5017f1e127..4be8ffc743 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -145,9 +146,9 @@ protected: protected: SdrUndoObj(SdrObject& rNewObj); - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, FASTBOOL bRepeat=FALSE) const; + void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, bool bRepeat = false) const; - static void GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, FASTBOOL bRepeat = FALSE ); + static void GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, bool bRepeat = false ); // #94278# new method for evtl. PageChange at UNDO/REDO void ImpShowPageOfThisObject(); @@ -173,8 +174,8 @@ protected: SfxStyleSheet* pUndoStyleSheet; SfxStyleSheet* pRedoStyleSheet; SfxStyleSheet* pRepeatStyleSheet; - FASTBOOL bStyleSheet; - FASTBOOL bHaveToTakeRedoSet; + bool bStyleSheet; + bool bHaveToTakeRedoSet; // Bei Zuweisung von TextItems auf ein Zeichenobjekt mit Text: OutlinerParaObject* pTextUndo; @@ -186,7 +187,7 @@ protected: SdrUndoGroup* pUndoGroup; public: - SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1=FALSE, FASTBOOL bSaveText=FALSE); + SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1 = false, bool bSaveText = false); virtual ~SdrUndoAttrObj(); void SetRepeatAttr(const SfxItemSet& rSet); virtual void Undo(); @@ -264,7 +265,7 @@ public: //************************************************************ class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj { - bool bOwner; + bool bOwner; protected: SdrObjList* pObjList; @@ -295,7 +296,7 @@ protected: class SVX_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList { public: - SdrUndoRemoveObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE) + SdrUndoRemoveObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -314,7 +315,7 @@ public: class SVX_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList { public: - SdrUndoInsertObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE) + SdrUndoInsertObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -332,7 +333,7 @@ public: class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj { public: - SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE) + SdrUndoDelObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(TRUE); } virtual void Undo(); @@ -356,7 +357,7 @@ public: class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj { public: - SdrUndoNewObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE) + SdrUndoNewObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoInsertObj(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -377,8 +378,8 @@ public: class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj { - bool bOldOwner; - bool bNewOwner; + bool bOldOwner; + bool bNewOwner; protected: SdrObjList* pObjList; @@ -410,7 +411,7 @@ public: class SdrUndoCopyObj : public SdrUndoNewObj { public: - SdrUndoCopyObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE) + SdrUndoCopyObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoNewObj(rNewObj,bOrdNumDirect) {} virtual String GetComment() const; @@ -460,7 +461,7 @@ class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj protected: OutlinerParaObject* pOldText; OutlinerParaObject* pNewText; - FASTBOOL bNewTextAvailable; + bool bNewTextAvailable; BOOL bEmptyPresObj; sal_Int32 mnText; @@ -468,7 +469,7 @@ public: SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText ); virtual ~SdrUndoObjSetText(); - FASTBOOL IsDifferent() const { return pOldText!=pNewText; } + bool IsDifferent() const { return pOldText!=pNewText; } void AfterSetText(); virtual void Undo(); @@ -481,7 +482,7 @@ public: virtual bool CanSdrRepeat(SdrView& rView) const; }; -// --> OD 2009-07-09 #i73249# +// Implement Title/Description Elements UI for Writer text frames, graphics and embedded objects (#i73249#) class SdrUndoObjStrAttr : public SdrUndoObj { public: @@ -508,7 +509,6 @@ public: virtual String GetComment() const; }; -// <-- //////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -535,7 +535,7 @@ protected: SdrLayer* pLayer; SdrLayerAdmin* pLayerAdmin; USHORT nNum; - FASTBOOL bItsMine; + bool bItsMine; protected: SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); @@ -633,7 +633,7 @@ protected: protected: SdrUndoPage(SdrPage& rNewPg); - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT n=0, FASTBOOL bRepeat=FALSE) const; + void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT n=0, bool bRepeat = false) const; }; //************************************************************ @@ -651,7 +651,7 @@ protected: // Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page // statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE - FASTBOOL bItsMine; + bool bItsMine; protected: SdrUndoPageList(SdrPage& rNewPg); @@ -853,12 +853,11 @@ public: virtual SdrUndoAction* CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ); virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ); - // --> OD 2009-07-09 #i73249# + // Implement Title/Description Elements UI for Writer text frames, graphics and embedded objects (#i73249#) virtual SdrUndoAction* CreateUndoObjectStrAttr( SdrObject& rObject, SdrUndoObjStrAttr::ObjStrAttrType eObjStrAttrType, String sOldStr, String sNewStr ); - // <-- // layer virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); @@ -880,3 +879,4 @@ public: #endif //_SVDUNDO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx index 60c557f8b0..0786a2e3cb 100644 --- a/svx/inc/svx/svdview.hxx +++ b/svx/inc/svx/svdview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -337,3 +338,4 @@ public: // ///////////////////////////////////////////////////////////////////////////////////////////////// */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdviter.hxx b/svx/inc/svx/svdviter.hxx index 43f8c0e14a..922d0221ac 100644 --- a/svx/inc/svx/svdviter.hxx +++ b/svx/inc/svx/svdviter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,6 +33,39 @@ #include <sal/types.h> #include "svx/svxdllapi.h" +/* + +Using this class, you can find out: +- SdrView* First/NextView() + - All Views in which a model is displayed + - All Views in which a certain page is visible (also as MasterPage) + - All Views in which a certain object is visible (also as MasterPage) +- SdrPageView* First/NextPageView() + - All PageViews in which a model is displayed + - All PageViews in which a certain page is visible (also as MasterPage) + - All PageViews in which a certain object is visible (also as MasterPage) +- OutputDevice* First/NextOutDev() + - All OutputDevices in which a model is displayed + - All OutputDevices in which a certain page is visible (also as MasterPage) + - All OutputDevices in which a certain object is visible (also as MasterPage) +- Window* First/NextWindow() + - All Windows in which a model is displayed + - All Windows in which a certain page is visible (also as MasterPage) + - All Windows in which a certain object is visible (also as MasterPage) +You can specify if the selection is restricted to a certain page/object by +choosing the corresponding constructor. + +Among others, the following are considered: +- Visibility state of the layer +- Visible Layer of MasterPages +- Multiple layer for group objects + +Not considered are: +- Whether the pages/objects were already painted or if an Invalidate is still pending +- Whether the pages/objects in a Window are in a visible region + +*/ + //////////////////////////////////////////////////////////////////////////////////////////////////// class OutputDevice; @@ -85,42 +119,6 @@ public: Window* NextWindow(); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef _JUST_DESCRIPTION - -Mit dieser Klasse kann man rausbekommen: -- SdrView* First/NextView() - - Alle Views in denen ein Models dargestellt wird - - Alle Views in denen eine bestimme Page sichtbar ist (ww. auch als MasterPage) - - Alle Views in denen ein bestimmes Objekt sichtbar ist (ww. auch auf MasterPage) -- SdrPageView* First/NextPageView() - - Alle PageViews in denen ein Models dargestellt wird - - Alle PageViews in denen eine bestimme Page sichtbar ist (ww. auch als MasterPage) - - Alle PageViews in denen ein bestimmes Objekt sichtbar ist (ww. auch auf MasterPage) -- OutputDevice* First/NextOutDev() - - Alle OutputDevices in denen ein Models dargestellt wird - - Alle OutputDevices in denen eine bestimme Page sichtbar ist (ww. auch als MasterPage) - - Alle OutputDevices in denen ein bestimmes Objekt sichtbar ist (ww. auch auf MasterPage) -- Window* First/NextWindow() - - Alle Windows in denen ein Models dargestellt wird - - Alle Windows in denen eine bestimme Page sichtbar ist (auch als MasterPage) - - Alle Windows in denen ein bestimmes Objekt sichtbar ist (auch auf MasterPage) -Ob die Auswahl auf ein(e) bestimmte(s) Page/Objekt beschraenkt wird, bestimmt man -durch die Wahl des Konstruktors. - -Es werden u.a. auch berueksichtigt: -- Layer Sichtbarkeitsstatus -- Visible Layer von MasterPages -- Mehrfachlayer bei Gruppenobjekten - -Es wird nicht berueksichtigt: -- Ob die Pages/Objekte wirklich schon gepaintet wurden oder noch ein Invalidate ansteht, ... -- Ob die Pages/Objekte in einem Window im sichtbaren Bereich liegen - -#endif // _JUST_DESCRIPTION - -//////////////////////////////////////////////////////////////////////////////////////////////////// - #endif //_SVDVITER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx index f93d72e68c..363e3bd040 100644 --- a/svx/inc/svx/svdxcgv.hxx +++ b/svx/inc/svx/svdxcgv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <svx/svdedxv.hxx> -#ifndef _GDIMTF_HXX //autogen #include <vcl/gdimtf.hxx> -#endif #include "svx/svxdllapi.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -160,3 +159,5 @@ public: }; #endif //_SVDXCGV_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svimbase.hxx b/svx/inc/svx/svimbase.hxx index 7f4b4710f8..3515a9dbbb 100644 --- a/svx/inc/svx/svimbase.hxx +++ b/svx/inc/svx/svimbase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,43 +163,36 @@ public: ULONG GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); } ULONG GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); } - // Farbtiefe des Ausgangsbildes ermitteln und setzen + // Get and set the color depth of the origin picture SimDepthType GetDepth() const { return eOrgDepth; } void SetDepth( const SimDepthType eDepth ) { eOrgDepth = eDepth; } - // Farbtiefen nach Undo und Redo ermitteln und setzen + // Get and set the color depth after Undo and Redo SimDepthType GetUndoDepth() const { return eUndoDepth; } void SetUndoDepth(const SimDepthType eDepth) { eUndoDepth = eDepth; } SimDepthType GetRedoDepth() const { return eRedoDepth; } void SetRedoDepth(const SimDepthType eDepth) { eRedoDepth = eDepth; } - // Vor- und Ruecklauf der Bildverarbeitung BOOL BeginProcessing( BOOL bUndo = TRUE ); void EndProcessing(); BOOL BeginProcessingExt(ULONG nWidth, ULONG nHeight, BOOL bUndo = TRUE); void EndProcessingExt() { EndProcessing(); } - // Zeiger auf Arrays zur Verfuegung stellen HPBYTE GetOrgPointer() { return pOrgArray; } HPBYTE GetDestPointer() { return pDestArray; } - // DIB-Erzeugung fuer Anzeige BOOL CreateOutBitmap( const ULONG nColorCount = 256, ULONG nLast = 0, SfxProgress* pProgress = NULL ); - // Undo-Verwaltung BOOL DoUndo( SfxProgress* pProgress = NULL ); BOOL DoRedo( SfxProgress* pProgress = NULL ); - // DIB-Rueckgabe fuer Anzeige const Bitmap& GetOutBitmap() const; - // DIB-Rueckgabe fuer Speicherung Bitmap GetSaveBitmap(); - // Palette besorgen SimPalette* GetOrgPalette() const { return nWhichOrg == 1 ? pPal1 : pPal2; } SimPalette* GetDestPalette() const { return nWhichOrg == 1 ? pPal2 : pPal1; } }; @@ -210,3 +204,5 @@ public: BOOL DitherBitmap( Bitmap& rBitmap, BOOL bDitherAlways = FALSE ); #endif // _SVIMBASE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx index 81bb8a93b3..e02b98fab6 100644 --- a/svx/inc/svx/svx3ditems.hxx +++ b/svx/inc/svx/svx3ditems.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,8 +88,8 @@ public: Svx3DNormalsKindItem(sal_uInt16 nVal = 0); // use drawing::NormalsKind - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -102,8 +103,8 @@ public: Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -112,8 +113,8 @@ public: Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -147,8 +148,8 @@ public: Svx3DTextureKindItem(sal_uInt16 nVal = 3); // use drawing::TextureKind - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -157,8 +158,8 @@ public: Svx3DTextureModeItem(sal_uInt16 nVal = 2); // use drawing:TextureMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -173,8 +174,8 @@ public: Svx3DPerspectiveItem(sal_uInt16 nVal = (sal_uInt16)PR_PERSPECTIVE); // use drawing::ProjectionMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -328,8 +329,8 @@ public: Svx3DShadeModeItem(sal_uInt16 nVal = 2); // use drawing::ShadeMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -375,3 +376,5 @@ public: }; #endif // _SVX3DITEMS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index a041bdbbe2..7b0f369ed4 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,6 +40,7 @@ class SdrView; #include <com/sun/star/container/XIndexContainer.hpp> //add for FmShowColsDialog #include <com/sun/star/container/XNameReplace.hpp> //add for SvxMacroAssignDlg #include "svx/svxdllapi.h" +#include <vector> namespace com{namespace sun{namespace star{ namespace linguistic2{ @@ -55,7 +57,6 @@ typedef USHORT* (*DialogGetRanges)(); struct ExchangeData; class INetURLObject; class GalleryTheme; -class TargetList; class SvxHyperlinkTabPageBase; class SearchAttrItemList; class FmFormShell; @@ -486,7 +487,7 @@ public: virtual VclAbstractDialog* CreateScriptErrorDialog( Window* pParent, com::sun::star::uno::Any aException) = 0; - virtual VclAbstractDialog* CreateSvxMacroAssignDlg( + virtual VclAbstractDialog* CreateSvxMacroAssignDlg( Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, @@ -505,3 +506,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svxdllapi.h b/svx/inc/svx/svxdllapi.h index de790b8e40..ad39812fc4 100644 --- a/svx/inc/svx/svxdllapi.h +++ b/svx/inc/svx/svxdllapi.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ #define SVX_DLLPRIVATE SAL_DLLPRIVATE #endif /* INCLUDED_SVXDLLAPI_H */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svxerr.hxx b/svx/inc/svx/svxerr.hxx index 31baf42e2e..e57050d31c 100644 --- a/svx/inc/svx/svxerr.hxx +++ b/svx/inc/svx/svxerr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,4 @@ class SVX_DLLPUBLIC SvxErrorHandler : private SfxErrorHandler #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx index 120beaad6c..03fe3a6abc 100644 --- a/svx/inc/svx/svxgrahicitem.hxx +++ b/svx/inc/svx/svxgrahicitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index ab0189fe5d..82e8a2fbf6 100755 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -591,8 +591,8 @@ #define SID_ATTR_POSITION ( SID_SVX_START + 223 ) #define SID_ATTR_SIZE ( SID_SVX_START + 224 ) #define SID_TABLE_CELL ( SID_SVX_START + 225 ) -#define SID_ATTR_ALIGN_HOR_JUSTIFY ( SID_SVX_START + 226 ) -#define SID_ATTR_ALIGN_VER_JUSTIFY ( SID_SVX_START + 227 ) +//#define SID_ATTR_ALIGN_HOR_JUSTIFY ( SID_SVX_START + 226 ) +//#define SID_ATTR_ALIGN_VER_JUSTIFY ( SID_SVX_START + 227 ) #define SID_ATTR_ALIGN_MARGIN ( SID_SVX_START + 228 ) #define SID_ATTR_ALIGN_STACKED ( SID_SVX_START + 229 ) #define SID_ATTR_ALIGN_LINEBREAK ( SID_SVX_START + 230 ) @@ -745,11 +745,11 @@ //#define SID_ZOOM_PREV ( SID_SVX_START + 403 ) -> sfxsids.hrc #define SID_BACKGRND_DESTINATION ( SID_SVX_START + 404 ) #define SID_ATTR_FLASH ( SID_SVX_START + 406 ) -#define SID_ATTR_3D_LIGHT ( SID_SVX_START + 407 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ +#define SID_ATTR_3D_LIGHT ( SID_SVX_START + 407 ) /* Slots mit --> koennen demnaechst entfallen */ #define SID_ATTR_3D_START SID_ATTR_3D_LIGHT -#define SID_ATTR_3D_LIGHTINTENSITY ( SID_SVX_START + 408 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ -#define SID_ATTR_3D_LIGHTCOLOR ( SID_SVX_START + 409 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ -#define SID_ATTR_3D_AMBIENTINTENSITY ( SID_SVX_START + 410 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ +#define SID_ATTR_3D_LIGHTINTENSITY ( SID_SVX_START + 408 ) /* Slots mit --> koennen demnaechst entfallen */ +#define SID_ATTR_3D_LIGHTCOLOR ( SID_SVX_START + 409 ) /* Slots mit --> koennen demnaechst entfallen */ +#define SID_ATTR_3D_AMBIENTINTENSITY ( SID_SVX_START + 410 ) /* Slots mit --> koennen demnaechst entfallen */ #define SID_ATTR_3D_AMBIENTCOLOR ( SID_SVX_START + 411 ) #define SID_IMPORT_GRAPH_LINK ( SID_SVX_START + 412 ) diff --git a/svx/inc/svx/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx index fabd1b10c5..543a5575a3 100644 --- a/svx/inc/svx/swframeexample.hxx +++ b/svx/inc/svx/swframeexample.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ public: #endif // _SVXSWFRAMEEXAMPLE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/swframeposstrings.hxx b/svx/inc/svx/swframeposstrings.hxx index ba73e3d017..71fe439ef8 100644 --- a/svx/inc/svx/swframeposstrings.hxx +++ b/svx/inc/svx/swframeposstrings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,10 +31,10 @@ #include <tools/string.hxx> #include "svx/svxdllapi.h" -/* -----------------04.03.2004 12:58----------------- +/* contains strings needed for positioning dialogs of frames and drawing in Writer - --------------------------------------------------*/ + */ class SvxSwFramePosString_Impl; class SVX_DLLPUBLIC SvxSwFramePosString { @@ -92,3 +93,4 @@ public: }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/swframevalidation.hxx b/svx/inc/svx/swframevalidation.hxx index 0bd57c9747..ded6a1cda4 100644 --- a/svx/inc/svx/swframevalidation.hxx +++ b/svx/inc/svx/swframevalidation.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,9 @@ #include <tools/gen.hxx> #include <limits.h> -/* -----------------03.03.2004 16:31----------------- - struct to determine min/max values for fly frame positioning in Writer - --------------------------------------------------*/ +/* + struct to determine min/max values for fly frame positioning in Writer + */ struct SvxSwFrameValidation { sal_Int16 nAnchorType; //com::sun::star::text::TextContentAnchorType @@ -61,7 +62,7 @@ struct SvxSwFrameValidation sal_Int32 nMinHeight; sal_Int32 nMaxHeight; - Size aPercentSize; // Size fuer 100%-Wert + Size aPercentSize; // Size for 100% value SvxSwFrameValidation() : bAutoHeight(false), @@ -85,3 +86,4 @@ struct SvxSwFrameValidation #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxallitm.hxx b/svx/inc/svx/sxallitm.hxx index b71a05d9e6..da6b6ac7b3 100644 --- a/svx/inc/svx/sxallitm.hxx +++ b/svx/inc/svx/sxallitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx index 28221d57ba..da4c5b3670 100644 --- a/svx/inc/svx/sxcaitm.hxx +++ b/svx/inc/svx/sxcaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <svx/svddef.hxx> -#ifndef _SDRANGITM_HXX #include <svx/sdangitm.hxx> -#endif #include <svx/sdooitm.hxx> //------------------------------------ @@ -58,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx index a42215af07..d2c8d11069 100644 --- a/svx/inc/svx/sxcecitm.hxx +++ b/svx/inc/svx/sxcecitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxcgitm.hxx b/svx/inc/svx/sxcgitm.hxx index eab00df9cc..74e11d812c 100644 --- a/svx/inc/svx/sxcgitm.hxx +++ b/svx/inc/svx/sxcgitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxciaitm.hxx b/svx/inc/svx/sxciaitm.hxx index ecdb621132..2ebd236973 100644 --- a/svx/inc/svx/sxciaitm.hxx +++ b/svx/inc/svx/sxciaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx index a4ff9f309a..006bd0b6e4 100644 --- a/svx/inc/svx/sxcikitm.hxx +++ b/svx/inc/svx/sxcikitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,11 +46,13 @@ public: virtual USHORT GetValueCount() const; // { return 4; } SdrCircKind GetValue() const { return (SdrCircKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueTextByPos(USHORT nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxcllitm.hxx b/svx/inc/svx/sxcllitm.hxx index 48b943219d..915c39e60e 100644 --- a/svx/inc/svx/sxcllitm.hxx +++ b/svx/inc/svx/sxcllitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx index fbfef44d2b..568328ddaa 100644 --- a/svx/inc/svx/sxctitm.hxx +++ b/svx/inc/svx/sxctitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx index cb62886899..99face04ea 100644 --- a/svx/inc/svx/sxekitm.hxx +++ b/svx/inc/svx/sxekitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,10 +50,12 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; virtual USHORT GetValueCount() const; // { return 5; } SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueTextByPos(USHORT nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxelditm.hxx b/svx/inc/svx/sxelditm.hxx index 8140c88fb2..0d9f294867 100644 --- a/svx/inc/svx/sxelditm.hxx +++ b/svx/inc/svx/sxelditm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,24 +42,26 @@ class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public SdrMetricItem { public: SdrEdgeLine1DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal) {} SdrEdgeLine1DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeLine2DeltaItem: public SdrMetricItem { public: SdrEdgeLine2DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE2DELTA,nVal) {} SdrEdgeLine2DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE2DELTA,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeLine3DeltaItem: public SdrMetricItem { public: SdrEdgeLine3DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE3DELTA,nVal) {} SdrEdgeLine3DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE3DELTA,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxenditm.hxx b/svx/inc/svx/sxenditm.hxx index edac60d579..403dff7f33 100644 --- a/svx/inc/svx/sxenditm.hxx +++ b/svx/inc/svx/sxenditm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,32 +36,32 @@ class SVX_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem { public: SdrEdgeNode1HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} SdrEdgeNode1HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { public: SdrEdgeNode1VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} SdrEdgeNode1VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { public: SdrEdgeNode2HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} SdrEdgeNode2HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { public: SdrEdgeNode2VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} SdrEdgeNode2VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; class SdrEdgeNode1GlueDistItem: public SdrMetricItem { @@ -76,3 +77,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx index 017a4d42cc..63d8a453ca 100644 --- a/svx/inc/svx/sxfiitm.hxx +++ b/svx/inc/svx/sxfiitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx index c13d950ae6..9bb548df81 100644 --- a/svx/inc/svx/sxlayitm.hxx +++ b/svx/inc/svx/sxlayitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxlogitm.hxx b/svx/inc/svx/sxlogitm.hxx index 9689a90a2f..ccf0ef8209 100644 --- a/svx/inc/svx/sxlogitm.hxx +++ b/svx/inc/svx/sxlogitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmbritm.hxx b/svx/inc/svx/sxmbritm.hxx index f6765fc7f0..04141d4784 100644 --- a/svx/inc/svx/sxmbritm.hxx +++ b/svx/inc/svx/sxmbritm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <svx/svddef.hxx> -#ifndef SXMBRITM_HXX #include <svx/sdynitm.hxx> -#endif // Die Masslinie unterhalb der Bezugskante // Zur Bemassung einer Objektunterkante @@ -46,3 +45,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmfsitm.hxx b/svx/inc/svx/sxmfsitm.hxx index 3ff6630d4b..b977813587 100644 --- a/svx/inc/svx/sxmfsitm.hxx +++ b/svx/inc/svx/sxmfsitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx index 6ff09ccc57..9c172e35f9 100644 --- a/svx/inc/svx/sxmkitm.hxx +++ b/svx/inc/svx/sxmkitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,11 +46,13 @@ public: virtual USHORT GetValueCount() const; // { return 2; } SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueTextByPos(USHORT nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmlhitm.hxx b/svx/inc/svx/sxmlhitm.hxx index 1b36f6c6f4..608d004f7d 100644 --- a/svx/inc/svx/sxmlhitm.hxx +++ b/svx/inc/svx/sxmlhitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmoitm.hxx b/svx/inc/svx/sxmoitm.hxx index f80d1e971c..6c7d8f7525 100644 --- a/svx/inc/svx/sxmoitm.hxx +++ b/svx/inc/svx/sxmoitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmovitm.hxx b/svx/inc/svx/sxmovitm.hxx index f6e6e08a55..2fe2d0989d 100644 --- a/svx/inc/svx/sxmovitm.hxx +++ b/svx/inc/svx/sxmovitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmsitm.hxx b/svx/inc/svx/sxmsitm.hxx index e7b5d002e3..07b31963fd 100644 --- a/svx/inc/svx/sxmsitm.hxx +++ b/svx/inc/svx/sxmsitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmspitm.hxx b/svx/inc/svx/sxmspitm.hxx index 708009da14..41753b4b93 100644 --- a/svx/inc/svx/sxmspitm.hxx +++ b/svx/inc/svx/sxmspitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmsuitm.hxx b/svx/inc/svx/sxmsuitm.hxx index 505d0672a4..af9109caf8 100644 --- a/svx/inc/svx/sxmsuitm.hxx +++ b/svx/inc/svx/sxmsuitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmtaitm.hxx b/svx/inc/svx/sxmtaitm.hxx index ccaec77c43..8d60ba3c7c 100644 --- a/svx/inc/svx/sxmtaitm.hxx +++ b/svx/inc/svx/sxmtaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmtfitm.hxx b/svx/inc/svx/sxmtfitm.hxx index 90c4dc29d3..d358bf7555 100644 --- a/svx/inc/svx/sxmtfitm.hxx +++ b/svx/inc/svx/sxmtfitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx index 411efd4acb..edd37c9b08 100644 --- a/svx/inc/svx/sxmtpitm.hxx +++ b/svx/inc/svx/sxmtpitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,8 +48,8 @@ public: virtual USHORT GetValueCount() const; // { return 4; } SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueTextByPos(USHORT nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; @@ -67,11 +68,13 @@ public: virtual USHORT GetValueCount() const; // { return 5; } SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueTextByPos(USHORT nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmtritm.hxx b/svx/inc/svx/sxmtritm.hxx index 6c3332e96f..89581fa28d 100644 --- a/svx/inc/svx/sxmtritm.hxx +++ b/svx/inc/svx/sxmtritm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx index 57dc5f70c4..a0dec32fd3 100644 --- a/svx/inc/svx/sxmuitm.hxx +++ b/svx/inc/svx/sxmuitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,11 +45,13 @@ public: virtual USHORT GetValueCount() const; // { return 14; } FieldUnit GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual String GetValueTextByPos(USHORT nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxoneitm.hxx b/svx/inc/svx/sxoneitm.hxx index 3994a224e0..a80bc692a5 100644 --- a/svx/inc/svx/sxoneitm.hxx +++ b/svx/inc/svx/sxoneitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxonitm.hxx b/svx/inc/svx/sxonitm.hxx index 6577f3d0d5..de3a855e25 100644 --- a/svx/inc/svx/sxonitm.hxx +++ b/svx/inc/svx/sxonitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxopitm.hxx b/svx/inc/svx/sxopitm.hxx index cce103b716..4bb7954dd8 100644 --- a/svx/inc/svx/sxopitm.hxx +++ b/svx/inc/svx/sxopitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxraitm.hxx b/svx/inc/svx/sxraitm.hxx index 3e163d511d..2edebe2d6d 100644 --- a/svx/inc/svx/sxraitm.hxx +++ b/svx/inc/svx/sxraitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxreaitm.hxx b/svx/inc/svx/sxreaitm.hxx index bf1c214557..727b85df72 100644 --- a/svx/inc/svx/sxreaitm.hxx +++ b/svx/inc/svx/sxreaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <svx/svddef.hxx> -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif //------------------------------ // class SdrResizeXAllItem @@ -54,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxreoitm.hxx b/svx/inc/svx/sxreoitm.hxx index 6a70ba5cca..d33fea2dee 100644 --- a/svx/inc/svx/sxreoitm.hxx +++ b/svx/inc/svx/sxreoitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <svx/svddef.hxx> -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif //------------------------------ // class SdrResizeXOneItem @@ -54,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxroaitm.hxx b/svx/inc/svx/sxroaitm.hxx index 4aae18f18a..a257e399fe 100644 --- a/svx/inc/svx/sxroaitm.hxx +++ b/svx/inc/svx/sxroaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxrooitm.hxx b/svx/inc/svx/sxrooitm.hxx index 724ae030ce..fa1614efa0 100644 --- a/svx/inc/svx/sxrooitm.hxx +++ b/svx/inc/svx/sxrooitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxsaitm.hxx b/svx/inc/svx/sxsaitm.hxx index 39c4738e2b..7648722da8 100644 --- a/svx/inc/svx/sxsaitm.hxx +++ b/svx/inc/svx/sxsaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxsalitm.hxx b/svx/inc/svx/sxsalitm.hxx index 0333d8bd59..c2d40dbe44 100644 --- a/svx/inc/svx/sxsalitm.hxx +++ b/svx/inc/svx/sxsalitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx index e984f38bb2..5a1cc93447 100644 --- a/svx/inc/svx/sxsiitm.hxx +++ b/svx/inc/svx/sxsiitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef _SXSIITM_HXX #define _SXSIITM_HXX -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif class SdrScaleItem: public SdrFractionItem { public: @@ -43,3 +42,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxsoitm.hxx b/svx/inc/svx/sxsoitm.hxx index 8a53e3dfca..b4ed5ec88d 100644 --- a/svx/inc/svx/sxsoitm.hxx +++ b/svx/inc/svx/sxsoitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxtraitm.hxx b/svx/inc/svx/sxtraitm.hxx index 442f89ef7c..2b2bb6c4be 100644 --- a/svx/inc/svx/sxtraitm.hxx +++ b/svx/inc/svx/sxtraitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx index 79b31cac28..0339d284e5 100644 --- a/svx/inc/svx/tabarea.hxx +++ b/svx/inc/svx/tabarea.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,6 @@ #endif #ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svx/dlgctrl.hxx> #include <svx/xsetit.hxx> #include <svx/xfillit0.hxx> @@ -74,3 +74,4 @@ class SdrView; #endif // _SVX_TAB_AREA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx index eacd2dc739..ef46e515cc 100644 --- a/svx/inc/svx/tabline.hxx +++ b/svx/inc/svx/tabline.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,6 @@ #endif #ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/stdctrl.hxx> #include <svx/svdpage.hxx> #include <svx/xlineit0.hxx> @@ -64,3 +64,4 @@ class SdrObject; #endif // _SVX_TAB_LINE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index ff2301f52a..66b486159b 100644 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -445,3 +446,5 @@ public: }; #endif // #ifndef _SVX_TBCONTRL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx index bc674472aa..6e97892565 100644 --- a/svx/inc/svx/tbxalign.hxx +++ b/svx/inc/svx/tbxalign.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ private: rtl::OUString m_aCommand; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxcolor.hxx b/svx/inc/svx/tbxcolor.hxx index 3581093654..b06afcfe7e 100644 --- a/svx/inc/svx/tbxcolor.hxx +++ b/svx/inc/svx/tbxcolor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ namespace svx #endif // #ifndef _SVX_TBXCOLOR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/svx/inc/svx/tbxcolorupdate.hxx index 4c38a3aa76..c2f61b8ae3 100644 --- a/svx/inc/svx/tbxcolorupdate.hxx +++ b/svx/inc/svx/tbxcolorupdate.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ namespace svx //........................................................................ #endif // SVX_TBXCOLORUPDATE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx index eee93e3d7b..e3a5c155fa 100644 --- a/svx/inc/svx/tbxctl.hxx +++ b/svx/inc/svx/tbxctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ /************************************************************************* |* -|* Klasse f"ur SwToolbox +|* Class for SwToolbox |* \************************************************************************/ @@ -60,3 +61,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx index 4265b9af44..581d7ed52b 100644 --- a/svx/inc/svx/tbxcustomshapes.hxx +++ b/svx/inc/svx/tbxcustomshapes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx index d4aceb2c32..6ca407184b 100644 --- a/svx/inc/svx/tbxdraw.hxx +++ b/svx/inc/svx/tbxdraw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,4 @@ public: #endif // _TBX_DRAW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/txencbox.hxx b/svx/inc/svx/txencbox.hxx index a37cf0aad7..80462b6aa2 100644 --- a/svx/inc/svx/txencbox.hxx +++ b/svx/inc/svx/txencbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <rtl/textenc.h> #include "svx/svxdllapi.h" @@ -119,3 +118,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/txenctab.hxx b/svx/inc/svx/txenctab.hxx index a1d28b2695..5baa6444f4 100644 --- a/svx/inc/svx/txenctab.hxx +++ b/svx/inc/svx/txenctab.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _RESARY_HXX //autogen #include <tools/resary.hxx> -#endif #include <rtl/textenc.h> #include "svx/svxdllapi.h" @@ -53,3 +52,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ucsubset.hxx b/svx/inc/svx/ucsubset.hxx index 0dc9496c0c..22e8ce7f1e 100644 --- a/svx/inc/svx/ucsubset.hxx +++ b/svx/inc/svx/ucsubset.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoapi.hxx b/svx/inc/svx/unoapi.hxx index 2f9a16b91c..c40e276702 100644 --- a/svx/inc/svx/unoapi.hxx +++ b/svx/inc/svx/unoapi.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,4 @@ SVX_DLLPUBLIC void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const r #endif // _SVX_UNOAPI_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unofill.hxx b/svx/inc/svx/unofill.hxx index 5579c2202d..3f05501d0c 100644 --- a/svx/inc/svx/unofill.hxx +++ b/svx/inc/svx/unofill.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterfac #endif // _SVX_UNOFILL_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unomaster.hxx b/svx/inc/svx/unomaster.hxx index 670d575a53..e34ab41ed3 100644 --- a/svx/inc/svx/unomaster.hxx +++ b/svx/inc/svx/unomaster.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unomid.hxx b/svx/inc/svx/unomid.hxx index 9c49f4eda6..5d991e6a0e 100644 --- a/svx/inc/svx/unomid.hxx +++ b/svx/inc/svx/unomid.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,5 @@ #define MID_LEFT 3 #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unomod.hxx b/svx/inc/svx/unomod.hxx index 08fb0102d8..3daaf4af36 100644 --- a/svx/inc/svx/unomod.hxx +++ b/svx/inc/svx/unomod.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unomodel.hxx b/svx/inc/svx/unomodel.hxx index 0f13b9eeb3..dd0b5cce99 100644 --- a/svx/inc/svx/unomodel.hxx +++ b/svx/inc/svx/unomodel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,4 @@ SVX_DLLPUBLIC extern sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const com #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index b01c13b55a..6bf6b5ad0a 100644 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,16 +37,14 @@ #include <com/sun/star/drawing/XShapeGrouper.hpp> #include <com/sun/star/drawing/XShapeCombiner.hpp> #include <com/sun/star/drawing/XShapeBinder.hpp> -#ifndef _COM_SUN_STAR_UNO_XUNOTUNNEL_HPP_ #include <com/sun/star/lang/XUnoTunnel.hpp> -#endif #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <svl/lstner.hxx> #include <editeng/mutxhelp.hxx> #include "svx/svxdllapi.h" -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase5.hxx> #include <comphelper/servicehelper.hxx> #include <svx/unoprov.hxx> @@ -61,7 +60,6 @@ class SvxShape; class SvxShapeGroup; class SvxShapeConnector; class SvxShapeList; -class SvxDrawPageList; /*********************************************************************** * Macros fuer Umrechnung Twips<->100tel mm * @@ -158,3 +156,4 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unopool.hxx b/svx/inc/svx/unopool.hxx index 49baf26ee4..d74003faf4 100644 --- a/svx/inc/svx/unopool.hxx +++ b/svx/inc/svx/unopool.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index 06a1a7a284..e8a888148a 100644 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,29 +41,14 @@ class SfxItemPool; * class UHashMap * ***********************************************************************/ -struct UHashMapEntry -{ - ::rtl::OUString aIdentifier; - UINT32 nId; - - UHashMapEntry(const sal_Char * value, sal_Int32 length, UINT32 _nId) : aIdentifier(value,length,RTL_TEXTENCODING_ASCII_US), nId(_nId) { } -}; - -DECLARE_LIST( UHashMapEntryList, UHashMapEntry* ) - -#define HASHARRAYSIZE 0x10 #define UHASHMAP_NOTFOUND sal::static_int_cast< UINT32 >(~0) - class UHashMap { -private: - UHashMapEntryList m_aHashList[HASHARRAYSIZE]; - + UHashMap() {} public: - UHashMap( UHashMapEntry* pMap ); - ~UHashMap() {}; - - UINT32 getId( const ::rtl::OUString& rCompareString ); + static sal_uInt32 getId( const ::rtl::OUString& rCompareString ); + static rtl::OUString getNameFromId (sal_uInt32 nId); + static ::com::sun::star::uno::Sequence< rtl::OUString > getServiceNames(); }; /*********************************************************************** @@ -119,8 +105,6 @@ const sal_Int16 OBJ_OLE2_APPLET = 100; const sal_Int16 OBJ_OLE2_PLUGIN = 101; extern SvxUnoPropertyMapProvider aSvxMapProvider; -extern UHashMapEntry pSdrShapeIdentifierMap[]; -extern UHashMap aSdrShapeIdentifierMap; #define E3D_INVENTOR_FLAG (0x80000000) @@ -147,3 +131,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index 01fcb99dec..2e3df7a9b4 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,12 +70,11 @@ class SfxItemSet; class SdrModel; class SvxDrawPage; class SvGlobalName; -// --> OD 2009-01-16 #i59051# +// Dimension arrows change size/position on save/reload (#i59051#) namespace basegfx { class B2DPolyPolygon; } // end of namespace basegfx -// <-- class SvxShapeMutex { @@ -139,10 +139,9 @@ protected: // Umrechnungen fuer den Writer, der in TWIPS arbeitet void ForceMetricToItemPoolMetric(Pair& rPoint) const throw(); void ForceMetricTo100th_mm(Pair& rPoint) const throw(); - // --> OD 2009-01-16 #i59051# + // Dimension arrows change size/position on save/reload (#i59051#) void ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); void ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); - // <-- ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const; @@ -209,9 +208,6 @@ public: and the property found is returned instead of set at the object directly. */ -// os: unused function -// static ::com::sun::star::uno::Any SAL_CALL GetFillAttributeByName( -// const ::rtl::OUString& rPropertyName, const ::rtl::OUString& rName, SdrModel* pModel ); UNO3_GETIMPLEMENTATION_DECL( SvxShape ) @@ -235,12 +231,6 @@ public: // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw (); - - /** @obsolete - not used anymore - */ - virtual void onUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundRect); - // XAggregation virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); @@ -839,7 +829,6 @@ protected: public: SvxCustomShape( SdrObject* pObj ) throw (); // overide these for special property handling in subcasses. Return true if property is handled - //virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertyMapEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -890,3 +879,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoshcol.hxx b/svx/inc/svx/unoshcol.hxx index 8783cb9521..711d317664 100644 --- a/svx/inc/svx/unoshcol.hxx +++ b/svx/inc/svx/unoshcol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index 4d537cd09d..bf3291ab5b 100644 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -532,3 +533,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx index 8ccfa9e52f..603857020b 100644 --- a/svx/inc/svx/unoshtxt.hxx +++ b/svx/inc/svx/unoshtxt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx index 2fa88fe614..0401ac43f3 100644 --- a/svx/inc/svx/verttexttbxctrl.hxx +++ b/svx/inc/svx/verttexttbxctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,9 @@ #include <sfx2/tbxctrl.hxx> #include "svx/svxdllapi.h" -/* -----------------------------27.04.01 15:38-------------------------------- - control to remove/insert cjk settings dependent vertical text toolbox item - ---------------------------------------------------------------------------*/ +/* + control to remove/insert cjk settings dependent vertical text toolbox item + */ class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl { sal_Bool bCheckVertical; //determines whether vertical mode or CTL mode has to be checked @@ -45,18 +46,14 @@ public: void SetVert(sal_Bool bSet) {bCheckVertical = bSet;} }; -/* -----------------------------12.09.2002 11:50------------------------------ - ---------------------------------------------------------------------------*/ class SVX_DLLPUBLIC SvxCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl { public: SFX_DECL_TOOLBOX_CONTROL(); SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ); }; -/* -----------------------------12.09.2002 11:50------------------------------ - ---------------------------------------------------------------------------*/ class SVX_DLLPUBLIC SvxVertTextTbxCtrl : public SvxVertCTLTextTbxCtrl { public: @@ -65,3 +62,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx index f30c3be8b9..e335daeb10 100644 --- a/svx/inc/svx/view3d.hxx +++ b/svx/inc/svx/view3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -275,3 +276,5 @@ public: }; #endif // _E3D_VIEW3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx index 6484c4cac0..41d476e6c7 100644 --- a/svx/inc/svx/viewlayoutitem.hxx +++ b/svx/inc/svx/viewlayoutitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,6 @@ #include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "svx/svxdllapi.h" //------------------------------------------------------------------------- @@ -54,10 +54,12 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const; // leer virtual SvStream& Store( SvStream& rStrm , USHORT nItemVersion ) const; // leer - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer }; //------------------------------------------------------------------------ #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx index 734a56827e..35340aa97d 100644 --- a/svx/inc/svx/viewpt3d.hxx +++ b/svx/inc/svx/viewpt3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,5 @@ class SVX_DLLPUBLIC Viewport3D }; #endif // _VIEWPT3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/volume3d.hxx b/svx/inc/svx/volume3d.hxx index 0254a49ec7..513fa53527 100644 --- a/svx/inc/svx/volume3d.hxx +++ b/svx/inc/svx/volume3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,3 +32,5 @@ #include <basegfx/range/b3drange.hxx> #endif // _VOLUME3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx index 54b7eba0d6..8270fb1091 100644 --- a/svx/inc/svx/wrapfield.hxx +++ b/svx/inc/svx/wrapfield.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ protected: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xattr.hxx b/svx/inc/svx/xattr.hxx index d4f4bd42e1..30f9981804 100644 --- a/svx/inc/svx/xattr.hxx +++ b/svx/inc/svx/xattr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,21 +28,6 @@ #ifndef _XATTR_HXX #define _XATTR_HXX -// include --------------------------------------------------------------- - -#ifndef _XDEF_HXX -//#include <svx/xdef.hxx> -#endif -#ifndef _XENUM_HXX -//#include <svx/xenum.hxx> -#endif -#ifndef _XPOLY_HXX -//#include <svx/xpoly.hxx> -#endif -#ifndef _SVX_RECTENUM_HXX -//#include <svx/rectenum.hxx> -#endif - class XColorTable; class XDashTable; class XLineEndTable; @@ -65,3 +51,4 @@ class XGradientTable; #endif // _XATTR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx index 187a0678d4..a54b201de3 100644 --- a/svx/inc/svx/xbitmap.hxx +++ b/svx/inc/svx/xbitmap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,6 @@ #define _SVX_XBITMAP_HXX #include <tools/color.hxx> -#ifndef _BITMAP_HXX //autogen #include <vcl/bitmap.hxx> #endif #include <svtools/grfmgr.hxx> @@ -98,3 +98,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx index f0426d0210..f604b99493 100644 --- a/svx/inc/svx/xbtmpit.hxx +++ b/svx/inc/svx/xbtmpit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,8 +59,8 @@ public: virtual SvStream& Store( SvStream& rOut, USHORT nItemVersion ) const; virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -74,3 +75,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx index e419ac8413..884da1e411 100644 --- a/svx/inc/svx/xcolit.hxx +++ b/svx/inc/svx/xcolit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,8 +48,8 @@ public: XColorItem() {} XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor); XColorItem(USHORT nWhich, SvStream& rIn); @@ -65,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xdash.hxx b/svx/inc/svx/xdash.hxx index bacc17de97..151e89edeb 100644 --- a/svx/inc/svx/xdash.hxx +++ b/svx/inc/svx/xdash.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx index f65dfb6de7..6600a8e202 100644 --- a/svx/inc/svx/xdef.hxx +++ b/svx/inc/svx/xdef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,5 @@ #define XATTR_END XATTR_TEXT_LAST #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xenum.hxx b/svx/inc/svx/xenum.hxx index 433799c928..6a19588533 100644 --- a/svx/inc/svx/xenum.hxx +++ b/svx/inc/svx/xenum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ enum XBitmapType { XBITMAP_IMPORT, XBITMAP_8X8, XBITMAP_NONE, #endif // _XENUM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xexch.hxx b/svx/inc/svx/xexch.hxx index bb18e46231..ae997866e0 100644 --- a/svx/inc/svx/xexch.hxx +++ b/svx/inc/svx/xexch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ #include "svx/svxdllapi.h" //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Clipboard-Format fuer XOutDev-Fuellattribute +// Clipboard format for XOutDev filling attributes //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ class XFillAttrSetItem; @@ -54,7 +55,6 @@ public: XFillExchangeData(const XFillAttrSetItem rXFillAttrSetItem); virtual ~XFillExchangeData(); - // Zuweisungsoperator XFillExchangeData& operator=( const XFillExchangeData& rXFillExchangeData ); SVX_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData ); @@ -65,3 +65,5 @@ public: }; #endif // _SVX_XEXCH_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx index 3a35a0d6d8..3a0d9aa7b7 100644 --- a/svx/inc/svx/xfillit.hxx +++ b/svx/inc/svx/xfillit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SVX_FILLITEM_HXX #define _SVX_FILLITEM_HXX -#ifndef _BITMAP_HXX //autogen #include <vcl/bitmap.hxx> -#endif #include <svx/xcolit.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> @@ -49,3 +48,5 @@ class XGradient; class XOBitmap; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx index b32a691034..50e63a0137 100644 --- a/svx/inc/svx/xfillit0.hxx +++ b/svx/inc/svx/xfillit0.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,8 +49,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -61,3 +62,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx index 7e65ff6bc4..363463cdd0 100644 --- a/svx/inc/svx/xflasit.hxx +++ b/svx/inc/svx/xflasit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx index e6c817dfa5..5c74202fa5 100644 --- a/svx/inc/svx/xflbckit.hxx +++ b/svx/inc/svx/xflbckit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx index b352dfe4cf..d4591193cd 100644 --- a/svx/inc/svx/xflbmpit.hxx +++ b/svx/inc/svx/xflbmpit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx index 4ec7fd9e59..f420c1f7bc 100644 --- a/svx/inc/svx/xflbmsli.hxx +++ b/svx/inc/svx/xflbmsli.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx index 459819e227..2007430545 100644 --- a/svx/inc/svx/xflbmsxy.hxx +++ b/svx/inc/svx/xflbmsxy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,7 +56,7 @@ public: // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen // wir hier beruecksichtigen - SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const; + SVX_DLLPRIVATE virtual bool HasMetrics() const; }; /************************************************************************* @@ -82,7 +83,9 @@ public: // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen // wir hier beruecksichtigen - SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const; + SVX_DLLPRIVATE virtual bool HasMetrics() const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx index 69b44b5738..e2c1f81821 100644 --- a/svx/inc/svx/xflbmtit.hxx +++ b/svx/inc/svx/xflbmtit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx index b41d11ece9..eb9b5173a9 100644 --- a/svx/inc/svx/xflboxy.hxx +++ b/svx/inc/svx/xflboxy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx index 01af18d79f..804582933a 100644 --- a/svx/inc/svx/xflbstit.hxx +++ b/svx/inc/svx/xflbstit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx index d205ae439b..4fe87bcffe 100644 --- a/svx/inc/svx/xflbtoxy.hxx +++ b/svx/inc/svx/xflbtoxy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx index 4f8ee4b9d5..b6194eb9b5 100644 --- a/svx/inc/svx/xflclit.hxx +++ b/svx/inc/svx/xflclit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,8 +51,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -61,3 +62,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx index a8b016418b..92c85b6304 100644 --- a/svx/inc/svx/xflftrit.hxx +++ b/svx/inc/svx/xflftrit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,8 +57,8 @@ public: virtual int operator==( const SfxPoolItem& rItem ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * pIntlWrapper = 0 ) const; @@ -70,3 +71,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx index 42543a6df2..a3fb726ffc 100644 --- a/svx/inc/svx/xflgrit.hxx +++ b/svx/inc/svx/xflgrit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,8 +58,8 @@ public: virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -72,3 +73,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx index 955184cc42..ce12f8a832 100644 --- a/svx/inc/svx/xflhtit.hxx +++ b/svx/inc/svx/xflhtit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,14 +57,14 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual FASTBOOL HasMetrics() const; - virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); + virtual bool HasMetrics() const; + virtual bool ScaleMetrics(long nMul, long nDiv); const XHatch& GetHatchValue(const XHatchTable* pTable = 0) const; // GetValue -> GetHatchValue void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue @@ -74,3 +75,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx index b23a236b23..a6d9b11e57 100644 --- a/svx/inc/svx/xfltrit.hxx +++ b/svx/inc/svx/xfltrit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx index 45c9821eca..0973c0c596 100644 --- a/svx/inc/svx/xftadit.hxx +++ b/svx/inc/svx/xftadit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,8 +49,10 @@ public: virtual USHORT GetValueCount() const; XFormTextAdjust GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx index 03942d3345..5236533d6c 100644 --- a/svx/inc/svx/xftdiit.hxx +++ b/svx/inc/svx/xftdiit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx index b6d514f64b..7a549d1500 100644 --- a/svx/inc/svx/xftmrit.hxx +++ b/svx/inc/svx/xftmrit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftouit.hxx b/svx/inc/svx/xftouit.hxx index 9643eda921..e7f05862f8 100644 --- a/svx/inc/svx/xftouit.hxx +++ b/svx/inc/svx/xftouit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx index ade90a7122..58ee833d2d 100644 --- a/svx/inc/svx/xftsfit.hxx +++ b/svx/inc/svx/xftsfit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,9 +48,10 @@ public: virtual USHORT GetValueCount() const; XFormTextStdForm GetValue() const { return (XFormTextStdForm) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftshcit.hxx b/svx/inc/svx/xftshcit.hxx index 0ebca5673c..eb8d670750 100644 --- a/svx/inc/svx/xftshcit.hxx +++ b/svx/inc/svx/xftshcit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx index 532a996b27..5d098153af 100644 --- a/svx/inc/svx/xftshit.hxx +++ b/svx/inc/svx/xftshit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,9 +49,10 @@ public: virtual USHORT GetValueCount() const; XFormTextShadow GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx index 2e1245a2d4..0abb9a3a4d 100644 --- a/svx/inc/svx/xftshtit.hxx +++ b/svx/inc/svx/xftshtit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx index aae03c6eb5..7c5dbae59b 100644 --- a/svx/inc/svx/xftshxy.hxx +++ b/svx/inc/svx/xftshxy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx index d9eb6cb847..5cc74b2979 100644 --- a/svx/inc/svx/xftstit.hxx +++ b/svx/inc/svx/xftstit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xgrad.hxx b/svx/inc/svx/xgrad.hxx index 2f6b9d49f1..f905c3b0c0 100644 --- a/svx/inc/svx/xgrad.hxx +++ b/svx/inc/svx/xgrad.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx index e002e3eafe..43f0b476b3 100644 --- a/svx/inc/svx/xgrscit.hxx +++ b/svx/inc/svx/xgrscit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xhatch.hxx b/svx/inc/svx/xhatch.hxx index 823463733b..4c1761a01d 100644 --- a/svx/inc/svx/xhatch.hxx +++ b/svx/inc/svx/xhatch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx index 9b7de6297c..a825b84237 100644 --- a/svx/inc/svx/xit.hxx +++ b/svx/inc/svx/xit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx index 37fb9d56a1..d9afba2cfa 100644 --- a/svx/inc/svx/xlineit.hxx +++ b/svx/inc/svx/xlineit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,4 @@ class SvStream; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx index 1937035566..26f5027db4 100644 --- a/svx/inc/svx/xlineit0.hxx +++ b/svx/inc/svx/xlineit0.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,8 +45,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -57,3 +58,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx index 90ea7c4b50..5680d2b26b 100644 --- a/svx/inc/svx/xlinjoit.hxx +++ b/svx/inc/svx/xlinjoit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,8 +48,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; @@ -58,3 +59,5 @@ public: }; #endif // _SVX_XLINJOIT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx index ba6a248286..8a09266e3a 100644 --- a/svx/inc/svx/xlnasit.hxx +++ b/svx/inc/svx/xlnasit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx index 0467a2fea6..e5b930c3ba 100644 --- a/svx/inc/svx/xlnclit.hxx +++ b/svx/inc/svx/xlnclit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,8 +47,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -56,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx index c476a7848c..d091ea9cc7 100644 --- a/svx/inc/svx/xlndsit.hxx +++ b/svx/inc/svx/xlndsit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <svx/xit.hxx> -#ifndef _SVX_XLINIIT_HXX //autogen #include <svx/xdash.hxx> -#endif #include "svx/svxdllapi.h" class SdrModel; @@ -59,15 +58,15 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual FASTBOOL HasMetrics() const; - virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); + virtual bool HasMetrics() const; + virtual bool ScaleMetrics(long nMul, long nDiv); const XDash& GetDashValue(const XDashTable* pTable = 0) const; // GetValue -> GetDashValue void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue @@ -78,3 +77,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx index 988705b026..13a9bd9897 100644 --- a/svx/inc/svx/xlnedcit.hxx +++ b/svx/inc/svx/xlnedcit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,8 +44,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -53,3 +54,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx index df85abc4c6..e9f131e2e1 100644 --- a/svx/inc/svx/xlnedit.hxx +++ b/svx/inc/svx/xlnedit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,8 +56,8 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -70,3 +71,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx index 0651824e0e..de84722e46 100644 --- a/svx/inc/svx/xlnedwit.hxx +++ b/svx/inc/svx/xlnedwit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,8 +47,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -57,3 +58,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx index ffbdfe0ab0..3e4a8da2fd 100644 --- a/svx/inc/svx/xlnstcit.hxx +++ b/svx/inc/svx/xlnstcit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,8 +44,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -54,3 +55,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx index 0572ec9c38..393a68367a 100644 --- a/svx/inc/svx/xlnstit.hxx +++ b/svx/inc/svx/xlnstit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,8 +56,8 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -70,3 +71,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx index 02ff94f48c..6f17e4ff8b 100644 --- a/svx/inc/svx/xlnstwit.hxx +++ b/svx/inc/svx/xlnstwit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,8 +46,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -56,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx index 377f4dcfcb..213ac41478 100644 --- a/svx/inc/svx/xlntrit.hxx +++ b/svx/inc/svx/xlntrit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx index f4f24a2f56..3ba8daf089 100644 --- a/svx/inc/svx/xlnwtit.hxx +++ b/svx/inc/svx/xlnwtit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,8 +44,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -53,3 +54,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx index 4e4982d045..aa532d2388 100644 --- a/svx/inc/svx/xmleohlp.hxx +++ b/svx/inc/svx/xmleohlp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -147,3 +148,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xmlexchg.hxx b/svx/inc/svx/xmlexchg.hxx index eab60f07ad..08e753adf6 100644 --- a/svx/inc/svx/xmlexchg.hxx +++ b/svx/inc/svx/xmlexchg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,4 @@ namespace svx #endif // _SVX_XMLEXCHG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx index 7df268a39c..67c637f8cf 100644 --- a/svx/inc/svx/xmlgrhlp.hxx +++ b/svx/inc/svx/xmlgrhlp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,5 @@ SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicExportHelper_getImplementatio } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx index cadcc55fc5..f6da616aee 100644 --- a/svx/inc/svx/xmlsecctrl.hxx +++ b/svx/inc/svx/xmlsecctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx index 21ab95e2f6..d531947f0d 100644 --- a/svx/inc/svx/xoutbmp.hxx +++ b/svx/inc/svx/xoutbmp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ public: SVX_DLLPUBLIC BOOL DitherBitmap( Bitmap& rBitmap ); #endif // _XOUTBMP_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx index a8ccd34713..aedd8ff432 100644 --- a/svx/inc/svx/xpoly.hxx +++ b/svx/inc/svx/xpoly.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -210,3 +211,5 @@ public: #endif // _XPOLY_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx index 4f5dba0c06..0fee8edfae 100644 --- a/svx/inc/svx/xpool.hxx +++ b/svx/inc/svx/xpool.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ protected: }; #endif // _XPOOL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx index f40b9fa939..3d0de667dd 100644 --- a/svx/inc/svx/xsetit.hxx +++ b/svx/inc/svx/xsetit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,7 +29,6 @@ #ifndef _SVX_XSETITEM_HXX #define _SVX_XSETITEM_HXX -#ifndef _XATTR_HXX #include <svx/xit.hxx> #endif #include <svl/metitem.hxx> @@ -51,3 +51,5 @@ #include <svx/xflbckit.hxx> #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx index ef65257c2c..f3838dc39c 100644 --- a/svx/inc/svx/xsflclit.hxx +++ b/svx/inc/svx/xsflclit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index 444d2cf984..1cce2de703 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,14 +38,10 @@ #include <svx/xflasit.hxx> #include <svx/xlnasit.hxx> -#ifndef _SV_COLOR_HXX #include <tools/color.hxx> -#endif #include <tools/string.hxx> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include "svx/svxdllapi.h" #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -58,7 +55,7 @@ class XOutdevItemPool; #define BITMAP_HEIGHT 12 // Standard-Vergleichsstring -extern sal_Unicode __FAR_DATA pszStandard[]; // "standard" +extern sal_Unicode pszStandard[]; // "standard" // Funktion zum Konvertieren in echte RGB-Farben, da mit // enum COL_NAME nicht verglichen werden kann. @@ -651,3 +648,5 @@ public: }; #endif // _XTABLE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx index 85061cf2c1..f8a4d39d34 100644 --- a/svx/inc/svx/xtextit.hxx +++ b/svx/inc/svx/xtextit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx index e7c981633c..1edf46edca 100644 --- a/svx/inc/svx/xtextit0.hxx +++ b/svx/inc/svx/xtextit0.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,8 +50,8 @@ public: virtual USHORT GetValueCount() const; XFormTextStyle GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; /************************************************************************* @@ -70,3 +71,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx index 2d2ce9408c..a377b6ece1 100644 --- a/svx/inc/svx/zoom_def.hxx +++ b/svx/inc/svx/zoom_def.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef _SVX_ZOOM_DEF_HXX #define _SVX_ZOOM_DEF_HXX @@ -6,3 +7,5 @@ #define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx index b3386b207b..42dc766639 100644 --- a/svx/inc/svx/zoomctrl.hxx +++ b/svx/inc/svx/zoomctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx index 3405b5eda4..6963f26085 100644 --- a/svx/inc/svx/zoomitem.hxx +++ b/svx/inc/svx/zoomitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,6 @@ #include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "svx/svxdllapi.h" //------------------------------------------------------------------------- @@ -61,7 +61,7 @@ public: void SetValueSet( USHORT nValues ) { nValueSet = nValues; } USHORT GetValueSet() const { return nValueSet; } - FASTBOOL IsValueAllowed( USHORT nValue ) const + bool IsValueAllowed( USHORT nValue ) const { return nValue == ( nValue & nValueSet ); } SvxZoomType GetType() const { return eType; } @@ -72,8 +72,8 @@ public: virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const; virtual SvStream& Store( SvStream& rStrm , USHORT nItemVersion ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; //------------------------------------------------------------------------ @@ -89,3 +89,5 @@ public: #define SVX_ZOOM_ENABLE_ALL 0x701F #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/svx/inc/svx/zoomsliderctrl.hxx index 23415597d7..6db597a455 100644 --- a/svx/inc/svx/zoomsliderctrl.hxx +++ b/svx/inc/svx/zoomsliderctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx index 725f61a31f..6701f6d7f3 100644 --- a/svx/inc/svx/zoomslideritem.hxx +++ b/svx/inc/svx/zoomslideritem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,6 @@ #include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <com/sun/star/uno/Sequence.hxx> #include "svx/svxdllapi.h" @@ -59,10 +59,12 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const; // leer virtual SvStream& Store( SvStream& rStrm , USHORT nItemVersion ) const; // leer - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; //------------------------------------------------------------------------ #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svxempty.hxx b/svx/inc/svxempty.hxx index ccfa3cf672..4c40416ea9 100644 --- a/svx/inc/svxempty.hxx +++ b/svx/inc/svxempty.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,6 @@ extern XubString& rImplEmptyStr; inline const XubString& GetEmptyStr() { return rImplEmptyStr; } #define GetEmptySStr GetEmptyStr #else -// CSET stellt rImplEmptyStr nicht in items.lib (?) const XubString& GetEmptyStr(); #define GetEmptySStr GetEmptyStr #endif @@ -43,3 +43,4 @@ const XubString& GetEmptyStr(); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx index 67418fc5ca..d85c051818 100644 --- a/svx/inc/tbunocontroller.hxx +++ b/svx/inc/tbunocontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ class FontHeightToolBoxControl : public svt::ToolboxController, } #endif // __TBUNOCONTROLLER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/uiks.hxx b/svx/inc/uiks.hxx index 8fe1de39b2..6bbd772519 100644 --- a/svx/inc/uiks.hxx +++ b/svx/inc/uiks.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef _SVX_UIKS_HXX #define _SVX_UIKS_HXX -#ifndef _USR_UIKS_HXX #include <usr/uiks.hxx> -#endif // DBENGINE @@ -87,3 +86,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx index 0ed838c4c9..ab00693e71 100644 --- a/svx/inc/unomlstr.hxx +++ b/svx/inc/unomlstr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx index 3650a698f9..e4fd725c64 100644 --- a/svx/inc/xpolyimp.hxx +++ b/svx/inc/xpolyimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,16 +31,8 @@ #include <tools/gen.hxx> #include <svx/xpoly.hxx> +#include <vector> -/************************************************************************* -|* -|* class ImpXPolygon -|* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung Joe 26.09.95 -|* -*************************************************************************/ class ImpXPolygon { public: @@ -73,17 +66,7 @@ public: void Remove( USHORT nPos, USHORT nCount ); }; - -/************************************************************************* -|* -|* class ImpXPolyPolygon -|* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung Joe 26-09-1995 -|* -*************************************************************************/ -DECLARE_LIST( XPolygonList, XPolygon* ) +typedef ::std::vector< XPolygon* > XPolygonList; class ImpXPolyPolygon { @@ -91,9 +74,7 @@ public: XPolygonList aXPolyList; USHORT nRefCount; - ImpXPolyPolygon( USHORT nInitSize = 16, USHORT nResize = 16 ) : - aXPolyList( 1024, nInitSize, nResize ) - { nRefCount = 1; } + ImpXPolyPolygon() { nRefCount = 1; } ImpXPolyPolygon( const ImpXPolyPolygon& rImpXPolyPoly ); ~ImpXPolyPolygon(); @@ -104,3 +85,5 @@ public: #endif // _XPOLYIMP_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |