From 8c14f1bf6b0d2a395e6a0aac8b8733a804e4568d Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 19 Sep 2009 00:02:22 +0200 Subject: better dependencies for sdi files --- starmath/sdi/makefile.mk | 10 +- starmath/sdi/smitems.sdi | 598 ++++++++++++++++++++++++++++++++++++++++++++++ starmath/sdi/smslots.sdi | 16 +- starmath/sdi/svxitems.sdi | 598 ---------------------------------------------- 4 files changed, 614 insertions(+), 608 deletions(-) create mode 100644 starmath/sdi/smitems.sdi delete mode 100644 starmath/sdi/svxitems.sdi (limited to 'starmath') diff --git a/starmath/sdi/makefile.mk b/starmath/sdi/makefile.mk index a10a81adaec9..098f1bc74f32 100644 --- a/starmath/sdi/makefile.mk +++ b/starmath/sdi/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,12 @@ SVSDIINC=$(PRJ)$/inc SDI1NAME=$(TARGET) SVSDI1DEPEND= \ - $(SOLARINCDIR)$/svxslots.ilb \ - smath.sdi \ + $(SOLARINCXDIR)$/sfx2/sfx.sdi \ + $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ + $(SOLARINCXDIR)$/svx/svx.sdi \ + $(SOLARINCXDIR)$/svx/svxitems.sdi \ + $(SOLARINCXDIR)$/svx/xoitems.sdi \ + smath.sdi \ smslots.sdi \ $(SVSDIINC)$/starmath.hrc diff --git a/starmath/sdi/smitems.sdi b/starmath/sdi/smitems.sdi new file mode 100644 index 000000000000..ddbf0f2fc185 --- /dev/null +++ b/starmath/sdi/smitems.sdi @@ -0,0 +1,598 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: svxitems.sdi,v $ + * $Revision: 1.4 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +//------------------------------------------------------------------------- + +enum SvxAdjust +{ + SVX_ADJUST_LEFT, + SVX_ADJUST_RIGHT, + SVX_ADJUST_BLOCK, + SVX_ADJUST_CENTER, + SVX_ADJUST_BLOCKLINE, + SVX_ADJUST_END +}; +item SvxAdjust SvxAdjustItem; + +//------------------------------------------------------------------------- + +enum SvxCaseMap +{ + SVX_CASEMAP_NOT_MAPPED, + SVX_CASEMAP_VERSALIEN, + SVX_CASEMAP_GEMEINE, + SVX_CASEMAP_TITEL, + SVX_CASEMAP_KAPITAELCHEN, + SVX_CASEMAP_END +}; +item SvxCaseMap SvxCaseMapItem; + +//------------------------------------------------------------------------- + +enum CharSet +{ + CHARSET_DONTKNOW, + CHARSET_ANSI, + CHARSET_MAC, + CHARSET_IBMPC_437, + CHARSET_IBMPC_850, + CHARSET_IBMPC_860, + CHARSET_IBMPC_861, + CHARSET_IBMPC_863, + CHARSET_IBMPC_865, + CHARSET_SYSTEM, + CHARSET_SYMBOL +}; +item CharSet CharSetItem; + +//------------------------------------------------------------------------- + +enum FontFamily +{ + FAMILY_DONTKNOW, + FAMILY_DECORATIVE, + FAMILY_MODERN, + FAMILY_ROMAN, + FAMILY_SCRIPT, + FAMILY_SWISS, + FAMILY_SYSTEM +}; +item FontFamily FontFamilyItem; + +//------------------------------------------------------------------------- + +enum FontPitch +{ + PITCH_DONTKNOW, + PITCH_FIXED, + PITCH_VARIABLE +}; +item FontPitch FontPitchItem; + +//------------------------------------------------------------------------- + +enum FontAlign +{ + ALIGN_TOP, + ALIGN_BASELINE, + ALIGN_BOTTOM +}; +item FontAlign FontAlignItem; + +//------------------------------------------------------------------------- + +enum FontWeight +{ + WEIGHT_DONTKNOW, + WEIGHT_THIN, + WEIGHT_ULTRALIGHT, + WEIGHT_LIGHT, + WEIGHT_SEMILIGHT, + WEIGHT_NORMAL, + WEIGHT_MEDIUM, + WEIGHT_SEMIBOLD, + WEIGHT_BOLD, + WEIGHT_ULTRABOLD, + WEIGHT_BLACK +}; +item FontWeight FontWeightItem; + +//------------------------------------------------------------------------- + +enum FontUnderline +{ + UNDERLINE_NONE, + UNDERLINE_SINGLE, + UNDERLINE_DOUBLE, + UNDERLINE_DOTTED +}; +item FontUnderline FontUnderlineItem; + +//------------------------------------------------------------------------- + +enum FontStrikeout +{ + STRIKEOUT_NONE, + STRIKEOUT_SINGLE, + STRIKEOUT_DOUBLE +}; +item FontStrikeout FontStrikeoutItem; + +//------------------------------------------------------------------------- + +enum FontItalic +{ + ITALIC_NONE, + ITALIC_OBLIQUE, + ITALIC_NORMAL +}; +item FontItalic FontItalicItem; + +//------------------------------------------------------------------------- + +enum SvxDbType +{ + DBTYPE_STARBASE, + DBTYPE_ODBC, + DBTYPE_WATCOM +}; +item SvxDbType SvxDbTypeItem; + +//------------------------------------------------------------------------- + +enum SvxLineSpace +{ + SVX_LINE_SPACE_AUTO, + SVX_LINE_SPACE_MAX, + SVX_LINE_SPACE_MIN, + SVX_LINE_SPACE_END +}; +item SvxLineSpace SvxLineSpaceItem; + +//------------------------------------------------------------------------- + +enum SvxInterLineSpace +{ + SVX_INTER_LINE_SPACE_OFF, + SVX_INTER_LINE_SPACE_PROP, + SVX_INTER_LINE_SPACE_FIX, + SVX_INTER_LINE_SPACE_END +}; +item SvxInterLineSpace SvxInterLineSpaceItem; + +//------------------------------------------------------------------------- + +enum SvxBreak +{ + SVX_BREAK_NONE, + SVX_BREAK_COLUMN_BEFORE, + SVX_BREAK_COLUMN_AFTER, + SVX_BREAK_COLUMN_BOTH, + SVX_BREAK_PAGE_BEFORE, + SVX_BREAK_PAGE_AFTER, + SVX_BREAK_PAGE_BOTH, + SVX_BREAK_END +}; +item SvxBreak SvxBreakItem; + +//------------------------------------------------------------------------- + +enum BrushStyle +{ + BRUSH_NULL, + BRUSH_SOLID, + BRUSH_HORZ, + BRUSH_VERT, + BRUSH_CROSS, + BRUSH_DIAGCROSS, + BRUSH_UPDIAG, + BRUSH_DOWNDIAG, + BRUSH_25, + BRUSH_50, + BRUSH_75, + BRUSH_BITMAP +}; +item BrushStyle BrushStyleItem; + +//------------------------------------------------------------------------- + +enum SvxNumType +{ + SVX_CHARS_UPPER_LETTER, + SVX_CHARS_LOWER_LETTER, + SVX_ROMAN_UPPER, + SVX_ROMAN_LOWER, + SVX_ARABIC, + SVX_NUMBER_NONE, + SVX_CHAR_SPECIAL, + SVX_PAGEDESC +}; +item SvxNumType SvxNumTypeItem; + +//------------------------------------------------------------------------- + +enum SvxShadowLocation +{ + SVX_SHADOW_NONE, + SVX_SHADOW_TOPLEFT, + SVX_SHADOW_TOPRIGHT, + SVX_SHADOW_BOTTOMLEFT, + SVX_SHADOW_BOTTOMRIGHT, + SVX_SHADOW_END +}; +item SvxShadowLocation SvxShadowLocationItem; + +//------------------------------------------------------------------------- + +struct SvxBrush +{ + BrushStyle Style MID_BRUSHSTYLE; + BOOL Transparent MID_TRANSPARENT; + UINT32 BackColor MID_BG_COLOR; + UINT32 FillColor MID_FG_COLOR; +}; +item SvxBrush SvxBrushItem; + +//------------------------------------------------------------------------- + +struct SvxCharSetColor +{ + CharSet CharSet MID_CHARSET; + UINT32 Color MID_FG_COLOR; +}; +item SvxCharSetColor SvxCharSetColorItem; + +//------------------------------------------------------------------------- + +item BOOL SvxAutoKernItem; +item UINT32 SvxColorItem; +item BOOL SvxContourItem; +item FontStrikeout SvxCrossedOutItem; + +//------------------------------------------------------------------------- + +struct SvxEscapement +{ + INT16 Esc MID_ESCAPEMENT; + BYTE Prop MID_PROPORTIONAL; +}; +item SvxEscapement SvxEscapementItem; + +//------------------------------------------------------------------------- + +struct SvxFmtBreak +{ + BOOL Auto MID_AUTOBREAK; + UINT16 Break MID_BREAKxxx; +} +item SvxFmtBreak SvxFmtBreakItem; + +//------------------------------------------------------------------------- + +item BOOL SvxFmtKeepItem; +item BOOL SvxFmtSplitItem; + +struct SvxFontHeight +{ + UINT32 Height MID_HEIGHT; + BYTE Prop MID_PROPORTIONAL; +}; +item SvxFontHeight SvxFontHeightItem; + +//------------------------------------------------------------------------- + +struct SvxFont +{ + String StyleName MID_FONTSTYLE; + FontPitch Pitch MID_FONTPICTH; + CharSet CharSet MID_CHARSET; + FontFamily Family MID_FONTFAMILY; + String FamilyName MID_FONTFAMILYNAME; +}; +item SvxFont SvxFontItem; + +//------------------------------------------------------------------------- + +struct SvxHyphenZone +{ + BOOL Hyphen MID_HYPHEN; + BOOL PageEnd MID_PAGEEND; + BYTE MinLead MID_MINLEAD; + BYTE MinTrail MID_MINTRAIL; + BYTE MaxHyphens MID_MAXHYPHENS; +}; +item SvxHyphenZone SvxHyphenZoneItem; + +//------------------------------------------------------------------------- + +item INT16 SvxKerningItem; + +//------------------------------------------------------------------------- + +struct SvxLine +{ + UINT32 Color MID_FG_COLOR; + UINT16 OutWidth MID_OUTER_WIDTH; + UINT16 InWidth MID_INNER_WIDTH; + UINT16 Distance MID_DISTANCE; +}; +item SvxLine SvxLineItem; + +//------------------------------------------------------------------------- + +struct SvxLRSpace +{ + INT16 FirstLineOffset MID_FIRSTLINE_OFFSET; // % or direct + UINT16 LeftMargin MID_LEFT_MARGIN; // % or direct + UINT16 RightMargin MID_RIGHT_MARGIN; // % or direct +}; +item SvxLRSpace SvxLRSpaceItem; + +//------------------------------------------------------------------------- + +item UINT16 SvxLanguage; + +struct SvxLineSpacing +{ + SvxLineSpace LineSpace MID_LINESPACE; + UINT16 LineHeight MID_HEIGHT; // % or direct + SvxInterLineSpace InterLineSpace MID_INTER_LINESPACE; + INT16 InterSpace MID_INTER_SPACE; +}; +item SvxLineSpacing SvxLineSpacingItem; + +//------------------------------------------------------------------------- + +item BOOL SvxNoHyphenItem; +item BOOL SvxNoLinebreakItem; +item BOOL SvxOpaqueItem; +item BYTE SvxOrphansItem; + +//------------------------------------------------------------------------- + +struct SvxPage +{ + String DescName MID_DESCNAMExxx; + BOOL Landscape MID_LANDSCAPE; + UINT16 Use MID_USExxx; + SvxNumType NumType MID_NUMTYPExxx; +}; +item SvxPage SvxPageItem; + +//------------------------------------------------------------------------- + +item String SvxPageModelItem; + +//------------------------------------------------------------------------- + +struct SvxPagePosSize +{ + INT32 XPos MID_X; + INT32 YPos MID_Y; + INT32 Width MID_WIDTH; + INT32 Height MID_HEIGHT; +}; +item SvxPagePosSize SvxPagePosSizeItem; + +//------------------------------------------------------------------------- + +item BYTE SvxPaperBinItem; + +//------------------------------------------------------------------------- + +item String SvxPostItAuthorItem; +item String SvxPostItDateItem; +item String SvxPostItTextItem; +item FontItalic SvxPostureItem; +item BOOL SvxPrintItem; +item UINT16 SvxPropSizeItem; + +//------------------------------------------------------------------------- + +struct SvxProtect +{ + BOOL Content MID_CONTENT; + BOOL Pos MID_POS; + BOOL Size MID_SIZE; +}; +item SvxProtect SvxProtectItem; + +//------------------------------------------------------------------------- + +struct SvxSearch +{ + UINT16 Command MID_COMMAND; + String SearchString MID_SEARCH_STRING; + String ReplaceString MID_REPLACE_STRING; + // W)ord, E)xact, B)ack, S)election, R)egExpr, P)attern + String Flags MID_FLAGS; + UINT16 Family MID_FAMILY; + UINT16 CellType MID_CELLTYPE; + BOOL RowDirection MID_ROW_DIRECTION; + UINT16 AppFlag MID_APPFLAG; +}; +item SvxSearch SvxSearchItem; + +//------------------------------------------------------------------------- + +item BOOL SvxShadowedItem; + +//------------------------------------------------------------------------- + +struct SvxShadow +{ + SvxShadowLocation Location MID_LOCATION; + UINT16 Width MID_WIDTH; + BrushStyle Style MID_BRUSHSTYLE; + BOOL Transparent MID_TRANSPARENT; + UINT32 BackColor MID_BG_COLOR; + UINT32 FillColor MID_FG_COLOR; +}; +item SvxShadow SvxShadowItem; + +//------------------------------------------------------------------------- + +struct SvxSize +{ + UINT32 Width MID_WIDTH; + UINT32 Height MID_HEIGHT; +}; +item SvxSize SvxSizeItem; + +//------------------------------------------------------------------------- + +struct SvxULSpace +{ + UINT16 Upper MID_UPPER; // % or direct + UINT16 Lower MID_LOWER; // % or direct +}; +item SvxULSpace SvxULSpaceItem + +//------------------------------------------------------------------------- + +enum SvxChooseControlEnum +{ + SVX_SNAP_PUSHBUTTON, + SVX_SNAP_CHECKBOX, + SVX_SNAP_RADIOBUTTON, + SVX_SNAP_SPINBUTTON, + SVX_SNAP_FIXEDTEXT, + SVX_SNAP_GROUPBOX, + SVX_SNAP_LISTBOX, + SVX_SNAP_COMBOBOX, + SVX_SNAP_EDIT, + SVX_SNAP_HSCROLLBAR, + SVX_SNAP_VSCROLLBAR, + SVX_SNAP_PREVIEW, + SVX_SNAP_SELECT, + SVX_SNAP_NOTHING +} +item SvxChooseControlEnum SvxChooseControlEnumItem; + +//------------------------------------------------------------------------- + +enum SvxDrawToolEnum +{ + SVX_SNAP_DRAW_SELECT, + // + SVX_SNAP_DRAW_LINE, + SVX_SNAP_DRAW_RECT, + SVX_SNAP_DRAW_ELLIPSE, + SVX_SNAP_DRAW_POLYGON, + SVX_SNAP_DRAW_ARC, + SVX_SNAP_DRAW_PIE, + SVX_SNAP_DRAW_CIRCLECUT, + SVX_SNAP_DRAW_TEXT, + SVX_SNAP_DRAW_CAPTION, + SVX_SNAP_DRAW_NOTHING +} +item SvxDrawToolEnum SvxDrawToolEnumItem; + +//------------------------------------------------------------------------- + +item SvxChooseControlEnum SvxChooseControlItem; +item SvxDrawToolEnum SvxDrawToolItem; +item FontUnderline SvxUnderlineItem; +item FontWeight SvxWeightItem; +item BYTE SvxWidowsItem; +item BOOL SvxWordLineModeItem; +item String SvxBoxItem; //! Dummy + +//------------------------------------------------------------------------- + +enum SvxCellHorJustifyEnum +{ + SVX_HOR_JUSTIFY_STANDARD, + SVX_HOR_JUSTIFY_LEFT, + SVX_HOR_JUSTIFY_CENTER, + SVX_HOR_JUSTIFY_RIGHT, + SVX_HOR_JUSTIFY_BLOCK, + SVX_HOR_JUSTIFY_REPEAT +}; +item SvxCellHorJustifyEnum SvxCellHorJustifyEnumItem; + +enum SvxCellVerJustifyEnum +{ + SVX_VER_JUSTIFY_STANDARD, + SVX_VER_JUSTIFY_TOP, + SVX_VER_JUSTIFY_CENTER, + SVX_VER_JUSTIFY_BOTTOM +}; +item SvxCellVerJustifyEnum SvxCellVerJustifyEnumItem; + +//------------------------------------------------------------------------- + +enum SvxCellOrientationEnum +{ + SVX_ORIENTATION_STANDARD, + SVX_ORIENTATION_TOPBOTTOM, + SVX_ORIENTATION_BOTTOMTOP, + SVX_ORIENTATION_STACKED +}; +item SvxCellOrientationEnum SvxCellOrientationEnumItem; + +//------------------------------------------------------------------------- + +item SvxCellHorJustifyEnum SvxHorJustifyItem; +item SvxCellVerJustifyEnum SvxVerJustifyItem; +item SvxCellOrientationEnum SvxOrientationItem; + +//------------------------------------------------------------------------- + +struct SvxLongLRSpace +{ + INT32 Left MID_LEFT; + INT32 Right MID_RIGHT; +}; +item SvxLongLRSpace SvxLongLRSpaceItem; + +//------------------------------------------------------------------------- + +struct SvxLongULSpace +{ + INT32 Upper MID_UPPER; + INT32 Lower MID_LOWER; +}; +item SvxLongULSpace SvxLongULSpaceItem; + +//------------------------------------------------------------------------- + +struct SvxZoom +{ + INT32 Type MID_TYPE; + UINT16 ValueSet MID_VALUESET; + INT32 Percent MID_PERCENT; +}; +item SvxZoom SvxZoomItem; + +//------------------------------------------------------------------------- + +item SbxObject SvxTabStopItem; + + diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi index 40b9da78d7ff..88bd108bddff 100644 --- a/starmath/sdi/smslots.sdi +++ b/starmath/sdi/smslots.sdi @@ -28,8 +28,6 @@ * ************************************************************************/ -import "svxslots.ilb" - module "312C4240-35E7-101C-B12A-04021C007002" "58216740-35E7-101C-B12A-04021C007002" @@ -39,9 +37,13 @@ StarMath SlotIdFile ( "starmath.hrc" ) SlotIdFile ( "sfx2/sfxsids.hrc" ) SlotIdFile ( "svx/svxids.hrc" ) - TypeLibFile ( "smslots.tlb" ) ] { + include "sfx2/sfxitems.sdi" + include "sfx2/sfx.sdi" + include "svx/svxitems.sdi" + include "svx/xoitems.sdi" + include "svx/svx.sdi" include "smath.sdi" interface StarMath [ @@ -59,7 +61,7 @@ shell SmModule import StarMath[Automation]; } -interface FormulaDocument : OfficeDocument +interface FormulaDocument [ uuid ( "815CBB20-2FC3-11CF-89CA-008029E4B0B1" ) ] @@ -149,13 +151,13 @@ interface FormulaDocument : OfficeDocument ] } -shell SmDocShell : SfxObjectShell +shell SmDocShell { import FormulaDocument[Automation]; } -interface FormulaView : View +interface FormulaView [ uuid ( "CE1A6C00-2FC3-11CF-89CA-008029E4B0B1" ) ] @@ -323,7 +325,7 @@ interface FormulaView : View ] } -shell SmViewShell : SfxViewShell +shell SmViewShell { import FormulaView[Automation]; } diff --git a/starmath/sdi/svxitems.sdi b/starmath/sdi/svxitems.sdi deleted file mode 100644 index ddbf0f2fc185..000000000000 --- a/starmath/sdi/svxitems.sdi +++ /dev/null @@ -1,598 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: svxitems.sdi,v $ - * $Revision: 1.4 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -//------------------------------------------------------------------------- - -enum SvxAdjust -{ - SVX_ADJUST_LEFT, - SVX_ADJUST_RIGHT, - SVX_ADJUST_BLOCK, - SVX_ADJUST_CENTER, - SVX_ADJUST_BLOCKLINE, - SVX_ADJUST_END -}; -item SvxAdjust SvxAdjustItem; - -//------------------------------------------------------------------------- - -enum SvxCaseMap -{ - SVX_CASEMAP_NOT_MAPPED, - SVX_CASEMAP_VERSALIEN, - SVX_CASEMAP_GEMEINE, - SVX_CASEMAP_TITEL, - SVX_CASEMAP_KAPITAELCHEN, - SVX_CASEMAP_END -}; -item SvxCaseMap SvxCaseMapItem; - -//------------------------------------------------------------------------- - -enum CharSet -{ - CHARSET_DONTKNOW, - CHARSET_ANSI, - CHARSET_MAC, - CHARSET_IBMPC_437, - CHARSET_IBMPC_850, - CHARSET_IBMPC_860, - CHARSET_IBMPC_861, - CHARSET_IBMPC_863, - CHARSET_IBMPC_865, - CHARSET_SYSTEM, - CHARSET_SYMBOL -}; -item CharSet CharSetItem; - -//------------------------------------------------------------------------- - -enum FontFamily -{ - FAMILY_DONTKNOW, - FAMILY_DECORATIVE, - FAMILY_MODERN, - FAMILY_ROMAN, - FAMILY_SCRIPT, - FAMILY_SWISS, - FAMILY_SYSTEM -}; -item FontFamily FontFamilyItem; - -//------------------------------------------------------------------------- - -enum FontPitch -{ - PITCH_DONTKNOW, - PITCH_FIXED, - PITCH_VARIABLE -}; -item FontPitch FontPitchItem; - -//------------------------------------------------------------------------- - -enum FontAlign -{ - ALIGN_TOP, - ALIGN_BASELINE, - ALIGN_BOTTOM -}; -item FontAlign FontAlignItem; - -//------------------------------------------------------------------------- - -enum FontWeight -{ - WEIGHT_DONTKNOW, - WEIGHT_THIN, - WEIGHT_ULTRALIGHT, - WEIGHT_LIGHT, - WEIGHT_SEMILIGHT, - WEIGHT_NORMAL, - WEIGHT_MEDIUM, - WEIGHT_SEMIBOLD, - WEIGHT_BOLD, - WEIGHT_ULTRABOLD, - WEIGHT_BLACK -}; -item FontWeight FontWeightItem; - -//------------------------------------------------------------------------- - -enum FontUnderline -{ - UNDERLINE_NONE, - UNDERLINE_SINGLE, - UNDERLINE_DOUBLE, - UNDERLINE_DOTTED -}; -item FontUnderline FontUnderlineItem; - -//------------------------------------------------------------------------- - -enum FontStrikeout -{ - STRIKEOUT_NONE, - STRIKEOUT_SINGLE, - STRIKEOUT_DOUBLE -}; -item FontStrikeout FontStrikeoutItem; - -//------------------------------------------------------------------------- - -enum FontItalic -{ - ITALIC_NONE, - ITALIC_OBLIQUE, - ITALIC_NORMAL -}; -item FontItalic FontItalicItem; - -//------------------------------------------------------------------------- - -enum SvxDbType -{ - DBTYPE_STARBASE, - DBTYPE_ODBC, - DBTYPE_WATCOM -}; -item SvxDbType SvxDbTypeItem; - -//------------------------------------------------------------------------- - -enum SvxLineSpace -{ - SVX_LINE_SPACE_AUTO, - SVX_LINE_SPACE_MAX, - SVX_LINE_SPACE_MIN, - SVX_LINE_SPACE_END -}; -item SvxLineSpace SvxLineSpaceItem; - -//------------------------------------------------------------------------- - -enum SvxInterLineSpace -{ - SVX_INTER_LINE_SPACE_OFF, - SVX_INTER_LINE_SPACE_PROP, - SVX_INTER_LINE_SPACE_FIX, - SVX_INTER_LINE_SPACE_END -}; -item SvxInterLineSpace SvxInterLineSpaceItem; - -//------------------------------------------------------------------------- - -enum SvxBreak -{ - SVX_BREAK_NONE, - SVX_BREAK_COLUMN_BEFORE, - SVX_BREAK_COLUMN_AFTER, - SVX_BREAK_COLUMN_BOTH, - SVX_BREAK_PAGE_BEFORE, - SVX_BREAK_PAGE_AFTER, - SVX_BREAK_PAGE_BOTH, - SVX_BREAK_END -}; -item SvxBreak SvxBreakItem; - -//------------------------------------------------------------------------- - -enum BrushStyle -{ - BRUSH_NULL, - BRUSH_SOLID, - BRUSH_HORZ, - BRUSH_VERT, - BRUSH_CROSS, - BRUSH_DIAGCROSS, - BRUSH_UPDIAG, - BRUSH_DOWNDIAG, - BRUSH_25, - BRUSH_50, - BRUSH_75, - BRUSH_BITMAP -}; -item BrushStyle BrushStyleItem; - -//------------------------------------------------------------------------- - -enum SvxNumType -{ - SVX_CHARS_UPPER_LETTER, - SVX_CHARS_LOWER_LETTER, - SVX_ROMAN_UPPER, - SVX_ROMAN_LOWER, - SVX_ARABIC, - SVX_NUMBER_NONE, - SVX_CHAR_SPECIAL, - SVX_PAGEDESC -}; -item SvxNumType SvxNumTypeItem; - -//------------------------------------------------------------------------- - -enum SvxShadowLocation -{ - SVX_SHADOW_NONE, - SVX_SHADOW_TOPLEFT, - SVX_SHADOW_TOPRIGHT, - SVX_SHADOW_BOTTOMLEFT, - SVX_SHADOW_BOTTOMRIGHT, - SVX_SHADOW_END -}; -item SvxShadowLocation SvxShadowLocationItem; - -//------------------------------------------------------------------------- - -struct SvxBrush -{ - BrushStyle Style MID_BRUSHSTYLE; - BOOL Transparent MID_TRANSPARENT; - UINT32 BackColor MID_BG_COLOR; - UINT32 FillColor MID_FG_COLOR; -}; -item SvxBrush SvxBrushItem; - -//------------------------------------------------------------------------- - -struct SvxCharSetColor -{ - CharSet CharSet MID_CHARSET; - UINT32 Color MID_FG_COLOR; -}; -item SvxCharSetColor SvxCharSetColorItem; - -//------------------------------------------------------------------------- - -item BOOL SvxAutoKernItem; -item UINT32 SvxColorItem; -item BOOL SvxContourItem; -item FontStrikeout SvxCrossedOutItem; - -//------------------------------------------------------------------------- - -struct SvxEscapement -{ - INT16 Esc MID_ESCAPEMENT; - BYTE Prop MID_PROPORTIONAL; -}; -item SvxEscapement SvxEscapementItem; - -//------------------------------------------------------------------------- - -struct SvxFmtBreak -{ - BOOL Auto MID_AUTOBREAK; - UINT16 Break MID_BREAKxxx; -} -item SvxFmtBreak SvxFmtBreakItem; - -//------------------------------------------------------------------------- - -item BOOL SvxFmtKeepItem; -item BOOL SvxFmtSplitItem; - -struct SvxFontHeight -{ - UINT32 Height MID_HEIGHT; - BYTE Prop MID_PROPORTIONAL; -}; -item SvxFontHeight SvxFontHeightItem; - -//------------------------------------------------------------------------- - -struct SvxFont -{ - String StyleName MID_FONTSTYLE; - FontPitch Pitch MID_FONTPICTH; - CharSet CharSet MID_CHARSET; - FontFamily Family MID_FONTFAMILY; - String FamilyName MID_FONTFAMILYNAME; -}; -item SvxFont SvxFontItem; - -//------------------------------------------------------------------------- - -struct SvxHyphenZone -{ - BOOL Hyphen MID_HYPHEN; - BOOL PageEnd MID_PAGEEND; - BYTE MinLead MID_MINLEAD; - BYTE MinTrail MID_MINTRAIL; - BYTE MaxHyphens MID_MAXHYPHENS; -}; -item SvxHyphenZone SvxHyphenZoneItem; - -//------------------------------------------------------------------------- - -item INT16 SvxKerningItem; - -//------------------------------------------------------------------------- - -struct SvxLine -{ - UINT32 Color MID_FG_COLOR; - UINT16 OutWidth MID_OUTER_WIDTH; - UINT16 InWidth MID_INNER_WIDTH; - UINT16 Distance MID_DISTANCE; -}; -item SvxLine SvxLineItem; - -//------------------------------------------------------------------------- - -struct SvxLRSpace -{ - INT16 FirstLineOffset MID_FIRSTLINE_OFFSET; // % or direct - UINT16 LeftMargin MID_LEFT_MARGIN; // % or direct - UINT16 RightMargin MID_RIGHT_MARGIN; // % or direct -}; -item SvxLRSpace SvxLRSpaceItem; - -//------------------------------------------------------------------------- - -item UINT16 SvxLanguage; - -struct SvxLineSpacing -{ - SvxLineSpace LineSpace MID_LINESPACE; - UINT16 LineHeight MID_HEIGHT; // % or direct - SvxInterLineSpace InterLineSpace MID_INTER_LINESPACE; - INT16 InterSpace MID_INTER_SPACE; -}; -item SvxLineSpacing SvxLineSpacingItem; - -//------------------------------------------------------------------------- - -item BOOL SvxNoHyphenItem; -item BOOL SvxNoLinebreakItem; -item BOOL SvxOpaqueItem; -item BYTE SvxOrphansItem; - -//------------------------------------------------------------------------- - -struct SvxPage -{ - String DescName MID_DESCNAMExxx; - BOOL Landscape MID_LANDSCAPE; - UINT16 Use MID_USExxx; - SvxNumType NumType MID_NUMTYPExxx; -}; -item SvxPage SvxPageItem; - -//------------------------------------------------------------------------- - -item String SvxPageModelItem; - -//------------------------------------------------------------------------- - -struct SvxPagePosSize -{ - INT32 XPos MID_X; - INT32 YPos MID_Y; - INT32 Width MID_WIDTH; - INT32 Height MID_HEIGHT; -}; -item SvxPagePosSize SvxPagePosSizeItem; - -//------------------------------------------------------------------------- - -item BYTE SvxPaperBinItem; - -//------------------------------------------------------------------------- - -item String SvxPostItAuthorItem; -item String SvxPostItDateItem; -item String SvxPostItTextItem; -item FontItalic SvxPostureItem; -item BOOL SvxPrintItem; -item UINT16 SvxPropSizeItem; - -//------------------------------------------------------------------------- - -struct SvxProtect -{ - BOOL Content MID_CONTENT; - BOOL Pos MID_POS; - BOOL Size MID_SIZE; -}; -item SvxProtect SvxProtectItem; - -//------------------------------------------------------------------------- - -struct SvxSearch -{ - UINT16 Command MID_COMMAND; - String SearchString MID_SEARCH_STRING; - String ReplaceString MID_REPLACE_STRING; - // W)ord, E)xact, B)ack, S)election, R)egExpr, P)attern - String Flags MID_FLAGS; - UINT16 Family MID_FAMILY; - UINT16 CellType MID_CELLTYPE; - BOOL RowDirection MID_ROW_DIRECTION; - UINT16 AppFlag MID_APPFLAG; -}; -item SvxSearch SvxSearchItem; - -//------------------------------------------------------------------------- - -item BOOL SvxShadowedItem; - -//------------------------------------------------------------------------- - -struct SvxShadow -{ - SvxShadowLocation Location MID_LOCATION; - UINT16 Width MID_WIDTH; - BrushStyle Style MID_BRUSHSTYLE; - BOOL Transparent MID_TRANSPARENT; - UINT32 BackColor MID_BG_COLOR; - UINT32 FillColor MID_FG_COLOR; -}; -item SvxShadow SvxShadowItem; - -//------------------------------------------------------------------------- - -struct SvxSize -{ - UINT32 Width MID_WIDTH; - UINT32 Height MID_HEIGHT; -}; -item SvxSize SvxSizeItem; - -//------------------------------------------------------------------------- - -struct SvxULSpace -{ - UINT16 Upper MID_UPPER; // % or direct - UINT16 Lower MID_LOWER; // % or direct -}; -item SvxULSpace SvxULSpaceItem - -//------------------------------------------------------------------------- - -enum SvxChooseControlEnum -{ - SVX_SNAP_PUSHBUTTON, - SVX_SNAP_CHECKBOX, - SVX_SNAP_RADIOBUTTON, - SVX_SNAP_SPINBUTTON, - SVX_SNAP_FIXEDTEXT, - SVX_SNAP_GROUPBOX, - SVX_SNAP_LISTBOX, - SVX_SNAP_COMBOBOX, - SVX_SNAP_EDIT, - SVX_SNAP_HSCROLLBAR, - SVX_SNAP_VSCROLLBAR, - SVX_SNAP_PREVIEW, - SVX_SNAP_SELECT, - SVX_SNAP_NOTHING -} -item SvxChooseControlEnum SvxChooseControlEnumItem; - -//------------------------------------------------------------------------- - -enum SvxDrawToolEnum -{ - SVX_SNAP_DRAW_SELECT, - // - SVX_SNAP_DRAW_LINE, - SVX_SNAP_DRAW_RECT, - SVX_SNAP_DRAW_ELLIPSE, - SVX_SNAP_DRAW_POLYGON, - SVX_SNAP_DRAW_ARC, - SVX_SNAP_DRAW_PIE, - SVX_SNAP_DRAW_CIRCLECUT, - SVX_SNAP_DRAW_TEXT, - SVX_SNAP_DRAW_CAPTION, - SVX_SNAP_DRAW_NOTHING -} -item SvxDrawToolEnum SvxDrawToolEnumItem; - -//------------------------------------------------------------------------- - -item SvxChooseControlEnum SvxChooseControlItem; -item SvxDrawToolEnum SvxDrawToolItem; -item FontUnderline SvxUnderlineItem; -item FontWeight SvxWeightItem; -item BYTE SvxWidowsItem; -item BOOL SvxWordLineModeItem; -item String SvxBoxItem; //! Dummy - -//------------------------------------------------------------------------- - -enum SvxCellHorJustifyEnum -{ - SVX_HOR_JUSTIFY_STANDARD, - SVX_HOR_JUSTIFY_LEFT, - SVX_HOR_JUSTIFY_CENTER, - SVX_HOR_JUSTIFY_RIGHT, - SVX_HOR_JUSTIFY_BLOCK, - SVX_HOR_JUSTIFY_REPEAT -}; -item SvxCellHorJustifyEnum SvxCellHorJustifyEnumItem; - -enum SvxCellVerJustifyEnum -{ - SVX_VER_JUSTIFY_STANDARD, - SVX_VER_JUSTIFY_TOP, - SVX_VER_JUSTIFY_CENTER, - SVX_VER_JUSTIFY_BOTTOM -}; -item SvxCellVerJustifyEnum SvxCellVerJustifyEnumItem; - -//------------------------------------------------------------------------- - -enum SvxCellOrientationEnum -{ - SVX_ORIENTATION_STANDARD, - SVX_ORIENTATION_TOPBOTTOM, - SVX_ORIENTATION_BOTTOMTOP, - SVX_ORIENTATION_STACKED -}; -item SvxCellOrientationEnum SvxCellOrientationEnumItem; - -//------------------------------------------------------------------------- - -item SvxCellHorJustifyEnum SvxHorJustifyItem; -item SvxCellVerJustifyEnum SvxVerJustifyItem; -item SvxCellOrientationEnum SvxOrientationItem; - -//------------------------------------------------------------------------- - -struct SvxLongLRSpace -{ - INT32 Left MID_LEFT; - INT32 Right MID_RIGHT; -}; -item SvxLongLRSpace SvxLongLRSpaceItem; - -//------------------------------------------------------------------------- - -struct SvxLongULSpace -{ - INT32 Upper MID_UPPER; - INT32 Lower MID_LOWER; -}; -item SvxLongULSpace SvxLongULSpaceItem; - -//------------------------------------------------------------------------- - -struct SvxZoom -{ - INT32 Type MID_TYPE; - UINT16 ValueSet MID_VALUESET; - INT32 Percent MID_PERCENT; -}; -item SvxZoom SvxZoomItem; - -//------------------------------------------------------------------------- - -item SbxObject SvxTabStopItem; - - -- cgit From eb52fad75717c6e0d16e93b39d3fb49132cf69d1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 6 Oct 2009 07:38:24 +0200 Subject: #103496#: move VCL free ConfigItems to unotools --- starmath/source/config.cxx | 2 +- starmath/source/document.cxx | 6 +- starmath/source/mathmlexport.cxx | 20 +++--- starmath/source/mathmlimport.cxx | 136 +++++++++++++++++++-------------------- 4 files changed, 82 insertions(+), 82 deletions(-) (limited to 'starmath') diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx index b778571a5c0f..0f5b42cbd37f 100644 --- a/starmath/source/config.cxx +++ b/starmath/source/config.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index ab467fc034e3..83411afab78c 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -59,9 +59,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 9ddabab9c325..75c9e8cfc8d9 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include #include #include @@ -403,8 +403,8 @@ SmXMLExport::SmXMLExport( { } -sal_Int64 SAL_CALL SmXMLExport::getSomething( - const uno::Sequence< sal_Int8 >& rId ) +sal_Int64 SAL_CALL SmXMLExport::getSomething( + const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException) { if ( rId.getLength() == 16 && @@ -833,7 +833,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel) if (nSize >= 1 && pNode->GetSubNode(nSize-1)->GetNumSubNodes() == 0) --nSize; - // try to avoid creating a mtable element when the formula consists only + // try to avoid creating a mtable element when the formula consists only // of a single output line if (nLevel || (nSize >1)) pTable = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTABLE, sal_True, sal_True); @@ -902,7 +902,7 @@ void SmXMLExport::ExportText(const SmNode *pNode, int /*nLevel*/) void SmXMLExport::ExportBlank(const SmNode * /*pNode*/, int /*nLevel*/) { - //!! exports an empty tag since for example "~_~" is allowed in + //!! exports an empty tag since for example "~_~" is allowed in //!! Math (so it has no sense at all) but must not result in an empty //!! tag in MathML !! @@ -910,7 +910,7 @@ void SmXMLExport::ExportBlank(const SmNode * /*pNode*/, int /*nLevel*/) //const SmBlankNode *pTemp = static_cast(pNode); pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MI, sal_True, sal_False); - + GetDocHandler()->characters( OUString() ); delete pText; } @@ -1203,10 +1203,10 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode, int nLevel) static bool lcl_HasEffectOnMathvariant( const SmTokenType eType ) { - return eType == TBOLD || eType == TNBOLD || + return eType == TBOLD || eType == TNBOLD || eType == TITALIC || eType == TNBOLD || eType == TSANS || eType == TSERIF || eType == TFIXED; -} +} void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel) { @@ -1480,7 +1480,7 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel) // thus at least it will not vanish into nothing ExportText(pNode, nLevel); } - else + else { //To fully handle generic MathML we need to implement the full //operator dictionary, we will generate MathML with explicit diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 1f7336db6d3c..e4b01f33cc12 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ one go*/ #include #include #include -#include +#include #include #include #include @@ -337,7 +337,7 @@ ULONG SmXMLImportWrapper::ReadThroughComponent( packages::zip::ZipIOException aBrokenPackage; if ( aSaxEx.WrappedException >>= aBrokenPackage ) return ERRCODE_IO_BROKENPACKAGE; - + if ( bEncrypted ) nError = ERRCODE_SFX_WRONGPASSWORD; } @@ -346,7 +346,7 @@ ULONG SmXMLImportWrapper::ReadThroughComponent( packages::zip::ZipIOException aBrokenPackage; if ( r.WrappedException >>= aBrokenPackage ) return ERRCODE_IO_BROKENPACKAGE; - + if ( bEncrypted ) nError = ERRCODE_SFX_WRONGPASSWORD; } @@ -553,8 +553,8 @@ rtl::OUString SAL_CALL SmXMLImport::getImplementationName() } -sal_Int64 SAL_CALL SmXMLImport::getSomething( - const uno::Sequence< sal_Int8 >&rId ) +sal_Int64 SAL_CALL SmXMLImport::getSomething( + const uno::Sequence< sal_Int8 >&rId ) throw(uno::RuntimeException) { if ( rId.getLength() == 16 && @@ -625,17 +625,17 @@ public: SmXMLImportContext( SmXMLImport &rImport, sal_uInt16 nPrfx, const OUString& rLName) : SvXMLImportContext(rImport, nPrfx, rLName) {} - + const SmXMLImport& GetSmImport() const { return (const SmXMLImport&)GetImport(); } - + SmXMLImport& GetSmImport() { return (SmXMLImport&)GetImport(); } - + virtual void TCharacters(const OUString & /*rChars*/); virtual void Characters(const OUString &rChars); virtual SvXMLImportContext *CreateChildContext(sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/); @@ -644,7 +644,7 @@ public: void SmXMLImportContext::TCharacters(const OUString & /*rChars*/) { } - + void SmXMLImportContext::Characters(const OUString &rChars) { /* @@ -678,10 +678,10 @@ struct SmXMLContext_Helper OUString sColor; SmXMLImportContext rContext; - - SmXMLContext_Helper(SmXMLImportContext &rImport) : + + SmXMLContext_Helper(SmXMLImportContext &rImport) : nIsBold(-1), nIsItalic(-1), nFontSize(0.0), rContext(rImport) {} - + void RetrieveAttrs(const uno::Reference< xml::sax::XAttributeList > &xAttrList ); void ApplyAttrs(); }; @@ -845,9 +845,9 @@ public: SmXMLDocContext_Impl( SmXMLImport &rImport, sal_uInt16 nPrfx, const OUString& rLName) : SmXMLImportContext(rImport,nPrfx,rLName) {} - + virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList); - + void EndElement(); }; @@ -864,13 +864,13 @@ public: const OUString& rLName) : SmXMLDocContext_Impl(rImport,nPrefix,rLName) { nElementCount = GetSmImport().GetNodeStack().Count(); } - + virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList); - + SvXMLImportContext *StrictCreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList); - + void EndElement(); }; @@ -882,7 +882,7 @@ public: SmXMLFracContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {} - + void EndElement(); }; @@ -894,7 +894,7 @@ public: SmXMLSqrtContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {} - + void EndElement(); }; @@ -906,7 +906,7 @@ public: SmXMLRootContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {} - + void EndElement(); }; @@ -922,7 +922,7 @@ public: SmXMLStyleContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName), aStyleHelper(*this) {} - + void EndElement(); void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList ); }; @@ -1100,7 +1100,7 @@ public: SmXMLPaddedContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {} - + void EndElement(); }; @@ -1124,7 +1124,7 @@ public: SmXMLPhantomContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {} - + void EndElement(); }; @@ -1164,7 +1164,7 @@ public: const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName), cBegin('('), cEnd(')') {} - + void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList ); void EndElement(); }; @@ -1255,7 +1255,7 @@ public: SmXMLErrorContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {} - + void EndElement(); }; @@ -1293,9 +1293,9 @@ public: aToken.nLevel = 5; aToken.eType = TNUMBER; } - + virtual void TCharacters(const OUString &rChars); - + void EndElement(); }; @@ -1319,9 +1319,9 @@ public: SmXMLAnnotationContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLImportContext(rImport,nPrefix,rLName), bIsStarMath(sal_False) {} - + virtual void Characters(const OUString &rChars); - + void StartElement(const uno::Reference & xAttrList ); }; @@ -1374,9 +1374,9 @@ public: aToken.nLevel = 5; aToken.eType = TTEXT; } - + virtual void TCharacters(const OUString &rChars); - + void EndElement(); }; @@ -1407,9 +1407,9 @@ public: aToken.nLevel = 5; aToken.eType = TTEXT; } - + virtual void TCharacters(const OUString &rChars); - + void EndElement(); }; @@ -1454,9 +1454,9 @@ public: aToken.nLevel = 5; aToken.eType = TIDENT; } - + void TCharacters(const OUString &rChars); - void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList ) + void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { aStyleHelper.RetrieveAttrs(xAttrList); }; @@ -1519,7 +1519,7 @@ public: aToken.eType = TSPECIAL; aToken.nLevel = 5; } - + void TCharacters(const OUString &rChars); void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList ); void EndElement(); @@ -1578,7 +1578,7 @@ public: SmXMLSpaceContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLImportContext(rImport,nPrefix,rLName) {} - + void StartElement(const uno::Reference< xml::sax::XAttributeList >& xAttrList ); }; @@ -1606,10 +1606,10 @@ public: SmXMLSubContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {} - - void EndElement() - { - GenericEndElement(TRSUB,RSUB); + + void EndElement() + { + GenericEndElement(TRSUB,RSUB); } }; @@ -1647,7 +1647,7 @@ public: SmXMLSupContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLSubContext_Impl(rImport,nPrefix,rLName) {} - + void EndElement() { GenericEndElement(TRSUP,RSUP); @@ -1665,9 +1665,9 @@ public: SmXMLSubSupContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {} - - void EndElement() - { + + void EndElement() + { GenericEndElement(TRSUB,RSUB,RSUP); } }; @@ -1711,7 +1711,7 @@ public: SmXMLUnderContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLSubContext_Impl(rImport,nPrefix,rLName) {} - + void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList ); void EndElement(); void HandleAccent(); @@ -1782,7 +1782,7 @@ public: SmXMLOverContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLSubContext_Impl(rImport,nPrefix,rLName), nAttrCount(0) {} - + void EndElement(); void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList ); void HandleAccent(); @@ -1836,9 +1836,9 @@ public: SmXMLUnderOverContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLSubSupContext_Impl(rImport,nPrefix,rLName) {} - - void EndElement() - { + + void EndElement() + { GenericEndElement(TCSUB,CSUB,CSUP); } }; @@ -1854,7 +1854,7 @@ public: const OUString& rLName) : SmXMLSubSupContext_Impl(rImport,nPrefix,rLName), bHasPrescripts(FALSE) {} - + void EndElement(); void MiddleElement(); SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, @@ -1870,7 +1870,7 @@ public: SmXMLNoneContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix, const OUString& rLName) : SmXMLImportContext(rImport,nPrefix,rLName) {} - + void EndElement(); }; @@ -1906,7 +1906,7 @@ public: const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {} - + SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList); @@ -1922,7 +1922,7 @@ public: const OUString& rLName) : SmXMLTableRowContext_Impl(rImport,nPrefix,rLName) {} - + void EndElement(); SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, @@ -1950,9 +1950,9 @@ public: const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {} - + /*Don't do anything with alignment for now*/ - void EndElement() + void EndElement() { } }; @@ -1966,7 +1966,7 @@ public: const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {} - + void EndElement(); }; @@ -1980,7 +1980,7 @@ public: SmXMLOfficeContext_Impl( SmXMLImport &rImport, sal_uInt16 nPrfx, const OUString& rLName) : SvXMLImportContext(rImport,nPrfx,rLName) {} - + virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList); }; @@ -1990,10 +1990,10 @@ SvXMLImportContext *SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16 nPref { SvXMLImportContext *pContext = 0; if ( XML_NAMESPACE_OFFICE == nPrefix && - rLocalName == GetXMLToken(XML_META) ) + rLocalName == GetXMLToken(XML_META) ) { DBG_WARNING("XML_TOK_DOC_META: should not have come here, maybe document is invalid?"); - } + } else if ( XML_NAMESPACE_OFFICE == nPrefix && rLocalName == GetXMLToken(XML_SETTINGS) ) { @@ -2049,8 +2049,8 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext( { return SvXMLMetaDocumentContext::CreateChildContext( i_nPrefix, i_rLocalName, i_xAttrList ); - } - else + } + else { return SmXMLOfficeContext_Impl::CreateChildContext( i_nPrefix, i_rLocalName, i_xAttrList ); @@ -2837,10 +2837,10 @@ SvXMLImportContext *SmXMLImport::CreateContext(sal_uInt16 nPrefix, const OUString &rLocalName, const uno::Reference & /*xAttrList*/) { - if ( XML_NAMESPACE_OFFICE == nPrefix ) + if ( XML_NAMESPACE_OFFICE == nPrefix ) { if ( (IsXMLToken(rLocalName, XML_DOCUMENT) || - IsXMLToken(rLocalName, XML_DOCUMENT_META))) + IsXMLToken(rLocalName, XML_DOCUMENT_META))) { uno::Reference xDocBuilder( mxServiceFactory->createInstance( @@ -2856,12 +2856,12 @@ SvXMLImportContext *SmXMLImport::CreateContext(sal_uInt16 nPrefix, // flat OpenDocument file format -- this has not been tested... : new SmXMLFlatDocContext_Impl( *this, nPrefix, rLocalName, xDPS->getDocumentProperties(), xDocBuilder); - } - else + } + else { return new SmXMLOfficeContext_Impl( *this,nPrefix,rLocalName); } - } + } else return new SmXMLDocContext_Impl(*this,nPrefix,rLocalName); } -- cgit From ed87eb8f7aec4990f65ed9c5b90738eab8b59e21 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Oct 2009 00:05:16 +0200 Subject: #i103496#: split svtools; improve ConfitItems --- starmath/inc/action.hxx | 2 +- starmath/inc/config.hxx | 4 ++-- starmath/inc/document.hxx | 2 +- starmath/inc/format.hxx | 4 ++-- starmath/inc/smmod.hxx | 9 +++++---- starmath/inc/starmath.hrc | 2 +- starmath/inc/symbol.hxx | 4 ++-- starmath/source/accessibility.cxx | 2 +- starmath/source/accessibility.hxx | 2 +- starmath/source/cfgitem.cxx | 2 ++ starmath/source/cfgitem.hxx | 4 ++-- starmath/source/config.cxx | 14 +++++++------- starmath/source/dialog.cxx | 6 +++--- starmath/source/document.cxx | 22 +++++++++++----------- starmath/source/edit.cxx | 8 ++++---- starmath/source/math_pch.cxx | 36 ++++++++++++++++++------------------ starmath/source/mathmlexport.cxx | 4 ++-- starmath/source/mathmlimport.cxx | 4 ++-- starmath/source/parse.cxx | 2 +- starmath/source/smdetect.cxx | 6 +++--- starmath/source/smmod.cxx | 17 +++++++---------- starmath/source/toolbox.cxx | 4 ++-- starmath/source/typemap.cxx | 6 +++--- starmath/source/unomodel.cxx | 2 +- starmath/source/view.cxx | 16 ++++++++-------- 25 files changed, 92 insertions(+), 92 deletions(-) (limited to 'starmath') diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx index 6e2375331de9..6a816a447d8c 100644 --- a/starmath/inc/action.hxx +++ b/starmath/inc/action.hxx @@ -30,7 +30,7 @@ #ifndef ACTION_HXX #define ACTION_HXX -#include +#include #include "format.hxx" class SmDocShell; diff --git a/starmath/inc/config.hxx b/starmath/inc/config.hxx index 6528c81b45ac..ecf30b244f80 100644 --- a/starmath/inc/config.hxx +++ b/starmath/inc/config.hxx @@ -30,8 +30,8 @@ #ifndef CONFIG_HXX #define CONFIG_HXX -#include -#include +#include +#include #include "format.hxx" #include "cfgitem.hxx" diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index fac4f1b0faa4..94bffbaad48d 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include "format.hxx" diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx index 05375f8a73e0..6b9b5ad650b5 100644 --- a/starmath/inc/format.hxx +++ b/starmath/inc/format.hxx @@ -31,8 +31,8 @@ #define FORMAT_HXX -#include -#include +#include +#include #include "utility.hxx" #include diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index 4b493c0cbca7..722efd82595c 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -34,7 +34,7 @@ #ifndef _SV_RESARY_HXX #include #endif -#include +#include #include #include @@ -44,6 +44,8 @@ #include "starmath.hrc" #endif +#include + class SvxErrorHandler; class SfxObjectFactory; class SmConfig; @@ -124,7 +126,7 @@ public: ///////////////////////////////////////////////////////////////// -class SmModule : public SfxModule, public SfxListener +class SmModule : public SfxModule, utl::ConfigurationListener { svtools::ColorConfig *pColorConfig; SmConfig *pConfig; @@ -145,8 +147,7 @@ public: SmModule(SfxObjectFactory* pObjFact); virtual ~SmModule(); - // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); svtools::ColorConfig & GetColorConfig(); diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 6d117bcc9524..0f93e6551cc9 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -31,7 +31,7 @@ #define _STARMATH_HRC #ifndef _SVX_SVXIDS_HRC -#include +#include #endif #ifndef _SFXSIDS_HRC //autogen #include diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx index d39376c30ed0..9d0707a19690 100644 --- a/starmath/inc/symbol.hxx +++ b/starmath/inc/symbol.hxx @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include "utility.hxx" #include diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index f258d7f31176..823e5bbd926e 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 7199583dd4ff..07217bee9f1a 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include // SvxEditSource, SvxTextForwarder, SvxViewForwarder, SvxEditViewForwarder diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 16461d97d6e1..185df0c003f5 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -1292,6 +1292,8 @@ void SmMathConfig::SetShowFormulaCursor( BOOL bVal ) SetOtherIfNotEqual( pOther->bFormulaCursor, bVal ); } +void SmMathConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{} ///////////////////////////////////////////////////////////////// diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx index 8987e153026f..8ab417cac1f1 100644 --- a/starmath/source/cfgitem.hxx +++ b/starmath/source/cfgitem.hxx @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include @@ -174,7 +174,7 @@ public: virtual ~SmMathConfig(); // utl::ConfigItem - //virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); virtual void Commit(); // make some protected functions of utl::ConfigItem public diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx index 0f5b42cbd37f..284a7898499d 100644 --- a/starmath/source/config.cxx +++ b/starmath/source/config.cxx @@ -32,15 +32,15 @@ #include "precompiled_starmath.hxx" -#include -#include -#include +#include +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 20af2f38b3ee..3a0c7455144f 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -34,9 +34,9 @@ #define SMDLL 1 #include "tools/rcid.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 83411afab78c..63b651fd0539 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -55,22 +55,22 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 8435b7b5f35a..6f69f52539aa 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -52,13 +52,13 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include #include #include diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx index 5ea88307fb2d..6dba5ec80379 100644 --- a/starmath/source/math_pch.cxx +++ b/starmath/source/math_pch.cxx @@ -48,11 +48,11 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include #include @@ -130,9 +130,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -143,7 +143,7 @@ #include #include #include -#include +#include #include #include #include @@ -156,7 +156,7 @@ #include #include #include -#include +#include #include #include #include @@ -736,7 +736,7 @@ #endif #include #include -#include +#include #include #include #include @@ -745,10 +745,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -756,14 +756,14 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -822,9 +822,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 75c9e8cfc8d9..c9b12abcdb90 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -62,8 +62,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index e4b01f33cc12..bdbb7de5e8a9 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -58,8 +58,8 @@ one go*/ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 83662e50b123..727d595b40ea 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include "parse.hxx" #ifndef _STARMATH_HRC #include "starmath.hrc" diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index f65b7fcdc764..f7008403cddf 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -60,10 +60,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 20cfc284d006..8ad99121acfa 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include @@ -47,7 +47,7 @@ #endif #include #include -#include +#include #include #include "smmod.hxx" #include "symbol.hxx" @@ -251,6 +251,8 @@ SmModule::SmModule(SfxObjectFactory* pObjFact) : SmModule::~SmModule() { delete pConfig; + if (pColorConfig) + pColorConfig->RemoveListener(this); delete pColorConfig; delete pLocSymbolData; delete pSysLocale; @@ -295,19 +297,14 @@ svtools::ColorConfig & SmModule::GetColorConfig() { pColorConfig = new svtools::ColorConfig; ApplyColorConfigValues( *pColorConfig ); - StartListening( *pColorConfig ); + pColorConfig->AddListener(this); } return *pColorConfig; } -void SmModule::Notify( SfxBroadcaster & /*rBC*/, const SfxHint &rHint ) +void SmModule::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { - if (rHint.ISA(SfxSimpleHint)) - { - ULONG nHintId = ((SfxSimpleHint&)rHint).GetId(); - if (SFX_HINT_COLORS_CHANGED == nHintId) - ApplyColorConfigValues(*pColorConfig); - } + ApplyColorConfigValues(*pColorConfig); } SmConfig * SmModule::GetConfig() diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index 487bd6155fc9..2a912664fde4 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -33,9 +33,9 @@ #include -#include +#include #include -#include +#include #include #include #include diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx index d0e796533e3f..bc61839af470 100644 --- a/starmath/source/typemap.cxx +++ b/starmath/source/typemap.cxx @@ -141,10 +141,10 @@ #define SvxCellVerJustifyEnumItem SfxVoidItem #define SvxCellOrientationEnumItem SfxVoidItem #include -#include -#include +#include +#include #include -#include +#include #define SFX_TYPEMAP #include "smslots.hxx" diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index ed6e5b6bd23f..6a4a65b7e228 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 5492553e46fe..70a11d12bac6 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -51,15 +51,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include #include -- cgit From 1c93cfc40edd2997b8478d05c2250343930bd125 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 2 Nov 2009 20:49:14 +0100 Subject: #i106421#: create new cui resource file --- starmath/source/view.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'starmath') diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 70a11d12bac6..855831fc9e9f 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1653,7 +1653,7 @@ void SmViewShell::Execute(SfxRequest& rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aSet, RID_SVXDLG_ZOOM); + pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aSet); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 } pDlg->SetLimits( MINZOOM, MAXZOOM ); -- cgit From 0a21703aa86d73cbd064c89c6aba053979472fb7 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Tue, 3 Nov 2009 18:12:19 +0100 Subject: #i104678# use high contrast mode setting instead of IsDark (paradigm shift begun with issue i35482) --- starmath/source/dialog.cxx | 12 ++++++------ starmath/source/document.cxx | 2 +- starmath/source/toolbox.cxx | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'starmath') diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 20af2f38b3ee..0f7e233cde87 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -396,9 +396,9 @@ void SmFontDialog::InitColor_Impl() #endif ColorData nBgCol = COL_WHITE, nTxtCol = COL_BLACK; - if (GetDisplayBackground().GetColor().IsDark()) + const StyleSettings &rS = GetSettings().GetStyleSettings(); + if (rS.GetHighContrastMode()) { - const StyleSettings &rS = GetSettings().GetStyleSettings(); nBgCol = rS.GetFieldColor().GetColor(); nTxtCol = rS.GetFieldTextColor().GetColor(); } @@ -967,7 +967,7 @@ SmDistanceDialog::~SmDistanceDialog() void SmDistanceDialog::ApplyImages() { - BOOL bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0; + BOOL bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); for (int i = 0; i < NOCATEGORIES; ++i) { SmCategoryDesc *pCat = Categories[i]; @@ -1551,9 +1551,9 @@ void SmSymbolDialog::InitColor_Impl() #endif ColorData nBgCol = COL_WHITE, nTxtCol = COL_BLACK; - if (GetDisplayBackground().GetColor().IsDark()) + const StyleSettings &rS = GetSettings().GetStyleSettings(); + if (rS.GetHighContrastMode()) { - const StyleSettings &rS = GetSettings().GetStyleSettings(); nBgCol = rS.GetFieldColor().GetColor(); nTxtCol = rS.GetFieldTextColor().GetColor(); } @@ -2180,7 +2180,7 @@ void SmSymDefineDialog::InitColor_Impl() #endif ColorData nBgCol = COL_WHITE, nTxtCol = COL_BLACK; - BOOL bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0; + BOOL bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); if (bHighContrast) { const StyleSettings &rS = GetSettings().GetStyleSettings(); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index ab467fc034e3..03beb26f7bb2 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -467,7 +467,7 @@ void SmDocShell::Draw(OutputDevice &rDev, Point &rPosition) ULONG nOldDrawMode = DRAWMODE_DEFAULT; BOOL bRestoreDrawMode = FALSE; if (OUTDEV_WINDOW == rDev.GetOutDevType() && - ((Window &) rDev).GetDisplayBackground().GetColor().IsDark()) + ((Window &) rDev).GetSettings().GetStyleSettings().GetHighContrastMode()) { nOldDrawMode = rDev.GetDrawMode(); rDev.SetDrawMode( DRAWMODE_DEFAULT ); diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index 487bd6155fc9..0c108967e0c1 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -222,7 +222,7 @@ const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, BOOL bHighContra void SmToolBoxWindow::ApplyImageLists( USHORT nCategoryRID ) { - BOOL bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0; + BOOL bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); // set image list for toolbox 'catalog' const ImageList *pImageList = GetImageList( bHighContrast ? RID_ILH_CATALOG : RID_IL_CATALOG, bHighContrast ); -- cgit