diff options
author | Michael Callahan <callahan@xmission.com> | 2010-12-06 10:36:22 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-12-06 10:36:22 +0000 |
commit | b76b4d9b64f09dd4941c48b245eaffcf6bfd056d (patch) | |
tree | d9c29fe576ff6f1d3e4b1a3fd8743f79308d1e33 /sw/source/filter/html | |
parent | 28b420533905e506f3f2a6a6afd8671f301c9001 (diff) |
remove obsolete __FAR_DATA
Diffstat (limited to 'sw/source/filter/html')
-rw-r--r-- | sw/source/filter/html/css1atr.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/html/css1kywd.cxx | 304 | ||||
-rw-r--r-- | sw/source/filter/html/css1kywd.hxx | 304 | ||||
-rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlbas.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmldraw.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/htmlfld.cxx | 22 | ||||
-rw-r--r-- | sw/source/filter/html/htmlfly.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/html/htmlform.cxx | 16 | ||||
-rw-r--r-- | sw/source/filter/html/htmlform.hxx | 10 | ||||
-rw-r--r-- | sw/source/filter/html/htmlgrin.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/htmlnum.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmltab.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/svxcss1.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/swhtml.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/swhtml.hxx | 6 | ||||
-rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/wrthtml.hxx | 2 |
18 files changed, 352 insertions, 352 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 5711ca98317b..c964da86b200 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -140,11 +140,11 @@ using namespace ::com::sun::star; //----------------------------------------------------------------------- -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_rule_end, " }" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_span_tag_end, "\">" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_rule_end, " }" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_span_tag_end, "\">" ); const sal_Char cCSS1_style_opt_end = '\"'; -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sHTML_FTN_fontheight, "57%" ); +sal_Char CSS1_CONSTASCII_DEF( sHTML_FTN_fontheight, "57%" ); extern SwAttrFnTab aCSS1AttrFnTab; diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx index 7031a5ac5985..66dccb126045 100644 --- a/sw/source/filter/html/css1kywd.cxx +++ b/sw/source/filter/html/css1kywd.cxx @@ -34,97 +34,97 @@ /* */ -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS_mimetype, "text/css" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS_mimetype, "text/css" ); /* */ // ein par allgemeine Strings -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_import, "import" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_import, "import" ); // Feature: PrintExt -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_page, "page" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_media, "media" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_page, "page" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_media, "media" ); // /Feature: PrintExt -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_important, "important" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_important, "important" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_link, "link" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_visited, "visited" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_first_letter, "first-letter" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_link, "link" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_visited, "visited" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_first_letter, "first-letter" ); // Feature: PrintExt -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_left, "left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_right, "right" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_first, "first" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_left, "left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_right, "right" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_first, "first" ); // /Feature: PrintExt -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_url, "url" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_rgb, "rgb" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_url, "url" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_rgb, "rgb" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_pt, "pt" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_mm, "mm" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_cm, "cm" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_pc, "pc" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_inch, "in" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_px, "px" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_em, "em" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_ex, "ex" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_pt, "pt" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_mm, "mm" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_cm, "cm" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_pc, "pc" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_inch, "in" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_px, "px" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_em, "em" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_ex, "ex" ); /* */ // Strings fuer Font-Properties -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_family, "font-family" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_family, "font-family" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_serif, "serif" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_sans_serif, "sans-serif" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_cursive, "cursive" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_fantasy, "fantasy" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_monospace, "monospace" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_serif, "serif" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_sans_serif, "sans-serif" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_cursive, "cursive" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_fantasy, "fantasy" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_monospace, "monospace" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_style, "font-style" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_style, "font-style" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_italic, "italic" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_oblique, "oblique" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_italic, "italic" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_oblique, "oblique" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_variant, "font-variant" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_variant, "font-variant" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_small_caps, "small-caps" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_small_caps, "small-caps" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_weight, "font-weight" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_weight, "font-weight" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_extra_light, "extra-light" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_light, "light" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_demi_light, "demi-light" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_demi_bold, "demi-bold" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_bold, "bold" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_extra_bold, "extra-bold" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_lighter, "lighter" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_bolder, "bolder" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_extra_light, "extra-light" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_light, "light" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_demi_light, "demi-light" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_demi_bold, "demi-bold" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bold, "bold" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_extra_bold, "extra-bold" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_lighter, "lighter" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bolder, "bolder" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_size, "font-size" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_size, "font-size" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_xx_small, "xx-small" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_x_small, "x-small" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_small, "small" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_large, "large" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_x_large, "x-large" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_xx_large, "xx-large" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_xx_small, "xx-small" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_x_small, "x-small" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_small, "small" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_large, "large" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_x_large, "x-large" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_xx_large, "xx-large" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_larger, "larger" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_smaller, "smaller" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_larger, "larger" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_smaller, "smaller" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" ); @@ -132,120 +132,120 @@ sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" ); // Strings fuer Farb- und Hintergrund-Properties -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_color, "color" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_color, "color" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_background, "background" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_background_color, "background-color" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background, "background" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background_color, "background-color" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_transparent, "transparent" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_transparent, "transparent" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_repeat, "repeat" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_x, "repeat-x" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_y, "repeat-y" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_no_repeat, "no-repeat" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat, "repeat" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_x, "repeat-x" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_y, "repeat-y" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_no_repeat, "no-repeat" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_top, "top" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_middle, "middle" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_bottom, "bottom" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_top, "top" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_middle, "middle" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bottom, "bottom" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_scroll, "scroll" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_scroll, "scroll" ); /* */ // Strings fuer Text-Properties -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_letter_spacing, "letter-spacing" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_letter_spacing, "letter-spacing" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_text_decoration, "text-decoration" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_decoration, "text-decoration" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_underline, "underline" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_overline, "overline" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_line_through, "line-through" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_blink, "blink" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_underline, "underline" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_overline, "overline" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_line_through, "line-through" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_blink, "blink" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_text_align, "text-align" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_align, "text-align" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_left, "left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_center, "center" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_right, "right" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_justify, "justify" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_left, "left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_center, "center" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_right, "right" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_justify, "justify" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_text_indent, "text-indent" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_indent, "text-indent" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_line_height, "line-height" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_line_height, "line-height" ); /* */ // Strings fuer Box-Properties -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_left, "margin-left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_right, "margin-right" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_top, "margin-top" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_bottom, "margin-bottom" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin, "margin" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_top, "padding-top" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_bottom, "padding-bottom" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_left, "padding-left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_right, "padding-right" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding, "padding" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_auto, "auto" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_left_width, "border-left-width" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_right_width, "border-right-width" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_top_width, "border-top-width" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom_width, "border-bottom-width" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_width, "border-width" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_color, "border-color" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_style, "border-style" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_left, "border-left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_right, "border-right" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_top, "border-top" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom, "border-bottom" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border, "border" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_thin, "thin" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_thick, "thick" ); - -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_dotted, "dotted" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_dashed, "dashed" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_solid, "solid" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_double, "double" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_groove, "groove" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_ridge, "ridge" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_inset, "inset" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_outset, "outset" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_width, "width" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_height, "height" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_float, "float" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_left, "margin-left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_right, "margin-right" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_top, "margin-top" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_bottom, "margin-bottom" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin, "margin" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_top, "padding-top" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_bottom, "padding-bottom" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_left, "padding-left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_right, "padding-right" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding, "padding" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_auto, "auto" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_left_width, "border-left-width" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_right_width, "border-right-width" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_top_width, "border-top-width" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom_width, "border-bottom-width" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_width, "border-width" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_color, "border-color" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_style, "border-style" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_left, "border-left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_right, "border-right" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_top, "border-top" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom, "border-bottom" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border, "border" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_thin, "thin" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_thick, "thick" ); + +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_dotted, "dotted" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_dashed, "dashed" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_solid, "solid" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_double, "double" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_groove, "groove" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_ridge, "ridge" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_inset, "inset" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_outset, "outset" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_width, "width" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_height, "height" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_float, "float" ); /* */ // Strings fuer Positioning -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_position, "position" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_position, "position" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_absolute, "absolute" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_relative, "relative" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_static, "static" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_absolute, "absolute" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_relative, "relative" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_static, "static" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_left, "left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_left, "left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" ); /* */ @@ -253,32 +253,32 @@ sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" ); // Strings fuer Printing Extensions -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_page_break_before, "page-break-before" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_page_break_after, "page-break-after" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_page_break_inside, "page-break-inside" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_size, "size" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_widows, "widows" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_orphans, "orphans" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_marks, "marks" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_before, "page-break-before" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_after, "page-break-after" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_inside, "page-break-inside" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_size, "size" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_widows, "widows" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_orphans, "orphans" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_marks, "marks" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_always, "always" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_avoid, "avoid" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_always, "always" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_avoid, "avoid" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_portrait, "portrait" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_landscape, "landscape" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_portrait, "portrait" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_landscape, "landscape" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_crop, "crop" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_cross, "cross" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_crop, "crop" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_cross, "cross" ); // /Feature: PrintExt -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_class_abs_pos, "sd-abs-pos" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_class_abs_pos, "sd-abs-pos" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_so_language, "so-language" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_so_language, "so-language" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_direction, "direction" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_ltr, "ltr" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_rtl, "rtl" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_inherit, "inherit" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_direction, "direction" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_ltr, "ltr" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_rtl, "rtl" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_inherit, "inherit" ); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx index 19d1d7771ab7..eafd0396e273 100644 --- a/sw/source/filter/html/css1kywd.hxx +++ b/sw/source/filter/html/css1kywd.hxx @@ -40,97 +40,97 @@ /* */ -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS_mimetype, "text/css" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS_mimetype, "text/css" ); /* */ // ein par allgemeine Strings -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_import, "import" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_import, "import" ); // Feature: PrintExt -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_page, "page" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_media, "media" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_page, "page" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_media, "media" ); // /Feature: PrintExt -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_important, "important" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_important, "important" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_link, "link" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_visited, "visited" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_first_letter, "first-letter" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_link, "link" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_visited, "visited" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_first_letter, "first-letter" ); // Feature: PrintExt -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_left, "left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_right, "right" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_first, "first" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_left, "left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_right, "right" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_first, "first" ); // /Feature: PrintExt -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_url, "url" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_rgb, "rgb" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_url, "url" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_rgb, "rgb" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_pt, "pt" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_mm, "mm" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_cm, "cm" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_pc, "pc" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_inch, "in" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_px, "px" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_em, "em" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_ex, "ex" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_pt, "pt" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_mm, "mm" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_cm, "cm" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_pc, "pc" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_inch, "in" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_px, "px" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_em, "em" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_ex, "ex" ); /* */ // Strings fuer Font-Properties -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_family, "font-family" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_family, "font-family" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_serif, "serif" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_sans_serif, "sans-serif" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_cursive, "cursive" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_fantasy, "fantasy" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_monospace, "monospace" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_serif, "serif" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_sans_serif, "sans-serif" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_cursive, "cursive" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_fantasy, "fantasy" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_monospace, "monospace" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_style, "font-style" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_style, "font-style" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_italic, "italic" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_oblique, "oblique" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_italic, "italic" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_oblique, "oblique" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_variant, "font-variant" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_variant, "font-variant" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_small_caps, "small-caps" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_small_caps, "small-caps" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_weight, "font-weight" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_weight, "font-weight" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_extra_light, "extra-light" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_light, "light" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_demi_light, "demi-light" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_demi_bold, "demi-bold" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_bold, "bold" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_extra_bold, "extra-bold" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_lighter, "lighter" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_bolder, "bolder" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_extra_light, "extra-light" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_light, "light" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_demi_light, "demi-light" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_demi_bold, "demi-bold" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bold, "bold" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_extra_bold, "extra-bold" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_lighter, "lighter" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bolder, "bolder" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_size, "font-size" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_size, "font-size" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_xx_small, "xx-small" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_x_small, "x-small" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_small, "small" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_large, "large" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_x_large, "x-large" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_xx_large, "xx-large" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_small, "xx-small" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_x_small, "x-small" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_small, "small" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_large, "large" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_x_large, "x-large" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_large, "xx-large" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_larger, "larger" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_smaller, "smaller" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_larger, "larger" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_smaller, "smaller" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" ); @@ -138,120 +138,120 @@ extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" ); // Strings fuer Farb- und Hintergrund-Properties -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_color, "color" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_color, "color" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_background, "background" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_background_color, "background-color" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background, "background" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background_color, "background-color" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_transparent, "transparent" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_transparent, "transparent" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_repeat, "repeat" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_x, "repeat-x" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_y, "repeat-y" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_no_repeat, "no-repeat" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat, "repeat" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_x, "repeat-x" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_y, "repeat-y" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_no_repeat, "no-repeat" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_top, "top" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_middle, "middle" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_bottom, "bottom" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_top, "top" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_middle, "middle" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bottom, "bottom" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_scroll, "scroll" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_scroll, "scroll" ); /* */ // Strings fuer Text-Properties -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_letter_spacing, "letter-spacing" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_letter_spacing, "letter-spacing" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_text_decoration, "text-decoration" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_decoration, "text-decoration" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_underline, "underline" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_overline, "overline" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_line_through, "line-through" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_blink, "blink" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_underline, "underline" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_overline, "overline" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_line_through, "line-through" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_blink, "blink" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_text_align, "text-align" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_align, "text-align" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_left, "left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_center, "center" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_right, "right" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_justify, "justify" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_left, "left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_center, "center" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_right, "right" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_justify, "justify" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_text_indent, "text-indent" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_indent, "text-indent" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_line_height, "line-height" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_line_height, "line-height" ); /* */ // Strings fuer Box-Properties -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_left, "margin-left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_right, "margin-right" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_top, "margin-top" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_bottom, "margin-bottom" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin, "margin" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_top, "padding-top" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_bottom, "padding-bottom" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_left, "padding-left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_right, "padding-right" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding, "padding" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_auto, "auto" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_left_width, "border-left-width" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_right_width, "border-right-width" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_top_width, "border-top-width" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom_width, "border-bottom-width" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_width, "border-width" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_color, "border-color" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_style, "border-style" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_left, "border-left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_right, "border-right" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_top, "border-top" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom, "border-bottom" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border, "border" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_thin, "thin" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_thick, "thick" ); - -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_dotted, "dotted" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_dashed, "dashed" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_solid, "solid" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_double, "double" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_groove, "groove" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_ridge, "ridge" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_inset, "inset" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_outset, "outset" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_width, "width" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_height, "height" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_float, "float" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_left, "margin-left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_right, "margin-right" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_top, "margin-top" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_bottom, "margin-bottom" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin, "margin" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_top, "padding-top" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_bottom, "padding-bottom" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_left, "padding-left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_right, "padding-right" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding, "padding" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_auto, "auto" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_left_width, "border-left-width" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_right_width, "border-right-width" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_top_width, "border-top-width" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom_width, "border-bottom-width" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_width, "border-width" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_color, "border-color" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_style, "border-style" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_left, "border-left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_right, "border-right" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_top, "border-top" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom, "border-bottom" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border, "border" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_thin, "thin" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_thick, "thick" ); + +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_dotted, "dotted" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_dashed, "dashed" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_solid, "solid" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_double, "double" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_groove, "groove" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_ridge, "ridge" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_inset, "inset" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_outset, "outset" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_width, "width" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_height, "height" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_float, "float" ); /* */ // Strings fuer Positioning -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_position, "position" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_position, "position" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_absolute, "absolute" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_relative, "relative" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_static, "static" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_absolute, "absolute" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_relative, "relative" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_static, "static" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_left, "left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_left, "left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" ); /* */ @@ -259,33 +259,33 @@ extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" ); // Strings fuer Printing Extensions -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_page_break_before, "page-break-before" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_page_break_after, "page-break-after" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_page_break_inside, "page-break-inside" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_size, "size" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_widows, "widows" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_orphans, "orphans" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_marks, "marks" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_before, "page-break-before" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_after, "page-break-after" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_inside, "page-break-inside" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_size, "size" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_widows, "widows" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_orphans, "orphans" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_marks, "marks" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_always, "always" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_avoid, "avoid" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_always, "always" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_avoid, "avoid" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_portrait, "portrait" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_landscape, "landscape" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_portrait, "portrait" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_landscape, "landscape" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_crop, "crop" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_cross, "cross" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_crop, "crop" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_cross, "cross" ); // /Feature: PrintExt -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_class_abs_pos, "sd-abs-pos" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_class_abs_pos, "sd-abs-pos" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_so_language, "so-language" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_direction, "direction" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_ltr, "ltr" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_rtl, "rtl" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_inherit, "inherit" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_so_language, "so-language" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_direction, "direction" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_ltr, "ltr" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_rtl, "rtl" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_inherit, "inherit" ); #endif diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 92aed538fb86..a5e958f4c861 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -133,7 +133,7 @@ using namespace ::com::sun::star; //----------------------------------------------------------------------- -HTMLOutEvent __FAR_DATA aAnchorEventTable[] = +HTMLOutEvent aAnchorEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonclick, OOO_STRING_SVTOOLS_HTML_O_onclick, SFX_EVENT_MOUSECLICK_OBJECT }, { OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT }, diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 0d8afd27af9c..cdd1e9b8b6e0 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; -static HTMLOutEvent __FAR_DATA aBodyEventTable[] = +static HTMLOutEvent aBodyEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SFX_EVENT_OPENDOC }, { OOO_STRING_SVTOOLS_HTML_O_SDonunload, OOO_STRING_SVTOOLS_HTML_O_onunload, SFX_EVENT_PREPARECLOSEDOC }, diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index 3e47fe1b4aa6..9c6bb06eb995 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -79,7 +79,7 @@ const sal_uInt32 HTML_FRMOPTS_MARQUEE_CSS1 = HTML_FRMOPT_S_ALIGN | HTML_FRMOPT_S_SPACE; -static HTMLOptionEnum __FAR_DATA aHTMLMarqBehaviorTable[] = +static HTMLOptionEnum aHTMLMarqBehaviorTable[] = { { OOO_STRING_SVTOOLS_HTML_BEHAV_scroll, SDRTEXTANI_SCROLL }, { OOO_STRING_SVTOOLS_HTML_BEHAV_alternate, SDRTEXTANI_ALTERNATE }, @@ -87,7 +87,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLMarqBehaviorTable[] = { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLMarqDirectionTable[] = +static HTMLOptionEnum aHTMLMarqDirectionTable[] = { { OOO_STRING_SVTOOLS_HTML_AL_left, SDRTEXTANI_LEFT }, { OOO_STRING_SVTOOLS_HTML_AL_right, SDRTEXTANI_RIGHT }, diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 511fcbb27c43..46e0b444b6b0 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -56,7 +56,7 @@ struct HTMLNumFmtTblEntry NfIndexTableOffset eFmt; }; -static HTMLOptionEnum __FAR_DATA aHTMLFldTypeTable[] = +static HTMLOptionEnum aHTMLFldTypeTable[] = { { OOO_STRING_SW_HTML_FT_author, RES_AUTHORFLD }, { OOO_STRING_SW_HTML_FT_sender, RES_EXTUSERFLD }, @@ -70,7 +70,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLFldTypeTable[] = { 0, 0 } }; -static HTMLNumFmtTblEntry __FAR_DATA aHTMLDateFldFmtTable[] = +static HTMLNumFmtTblEntry aHTMLDateFldFmtTable[] = { { "SSYS", NF_DATE_SYSTEM_SHORT }, { "LSYS", NF_DATE_SYSTEM_LONG }, @@ -92,7 +92,7 @@ static HTMLNumFmtTblEntry __FAR_DATA aHTMLDateFldFmtTable[] = { 0, NF_NUMERIC_START } }; -static HTMLNumFmtTblEntry __FAR_DATA aHTMLTimeFldFmtTable[] = +static HTMLNumFmtTblEntry aHTMLTimeFldFmtTable[] = { { "SYS", NF_TIME_HHMMSS }, { "SSMM24", NF_TIME_HHMM }, @@ -100,7 +100,7 @@ static HTMLNumFmtTblEntry __FAR_DATA aHTMLTimeFldFmtTable[] = { 0, NF_NUMERIC_START } }; -static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldFmtTable[] = +static HTMLOptionEnum aHTMLPageNumFldFmtTable[] = { { OOO_STRING_SW_HTML_FF_uletter, SVX_NUM_CHARS_UPPER_LETTER }, { OOO_STRING_SW_HTML_FF_lletter, SVX_NUM_CHARS_LOWER_LETTER }, @@ -116,7 +116,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldFmtTable[] = }; -static HTMLOptionEnum __FAR_DATA aHTMLExtUsrFldSubTable[] = +static HTMLOptionEnum aHTMLExtUsrFldSubTable[] = { { OOO_STRING_SW_HTML_FS_company, EU_COMPANY }, { OOO_STRING_SW_HTML_FS_firstname, EU_FIRSTNAME }, @@ -136,14 +136,14 @@ static HTMLOptionEnum __FAR_DATA aHTMLExtUsrFldSubTable[] = { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLAuthorFldFmtTable[] = +static HTMLOptionEnum aHTMLAuthorFldFmtTable[] = { { OOO_STRING_SW_HTML_FF_name, AF_NAME }, { OOO_STRING_SW_HTML_FF_shortcut, AF_SHORTCUT }, { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldSubTable[] = +static HTMLOptionEnum aHTMLPageNumFldSubTable[] = { { OOO_STRING_SW_HTML_FS_random, PG_RANDOM }, { OOO_STRING_SW_HTML_FS_next, PG_NEXT }, @@ -159,7 +159,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldSubTable[] = const SwDocInfoSubType DI_INFO3 = DI_SUBTYPE_END + 3; const SwDocInfoSubType DI_INFO4 = DI_SUBTYPE_END + 4; -static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldSubTable[] = +static HTMLOptionEnum aHTMLDocInfoFldSubTable[] = { { OOO_STRING_SW_HTML_FS_title, DI_TITEL }, { OOO_STRING_SW_HTML_FS_theme, DI_THEMA }, @@ -175,7 +175,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldSubTable[] = { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldFmtTable[] = +static HTMLOptionEnum aHTMLDocInfoFldFmtTable[] = { { OOO_STRING_SW_HTML_FF_author, DI_SUB_AUTHOR }, { OOO_STRING_SW_HTML_FF_time, DI_SUB_TIME }, @@ -183,7 +183,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldFmtTable[] = { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLDocStatFldSubTable[] = +static HTMLOptionEnum aHTMLDocStatFldSubTable[] = { { OOO_STRING_SW_HTML_FS_page, DS_PAGE }, { OOO_STRING_SW_HTML_FS_para, DS_PARA }, @@ -195,7 +195,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLDocStatFldSubTable[] = { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLFileNameFldFmtTable[] = +static HTMLOptionEnum aHTMLFileNameFldFmtTable[] = { { OOO_STRING_SW_HTML_FF_name, FF_NAME }, { OOO_STRING_SW_HTML_FF_pathname, FF_PATHNAME }, diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 672a57f1a13a..44f782a5fb1d 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -156,9 +156,9 @@ static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt, const SdrObject& rSdrObj ); //----------------------------------------------------------------------- -extern HTMLOutEvent __FAR_DATA aAnchorEventTable[]; +extern HTMLOutEvent aAnchorEventTable[]; -static HTMLOutEvent __FAR_DATA aImageEventTable[] = +static HTMLOutEvent aImageEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SVX_EVENT_IMAGE_LOAD }, { OOO_STRING_SVTOOLS_HTML_O_SDonabort, OOO_STRING_SVTOOLS_HTML_O_onabort, SVX_EVENT_IMAGE_ABORT }, @@ -166,7 +166,7 @@ static HTMLOutEvent __FAR_DATA aImageEventTable[] = { 0, 0, 0 } }; -static HTMLOutEvent __FAR_DATA aIMapEventTable[] = +static HTMLOutEvent aIMapEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT }, { OOO_STRING_SVTOOLS_HTML_O_SDonmouseout, OOO_STRING_SVTOOLS_HTML_O_onmouseout, SFX_EVENT_MOUSEOUT_OBJECT }, diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 21468fd64b04..8c3afde3423c 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -96,14 +96,14 @@ using ::rtl::OUString; const sal_uInt16 TABINDEX_MIN = 0; const sal_uInt16 TABINDEX_MAX = 32767; -static HTMLOptionEnum __FAR_DATA aHTMLFormMethodTable[] = +static HTMLOptionEnum aHTMLFormMethodTable[] = { { OOO_STRING_SVTOOLS_HTML_METHOD_get, FormSubmitMethod_GET }, { OOO_STRING_SVTOOLS_HTML_METHOD_post, FormSubmitMethod_POST }, { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLFormEncTypeTable[] = +static HTMLOptionEnum aHTMLFormEncTypeTable[] = { { OOO_STRING_SVTOOLS_HTML_ET_url, FormSubmitEncoding_URL }, { OOO_STRING_SVTOOLS_HTML_ET_multipart, FormSubmitEncoding_MULTIPART }, @@ -113,7 +113,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLFormEncTypeTable[] = enum HTMLWordWrapMode { HTML_WM_OFF, HTML_WM_HARD, HTML_WM_SOFT }; -static HTMLOptionEnum __FAR_DATA aHTMLTextAreaWrapTable[] = +static HTMLOptionEnum aHTMLTextAreaWrapTable[] = { { OOO_STRING_SVTOOLS_HTML_WW_off, HTML_WM_OFF }, { OOO_STRING_SVTOOLS_HTML_WW_hard, HTML_WM_HARD }, @@ -123,7 +123,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLTextAreaWrapTable[] = { 0, 0 } }; -HTMLEventType __FAR_DATA aEventTypeTable[] = +HTMLEventType aEventTypeTable[] = { HTML_ET_ONSUBMITFORM, HTML_ET_ONRESETFORM, @@ -136,7 +136,7 @@ HTMLEventType __FAR_DATA aEventTypeTable[] = HTML_ET_END }; -const sal_Char * __FAR_DATA aEventListenerTable[] = +const sal_Char * aEventListenerTable[] = { "XSubmitListener", "XResetListener", @@ -148,7 +148,7 @@ const sal_Char * __FAR_DATA aEventListenerTable[] = "" }; -const sal_Char * __FAR_DATA aEventMethodTable[] = +const sal_Char * aEventMethodTable[] = { "approveSubmit", "approveReset", @@ -160,7 +160,7 @@ const sal_Char * __FAR_DATA aEventMethodTable[] = "" }; -const sal_Char * __FAR_DATA aEventSDOptionTable[] = +const sal_Char * aEventSDOptionTable[] = { OOO_STRING_SVTOOLS_HTML_O_SDonsubmit, OOO_STRING_SVTOOLS_HTML_O_SDonreset, @@ -172,7 +172,7 @@ const sal_Char * __FAR_DATA aEventSDOptionTable[] = 0 }; -const sal_Char * __FAR_DATA aEventOptionTable[] = +const sal_Char * aEventOptionTable[] = { OOO_STRING_SVTOOLS_HTML_O_onsubmit, OOO_STRING_SVTOOLS_HTML_O_onreset, diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx index 90088dffa029..635392a72519 100644 --- a/sw/source/filter/html/htmlform.hxx +++ b/sw/source/filter/html/htmlform.hxx @@ -39,11 +39,11 @@ enum HTMLEventType HTML_ET_END }; -extern HTMLEventType __FAR_DATA aEventTypeTable[]; -extern const sal_Char * __FAR_DATA aEventListenerTable[]; -extern const sal_Char * __FAR_DATA aEventMethodTable[]; -extern const sal_Char * __FAR_DATA aEventSDOptionTable[]; -extern const sal_Char * __FAR_DATA aEventOptionTable[]; +extern HTMLEventType aEventTypeTable[]; +extern const sal_Char * aEventListenerTable[]; +extern const sal_Char * aEventMethodTable[]; +extern const sal_Char * aEventSDOptionTable[]; +extern const sal_Char * aEventOptionTable[]; diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 6d8ca94e77c2..ae837d9e158d 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -84,7 +84,7 @@ using namespace ::com::sun::star; -HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[] = +HTMLOptionEnum aHTMLImgHAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_AL_left, text::HoriOrientation::LEFT }, { OOO_STRING_SVTOOLS_HTML_AL_right, text::HoriOrientation::RIGHT }, @@ -92,7 +92,7 @@ HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[] = }; -HTMLOptionEnum __FAR_DATA aHTMLImgVAlignTable[] = +HTMLOptionEnum aHTMLImgVAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::LINE_TOP }, { OOO_STRING_SVTOOLS_HTML_VA_texttop, text::VertOrientation::CHAR_TOP }, diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx index 0bdb94d65f70..1395d1e50c71 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star; // <UL TYPE=...> -static HTMLOptionEnum __FAR_DATA aHTMLULTypeTable[] = +static HTMLOptionEnum aHTMLULTypeTable[] = { { OOO_STRING_SVTOOLS_HTML_ULTYPE_disc, HTML_BULLETCHAR_DISC }, { OOO_STRING_SVTOOLS_HTML_ULTYPE_circle, HTML_BULLETCHAR_CIRCLE }, diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 6d734d93b929..81d7e46189b2 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -82,7 +82,7 @@ using namespace ::com::sun::star; -static HTMLOptionEnum __FAR_DATA aHTMLTblVAlignTable[] = +static HTMLOptionEnum aHTMLTblVAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::NONE }, { OOO_STRING_SVTOOLS_HTML_VA_middle, text::VertOrientation::CENTER }, diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index d72231e467e5..7d194a0909e2 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -3183,7 +3183,7 @@ struct CSS1PropEntry // die Tabelle mit den Zuordnungen -static CSS1PropEntry __FAR_DATA aCSS1PropFnTab[] = +static CSS1PropEntry aCSS1PropFnTab[] = { CSS1_PROP_ENTRY(background), CSS1_PROP_ENTRY(background_color), @@ -3241,7 +3241,7 @@ static CSS1PropEntry __FAR_DATA aCSS1PropFnTab[] = /* */ -static int __FAR_DATA bSortedPropFns = FALSE; +static int bSortedPropFns = FALSE; extern "C" { diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index d56eba93d4e3..0a273d34a1f7 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -133,7 +133,7 @@ using namespace ::com::sun::star; // <P ALIGN=xxx>, <Hn ALIGN=xxx>, <TD ALIGN=xxx> usw. -HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[] = +HTMLOptionEnum aHTMLPAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_AL_left, SVX_ADJUST_LEFT }, { OOO_STRING_SVTOOLS_HTML_AL_center, SVX_ADJUST_CENTER }, @@ -145,7 +145,7 @@ HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[] = }; // <SPACER TYPE=...> -static HTMLOptionEnum __FAR_DATA aHTMLSpacerTypeTable[] = +static HTMLOptionEnum aHTMLSpacerTypeTable[] = { { OOO_STRING_SVTOOLS_HTML_SPTYPE_block, HTML_SPTYPE_BLOCK }, { OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal, HTML_SPTYPE_HORI }, diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index f6f7eac37b64..b8c760ba1e7f 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -80,9 +80,9 @@ class SvxCSS1PropertyInfo; #define HTML_DFLT_IMG_HEIGHT (MM50*2) // ein par Sachen, die man oefter mal braucht -extern HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[]; -extern HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[]; -extern HTMLOptionEnum __FAR_DATA aHTMLImgVAlignTable[]; +extern HTMLOptionEnum aHTMLPAlignTable[]; +extern HTMLOptionEnum aHTMLImgHAlignTable[]; +extern HTMLOptionEnum aHTMLImgVAlignTable[]; // der Attribut Stack: diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 94e7242ef645..09cae01e1864 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -95,10 +95,10 @@ #if defined(UNX) const sal_Char SwHTMLWriter::sNewLine = '\012'; #else -const sal_Char __FAR_DATA SwHTMLWriter::sNewLine[] = "\015\012"; +const sal_Char SwHTMLWriter::sNewLine[] = "\015\012"; #endif -static sal_Char __FAR_DATA sIndentTabs[MAX_INDENT_LEVEL+2] = +static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; SwHTMLWriter::SwHTMLWriter( const String& rBaseURL ) diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 9efc9015b36f..525965c1cd73 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -222,7 +222,7 @@ public: #if defined(UNX) static const sal_Char sNewLine; // nur \012 oder \015 #else - static const sal_Char __FAR_DATA sNewLine[]; // \015\012 + static const sal_Char sNewLine[]; // \015\012 #endif SvStringsDtor aImgMapNames; // geschriebene Image Maps |