diff options
Diffstat (limited to 'starmath')
68 files changed, 3151 insertions, 3151 deletions
diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx index 2463edc983f0..5583cf93602a 100644 --- a/starmath/inc/action.hxx +++ b/starmath/inc/action.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ class SmDocShell; class SmFormatAction: public SfxUndoAction { - SmDocShell *pDoc; + SmDocShell *pDoc; SmFormat aOldFormat; SmFormat aNewFormat; diff --git a/starmath/inc/applicat.hxx b/starmath/inc/applicat.hxx index 1b896164099f..e23290682c6c 100644 --- a/starmath/inc/applicat.hxx +++ b/starmath/inc/applicat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,8 +34,8 @@ class SvxErrorHandler; #include <sfx2/app.hxx> -#define SMDLL 1 -#define APPLICATIONNAME "smath3" +#define SMDLL 1 +#define APPLICATIONNAME "smath3" #ifdef WIN @@ -75,10 +75,10 @@ class SmApplicat: public SfxApplication protected: SvxErrorHandler *pSvxErrorHandler; - virtual void OpenClients(); + virtual void OpenClients(); // initialization / deinitialization - virtual void Init(); + virtual void Init(); virtual void Exit(); public: diff --git a/starmath/inc/config.hxx b/starmath/inc/config.hxx index 9d87ba0abd2b..2c225ea818bb 100644 --- a/starmath/inc/config.hxx +++ b/starmath/inc/config.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,14 +42,14 @@ class SfxItemSet; class SmConfig : public SmMathConfig, public SfxBroadcaster { - SmFontPickList vFontPickList[7]; + SmFontPickList vFontPickList[7]; public: SmConfig(); virtual ~SmConfig(); SmFontPickList & GetFontPickList(USHORT nIdent) { return vFontPickList[nIdent]; } - + void ItemSetToConfig(const SfxItemSet &rSet); void ConfigToItemSet(SfxItemSet &rSet) const; }; diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index fcad9688f940..b758df5e2adf 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,32 +50,32 @@ #include "symbol.hxx" class SubsetMap; -#define CATEGORY_NONE 0xFFFF +#define CATEGORY_NONE 0xFFFF /**************************************************************************/ -void SetFontStyle(const XubString &rStyleName, Font &rFont); +void SetFontStyle(const XubString &rStyleName, Font &rFont); /**************************************************************************/ class SmPrintOptionsTabPage : public SfxTabPage { FixedLine aFixedLine1; - CheckBox aTitle; - CheckBox aText; - CheckBox aFrame; + CheckBox aTitle; + CheckBox aText; + CheckBox aFrame; FixedLine aFixedLine2; - RadioButton aSizeNormal; - RadioButton aSizeScaled; - RadioButton aSizeZoomed; - MetricField aZoom; + RadioButton aSizeNormal; + RadioButton aSizeScaled; + RadioButton aSizeZoomed; + MetricField aZoom; FixedLine aFixedLine3; - CheckBox aNoRightSpaces; + CheckBox aNoRightSpaces; DECL_LINK(SizeButtonClickHdl, Button *); - virtual BOOL FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual BOOL FillItemSet(SfxItemSet& rSet); + virtual void Reset(const SfxItemSet& rSet); public: static SfxTabPage* Create(Window *pWindow, const SfxItemSet &rSet); @@ -87,7 +87,7 @@ public: class SmShowFont : public Control { - virtual void Paint(const Rectangle&); + virtual void Paint(const Rectangle&); public: SmShowFont(Window *pParent, const ResId& rResId) : @@ -100,16 +100,16 @@ public: class SmFontDialog : public ModalDialog { - FixedText aFixedText1; - ComboBox aFontBox; - CheckBox aBoldCheckBox; - CheckBox aItalicCheckBox; - OKButton aOKButton1; - CancelButton aCancelButton1; - SmShowFont aShowFont; + FixedText aFixedText1; + ComboBox aFontBox; + CheckBox aBoldCheckBox; + CheckBox aItalicCheckBox; + OKButton aOKButton1; + CancelButton aCancelButton1; + SmShowFont aShowFont; FixedText aFixedText2; - Font Face; + Font Face; DECL_LINK(FontSelectHdl, ComboBox *); DECL_LINK(FontModifyHdl, ComboBox *); @@ -122,30 +122,30 @@ class SmFontDialog : public ModalDialog public: SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, BOOL bHideCheckboxes, BOOL bFreeRes = TRUE); - const Font& GetFont() const { return Face; } - void SetFont(const Font &rFont); + const Font& GetFont() const { return Face; } + void SetFont(const Font &rFont); }; /**************************************************************************/ class SmFontSizeDialog : public ModalDialog { - FixedText aFixedText1; - MetricField aBaseSize; - FixedText aFixedText4; - MetricField aTextSize; - FixedText aFixedText5; - MetricField aIndexSize; - FixedText aFixedText6; - MetricField aFunctionSize; - FixedText aFixedText7; - MetricField aOperatorSize; - FixedText aFixedText8; - MetricField aBorderSize; + FixedText aFixedText1; + MetricField aBaseSize; + FixedText aFixedText4; + MetricField aTextSize; + FixedText aFixedText5; + MetricField aIndexSize; + FixedText aFixedText6; + MetricField aFunctionSize; + FixedText aFixedText7; + MetricField aOperatorSize; + FixedText aFixedText8; + MetricField aBorderSize; FixedLine aFixedLine1; - OKButton aOKButton1; - CancelButton aCancelButton1; - PushButton aDefaultButton; + OKButton aOKButton1; + CancelButton aCancelButton1; + PushButton aDefaultButton; DECL_LINK(DefaultButtonClickHdl, Button *); @@ -160,26 +160,26 @@ public: class SmFontTypeDialog : public ModalDialog { - FixedText aFixedText1; - SmFontPickListBox aVariableFont; - FixedText aFixedText2; - SmFontPickListBox aFunctionFont; - FixedText aFixedText3; - SmFontPickListBox aNumberFont; - FixedText aFixedText4; - SmFontPickListBox aTextFont; - FixedText aFixedText5; - SmFontPickListBox aSerifFont; - FixedText aFixedText6; - SmFontPickListBox aSansFont; - FixedText aFixedText7; - SmFontPickListBox aFixedFont; + FixedText aFixedText1; + SmFontPickListBox aVariableFont; + FixedText aFixedText2; + SmFontPickListBox aFunctionFont; + FixedText aFixedText3; + SmFontPickListBox aNumberFont; + FixedText aFixedText4; + SmFontPickListBox aTextFont; + FixedText aFixedText5; + SmFontPickListBox aSerifFont; + FixedText aFixedText6; + SmFontPickListBox aSansFont; + FixedText aFixedText7; + SmFontPickListBox aFixedFont; FixedLine aFixedLine1; FixedLine aFixedLine2; - OKButton aOKButton1; - CancelButton aCancelButton1; - MenuButton aMenuButton; - PushButton aDefaultButton; + OKButton aOKButton1; + CancelButton aCancelButton1; + MenuButton aMenuButton; + PushButton aDefaultButton; OutputDevice *pFontListDev; @@ -195,12 +195,12 @@ public: /**************************************************************************/ -#define NOCATEGORIES 10 +#define NOCATEGORIES 10 class SmCategoryDesc : public Resource { XubString Name; - XubString *Strings[4]; + XubString *Strings[4]; Bitmap *Graphics[4]; /* regular bitmaps */ Bitmap *GraphicsH[4]; /* high contrast bitmaps */ USHORT Minimum[4]; @@ -212,12 +212,12 @@ public: SmCategoryDesc(const ResId &rResId, USHORT nCategoryIdx); ~SmCategoryDesc(); - const XubString & GetName() const { return Name; } - const XubString * GetString(USHORT Index) const { return Strings[Index]; } - USHORT GetMinimum(USHORT Index) { return Minimum[Index]; } - USHORT GetMaximum(USHORT Index) { return Maximum[Index]; } - USHORT GetValue(USHORT Index) const { return Value[Index]; } - void SetValue(USHORT Index, USHORT nVal) { Value[Index] = nVal;} + const XubString & GetName() const { return Name; } + const XubString * GetString(USHORT Index) const { return Strings[Index]; } + USHORT GetMinimum(USHORT Index) { return Minimum[Index]; } + USHORT GetMaximum(USHORT Index) { return Maximum[Index]; } + USHORT GetValue(USHORT Index) const { return Value[Index]; } + void SetValue(USHORT Index, USHORT nVal) { Value[Index] = nVal;} void SetHighContrast( BOOL bVal ) { bIsHighContrast = bVal; } const Bitmap * GetGraphic(USHORT Index) const @@ -229,25 +229,25 @@ public: class SmDistanceDialog : public ModalDialog { - FixedText aFixedText1; - MetricField aMetricField1; - FixedText aFixedText2; - MetricField aMetricField2; - FixedText aFixedText3; - MetricField aMetricField3; - CheckBox aCheckBox1; - FixedText aFixedText4; - MetricField aMetricField4; - OKButton aOKButton1; - CancelButton aCancelButton1; - MenuButton aMenuButton; - PushButton aDefaultButton; - FixedBitmap aBitmap; + FixedText aFixedText1; + MetricField aMetricField1; + FixedText aFixedText2; + MetricField aMetricField2; + FixedText aFixedText3; + MetricField aMetricField3; + CheckBox aCheckBox1; + FixedText aFixedText4; + MetricField aMetricField4; + OKButton aOKButton1; + CancelButton aCancelButton1; + MenuButton aMenuButton; + PushButton aDefaultButton; + FixedBitmap aBitmap; FixedLine aFixedLine; SmCategoryDesc *Categories[NOCATEGORIES]; - USHORT nActiveCategory; - BOOL bScaleAllBrackets; + USHORT nActiveCategory; + BOOL bScaleAllBrackets; DECL_LINK(GetFocusHdl, Control *); DECL_LINK(MenuSelectHdl, Menu *); @@ -255,8 +255,8 @@ class SmDistanceDialog : public ModalDialog DECL_LINK(CheckBoxClickHdl, CheckBox *); using Window::SetHelpId; - void SetHelpId(MetricField &rField, ULONG nHelpId); - void SetCategory(USHORT Category); + void SetHelpId(MetricField &rField, ULONG nHelpId); + void SetCategory(USHORT Category); void ApplyImages(); @@ -281,9 +281,9 @@ class SmAlignDialog : public ModalDialog RadioButton aCenter; RadioButton aRight; FixedLine aFixedLine1; - OKButton aOKButton1; + OKButton aOKButton1; CancelButton aCancelButton1; - PushButton aDefaultButton; + PushButton aDefaultButton; DECL_LINK(DefaultButtonClickHdl, Button *); @@ -299,17 +299,17 @@ public: class SmShowSymbolSet : public Control { SymbolPtrVec_t aSymbolSet; - ScrollBar aVScrollBar; - Size aOutputSize; - Link aSelectHdlLink; - Link aDblClickHdlLink; - USHORT nLen; - USHORT nRows, nColumns; - USHORT nSelectSymbol; - - virtual void Paint(const Rectangle&); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void KeyInput(const KeyEvent& rKEvt); + ScrollBar aVScrollBar; + Size aOutputSize; + Link aSelectHdlLink; + Link aDblClickHdlLink; + USHORT nLen; + USHORT nRows, nColumns; + USHORT nSelectSymbol; + + virtual void Paint(const Rectangle&); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + virtual void KeyInput(const KeyEvent& rKEvt); DECL_LINK( ScrollHdl, ScrollBar* ); @@ -318,8 +318,8 @@ public: void SetSymbolSet(const SymbolPtrVec_t& rSymbolSet); - void SelectSymbol(USHORT nSymbol); - USHORT GetSelectSymbol() const { return nSelectSymbol; } + void SelectSymbol(USHORT nSymbol); + USHORT GetSelectSymbol() const { return nSelectSymbol; } void SetSelectHdl(const Link& rLink) { aSelectHdlLink = rLink; } void SetDblClickHdl(const Link& rLink) { aDblClickHdlLink = rLink; } @@ -331,15 +331,15 @@ class SmShowSymbol : public Control { Link aDblClickHdlLink; - virtual void Paint(const Rectangle&); - virtual void MouseButtonDown(const MouseEvent& rMEvt); + virtual void Paint(const Rectangle&); + virtual void MouseButtonDown(const MouseEvent& rMEvt); public: SmShowSymbol(Window *pParent, const ResId& rResId) : Control(pParent, rResId) {} - void SetSymbol(const SmSym *pSymbol); - void SetDblClickHdl(const Link &rLink) { aDblClickHdlLink = rLink; } + void SetSymbol(const SmSym *pSymbol); + void SetDblClickHdl(const Link &rLink) { aDblClickHdlLink = rLink; } }; //////////////////////////////////////////////////////////////////////////////// @@ -348,18 +348,18 @@ class SmSymDefineDialog; class SmSymbolDialog : public ModalDialog { - FixedText aSymbolSetText; - ListBox aSymbolSets; + FixedText aSymbolSetText; + ListBox aSymbolSets; SmShowSymbolSet aSymbolSetDisplay; - FixedText aSymbolName; - SmShowSymbol aSymbolDisplay; - PushButton aGetBtn; - PushButton aCloseBtn; - PushButton aEditBtn; + FixedText aSymbolName; + SmShowSymbol aSymbolDisplay; + PushButton aGetBtn; + PushButton aCloseBtn; + PushButton aEditBtn; SmViewShell &rViewSh; SmSymbolManager &rSymbolMgr; - + String aSymbolSetName; SymbolPtrVec_t aSymbolSet; @@ -372,7 +372,7 @@ class SmSymbolDialog : public ModalDialog DECL_LINK(EditClickHdl, Button *); DECL_LINK(GetClickHdl, Button *); - void FillSymbolSets(BOOL bDeleteText = TRUE); + void FillSymbolSets(BOOL bDeleteText = TRUE); void SetSymbolSetManager(SmSymbolManager &rMgr); const SmSym *GetSymbol() const; void InitColor_Impl(); @@ -384,7 +384,7 @@ public: SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell, BOOL bFreeRes = TRUE); virtual ~SmSymbolDialog(); - BOOL SelectSymbolSet(const XubString &rSymbolSetName); + BOOL SelectSymbolSet(const XubString &rSymbolSetName); void SelectSymbol(USHORT nSymbolPos); USHORT GetSelectedSymbol() const { return aSymbolSetDisplay.GetSelectSymbol(); } }; @@ -393,7 +393,7 @@ public: class SmShowChar : public Control { - virtual void Paint(const Rectangle&); + virtual void Paint(const Rectangle&); public: SmShowChar(Window *pParent, const ResId& rResId) @@ -401,8 +401,8 @@ public: { } - void SetChar(xub_Unicode aChar); - void SetFont(const Font &rFont); + void SetChar(xub_Unicode aChar); + void SetFont(const Font &rFont); }; //////////////////////////////////////////////////////////////////////////////// @@ -441,7 +441,7 @@ class SmSymDefineDialog : public ModalDialog SmSymbolManager aSymbolMgrCopy, &rSymbolMgr; - const SmSym *pOrigSymbol; + const SmSym *pOrigSymbol; const SubsetMap *pSubsetMap; FontList *pFontList; @@ -457,22 +457,22 @@ class SmSymDefineDialog : public ModalDialog DECL_LINK(ChangeClickHdl, Button *); DECL_LINK(DeleteClickHdl, Button *); - void FillSymbols(ComboBox &rComboBox, BOOL bDeleteText = TRUE); - void FillSymbolSets(ComboBox &rComboBox, BOOL bDeleteText = TRUE); - void FillFonts(BOOL bDeleteText = TRUE); - void FillStyles(BOOL bDeleteText = TRUE); + void FillSymbols(ComboBox &rComboBox, BOOL bDeleteText = TRUE); + void FillSymbolSets(ComboBox &rComboBox, BOOL bDeleteText = TRUE); + void FillFonts(BOOL bDeleteText = TRUE); + void FillStyles(BOOL bDeleteText = TRUE); void SetSymbolSetManager(const SmSymbolManager &rMgr); - void SetFont(const XubString &rFontName, const XubString &rStyleName); - void SetOrigSymbol(const SmSym *pSymbol, const XubString &rSymbolSetName); - void UpdateButtons(); + void SetFont(const XubString &rFontName, const XubString &rStyleName); + void SetOrigSymbol(const SmSym *pSymbol, const XubString &rSymbolSetName); + void UpdateButtons(); - BOOL SelectSymbolSet(ComboBox &rComboBox, const XubString &rSymbolSetName, + BOOL SelectSymbolSet(ComboBox &rComboBox, const XubString &rSymbolSetName, BOOL bDeleteText); - BOOL SelectSymbol(ComboBox &rComboBox, const XubString &rSymbolName, + BOOL SelectSymbol(ComboBox &rComboBox, const XubString &rSymbolName, BOOL bDeleteText); - BOOL SelectFont(const XubString &rFontName, BOOL bApplyFont); - BOOL SelectStyle(const XubString &rStyleName, BOOL bApplyFont); + BOOL SelectFont(const XubString &rFontName, BOOL bApplyFont); + BOOL SelectStyle(const XubString &rStyleName, BOOL bApplyFont); SmSym * GetSymbol(const ComboBox &rComboBox); const SmSym * GetSymbol(const ComboBox &rComboBox) const @@ -491,31 +491,31 @@ public: using OutputDevice::SetFont; // Dialog - virtual short Execute(); + virtual short Execute(); BOOL SelectOldSymbolSet(const XubString &rSymbolSetName) { return SelectSymbolSet(aOldSymbolSets, rSymbolSetName, FALSE); } - + BOOL SelectOldSymbol(const XubString &rSymbolName) { return SelectSymbol(aOldSymbols, rSymbolName, FALSE); } - + BOOL SelectSymbolSet(const XubString &rSymbolSetName) { return SelectSymbolSet(aSymbolSets, rSymbolSetName, FALSE); } - + BOOL SelectSymbol(const XubString &rSymbolName) { return SelectSymbol(aSymbols, rSymbolName, FALSE); } - + BOOL SelectFont(const XubString &rFontName) { return SelectFont(rFontName, TRUE); } - BOOL SelectStyle(const XubString &rStyleName) { return SelectStyle(rStyleName, TRUE); }; - void SelectChar(xub_Unicode cChar); + BOOL SelectStyle(const XubString &rStyleName) { return SelectStyle(rStyleName, TRUE); }; + void SelectChar(xub_Unicode cChar); }; diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 6f73e2244009..6cf38965deba 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #ifndef DOCUMENT_HXX #define DOCUMENT_HXX -#define SMDLL 1 +#define SMDLL 1 #include <sot/storage.hxx> #include <sot/sotref.hxx> @@ -50,20 +50,20 @@ class SfxPrinter; class Printer; class SmCursor; -#define HINT_DATACHANGED 1004 +#define HINT_DATACHANGED 1004 -#define SM30BIDENT ((ULONG)0x534D3033L) -#define SM30IDENT ((ULONG)0x30334d53L) +#define SM30BIDENT ((ULONG)0x534D3033L) +#define SM30IDENT ((ULONG)0x30334d53L) #define SM304AIDENT ((ULONG)0x34303330L) #define SM30VERSION ((ULONG)0x00010000L) -#define SM50VERSION ((ULONG)0x00010001L) //Unterschied zur SM30VERSION ist +#define SM50VERSION ((ULONG)0x00010001L) //Unterschied zur SM30VERSION ist //der neue Border im Format. -#define FRMIDENT ((ULONG)0x03031963L) -#define FRMVERSION ((ULONG)0x00010001L) +#define FRMIDENT ((ULONG)0x03031963L) +#define FRMVERSION ((ULONG)0x00010001L) -#define STAROFFICE_XML "StarOffice XML (Math)" -#define MATHML_XML "MathML XML (Math)" +#define STAROFFICE_XML "StarOffice XML (Math)" +#define MATHML_XML "MathML XML (Math)" /* Zugriff auf den Drucker sollte ausschliesslich ueber diese Klasse erfolgen * ========================================================================== @@ -111,22 +111,22 @@ class SmDocShell : public SfxObjectShell, public SfxListener friend class SmModel; friend class SmCursor; - String aText; - SmFormat aFormat; - SmParser aInterpreter; + String aText; + SmFormat aFormat; + SmParser aInterpreter; String aAccText; - SmNode *pTree; + SmNode *pTree; SfxMenuBarManager *pMenuMgr; - SfxItemPool *pEditEngineItemPool; - EditEngine *pEditEngine; - SfxPrinter *pPrinter; //Siehe Kommentar zum SmPrinter Access! - Printer *pTmpPrinter; //ebenfalls - long nLeftBorder, + SfxItemPool *pEditEngineItemPool; + EditEngine *pEditEngine; + SfxPrinter *pPrinter; //Siehe Kommentar zum SmPrinter Access! + Printer *pTmpPrinter; //ebenfalls + long nLeftBorder, nRightBorder, nTopBorder, nBottomBorder; - USHORT nModifyCount; - BOOL bIsFormulaArranged; + USHORT nModifyCount; + BOOL bIsFormulaArranged; SmCursor *pCursor; @@ -136,11 +136,11 @@ class SmDocShell : public SfxObjectShell, public SfxListener BOOL WriteAsMathType3( SfxMedium& ); - virtual void Draw(OutputDevice *pDevice, + virtual void Draw(OutputDevice *pDevice, const JobSetup & rSetup, USHORT nAspect = ASPECT_CONTENT); - virtual void FillClass(SvGlobalName* pClassName, + virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, String* pAppName, String* pFullTypeName, @@ -148,13 +148,13 @@ class SmDocShell : public SfxObjectShell, public SfxListener sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; - virtual BOOL SetData( const String& rData ); - virtual ULONG GetMiscStatus() const; - virtual void OnDocumentPrinterChanged( Printer * ); + virtual BOOL SetData( const String& rData ); + virtual ULONG GetMiscStatus() const; + virtual void OnDocumentPrinterChanged( Printer * ); virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); virtual BOOL Load( SfxMedium& rMedium ); - void ImplSave( SvStorageStreamRef xStrm ); - virtual BOOL Save(); + void ImplSave( SvStorageStreamRef xStrm ); + virtual BOOL Save(); virtual BOOL SaveAs( SfxMedium& rMedium ); virtual BOOL ConvertTo( SfxMedium &rMedium ); virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); @@ -162,10 +162,10 @@ class SmDocShell : public SfxObjectShell, public SfxListener Printer *GetPrt(); OutputDevice* GetRefDev(); - BOOL IsFormulaArranged() const { return bIsFormulaArranged; } - void SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; } + BOOL IsFormulaArranged() const { return bIsFormulaArranged; } + void SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; } - virtual BOOL ConvertFrom(SfxMedium &rMedium); + virtual BOOL ConvertFrom(SfxMedium &rMedium); /** Called whenever the formula is changed * Deletes the current cursor @@ -179,10 +179,10 @@ public: SFX_DECL_OBJECTFACTORY(); SmDocShell( const sal_uInt64 i_nSfxCreationFlags ); - virtual ~SmDocShell(); + virtual ~SmDocShell(); - void LoadSymbols(); - void SaveSymbols(); + void LoadSymbols(); + void SaveSymbols(); void ArrangeFormula(); @@ -190,9 +190,9 @@ public: //und fuer die Kommunikation mit dem SFX! //Alle internen Verwendungen des Printers sollten ausschlieslich uber //den SmPrinterAccess funktionieren. - BOOL HasPrinter() { return 0 != pPrinter; } - SfxPrinter *GetPrinter() { GetPrt(); return pPrinter; } - void SetPrinter( SfxPrinter * ); + BOOL HasPrinter() { return 0 != pPrinter; } + SfxPrinter *GetPrinter() { GetPrt(); return pPrinter; } + void SetPrinter( SfxPrinter * ); const String GetComment() const; @@ -200,32 +200,32 @@ public: sal_Bool ReplaceBadChars(); void UpdateText(); - void SetText(const String& rBuffer); - String& GetText() { return (aText); } - void SetFormat(SmFormat& rFormat); + void SetText(const String& rBuffer); + String& GetText() { return (aText); } + void SetFormat(SmFormat& rFormat); const SmFormat& GetFormat() { return (aFormat); } - void Parse(); - SmParser & GetParser() { return aInterpreter; } - const SmNode * GetFormulaTree() const { return pTree; } - void SetFormulaTree(SmNode *&rTree) { pTree = rTree; } + void Parse(); + SmParser & GetParser() { return aInterpreter; } + const SmNode * GetFormulaTree() const { return pTree; } + void SetFormulaTree(SmNode *&rTree) { pTree = rTree; } String GetAccessibleText(); - EditEngine & GetEditEngine(); - SfxItemPool & GetEditEngineItemPool(); + EditEngine & GetEditEngine(); + SfxItemPool & GetEditEngineItemPool(); - void DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSelection = FALSE); - Size GetSize(); + void DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSelection = FALSE); + Size GetSize(); void Repaint(); - virtual SfxUndoManager *GetUndoManager (); + virtual SfxUndoManager *GetUndoManager (); virtual SfxItemPool& GetPool() const; - void Execute( SfxRequest& rReq ); - void GetState(SfxItemSet &); + void Execute( SfxRequest& rReq ); + void GetState(SfxItemSet &); virtual void SetVisArea (const Rectangle & rVisArea); virtual void SetModified(BOOL bModified); diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index cfb5ddffda8b..7249cc3a44e9 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,13 +61,13 @@ class SmEditWindow : public Window, public DropTargetHelper SmEditAccessible * pAccessible; SmCmdBoxWindow &rCmdBox; - EditView *pEditView; - ScrollBar *pHScrollBar, + EditView *pEditView; + ScrollBar *pHScrollBar, *pVScrollBar; ScrollBarBox *pScrollBox; - Timer aModifyTimer, + Timer aModifyTimer, aCursorMoveTimer; - ESelection aOldSelection; + ESelection aOldSelection; virtual void KeyInput(const KeyEvent& rKEvt); virtual void Command(const CommandEvent& rCEvt); @@ -88,12 +88,12 @@ class SmEditWindow : public Window, public DropTargetHelper DECL_LINK(EditStatusHdl ,EditStatus *); DECL_LINK(ScrollHdl, ScrollBar *); - void CreateEditView(); + void CreateEditView(); - Rectangle AdjustScrollBars(); - void SetScrollBarRanges(); - void InitScrollBars(); - void InvalidateSlots(); + Rectangle AdjustScrollBars(); + void SetScrollBarRanges(); + void InitScrollBars(); + void InvalidateSlots(); public: SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ); @@ -106,30 +106,30 @@ public: SfxItemPool * GetEditEngineItemPool(); // Window - virtual void SetText(const XubString &rText); + virtual void SetText(const XubString &rText); virtual String GetText() const; - virtual void GetFocus(); - virtual void LoseFocus(); - - ESelection GetSelection() const; - void SetSelection(const ESelection &rSel); - - BOOL IsEmpty() const; - BOOL IsSelected() const; - BOOL IsAllSelected() const; - void Cut(); - void Copy(); - void Paste(); - void Delete(); - void SelectAll(); - void InsertText(const String &rText); - void InsertCommand(USHORT nCommand); - void MarkError(const Point &rPos); - void SelNextMark(); - void SelPrevMark(); - BOOL HasMark(const String &rText) const; - - void Flush(); + virtual void GetFocus(); + virtual void LoseFocus(); + + ESelection GetSelection() const; + void SetSelection(const ESelection &rSel); + + BOOL IsEmpty() const; + BOOL IsSelected() const; + BOOL IsAllSelected() const; + void Cut(); + void Copy(); + void Paste(); + void Delete(); + void SelectAll(); + void InsertText(const String &rText); + void InsertCommand(USHORT nCommand); + void MarkError(const Point &rPos); + void SelNextMark(); + void SelPrevMark(); + BOOL HasMark(const String &rText) const; + + void Flush(); void DeleteEditView( SmViewShell &rView ); void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg ); diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx index f4cddc3bbdc9..6823ba82dc87 100644 --- a/starmath/inc/format.hxx +++ b/starmath/inc/format.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,91 +35,91 @@ #include <types.hxx> -#define SM_FMT_VERSION_51 ((BYTE) 0x01) -#define SM_FMT_VERSION_NOW SM_FMT_VERSION_51 +#define SM_FMT_VERSION_51 ((BYTE) 0x01) +#define SM_FMT_VERSION_NOW SM_FMT_VERSION_51 -#define FNTNAME_TIMES "Times New Roman" -#define FNTNAME_HELV "Helvetica" -#define FNTNAME_COUR "Courier" +#define FNTNAME_TIMES "Times New Roman" +#define FNTNAME_HELV "Helvetica" +#define FNTNAME_COUR "Courier" #define FNTNAME_MATH FONTNAME_MATH // symbolic names used as array indices -#define SIZ_BEGIN 0 -#define SIZ_TEXT 0 -#define SIZ_INDEX 1 -#define SIZ_FUNCTION 2 -#define SIZ_OPERATOR 3 -#define SIZ_LIMITS 4 -#define SIZ_END 4 +#define SIZ_BEGIN 0 +#define SIZ_TEXT 0 +#define SIZ_INDEX 1 +#define SIZ_FUNCTION 2 +#define SIZ_OPERATOR 3 +#define SIZ_LIMITS 4 +#define SIZ_END 4 // symbolic names used as array indices -#define FNT_BEGIN 0 -#define FNT_VARIABLE 0 -#define FNT_FUNCTION 1 -#define FNT_NUMBER 2 -#define FNT_TEXT 3 -#define FNT_SERIF 4 -#define FNT_SANS 5 -#define FNT_FIXED 6 -#define FNT_MATH 7 -#define FNT_END 7 +#define FNT_BEGIN 0 +#define FNT_VARIABLE 0 +#define FNT_FUNCTION 1 +#define FNT_NUMBER 2 +#define FNT_TEXT 3 +#define FNT_SERIF 4 +#define FNT_SANS 5 +#define FNT_FIXED 6 +#define FNT_MATH 7 +#define FNT_END 7 // symbolic names used as array indices -#define DIS_BEGIN 0 -#define DIS_HORIZONTAL 0 -#define DIS_VERTICAL 1 -#define DIS_ROOT 2 -#define DIS_SUPERSCRIPT 3 -#define DIS_SUBSCRIPT 4 -#define DIS_NUMERATOR 5 -#define DIS_DENOMINATOR 6 -#define DIS_FRACTION 7 -#define DIS_STROKEWIDTH 8 -#define DIS_UPPERLIMIT 9 -#define DIS_LOWERLIMIT 10 -#define DIS_BRACKETSIZE 11 -#define DIS_BRACKETSPACE 12 -#define DIS_MATRIXROW 13 -#define DIS_MATRIXCOL 14 -#define DIS_ORNAMENTSIZE 15 -#define DIS_ORNAMENTSPACE 16 -#define DIS_OPERATORSIZE 17 -#define DIS_OPERATORSPACE 18 -#define DIS_LEFTSPACE 19 -#define DIS_RIGHTSPACE 20 -#define DIS_TOPSPACE 21 -#define DIS_BOTTOMSPACE 22 -#define DIS_NORMALBRACKETSIZE 23 -#define DIS_END 23 +#define DIS_BEGIN 0 +#define DIS_HORIZONTAL 0 +#define DIS_VERTICAL 1 +#define DIS_ROOT 2 +#define DIS_SUPERSCRIPT 3 +#define DIS_SUBSCRIPT 4 +#define DIS_NUMERATOR 5 +#define DIS_DENOMINATOR 6 +#define DIS_FRACTION 7 +#define DIS_STROKEWIDTH 8 +#define DIS_UPPERLIMIT 9 +#define DIS_LOWERLIMIT 10 +#define DIS_BRACKETSIZE 11 +#define DIS_BRACKETSPACE 12 +#define DIS_MATRIXROW 13 +#define DIS_MATRIXCOL 14 +#define DIS_ORNAMENTSIZE 15 +#define DIS_ORNAMENTSPACE 16 +#define DIS_OPERATORSIZE 17 +#define DIS_OPERATORSPACE 18 +#define DIS_LEFTSPACE 19 +#define DIS_RIGHTSPACE 20 +#define DIS_TOPSPACE 21 +#define DIS_BOTTOMSPACE 22 +#define DIS_NORMALBRACKETSIZE 23 +#define DIS_END 23 // to be broadcastet on format changes: -#define HINT_FORMATCHANGED 10003 +#define HINT_FORMATCHANGED 10003 -enum SmHorAlign { AlignLeft, AlignCenter, AlignRight }; +enum SmHorAlign { AlignLeft, AlignCenter, AlignRight }; String GetDefaultFontName( LanguageType nLang, USHORT nIdent ); class SmFormat : public SfxBroadcaster { - SmFace vFont[FNT_END + 1]; + SmFace vFont[FNT_END + 1]; BOOL bDefaultFont[FNT_END + 1]; - Size aBaseSize; - long nVersion; - USHORT vSize[SIZ_END + 1]; - USHORT vDist[DIS_END + 1]; - SmHorAlign eHorAlign; + Size aBaseSize; + long nVersion; + USHORT vSize[SIZ_END + 1]; + USHORT vDist[DIS_END + 1]; + SmHorAlign eHorAlign; INT16 nGreekCharStyle; - BOOL bIsTextmode, + BOOL bIsTextmode, bScaleNormalBrackets; public: SmFormat(); SmFormat(const SmFormat &rFormat) : SfxBroadcaster() { *this = rFormat; } - const Size & GetBaseSize() const { return aBaseSize; } - void SetBaseSize(const Size &rSize) { aBaseSize = rSize; } + const Size & GetBaseSize() const { return aBaseSize; } + void SetBaseSize(const Size &rSize) { aBaseSize = rSize; } const SmFace & GetFont(USHORT nIdent) const { return vFont[nIdent]; } void SetFont(USHORT nIdent, const SmFace &rFont, BOOL bDefault = FALSE); @@ -128,30 +128,30 @@ public: void SetDefaultFont(USHORT nIdent, BOOL bVal) { bDefaultFont[nIdent] = bVal; } BOOL IsDefaultFont(USHORT nIdent) const { return bDefaultFont[nIdent]; } - USHORT GetRelSize(USHORT nIdent) const { return vSize[nIdent]; } - void SetRelSize(USHORT nIdent, USHORT nVal) { vSize[nIdent] = nVal;} - - USHORT GetDistance(USHORT nIdent) const { return vDist[nIdent]; } - void SetDistance(USHORT nIdent, USHORT nVal) { vDist[nIdent] = nVal; } + USHORT GetRelSize(USHORT nIdent) const { return vSize[nIdent]; } + void SetRelSize(USHORT nIdent, USHORT nVal) { vSize[nIdent] = nVal;} - SmHorAlign GetHorAlign() const { return eHorAlign; } - void SetHorAlign(SmHorAlign eAlign) { eHorAlign = eAlign; } + USHORT GetDistance(USHORT nIdent) const { return vDist[nIdent]; } + void SetDistance(USHORT nIdent, USHORT nVal) { vDist[nIdent] = nVal; } - BOOL IsTextmode() const { return bIsTextmode; } - void SetTextmode(BOOL bVal) { bIsTextmode = bVal; } + SmHorAlign GetHorAlign() const { return eHorAlign; } + void SetHorAlign(SmHorAlign eAlign) { eHorAlign = eAlign; } + BOOL IsTextmode() const { return bIsTextmode; } + void SetTextmode(BOOL bVal) { bIsTextmode = bVal; } + INT16 GetGreekCharStyle() const { return nGreekCharStyle; } void SetGreekCharStyle(INT16 nVal) { nGreekCharStyle = nVal; } - BOOL IsScaleNormalBrackets() const { return bScaleNormalBrackets; } - void SetScaleNormalBrackets(BOOL bVal) { bScaleNormalBrackets = bVal; } + BOOL IsScaleNormalBrackets() const { return bScaleNormalBrackets; } + void SetScaleNormalBrackets(BOOL bVal) { bScaleNormalBrackets = bVal; } - long GetVersion() const { return nVersion; } + long GetVersion() const { return nVersion; } //! at time (5.1) use only the lower byte!!! - void SetVersion(long nVer) { nVersion = nVer; } + void SetVersion(long nVer) { nVersion = nVer; } - SmFormat & operator = (const SmFormat &rFormat); + SmFormat & operator = (const SmFormat &rFormat); BOOL operator == (const SmFormat &rFormat) const; inline BOOL operator != (const SmFormat &rFormat) const; @@ -162,7 +162,7 @@ public: } }; - + inline BOOL SmFormat::operator != (const SmFormat &rFormat) const { return !(*this == rFormat); diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index a8589c682dd4..153db2d38c05 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -60,27 +60,27 @@ #include "format.hxx" -#define ATTR_BOLD 0x0001 -#define ATTR_ITALIC 0x0002 +#define ATTR_BOLD 0x0001 +#define ATTR_ITALIC 0x0002 -#define FNTSIZ_ABSOLUT 1 -#define FNTSIZ_PLUS 2 -#define FNTSIZ_MINUS 3 +#define FNTSIZ_ABSOLUT 1 +#define FNTSIZ_PLUS 2 +#define FNTSIZ_MINUS 3 #define FNTSIZ_MULTIPLY 4 -#define FNTSIZ_DIVIDE 5 +#define FNTSIZ_DIVIDE 5 // flags to interdict respective status changes -#define FLG_FONT 0x0001 -#define FLG_SIZE 0x0002 -#define FLG_BOLD 0x0004 -#define FLG_ITALIC 0x0008 -#define FLG_COLOR 0x0010 -#define FLG_VISIBLE 0x0020 -#define FLG_HORALIGN 0x0040 +#define FLG_FONT 0x0001 +#define FLG_SIZE 0x0002 +#define FLG_BOLD 0x0004 +#define FLG_ITALIC 0x0008 +#define FLG_COLOR 0x0010 +#define FLG_VISIBLE 0x0020 +#define FLG_HORALIGN 0x0040 -extern SmFormat *pActiveFormat; +extern SmFormat *pActiveFormat; class SmVisitor; class SmDocShell; @@ -93,14 +93,14 @@ typedef std::vector< SmStructureNode * > SmStructureNodeArray; //////////////////////////////////////////////////////////////////////////////// -enum SmScaleMode { SCALE_NONE, SCALE_WIDTH, SCALE_HEIGHT }; +enum SmScaleMode { SCALE_NONE, SCALE_WIDTH, SCALE_HEIGHT }; enum SmNodeType { - NTABLE, NBRACE, NBRACEBODY, NOPER, NALIGN, - NATTRIBUT, NFONT, NUNHOR, NBINHOR, NBINVER, - NBINDIAGONAL, NSUBSUP, NMATRIX, NPLACE, NTEXT, - NSPECIAL, NGLYPH_SPECIAL, NMATH, NBLANK, NERROR, + NTABLE, NBRACE, NBRACEBODY, NOPER, NALIGN, + NATTRIBUT, NFONT, NUNHOR, NBINHOR, NBINVER, + NBINDIAGONAL, NSUBSUP, NMATRIX, NPLACE, NTEXT, + NSPECIAL, NGLYPH_SPECIAL, NMATH, NBLANK, NERROR, NLINE, NEXPRESSION, NPOLYLINE, NROOT, NROOTSYMBOL, NRECTANGLE, NVERTICAL_BRACE }; @@ -111,15 +111,15 @@ enum SmNodeType class SmNode : public SmRect { - SmFace aFace; + SmFace aFace; - SmToken aNodeToken; - SmNodeType eType; - SmScaleMode eScaleMode; - RectHorAlign eRectHorAlign; - USHORT nFlags, + SmToken aNodeToken; + SmNodeType eType; + SmScaleMode eScaleMode; + RectHorAlign eRectHorAlign; + USHORT nFlags, nAttributes; - BOOL bIsPhantom, + BOOL bIsPhantom, bIsDebug; BOOL bIsSelected; @@ -131,7 +131,7 @@ protected: sal_Int32 nAccIndex; public: - virtual ~SmNode(); + virtual ~SmNode(); virtual BOOL IsVisible() const; @@ -142,14 +142,14 @@ public: return ((SmNode *) this)->GetSubNode(nIndex); } - virtual SmNode * GetLeftMost(); + virtual SmNode * GetLeftMost(); const SmNode * GetLeftMost() const { return ((SmNode *) this)->GetLeftMost(); } - USHORT & Flags() { return nFlags; } - USHORT & Attributes() { return nAttributes; } + USHORT & Flags() { return nFlags; } + USHORT & Attributes() { return nAttributes; } BOOL IsDebug() const { return bIsDebug; } BOOL IsPhantom() const { return bIsPhantom; } @@ -160,7 +160,7 @@ public: void ClearAttribut(USHORT nAttrib); const SmFace & GetFont() const { return aFace; }; - SmFace & GetFont() { return aFace; }; + SmFace & GetFont() { return aFace; }; void SetFont(const SmFace &rFace); void SetFontSize(const Fraction &rRelSize, USHORT nType); @@ -177,7 +177,7 @@ public: RectHorAlign GetRectHorAlign() const { return eRectHorAlign; } const SmRect & GetRect() const { return *this; } - SmRect & GetRect() { return *this; } + SmRect & GetRect() { return *this; } virtual void Move(const Point &rPosition); void MoveTo(const Point &rPosition) { Move(rPosition - GetTopLeft()); } @@ -192,20 +192,20 @@ public: sal_Int32 GetAccessibleIndex() const { return nAccIndex; } const SmNode * FindNodeWithAccessibleIndex(xub_StrLen nAccIndex) const; - USHORT GetRow() const { return (USHORT)aNodeToken.nRow; } - USHORT GetColumn() const { return (USHORT)aNodeToken.nCol; } + USHORT GetRow() const { return (USHORT)aNodeToken.nRow; } + USHORT GetColumn() const { return (USHORT)aNodeToken.nCol; } - SmScaleMode GetScaleMode() const { return eScaleMode; } - void SetScaleMode(SmScaleMode eMode) { eScaleMode = eMode; } + SmScaleMode GetScaleMode() const { return eScaleMode; } + void SetScaleMode(SmScaleMode eMode) { eScaleMode = eMode; } virtual void AdaptToX(const OutputDevice &rDev, ULONG nWidth); virtual void AdaptToY(const OutputDevice &rDev, ULONG nHeight); - SmNodeType GetType() const { return eType; } - const SmToken & GetToken() const { return aNodeToken; } + SmNodeType GetType() const { return eType; } + const SmToken & GetToken() const { return aNodeToken; } - const SmNode * FindTokenAt(USHORT nRow, USHORT nCol) const; - const SmNode * FindRectClosestTo(const Point &rPoint) const; + const SmNode * FindTokenAt(USHORT nRow, USHORT nCol) const; + const SmNode * FindRectClosestTo(const Point &rPoint) const; /** Accept a visitor * Calls the method for this class on the visitor @@ -252,8 +252,8 @@ protected: /** Sets parent on children of this node */ void ClaimPaternity(){ SmNode* pNode; - USHORT nSize = GetNumSubNodes(); - for (USHORT i = 0; i < nSize; i++) + USHORT nSize = GetNumSubNodes(); + for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->SetParent((SmStructureNode*)this); //Cast is valid if we have children } @@ -334,20 +334,20 @@ class SmStructureNode : public SmNode protected: SmStructureNode(SmNodeType eNodeType, const SmToken &rNodeToken) - : SmNode(eNodeType, rNodeToken) + : SmNode(eNodeType, rNodeToken) {} public: SmStructureNode( const SmStructureNode &rNode ); virtual ~SmStructureNode(); - virtual BOOL IsVisible() const; + virtual BOOL IsVisible() const; - virtual USHORT GetNumSubNodes() const; + virtual USHORT GetNumSubNodes() const; void SetNumSubNodes(USHORT nSize) { aSubNodes.resize(nSize); } using SmNode::GetSubNode; - virtual SmNode * GetSubNode(USHORT nIndex); + virtual SmNode * GetSubNode(USHORT nIndex); void SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird = NULL); void SetSubNodes(const SmNodeArray &rNodeArray); @@ -381,15 +381,15 @@ class SmVisibleNode : public SmNode { protected: SmVisibleNode(SmNodeType eNodeType, const SmToken &rNodeToken) - : SmNode(eNodeType, rNodeToken) + : SmNode(eNodeType, rNodeToken) {} public: - virtual BOOL IsVisible() const; - virtual USHORT GetNumSubNodes() const; + virtual BOOL IsVisible() const; + virtual USHORT GetNumSubNodes() const; using SmNode::GetSubNode; - virtual SmNode * GetSubNode(USHORT nIndex); + virtual SmNode * GetSubNode(USHORT nIndex); }; @@ -400,7 +400,7 @@ class SmGraphicNode : public SmVisibleNode { protected: SmGraphicNode(SmNodeType eNodeType, const SmToken &rNodeToken) - : SmVisibleNode(eNodeType, rNodeToken) + : SmVisibleNode(eNodeType, rNodeToken) {} public: @@ -421,7 +421,7 @@ class SmRectangleNode : public SmGraphicNode public: SmRectangleNode(const SmToken &rNodeToken) - : SmGraphicNode(NRECTANGLE, rNodeToken) + : SmGraphicNode(NRECTANGLE, rNodeToken) {} virtual void AdaptToX(const OutputDevice &rDev, ULONG nWidth); @@ -446,14 +446,14 @@ public: */ class SmPolyLineNode : public SmGraphicNode { - Polygon aPoly; - Size aToSize; - long nWidth; + Polygon aPoly; + Size aToSize; + long nWidth; public: SmPolyLineNode(const SmToken &rNodeToken); - long GetWidth() const { return nWidth; } + long GetWidth() const { return nWidth; } Size GetToSize() const { return aToSize; } Polygon &GetPolygon() { return aPoly; } @@ -495,9 +495,9 @@ protected: public: SmTextNode(const SmToken &rNodeToken, USHORT nFontDescP ); - USHORT GetFontDesc() const { return nFontDesc; } - void SetText(const XubString &rText) { aText = rText; } - const XubString & GetText() const { return aText; } + USHORT GetFontDesc() const { return nFontDesc; } + void SetText(const XubString &rText) { aText = rText; } + const XubString & GetText() const { return aText; } /** Change the text of this node, including the underlying token */ void ChangeText(const XubString &rText) { aText = rText; @@ -580,7 +580,7 @@ class SmGlyphSpecialNode : public SmSpecialNode { public: SmGlyphSpecialNode(const SmToken &rNodeToken) - : SmSpecialNode(NGLYPH_SPECIAL, rNodeToken, FNT_MATH) + : SmSpecialNode(NGLYPH_SPECIAL, rNodeToken, FNT_MATH) {} virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); @@ -598,7 +598,7 @@ class SmMathSymbolNode : public SmSpecialNode { protected: SmMathSymbolNode(SmNodeType eNodeType, const SmToken &rNodeToken) - : SmSpecialNode(eNodeType, rNodeToken, FNT_MATH) + : SmSpecialNode(eNodeType, rNodeToken, FNT_MATH) { xub_Unicode cChar = GetToken().cMathChar; if ((xub_Unicode) '\0' != cChar) @@ -659,7 +659,7 @@ class SmPlaceNode : public SmMathSymbolNode { public: SmPlaceNode(const SmToken &rNodeToken) - : SmMathSymbolNode(NPLACE, rNodeToken) + : SmMathSymbolNode(NPLACE, rNodeToken) { } SmPlaceNode() : SmMathSymbolNode(NPLACE, SmToken(TPLACE, MS_PLACE, "<?>")) {}; @@ -681,7 +681,7 @@ class SmErrorNode : public SmMathSymbolNode { public: SmErrorNode(SmParseError /*eError*/, const SmToken &rNodeToken) - : SmMathSymbolNode(NERROR, rNodeToken) + : SmMathSymbolNode(NERROR, rNodeToken) { SetText((xub_Unicode) MS_ERROR); } @@ -705,7 +705,7 @@ class SmTableNode : public SmStructureNode { public: SmTableNode(const SmToken &rNodeToken) - : SmStructureNode(NTABLE, rNodeToken) + : SmStructureNode(NTABLE, rNodeToken) {} using SmNode::GetLeftMost; @@ -729,14 +729,14 @@ class SmLineNode : public SmStructureNode protected: SmLineNode(SmNodeType eNodeType, const SmToken &rNodeToken) - : SmStructureNode(eNodeType, rNodeToken) + : SmStructureNode(eNodeType, rNodeToken) { bUseExtraSpaces = TRUE; } public: SmLineNode(const SmToken &rNodeToken) - : SmStructureNode(NLINE, rNodeToken) + : SmStructureNode(NLINE, rNodeToken) { bUseExtraSpaces = TRUE; } @@ -762,7 +762,7 @@ class SmExpressionNode : public SmLineNode { public: SmExpressionNode(const SmToken &rNodeToken) - : SmLineNode(NEXPRESSION, rNodeToken) + : SmLineNode(NEXPRESSION, rNodeToken) {} virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); @@ -781,7 +781,7 @@ class SmUnHorNode : public SmStructureNode { public: SmUnHorNode(const SmToken &rNodeToken) - : SmStructureNode(NUNHOR, rNodeToken) + : SmStructureNode(NUNHOR, rNodeToken) { SetNumSubNodes(2); } @@ -813,7 +813,7 @@ protected: public: SmRootNode(const SmToken &rNodeToken) - : SmStructureNode(NROOT, rNodeToken) + : SmStructureNode(NROOT, rNodeToken) { SetNumSubNodes(3); } @@ -841,7 +841,7 @@ class SmBinHorNode : public SmStructureNode { public: SmBinHorNode(const SmToken &rNodeToken) - : SmStructureNode(NBINHOR, rNodeToken) + : SmStructureNode(NBINHOR, rNodeToken) { SetNumSubNodes(3); } @@ -869,7 +869,7 @@ class SmBinVerNode : public SmStructureNode { public: SmBinVerNode(const SmToken &rNodeToken) - : SmStructureNode(NBINVER, rNodeToken) + : SmStructureNode(NBINVER, rNodeToken) { SetNumSubNodes(3); } @@ -897,16 +897,16 @@ public: */ class SmBinDiagonalNode : public SmStructureNode { - BOOL bAscending; + BOOL bAscending; - void GetOperPosSize(Point &rPos, Size &rSize, + void GetOperPosSize(Point &rPos, Size &rSize, const Point &rDiagPoint, double fAngleDeg) const; public: SmBinDiagonalNode(const SmToken &rNodeToken); - BOOL IsAscending() const { return bAscending; } - void SetAscending(BOOL bVal) { bAscending = bVal; } + BOOL IsAscending() const { return bAscending; } + void SetAscending(BOOL bVal) { bAscending = bVal; } virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); void Accept(SmVisitor* pVisitor); @@ -922,19 +922,19 @@ public: * See graphic for positions at char: * * \code - * CSUP + * CSUP * * LSUP H H RSUP - * H H - * HHHH - * H H + * H H + * HHHH + * H H * LSUB H H RSUB * - * CSUB + * CSUB * \endcode */ enum SmSubSup -{ CSUB, CSUP, RSUB, RSUP, LSUB, LSUP +{ CSUB, CSUP, RSUB, RSUP, LSUB, LSUP }; /** numbers of entries in the above enum (that is: the number of possible @@ -962,14 +962,14 @@ class SmSubSupNode : public SmStructureNode public: SmSubSupNode(const SmToken &rNodeToken) - : SmStructureNode(NSUBSUP, rNodeToken) + : SmStructureNode(NSUBSUP, rNodeToken) { SetNumSubNodes(1 + SUBSUP_NUM_ENTRIES); bUseLimits = FALSE; } /** Get body (Not NULL) */ - SmNode * GetBody() { return GetSubNode(0); } + SmNode * GetBody() { return GetSubNode(0); } /** Get body (Not NULL) */ const SmNode * GetBody() const { @@ -1016,7 +1016,7 @@ class SmBraceNode : public SmStructureNode { public: SmBraceNode(const SmToken &rNodeToken) - : SmStructureNode(NBRACE, rNodeToken) + : SmStructureNode(NBRACE, rNodeToken) { SetNumSubNodes(3); } @@ -1045,8 +1045,8 @@ class SmBracebodyNode : public SmStructureNode public: inline SmBracebodyNode(const SmToken &rNodeToken); - virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); - long GetBodyHeight() const { return nBodyHeight; } + virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); + long GetBodyHeight() const { return nBodyHeight; } void Accept(SmVisitor* pVisitor); }; @@ -1077,7 +1077,7 @@ class SmVerticalBraceNode : public SmStructureNode public: inline SmVerticalBraceNode(const SmToken &rNodeToken); - virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); + virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); void Accept(SmVisitor* pVisitor); }; @@ -1108,12 +1108,12 @@ class SmOperNode : public SmStructureNode { public: SmOperNode(const SmToken &rNodeToken) - : SmStructureNode(NOPER, rNodeToken) + : SmStructureNode(NOPER, rNodeToken) { SetNumSubNodes(2); } - SmNode * GetSymbol(); + SmNode * GetSymbol(); const SmNode * GetSymbol() const { return ((SmOperNode *) this)->GetSymbol(); @@ -1134,7 +1134,7 @@ class SmAlignNode : public SmStructureNode { public: SmAlignNode(const SmToken &rNodeToken) - : SmStructureNode(NALIGN, rNodeToken) + : SmStructureNode(NALIGN, rNodeToken) {} virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); @@ -1158,7 +1158,7 @@ class SmAttributNode : public SmStructureNode { public: SmAttributNode(const SmToken &rNodeToken) - : SmStructureNode(NATTRIBUT, rNodeToken) + : SmStructureNode(NATTRIBUT, rNodeToken) {} virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); @@ -1175,12 +1175,12 @@ public: */ class SmFontNode : public SmStructureNode { - USHORT nSizeType; - Fraction aFontSize; + USHORT nSizeType; + Fraction aFontSize; public: SmFontNode(const SmToken &rNodeToken) - : SmStructureNode(NFONT, rNodeToken) + : SmStructureNode(NFONT, rNodeToken) { nSizeType = FNTSIZ_MULTIPLY; aFontSize = Fraction(1L); @@ -1206,12 +1206,12 @@ public: */ class SmMatrixNode : public SmStructureNode { - USHORT nNumRows, + USHORT nNumRows, nNumCols; public: SmMatrixNode(const SmToken &rNodeToken) - : SmStructureNode(NMATRIX, rNodeToken) + : SmStructureNode(NMATRIX, rNodeToken) { nNumRows = nNumCols = 0; } @@ -1237,17 +1237,17 @@ public: */ class SmBlankNode : public SmGraphicNode { - USHORT nNum; + USHORT nNum; public: SmBlankNode(const SmToken &rNodeToken) - : SmGraphicNode(NBLANK, rNodeToken) + : SmGraphicNode(NBLANK, rNodeToken) { nNum = 0; } void IncreaseBy(const SmToken &rToken); - void Clear() { nNum = 0; } + void Clear() { nNum = 0; } USHORT GetBlankNum() const { return nNum; } void SetBlankNum(USHORT nNumber) { nNum = nNumber; } diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index 5018340b5a01..f549abf4c285 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -41,87 +41,87 @@ class SmDocShell; // TokenGroups -#define TGOPER 0x00000001 -#define TGRELATION 0x00000002 -#define TGSUM 0x00000004 -#define TGPRODUCT 0x00000008 -#define TGUNOPER 0x00000010 -#define TGPOWER 0x00000020 -#define TGATTRIBUT 0x00000040 -#define TGALIGN 0x00000080 -#define TGFUNCTION 0x00000100 -#define TGBLANK 0x00000200 -#define TGLBRACES 0x00000400 -#define TGRBRACES 0x00000800 -#define TGCOLOR 0x00001000 -#define TGFONT 0x00002000 -#define TGSTANDALONE 0x00004000 -#define TGDISCARDED 0x00008000 -#define TGLIMIT 0x00010000 -#define TGFONTATTR 0x00020000 +#define TGOPER 0x00000001 +#define TGRELATION 0x00000002 +#define TGSUM 0x00000004 +#define TGPRODUCT 0x00000008 +#define TGUNOPER 0x00000010 +#define TGPOWER 0x00000020 +#define TGATTRIBUT 0x00000040 +#define TGALIGN 0x00000080 +#define TGFUNCTION 0x00000100 +#define TGBLANK 0x00000200 +#define TGLBRACES 0x00000400 +#define TGRBRACES 0x00000800 +#define TGCOLOR 0x00001000 +#define TGFONT 0x00002000 +#define TGSTANDALONE 0x00004000 +#define TGDISCARDED 0x00008000 +#define TGLIMIT 0x00010000 +#define TGFONTATTR 0x00020000 enum SmTokenType { - TEND, TLGROUP, TRGROUP, TLPARENT, TRPARENT, - TLBRACKET, TRBRACKET, TPLUS, TMINUS, TMULTIPLY, - TDIVIDEBY, TASSIGN, TPOUND, TSPECIAL, TSLASH, - TBACKSLASH, TBLANK, TSBLANK, TRSUB, TRSUP, - TCSUB, TCSUP, TLSUB, TLSUP, TGT, - TLT, TAND, TOR, TINTERSECT, TUNION, - TNEWLINE, TBINOM, TFROM, TTO, TINT, - TSUM, TOPER, TABS, TSQRT, TFACT, - TNROOT, TOVER, TTIMES, TGE, TLE, - TGG, TLL, TDOTSAXIS, TDOTSLOW, TDOTSVERT, - TDOTSDIAG, TDOTSUP, TDOTSDOWN, TACUTE, TBAR, - TBREVE, TCHECK, TCIRCLE, TDOT, TDDOT, - TDDDOT, TGRAVE, THAT, TTILDE, TVEC, - TUNDERLINE, TOVERLINE, TOVERSTRIKE, TITALIC, TNITALIC, - TBOLD, TNBOLD, TPHANTOM, TFONT, TSIZE, - TCOLOR, TALIGNL, TALIGNC, TALIGNR, TLEFT, - TRIGHT, TLANGLE, TLBRACE, TLLINE, TLDLINE, - TLCEIL, TLFLOOR, TNONE, TMLINE, TRANGLE, - TRBRACE, TRLINE, TRDLINE, TRCEIL, TRFLOOR, - TSIN, TCOS, TTAN, TCOT, TFUNC, - TSTACK, TMATRIX, TMATFORM, TDPOUND, TPLACE, - TTEXT, TNUMBER, TCHARACTER, TIDENT, TNEQ, - TEQUIV, TDEF, TPROP, TSIM, TSIMEQ, - TAPPROX, TPARALLEL, TORTHO, TIN, TNOTIN, - TSUBSET, TSUBSETEQ, TSUPSET, TSUPSETEQ, TPLUSMINUS, - TMINUSPLUS, TOPLUS, TOMINUS, TDIV, TOTIMES, - TODIVIDE, TTRANSL, TTRANSR, TIINT, TIIINT, - TLINT, TLLINT, TLLLINT, TPROD, TCOPROD, - TFORALL, TEXISTS, TLIM, TNABLA, TTOWARD, - TSINH, TCOSH, TTANH, TCOTH, TASIN, - TACOS, TATAN, TLN, TLOG, TUOPER, - TBOPER, TBLACK, TWHITE, TRED, TGREEN, - TBLUE, TCYAN, TMAGENTA, TYELLOW, TFIXED, - TSANS, TSERIF, TPOINT, TASINH, TACOSH, - TATANH, TACOTH, TACOT, TEXP, TCDOT, - TODOT, TLESLANT, TGESLANT, TNSUBSET, TNSUPSET, - TNSUBSETEQ, TNSUPSETEQ, TPARTIAL, TNEG, TNI, - TBACKEPSILON, TALEPH, TIM, TRE, TWP, - TEMPTYSET, TINFINITY, TESCAPE, TLIMSUP, TLIMINF, - TNDIVIDES, TDRARROW, TDLARROW, TDLRARROW, TUNDERBRACE, - TOVERBRACE, TCIRC, TTOP, THBAR, TLAMBDABAR, - TLEFTARROW, TRIGHTARROW, TUPARROW, TDOWNARROW, TDIVIDES, - TNDIBVIDES, TSETN, TSETZ, TSETQ, TSETR, - TSETC, TWIDEVEC, TWIDETILDE, TWIDEHAT, TWIDESLASH, - TWIDEBACKSLASH, TLDBRACKET, TRDBRACKET, TNOSPACE, - TUNKNOWN, TDEBUG + TEND, TLGROUP, TRGROUP, TLPARENT, TRPARENT, + TLBRACKET, TRBRACKET, TPLUS, TMINUS, TMULTIPLY, + TDIVIDEBY, TASSIGN, TPOUND, TSPECIAL, TSLASH, + TBACKSLASH, TBLANK, TSBLANK, TRSUB, TRSUP, + TCSUB, TCSUP, TLSUB, TLSUP, TGT, + TLT, TAND, TOR, TINTERSECT, TUNION, + TNEWLINE, TBINOM, TFROM, TTO, TINT, + TSUM, TOPER, TABS, TSQRT, TFACT, + TNROOT, TOVER, TTIMES, TGE, TLE, + TGG, TLL, TDOTSAXIS, TDOTSLOW, TDOTSVERT, + TDOTSDIAG, TDOTSUP, TDOTSDOWN, TACUTE, TBAR, + TBREVE, TCHECK, TCIRCLE, TDOT, TDDOT, + TDDDOT, TGRAVE, THAT, TTILDE, TVEC, + TUNDERLINE, TOVERLINE, TOVERSTRIKE, TITALIC, TNITALIC, + TBOLD, TNBOLD, TPHANTOM, TFONT, TSIZE, + TCOLOR, TALIGNL, TALIGNC, TALIGNR, TLEFT, + TRIGHT, TLANGLE, TLBRACE, TLLINE, TLDLINE, + TLCEIL, TLFLOOR, TNONE, TMLINE, TRANGLE, + TRBRACE, TRLINE, TRDLINE, TRCEIL, TRFLOOR, + TSIN, TCOS, TTAN, TCOT, TFUNC, + TSTACK, TMATRIX, TMATFORM, TDPOUND, TPLACE, + TTEXT, TNUMBER, TCHARACTER, TIDENT, TNEQ, + TEQUIV, TDEF, TPROP, TSIM, TSIMEQ, + TAPPROX, TPARALLEL, TORTHO, TIN, TNOTIN, + TSUBSET, TSUBSETEQ, TSUPSET, TSUPSETEQ, TPLUSMINUS, + TMINUSPLUS, TOPLUS, TOMINUS, TDIV, TOTIMES, + TODIVIDE, TTRANSL, TTRANSR, TIINT, TIIINT, + TLINT, TLLINT, TLLLINT, TPROD, TCOPROD, + TFORALL, TEXISTS, TLIM, TNABLA, TTOWARD, + TSINH, TCOSH, TTANH, TCOTH, TASIN, + TACOS, TATAN, TLN, TLOG, TUOPER, + TBOPER, TBLACK, TWHITE, TRED, TGREEN, + TBLUE, TCYAN, TMAGENTA, TYELLOW, TFIXED, + TSANS, TSERIF, TPOINT, TASINH, TACOSH, + TATANH, TACOTH, TACOT, TEXP, TCDOT, + TODOT, TLESLANT, TGESLANT, TNSUBSET, TNSUPSET, + TNSUBSETEQ, TNSUPSETEQ, TPARTIAL, TNEG, TNI, + TBACKEPSILON, TALEPH, TIM, TRE, TWP, + TEMPTYSET, TINFINITY, TESCAPE, TLIMSUP, TLIMINF, + TNDIVIDES, TDRARROW, TDLARROW, TDLRARROW, TUNDERBRACE, + TOVERBRACE, TCIRC, TTOP, THBAR, TLAMBDABAR, + TLEFTARROW, TRIGHTARROW, TUPARROW, TDOWNARROW, TDIVIDES, + TNDIBVIDES, TSETN, TSETZ, TSETQ, TSETR, + TSETC, TWIDEVEC, TWIDETILDE, TWIDEHAT, TWIDESLASH, + TWIDEBACKSLASH, TLDBRACKET, TRDBRACKET, TNOSPACE, + TUNKNOWN, TDEBUG }; struct SmToken { // token text - String aText; + String aText; // token info SmTokenType eType; - sal_Unicode cMathChar; + sal_Unicode cMathChar; // parse-help info - ULONG nGroup; - USHORT nLevel; + ULONG nGroup; + USHORT nLevel; // token position USHORT nRow; xub_StrLen nCol; @@ -137,16 +137,16 @@ struct SmToken enum SmParseError { - PE_NONE, PE_UNEXPECTED_END_OF_INPUT, - PE_UNEXPECTED_CHAR, PE_UNEXPECTED_TOKEN, - PE_FUNC_EXPECTED, PE_UNOPER_EXPECTED, - PE_BINOPER_EXPECTED, PE_SYMBOL_EXPECTED, - PE_IDENTIFIER_EXPECTED, PE_POUND_EXPECTED, - PE_COLOR_EXPECTED, PE_LGROUP_EXPECTED, - PE_RGROUP_EXPECTED, PE_LBRACE_EXPECTED, - PE_RBRACE_EXPECTED, PE_PARENT_MISMATCH, - PE_RIGHT_EXPECTED, PE_FONT_EXPECTED, - PE_SIZE_EXPECTED, PE_DOUBLE_ALIGN, + PE_NONE, PE_UNEXPECTED_END_OF_INPUT, + PE_UNEXPECTED_CHAR, PE_UNEXPECTED_TOKEN, + PE_FUNC_EXPECTED, PE_UNOPER_EXPECTED, + PE_BINOPER_EXPECTED, PE_SYMBOL_EXPECTED, + PE_IDENTIFIER_EXPECTED, PE_POUND_EXPECTED, + PE_COLOR_EXPECTED, PE_LGROUP_EXPECTED, + PE_RGROUP_EXPECTED, PE_LBRACE_EXPECTED, + PE_RBRACE_EXPECTED, PE_PARENT_MISMATCH, + PE_RIGHT_EXPECTED, PE_FONT_EXPECTED, + PE_SIZE_EXPECTED, PE_DOUBLE_ALIGN, PE_DOUBLE_SUBSUPSCRIPT }; @@ -154,8 +154,8 @@ enum SmParseError struct SmErrorDesc { SmParseError Type; - SmNode *pNode; - String Text; + SmNode *pNode; + String Text; }; DECLARE_STACK(SmNodeStack, SmNode *) @@ -175,11 +175,11 @@ enum SmConvert struct SmTokenTableEntry { - const sal_Char* pIdent; - SmTokenType eType; - sal_Unicode cMathChar; - ULONG nGroup; - USHORT nLevel; + const sal_Char* pIdent; + SmTokenType eType; + sal_Unicode cMathChar; + ULONG nGroup; + USHORT nLevel; }; class SmParser @@ -204,57 +204,57 @@ class SmParser protected: #if OSL_DEBUG_LEVEL - BOOL IsDelimiter( const String &rTxt, xub_StrLen nPos ); + BOOL IsDelimiter( const String &rTxt, xub_StrLen nPos ); #endif - void NextToken(); - xub_StrLen GetTokenIndex() const { return nTokenIndex; } - void Insert(const String &rText, USHORT nPos); + void NextToken(); + xub_StrLen GetTokenIndex() const { return nTokenIndex; } + void Insert(const String &rText, USHORT nPos); void Replace( USHORT nPos, USHORT nLen, const String &rText ); - inline BOOL TokenInGroup(ULONG nGroup); + inline BOOL TokenInGroup(ULONG nGroup); // grammar - void Table(); - void Line(); - void Expression(); - void Relation(); - void Sum(); - void Product(); - void SubSup(ULONG nActiveGroup); - void OpSubSup(); - void Power(); - void Blank(); - void Term(); - void Escape(); - void Operator(); - void Oper(); - void UnOper(); - void Align(); - void FontAttribut(); - void Attribut(); - void Font(); - void FontSize(); - void Color(); - void Brace(); - void Bracebody(BOOL bIsLeftRight); - void Function(); - void Binom(); - void Stack(); - void Matrix(); - void Special(); - void GlyphSpecial(); + void Table(); + void Line(); + void Expression(); + void Relation(); + void Sum(); + void Product(); + void SubSup(ULONG nActiveGroup); + void OpSubSup(); + void Power(); + void Blank(); + void Term(); + void Escape(); + void Operator(); + void Oper(); + void UnOper(); + void Align(); + void FontAttribut(); + void Attribut(); + void Font(); + void FontSize(); + void Color(); + void Brace(); + void Bracebody(BOOL bIsLeftRight); + void Function(); + void Binom(); + void Stack(); + void Matrix(); + void Special(); + void GlyphSpecial(); // end of grammar LanguageType GetLanguage() const { return nLang; } void SetLanguage( LanguageType nNewLang ) { nLang = nNewLang; } - void Error(SmParseError Error); + void Error(SmParseError Error); public: SmParser(); /** Parse rBuffer to formula tree */ - SmNode *Parse(const String &rBuffer); + SmNode *Parse(const String &rBuffer); /** Parse rBuffer to formula subtree that constitutes an expression */ SmNode *ParseExpression(const String &rBuffer); @@ -268,11 +268,11 @@ public: BOOL IsExportSymbolNames() const { return bExportSymNames; } void SetExportSymbolNames(BOOL bVal) { bExportSymNames = bVal; } - USHORT AddError(SmParseError Type, SmNode *pNode); + USHORT AddError(SmParseError Type, SmNode *pNode); - const SmErrorDesc * NextError(); - const SmErrorDesc * PrevError(); - const SmErrorDesc * GetError(USHORT i = 0xFFFF); + const SmErrorDesc * NextError(); + const SmErrorDesc * PrevError(); + const SmErrorDesc * GetError(USHORT i = 0xFFFF); static const SmTokenTableEntry* GetTokenTableEntry( const String &rName ); }; diff --git a/starmath/inc/pch/precompiled_starmath.cxx b/starmath/inc/pch/precompiled_starmath.cxx index c25af02d9f18..1af681bd3ea4 100644 --- a/starmath/inc/pch/precompiled_starmath.cxx +++ b/starmath/inc/pch/precompiled_starmath.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/inc/pch/precompiled_starmath.hxx b/starmath/inc/pch/precompiled_starmath.hxx index 7d2363e50a94..d258e8125c6e 100644 --- a/starmath/inc/pch/precompiled_starmath.hxx +++ b/starmath/inc/pch/precompiled_starmath.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx index fdd12dd86669..16a61eae888f 100644 --- a/starmath/inc/rect.hxx +++ b/starmath/inc/rect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,41 +60,41 @@ inline long SmFromTo(long nFrom, long nTo, double fRelDist) // // possible flags for the 'Draw' function below (just for debugging) -#define SM_RECT_CORE 0x0001 -#define SM_RECT_ITALIC 0x0002 -#define SM_RECT_LINES 0x0004 -#define SM_RECT_MID 0x0008 +#define SM_RECT_CORE 0x0001 +#define SM_RECT_ITALIC 0x0002 +#define SM_RECT_LINES 0x0004 +#define SM_RECT_MID 0x0008 // possible positions and alignments for the 'AlignTo' function enum RectPos // (RP_LEFT : align the current object to the left of the argument, ...) -{ RP_LEFT, RP_RIGHT, +{ RP_LEFT, RP_RIGHT, RP_TOP, RP_BOTTOM, RP_ATTRIBUT }; enum RectHorAlign -{ RHA_LEFT, RHA_CENTER, RHA_RIGHT +{ RHA_LEFT, RHA_CENTER, RHA_RIGHT }; enum RectVerAlign -{ RVA_TOP, RVA_MID, RVA_BOTTOM, RVA_BASELINE, RVA_CENTERY, +{ RVA_TOP, RVA_MID, RVA_BOTTOM, RVA_BASELINE, RVA_CENTERY, RVA_ATTRIBUT_HI, RVA_ATTRIBUT_MID, RVA_ATTRIBUT_LO }; // different methods of copying baselines and mid's in 'ExtendBy' function enum RectCopyMBL -{ RCP_THIS, // keep baseline of current object even if it has none - RCP_ARG, // as above but for the argument - RCP_NONE, // result will have no baseline - RCP_XOR // if current object has a baseline keep it else copy - // the arguments baseline (even if it has none) +{ RCP_THIS, // keep baseline of current object even if it has none + RCP_ARG, // as above but for the argument + RCP_NONE, // result will have no baseline + RCP_XOR // if current object has a baseline keep it else copy + // the arguments baseline (even if it has none) }; class SmRect { - Point aTopLeft; - Size aSize; - long nBaseline, + Point aTopLeft; + Size aSize; + long nBaseline, nAlignT, nAlignM, nAlignB, @@ -105,7 +105,7 @@ class SmRect nLoAttrFence, nHiAttrFence; USHORT nBorderWidth; - BOOL bHasBaseline, + BOOL bHasBaseline, bHasAlignInfo; protected: @@ -114,8 +114,8 @@ protected: void Init(const OutputDevice &rDev, const SmFormat *pFormat, const XubString &rText, USHORT nBorderWidth); - void ClearBaseline() { bHasBaseline = FALSE; }; - inline void CopyMBL(const SmRect& rRect); + void ClearBaseline() { bHasBaseline = FALSE; }; + inline void CopyMBL(const SmRect& rRect); void CopyAlignInfo(const SmRect& rRect); SmRect & Union(const SmRect &rRect); @@ -132,64 +132,64 @@ public: void SetItalicSpaces(long nLeftSpace, long nRightSpace); - void SetWidth(ULONG nWidth) { aSize.Width() = nWidth; } - void SetHeight(ULONG nHeight) { aSize.Height() = nHeight; } + void SetWidth(ULONG nWidth) { aSize.Width() = nWidth; } + void SetHeight(ULONG nHeight) { aSize.Height() = nHeight; } void SetLeft(long nLeft); void SetRight(long nRight); void SetBottom(long nBottom); void SetTop(long nTop); - const Point & GetTopLeft() const { return aTopLeft; } + const Point & GetTopLeft() const { return aTopLeft; } - long GetTop() const { return GetTopLeft().Y(); } - long GetLeft() const { return GetTopLeft().X(); } - long GetBottom() const { return GetTop() + GetHeight() - 1; } - long GetRight() const { return GetLeft() + GetWidth() - 1; } - long GetCenterX() const { return (GetLeft() + GetRight()) / 2L; } - long GetCenterY() const { return (GetTop() + GetBottom()) / 2L; } - long GetWidth() const { return GetSize().Width(); } - long GetHeight() const { return GetSize().Height(); } + long GetTop() const { return GetTopLeft().Y(); } + long GetLeft() const { return GetTopLeft().X(); } + long GetBottom() const { return GetTop() + GetHeight() - 1; } + long GetRight() const { return GetLeft() + GetWidth() - 1; } + long GetCenterX() const { return (GetLeft() + GetRight()) / 2L; } + long GetCenterY() const { return (GetTop() + GetBottom()) / 2L; } + long GetWidth() const { return GetSize().Width(); } + long GetHeight() const { return GetSize().Height(); } long GetItalicLeftSpace() const { return nItalicLeftSpace; } long GetItalicRightSpace() const { return nItalicRightSpace; } - void SetHiAttrFence(long nVal) { nHiAttrFence = nVal; } - void SetLoAttrFence(long nVal) { nLoAttrFence = nVal; } - long GetHiAttrFence() const { return nHiAttrFence; } - long GetLoAttrFence() const { return nLoAttrFence; } + void SetHiAttrFence(long nVal) { nHiAttrFence = nVal; } + void SetLoAttrFence(long nVal) { nLoAttrFence = nVal; } + long GetHiAttrFence() const { return nHiAttrFence; } + long GetLoAttrFence() const { return nLoAttrFence; } - long GetItalicLeft() const { return GetLeft() - GetItalicLeftSpace(); } - long GetItalicCenterX() const { return (GetItalicLeft() + GetItalicRight()) / 2; } - long GetItalicRight() const { return GetRight() + GetItalicRightSpace(); } - long GetItalicWidth() const { return GetWidth() + GetItalicLeftSpace() + GetItalicRightSpace(); } + long GetItalicLeft() const { return GetLeft() - GetItalicLeftSpace(); } + long GetItalicCenterX() const { return (GetItalicLeft() + GetItalicRight()) / 2; } + long GetItalicRight() const { return GetRight() + GetItalicRightSpace(); } + long GetItalicWidth() const { return GetWidth() + GetItalicLeftSpace() + GetItalicRightSpace(); } - BOOL HasBaseline() const { return bHasBaseline; } - inline long GetBaseline() const; - long GetBaselineOffset() const { return GetBaseline() - GetTop(); } + BOOL HasBaseline() const { return bHasBaseline; } + inline long GetBaseline() const; + long GetBaselineOffset() const { return GetBaseline() - GetTop(); } void SetAlignTop(long nVal) { nAlignT = nVal; } - long GetAlignT() const { return nAlignT; } - long GetAlignM() const { return nAlignM; } - long GetAlignB() const { return nAlignB; } + long GetAlignT() const { return nAlignT; } + long GetAlignM() const { return nAlignM; } + long GetAlignB() const { return nAlignB; } void SetAlignT(long nVal) { nAlignT = nVal; } - const Point GetCenter() const - { return Point(GetCenterX(), GetCenterY()); } + const Point GetCenter() const + { return Point(GetCenterX(), GetCenterY()); } - const Size & GetSize() const { return aSize; } + const Size & GetSize() const { return aSize; } - const Size GetItalicSize() const - { return Size(GetItalicWidth(), GetHeight()); } + const Size GetItalicSize() const + { return Size(GetItalicWidth(), GetHeight()); } void Move (const Point &rPosition); void MoveTo(const Point &rPosition) { Move(rPosition - GetTopLeft()); } BOOL IsEmpty() const { - return GetWidth() == 0 || GetHeight() == 0; + return GetWidth() == 0 || GetHeight() == 0; } BOOL HasAlignInfo() const { return bHasAlignInfo; } @@ -203,17 +203,17 @@ public: SmRect & ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode, BOOL bKeepVerAlignParams); - long OrientedDist(const Point &rPoint) const; - BOOL IsInsideRect(const Point &rPoint) const; - BOOL IsInsideItalicRect(const Point &rPoint) const; + long OrientedDist(const Point &rPoint) const; + BOOL IsInsideRect(const Point &rPoint) const; + BOOL IsInsideItalicRect(const Point &rPoint) const; - inline SmRect & operator = (const SmRect &rRect); + inline SmRect & operator = (const SmRect &rRect); - inline Rectangle AsRectangle() const; - SmRect AsGlyphRect() const; + inline Rectangle AsRectangle() const; + SmRect AsGlyphRect() const; #ifdef SM_RECT_DEBUG - void Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const; + void Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const; #endif }; @@ -230,9 +230,9 @@ inline void SmRect::SetItalicSpaces(long nLeftSpace, long nRightSpace) inline void SmRect::CopyMBL(const SmRect &rRect) // copy AlignM baseline and value of 'rRect' { - nBaseline = rRect.nBaseline; + nBaseline = rRect.nBaseline; bHasBaseline = rRect.bHasBaseline; - nAlignM = rRect.nAlignM; + nAlignM = rRect.nAlignM; } @@ -245,7 +245,7 @@ inline long SmRect::GetBaseline() const inline SmRect & SmRect::operator = (const SmRect &rRect) { - new (this) SmRect(rRect); // placement new + new (this) SmRect(rRect); // placement new return *this; } diff --git a/starmath/inc/smdll.hxx b/starmath/inc/smdll.hxx index cc5560764914..25194d47cb63 100644 --- a/starmath/inc/smdll.hxx +++ b/starmath/inc/smdll.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index f6e1eb205fe1..242b5757d0be 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,8 +91,8 @@ public: class SmLocalizedSymbolData : public Resource { - ResStringArray aUiSymbolNamesAry; - ResStringArray aExportSymbolNamesAry; + ResStringArray aUiSymbolNamesAry; + ResStringArray aExportSymbolNamesAry; ResStringArray aUiSymbolSetNamesAry; ResStringArray aExportSymbolSetNamesAry; SmNamesArray *p50NamesAry; @@ -167,9 +167,9 @@ public: } //virtuelle Methoden fuer den Optionendialog - virtual SfxItemSet* CreateItemSet( USHORT nId ); - virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); - virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ); + virtual SfxItemSet* CreateItemSet( USHORT nId ); + virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); + virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ); }; #define SM_MOD() ( *(SmModule**) GetAppData(SHL_SM) ) diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 9be6defc3964..ed670d8d1fba 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,110 +31,110 @@ #include <sfx2/sfxsids.hrc> #include <editeng/memberids.hrc> -#define SID_NEXTERR (SID_SMA_START + 1) -#define SID_PREVERR (SID_SMA_START + 2) -#define SID_NEXTMARK (SID_SMA_START + 3) -#define SID_PREVMARK (SID_SMA_START + 4) +#define SID_NEXTERR (SID_SMA_START + 1) +#define SID_PREVERR (SID_SMA_START + 2) +#define SID_NEXTMARK (SID_SMA_START + 3) +#define SID_PREVMARK (SID_SMA_START + 4) #define SID_SYMBOLS_CATALOGUE (SID_SMA_START + 5) -#define SID_PREFERENCES (SID_SMA_START + 6) -#define SID_VIEW050 (SID_SMA_START + 7) -#define SID_VIEW100 (SID_SMA_START + 8) -#define SID_VIEW200 (SID_SMA_START + 9) +#define SID_PREFERENCES (SID_SMA_START + 6) +#define SID_VIEW050 (SID_SMA_START + 7) +#define SID_VIEW100 (SID_SMA_START + 8) +#define SID_VIEW200 (SID_SMA_START + 9) #define SID_ZOOMIN (SID_SMA_START + 10) -#define SID_ZOOMOUT (SID_SMA_START + 11) +#define SID_ZOOMOUT (SID_SMA_START + 11) #define SID_DRAW (SID_SMA_START + 12) #define SID_ADJUST (SID_SMA_START + 13) -#define SID_TOOLBOX (SID_SMA_START + 14) -#define SID_FORMULACURSOR (SID_SMA_START + 15) +#define SID_TOOLBOX (SID_SMA_START + 14) +#define SID_FORMULACURSOR (SID_SMA_START + 15) #define SID_FONT (SID_SMA_START + 50) -#define SID_FONTSIZE (SID_SMA_START + 51) -#define SID_DISTANCE (SID_SMA_START + 52) +#define SID_FONTSIZE (SID_SMA_START + 51) +#define SID_DISTANCE (SID_SMA_START + 52) #define SID_ALIGN (SID_SMA_START + 53) -#define SID_AUTO_REDRAW (SID_SMA_START + 55) -#define SID_SYMBOLS (SID_SMA_START + 56) // Muss erstmal wieder aufgenommen werden ! -#define SID_TEXTMODE (SID_SMA_START + 57) -#define SID_INSERT_FORMULA (SID_SMA_START + 58) +#define SID_AUTO_REDRAW (SID_SMA_START + 55) +#define SID_SYMBOLS (SID_SMA_START + 56) // Muss erstmal wieder aufgenommen werden ! +#define SID_TEXTMODE (SID_SMA_START + 57) +#define SID_INSERT_FORMULA (SID_SMA_START + 58) #define SID_TEXT (SID_SMA_START + 100) #define SID_GAPHIC_SM (SID_SMA_START + 101) -#define SID_FITINWINDOW (SID_SMA_START + 103) +#define SID_FITINWINDOW (SID_SMA_START + 103) /** Command for inserting a symbol specified by a string (Inserts an SmSpecialNode) */ -#define SID_INSERTSYMBOL (SID_SMA_START + 104) +#define SID_INSERTSYMBOL (SID_SMA_START + 104) /** Command for inserting a math construction specified in commands.src */ -#define SID_INSERTCOMMAND (SID_SMA_START + 105) - -#define SID_LOADSYMBOLS (SID_SMA_START + 107) -#define SID_SAVESYMBOLS (SID_SMA_START + 108) -#define SID_ZOOMSTATUS (SID_SMA_START + 109) -#define SID_MODIFYSTATUS (SID_SMA_START + 110) -#define SID_TEXTSTATUS (SID_SMA_START + 111) - -#define SID_PRINTTITLE (SID_SMA_START + 112) -#define SID_PRINTTEXT (SID_SMA_START + 113) -#define SID_PRINTFRAME (SID_SMA_START + 114) -#define SID_PRINTSIZE (SID_SMA_START + 115) -#define SID_PRINTZOOM (SID_SMA_START + 116) - -#define SID_COPYOBJECT (SID_SMA_START + 117) -#define SID_PASTEOBJECT (SID_SMA_START + 118) -#define SID_AUTOREDRAW (SID_SMA_START + 119) - -#define SID_GETEDITTEXT (SID_SMA_START + 121) -#define SID_CMDBOXWINDOW (SID_SMA_START + 122) -#define SID_TOOLBOXWINDOW (SID_SMA_START + 123) -#define SID_NO_RIGHT_SPACES (SID_SMA_START + 124) +#define SID_INSERTCOMMAND (SID_SMA_START + 105) + +#define SID_LOADSYMBOLS (SID_SMA_START + 107) +#define SID_SAVESYMBOLS (SID_SMA_START + 108) +#define SID_ZOOMSTATUS (SID_SMA_START + 109) +#define SID_MODIFYSTATUS (SID_SMA_START + 110) +#define SID_TEXTSTATUS (SID_SMA_START + 111) + +#define SID_PRINTTITLE (SID_SMA_START + 112) +#define SID_PRINTTEXT (SID_SMA_START + 113) +#define SID_PRINTFRAME (SID_SMA_START + 114) +#define SID_PRINTSIZE (SID_SMA_START + 115) +#define SID_PRINTZOOM (SID_SMA_START + 116) + +#define SID_COPYOBJECT (SID_SMA_START + 117) +#define SID_PASTEOBJECT (SID_SMA_START + 118) +#define SID_AUTOREDRAW (SID_SMA_START + 119) + +#define SID_GETEDITTEXT (SID_SMA_START + 121) +#define SID_CMDBOXWINDOW (SID_SMA_START + 122) +#define SID_TOOLBOXWINDOW (SID_SMA_START + 123) +#define SID_NO_RIGHT_SPACES (SID_SMA_START + 124) #define SID_DUMMY (SID_SMA_START + 254) //#define GID_FORMEL (RID_GROUPS_OFFSET + 1) //#define GID_ERROR (RID_GROUPS_OFFSET + 2) -//#define RID_OPTIONSDIALOG (RID_APP_START + 1) -#define RID_FONTDIALOG (RID_APP_START + 2) -#define RID_FONTSIZEDIALOG (RID_APP_START + 3) -#define RID_FONTTYPEDIALOG (RID_APP_START + 4) -#define RID_DISTANCEDIALOG (RID_APP_START + 5) -#define RID_ALIGNDIALOG (RID_APP_START + 6) -#define RID_PRINTOPTIONPAGE (RID_APP_START + 7) -#define RID_SYMBOLDIALOG (RID_APP_START + 8) -#define RID_SYMDEFINEDIALOG (RID_APP_START + 9) -#define RID_EXTRAOPTIONPAGE (RID_APP_START + 10) -#define RID_PRINTUIOPTIONS (RID_APP_START + 11) - -#define RID_MATH_TOOLBOX (RID_APP_START + 50) +//#define RID_OPTIONSDIALOG (RID_APP_START + 1) +#define RID_FONTDIALOG (RID_APP_START + 2) +#define RID_FONTSIZEDIALOG (RID_APP_START + 3) +#define RID_FONTTYPEDIALOG (RID_APP_START + 4) +#define RID_DISTANCEDIALOG (RID_APP_START + 5) +#define RID_ALIGNDIALOG (RID_APP_START + 6) +#define RID_PRINTOPTIONPAGE (RID_APP_START + 7) +#define RID_SYMBOLDIALOG (RID_APP_START + 8) +#define RID_SYMDEFINEDIALOG (RID_APP_START + 9) +#define RID_EXTRAOPTIONPAGE (RID_APP_START + 10) +#define RID_PRINTUIOPTIONS (RID_APP_START + 11) + +#define RID_MATH_TOOLBOX (RID_APP_START + 50) // wegen #58705# entfernt -//#define RID_DRAW_OBJECTBAR (RID_APP_START + 51) +//#define RID_DRAW_OBJECTBAR (RID_APP_START + 51) -#define RID_DEFAULTSAVEQUERY (RID_APP_START + 102) -#define RID_WRITESYMBOLERROR (RID_APP_START + 202) -#define RID_READSYMBOLERROR (RID_APP_START + 203) -#define RID_NOMATHTYPEFACEWARNING (RID_APP_START + 204) -#define RID_OBJECTNAME (RID_APP_START + 501) +#define RID_DEFAULTSAVEQUERY (RID_APP_START + 102) +#define RID_WRITESYMBOLERROR (RID_APP_START + 202) +#define RID_READSYMBOLERROR (RID_APP_START + 203) +#define RID_NOMATHTYPEFACEWARNING (RID_APP_START + 204) +#define RID_OBJECTNAME (RID_APP_START + 501) // free -#define RID_UNDOEDITNAME (RID_APP_START + 503) -#define RID_UNDOFORMATNAME (RID_APP_START + 504) -#define RID_APPICO (RID_APP_START + 601) -#define RID_TMPICO (RID_APP_START + 603) -#define RID_COMMANDMENU (RID_APP_START + 701) -#define RID_VIEWMENU (RID_APP_START + 702) -#define RID_DISTANCEMENU (RID_APP_START + 703) -#define RID_FONTMENU (RID_APP_START + 704) -#define RID_STARTUPWINDOW (RID_APP_START + 800) -#define RID_TOOLBOXWINDOW (RID_APP_START + 801) -#define RID_CMDBOXWINDOW (RID_APP_START + 802) -#define RID_FONTREGULAR (RID_APP_START + 804) -#define RID_FONTITALIC (RID_APP_START + 805) -#define RID_FONTBOLD (RID_APP_START + 806) -//#define RID_PRINTOPTION (RID_APP_START + 807) -#define RID_DOCUMENTSTR (RID_APP_START + 808) -#define RID_SYMBOLFILESSTR (RID_APP_START + 809) -#define RID_ALLFILESSTR (RID_APP_START + 810) -#define RID_CREATORSTR (RID_APP_START + 811) -#define RID_FILESMFTYP (RID_APP_START + 812) -#define RID_FILESYMTYP (RID_APP_START + 813) -#define RID_SMMENU (RID_APP_START + 814) -#define RID_SMACCEL (RID_APP_START + 815) -#define RID_STATUSBAR (RID_APP_START + 816) -#define RID_APPNAMESTR (RID_APP_START + 817) +#define RID_UNDOEDITNAME (RID_APP_START + 503) +#define RID_UNDOFORMATNAME (RID_APP_START + 504) +#define RID_APPICO (RID_APP_START + 601) +#define RID_TMPICO (RID_APP_START + 603) +#define RID_COMMANDMENU (RID_APP_START + 701) +#define RID_VIEWMENU (RID_APP_START + 702) +#define RID_DISTANCEMENU (RID_APP_START + 703) +#define RID_FONTMENU (RID_APP_START + 704) +#define RID_STARTUPWINDOW (RID_APP_START + 800) +#define RID_TOOLBOXWINDOW (RID_APP_START + 801) +#define RID_CMDBOXWINDOW (RID_APP_START + 802) +#define RID_FONTREGULAR (RID_APP_START + 804) +#define RID_FONTITALIC (RID_APP_START + 805) +#define RID_FONTBOLD (RID_APP_START + 806) +//#define RID_PRINTOPTION (RID_APP_START + 807) +#define RID_DOCUMENTSTR (RID_APP_START + 808) +#define RID_SYMBOLFILESSTR (RID_APP_START + 809) +#define RID_ALLFILESSTR (RID_APP_START + 810) +#define RID_CREATORSTR (RID_APP_START + 811) +#define RID_FILESMFTYP (RID_APP_START + 812) +#define RID_FILESYMTYP (RID_APP_START + 813) +#define RID_SMMENU (RID_APP_START + 814) +#define RID_SMACCEL (RID_APP_START + 815) +#define RID_STATUSBAR (RID_APP_START + 816) +#define RID_APPNAMESTR (RID_APP_START + 817) #define STR_MATH_DOCUMENT_FULLTYPE_CURRENT (RID_APP_START + 821) #define RID_SMPLUGINMENU (RID_APP_START + 822) @@ -142,24 +142,24 @@ #define STR_STATSTR_WRITING (RID_APP_START + 824) #define STR_CMDBOXWINDOW (RID_APP_START + 825) -#define RID_ERR_IDENT (RID_APP_START + 920) -#define RID_ERR_UNKOWN (RID_APP_START + 921) -#define RID_ERR_UNEXPECTEDCHARACTER (RID_APP_START + 922) -#define RID_ERR_LGROUPEXPECTED (RID_APP_START + 923) -#define RID_ERR_RGROUPEXPECTED (RID_APP_START + 924) -#define RID_ERR_LBRACEEXPECTED (RID_APP_START + 925) -#define RID_ERR_RBRACEEXPECTED (RID_APP_START + 926) -#define RID_ERR_FUNCEXPECTED (RID_APP_START + 927) -#define RID_ERR_UNOPEREXPECTED (RID_APP_START + 928) -#define RID_ERR_BINOPEREXPECTED (RID_APP_START + 929) -#define RID_ERR_SYMBOLEXPECTED (RID_APP_START + 930) -#define RID_ERR_IDENTEXPECTED (RID_APP_START + 931) -#define RID_ERR_POUNDEXPECTED (RID_APP_START + 932) -#define RID_ERR_COLOREXPECTED (RID_APP_START + 933) -#define RID_ERR_LPARENTEXPECTED (RID_APP_START + 934) -#define RID_ERR_RPARENTEXPECTED (RID_APP_START + 935) -#define RID_ERR_RIGHTEXPECTED (RID_APP_START + 936) -#define RID_ERR_OVERFLOW (RID_APP_START + 937) +#define RID_ERR_IDENT (RID_APP_START + 920) +#define RID_ERR_UNKOWN (RID_APP_START + 921) +#define RID_ERR_UNEXPECTEDCHARACTER (RID_APP_START + 922) +#define RID_ERR_LGROUPEXPECTED (RID_APP_START + 923) +#define RID_ERR_RGROUPEXPECTED (RID_APP_START + 924) +#define RID_ERR_LBRACEEXPECTED (RID_APP_START + 925) +#define RID_ERR_RBRACEEXPECTED (RID_APP_START + 926) +#define RID_ERR_FUNCEXPECTED (RID_APP_START + 927) +#define RID_ERR_UNOPEREXPECTED (RID_APP_START + 928) +#define RID_ERR_BINOPEREXPECTED (RID_APP_START + 929) +#define RID_ERR_SYMBOLEXPECTED (RID_APP_START + 930) +#define RID_ERR_IDENTEXPECTED (RID_APP_START + 931) +#define RID_ERR_POUNDEXPECTED (RID_APP_START + 932) +#define RID_ERR_COLOREXPECTED (RID_APP_START + 933) +#define RID_ERR_LPARENTEXPECTED (RID_APP_START + 934) +#define RID_ERR_RPARENTEXPECTED (RID_APP_START + 935) +#define RID_ERR_RIGHTEXPECTED (RID_APP_START + 936) +#define RID_ERR_OVERFLOW (RID_APP_START + 937) // toolbox image lists for 'Selection' window //!! RID_ILH_XYZ = RID_IL_XYZ + 1 !! @@ -184,266 +184,266 @@ #define RID_IL_MISC (RID_APP_START + 968) #define RID_ILH_MISC (RID_APP_START + 969) -#define RID_UNBINOPS_CAT (RID_APP_START + 1101) -#define RID_RELATIONS_CAT (RID_APP_START + 1102) -#define RID_SETOPERATIONS_CAT (RID_APP_START + 1103) -#define RID_FUNCTIONS_CAT (RID_APP_START + 1104) -#define RID_OPERATORS_CAT (RID_APP_START + 1105) -#define RID_ATTRIBUTES_CAT (RID_APP_START + 1106) -#define RID_BRACKETS_CAT (RID_APP_START + 1107) -#define RID_FORMAT_CAT (RID_APP_START + 1108) -#define RID_UNBINOPS_CAT_HLP (RID_APP_START + 1109) -#define RID_RELATIONS_CAT_HLP (RID_APP_START + 1110) -#define RID_SETOPEROPERATIONS_CAT_HLP (RID_APP_START + 1111) -#define RID_FUNCTIONS_CAT_HLP (RID_APP_START + 1112) -#define RID_OPERATORS_CAT_HLP (RID_APP_START + 1113) -#define RID_ATTRIBUTES_CAT_HLP (RID_APP_START + 1114) -#define RID_BRACKETS_CAT_HLP (RID_APP_START + 1115) -#define RID_FORMAT_CAT_HLP (RID_APP_START + 1116) -#define RID_MISC_CAT (RID_APP_START + 1117) -#define RID_MISC_CAT_HLP (RID_APP_START + 1118) +#define RID_UNBINOPS_CAT (RID_APP_START + 1101) +#define RID_RELATIONS_CAT (RID_APP_START + 1102) +#define RID_SETOPERATIONS_CAT (RID_APP_START + 1103) +#define RID_FUNCTIONS_CAT (RID_APP_START + 1104) +#define RID_OPERATORS_CAT (RID_APP_START + 1105) +#define RID_ATTRIBUTES_CAT (RID_APP_START + 1106) +#define RID_BRACKETS_CAT (RID_APP_START + 1107) +#define RID_FORMAT_CAT (RID_APP_START + 1108) +#define RID_UNBINOPS_CAT_HLP (RID_APP_START + 1109) +#define RID_RELATIONS_CAT_HLP (RID_APP_START + 1110) +#define RID_SETOPEROPERATIONS_CAT_HLP (RID_APP_START + 1111) +#define RID_FUNCTIONS_CAT_HLP (RID_APP_START + 1112) +#define RID_OPERATORS_CAT_HLP (RID_APP_START + 1113) +#define RID_ATTRIBUTES_CAT_HLP (RID_APP_START + 1114) +#define RID_BRACKETS_CAT_HLP (RID_APP_START + 1115) +#define RID_FORMAT_CAT_HLP (RID_APP_START + 1116) +#define RID_MISC_CAT (RID_APP_START + 1117) +#define RID_MISC_CAT_HLP (RID_APP_START + 1118) // new resource ID's -#define RID_PLUSX (RID_APP_START + 1201) -#define RID_MINUSX (RID_APP_START + 1202) -#define RID_PLUSMINUSX (RID_APP_START + 1203) -#define RID_MINUSPLUSX (RID_APP_START + 1204) -#define RID_XPLUSY (RID_APP_START + 1205) -#define RID_XCDOTY (RID_APP_START + 1206) -#define RID_XTIMESY (RID_APP_START + 1207) -#define RID_XSYMTIMESY (RID_APP_START + 1208) -#define RID_XMINUSY (RID_APP_START + 1209) -#define RID_XOVERY (RID_APP_START + 1210) -#define RID_XDIVY (RID_APP_START + 1211) -#define RID_XSYMDIVIDEY (RID_APP_START + 1212) -#define RID_NEGX (RID_APP_START + 1213) -#define RID_XANDY (RID_APP_START + 1214) -#define RID_XORY (RID_APP_START + 1215) -#define RID_XODIVIDEY (RID_APP_START + 1216) -#define RID_XODOTY (RID_APP_START + 1217) -#define RID_XOMINUSY (RID_APP_START + 1218) -#define RID_XOPLUSY (RID_APP_START + 1219) -#define RID_XOTIMESY (RID_APP_START + 1220) -#define RID_XCIRCY (RID_APP_START + 1221) -#define RID_XWIDESLASHY (RID_APP_START + 1222) -#define RID_XWIDEBSLASHY (RID_APP_START + 1223) - -#define RID_XEQY (RID_APP_START + 1301) -#define RID_XNEQY (RID_APP_START + 1302) -#define RID_XEQUIVY (RID_APP_START + 1303) -#define RID_XORTHOY (RID_APP_START + 1304) -#define RID_XLTY (RID_APP_START + 1305) -#define RID_XGTY (RID_APP_START + 1306) -#define RID_XAPPROXY (RID_APP_START + 1307) -#define RID_XPARALLELY (RID_APP_START + 1308) -#define RID_XLESLANTY (RID_APP_START + 1309) -#define RID_XGESLANTY (RID_APP_START + 1310) -#define RID_XSIMEQY (RID_APP_START + 1311) -#define RID_XPROPY (RID_APP_START + 1312) -#define RID_XLEY (RID_APP_START + 1313) -#define RID_XGEY (RID_APP_START + 1314) -#define RID_XSIMY (RID_APP_START + 1315) -#define RID_XTOWARDY (RID_APP_START + 1316) -#define RID_XLLY (RID_APP_START + 1317) -#define RID_XGGY (RID_APP_START + 1318) -#define RID_XDEFY (RID_APP_START + 1319) -#define RID_XTRANSLY (RID_APP_START + 1320) -#define RID_XTRANSRY (RID_APP_START + 1321) -#define RID_XDIVIDESY (RID_APP_START + 1322) -#define RID_XNDIVIDESY (RID_APP_START + 1323) -#define RID_DLARROW (RID_APP_START + 1324) -#define RID_DLRARROW (RID_APP_START + 1325) -#define RID_DRARROW (RID_APP_START + 1326) - -#define RID_XINY (RID_APP_START + 1401) -#define RID_XNOTINY (RID_APP_START + 1402) -#define RID_XOWNSY (RID_APP_START + 1403) -#define RID_XINTERSECTIONY (RID_APP_START + 1405) -#define RID_XUNIONY (RID_APP_START + 1406) -#define RID_XSETMINUSY (RID_APP_START + 1407) -#define RID_XSLASHY (RID_APP_START + 1408) -#define RID_XSUBSETY (RID_APP_START + 1409) -#define RID_XSUBSETEQY (RID_APP_START + 1410) -#define RID_XSUPSETY (RID_APP_START + 1411) -#define RID_XSUPSETEQY (RID_APP_START + 1412) -#define RID_XNSUBSETY (RID_APP_START + 1413) -#define RID_XNSUBSETEQY (RID_APP_START + 1414) -#define RID_XNSUPSETY (RID_APP_START + 1415) -#define RID_XNSUPSETEQY (RID_APP_START + 1416) -#define RID_SETN (RID_APP_START + 1417) -#define RID_SETZ (RID_APP_START + 1418) -#define RID_SETQ (RID_APP_START + 1419) -#define RID_SETR (RID_APP_START + 1420) -#define RID_SETC (RID_APP_START + 1421) - -#define RID_ABSX (RID_APP_START + 1501) -#define RID_FACTX (RID_APP_START + 1502) -#define RID_SQRTX (RID_APP_START + 1503) -#define RID_NROOTXY (RID_APP_START + 1504) -#define RID_EX (RID_APP_START + 1505) -#define RID_LNX (RID_APP_START + 1506) -#define RID_EXPX (RID_APP_START + 1507) -#define RID_LOGX (RID_APP_START + 1508) -#define RID_SINX (RID_APP_START + 1509) -#define RID_COSX (RID_APP_START + 1510) -#define RID_TANX (RID_APP_START + 1511) -#define RID_COTX (RID_APP_START + 1512) -#define RID_SINHX (RID_APP_START + 1513) -#define RID_COSHX (RID_APP_START + 1514) -#define RID_TANHX (RID_APP_START + 1515) -#define RID_COTHX (RID_APP_START + 1516) -#define RID_ARCSINX (RID_APP_START + 1517) -#define RID_ARCCOSX (RID_APP_START + 1518) -#define RID_ARCTANX (RID_APP_START + 1519) -#define RID_ARCCOTX (RID_APP_START + 1520) -#define RID_ARSINHX (RID_APP_START + 1521) -#define RID_ARCOSHX (RID_APP_START + 1522) -#define RID_ARTANHX (RID_APP_START + 1523) -#define RID_ARCOTHX (RID_APP_START + 1524) - -#define RID_LIMX (RID_APP_START + 1601) -#define RID_SUMX (RID_APP_START + 1602) -#define RID_PRODX (RID_APP_START + 1603) -#define RID_COPRODX (RID_APP_START + 1604) -#define RID_INTX (RID_APP_START + 1605) -#define RID_IINTX (RID_APP_START + 1606) -#define RID_IIINTX (RID_APP_START + 1607) -#define RID_LINTX (RID_APP_START + 1609) -#define RID_LLINTX (RID_APP_START + 1610) -#define RID_LLLINTX (RID_APP_START + 1611) -#define RID_FROMXTOY (RID_APP_START + 1613) -#define RID_FROMX (RID_APP_START + 1614) -#define RID_TOX (RID_APP_START + 1615) -#define RID_LIMINFX (RID_APP_START + 1616) -#define RID_LIMSUPX (RID_APP_START + 1617) - -#define RID_ACUTEX (RID_APP_START + 1701) -#define RID_GRAVEX (RID_APP_START + 1702) -#define RID_CHECKX (RID_APP_START + 1703) -#define RID_BREVEX (RID_APP_START + 1704) -#define RID_BARX (RID_APP_START + 1705) -#define RID_VECX (RID_APP_START + 1706) -#define RID_HATX (RID_APP_START + 1707) -#define RID_TILDEX (RID_APP_START + 1708) -#define RID_CIRCLEX (RID_APP_START + 1709) -#define RID_DOTX (RID_APP_START + 1710) -#define RID_DDOTX (RID_APP_START + 1711) -#define RID_DDDOTX (RID_APP_START + 1712) -#define RID_OVERLINEX (RID_APP_START + 1713) -#define RID_UNDERLINEX (RID_APP_START + 1714) -#define RID_OVERSTRIKEX (RID_APP_START + 1715) -#define RID_PHANTOMX (RID_APP_START + 1716) -#define RID_BOLDX (RID_APP_START + 1717) -#define RID_ITALX (RID_APP_START + 1718) -#define RID_SIZEXY (RID_APP_START + 1719) -#define RID_FONTXY (RID_APP_START + 1720) -#define RID_COLORX (RID_APP_START + 1721) -#define RID_WIDEHATX (RID_APP_START + 1722) -#define RID_WIDETILDEX (RID_APP_START + 1723) -#define RID_WIDEVECX (RID_APP_START + 1724) - -#define RID_LRPARENTX (RID_APP_START + 1801) -#define RID_LRBRACKETX (RID_APP_START + 1802) -#define RID_LRANGLEX (RID_APP_START + 1803) -#define RID_LRBRACEX (RID_APP_START + 1804) -#define RID_LRLINEX (RID_APP_START + 1805) -#define RID_LRDLINEX (RID_APP_START + 1806) -#define RID_LRGROUPX (RID_APP_START + 1808) -#define RID_SLRPARENTX (RID_APP_START + 1809) -#define RID_SLRBRACKETX (RID_APP_START + 1810) -#define RID_SLRANGLEX (RID_APP_START + 1811) -#define RID_SLRBRACEX (RID_APP_START + 1812) -#define RID_SLRLINEX (RID_APP_START + 1813) -#define RID_SLRDLINEX (RID_APP_START + 1814) -#define RID_LRCEILX (RID_APP_START + 1817) -#define RID_LRFLOORX (RID_APP_START + 1818) -#define RID_SLRCEILX (RID_APP_START + 1819) -#define RID_SLRFLOORX (RID_APP_START + 1820) -#define RID_LMRANGLEXY (RID_APP_START + 1821) -#define RID_SLMRANGLEXY (RID_APP_START + 1822) -#define RID_LRDBRACKETX (RID_APP_START + 1823) -#define RID_SLRDBRACKETX (RID_APP_START + 1824) -#define RID_XOVERBRACEY (RID_APP_START + 1825) -#define RID_XUNDERBRACEY (RID_APP_START + 1826) - -#define RID_NEWLINE (RID_APP_START + 1901) -#define RID_SBLANK (RID_APP_START + 1902) -#define RID_BLANK (RID_APP_START + 1903) -#define RID_RSUBX (RID_APP_START + 1904) -#define RID_BINOMXY (RID_APP_START + 1905) -#define RID_STACK (RID_APP_START + 1906) -#define RID_MATRIX (RID_APP_START + 1907) -#define RID_RSUPX (RID_APP_START + 1908) -#define RID_ALIGNLX (RID_APP_START + 1909) -#define RID_ALIGNCX (RID_APP_START + 1910) -#define RID_ALIGNRX (RID_APP_START + 1911) -#define RID_LSUBX (RID_APP_START + 1912) -#define RID_LSUPX (RID_APP_START + 1916) -#define RID_CSUBX (RID_APP_START + 1917) -#define RID_CSUPX (RID_APP_START + 1918) -#define RID_NOSPACE (RID_APP_START + 1919) - -#define RID_ALEPH (RID_APP_START + 2001) -#define RID_EMPTYSET (RID_APP_START + 2002) -#define RID_RE (RID_APP_START + 2003) -#define RID_IM (RID_APP_START + 2004) -#define RID_INFINITY (RID_APP_START + 2005) -#define RID_PARTIAL (RID_APP_START + 2006) -#define RID_WP (RID_APP_START + 2007) -#define RID_DOTSAXIS (RID_APP_START + 2008) -#define RID_DOTSUP (RID_APP_START + 2009) -#define RID_DOTSDOWN (RID_APP_START + 2010) -#define RID_DOTSLOW (RID_APP_START + 2011) -#define RID_DOTSVERT (RID_APP_START + 2012) -#define RID_NABLA (RID_APP_START + 2013) -#define RID_HBAR (RID_APP_START + 2014) -#define RID_LAMBDABAR (RID_APP_START + 2015) -#define RID_LEFTARROW (RID_APP_START + 2016) -#define RID_RIGHTARROW (RID_APP_START + 2017) -#define RID_UPARROW (RID_APP_START + 2018) -#define RID_DOWNARROW (RID_APP_START + 2019) -#define RID_EXISTS (RID_APP_START + 1608) -#define RID_FORALL (RID_APP_START + 1612) +#define RID_PLUSX (RID_APP_START + 1201) +#define RID_MINUSX (RID_APP_START + 1202) +#define RID_PLUSMINUSX (RID_APP_START + 1203) +#define RID_MINUSPLUSX (RID_APP_START + 1204) +#define RID_XPLUSY (RID_APP_START + 1205) +#define RID_XCDOTY (RID_APP_START + 1206) +#define RID_XTIMESY (RID_APP_START + 1207) +#define RID_XSYMTIMESY (RID_APP_START + 1208) +#define RID_XMINUSY (RID_APP_START + 1209) +#define RID_XOVERY (RID_APP_START + 1210) +#define RID_XDIVY (RID_APP_START + 1211) +#define RID_XSYMDIVIDEY (RID_APP_START + 1212) +#define RID_NEGX (RID_APP_START + 1213) +#define RID_XANDY (RID_APP_START + 1214) +#define RID_XORY (RID_APP_START + 1215) +#define RID_XODIVIDEY (RID_APP_START + 1216) +#define RID_XODOTY (RID_APP_START + 1217) +#define RID_XOMINUSY (RID_APP_START + 1218) +#define RID_XOPLUSY (RID_APP_START + 1219) +#define RID_XOTIMESY (RID_APP_START + 1220) +#define RID_XCIRCY (RID_APP_START + 1221) +#define RID_XWIDESLASHY (RID_APP_START + 1222) +#define RID_XWIDEBSLASHY (RID_APP_START + 1223) + +#define RID_XEQY (RID_APP_START + 1301) +#define RID_XNEQY (RID_APP_START + 1302) +#define RID_XEQUIVY (RID_APP_START + 1303) +#define RID_XORTHOY (RID_APP_START + 1304) +#define RID_XLTY (RID_APP_START + 1305) +#define RID_XGTY (RID_APP_START + 1306) +#define RID_XAPPROXY (RID_APP_START + 1307) +#define RID_XPARALLELY (RID_APP_START + 1308) +#define RID_XLESLANTY (RID_APP_START + 1309) +#define RID_XGESLANTY (RID_APP_START + 1310) +#define RID_XSIMEQY (RID_APP_START + 1311) +#define RID_XPROPY (RID_APP_START + 1312) +#define RID_XLEY (RID_APP_START + 1313) +#define RID_XGEY (RID_APP_START + 1314) +#define RID_XSIMY (RID_APP_START + 1315) +#define RID_XTOWARDY (RID_APP_START + 1316) +#define RID_XLLY (RID_APP_START + 1317) +#define RID_XGGY (RID_APP_START + 1318) +#define RID_XDEFY (RID_APP_START + 1319) +#define RID_XTRANSLY (RID_APP_START + 1320) +#define RID_XTRANSRY (RID_APP_START + 1321) +#define RID_XDIVIDESY (RID_APP_START + 1322) +#define RID_XNDIVIDESY (RID_APP_START + 1323) +#define RID_DLARROW (RID_APP_START + 1324) +#define RID_DLRARROW (RID_APP_START + 1325) +#define RID_DRARROW (RID_APP_START + 1326) + +#define RID_XINY (RID_APP_START + 1401) +#define RID_XNOTINY (RID_APP_START + 1402) +#define RID_XOWNSY (RID_APP_START + 1403) +#define RID_XINTERSECTIONY (RID_APP_START + 1405) +#define RID_XUNIONY (RID_APP_START + 1406) +#define RID_XSETMINUSY (RID_APP_START + 1407) +#define RID_XSLASHY (RID_APP_START + 1408) +#define RID_XSUBSETY (RID_APP_START + 1409) +#define RID_XSUBSETEQY (RID_APP_START + 1410) +#define RID_XSUPSETY (RID_APP_START + 1411) +#define RID_XSUPSETEQY (RID_APP_START + 1412) +#define RID_XNSUBSETY (RID_APP_START + 1413) +#define RID_XNSUBSETEQY (RID_APP_START + 1414) +#define RID_XNSUPSETY (RID_APP_START + 1415) +#define RID_XNSUPSETEQY (RID_APP_START + 1416) +#define RID_SETN (RID_APP_START + 1417) +#define RID_SETZ (RID_APP_START + 1418) +#define RID_SETQ (RID_APP_START + 1419) +#define RID_SETR (RID_APP_START + 1420) +#define RID_SETC (RID_APP_START + 1421) + +#define RID_ABSX (RID_APP_START + 1501) +#define RID_FACTX (RID_APP_START + 1502) +#define RID_SQRTX (RID_APP_START + 1503) +#define RID_NROOTXY (RID_APP_START + 1504) +#define RID_EX (RID_APP_START + 1505) +#define RID_LNX (RID_APP_START + 1506) +#define RID_EXPX (RID_APP_START + 1507) +#define RID_LOGX (RID_APP_START + 1508) +#define RID_SINX (RID_APP_START + 1509) +#define RID_COSX (RID_APP_START + 1510) +#define RID_TANX (RID_APP_START + 1511) +#define RID_COTX (RID_APP_START + 1512) +#define RID_SINHX (RID_APP_START + 1513) +#define RID_COSHX (RID_APP_START + 1514) +#define RID_TANHX (RID_APP_START + 1515) +#define RID_COTHX (RID_APP_START + 1516) +#define RID_ARCSINX (RID_APP_START + 1517) +#define RID_ARCCOSX (RID_APP_START + 1518) +#define RID_ARCTANX (RID_APP_START + 1519) +#define RID_ARCCOTX (RID_APP_START + 1520) +#define RID_ARSINHX (RID_APP_START + 1521) +#define RID_ARCOSHX (RID_APP_START + 1522) +#define RID_ARTANHX (RID_APP_START + 1523) +#define RID_ARCOTHX (RID_APP_START + 1524) + +#define RID_LIMX (RID_APP_START + 1601) +#define RID_SUMX (RID_APP_START + 1602) +#define RID_PRODX (RID_APP_START + 1603) +#define RID_COPRODX (RID_APP_START + 1604) +#define RID_INTX (RID_APP_START + 1605) +#define RID_IINTX (RID_APP_START + 1606) +#define RID_IIINTX (RID_APP_START + 1607) +#define RID_LINTX (RID_APP_START + 1609) +#define RID_LLINTX (RID_APP_START + 1610) +#define RID_LLLINTX (RID_APP_START + 1611) +#define RID_FROMXTOY (RID_APP_START + 1613) +#define RID_FROMX (RID_APP_START + 1614) +#define RID_TOX (RID_APP_START + 1615) +#define RID_LIMINFX (RID_APP_START + 1616) +#define RID_LIMSUPX (RID_APP_START + 1617) + +#define RID_ACUTEX (RID_APP_START + 1701) +#define RID_GRAVEX (RID_APP_START + 1702) +#define RID_CHECKX (RID_APP_START + 1703) +#define RID_BREVEX (RID_APP_START + 1704) +#define RID_BARX (RID_APP_START + 1705) +#define RID_VECX (RID_APP_START + 1706) +#define RID_HATX (RID_APP_START + 1707) +#define RID_TILDEX (RID_APP_START + 1708) +#define RID_CIRCLEX (RID_APP_START + 1709) +#define RID_DOTX (RID_APP_START + 1710) +#define RID_DDOTX (RID_APP_START + 1711) +#define RID_DDDOTX (RID_APP_START + 1712) +#define RID_OVERLINEX (RID_APP_START + 1713) +#define RID_UNDERLINEX (RID_APP_START + 1714) +#define RID_OVERSTRIKEX (RID_APP_START + 1715) +#define RID_PHANTOMX (RID_APP_START + 1716) +#define RID_BOLDX (RID_APP_START + 1717) +#define RID_ITALX (RID_APP_START + 1718) +#define RID_SIZEXY (RID_APP_START + 1719) +#define RID_FONTXY (RID_APP_START + 1720) +#define RID_COLORX (RID_APP_START + 1721) +#define RID_WIDEHATX (RID_APP_START + 1722) +#define RID_WIDETILDEX (RID_APP_START + 1723) +#define RID_WIDEVECX (RID_APP_START + 1724) + +#define RID_LRPARENTX (RID_APP_START + 1801) +#define RID_LRBRACKETX (RID_APP_START + 1802) +#define RID_LRANGLEX (RID_APP_START + 1803) +#define RID_LRBRACEX (RID_APP_START + 1804) +#define RID_LRLINEX (RID_APP_START + 1805) +#define RID_LRDLINEX (RID_APP_START + 1806) +#define RID_LRGROUPX (RID_APP_START + 1808) +#define RID_SLRPARENTX (RID_APP_START + 1809) +#define RID_SLRBRACKETX (RID_APP_START + 1810) +#define RID_SLRANGLEX (RID_APP_START + 1811) +#define RID_SLRBRACEX (RID_APP_START + 1812) +#define RID_SLRLINEX (RID_APP_START + 1813) +#define RID_SLRDLINEX (RID_APP_START + 1814) +#define RID_LRCEILX (RID_APP_START + 1817) +#define RID_LRFLOORX (RID_APP_START + 1818) +#define RID_SLRCEILX (RID_APP_START + 1819) +#define RID_SLRFLOORX (RID_APP_START + 1820) +#define RID_LMRANGLEXY (RID_APP_START + 1821) +#define RID_SLMRANGLEXY (RID_APP_START + 1822) +#define RID_LRDBRACKETX (RID_APP_START + 1823) +#define RID_SLRDBRACKETX (RID_APP_START + 1824) +#define RID_XOVERBRACEY (RID_APP_START + 1825) +#define RID_XUNDERBRACEY (RID_APP_START + 1826) + +#define RID_NEWLINE (RID_APP_START + 1901) +#define RID_SBLANK (RID_APP_START + 1902) +#define RID_BLANK (RID_APP_START + 1903) +#define RID_RSUBX (RID_APP_START + 1904) +#define RID_BINOMXY (RID_APP_START + 1905) +#define RID_STACK (RID_APP_START + 1906) +#define RID_MATRIX (RID_APP_START + 1907) +#define RID_RSUPX (RID_APP_START + 1908) +#define RID_ALIGNLX (RID_APP_START + 1909) +#define RID_ALIGNCX (RID_APP_START + 1910) +#define RID_ALIGNRX (RID_APP_START + 1911) +#define RID_LSUBX (RID_APP_START + 1912) +#define RID_LSUPX (RID_APP_START + 1916) +#define RID_CSUBX (RID_APP_START + 1917) +#define RID_CSUPX (RID_APP_START + 1918) +#define RID_NOSPACE (RID_APP_START + 1919) + +#define RID_ALEPH (RID_APP_START + 2001) +#define RID_EMPTYSET (RID_APP_START + 2002) +#define RID_RE (RID_APP_START + 2003) +#define RID_IM (RID_APP_START + 2004) +#define RID_INFINITY (RID_APP_START + 2005) +#define RID_PARTIAL (RID_APP_START + 2006) +#define RID_WP (RID_APP_START + 2007) +#define RID_DOTSAXIS (RID_APP_START + 2008) +#define RID_DOTSUP (RID_APP_START + 2009) +#define RID_DOTSDOWN (RID_APP_START + 2010) +#define RID_DOTSLOW (RID_APP_START + 2011) +#define RID_DOTSVERT (RID_APP_START + 2012) +#define RID_NABLA (RID_APP_START + 2013) +#define RID_HBAR (RID_APP_START + 2014) +#define RID_LAMBDABAR (RID_APP_START + 2015) +#define RID_LEFTARROW (RID_APP_START + 2016) +#define RID_RIGHTARROW (RID_APP_START + 2017) +#define RID_UPARROW (RID_APP_START + 2018) +#define RID_DOWNARROW (RID_APP_START + 2019) +#define RID_EXISTS (RID_APP_START + 1608) +#define RID_FORALL (RID_APP_START + 1612) // new menue resource ID's -#define RID_UNBINOPS_MENU (RID_APP_START + 2164) -#define RID_RELATIONS_MENU (RID_APP_START + 2165) -#define RID_SETOPERATIONS_MENU (RID_APP_START + 2166) -#define RID_FUNCTIONS_MENU (RID_APP_START + 2167) -#define RID_OPERATORS_MENU (RID_APP_START + 2168) -#define RID_ATTRIBUTES_MENU (RID_APP_START + 2169) -#define RID_BRACKETS_MENU (RID_APP_START + 2170) -#define RID_FORMAT_MENU (RID_APP_START + 2171) -#define RID_MISC_MENU (RID_APP_START + 2172) -#define RID_FUNCTIONSOTHER1_MENU (RID_APP_START + 2173) - -#define RID_XPP_LINE (RID_APP_START + 3000) -#define RID_XPP_DLINE (RID_APP_START + 3001) -#define RID_XPP_SQRT (RID_APP_START + 3002) -#define RID_XPP_SQRT2 (RID_APP_START + 3003) -#define RID_XPP_HAT (RID_APP_START + 3004) -#define RID_XPP_TILDE (RID_APP_START + 3005) -#define RID_XPP_BAR (RID_APP_START + 3006) -#define RID_XPP_VEC (RID_APP_START + 3007) -#define RID_XPP_LBRACE (RID_APP_START + 3008) -#define RID_XPP_RBRACE (RID_APP_START + 3009) -#define RID_XPP_LPARENT (RID_APP_START + 3010) -#define RID_XPP_RPARENT (RID_APP_START + 3011) -#define RID_XPP_LANGLE (RID_APP_START + 3012) -#define RID_XPP_RANGLE (RID_APP_START + 3013) -#define RID_XPP_LBRACKET (RID_APP_START + 3014) -#define RID_XPP_RBRACKET (RID_APP_START + 3015) -#define RID_XPP_LDBRACKET (RID_APP_START + 3016) -#define RID_XPP_RDBRACKET (RID_APP_START + 3017) -#define RID_XPP_LCEIL (RID_APP_START + 3018) -#define RID_XPP_RCEIL (RID_APP_START + 3019) -#define RID_XPP_LFLOOR (RID_APP_START + 3020) -#define RID_XPP_RFLOOR (RID_APP_START + 3021) -#define RID_XPP_OVERBRACE (RID_APP_START + 3022) -#define RID_XPP_UNDERBRACE (RID_APP_START + 3023) +#define RID_UNBINOPS_MENU (RID_APP_START + 2164) +#define RID_RELATIONS_MENU (RID_APP_START + 2165) +#define RID_SETOPERATIONS_MENU (RID_APP_START + 2166) +#define RID_FUNCTIONS_MENU (RID_APP_START + 2167) +#define RID_OPERATORS_MENU (RID_APP_START + 2168) +#define RID_ATTRIBUTES_MENU (RID_APP_START + 2169) +#define RID_BRACKETS_MENU (RID_APP_START + 2170) +#define RID_FORMAT_MENU (RID_APP_START + 2171) +#define RID_MISC_MENU (RID_APP_START + 2172) +#define RID_FUNCTIONSOTHER1_MENU (RID_APP_START + 2173) + +#define RID_XPP_LINE (RID_APP_START + 3000) +#define RID_XPP_DLINE (RID_APP_START + 3001) +#define RID_XPP_SQRT (RID_APP_START + 3002) +#define RID_XPP_SQRT2 (RID_APP_START + 3003) +#define RID_XPP_HAT (RID_APP_START + 3004) +#define RID_XPP_TILDE (RID_APP_START + 3005) +#define RID_XPP_BAR (RID_APP_START + 3006) +#define RID_XPP_VEC (RID_APP_START + 3007) +#define RID_XPP_LBRACE (RID_APP_START + 3008) +#define RID_XPP_RBRACE (RID_APP_START + 3009) +#define RID_XPP_LPARENT (RID_APP_START + 3010) +#define RID_XPP_RPARENT (RID_APP_START + 3011) +#define RID_XPP_LANGLE (RID_APP_START + 3012) +#define RID_XPP_RANGLE (RID_APP_START + 3013) +#define RID_XPP_LBRACKET (RID_APP_START + 3014) +#define RID_XPP_RBRACKET (RID_APP_START + 3015) +#define RID_XPP_LDBRACKET (RID_APP_START + 3016) +#define RID_XPP_RDBRACKET (RID_APP_START + 3017) +#define RID_XPP_LCEIL (RID_APP_START + 3018) +#define RID_XPP_RCEIL (RID_APP_START + 3019) +#define RID_XPP_LFLOOR (RID_APP_START + 3020) +#define RID_XPP_RFLOOR (RID_APP_START + 3021) +#define RID_XPP_OVERBRACE (RID_APP_START + 3022) +#define RID_XPP_UNDERBRACE (RID_APP_START + 3023) #define RID_LOCALIZED_NAMES (RID_APP_START + 3101) -#define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102) +#define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102) #define RID_EXPORT_SYMBOL_NAMES (RID_APP_START + 3103) #define RID_LOCALIZED_SYMBOLSET_NAMES (RID_APP_START + 3104) #define RID_UI_SYMBOLSET_NAMES (RID_APP_START + 3105) @@ -459,301 +459,301 @@ #define MN_SUB_SENDTO (RID_APP_START + 3120) -#define HID_SMA_OPTIONSDIALOG (HID_SMA_START + 1) -#define HID_SMA_FONTDIALOG (HID_SMA_START + 2) -#define HID_SMA_FONTSIZEDIALOG (HID_SMA_START + 3) -#define HID_SMA_FONTTYPEDIALOG (HID_SMA_START + 4) -#define HID_SMA_DISTANCEDIALOG (HID_SMA_START + 5) -#define HID_SMA_ALIGNDIALOG (HID_SMA_START + 6) -#define HID_SMA_PRINTOPTIONPAGE (HID_SMA_START + 7) -#define HID_SMA_SYMBOLDIALOG (HID_SMA_START + 8) -#define HID_SMA_SYMDEFINEDIALOG (HID_SMA_START + 9) -#define HID_SMA_EXTRAOPTIONPAGE (HID_SMA_START + 10) -#define HID_SMA_DOCSAVEQUERY (HID_SMA_START + 11) -#define HID_SMA_OBJECTSAVEQUERY (HID_SMA_START + 12) -#define HID_SMA_DEFAULTSAVEQUERY (HID_SMA_START + 13) -#define HID_SMA_ILLEGALOBJECTERROR (HID_SMA_START + 14) -#define HID_SMA_ILLEGALFILEERROR (HID_SMA_START + 15) -#define HID_SMA_WRITESYMBOLERROR (HID_SMA_START + 16) -#define HID_SMA_READSYMBOLERROR (HID_SMA_START + 17) -#define HID_SMA_NOMATHTYPEFACEWARNING (HID_SMA_START + 18) -#define HID_SMA_OBJECTNAME (HID_SMA_START + 19) -#define HID_SMA_VIEWNAME (HID_SMA_START + 20) -#define HID_SMA_UNDOEDITNAME (HID_SMA_START + 21) -#define HID_SMA_UNDOFORMATNAME (HID_SMA_START + 22) -#define HID_SMA_APPICO (HID_SMA_START + 23) -#define HID_SMA_DOCICO (HID_SMA_START + 24) -#define HID_SMA_TMPICO (HID_SMA_START + 25) -#define HID_SMA_COMMANDMENU (HID_SMA_START + 26) -#define HID_SMA_VIEWMENU (HID_SMA_START + 27) -#define HID_SMA_DISTANCEMENU (HID_SMA_START + 28) -#define HID_SMA_FONTMENU (HID_SMA_START + 29) -#define HID_SMA_STARTUPWINDOW (HID_SMA_START + 30) -#define HID_SMA_TOOLBOXWINDOW (HID_SMA_START + 31) -#define HID_SMA_CMDBOXWINDOW (HID_SMA_START + 32) -#define HID_SMA_UPDATEOBJECT (HID_SMA_START + 33) -#define HID_SMA_FONTREGULAR (HID_SMA_START + 34) -#define HID_SMA_FONTITALIC (HID_SMA_START + 35) -#define HID_SMA_FONTBOLD (HID_SMA_START + 36) -#define HID_SMA_PRINTOPTION (HID_SMA_START + 37) -#define HID_SMA_DOCUMENTSTR (HID_SMA_START + 38) -#define HID_SMA_SYMBOLFILESSTR (HID_SMA_START + 39) -#define HID_SMA_ALLFILESSTR (HID_SMA_START + 40) -#define HID_SMA_CREATORSTR (HID_SMA_START + 41) -#define HID_SMA_FILESMFTYP (HID_SMA_START + 42) -#define HID_SMA_FILESYMTYP (HID_SMA_START + 43) -#define HID_SMA_WIN_DOCUMENT (HID_SMA_START + 44) -#define HID_SMA_COMMAND_WIN_EDIT (HID_SMA_START + 45) - -#define HID_SMA_PLUSX (HID_SMA_START + 50) -#define HID_SMA_MINUSX (HID_SMA_START + 51) -#define HID_SMA_PLUSMINUSX (HID_SMA_START + 52) -#define HID_SMA_MINUSPLUSX (HID_SMA_START + 53) -#define HID_SMA_NEGX (HID_SMA_START + 54) -#define HID_SMA_XPLUSY (HID_SMA_START + 55) -#define HID_SMA_XMINUSY (HID_SMA_START + 56) -#define HID_SMA_XCDOTY (HID_SMA_START + 57) -#define HID_SMA_XTIMESY (HID_SMA_START + 58) -#define HID_SMA_XSYMTIMESY (HID_SMA_START + 59) -#define HID_SMA_XSYMDIVIDEY (HID_SMA_START + 60) -#define HID_SMA_XDIVY (HID_SMA_START + 61) -#define HID_SMA_XOVERY (HID_SMA_START + 62) -#define HID_SMA_XODIVIDEY (HID_SMA_START + 63) -#define HID_SMA_XODOTY (HID_SMA_START + 64) -#define HID_SMA_XOMINUSY (HID_SMA_START + 65) -#define HID_SMA_XOPLUSY (HID_SMA_START + 66) -#define HID_SMA_XOTIMESY (HID_SMA_START + 67) -#define HID_SMA_XANDY (HID_SMA_START + 68) -#define HID_SMA_XORY (HID_SMA_START + 69) -#define HID_SMA_XEQY (HID_SMA_START + 70) -#define HID_SMA_XNEQY (HID_SMA_START + 71) -#define HID_SMA_XLTY (HID_SMA_START + 72) -#define HID_SMA_XGTY (HID_SMA_START + 73) -#define HID_SMA_XLEY (HID_SMA_START + 74) -#define HID_SMA_XGEY (HID_SMA_START + 75) -#define HID_SMA_XLESLANTY (HID_SMA_START + 76) -#define HID_SMA_XGESLANTY (HID_SMA_START + 77) -#define HID_SMA_XLLY (HID_SMA_START + 78) -#define HID_SMA_XGGY (HID_SMA_START + 79) -#define HID_SMA_XDEFY (HID_SMA_START + 80) -#define HID_SMA_XEQUIVY (HID_SMA_START + 81) -#define HID_SMA_XAPPROXY (HID_SMA_START + 82) -#define HID_SMA_XSIMY (HID_SMA_START + 83) -#define HID_SMA_XSIMEQY (HID_SMA_START + 84) -#define HID_SMA_XPROPY (HID_SMA_START + 85) -#define HID_SMA_XORTHOY (HID_SMA_START + 86) -#define HID_SMA_XPARALLELY (HID_SMA_START + 87) -#define HID_SMA_XTOWARDY (HID_SMA_START + 88) -#define HID_SMA_XTRANSLY (HID_SMA_START + 89) -#define HID_SMA_XTRANSRY (HID_SMA_START + 90) -#define HID_SMA_XINY (HID_SMA_START + 91) -#define HID_SMA_XNOTINY (HID_SMA_START + 92) -#define HID_SMA_XOWNSY (HID_SMA_START + 93) -#define HID_SMA_XUNIONY (HID_SMA_START + 94) -#define HID_SMA_XINTERSECTIONY (HID_SMA_START + 95) -#define HID_SMA_XSETMINUSY (HID_SMA_START + 96) -#define HID_SMA_XSLASHY (HID_SMA_START + 97) -#define HID_SMA_XSUBSETY (HID_SMA_START + 98) -#define HID_SMA_XSUBSETEQY (HID_SMA_START + 99) -#define HID_SMA_XSUPSETY (HID_SMA_START + 100) -#define HID_SMA_XSUPSETEQY (HID_SMA_START + 101) -#define HID_SMA_XNSUBSETY (HID_SMA_START + 102) -#define HID_SMA_XNSUBSETEQY (HID_SMA_START + 103) -#define HID_SMA_XNSUPSETY (HID_SMA_START + 104) -#define HID_SMA_XNSUPSETEQY (HID_SMA_START + 105) -#define HID_SMA_ABSX (HID_SMA_START + 106) -#define HID_SMA_FACTX (HID_SMA_START + 107) -#define HID_SMA_SQRTX (HID_SMA_START + 108) -#define HID_SMA_NROOTXY (HID_SMA_START + 109) -#define HID_SMA_EX (HID_SMA_START + 110) -#define HID_SMA_EXPX (HID_SMA_START + 111) -#define HID_SMA_LNX (HID_SMA_START + 112) -#define HID_SMA_LOGX (HID_SMA_START + 113) -#define HID_SMA_SINX (HID_SMA_START + 114) -#define HID_SMA_COSX (HID_SMA_START + 115) -#define HID_SMA_TANX (HID_SMA_START + 116) -#define HID_SMA_COTX (HID_SMA_START + 117) -#define HID_SMA_ARCSINX (HID_SMA_START + 118) -#define HID_SMA_ARCCOSX (HID_SMA_START + 119) -#define HID_SMA_ARCTANX (HID_SMA_START + 120) -#define HID_SMA_ARCCOTX (HID_SMA_START + 121) -#define HID_SMA_SINHX (HID_SMA_START + 122) -#define HID_SMA_COSHX (HID_SMA_START + 123) -#define HID_SMA_TANHX (HID_SMA_START + 124) -#define HID_SMA_COTHX (HID_SMA_START + 125) -#define HID_SMA_ARSINHX (HID_SMA_START + 126) -#define HID_SMA_ARCOSHX (HID_SMA_START + 127) -#define HID_SMA_ARTANHX (HID_SMA_START + 128) -#define HID_SMA_ARCOTHX (HID_SMA_START + 129) -#define HID_SMA_SUMX (HID_SMA_START + 130) -#define HID_SMA_PRODX (HID_SMA_START + 131) -#define HID_SMA_COPRODX (HID_SMA_START + 132) -#define HID_SMA_LIMX (HID_SMA_START + 133) -#define HID_SMA_LIMINFX (HID_SMA_START + 134) -#define HID_SMA_LIMSUPX (HID_SMA_START + 135) -#define HID_SMA_EXISTS (HID_SMA_START + 136) -#define HID_SMA_FORALL (HID_SMA_START + 137) -#define HID_SMA_NABLA (HID_SMA_START + 138) -#define HID_SMA_INTX (HID_SMA_START + 139) -#define HID_SMA_IINTX (HID_SMA_START + 140) -#define HID_SMA_IIINTX (HID_SMA_START + 141) -#define HID_SMA_LINTX (HID_SMA_START + 142) -#define HID_SMA_LLINTX (HID_SMA_START + 143) -#define HID_SMA_LLLINTX (HID_SMA_START + 144) -#define HID_SMA_FROMX (HID_SMA_START + 145) -#define HID_SMA_TOX (HID_SMA_START + 146) -#define HID_SMA_FROMXTOY (HID_SMA_START + 147) -#define HID_SMA_XCIRCY (HID_SMA_START + 148) -#define HID_SMA_XDIVIDESY (HID_SMA_START + 149) -#define HID_SMA_XNDIVIDESY (HID_SMA_START + 150) -#define HID_SMA_DLARROW (HID_SMA_START + 151) -#define HID_SMA_DLRARROW (HID_SMA_START + 152) -#define HID_SMA_DRARROW (HID_SMA_START + 153) - -#define HID_SMA_MISC_CAT (HID_SMA_START + 154) -#define HID_SMA_UNBINOPS_CAT (HID_SMA_START + 155) -#define HID_SMA_RELATIONS_CAT (HID_SMA_START + 156) -#define HID_SMA_SETOPERATIONS_CAT (HID_SMA_START + 157) -#define HID_SMA_FUNCTIONS_CAT (HID_SMA_START + 158) -#define HID_SMA_OPERATORS_CAT (HID_SMA_START + 159) -#define HID_SMA_ATTRIBUTES_CAT (HID_SMA_START + 160) -#define HID_SMA_BRACKETS_CAT (HID_SMA_START + 161) -#define HID_SMA_FORMAT_CAT (HID_SMA_START + 162) - -#define HID_SMA_OPERATOR_WIN (HID_SMA_START + 163) -#define HID_SMA_UNBINOPS_TBX (HID_SMA_START + 164) -#define HID_SMA_RELATIONS_TBX (HID_SMA_START + 165) -#define HID_SMA_SETOPERATIONS_TBX (HID_SMA_START + 166) -#define HID_SMA_FUNCTIONS_TBX (HID_SMA_START + 167) -#define HID_SMA_OPERATORS_TBX (HID_SMA_START + 168) -#define HID_SMA_ATTRIBUTES_TBX (HID_SMA_START + 169) -#define HID_SMA_BRACKETS_TBX (HID_SMA_START + 170) -#define HID_SMA_FORMAT_TBX (HID_SMA_START + 171) -#define HID_SMA_SELECTION_TBX (HID_SMA_START + 172) -#define HID_SMA_COMMAND_WIN (HID_SMA_START + 173) -#define HID_SMA_MISC_MENU (HID_SMA_START + 174) -#define HID_SMA_FUNCTIONSOTHER1_MENU (HID_SMA_START + 175) - -#define HID_SMA_ACUTEX (HID_SMA_START + 180) -#define HID_SMA_BARX (HID_SMA_START + 181) -#define HID_SMA_BREVEX (HID_SMA_START + 182) -#define HID_SMA_CHECKX (HID_SMA_START + 183) -#define HID_SMA_CIRCLEX (HID_SMA_START + 184) -#define HID_SMA_DOTX (HID_SMA_START + 185) -#define HID_SMA_DDOTX (HID_SMA_START + 186) -#define HID_SMA_DDDOTX (HID_SMA_START + 187) -#define HID_SMA_GRAVEX (HID_SMA_START + 188) -#define HID_SMA_HATX (HID_SMA_START + 189) -#define HID_SMA_TILDEX (HID_SMA_START + 190) -#define HID_SMA_VECX (HID_SMA_START + 191) -#define HID_SMA_UNDERLINEX (HID_SMA_START + 192) -#define HID_SMA_OVERLINEX (HID_SMA_START + 193) -#define HID_SMA_OVERSTRIKEX (HID_SMA_START + 194) -#define HID_SMA_PHANTOMX (HID_SMA_START + 195) -#define HID_SMA_BOLDX (HID_SMA_START + 196) -#define HID_SMA_ITALX (HID_SMA_START + 197) -#define HID_SMA_SIZEXY (HID_SMA_START + 198) -#define HID_SMA_FONTXY (HID_SMA_START + 199) -#define HID_SMA_COLORX (HID_SMA_START + 200) -#define HID_SMA_LRGROUPX (HID_SMA_START + 201) -#define HID_SMA_LRPARENTX (HID_SMA_START + 202) -#define HID_SMA_LRBRACKETX (HID_SMA_START + 203) -#define HID_SMA_LRBRACEX (HID_SMA_START + 204) -#define HID_SMA_LRANGLEX (HID_SMA_START + 205) -#define HID_SMA_LRCEILX (HID_SMA_START + 206) -#define HID_SMA_LRFLOORX (HID_SMA_START + 207) -#define HID_SMA_LRLINEX (HID_SMA_START + 208) -#define HID_SMA_LRDLINEX (HID_SMA_START + 209) -#define HID_SMA_SLRPARENTX (HID_SMA_START + 210) -#define HID_SMA_SLRBRACKETX (HID_SMA_START + 211) -#define HID_SMA_SLRBRACEX (HID_SMA_START + 212) -#define HID_SMA_SLRANGLEX (HID_SMA_START + 213) -#define HID_SMA_SLRCEILX (HID_SMA_START + 214) -#define HID_SMA_SLRFLOORX (HID_SMA_START + 215) -#define HID_SMA_SLRLINEX (HID_SMA_START + 216) -#define HID_SMA_SLRDLINEX (HID_SMA_START + 217) -#define HID_SMA_RSUBX (HID_SMA_START + 218) -#define HID_SMA_RSUPX (HID_SMA_START + 219) -#define HID_SMA_LSUBX (HID_SMA_START + 220) -#define HID_SMA_LSUPX (HID_SMA_START + 221) -#define HID_SMA_SBLANK (HID_SMA_START + 222) -#define HID_SMA_BLANK (HID_SMA_START + 223) -#define HID_SMA_NEWLINE (HID_SMA_START + 224) -#define HID_SMA_BINOMXY (HID_SMA_START + 225) -#define HID_SMA_STACK (HID_SMA_START + 226) -#define HID_SMA_MATRIX (HID_SMA_START + 227) -#define HID_SMA_ALIGNLX (HID_SMA_START + 228) -#define HID_SMA_ALIGNCX (HID_SMA_START + 229) -#define HID_SMA_ALIGNRX (HID_SMA_START + 230) -#define HID_SMA_ALEPH (HID_SMA_START + 231) -#define HID_SMA_EMPTYSET (HID_SMA_START + 232) -#define HID_SMA_RE (HID_SMA_START + 233) -#define HID_SMA_IM (HID_SMA_START + 234) -#define HID_SMA_INFINITY (HID_SMA_START + 235) -#define HID_SMA_PARTIAL (HID_SMA_START + 236) -#define HID_SMA_WP (HID_SMA_START + 237) -#define HID_SMA_DOTSAXIS (HID_SMA_START + 238) -#define HID_SMA_DOTSUP (HID_SMA_START + 239) -#define HID_SMA_DOTSDOWN (HID_SMA_START + 240) -#define HID_SMA_DOTSLOW (HID_SMA_START + 241) -#define HID_SMA_DOTSVERT (HID_SMA_START + 242) -#define HID_SMA_NOSPACE (HID_SMA_START + 243) - -#define HID_SMA_SETN (HID_SMA2_START + 1) -#define HID_SMA_SETZ (HID_SMA2_START + 2) -#define HID_SMA_SETQ (HID_SMA2_START + 3) -#define HID_SMA_SETR (HID_SMA2_START + 4) -#define HID_SMA_SETC (HID_SMA2_START + 5) -#define HID_SMA_WIDEHATX (HID_SMA2_START + 6) -#define HID_SMA_WIDETILDEX (HID_SMA2_START + 7) -#define HID_SMA_WIDEVECX (HID_SMA2_START + 8) -#define HID_SMA_CSUBX (HID_SMA2_START + 9) -#define HID_SMA_CSUPX (HID_SMA2_START + 10) -#define HID_SMA_HBAR (HID_SMA2_START + 11) -#define HID_SMA_LAMBDABAR (HID_SMA2_START + 12) -#define HID_SMA_LEFTARROW (HID_SMA2_START + 13) -#define HID_SMA_RIGHTARROW (HID_SMA2_START + 14) -#define HID_SMA_UPARROW (HID_SMA2_START + 15) -#define HID_SMA_DOWNARROW (HID_SMA2_START + 16) - -#define HID_SMA_DEFAULT_DIST (HID_SMA2_START + 17) -#define HID_SMA_LINE_DIST (HID_SMA2_START + 18) -#define HID_SMA_ROOT_DIST (HID_SMA2_START + 19) -#define HID_SMA_SUP_DIST (HID_SMA2_START + 20) -#define HID_SMA_SUB_DIST (HID_SMA2_START + 21) -#define HID_SMA_NUMERATOR_DIST (HID_SMA2_START + 22) -#define HID_SMA_DENOMINATOR_DIST (HID_SMA2_START + 23) -#define HID_SMA_FRACLINE_EXCWIDTH (HID_SMA2_START + 24) -#define HID_SMA_FRACLINE_LINEWIDTH (HID_SMA2_START + 25) -#define HID_SMA_UPPERLIMIT_DIST (HID_SMA2_START + 26) -#define HID_SMA_LOWERLIMIT_DIST (HID_SMA2_START + 27) -#define HID_SMA_BRACKET_EXCHEIGHT (HID_SMA2_START + 28) -#define HID_SMA_BRACKET_DIST (HID_SMA2_START + 29) -#define HID_SMA_MATRIXROW_DIST (HID_SMA2_START + 30) -#define HID_SMA_MATRIXCOL_DIST (HID_SMA2_START + 31) -#define HID_SMA_ATTRIBUT_DIST (HID_SMA2_START + 32) -#define HID_SMA_INTERATTRIBUT_DIST (HID_SMA2_START + 33) -#define HID_SMA_OPERATOR_EXCHEIGHT (HID_SMA2_START + 34) -#define HID_SMA_OPERATOR_DIST (HID_SMA2_START + 35) -#define HID_SMA_LEFTBORDER_DIST (HID_SMA2_START + 36) -#define HID_SMA_RIGHTBORDER_DIST (HID_SMA2_START + 37) -#define HID_SMA_UPPERBORDER_DIST (HID_SMA2_START + 38) -#define HID_SMA_LOWERBORDER_DIST (HID_SMA2_START + 39) -#define HID_SMA_SCALE_ALL_BRACKETS (HID_SMA2_START + 40) -#define HID_SMA_BRACKET_EXCHEIGHT2 (HID_SMA2_START + 41) -#define HID_SMA_LMRANGLEXY (HID_SMA2_START + 42) -#define HID_SMA_SLMRANGLEXY (HID_SMA2_START + 43) -#define HID_SMA_XWIDESLASHY (HID_SMA2_START + 44) +#define HID_SMA_OPTIONSDIALOG (HID_SMA_START + 1) +#define HID_SMA_FONTDIALOG (HID_SMA_START + 2) +#define HID_SMA_FONTSIZEDIALOG (HID_SMA_START + 3) +#define HID_SMA_FONTTYPEDIALOG (HID_SMA_START + 4) +#define HID_SMA_DISTANCEDIALOG (HID_SMA_START + 5) +#define HID_SMA_ALIGNDIALOG (HID_SMA_START + 6) +#define HID_SMA_PRINTOPTIONPAGE (HID_SMA_START + 7) +#define HID_SMA_SYMBOLDIALOG (HID_SMA_START + 8) +#define HID_SMA_SYMDEFINEDIALOG (HID_SMA_START + 9) +#define HID_SMA_EXTRAOPTIONPAGE (HID_SMA_START + 10) +#define HID_SMA_DOCSAVEQUERY (HID_SMA_START + 11) +#define HID_SMA_OBJECTSAVEQUERY (HID_SMA_START + 12) +#define HID_SMA_DEFAULTSAVEQUERY (HID_SMA_START + 13) +#define HID_SMA_ILLEGALOBJECTERROR (HID_SMA_START + 14) +#define HID_SMA_ILLEGALFILEERROR (HID_SMA_START + 15) +#define HID_SMA_WRITESYMBOLERROR (HID_SMA_START + 16) +#define HID_SMA_READSYMBOLERROR (HID_SMA_START + 17) +#define HID_SMA_NOMATHTYPEFACEWARNING (HID_SMA_START + 18) +#define HID_SMA_OBJECTNAME (HID_SMA_START + 19) +#define HID_SMA_VIEWNAME (HID_SMA_START + 20) +#define HID_SMA_UNDOEDITNAME (HID_SMA_START + 21) +#define HID_SMA_UNDOFORMATNAME (HID_SMA_START + 22) +#define HID_SMA_APPICO (HID_SMA_START + 23) +#define HID_SMA_DOCICO (HID_SMA_START + 24) +#define HID_SMA_TMPICO (HID_SMA_START + 25) +#define HID_SMA_COMMANDMENU (HID_SMA_START + 26) +#define HID_SMA_VIEWMENU (HID_SMA_START + 27) +#define HID_SMA_DISTANCEMENU (HID_SMA_START + 28) +#define HID_SMA_FONTMENU (HID_SMA_START + 29) +#define HID_SMA_STARTUPWINDOW (HID_SMA_START + 30) +#define HID_SMA_TOOLBOXWINDOW (HID_SMA_START + 31) +#define HID_SMA_CMDBOXWINDOW (HID_SMA_START + 32) +#define HID_SMA_UPDATEOBJECT (HID_SMA_START + 33) +#define HID_SMA_FONTREGULAR (HID_SMA_START + 34) +#define HID_SMA_FONTITALIC (HID_SMA_START + 35) +#define HID_SMA_FONTBOLD (HID_SMA_START + 36) +#define HID_SMA_PRINTOPTION (HID_SMA_START + 37) +#define HID_SMA_DOCUMENTSTR (HID_SMA_START + 38) +#define HID_SMA_SYMBOLFILESSTR (HID_SMA_START + 39) +#define HID_SMA_ALLFILESSTR (HID_SMA_START + 40) +#define HID_SMA_CREATORSTR (HID_SMA_START + 41) +#define HID_SMA_FILESMFTYP (HID_SMA_START + 42) +#define HID_SMA_FILESYMTYP (HID_SMA_START + 43) +#define HID_SMA_WIN_DOCUMENT (HID_SMA_START + 44) +#define HID_SMA_COMMAND_WIN_EDIT (HID_SMA_START + 45) + +#define HID_SMA_PLUSX (HID_SMA_START + 50) +#define HID_SMA_MINUSX (HID_SMA_START + 51) +#define HID_SMA_PLUSMINUSX (HID_SMA_START + 52) +#define HID_SMA_MINUSPLUSX (HID_SMA_START + 53) +#define HID_SMA_NEGX (HID_SMA_START + 54) +#define HID_SMA_XPLUSY (HID_SMA_START + 55) +#define HID_SMA_XMINUSY (HID_SMA_START + 56) +#define HID_SMA_XCDOTY (HID_SMA_START + 57) +#define HID_SMA_XTIMESY (HID_SMA_START + 58) +#define HID_SMA_XSYMTIMESY (HID_SMA_START + 59) +#define HID_SMA_XSYMDIVIDEY (HID_SMA_START + 60) +#define HID_SMA_XDIVY (HID_SMA_START + 61) +#define HID_SMA_XOVERY (HID_SMA_START + 62) +#define HID_SMA_XODIVIDEY (HID_SMA_START + 63) +#define HID_SMA_XODOTY (HID_SMA_START + 64) +#define HID_SMA_XOMINUSY (HID_SMA_START + 65) +#define HID_SMA_XOPLUSY (HID_SMA_START + 66) +#define HID_SMA_XOTIMESY (HID_SMA_START + 67) +#define HID_SMA_XANDY (HID_SMA_START + 68) +#define HID_SMA_XORY (HID_SMA_START + 69) +#define HID_SMA_XEQY (HID_SMA_START + 70) +#define HID_SMA_XNEQY (HID_SMA_START + 71) +#define HID_SMA_XLTY (HID_SMA_START + 72) +#define HID_SMA_XGTY (HID_SMA_START + 73) +#define HID_SMA_XLEY (HID_SMA_START + 74) +#define HID_SMA_XGEY (HID_SMA_START + 75) +#define HID_SMA_XLESLANTY (HID_SMA_START + 76) +#define HID_SMA_XGESLANTY (HID_SMA_START + 77) +#define HID_SMA_XLLY (HID_SMA_START + 78) +#define HID_SMA_XGGY (HID_SMA_START + 79) +#define HID_SMA_XDEFY (HID_SMA_START + 80) +#define HID_SMA_XEQUIVY (HID_SMA_START + 81) +#define HID_SMA_XAPPROXY (HID_SMA_START + 82) +#define HID_SMA_XSIMY (HID_SMA_START + 83) +#define HID_SMA_XSIMEQY (HID_SMA_START + 84) +#define HID_SMA_XPROPY (HID_SMA_START + 85) +#define HID_SMA_XORTHOY (HID_SMA_START + 86) +#define HID_SMA_XPARALLELY (HID_SMA_START + 87) +#define HID_SMA_XTOWARDY (HID_SMA_START + 88) +#define HID_SMA_XTRANSLY (HID_SMA_START + 89) +#define HID_SMA_XTRANSRY (HID_SMA_START + 90) +#define HID_SMA_XINY (HID_SMA_START + 91) +#define HID_SMA_XNOTINY (HID_SMA_START + 92) +#define HID_SMA_XOWNSY (HID_SMA_START + 93) +#define HID_SMA_XUNIONY (HID_SMA_START + 94) +#define HID_SMA_XINTERSECTIONY (HID_SMA_START + 95) +#define HID_SMA_XSETMINUSY (HID_SMA_START + 96) +#define HID_SMA_XSLASHY (HID_SMA_START + 97) +#define HID_SMA_XSUBSETY (HID_SMA_START + 98) +#define HID_SMA_XSUBSETEQY (HID_SMA_START + 99) +#define HID_SMA_XSUPSETY (HID_SMA_START + 100) +#define HID_SMA_XSUPSETEQY (HID_SMA_START + 101) +#define HID_SMA_XNSUBSETY (HID_SMA_START + 102) +#define HID_SMA_XNSUBSETEQY (HID_SMA_START + 103) +#define HID_SMA_XNSUPSETY (HID_SMA_START + 104) +#define HID_SMA_XNSUPSETEQY (HID_SMA_START + 105) +#define HID_SMA_ABSX (HID_SMA_START + 106) +#define HID_SMA_FACTX (HID_SMA_START + 107) +#define HID_SMA_SQRTX (HID_SMA_START + 108) +#define HID_SMA_NROOTXY (HID_SMA_START + 109) +#define HID_SMA_EX (HID_SMA_START + 110) +#define HID_SMA_EXPX (HID_SMA_START + 111) +#define HID_SMA_LNX (HID_SMA_START + 112) +#define HID_SMA_LOGX (HID_SMA_START + 113) +#define HID_SMA_SINX (HID_SMA_START + 114) +#define HID_SMA_COSX (HID_SMA_START + 115) +#define HID_SMA_TANX (HID_SMA_START + 116) +#define HID_SMA_COTX (HID_SMA_START + 117) +#define HID_SMA_ARCSINX (HID_SMA_START + 118) +#define HID_SMA_ARCCOSX (HID_SMA_START + 119) +#define HID_SMA_ARCTANX (HID_SMA_START + 120) +#define HID_SMA_ARCCOTX (HID_SMA_START + 121) +#define HID_SMA_SINHX (HID_SMA_START + 122) +#define HID_SMA_COSHX (HID_SMA_START + 123) +#define HID_SMA_TANHX (HID_SMA_START + 124) +#define HID_SMA_COTHX (HID_SMA_START + 125) +#define HID_SMA_ARSINHX (HID_SMA_START + 126) +#define HID_SMA_ARCOSHX (HID_SMA_START + 127) +#define HID_SMA_ARTANHX (HID_SMA_START + 128) +#define HID_SMA_ARCOTHX (HID_SMA_START + 129) +#define HID_SMA_SUMX (HID_SMA_START + 130) +#define HID_SMA_PRODX (HID_SMA_START + 131) +#define HID_SMA_COPRODX (HID_SMA_START + 132) +#define HID_SMA_LIMX (HID_SMA_START + 133) +#define HID_SMA_LIMINFX (HID_SMA_START + 134) +#define HID_SMA_LIMSUPX (HID_SMA_START + 135) +#define HID_SMA_EXISTS (HID_SMA_START + 136) +#define HID_SMA_FORALL (HID_SMA_START + 137) +#define HID_SMA_NABLA (HID_SMA_START + 138) +#define HID_SMA_INTX (HID_SMA_START + 139) +#define HID_SMA_IINTX (HID_SMA_START + 140) +#define HID_SMA_IIINTX (HID_SMA_START + 141) +#define HID_SMA_LINTX (HID_SMA_START + 142) +#define HID_SMA_LLINTX (HID_SMA_START + 143) +#define HID_SMA_LLLINTX (HID_SMA_START + 144) +#define HID_SMA_FROMX (HID_SMA_START + 145) +#define HID_SMA_TOX (HID_SMA_START + 146) +#define HID_SMA_FROMXTOY (HID_SMA_START + 147) +#define HID_SMA_XCIRCY (HID_SMA_START + 148) +#define HID_SMA_XDIVIDESY (HID_SMA_START + 149) +#define HID_SMA_XNDIVIDESY (HID_SMA_START + 150) +#define HID_SMA_DLARROW (HID_SMA_START + 151) +#define HID_SMA_DLRARROW (HID_SMA_START + 152) +#define HID_SMA_DRARROW (HID_SMA_START + 153) + +#define HID_SMA_MISC_CAT (HID_SMA_START + 154) +#define HID_SMA_UNBINOPS_CAT (HID_SMA_START + 155) +#define HID_SMA_RELATIONS_CAT (HID_SMA_START + 156) +#define HID_SMA_SETOPERATIONS_CAT (HID_SMA_START + 157) +#define HID_SMA_FUNCTIONS_CAT (HID_SMA_START + 158) +#define HID_SMA_OPERATORS_CAT (HID_SMA_START + 159) +#define HID_SMA_ATTRIBUTES_CAT (HID_SMA_START + 160) +#define HID_SMA_BRACKETS_CAT (HID_SMA_START + 161) +#define HID_SMA_FORMAT_CAT (HID_SMA_START + 162) + +#define HID_SMA_OPERATOR_WIN (HID_SMA_START + 163) +#define HID_SMA_UNBINOPS_TBX (HID_SMA_START + 164) +#define HID_SMA_RELATIONS_TBX (HID_SMA_START + 165) +#define HID_SMA_SETOPERATIONS_TBX (HID_SMA_START + 166) +#define HID_SMA_FUNCTIONS_TBX (HID_SMA_START + 167) +#define HID_SMA_OPERATORS_TBX (HID_SMA_START + 168) +#define HID_SMA_ATTRIBUTES_TBX (HID_SMA_START + 169) +#define HID_SMA_BRACKETS_TBX (HID_SMA_START + 170) +#define HID_SMA_FORMAT_TBX (HID_SMA_START + 171) +#define HID_SMA_SELECTION_TBX (HID_SMA_START + 172) +#define HID_SMA_COMMAND_WIN (HID_SMA_START + 173) +#define HID_SMA_MISC_MENU (HID_SMA_START + 174) +#define HID_SMA_FUNCTIONSOTHER1_MENU (HID_SMA_START + 175) + +#define HID_SMA_ACUTEX (HID_SMA_START + 180) +#define HID_SMA_BARX (HID_SMA_START + 181) +#define HID_SMA_BREVEX (HID_SMA_START + 182) +#define HID_SMA_CHECKX (HID_SMA_START + 183) +#define HID_SMA_CIRCLEX (HID_SMA_START + 184) +#define HID_SMA_DOTX (HID_SMA_START + 185) +#define HID_SMA_DDOTX (HID_SMA_START + 186) +#define HID_SMA_DDDOTX (HID_SMA_START + 187) +#define HID_SMA_GRAVEX (HID_SMA_START + 188) +#define HID_SMA_HATX (HID_SMA_START + 189) +#define HID_SMA_TILDEX (HID_SMA_START + 190) +#define HID_SMA_VECX (HID_SMA_START + 191) +#define HID_SMA_UNDERLINEX (HID_SMA_START + 192) +#define HID_SMA_OVERLINEX (HID_SMA_START + 193) +#define HID_SMA_OVERSTRIKEX (HID_SMA_START + 194) +#define HID_SMA_PHANTOMX (HID_SMA_START + 195) +#define HID_SMA_BOLDX (HID_SMA_START + 196) +#define HID_SMA_ITALX (HID_SMA_START + 197) +#define HID_SMA_SIZEXY (HID_SMA_START + 198) +#define HID_SMA_FONTXY (HID_SMA_START + 199) +#define HID_SMA_COLORX (HID_SMA_START + 200) +#define HID_SMA_LRGROUPX (HID_SMA_START + 201) +#define HID_SMA_LRPARENTX (HID_SMA_START + 202) +#define HID_SMA_LRBRACKETX (HID_SMA_START + 203) +#define HID_SMA_LRBRACEX (HID_SMA_START + 204) +#define HID_SMA_LRANGLEX (HID_SMA_START + 205) +#define HID_SMA_LRCEILX (HID_SMA_START + 206) +#define HID_SMA_LRFLOORX (HID_SMA_START + 207) +#define HID_SMA_LRLINEX (HID_SMA_START + 208) +#define HID_SMA_LRDLINEX (HID_SMA_START + 209) +#define HID_SMA_SLRPARENTX (HID_SMA_START + 210) +#define HID_SMA_SLRBRACKETX (HID_SMA_START + 211) +#define HID_SMA_SLRBRACEX (HID_SMA_START + 212) +#define HID_SMA_SLRANGLEX (HID_SMA_START + 213) +#define HID_SMA_SLRCEILX (HID_SMA_START + 214) +#define HID_SMA_SLRFLOORX (HID_SMA_START + 215) +#define HID_SMA_SLRLINEX (HID_SMA_START + 216) +#define HID_SMA_SLRDLINEX (HID_SMA_START + 217) +#define HID_SMA_RSUBX (HID_SMA_START + 218) +#define HID_SMA_RSUPX (HID_SMA_START + 219) +#define HID_SMA_LSUBX (HID_SMA_START + 220) +#define HID_SMA_LSUPX (HID_SMA_START + 221) +#define HID_SMA_SBLANK (HID_SMA_START + 222) +#define HID_SMA_BLANK (HID_SMA_START + 223) +#define HID_SMA_NEWLINE (HID_SMA_START + 224) +#define HID_SMA_BINOMXY (HID_SMA_START + 225) +#define HID_SMA_STACK (HID_SMA_START + 226) +#define HID_SMA_MATRIX (HID_SMA_START + 227) +#define HID_SMA_ALIGNLX (HID_SMA_START + 228) +#define HID_SMA_ALIGNCX (HID_SMA_START + 229) +#define HID_SMA_ALIGNRX (HID_SMA_START + 230) +#define HID_SMA_ALEPH (HID_SMA_START + 231) +#define HID_SMA_EMPTYSET (HID_SMA_START + 232) +#define HID_SMA_RE (HID_SMA_START + 233) +#define HID_SMA_IM (HID_SMA_START + 234) +#define HID_SMA_INFINITY (HID_SMA_START + 235) +#define HID_SMA_PARTIAL (HID_SMA_START + 236) +#define HID_SMA_WP (HID_SMA_START + 237) +#define HID_SMA_DOTSAXIS (HID_SMA_START + 238) +#define HID_SMA_DOTSUP (HID_SMA_START + 239) +#define HID_SMA_DOTSDOWN (HID_SMA_START + 240) +#define HID_SMA_DOTSLOW (HID_SMA_START + 241) +#define HID_SMA_DOTSVERT (HID_SMA_START + 242) +#define HID_SMA_NOSPACE (HID_SMA_START + 243) + +#define HID_SMA_SETN (HID_SMA2_START + 1) +#define HID_SMA_SETZ (HID_SMA2_START + 2) +#define HID_SMA_SETQ (HID_SMA2_START + 3) +#define HID_SMA_SETR (HID_SMA2_START + 4) +#define HID_SMA_SETC (HID_SMA2_START + 5) +#define HID_SMA_WIDEHATX (HID_SMA2_START + 6) +#define HID_SMA_WIDETILDEX (HID_SMA2_START + 7) +#define HID_SMA_WIDEVECX (HID_SMA2_START + 8) +#define HID_SMA_CSUBX (HID_SMA2_START + 9) +#define HID_SMA_CSUPX (HID_SMA2_START + 10) +#define HID_SMA_HBAR (HID_SMA2_START + 11) +#define HID_SMA_LAMBDABAR (HID_SMA2_START + 12) +#define HID_SMA_LEFTARROW (HID_SMA2_START + 13) +#define HID_SMA_RIGHTARROW (HID_SMA2_START + 14) +#define HID_SMA_UPARROW (HID_SMA2_START + 15) +#define HID_SMA_DOWNARROW (HID_SMA2_START + 16) + +#define HID_SMA_DEFAULT_DIST (HID_SMA2_START + 17) +#define HID_SMA_LINE_DIST (HID_SMA2_START + 18) +#define HID_SMA_ROOT_DIST (HID_SMA2_START + 19) +#define HID_SMA_SUP_DIST (HID_SMA2_START + 20) +#define HID_SMA_SUB_DIST (HID_SMA2_START + 21) +#define HID_SMA_NUMERATOR_DIST (HID_SMA2_START + 22) +#define HID_SMA_DENOMINATOR_DIST (HID_SMA2_START + 23) +#define HID_SMA_FRACLINE_EXCWIDTH (HID_SMA2_START + 24) +#define HID_SMA_FRACLINE_LINEWIDTH (HID_SMA2_START + 25) +#define HID_SMA_UPPERLIMIT_DIST (HID_SMA2_START + 26) +#define HID_SMA_LOWERLIMIT_DIST (HID_SMA2_START + 27) +#define HID_SMA_BRACKET_EXCHEIGHT (HID_SMA2_START + 28) +#define HID_SMA_BRACKET_DIST (HID_SMA2_START + 29) +#define HID_SMA_MATRIXROW_DIST (HID_SMA2_START + 30) +#define HID_SMA_MATRIXCOL_DIST (HID_SMA2_START + 31) +#define HID_SMA_ATTRIBUT_DIST (HID_SMA2_START + 32) +#define HID_SMA_INTERATTRIBUT_DIST (HID_SMA2_START + 33) +#define HID_SMA_OPERATOR_EXCHEIGHT (HID_SMA2_START + 34) +#define HID_SMA_OPERATOR_DIST (HID_SMA2_START + 35) +#define HID_SMA_LEFTBORDER_DIST (HID_SMA2_START + 36) +#define HID_SMA_RIGHTBORDER_DIST (HID_SMA2_START + 37) +#define HID_SMA_UPPERBORDER_DIST (HID_SMA2_START + 38) +#define HID_SMA_LOWERBORDER_DIST (HID_SMA2_START + 39) +#define HID_SMA_SCALE_ALL_BRACKETS (HID_SMA2_START + 40) +#define HID_SMA_BRACKET_EXCHEIGHT2 (HID_SMA2_START + 41) +#define HID_SMA_LMRANGLEXY (HID_SMA2_START + 42) +#define HID_SMA_SLMRANGLEXY (HID_SMA2_START + 43) +#define HID_SMA_XWIDESLASHY (HID_SMA2_START + 44) #define HID_SMA_XWIDEBSLASHY (HID_SMA2_START + 45) -#define HID_SMA_XOVERBRACEY (HID_SMA2_START + 46) -#define HID_SMA_XUNDERBRACEY (HID_SMA2_START + 47) -#define HID_SMA_LRDBRACKETX (HID_SMA2_START + 48) -#define HID_SMA_SLRDBRACKETX (HID_SMA2_START + 49) +#define HID_SMA_XOVERBRACEY (HID_SMA2_START + 46) +#define HID_SMA_XUNDERBRACEY (HID_SMA2_START + 47) +#define HID_SMA_LRDBRACKETX (HID_SMA2_START + 48) +#define HID_SMA_SLRDBRACKETX (HID_SMA2_START + 49) #define HID_SMA_CONTROL_SYMBOLSET_VIEW (HID_SMA2_START + 50) #define HID_SMA_CONTROL_FONTCHAR_VIEW (HID_SMA2_START + 51) -#define BMP_ARROW_RIGHT 1 +#define BMP_ARROW_RIGHT 1 #define MN_WIN 60 #define MN_SUB_VIEW 31 @@ -764,7 +764,7 @@ // 342 == SCH_IF_SMAVIEWSHELL, da SFX_INTERFACE_LIB kein // Define sondern neuerdings ein Enum ist -#define HID_SMA_VIEWSHELL_DOCUMENT (342) +#define HID_SMA_VIEWSHELL_DOCUMENT (342) #endif diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx index 1422550ff161..0bfb8b0b6aa9 100644 --- a/starmath/inc/symbol.hxx +++ b/starmath/inc/symbol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,8 +47,8 @@ #include "smmod.hxx" -#define SYMBOLSET_NONE 0xFFFF -#define SYMBOL_NONE 0xFFFF +#define SYMBOLSET_NONE 0xFFFF +#define SYMBOL_NONE 0xFFFF //////////////////////////////////////////////////////////////////////////////// @@ -94,7 +94,7 @@ public: const String& rSet, BOOL bIsPredefined = FALSE); SmSym(const SmSym& rSymbol); - SmSym& operator = (const SmSym& rSymbol); + SmSym& operator = (const SmSym& rSymbol); const Font& GetFace() const { return m_aFace; } sal_Unicode GetCharacter() const { return m_cChar; } @@ -140,8 +140,8 @@ typedef std::vector< const SmSym * > SymbolPtrVec_t; struct lt_SmSymPtr : public std::binary_function< const SmSym *, const SmSym *, bool > { - bool operator() ( const SmSym *pSym1, const SmSym *pSym2 ) - { + bool operator() ( const SmSym *pSym1, const SmSym *pSym2 ) + { return pSym1->GetCharacter() < pSym2->GetCharacter(); } }; @@ -175,12 +175,12 @@ public: bool AddOrReplaceSymbol( const SmSym & rSymbol, bool bForceChange = false ); void RemoveSymbol( const String & rSymbolName ); - SmSym * GetSymbolByName(const String& rSymbolName); - const SmSym * GetSymbolByName(const String& rSymbolName) const + SmSym * GetSymbolByName(const String& rSymbolName); + const SmSym * GetSymbolByName(const String& rSymbolName) const { return ((SmSymbolManager *) this)->GetSymbolByName(rSymbolName); } - + bool IsModified() const { return m_bModified; } void SetModified(bool bModify) { m_bModified = bModify; } diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx index e35ee9a8891c..9a418e5d879f 100644 --- a/starmath/inc/toolbox.hxx +++ b/starmath/inc/toolbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,16 +37,16 @@ #include "dialog.hrc" -#define NUM_TBX_CATEGORIES 9 +#define NUM_TBX_CATEGORIES 9 class SmToolBoxWindow : public SfxFloatingWindow { protected: - ToolBox aToolBoxCat; + ToolBox aToolBoxCat; FixedLine aToolBoxCat_Delim; // to visualy seperate the catalog part - ToolBox *pToolBoxCmd; - ToolBox *vToolBoxCategories[NUM_TBX_CATEGORIES]; + ToolBox *pToolBoxCmd; + ToolBox *vToolBoxCategories[NUM_TBX_CATEGORIES]; ImageList *aImageLists [NUM_TBX_CATEGORIES + 1]; /* regular */ ImageList *aImageListsH[NUM_TBX_CATEGORIES + 1]; /* high contrast */ USHORT nActiveCategoryRID; @@ -65,15 +65,15 @@ protected: public: SmToolBoxWindow(SfxBindings *pBindings, SfxChildWindow *pChildWindow, - Window *pParent); + Window *pParent); ~SmToolBoxWindow(); // Window - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent &rEvt ); void AdjustPosSize( BOOL bSetPos ); - void SetCategory(USHORT nCategory); + void SetCategory(USHORT nCategory); }; /**************************************************************************/ diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx index f96cffd83bb2..833c88c10d55 100644 --- a/starmath/inc/types.hxx +++ b/starmath/inc/types.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ sal_Unicode ConvertMathToMathML( sal_Unicode cChar ); // enum definitions for characters from the 'StarSymbol' font // (some chars have more than one alias!) //! Note: not listed here does not(!) mean "not used" -//! (see %alpha ... %gamma for example) +//! (see %alpha ... %gamma for example) // enum MathSymbol { diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index ba84bd08cc70..2ab0ff1bd2d6 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,10 +73,10 @@ protected: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); public: SmModel( SfxObjectShell *pObjSh = 0 ); - virtual ~SmModel() throw (); + virtual ~SmModel() throw (); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire( ) throw(); virtual void SAL_CALL release( ) throw(); diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index ec5faf1c1ead..084a54a4355f 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ BOOL IsBold( const Font &rFont ); class SmFace : public Font { - long nBorderWidth; + long nBorderWidth; void Impl_Init(); @@ -120,12 +120,12 @@ public: // overloaded version in order to supply a min value // for font size (height). (Also used in ctor's to do so.) - void SetSize(const Size& rSize); + void SetSize(const Size& rSize); - void SetBorderWidth(long nWidth) { nBorderWidth = nWidth; } - long GetBorderWidth() const; - long GetDefaultBorderWidth() const { return GetSize().Height() / 20 ; } - void FreezeBorderWidth() { nBorderWidth = GetDefaultBorderWidth(); } + void SetBorderWidth(long nWidth) { nBorderWidth = nWidth; } + long GetBorderWidth() const; + long GetDefaultBorderWidth() const { return GetSize().Height() / 20 ; } + void FreezeBorderWidth() { nBorderWidth = GetDefaultBorderWidth(); } SmFace & operator = (const SmFace &rFace); }; @@ -142,14 +142,14 @@ SmFace & operator *= (SmFace &rFace, const Fraction &rFrac); class SmInfoText : public FixedText { protected: - USHORT nMaxLen; - String aText; + USHORT nMaxLen; + String aText; public: SmInfoText(Window* pParent, WinBits nWinStyle = 0, USHORT nMax = 128); SmInfoText(Window* pParent, const ResId& rResId, USHORT nMax = 128); - void SetText(const String& rStr); + void SetText(const String& rStr); XubString GetText() const { return (aText); } }; @@ -164,20 +164,20 @@ public: class SmPickList : public SfxPtrArr { protected: - USHORT nSize; + USHORT nSize; virtual void *CreateItem(const String& rString) = 0; virtual void *CreateItem(const void *pItem) = 0; - virtual void DestroyItem(void *pItem) = 0; + virtual void DestroyItem(void *pItem) = 0; - virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const = 0; + virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const = 0; - virtual String GetStringItem(void *pItem) = 0; + virtual String GetStringItem(void *pItem) = 0; - void *GetPtr(USHORT nPos) const { return SfxPtrArr::GetObject(nPos); } - void *&GetPtr(USHORT nPos) { return SfxPtrArr::GetObject(nPos); } - void InsertPtr(USHORT nPos, void *pItem) { SfxPtrArr::Insert(nPos, pItem); } - void RemovePtr(USHORT nPos, USHORT nCount = 1) { SfxPtrArr::Remove(nPos, nCount); } + void *GetPtr(USHORT nPos) const { return SfxPtrArr::GetObject(nPos); } + void *&GetPtr(USHORT nPos) { return SfxPtrArr::GetObject(nPos); } + void InsertPtr(USHORT nPos, void *pItem) { SfxPtrArr::Insert(nPos, pItem); } + void RemovePtr(USHORT nPos, USHORT nCount = 1) { SfxPtrArr::Remove(nPos, nCount); } public: SmPickList(USHORT nInitSize = 0, USHORT nMaxSize = 5); @@ -185,20 +185,20 @@ public: SmPickList& operator = (const SmPickList& rList); - void *Get(USHORT nPos = 0) const { return GetPtr(nPos); } + void *Get(USHORT nPos = 0) const { return GetPtr(nPos); } using SfxPtrArr::Insert; - void Insert(const void* pItem); - void Update(const void* pItem, const void *pNewItem); + void Insert(const void* pItem); + void Update(const void* pItem, const void *pNewItem); using SfxPtrArr::Remove; - void Remove(const void* pItem); + void Remove(const void* pItem); using SfxPtrArr::operator []; - void *operator [] (USHORT nPos) const { return GetPtr(nPos); } + void *operator [] (USHORT nPos) const { return GetPtr(nPos); } - USHORT GetSize() const { return nSize; } - USHORT Count() const { return SfxPtrArr::Count(); } + USHORT GetSize() const { return nSize; } + USHORT Count() const { return SfxPtrArr::Count(); } - void Clear(); + void Clear(); }; @@ -212,11 +212,11 @@ class SmStringPickList : public SmPickList protected: virtual void *CreateItem(const String& rString); virtual void *CreateItem(const void *pItem); - virtual void DestroyItem(void *pItem); + virtual void DestroyItem(void *pItem); - virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const; + virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const; - virtual String GetStringItem(void *pItem); + virtual String GetStringItem(void *pItem); public: SmStringPickList() @@ -227,15 +227,15 @@ public: : SmPickList(rOrig) {} virtual ~SmStringPickList() { Clear(); } - virtual void Insert(const String &rString); - virtual void Update(const String &rString, const String &rNewString); - virtual void Remove(const String &rString); + virtual void Insert(const String &rString); + virtual void Update(const String &rString, const String &rNewString); + virtual void Remove(const String &rString); - inline BOOL Contains(const String &rString) const; - inline String Get(USHORT nPos = 0) const; + inline BOOL Contains(const String &rString) const; + inline String Get(USHORT nPos = 0) const; inline SmStringPickList& operator = (const SmStringPickList& rList); - inline String operator [] (USHORT nPos) const; + inline String operator [] (USHORT nPos) const; }; inline SmStringPickList& SmStringPickList::operator = (const SmStringPickList& rList) @@ -253,7 +253,7 @@ inline String SmStringPickList::Get(USHORT nPos) const return nPos < Count() ? *((String *)SmPickList::Get(nPos)) : String(); } -inline BOOL SmStringPickList::Contains(const String &rString) const +inline BOOL SmStringPickList::Contains(const String &rString) const { return SmPickList::Contains((void *)&rString); } @@ -271,11 +271,11 @@ class SmFontPickList : public SmPickList protected: virtual void *CreateItem(const String& rString); virtual void *CreateItem(const void *pItem); - virtual void DestroyItem(void *pItem); + virtual void DestroyItem(void *pItem); - virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const; + virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const; - virtual String GetStringItem(void *pItem); + virtual String GetStringItem(void *pItem); public: SmFontPickList() @@ -287,22 +287,22 @@ public: virtual ~SmFontPickList() { Clear(); } using SfxPtrArr::Insert; - virtual void Insert(const Font &rFont); + virtual void Insert(const Font &rFont); using SmPickList::Update; - virtual void Update(const Font &rFont, const Font &rNewFont); + virtual void Update(const Font &rFont, const Font &rNewFont); using SfxPtrArr::Remove; - virtual void Remove(const Font &rFont); + virtual void Remove(const Font &rFont); using SmPickList::Contains; - inline BOOL Contains(const Font &rFont) const; - inline Font Get(USHORT nPos = 0) const; + inline BOOL Contains(const Font &rFont) const; + inline Font Get(USHORT nPos = 0) const; - inline SmFontPickList& operator = (const SmFontPickList& rList); + inline SmFontPickList& operator = (const SmFontPickList& rList); using SfxPtrArr::operator []; - inline Font operator [] (USHORT nPos) const; + inline Font operator [] (USHORT nPos) const; - void ReadFrom(const SmFontDialog& rDialog); - void WriteTo(SmFontDialog& rDialog) const; + void ReadFrom(const SmFontDialog& rDialog); + void WriteTo(SmFontDialog& rDialog) const; }; inline SmFontPickList& SmFontPickList::operator = (const SmFontPickList& rList) @@ -310,7 +310,7 @@ inline SmFontPickList& SmFontPickList::operator = (const SmFontPickList& rList) *(SmPickList *)this = *(SmPickList *)&rList; return *this; } -inline Font SmFontPickList::operator [] (USHORT nPos) const +inline Font SmFontPickList::operator [] (USHORT nPos) const { return *((Font *)SmPickList::operator[](nPos)); } @@ -320,7 +320,7 @@ inline Font SmFontPickList::Get(USHORT nPos) const return nPos < Count() ? *((Font *)SmPickList::Get(nPos)) : Font(); } -inline BOOL SmFontPickList::Contains(const Font &rFont) const +inline BOOL SmFontPickList::Contains(const Font &rFont) const { return SmPickList::Contains((void *)&rFont); } @@ -344,17 +344,17 @@ public: SmStringPickComboBox& operator = (const SmStringPickList& rList); - void SetText(const String& rStr); + void SetText(const String& rStr); - virtual void Insert(const String &rString); - virtual void Update(const String &rString, const String &rNewString); - virtual void Remove(const String &rString); + virtual void Insert(const String &rString); + virtual void Update(const String &rString, const String &rNewString); + virtual void Remove(const String &rString); }; #endif //////////////////////////////////////////////////////////// // -// SmFontPickListBox +// SmFontPickListBox // class SmFontPickListBox : public SmFontPickList, public ListBox @@ -368,11 +368,11 @@ public: SmFontPickListBox& operator = (const SmFontPickList& rList); using SfxPtrArr::Insert; - virtual void Insert(const Font &rFont); + virtual void Insert(const Font &rFont); using Window::Update; - virtual void Update(const Font &rFont, const Font &rNewFont); + virtual void Update(const Font &rFont, const Font &rNewFont); using SfxPtrArr::Remove; - virtual void Remove(const Font &rFont); + virtual void Remove(const Font &rFont); }; #endif diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index cc13a35edf9f..925b2cc07e49 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -61,10 +61,10 @@ public: void ShowCursor(BOOL bShow); const SmNode * SetCursorPos(USHORT nRow, USHORT nCol); protected: - void SetIsCursorVisible(BOOL bVis) { bIsCursorVisible = bVis; } + void SetIsCursorVisible(BOOL bVis) { bIsCursorVisible = bVis; } using Window::SetCursor; void SetCursor(const SmNode *pNode); - void SetCursor(const Rectangle &rRect); + void SetCursor(const Rectangle &rRect); bool IsInlineEditEnabled() const; private: @@ -73,11 +73,11 @@ private: SmGraphicAccessible * pAccessible; SmViewShell *pViewShell; - USHORT nZoom; - short nModifyCount; + USHORT nZoom; + short nModifyCount; protected: - void SetFormulaDrawPos(const Point &rPos) { aFormulaDrawPos = rPos; } + void SetFormulaDrawPos(const Point &rPos) { aFormulaDrawPos = rPos; } virtual void DataChanged( const DataChangedEvent& ); virtual void Paint(const Rectangle&); @@ -125,8 +125,8 @@ protected: SmGraphicWindow &rGraphic; public: SmGraphicController(SmGraphicWindow &, USHORT, SfxBindings & ); - virtual void StateChanged(USHORT nSID, - SfxItemState eState, + virtual void StateChanged(USHORT nSID, + SfxItemState eState, const SfxPoolItem* pState); }; @@ -143,8 +143,8 @@ public: virtual ~SmEditController(); #endif - virtual void StateChanged(USHORT nSID, - SfxItemState eState, + virtual void StateChanged(USHORT nSID, + SfxItemState eState, const SfxPoolItem* pState); }; @@ -152,8 +152,8 @@ public: class SmCmdBoxWindow : public SfxDockingWindow { - SmEditWindow aEdit; - SmEditController aController; + SmEditWindow aEdit; + SmEditController aController; BOOL bExiting; Timer aInitialFocusTimer; @@ -172,12 +172,12 @@ protected : virtual SfxChildAlignment CheckAlignment(SfxChildAlignment eActual, SfxChildAlignment eWish); - virtual void ToggleFloatingMode(); + virtual void ToggleFloatingMode(); public: - SmCmdBoxWindow(SfxBindings *pBindings, + SmCmdBoxWindow(SfxBindings *pBindings, SfxChildWindow *pChildWindow, - Window *pParent); + Window *pParent); virtual ~SmCmdBoxWindow (); @@ -194,9 +194,9 @@ class SmCmdBoxWrapper : public SfxChildWindow SFX_DECL_CHILDWINDOW(SmCmdBoxWrapper); protected: - SmCmdBoxWrapper(Window *pParentWindow, - USHORT nId, - SfxBindings *pBindings, + SmCmdBoxWrapper(Window *pParentWindow, + USHORT nId, + SfxBindings *pBindings, SfxChildWinInfo *pInfo); #if OSL_DEBUG_LEVEL > 1 @@ -222,15 +222,15 @@ class SmViewShell: public SfxViewShell // for handling the PasteClipboardState friend class SmClipboardChangeListener; - SmGraphicWindow aGraphic; + SmGraphicWindow aGraphic; SmGraphicController aGraphicController; - String StatusText; + String StatusText; ::com::sun::star::uno:: Reference < ::com::sun::star::lang:: XEventListener > xClipEvtLstnr; - SmClipboardChangeListener* pClipEvtLstnr; + SmClipboardChangeListener* pClipEvtLstnr; SmViewShell_Impl* pImpl; - BOOL bPasteState; + BOOL bPasteState; DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -246,14 +246,14 @@ protected: const String& rLine); Size GetTextSize(OutputDevice& rDevice, const String& rText, - long MaxWidth); + long MaxWidth); void DrawTextLine(OutputDevice& rDevice, - const Point& rPosition, + const Point& rPosition, const String& rLine); void DrawText(OutputDevice& rDevice, - const Point& rPosition, + const Point& rPosition, const String& rText, - USHORT MaxWidth); + USHORT MaxWidth); virtual USHORT Print(SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0); virtual SfxPrinter *GetPrinter(BOOL bCreate = FALSE); @@ -263,7 +263,7 @@ protected: BOOL Insert( SfxMedium& rMedium ); BOOL InsertFrom(SfxMedium &rMedium); - virtual SfxTabPage *CreatePrintOptionsPage(Window *pParent, + virtual SfxTabPage *CreatePrintOptionsPage(Window *pParent, const SfxItemSet &rOptions); virtual void Deactivate(BOOL IsMDIActivate); virtual void Activate(BOOL IsMDIActivate); @@ -286,14 +286,14 @@ public: } SmEditWindow * GetEditWindow(); - SmGraphicWindow & GetGraphicWindow() { return aGraphic; } + SmGraphicWindow & GetGraphicWindow() { return aGraphic; } const SmGraphicWindow & GetGraphicWindow() const { return aGraphic; } - void SetStatusText(const String& Text); + void SetStatusText(const String& Text); - void ShowError( const SmErrorDesc *pErrorDesc ); - void NextError(); - void PrevError(); + void ShowError( const SmErrorDesc *pErrorDesc ); + void NextError(); + void PrevError(); SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START+2) SFX_DECL_VIEWFACTORY(SmViewShell); diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi index 99399c8396e3..d90403616cf6 100644 --- a/starmath/sdi/smath.sdi +++ b/starmath/sdi/smath.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,24 +27,24 @@ SfxVoidItem Adjust SID_ADJUST () [ - /* flags: */ - AutoUpdate = FALSE, + /* flags: */ + AutoUpdate = FALSE, Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] @@ -52,24 +52,24 @@ SfxVoidItem Adjust SID_ADJUST SfxVoidItem ChangeAlignment SID_ALIGN () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_FORMAT; ] @@ -77,24 +77,24 @@ SfxVoidItem ChangeAlignment SID_ALIGN SfxVoidItem ChangeDistance SID_DISTANCE () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_FORMAT; ] @@ -102,24 +102,24 @@ SfxVoidItem ChangeDistance SID_DISTANCE SfxVoidItem ChangeFont SID_FONT () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_FORMAT; ] @@ -127,24 +127,24 @@ SfxVoidItem ChangeFont SID_FONT SfxVoidItem ChangeFontSize SID_FONTSIZE () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_FORMAT; ] @@ -152,24 +152,24 @@ SfxVoidItem ChangeFontSize SID_FONTSIZE SfxVoidItem CommandWindow SID_CMDBOXWINDOW () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = GID_VIEW; ] @@ -177,24 +177,24 @@ SfxVoidItem CommandWindow SID_CMDBOXWINDOW SfxVoidItem Preferences SID_PREFERENCES () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_OPTIONS; ] @@ -202,26 +202,26 @@ SfxVoidItem Preferences SID_PREFERENCES SfxStringItem ConfigName SID_TEXT [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = GID_VIEW; ] @@ -229,24 +229,24 @@ SfxStringItem ConfigName SID_TEXT SfxVoidItem CopyObject SID_COPYOBJECT () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = GID_EDIT; ] @@ -254,24 +254,24 @@ SfxVoidItem CopyObject SID_COPYOBJECT SfxVoidItem Draw SID_DRAW () [ - /* flags: */ - AutoUpdate = FALSE, + /* flags: */ + AutoUpdate = FALSE, Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] @@ -279,24 +279,24 @@ SfxVoidItem Draw SID_DRAW SfxVoidItem FitInWindow SID_FITINWINDOW () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] @@ -304,24 +304,24 @@ SfxVoidItem FitInWindow SID_FITINWINDOW SfxBoolItem FormelCursor SID_FORMULACURSOR () [ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = TRUE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = TRUE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = TRUE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = TRUE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_MATH; ] @@ -329,26 +329,26 @@ SfxBoolItem FormelCursor SID_FORMULACURSOR SfxInt16Item Graphic SID_GAPHIC_SM [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = GID_MATH; ] @@ -356,24 +356,24 @@ SfxInt16Item Graphic SID_GAPHIC_SM SfxVoidItem InsertCommand SID_INSERTCOMMAND () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Asynchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_INSERT; ] @@ -381,24 +381,24 @@ SfxVoidItem InsertCommand SID_INSERTCOMMAND SfxVoidItem InsertConfigName SID_INSERTSYMBOL () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Asynchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_INSERT; ] @@ -406,24 +406,24 @@ SfxVoidItem InsertConfigName SID_INSERTSYMBOL SfxBoolItem InsertFormula SID_INSERT_FORMULA (SfxStringItem Name SID_INSERT_FORMULA,SfxStringItem Filter FN_PARAM_1) [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Asynchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_INSERT; ] @@ -431,24 +431,24 @@ SfxBoolItem InsertFormula SID_INSERT_FORMULA SfxVoidItem LoadSymbols SID_LOADSYMBOLS () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Asynchron; - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = GID_OPTIONS; ] @@ -456,26 +456,26 @@ SfxVoidItem LoadSymbols SID_LOADSYMBOLS SfxStringItem ModifyStatus SID_MODIFYSTATUS [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = TRUE, - ToolBoxConfig = FALSE, + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = TRUE, + ToolBoxConfig = FALSE, GroupId = GID_VIEW; ] @@ -483,24 +483,24 @@ SfxStringItem ModifyStatus SID_MODIFYSTATUS SfxVoidItem NextError SID_NEXTERR () [ - /* flags: */ - AutoUpdate = FALSE, + /* flags: */ + AutoUpdate = FALSE, Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_NAVIGATOR; ] @@ -508,24 +508,24 @@ SfxVoidItem NextError SID_NEXTERR SfxVoidItem NextMark SID_NEXTMARK () [ - /* flags: */ - AutoUpdate = FALSE, + /* flags: */ + AutoUpdate = FALSE, Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_NAVIGATOR; ] @@ -533,24 +533,24 @@ SfxVoidItem NextMark SID_NEXTMARK SfxVoidItem PasteObject SID_PASTEOBJECT () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = GID_EDIT; ] @@ -558,24 +558,24 @@ SfxVoidItem PasteObject SID_PASTEOBJECT SfxVoidItem PrevError SID_PREVERR () [ - /* flags: */ - AutoUpdate = FALSE, + /* flags: */ + AutoUpdate = FALSE, Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_NAVIGATOR; ] @@ -583,24 +583,24 @@ SfxVoidItem PrevError SID_PREVERR SfxVoidItem PrevMark SID_PREVMARK () [ - /* flags: */ - AutoUpdate = FALSE, + /* flags: */ + AutoUpdate = FALSE, Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_NAVIGATOR; ] @@ -608,26 +608,26 @@ SfxVoidItem PrevMark SID_PREVMARK SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW [ - /* flags: */ + /* flags: */ AutoUpdate = TRUE, Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] @@ -635,24 +635,24 @@ SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW SfxVoidItem SaveSymbols SID_SAVESYMBOLS () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = GID_OPTIONS; ] @@ -660,24 +660,24 @@ SfxVoidItem SaveSymbols SID_SAVESYMBOLS SfxVoidItem SetPaperSize SID_GETEDITTEXT () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = GID_MATH; ] @@ -685,24 +685,24 @@ SfxVoidItem SetPaperSize SID_GETEDITTEXT SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_OPTIONS; ] @@ -710,24 +710,24 @@ SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE SfxVoidItem Symbols SID_SYMBOLS () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_OPTIONS; ] @@ -735,26 +735,26 @@ SfxVoidItem Symbols SID_SYMBOLS SfxBoolItem Textmode SID_TEXTMODE [ - /* flags: */ - AutoUpdate = TRUE, + /* flags: */ + AutoUpdate = TRUE, Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] @@ -762,26 +762,26 @@ SfxBoolItem Textmode SID_TEXTMODE SfxStringItem TextStatus SID_TEXTSTATUS [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = TRUE, - ToolBoxConfig = FALSE, + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = TRUE, + ToolBoxConfig = FALSE, GroupId = GID_VIEW; ] @@ -789,24 +789,24 @@ SfxStringItem TextStatus SID_TEXTSTATUS SfxVoidItem ToolBowWindow SID_TOOLBOXWINDOW () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = GID_VIEW; ] @@ -814,26 +814,26 @@ SfxVoidItem ToolBowWindow SID_TOOLBOXWINDOW SfxBoolItem ToolBox SID_TOOLBOX [ - /* flags: */ - AutoUpdate = FALSE, + /* flags: */ + AutoUpdate = FALSE, Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] @@ -841,24 +841,24 @@ SfxBoolItem ToolBox SID_TOOLBOX SfxVoidItem View100 SID_VIEW100 () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] @@ -866,24 +866,24 @@ SfxVoidItem View100 SID_VIEW100 SfxVoidItem View200 SID_VIEW200 () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] @@ -891,24 +891,24 @@ SfxVoidItem View200 SID_VIEW200 SfxVoidItem View50 SID_VIEW050 () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] @@ -916,24 +916,24 @@ SfxVoidItem View50 SID_VIEW050 SfxVoidItem ZoomIn SID_ZOOMIN () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] @@ -941,24 +941,24 @@ SfxVoidItem ZoomIn SID_ZOOMIN SfxVoidItem ZoomOut SID_ZOOMOUT () [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] diff --git a/starmath/sdi/smitems.sdi b/starmath/sdi/smitems.sdi index 019d2c5f5312..af62aa70bbfb 100644 --- a/starmath/sdi/smitems.sdi +++ b/starmath/sdi/smitems.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -249,10 +249,10 @@ item SvxShadowLocation SvxShadowLocationItem; struct SvxBrush { - BrushStyle Style MID_BRUSHSTYLE; - BOOL Transparent MID_TRANSPARENT; - UINT32 BackColor MID_BG_COLOR; - UINT32 FillColor MID_FG_COLOR; + BrushStyle Style MID_BRUSHSTYLE; + BOOL Transparent MID_TRANSPARENT; + UINT32 BackColor MID_BG_COLOR; + UINT32 FillColor MID_FG_COLOR; }; item SvxBrush SvxBrushItem; @@ -260,24 +260,24 @@ item SvxBrush SvxBrushItem; struct SvxCharSetColor { - CharSet CharSet MID_CHARSET; - UINT32 Color MID_FG_COLOR; + CharSet CharSet MID_CHARSET; + UINT32 Color MID_FG_COLOR; }; item SvxCharSetColor SvxCharSetColorItem; //------------------------------------------------------------------------- -item BOOL SvxAutoKernItem; +item BOOL SvxAutoKernItem; item UINT32 SvxColorItem; -item BOOL SvxContourItem; -item FontStrikeout SvxCrossedOutItem; +item BOOL SvxContourItem; +item FontStrikeout SvxCrossedOutItem; //------------------------------------------------------------------------- struct SvxEscapement { - INT16 Esc MID_ESCAPEMENT; - BYTE Prop MID_PROPORTIONAL; + INT16 Esc MID_ESCAPEMENT; + BYTE Prop MID_PROPORTIONAL; }; item SvxEscapement SvxEscapementItem; @@ -285,8 +285,8 @@ item SvxEscapement SvxEscapementItem; struct SvxFmtBreak { - BOOL Auto MID_AUTOBREAK; - UINT16 Break MID_BREAKxxx; + BOOL Auto MID_AUTOBREAK; + UINT16 Break MID_BREAKxxx; } item SvxFmtBreak SvxFmtBreakItem; @@ -297,8 +297,8 @@ item BOOL SvxFmtSplitItem; struct SvxFontHeight { - UINT32 Height MID_HEIGHT; - BYTE Prop MID_PROPORTIONAL; + UINT32 Height MID_HEIGHT; + BYTE Prop MID_PROPORTIONAL; }; item SvxFontHeight SvxFontHeightItem; @@ -306,11 +306,11 @@ 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; + String StyleName MID_FONTSTYLE; + FontPitch Pitch MID_FONTPICTH; + CharSet CharSet MID_CHARSET; + FontFamily Family MID_FONTFAMILY; + String FamilyName MID_FONTFAMILYNAME; }; item SvxFont SvxFontItem; @@ -318,11 +318,11 @@ 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; + BOOL Hyphen MID_HYPHEN; + BOOL PageEnd MID_PAGEEND; + BYTE MinLead MID_MINLEAD; + BYTE MinTrail MID_MINTRAIL; + BYTE MaxHyphens MID_MAXHYPHENS; }; item SvxHyphenZone SvxHyphenZoneItem; @@ -334,10 +334,10 @@ item INT16 SvxKerningItem; struct SvxLine { - UINT32 Color MID_FG_COLOR; - UINT16 OutWidth MID_OUTER_WIDTH; - UINT16 InWidth MID_INNER_WIDTH; - UINT16 Distance MID_DISTANCE; + UINT32 Color MID_FG_COLOR; + UINT16 OutWidth MID_OUTER_WIDTH; + UINT16 InWidth MID_INNER_WIDTH; + UINT16 Distance MID_DISTANCE; }; item SvxLine SvxLineItem; @@ -345,9 +345,9 @@ 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 + INT16 FirstLineOffset MID_FIRSTLINE_OFFSET; // % or direct + UINT16 LeftMargin MID_LEFT_MARGIN; // % or direct + UINT16 RightMargin MID_RIGHT_MARGIN; // % or direct }; item SvxLRSpace SvxLRSpaceItem; @@ -357,10 +357,10 @@ 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; + SvxLineSpace LineSpace MID_LINESPACE; + UINT16 LineHeight MID_HEIGHT; // % or direct + SvxInterLineSpace InterLineSpace MID_INTER_LINESPACE; + INT16 InterSpace MID_INTER_SPACE; }; item SvxLineSpacing SvxLineSpacingItem; @@ -375,10 +375,10 @@ item BYTE SvxOrphansItem; struct SvxPage { - String DescName MID_DESCNAMExxx; - BOOL Landscape MID_LANDSCAPE; - UINT16 Use MID_USExxx; - SvxNumType NumType MID_NUMTYPExxx; + String DescName MID_DESCNAMExxx; + BOOL Landscape MID_LANDSCAPE; + UINT16 Use MID_USExxx; + SvxNumType NumType MID_NUMTYPExxx; }; item SvxPage SvxPageItem; @@ -390,10 +390,10 @@ item String SvxPageModelItem; struct SvxPagePosSize { - INT32 XPos MID_X; - INT32 YPos MID_Y; - INT32 Width MID_WIDTH; - INT32 Height MID_HEIGHT; + INT32 XPos MID_X; + INT32 YPos MID_Y; + INT32 Width MID_WIDTH; + INT32 Height MID_HEIGHT; }; item SvxPagePosSize SvxPagePosSizeItem; @@ -403,20 +403,20 @@ item BYTE SvxPaperBinItem; //------------------------------------------------------------------------- -item String SvxPostItAuthorItem; -item String SvxPostItDateItem; -item String SvxPostItTextItem; +item String SvxPostItAuthorItem; +item String SvxPostItDateItem; +item String SvxPostItTextItem; item FontItalic SvxPostureItem; -item BOOL SvxPrintItem; -item UINT16 SvxPropSizeItem; +item BOOL SvxPrintItem; +item UINT16 SvxPropSizeItem; //------------------------------------------------------------------------- struct SvxProtect { - BOOL Content MID_CONTENT; - BOOL Pos MID_POS; - BOOL Size MID_SIZE; + BOOL Content MID_CONTENT; + BOOL Pos MID_POS; + BOOL Size MID_SIZE; }; item SvxProtect SvxProtectItem; @@ -424,15 +424,15 @@ item SvxProtect SvxProtectItem; struct SvxSearch { - UINT16 Command MID_COMMAND; - String SearchString MID_SEARCH_STRING; - String ReplaceString MID_REPLACE_STRING; + 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; + String Flags MID_FLAGS; + UINT16 Family MID_FAMILY; + UINT16 CellType MID_CELLTYPE; + BOOL RowDirection MID_ROW_DIRECTION; + UINT16 AppFlag MID_APPFLAG; }; item SvxSearch SvxSearchItem; @@ -444,12 +444,12 @@ 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; + 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; @@ -457,8 +457,8 @@ item SvxShadow SvxShadowItem; struct SvxSize { - UINT32 Width MID_WIDTH; - UINT32 Height MID_HEIGHT; + UINT32 Width MID_WIDTH; + UINT32 Height MID_HEIGHT; }; item SvxSize SvxSizeItem; @@ -466,8 +466,8 @@ item SvxSize SvxSizeItem; struct SvxULSpace { - UINT16 Upper MID_UPPER; // % or direct - UINT16 Lower MID_LOWER; // % or direct + UINT16 Upper MID_UPPER; // % or direct + UINT16 Lower MID_LOWER; // % or direct }; item SvxULSpace SvxULSpaceItem @@ -564,8 +564,8 @@ item SvxCellOrientationEnum SvxOrientationItem; struct SvxLongLRSpace { - INT32 Left MID_LEFT; - INT32 Right MID_RIGHT; + INT32 Left MID_LEFT; + INT32 Right MID_RIGHT; }; item SvxLongLRSpace SvxLongLRSpaceItem; @@ -573,8 +573,8 @@ item SvxLongLRSpace SvxLongLRSpaceItem; struct SvxLongULSpace { - INT32 Upper MID_UPPER; - INT32 Lower MID_LOWER; + INT32 Upper MID_UPPER; + INT32 Lower MID_LOWER; }; item SvxLongULSpace SvxLongULSpaceItem; @@ -582,9 +582,9 @@ item SvxLongULSpace SvxLongULSpaceItem; struct SvxZoom { - INT32 Type MID_TYPE; - UINT16 ValueSet MID_VALUESET; - INT32 Percent MID_PERCENT; + INT32 Type MID_TYPE; + UINT16 ValueSet MID_VALUESET; + INT32 Percent MID_PERCENT; }; item SvxZoom SvxZoomItem; diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi index f96690b5c1f0..bf93f70255bc 100644 --- a/starmath/sdi/smslots.sdi +++ b/starmath/sdi/smslots.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index cb7ec0d0dee4..75311fc360c5 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -482,7 +482,7 @@ sal_Unicode SAL_CALL SmGraphicAccessible::getCharacter( sal_Int32 nIndex ) } Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttributes( - sal_Int32 nIndex, + sal_Int32 nIndex, const uno::Sequence< ::rtl::OUString > & /*rRequestedAttributes*/ ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -845,7 +845,7 @@ SmEditSource::SmEditSource( const SmEditSource &rSrc ) : aViewFwd (rSrc.rEditAcc), aTextFwd (rSrc.rEditAcc, *this), aEditViewFwd(rSrc.rEditAcc), - rEditAcc (rSrc.rEditAcc) + rEditAcc (rSrc.rEditAcc) { } @@ -1083,7 +1083,7 @@ void SmTextForwarder::RemoveAttribs( const ESelection& rSelection, sal_Bool bRem EditEngine *pEditEngine = rEditAcc.GetEditEngine(); if (pEditEngine) pEditEngine->RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich ); -} +} void SmTextForwarder::GetPortions( USHORT nPara, SvUShorts& rList ) const { @@ -1145,7 +1145,7 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe { EECharAttribArray aAttribs; - const SfxPoolItem* pLastItem = NULL; + const SfxPoolItem* pLastItem = NULL; SfxItemState eState = SFX_ITEM_DEFAULT; @@ -1167,8 +1167,8 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe // get list of char attribs rEditEngine.GetCharAttribs( nPara, aAttribs ); - BOOL bEmpty = TRUE; // we found no item inside the selektion of this paragraph - BOOL bGaps = FALSE; // we found items but theire gaps between them + BOOL bEmpty = TRUE; // we found no item inside the selektion of this paragraph + BOOL bGaps = FALSE; // we found items but theire gaps between them USHORT nLastEnd = nPos; const SfxPoolItem* pParaItem = NULL; @@ -1180,10 +1180,10 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe const sal_Bool bEmptyPortion = aAttrib.nStart == aAttrib.nEnd; if( (!bEmptyPortion && (aAttrib.nStart >= nEndPos)) || (bEmptyPortion && (aAttrib.nStart > nEndPos)) ) - break; // break if we are already behind our selektion + break; // break if we are already behind our selektion if( (!bEmptyPortion && (aAttrib.nEnd <= nPos)) || (bEmptyPortion && (aAttrib.nEnd < nPos)) ) - continue; // or if the attribute ends before our selektion + continue; // or if the attribute ends before our selektion if( aAttrib.pAttr->Which() != nWhich ) continue; // skip if is not the searched item @@ -1282,7 +1282,7 @@ Rectangle SmTextForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) const { Rectangle aRect(0,0,0,0); EditEngine *pEditEngine = rEditAcc.GetEditEngine(); - + if (pEditEngine) { // #108900# Handle virtual position one-past-the end of the string @@ -1306,7 +1306,7 @@ Rectangle SmTextForwarder::GetParaBounds( USHORT nPara ) const { Rectangle aRect(0,0,0,0); EditEngine *pEditEngine = rEditAcc.GetEditEngine(); - + if (pEditEngine) { const Point aPnt = pEditEngine->GetDocPosTopLeft( nPara ); @@ -1337,8 +1337,8 @@ sal_Bool SmTextForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPara, USH if (pEditEngine) { EPosition aDocPos = pEditEngine->FindDocPosition( rPos ); - nPara = aDocPos.nPara; - nIndex = aDocPos.nIndex; + nPara = aDocPos.nPara; + nIndex = aDocPos.nIndex; bRes = sal_True; } return bRes; @@ -1368,7 +1368,7 @@ sal_Bool SmTextForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& n sal_Bool SmTextForwarder::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); - return pEditEngine ? + return pEditEngine ? SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, *pEditEngine, nPara, nIndex ) : sal_False; } @@ -1384,18 +1384,18 @@ USHORT SmTextForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->GetLineLen(nPara, nLine) : 0; } - + void SmTextForwarder::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); pEditEngine->GetLineBoundaries(rStart, rEnd, nPara, nLine); -} +} USHORT SmTextForwarder::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->GetLineNumberAtIndex(nPara, nIndex) : 0; -} +} sal_Bool SmTextForwarder::QuickFormatDoc( BOOL /*bFull*/ ) { @@ -1478,7 +1478,7 @@ xub_StrLen SmTextForwarder::AppendTextPortion( USHORT nPara, const String &rText // append text ESelection aSel( nPara, pEditEngine->GetTextLen( nPara ) ); pEditEngine->QuickInsertText( rText, aSel ); - + // set attributes for new appended text nRes = aSel.nEndPos = pEditEngine->GetTextLen( nPara ); pEditEngine->QuickSetAttribs( rSet, aSel ); @@ -1488,7 +1488,7 @@ xub_StrLen SmTextForwarder::AppendTextPortion( USHORT nPara, const String &rText void SmTextForwarder::CopyText(const SvxTextForwarder& rSource) { - + const SmTextForwarder* pSourceForwarder = dynamic_cast< const SmTextForwarder* >( &rSource ); if( !pSourceForwarder ) return; @@ -1500,7 +1500,7 @@ void SmTextForwarder::CopyText(const SvxTextForwarder& rSource) pEditEngine->SetText( *pNewTextObject ); delete pNewTextObject; } -} +} //------------------------------------------------------------------------ diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index a71aee2a718e..3b5f4b34f4ea 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -198,7 +198,7 @@ public: class SmTextForwarder : /* analog to SvxEditEngineForwarder */ public SvxTextForwarder { - SmEditAccessible & rEditAcc; + SmEditAccessible & rEditAcc; SmEditSource & rEditSource; DECL_LINK( NotifyHdl, EENotify * ); @@ -211,64 +211,64 @@ public: SmTextForwarder( SmEditAccessible& rAcc, SmEditSource & rSource ); virtual ~SmTextForwarder(); - virtual USHORT GetParagraphCount() const; - virtual USHORT GetTextLen( USHORT nParagraph ) const; - virtual String GetText( const ESelection& rSel ) const; - virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All ) const; - virtual SfxItemSet GetParaAttribs( USHORT nPara ) const; - virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ); + virtual USHORT GetParagraphCount() const; + virtual USHORT GetTextLen( USHORT nParagraph ) const; + virtual String GetText( const ESelection& rSel ) const; + virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All ) const; + virtual SfxItemSet GetParaAttribs( USHORT nPara ) const; + virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ); virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const; + virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const; - virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const; - virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const; + virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const; + virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const; - virtual void QuickInsertText( const String& rText, const ESelection& rSel ); - virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - virtual void QuickInsertLineBreak( const ESelection& rSel ); + virtual void QuickInsertText( const String& rText, const ESelection& rSel ); + virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); + virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); + virtual void QuickInsertLineBreak( const ESelection& rSel ); virtual SfxItemPool* GetPool() const; virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked(const SvxFieldItem&, USHORT, USHORT); - virtual BOOL IsValid() const; + virtual void FieldClicked(const SvxFieldItem&, USHORT, USHORT); + virtual BOOL IsValid() const; - virtual LanguageType GetLanguage( USHORT, USHORT ) const; - virtual USHORT GetFieldCount( USHORT nPara ) const; - virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; + virtual LanguageType GetLanguage( USHORT, USHORT ) const; + virtual USHORT GetFieldCount( USHORT nPara ) const; + virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; virtual EBulletInfo GetBulletInfo( USHORT nPara ) const; - virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const; - virtual Rectangle GetParaBounds( USHORT nPara ) const; - virtual MapMode GetMapMode() const; - virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const; - virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const; - virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const; - virtual USHORT GetLineCount( USHORT nPara ) const; - virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const; + virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const; + virtual Rectangle GetParaBounds( USHORT nPara ) const; + virtual MapMode GetMapMode() const; + virtual OutputDevice* GetRefDevice() const; + virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const; + virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const; + virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const; + virtual USHORT GetLineCount( USHORT nPara ) const; + virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const; virtual void GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const; virtual USHORT GetLineNumberAtIndex( USHORT nPara, USHORT nLine ) const; - virtual sal_Bool Delete( const ESelection& ); - virtual sal_Bool InsertText( const String&, const ESelection& ); - virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ); + virtual sal_Bool Delete( const ESelection& ); + virtual sal_Bool InsertText( const String&, const ESelection& ); + virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ); virtual sal_Int16 GetDepth( USHORT nPara ) const; virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth ); - + virtual const SfxItemSet* GetEmptyItemSetPtr(); // implementation functions for XParagraphAppend and XTextPortionAppend virtual void AppendParagraph(); virtual xub_StrLen AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet ); - - virtual void CopyText(const SvxTextForwarder& rSource); + + virtual void CopyText(const SvxTextForwarder& rSource); }; class SmEditViewForwarder : /* analog to SvxEditEngineViewForwarder */ public SvxEditViewForwarder { - SmEditAccessible& rEditAcc; + SmEditAccessible& rEditAcc; // disallow copy-ctor and assignment-operator for now SmEditViewForwarder( const SmEditViewForwarder & ); @@ -278,17 +278,17 @@ public: SmEditViewForwarder( SmEditAccessible& rAcc ); virtual ~SmEditViewForwarder(); - virtual BOOL IsValid() const; + virtual BOOL IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Rectangle GetVisArea() const; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; - virtual sal_Bool GetSelection( ESelection& rSelection ) const; - virtual sal_Bool SetSelection( const ESelection& rSelection ); - virtual sal_Bool Copy(); - virtual sal_Bool Cut(); - virtual sal_Bool Paste(); + virtual sal_Bool GetSelection( ESelection& rSelection ) const; + virtual sal_Bool SetSelection( const ESelection& rSelection ); + virtual sal_Bool Copy(); + virtual sal_Bool Cut(); + virtual sal_Bool Paste(); }; @@ -300,7 +300,7 @@ class SmEditSource : SmTextForwarder aTextFwd; SmEditViewForwarder aEditViewFwd; - SmEditAccessible& rEditAcc; + SmEditAccessible& rEditAcc; // disallow copy-ctor and assignment-operator for now SmEditSource( const SmEditSource &rSrc ); @@ -312,10 +312,10 @@ public: virtual SvxEditSource* Clone() const; virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); + virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); virtual void UpdateData(); - virtual SfxBroadcaster& GetBroadcaster() const; + virtual SfxBroadcaster& GetBroadcaster() const; }; @@ -361,8 +361,8 @@ public: //! access EditEngine and EditView via the functions in the respective window //! pointers may be 0 (e.g. during reload) - EditEngine * GetEditEngine() { return pWin ? pWin->GetEditEngine() : 0; } - EditView * GetEditView() { return pWin ? pWin->GetEditView() : 0; } + EditEngine * GetEditEngine() { return pWin ? pWin->GetEditEngine() : 0; } + EditView * GetEditView() { return pWin ? pWin->GetEditView() : 0; } // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/starmath/source/action.cxx b/starmath/source/action.cxx index a7fbbc2a33bf..bccb9c49455b 100644 --- a/starmath/source/action.cxx +++ b/starmath/source/action.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 10148c9d39eb..6fd364f87b71 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -167,7 +167,7 @@ static const char * aFormatPropNames[] = }; -static Sequence< OUString > lcl_GetPropertyNames( +static Sequence< OUString > lcl_GetPropertyNames( const char * aPropNames[], USHORT nCount ) { @@ -182,7 +182,7 @@ static Sequence< OUString > lcl_GetPropertyNames( return aNames; } - + static Sequence< OUString > GetFormatPropertyNames() { USHORT nCnt = SAL_N_ELEMENTS(aFormatPropNames); @@ -236,7 +236,7 @@ SmFontFormat::SmFontFormat() nWeight = WEIGHT_DONTKNOW; nItalic = ITALIC_NONE; } - + SmFontFormat::SmFontFormat( const Font &rFont ) { @@ -261,7 +261,7 @@ const Font SmFontFormat::GetFont() const return aRes; } - + BOOL SmFontFormat::operator == ( const SmFontFormat &rFntFmt ) const { return aName == rFntFmt.aName && @@ -299,7 +299,7 @@ void SmFontFormatList::Clear() } -void SmFontFormatList::AddFontFormat( const String &rFntFmtId, +void SmFontFormatList::AddFontFormat( const String &rFntFmtId, const SmFontFormat &rFntFmt ) { const SmFontFormat *pFntFmt = GetFontFormat( rFntFmtId ); @@ -311,8 +311,8 @@ void SmFontFormatList::AddFontFormat( const String &rFntFmtId, SetModified( TRUE ); } } - - + + void SmFontFormatList::RemoveFontFormat( const String &rFntFmtId ) { USHORT nPos = 0xFFFF; @@ -333,7 +333,7 @@ void SmFontFormatList::RemoveFontFormat( const String &rFntFmtId ) } } - + const SmFontFormat * SmFontFormatList::GetFontFormat( const String &rFntFmtId ) const { SmFontFormat *pRes = 0; @@ -345,7 +345,7 @@ const SmFontFormat * SmFontFormatList::GetFontFormat( const String &rFntFmtId ) if (aEntries[i].aId == rFntFmtId) pRes = &aEntries[i].aFntFmt; } - + return pRes; } @@ -371,7 +371,7 @@ const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt ) co if (aEntries[i].aFntFmt == rFntFmt) aRes = aEntries[i].aId; } - + return aRes; } @@ -400,7 +400,7 @@ const String SmFontFormatList::GetFontFormatId( USHORT nPos ) const const String SmFontFormatList::GetNewFontFormatId() const { // returns first unused FormatId - + String aRes; String aPrefix( RTL_CONSTASCII_STRINGPARAM( "Id" ) ); @@ -429,7 +429,7 @@ SmMathConfig::SmMathConfig() : bIsOtherModified = bIsFormatModified = FALSE; } - + SmMathConfig::~SmMathConfig() { @@ -440,7 +440,7 @@ SmMathConfig::~SmMathConfig() delete pSymbolMgr; } - + void SmMathConfig::SetOtherModified( BOOL bVal ) { bIsOtherModified = bVal; @@ -461,7 +461,7 @@ void SmMathConfig::SetFontFormatListModified( BOOL bVal ) void SmMathConfig::ReadSymbol( SmSym &rSymbol, - const rtl::OUString &rSymbolName, + const rtl::OUString &rSymbolName, const rtl::OUString &rBaseNode ) const { Sequence< OUString > aNames = lcl_GetSymbolPropertyNames(); @@ -580,7 +580,7 @@ void SmMathConfig::GetSymbols( std::vector< SmSym > &rSymbols ) const Sequence< OUString > aNodes( ((SmMathConfig*) this)->GetNodeNames( A2OU( SYMBOL_LIST ) ) ); const OUString *pNode = aNodes.getConstArray(); INT32 nNodes = aNodes.getLength(); - + rSymbols.resize( nNodes ); std::vector< SmSym >::iterator aIt( rSymbols.begin() ); std::vector< SmSym >::iterator aEnd( rSymbols.end() ); @@ -598,7 +598,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols ) Sequence< OUString > aNames = lcl_GetSymbolPropertyNames(); const OUString *pNames = aNames.getConstArray(); sal_uIntPtr nSymbolProps = sal::static_int_cast< UINT32 >(aNames.getLength()); - + Sequence< PropertyValue > aValues( nCount * nSymbolProps ); PropertyValue *pValues = aValues.getArray(); @@ -685,7 +685,7 @@ void SmMathConfig::LoadFontFormatList() } pFontFormatList->SetModified( FALSE ); } - + void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat, const OUString &rSymbolName, const OUString &rBaseNode ) const @@ -755,13 +755,13 @@ void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat, void SmMathConfig::SaveFontFormatList() { SmFontFormatList &rFntFmtList = GetFontFormatList(); - + if (!rFntFmtList.IsModified()) return; Sequence< OUString > aNames = lcl_GetFontPropertyNames(); INT32 nSymbolProps = aNames.getLength(); - + USHORT nCount = rFntFmtList.GetCount(); Sequence< PropertyValue > aValues( nCount * nSymbolProps ); @@ -814,7 +814,7 @@ void SmMathConfig::SaveFontFormatList() } OSL_ENSURE( pVal - pValues == nCount * nSymbolProps, "properties missing" ); ReplaceSetProperties( A2OU( FONT_FORMAT_LIST ) , aValues ); - + rFntFmtList.SetModified( FALSE ); } @@ -823,7 +823,7 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols ) { size_t nCount = rSymbols.size(); USHORT i; - + // build list of used font-formats only //!! font-format IDs may be different !! SmFontFormatList aUsedList; @@ -860,7 +860,7 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols ) delete [] pTmpFormat; } - + void SmMathConfig::LoadOther() { if (!pOther) @@ -951,7 +951,7 @@ void SmMathConfig::SaveOther() *pValue++ <<= (BOOL) pOther->bAutoRedraw; // View/FormulaCursor *pValue++ <<= (BOOL) pOther->bFormulaCursor; - + OSL_ENSURE( pValue - pValues == nProps, "property mismatch" ); PutProperties( aNames , aValues ); @@ -963,7 +963,7 @@ void SmMathConfig::LoadFormat() if (!pFormat) pFormat = new SmFormat; - + Sequence< OUString > aNames( GetFormatPropertyNames() ); INT32 nProps = aNames.getLength(); @@ -1013,7 +1013,7 @@ void SmMathConfig::LoadFormat() ++pVal; } - LanguageType nLang = Application::GetSettings().GetUILanguage(); + LanguageType nLang = Application::GetSettings().GetUILanguage(); for (i = FNT_BEGIN; i < FNT_END; ++i) { Font aFnt; @@ -1067,7 +1067,7 @@ void SmMathConfig::SaveFormat() // StandardFormat/HorizontalAlignment *pValue++ <<= (INT16) pFormat->GetHorAlign(); // StandardFormat/BaseSize - *pValue++ <<= (INT16) SmRoundFraction( Sm100th_mmToPts( + *pValue++ <<= (INT16) SmRoundFraction( Sm100th_mmToPts( pFormat->GetBaseSize().Height() ) ); USHORT i; @@ -1090,10 +1090,10 @@ void SmMathConfig::SaveFormat() *pValue++ <<= aFntFmtId; } - + OSL_ENSURE( pValue - pValues == nProps, "property mismatch" ); PutProperties( aNames , aValues ); - + SetFormatModified( FALSE ); } @@ -1124,7 +1124,7 @@ void SmMathConfig::SetStandardFormat( const SmFormat &rFormat, BOOL bSaveFontFor } } } - + SmPrintSize SmMathConfig::GetPrintSize() const { @@ -1164,7 +1164,7 @@ void SmMathConfig::SetPrintZoomFactor( USHORT nVal ) SetOtherModified( TRUE ); } } - + void SmMathConfig::SetOtherIfNotEqual( BOOL &rbItem, BOOL bNewVal ) { diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx index 645cb6264fab..96887406489a 100644 --- a/starmath/source/cfgitem.hxx +++ b/starmath/source/cfgitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/commands.src b/starmath/source/commands.src index 9d618bbd0cf3..8a84ec218dbe 100644 --- a/starmath/source/commands.src +++ b/starmath/source/commands.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,198 +32,198 @@ //////////////////////////////////////////////////////////// -String RID_PLUSX { Text = "+<?> " ; }; -String RID_MINUSX { Text = "-<?> " ; }; -String RID_PLUSMINUSX { Text = "+-<?> " ; }; -String RID_MINUSPLUSX { Text = "-+<?> " ; }; -String RID_NEGX { Text = "neg <?> " ; }; -String RID_XPLUSY { Text = "<?> + <?> " ; }; -String RID_XMINUSY { Text = "<?> - <?> " ; }; -String RID_XCDOTY { Text = "<?> cdot <?> " ; }; -String RID_XTIMESY { Text = "<?> times <?> " ; }; -String RID_XSYMTIMESY { Text = "<?> * <?> " ; }; -String RID_XSYMDIVIDEY { Text = "<?> / <?> " ; }; -String RID_XDIVY { Text = "<?> div <?> " ; }; +String RID_PLUSX { Text = "+<?> " ; }; +String RID_MINUSX { Text = "-<?> " ; }; +String RID_PLUSMINUSX { Text = "+-<?> " ; }; +String RID_MINUSPLUSX { Text = "-+<?> " ; }; +String RID_NEGX { Text = "neg <?> " ; }; +String RID_XPLUSY { Text = "<?> + <?> " ; }; +String RID_XMINUSY { Text = "<?> - <?> " ; }; +String RID_XCDOTY { Text = "<?> cdot <?> " ; }; +String RID_XTIMESY { Text = "<?> times <?> " ; }; +String RID_XSYMTIMESY { Text = "<?> * <?> " ; }; +String RID_XSYMDIVIDEY { Text = "<?> / <?> " ; }; +String RID_XDIVY { Text = "<?> div <?> " ; }; String RID_XOVERY { Text = "{<?>} over {<?>} " ; }; -String RID_XODIVIDEY { Text = "<?> odivide <?> " ; }; -String RID_XODOTY { Text = "<?> odot <?> " ; }; -String RID_XOMINUSY { Text = "<?> ominus <?> " ; }; -String RID_XOPLUSY { Text = "<?> oplus <?> " ; }; -String RID_XOTIMESY { Text = "<?> otimes <?> " ; }; -String RID_XANDY { Text = "<?> and <?> " ; }; -String RID_XORY { Text = "<?> or <?> " ; }; -String RID_XEQY { Text = "<?> = <?> " ; }; -String RID_XNEQY { Text = "<?> <> <?> " ; }; -String RID_XLTY { Text = "<?> < <?> " ; }; -String RID_XGTY { Text = "<?> > <?> " ; }; -String RID_XLEY { Text = "<?> <= <?> " ; }; -String RID_XGEY { Text = "<?> >= <?> " ; }; -String RID_XLESLANTY { Text = "<?> leslant <?> " ; }; -String RID_XGESLANTY { Text = "<?> geslant <?> " ; }; -String RID_XLLY { Text = "<?> << <?> " ; }; -String RID_XGGY { Text = "<?> >> <?> " ; }; -String RID_XDEFY { Text = "<?> def <?> " ; }; -String RID_XEQUIVY { Text = "<?> equiv <?> " ; }; -String RID_XAPPROXY { Text = "<?> approx <?> " ; }; -String RID_XSIMY { Text = "<?> sim <?> " ; }; -String RID_XSIMEQY { Text = "<?> simeq <?> " ; }; -String RID_XPROPY { Text = "<?> prop <?> " ; }; -String RID_XORTHOY { Text = "<?> ortho <?> " ; }; -String RID_XPARALLELY { Text = "<?> parallel <?> " ; }; -String RID_XTOWARDY { Text = "<?> toward <?> " ; }; -String RID_XTRANSLY { Text = "<?> transl <?> " ; }; -String RID_XTRANSRY { Text = "<?> transr <?> " ; }; -String RID_XINY { Text = "<?> in <?> " ; }; -String RID_XNOTINY { Text = "<?> notin <?> " ; }; -String RID_XOWNSY { Text = "<?> owns <?> " ; }; -String RID_XUNIONY { Text = "<?> union <?> " ; }; -String RID_XINTERSECTIONY { Text = "<?> intersection <?> " ; }; -String RID_XSETMINUSY { Text = "<?> setminus <?> " ; }; -String RID_XSLASHY { Text = "<?> slash <?> " ; }; -String RID_XSUBSETY { Text = "<?> subset <?> " ; }; -String RID_XSUBSETEQY { Text = "<?> subseteq <?> " ; }; -String RID_XSUPSETY { Text = "<?> supset <?> " ; }; -String RID_XSUPSETEQY { Text = "<?> supseteq <?> " ; }; -String RID_XNSUBSETY { Text = "<?> nsubset <?> " ; }; -String RID_XNSUBSETEQY { Text = "<?> nsubseteq <?> " ; }; -String RID_XNSUPSETY { Text = "<?> nsupset <?> " ; }; -String RID_XNSUPSETEQY { Text = "<?> nsupseteq <?> " ; }; -String RID_ABSX { Text = "abs{<?>} " ; }; +String RID_XODIVIDEY { Text = "<?> odivide <?> " ; }; +String RID_XODOTY { Text = "<?> odot <?> " ; }; +String RID_XOMINUSY { Text = "<?> ominus <?> " ; }; +String RID_XOPLUSY { Text = "<?> oplus <?> " ; }; +String RID_XOTIMESY { Text = "<?> otimes <?> " ; }; +String RID_XANDY { Text = "<?> and <?> " ; }; +String RID_XORY { Text = "<?> or <?> " ; }; +String RID_XEQY { Text = "<?> = <?> " ; }; +String RID_XNEQY { Text = "<?> <> <?> " ; }; +String RID_XLTY { Text = "<?> < <?> " ; }; +String RID_XGTY { Text = "<?> > <?> " ; }; +String RID_XLEY { Text = "<?> <= <?> " ; }; +String RID_XGEY { Text = "<?> >= <?> " ; }; +String RID_XLESLANTY { Text = "<?> leslant <?> " ; }; +String RID_XGESLANTY { Text = "<?> geslant <?> " ; }; +String RID_XLLY { Text = "<?> << <?> " ; }; +String RID_XGGY { Text = "<?> >> <?> " ; }; +String RID_XDEFY { Text = "<?> def <?> " ; }; +String RID_XEQUIVY { Text = "<?> equiv <?> " ; }; +String RID_XAPPROXY { Text = "<?> approx <?> " ; }; +String RID_XSIMY { Text = "<?> sim <?> " ; }; +String RID_XSIMEQY { Text = "<?> simeq <?> " ; }; +String RID_XPROPY { Text = "<?> prop <?> " ; }; +String RID_XORTHOY { Text = "<?> ortho <?> " ; }; +String RID_XPARALLELY { Text = "<?> parallel <?> " ; }; +String RID_XTOWARDY { Text = "<?> toward <?> " ; }; +String RID_XTRANSLY { Text = "<?> transl <?> " ; }; +String RID_XTRANSRY { Text = "<?> transr <?> " ; }; +String RID_XINY { Text = "<?> in <?> " ; }; +String RID_XNOTINY { Text = "<?> notin <?> " ; }; +String RID_XOWNSY { Text = "<?> owns <?> " ; }; +String RID_XUNIONY { Text = "<?> union <?> " ; }; +String RID_XINTERSECTIONY { Text = "<?> intersection <?> " ; }; +String RID_XSETMINUSY { Text = "<?> setminus <?> " ; }; +String RID_XSLASHY { Text = "<?> slash <?> " ; }; +String RID_XSUBSETY { Text = "<?> subset <?> " ; }; +String RID_XSUBSETEQY { Text = "<?> subseteq <?> " ; }; +String RID_XSUPSETY { Text = "<?> supset <?> " ; }; +String RID_XSUPSETEQY { Text = "<?> supseteq <?> " ; }; +String RID_XNSUBSETY { Text = "<?> nsubset <?> " ; }; +String RID_XNSUBSETEQY { Text = "<?> nsubseteq <?> " ; }; +String RID_XNSUPSETY { Text = "<?> nsupset <?> " ; }; +String RID_XNSUPSETEQY { Text = "<?> nsupseteq <?> " ; }; +String RID_ABSX { Text = "abs{<?>} " ; }; String RID_FACTX { Text = "fact {<?>} " ; }; -String RID_SQRTX { Text = "sqrt{<?>} " ; }; -String RID_NROOTXY { Text = "nroot{<?>}{<?>} " ; }; -String RID_EX { Text = "func e^{<?>} " ; }; -String RID_EXPX { Text = "exp(<?>) " ; }; -String RID_LNX { Text = "ln(<?>) " ; }; -String RID_LOGX { Text = "log(<?>) " ; }; -String RID_SINX { Text = "sin(<?>) " ; }; -String RID_COSX { Text = "cos(<?>) " ; }; -String RID_TANX { Text = "tan(<?>) " ; }; -String RID_COTX { Text = "cot(<?>) " ; }; -String RID_ARCSINX { Text = "arcsin(<?>) " ; }; -String RID_ARCCOSX { Text = "arccos(<?>) " ; }; -String RID_ARCTANX { Text = "arctan(<?>) " ; }; -String RID_ARCCOTX { Text = "arccot(<?>) " ; }; -String RID_SINHX { Text = "sinh(<?>) " ; }; -String RID_COSHX { Text = "cosh(<?>) " ; }; -String RID_TANHX { Text = "tanh(<?>) " ; }; -String RID_COTHX { Text = "coth(<?>) " ; }; -String RID_ARSINHX { Text = "arsinh(<?>) " ; }; -String RID_ARCOSHX { Text = "arcosh(<?>) " ; }; -String RID_ARTANHX { Text = "artanh(<?>) " ; }; -String RID_ARCOTHX { Text = "arcoth(<?>) " ; }; -String RID_SUMX { Text = "sum <?> " ; }; -String RID_PRODX { Text = "prod <?> " ; }; -String RID_COPRODX { Text = "coprod <?> " ; }; -String RID_LIMX { Text = "lim <?> " ; }; -String RID_LIMINFX { Text = "liminf <?> " ; }; -String RID_LIMSUPX { Text = "limsup <?> " ; }; -String RID_EXISTS { Text = "exists " ; }; -String RID_FORALL { Text = "forall " ; }; -String RID_INTX { Text = "int <?> " ; }; -String RID_IINTX { Text = "iint <?> " ; }; -String RID_IIINTX { Text = "iiint <?> " ; }; -String RID_LINTX { Text = "lint <?> " ; }; -String RID_LLINTX { Text = "llint <?> " ; }; -String RID_LLLINTX { Text = "lllint <?> " ; }; -String RID_FROMX { Text = "from{<?>} <?> " ; }; -String RID_TOX { Text = "to{<?>} <?> " ; }; -String RID_FROMXTOY { Text = "from{<?>} to{<?>} <?> " ; }; -String RID_ACUTEX { Text = "acute <?> " ; }; -String RID_BARX { Text = "bar <?> " ; }; -String RID_BREVEX { Text = "breve <?> " ; }; -String RID_CHECKX { Text = "check <?> " ; }; -String RID_CIRCLEX { Text = "circle <?> " ; }; -String RID_DOTX { Text = "dot <?> " ; }; -String RID_DDOTX { Text = "ddot <?> " ; }; -String RID_DDDOTX { Text = "dddot <?> " ; }; -String RID_GRAVEX { Text = "grave <?> " ; }; -String RID_HATX { Text = "hat <?> " ; }; -String RID_TILDEX { Text = "tilde <?> " ; }; -String RID_VECX { Text = "vec <?> " ; }; +String RID_SQRTX { Text = "sqrt{<?>} " ; }; +String RID_NROOTXY { Text = "nroot{<?>}{<?>} " ; }; +String RID_EX { Text = "func e^{<?>} " ; }; +String RID_EXPX { Text = "exp(<?>) " ; }; +String RID_LNX { Text = "ln(<?>) " ; }; +String RID_LOGX { Text = "log(<?>) " ; }; +String RID_SINX { Text = "sin(<?>) " ; }; +String RID_COSX { Text = "cos(<?>) " ; }; +String RID_TANX { Text = "tan(<?>) " ; }; +String RID_COTX { Text = "cot(<?>) " ; }; +String RID_ARCSINX { Text = "arcsin(<?>) " ; }; +String RID_ARCCOSX { Text = "arccos(<?>) " ; }; +String RID_ARCTANX { Text = "arctan(<?>) " ; }; +String RID_ARCCOTX { Text = "arccot(<?>) " ; }; +String RID_SINHX { Text = "sinh(<?>) " ; }; +String RID_COSHX { Text = "cosh(<?>) " ; }; +String RID_TANHX { Text = "tanh(<?>) " ; }; +String RID_COTHX { Text = "coth(<?>) " ; }; +String RID_ARSINHX { Text = "arsinh(<?>) " ; }; +String RID_ARCOSHX { Text = "arcosh(<?>) " ; }; +String RID_ARTANHX { Text = "artanh(<?>) " ; }; +String RID_ARCOTHX { Text = "arcoth(<?>) " ; }; +String RID_SUMX { Text = "sum <?> " ; }; +String RID_PRODX { Text = "prod <?> " ; }; +String RID_COPRODX { Text = "coprod <?> " ; }; +String RID_LIMX { Text = "lim <?> " ; }; +String RID_LIMINFX { Text = "liminf <?> " ; }; +String RID_LIMSUPX { Text = "limsup <?> " ; }; +String RID_EXISTS { Text = "exists " ; }; +String RID_FORALL { Text = "forall " ; }; +String RID_INTX { Text = "int <?> " ; }; +String RID_IINTX { Text = "iint <?> " ; }; +String RID_IIINTX { Text = "iiint <?> " ; }; +String RID_LINTX { Text = "lint <?> " ; }; +String RID_LLINTX { Text = "llint <?> " ; }; +String RID_LLLINTX { Text = "lllint <?> " ; }; +String RID_FROMX { Text = "from{<?>} <?> " ; }; +String RID_TOX { Text = "to{<?>} <?> " ; }; +String RID_FROMXTOY { Text = "from{<?>} to{<?>} <?> " ; }; +String RID_ACUTEX { Text = "acute <?> " ; }; +String RID_BARX { Text = "bar <?> " ; }; +String RID_BREVEX { Text = "breve <?> " ; }; +String RID_CHECKX { Text = "check <?> " ; }; +String RID_CIRCLEX { Text = "circle <?> " ; }; +String RID_DOTX { Text = "dot <?> " ; }; +String RID_DDOTX { Text = "ddot <?> " ; }; +String RID_DDDOTX { Text = "dddot <?> " ; }; +String RID_GRAVEX { Text = "grave <?> " ; }; +String RID_HATX { Text = "hat <?> " ; }; +String RID_TILDEX { Text = "tilde <?> " ; }; +String RID_VECX { Text = "vec <?> " ; }; String RID_UNDERLINEX { Text = "underline {<?>} " ; }; String RID_OVERLINEX { Text = "overline {<?>} " ; }; String RID_OVERSTRIKEX { Text = "overstrike {<?>} " ; }; String RID_PHANTOMX { Text = "phantom {<?>} " ; }; -String RID_BOLDX { Text = "bold <?> " ; }; -String RID_ITALX { Text = "ital <?> " ; }; +String RID_BOLDX { Text = "bold <?> " ; }; +String RID_ITALX { Text = "ital <?> " ; }; String RID_SIZEXY { Text = "size <?> {<?>} " ; }; String RID_FONTXY { Text = "font <?> {<?>} " ; }; String RID_COLORX { Text = "color <?> {<?>} " ; }; -String RID_LRGROUPX { Text = "{<?>} " ; }; -String RID_LRPARENTX { Text = "(<?>) " ; }; -String RID_LRBRACKETX { Text = "[<?>] " ; }; -String RID_LRDBRACKETX { Text = "ldbracket <?> rdbracket " ; }; -String RID_LRBRACEX { Text = "lbrace <?> rbrace " ; }; -String RID_LRANGLEX { Text = "langle <?> rangle " ; }; -String RID_LRCEILX { Text = "lceil <?> rceil " ; }; -String RID_LRFLOORX { Text = "lfloor <?> rfloor " ; }; -String RID_LRLINEX { Text = "lline <?> rline " ; }; -String RID_LRDLINEX { Text = "ldline <?> rdline " ; }; -String RID_LMRANGLEXY { Text = "langle <?> mline <?> rangle " ; }; -String RID_SLRPARENTX { Text = "left ( <?> right ) " ; }; -String RID_SLRBRACKETX { Text = "left [ <?> right ] " ; }; -String RID_SLRDBRACKETX { Text = "left ldbracket <?> right rdbracket " ; }; -String RID_SLRBRACEX { Text = "left lbrace <?> right rbrace " ; }; -String RID_SLRANGLEX { Text = "left langle <?> right rangle " ; }; -String RID_SLRCEILX { Text = "left lceil <?> right rceil " ; }; -String RID_SLRFLOORX { Text = "left lfloor <?> right rfloor " ; }; -String RID_SLRLINEX { Text = "left lline <?> right rline " ; }; -String RID_SLRDLINEX { Text = "left ldline <?> right rdline " ; }; -String RID_SLMRANGLEXY { Text = "left langle <?> mline <?> right rangle " ; }; +String RID_LRGROUPX { Text = "{<?>} " ; }; +String RID_LRPARENTX { Text = "(<?>) " ; }; +String RID_LRBRACKETX { Text = "[<?>] " ; }; +String RID_LRDBRACKETX { Text = "ldbracket <?> rdbracket " ; }; +String RID_LRBRACEX { Text = "lbrace <?> rbrace " ; }; +String RID_LRANGLEX { Text = "langle <?> rangle " ; }; +String RID_LRCEILX { Text = "lceil <?> rceil " ; }; +String RID_LRFLOORX { Text = "lfloor <?> rfloor " ; }; +String RID_LRLINEX { Text = "lline <?> rline " ; }; +String RID_LRDLINEX { Text = "ldline <?> rdline " ; }; +String RID_LMRANGLEXY { Text = "langle <?> mline <?> rangle " ; }; +String RID_SLRPARENTX { Text = "left ( <?> right ) " ; }; +String RID_SLRBRACKETX { Text = "left [ <?> right ] " ; }; +String RID_SLRDBRACKETX { Text = "left ldbracket <?> right rdbracket " ; }; +String RID_SLRBRACEX { Text = "left lbrace <?> right rbrace " ; }; +String RID_SLRANGLEX { Text = "left langle <?> right rangle " ; }; +String RID_SLRCEILX { Text = "left lceil <?> right rceil " ; }; +String RID_SLRFLOORX { Text = "left lfloor <?> right rfloor " ; }; +String RID_SLRLINEX { Text = "left lline <?> right rline " ; }; +String RID_SLRDLINEX { Text = "left ldline <?> right rdline " ; }; +String RID_SLMRANGLEXY { Text = "left langle <?> mline <?> right rangle " ; }; String RID_XOVERBRACEY { Text = "{<?>} overbrace {<?>} " ; }; String RID_XUNDERBRACEY { Text = "{<?>} underbrace {<?>} " ; }; -String RID_RSUBX { Text = "<?>_{<?>}" ; }; -String RID_RSUPX { Text = "<?>^{<?>}" ; }; -String RID_LSUBX { Text = "<?> lsub{<?>} " ; }; -String RID_LSUPX { Text = "<?> lsup{<?>} " ; }; -String RID_CSUBX { Text = "<?> csub{<?>} " ; }; -String RID_CSUPX { Text = "<?> csup{<?>} " ; }; -String RID_SBLANK { Text = "`" ; }; -String RID_BLANK { Text = "~" ; }; -String RID_NEWLINE { Text = "newline " ; }; -String RID_BINOMXY { Text = "binom{<?>}{<?>} " ; }; -String RID_STACK { Text = "stack{<?> # <?> # <?>} " ; }; -String RID_MATRIX { Text = "matrix{<?> # <?> ## <?> # <?>} " ; }; -String RID_ALIGNLX { Text = "alignl <?> " ; }; -String RID_ALIGNCX { Text = "alignc <?> " ; }; -String RID_ALIGNRX { Text = "alignr <?> " ; }; -String RID_ALEPH { Text = "aleph " ; }; -String RID_EMPTYSET { Text = "emptyset " ; }; -String RID_RE { Text = "Re " ; }; -String RID_IM { Text = "Im " ; }; -String RID_INFINITY { Text = "infinity " ; }; -String RID_PARTIAL { Text = "partial " ; }; -String RID_NABLA { Text = "nabla " ; }; -String RID_WP { Text = "wp " ; }; -String RID_DOTSAXIS { Text = "dotsaxis " ; }; -String RID_DOTSUP { Text = "dotsup " ; }; -String RID_DOTSDOWN { Text = "dotsdown " ; }; -String RID_DOTSLOW { Text = "dotslow " ; }; -String RID_DOTSVERT { Text = "dotsvert " ; }; -String RID_XCIRCY { Text = "<?> circ <?> " ; }; +String RID_RSUBX { Text = "<?>_{<?>}" ; }; +String RID_RSUPX { Text = "<?>^{<?>}" ; }; +String RID_LSUBX { Text = "<?> lsub{<?>} " ; }; +String RID_LSUPX { Text = "<?> lsup{<?>} " ; }; +String RID_CSUBX { Text = "<?> csub{<?>} " ; }; +String RID_CSUPX { Text = "<?> csup{<?>} " ; }; +String RID_SBLANK { Text = "`" ; }; +String RID_BLANK { Text = "~" ; }; +String RID_NEWLINE { Text = "newline " ; }; +String RID_BINOMXY { Text = "binom{<?>}{<?>} " ; }; +String RID_STACK { Text = "stack{<?> # <?> # <?>} " ; }; +String RID_MATRIX { Text = "matrix{<?> # <?> ## <?> # <?>} " ; }; +String RID_ALIGNLX { Text = "alignl <?> " ; }; +String RID_ALIGNCX { Text = "alignc <?> " ; }; +String RID_ALIGNRX { Text = "alignr <?> " ; }; +String RID_ALEPH { Text = "aleph " ; }; +String RID_EMPTYSET { Text = "emptyset " ; }; +String RID_RE { Text = "Re " ; }; +String RID_IM { Text = "Im " ; }; +String RID_INFINITY { Text = "infinity " ; }; +String RID_PARTIAL { Text = "partial " ; }; +String RID_NABLA { Text = "nabla " ; }; +String RID_WP { Text = "wp " ; }; +String RID_DOTSAXIS { Text = "dotsaxis " ; }; +String RID_DOTSUP { Text = "dotsup " ; }; +String RID_DOTSDOWN { Text = "dotsdown " ; }; +String RID_DOTSLOW { Text = "dotslow " ; }; +String RID_DOTSVERT { Text = "dotsvert " ; }; +String RID_XCIRCY { Text = "<?> circ <?> " ; }; String RID_XWIDESLASHY { Text = "{<?>} wideslash {<?>} " ; }; String RID_XWIDEBSLASHY { Text = "<?> widebslash <?> " ; }; -String RID_XDIVIDESY { Text = "<?> divides <?> " ; }; -String RID_XNDIVIDESY { Text = "<?> ndivides <?> " ; }; -String RID_DLARROW { Text = "<?> dlarrow <?> " ; }; -String RID_DLRARROW { Text = "<?> dlrarrow <?> " ; }; -String RID_DRARROW { Text = "<?> drarrow <?> " ; }; -String RID_SETN { Text = "setN " ; }; -String RID_SETZ { Text = "setZ " ; }; -String RID_SETQ { Text = "setQ " ; }; -String RID_SETR { Text = "setR " ; }; -String RID_SETC { Text = "setC " ; }; +String RID_XDIVIDESY { Text = "<?> divides <?> " ; }; +String RID_XNDIVIDESY { Text = "<?> ndivides <?> " ; }; +String RID_DLARROW { Text = "<?> dlarrow <?> " ; }; +String RID_DLRARROW { Text = "<?> dlrarrow <?> " ; }; +String RID_DRARROW { Text = "<?> drarrow <?> " ; }; +String RID_SETN { Text = "setN " ; }; +String RID_SETZ { Text = "setZ " ; }; +String RID_SETQ { Text = "setQ " ; }; +String RID_SETR { Text = "setR " ; }; +String RID_SETC { Text = "setC " ; }; String RID_WIDEHATX { Text = "widehat {<?>} " ; }; String RID_WIDETILDEX { Text = "widetilde {<?>} " ; }; String RID_WIDEVECX { Text = "widevec {<?>} " ; }; -String RID_HBAR { Text = "hbar " ; }; -String RID_LAMBDABAR { Text = "lambdabar " ; }; -String RID_LEFTARROW { Text = "leftarrow " ; }; -String RID_RIGHTARROW { Text = "rightarrow " ; }; -String RID_UPARROW { Text = "uparrow " ; }; -String RID_DOWNARROW { Text = "downarrow " ; }; -String RID_NOSPACE { Text = "nospace {<?>} " ; }; +String RID_HBAR { Text = "hbar " ; }; +String RID_LAMBDABAR { Text = "lambdabar " ; }; +String RID_LEFTARROW { Text = "leftarrow " ; }; +String RID_RIGHTARROW { Text = "rightarrow " ; }; +String RID_UPARROW { Text = "uparrow " ; }; +String RID_DOWNARROW { Text = "downarrow " ; }; +String RID_NOSPACE { Text = "nospace {<?>} " ; }; ////////////////////////////////////////// diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx index 38fa63429215..0930c107052e 100644 --- a/starmath/source/config.cxx +++ b/starmath/source/config.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,36 +61,36 @@ SmConfig::~SmConfig() void SmConfig::ItemSetToConfig(const SfxItemSet &rSet) { - const SfxPoolItem *pItem = NULL; + const SfxPoolItem *pItem = NULL; UINT16 nU16; BOOL bVal; if (rSet.GetItemState(SID_PRINTSIZE, TRUE, &pItem) == SFX_ITEM_SET) - { nU16 = ((const SfxUInt16Item *) pItem)->GetValue(); + { nU16 = ((const SfxUInt16Item *) pItem)->GetValue(); SetPrintSize( (SmPrintSize) nU16 ); } if (rSet.GetItemState(SID_PRINTZOOM, TRUE, &pItem) == SFX_ITEM_SET) - { nU16 = ((const SfxUInt16Item *) pItem)->GetValue(); + { nU16 = ((const SfxUInt16Item *) pItem)->GetValue(); SetPrintZoomFactor( nU16 ); } if (rSet.GetItemState(SID_PRINTTITLE, TRUE, &pItem) == SFX_ITEM_SET) - { bVal = ((const SfxBoolItem *) pItem)->GetValue(); + { bVal = ((const SfxBoolItem *) pItem)->GetValue(); SetPrintTitle( bVal ); } if (rSet.GetItemState(SID_PRINTTEXT, TRUE, &pItem) == SFX_ITEM_SET) - { bVal = ((const SfxBoolItem *) pItem)->GetValue(); + { bVal = ((const SfxBoolItem *) pItem)->GetValue(); SetPrintFormulaText( bVal ); } if (rSet.GetItemState(SID_PRINTFRAME, TRUE, &pItem) == SFX_ITEM_SET) - { bVal = ((const SfxBoolItem *) pItem)->GetValue(); + { bVal = ((const SfxBoolItem *) pItem)->GetValue(); SetPrintFrame( bVal ); } if (rSet.GetItemState(SID_AUTOREDRAW, TRUE, &pItem) == SFX_ITEM_SET) - { bVal = ((const SfxBoolItem *) pItem)->GetValue(); + { bVal = ((const SfxBoolItem *) pItem)->GetValue(); SetAutoRedraw( bVal ); } if (rSet.GetItemState(SID_NO_RIGHT_SPACES, TRUE, &pItem) == SFX_ITEM_SET) - { bVal = ((const SfxBoolItem *) pItem)->GetValue(); + { bVal = ((const SfxBoolItem *) pItem)->GetValue(); if (IsIgnoreSpacesRight() != bVal) { SetIgnoreSpacesRight( bVal ); diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx index d3800b09e9ac..61b4745b86a6 100644 --- a/starmath/source/detreg.cxx +++ b/starmath/source/detreg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ void SAL_CALL component_getImplementationEnvironment( } sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, - void* pRegistryKey ) + void* pRegistryKey ) { Reference< ::registry::XRegistryKey > xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ; @@ -79,9 +79,9 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, // Set default return value for this operation - if it failed. void* pReturn = NULL ; - if ( - ( pImplementationName != NULL ) && - ( pServiceManager != NULL ) + if ( + ( pImplementationName != NULL ) && + ( pServiceManager != NULL ) ) { // Define variables which are used in following macros. diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index e69c0c31fa09..518d9285a458 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -177,16 +177,16 @@ IMPL_LINK_INLINE_END( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, pButt SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet &rOptions) : SfxTabPage(pParent, SmResId(RID_PRINTOPTIONPAGE), rOptions), aFixedLine1 (this, SmResId( FL_PRINTOPTIONS )), - aTitle (this, SmResId( CB_TITLEROW )), - aText (this, SmResId( CB_EQUATION_TEXT )), - aFrame (this, SmResId( CB_FRAME )), + aTitle (this, SmResId( CB_TITLEROW )), + aText (this, SmResId( CB_EQUATION_TEXT )), + aFrame (this, SmResId( CB_FRAME )), aFixedLine2 (this, SmResId( FL_PRINT_FORMAT )), - aSizeNormal (this, SmResId( RB_ORIGINAL_SIZE )), - aSizeScaled (this, SmResId( RB_FIT_TO_PAGE )), - aSizeZoomed (this, SmResId( RB_ZOOM )), - aZoom (this, SmResId( MF_ZOOM )), + aSizeNormal (this, SmResId( RB_ORIGINAL_SIZE )), + aSizeScaled (this, SmResId( RB_FIT_TO_PAGE )), + aSizeZoomed (this, SmResId( RB_ZOOM )), + aZoom (this, SmResId( MF_ZOOM )), aFixedLine3 (this, SmResId( FL_MISC_OPTIONS )), - aNoRightSpaces (this, SmResId( CB_IGNORE_SPACING )) + aNoRightSpaces (this, SmResId( CB_IGNORE_SPACING )) { FreeResource(); @@ -250,8 +250,8 @@ void SmShowFont::Paint(const Rectangle& rRect ) { Control::Paint( rRect ); - XubString Text (GetFont().GetName()); - Size TextSize(GetTextWidth(Text), GetTextHeight()); + XubString Text (GetFont().GetName()); + Size TextSize(GetTextWidth(Text), GetTextHeight()); DrawText(Point((GetOutputSize().Width() - TextSize.Width()) / 2, (GetOutputSize().Height() - TextSize.Height()) / 2), Text); @@ -326,13 +326,13 @@ void SmFontDialog::SetFont(const Font &rFont) SmFontDialog::SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, BOOL bHideCheckboxes, BOOL bFreeRes) : ModalDialog(pParent,SmResId(RID_FONTDIALOG)), - aFixedText1 (this, SmResId(1)), - aFontBox (this, SmResId(1)), - aBoldCheckBox (this, SmResId(1)), + aFixedText1 (this, SmResId(1)), + aFontBox (this, SmResId(1)), + aBoldCheckBox (this, SmResId(1)), aItalicCheckBox (this, SmResId(2)), - aOKButton1 (this, SmResId(1)), - aCancelButton1 (this, SmResId(1)), - aShowFont (this, SmResId(1)), + aOKButton1 (this, SmResId(1)), + aCancelButton1 (this, SmResId(1)), + aShowFont (this, SmResId(1)), aFixedText2 (this, SmResId(2)) { if (bFreeRes) @@ -479,11 +479,11 @@ void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const { rFormat.SetBaseSize( Size(0, SmPtsTo100th_mm( static_cast< long >(aBaseSize.GetValue()))) ); - rFormat.SetRelSize(SIZ_TEXT, (USHORT) aTextSize .GetValue()); - rFormat.SetRelSize(SIZ_INDEX, (USHORT) aIndexSize .GetValue()); + rFormat.SetRelSize(SIZ_TEXT, (USHORT) aTextSize .GetValue()); + rFormat.SetRelSize(SIZ_INDEX, (USHORT) aIndexSize .GetValue()); rFormat.SetRelSize(SIZ_FUNCTION, (USHORT) aFunctionSize.GetValue()); rFormat.SetRelSize(SIZ_OPERATOR, (USHORT) aOperatorSize.GetValue()); - rFormat.SetRelSize(SIZ_LIMITS, (USHORT) aBorderSize .GetValue()); + rFormat.SetRelSize(SIZ_LIMITS, (USHORT) aBorderSize .GetValue()); const Size aTmp (rFormat.GetBaseSize()); for (USHORT i = FNT_BEGIN; i <= FNT_END; i++) @@ -505,8 +505,8 @@ IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu ) { case 1: pActiveListBox = &aVariableFont; break; case 2: pActiveListBox = &aFunctionFont; break; - case 3: pActiveListBox = &aNumberFont; break; - case 4: pActiveListBox = &aTextFont; break; + case 3: pActiveListBox = &aNumberFont; break; + case 4: pActiveListBox = &aTextFont; break; case 5: pActiveListBox = &aSerifFont; bHideCheckboxes = TRUE; break; case 6: pActiveListBox = &aSansFont; bHideCheckboxes = TRUE; break; case 7: pActiveListBox = &aFixedFont; bHideCheckboxes = TRUE; break; @@ -552,16 +552,16 @@ SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice *pFntListDevic aFixedText3 (this, SmResId(3)), aNumberFont (this, SmResId(3)), aFixedText4 (this, SmResId(4)), - aTextFont (this, SmResId(4)), + aTextFont (this, SmResId(4)), aFixedText5 (this, SmResId(5)), - aSerifFont (this, SmResId(5)), + aSerifFont (this, SmResId(5)), aFixedText6 (this, SmResId(6)), - aSansFont (this, SmResId(6)), + aSansFont (this, SmResId(6)), aFixedText7 (this, SmResId(7)), - aFixedFont (this, SmResId(7)), + aFixedFont (this, SmResId(7)), aFixedLine1 (this, SmResId(1)), aFixedLine2 (this, SmResId(2)), - aOKButton1 (this, SmResId(1)), + aOKButton1 (this, SmResId(1)), aCancelButton1 (this, SmResId(1)), aMenuButton (this, SmResId(1)), aDefaultButton (this, SmResId(2)), @@ -582,10 +582,10 @@ void SmFontTypeDialog::ReadFrom(const SmFormat &rFormat) aVariableFont = pp->GetConfig()->GetFontPickList(FNT_VARIABLE); aFunctionFont = pp->GetConfig()->GetFontPickList(FNT_FUNCTION); aNumberFont = pp->GetConfig()->GetFontPickList(FNT_NUMBER); - aTextFont = pp->GetConfig()->GetFontPickList(FNT_TEXT); - aSerifFont = pp->GetConfig()->GetFontPickList(FNT_SERIF); - aSansFont = pp->GetConfig()->GetFontPickList(FNT_SANS); - aFixedFont = pp->GetConfig()->GetFontPickList(FNT_FIXED); + aTextFont = pp->GetConfig()->GetFontPickList(FNT_TEXT); + aSerifFont = pp->GetConfig()->GetFontPickList(FNT_SERIF); + aSansFont = pp->GetConfig()->GetFontPickList(FNT_SANS); + aFixedFont = pp->GetConfig()->GetFontPickList(FNT_FIXED); aVariableFont.Insert( rFormat.GetFont(FNT_VARIABLE) ); aFunctionFont.Insert( rFormat.GetFont(FNT_FUNCTION) ); @@ -604,9 +604,9 @@ void SmFontTypeDialog::WriteTo(SmFormat &rFormat) const pp->GetConfig()->GetFontPickList(FNT_VARIABLE) = aVariableFont; pp->GetConfig()->GetFontPickList(FNT_FUNCTION) = aFunctionFont; pp->GetConfig()->GetFontPickList(FNT_NUMBER) = aNumberFont; - pp->GetConfig()->GetFontPickList(FNT_TEXT) = aTextFont; + pp->GetConfig()->GetFontPickList(FNT_TEXT) = aTextFont; pp->GetConfig()->GetFontPickList(FNT_SERIF) = aSerifFont; - pp->GetConfig()->GetFontPickList(FNT_SANS) = aSansFont; + pp->GetConfig()->GetFontPickList(FNT_SANS) = aSansFont; pp->GetConfig()->GetFontPickList(FNT_FIXED) = aFixedFont; rFormat.SetFont( FNT_VARIABLE, aVariableFont.Get(0) ); @@ -632,25 +632,25 @@ struct FieldMinMax static const FieldMinMax pMinMaxData[10][4] = { // 0 - {{ 0, 200 }, { 0, 200 }, { 0, 100 }, { 0, 0 }}, + {{ 0, 200 }, { 0, 200 }, { 0, 100 }, { 0, 0 }}, // 1 - {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }}, + {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }}, // 2 - {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }}, + {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }}, // 3 - {{ 0, 100 }, { 1, 100 }, { 0, 0 }, { 0, 0 }}, + {{ 0, 100 }, { 1, 100 }, { 0, 0 }, { 0, 0 }}, // 4 - {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }}, + {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }}, // 5 - {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 100 }}, + {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 100 }}, // 6 - {{ 0, 300 }, { 0, 300 }, { 0, 0 }, { 0, 0 }}, + {{ 0, 300 }, { 0, 300 }, { 0, 0 }, { 0, 0 }}, // 7 - {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }}, + {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }}, // 8 - {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }}, + {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }}, // 9 - {{ 0, 10000 }, { 0, 10000 }, { 0, 10000 }, { 0, 10000 }} + {{ 0, 10000 }, { 0, 10000 }, { 0, 10000 }, { 0, 10000 }} }; SmCategoryDesc::SmCategoryDesc(const ResId& rResId, USHORT nCategoryIdx) : @@ -708,7 +708,7 @@ IMPL_LINK( SmDistanceDialog, GetFocusHdl, Control *, pControl ) { if (Categories[nActiveCategory]) { - USHORT i; + USHORT i; if (pControl == &aMetricField1) i = 0; @@ -781,7 +781,7 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId) // for it too. Edit *pSubEdit = rField.GetSubEdit(); if (pSubEdit) - { pSubEdit->SetHelpId(nHelpId); + { pSubEdit->SetHelpId(nHelpId); pSubEdit->SetHelpText(aEmptyText); } } @@ -1021,29 +1021,29 @@ void SmDistanceDialog::WriteTo(SmFormat &rFormat) /*const*/ // wenn nicht kann oben naemlich das const stehen! SetCategory(nActiveCategory); - rFormat.SetDistance( DIS_HORIZONTAL, Categories[0]->GetValue(0) ); - rFormat.SetDistance( DIS_VERTICAL, Categories[0]->GetValue(1) ); - rFormat.SetDistance( DIS_ROOT, Categories[0]->GetValue(2) ); - rFormat.SetDistance( DIS_SUPERSCRIPT, Categories[1]->GetValue(0) ); - rFormat.SetDistance( DIS_SUBSCRIPT, Categories[1]->GetValue(1) ); - rFormat.SetDistance( DIS_NUMERATOR, Categories[2]->GetValue(0) ); - rFormat.SetDistance( DIS_DENOMINATOR, Categories[2]->GetValue(1) ); - rFormat.SetDistance( DIS_FRACTION, Categories[3]->GetValue(0) ); - rFormat.SetDistance( DIS_STROKEWIDTH, Categories[3]->GetValue(1) ); - rFormat.SetDistance( DIS_UPPERLIMIT, Categories[4]->GetValue(0) ); - rFormat.SetDistance( DIS_LOWERLIMIT, Categories[4]->GetValue(1) ); - rFormat.SetDistance( DIS_BRACKETSIZE, Categories[5]->GetValue(0) ); - rFormat.SetDistance( DIS_BRACKETSPACE, Categories[5]->GetValue(1) ); - rFormat.SetDistance( DIS_MATRIXROW, Categories[6]->GetValue(0) ); - rFormat.SetDistance( DIS_MATRIXCOL, Categories[6]->GetValue(1) ); - rFormat.SetDistance( DIS_ORNAMENTSIZE, Categories[7]->GetValue(0) ); - rFormat.SetDistance( DIS_ORNAMENTSPACE, Categories[7]->GetValue(1) ); - rFormat.SetDistance( DIS_OPERATORSIZE, Categories[8]->GetValue(0) ); - rFormat.SetDistance( DIS_OPERATORSPACE, Categories[8]->GetValue(1) ); - rFormat.SetDistance( DIS_LEFTSPACE, Categories[9]->GetValue(0) ); - rFormat.SetDistance( DIS_RIGHTSPACE, Categories[9]->GetValue(1) ); - rFormat.SetDistance( DIS_TOPSPACE, Categories[9]->GetValue(2) ); - rFormat.SetDistance( DIS_BOTTOMSPACE, Categories[9]->GetValue(3) ); + rFormat.SetDistance( DIS_HORIZONTAL, Categories[0]->GetValue(0) ); + rFormat.SetDistance( DIS_VERTICAL, Categories[0]->GetValue(1) ); + rFormat.SetDistance( DIS_ROOT, Categories[0]->GetValue(2) ); + rFormat.SetDistance( DIS_SUPERSCRIPT, Categories[1]->GetValue(0) ); + rFormat.SetDistance( DIS_SUBSCRIPT, Categories[1]->GetValue(1) ); + rFormat.SetDistance( DIS_NUMERATOR, Categories[2]->GetValue(0) ); + rFormat.SetDistance( DIS_DENOMINATOR, Categories[2]->GetValue(1) ); + rFormat.SetDistance( DIS_FRACTION, Categories[3]->GetValue(0) ); + rFormat.SetDistance( DIS_STROKEWIDTH, Categories[3]->GetValue(1) ); + rFormat.SetDistance( DIS_UPPERLIMIT, Categories[4]->GetValue(0) ); + rFormat.SetDistance( DIS_LOWERLIMIT, Categories[4]->GetValue(1) ); + rFormat.SetDistance( DIS_BRACKETSIZE, Categories[5]->GetValue(0) ); + rFormat.SetDistance( DIS_BRACKETSPACE, Categories[5]->GetValue(1) ); + rFormat.SetDistance( DIS_MATRIXROW, Categories[6]->GetValue(0) ); + rFormat.SetDistance( DIS_MATRIXCOL, Categories[6]->GetValue(1) ); + rFormat.SetDistance( DIS_ORNAMENTSIZE, Categories[7]->GetValue(0) ); + rFormat.SetDistance( DIS_ORNAMENTSPACE, Categories[7]->GetValue(1) ); + rFormat.SetDistance( DIS_OPERATORSIZE, Categories[8]->GetValue(0) ); + rFormat.SetDistance( DIS_OPERATORSPACE, Categories[8]->GetValue(1) ); + rFormat.SetDistance( DIS_LEFTSPACE, Categories[9]->GetValue(0) ); + rFormat.SetDistance( DIS_RIGHTSPACE, Categories[9]->GetValue(1) ); + rFormat.SetDistance( DIS_TOPSPACE, Categories[9]->GetValue(2) ); + rFormat.SetDistance( DIS_BOTTOMSPACE, Categories[9]->GetValue(3) ); rFormat.SetDistance( DIS_NORMALBRACKETSIZE, Categories[5]->GetValue(3) ); rFormat.SetScaleNormalBrackets( bScaleAllBrackets ); @@ -1074,11 +1074,11 @@ IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ SmAlignDialog::SmAlignDialog(Window * pParent, BOOL bFreeRes) : ModalDialog(pParent, SmResId(RID_ALIGNDIALOG)), - aLeft (this, SmResId(1)), - aCenter (this, SmResId(2)), - aRight (this, SmResId(3)), + aLeft (this, SmResId(1)), + aCenter (this, SmResId(2)), + aRight (this, SmResId(3)), aFixedLine1 (this, SmResId(1)), - aOKButton1 (this, SmResId(1)), + aOKButton1 (this, SmResId(1)), aCancelButton1 (this, SmResId(1)), aDefaultButton (this, SmResId(1)) { @@ -1144,7 +1144,7 @@ void SmShowSymbolSet::Paint(const Rectangle&) for (USHORT i = v; i < nSymbols ; i++) { SmSym aSymbol (*aSymbolSet[i]); - Font aFont (aSymbol.GetFace()); + Font aFont (aSymbol.GetFace()); aFont.SetAlign(ALIGN_TOP); // etwas kleinere FontSize nehmen (als nLen) um etwas Luft zu haben @@ -1154,7 +1154,7 @@ void SmShowSymbolSet::Paint(const Rectangle&) // keep text color SetTextColor( aTxtColor ); - int nIV = i - v; + int nIV = i - v; Size aSize(GetTextWidth(aSymbol.GetCharacter()), GetTextHeight()); DrawText(Point((nIV % nColumns) * nLen + (nLen - aSize.Width()) / 2, @@ -1201,12 +1201,12 @@ void SmShowSymbolSet::KeyInput(const KeyEvent& rKEvt) { case KEY_DOWN: n = n + nColumns; break; case KEY_UP: n = n - nColumns; break; - case KEY_LEFT: n -= 1; break; - case KEY_RIGHT: n += 1; break; - case KEY_HOME: n = 0; break; + case KEY_LEFT: n -= 1; break; + case KEY_RIGHT: n += 1; break; + case KEY_HOME: n = 0; break; case KEY_END: n = static_cast< USHORT >(aSymbolSet.size() - 1); break; - case KEY_PAGEUP: n -= nColumns * nRows; break; - case KEY_PAGEDOWN: n += nColumns * nRows; break; + case KEY_PAGEUP: n -= nColumns * nRows; break; + case KEY_PAGEDOWN: n += nColumns * nRows; break; default: Control::KeyInput(rKEvt); @@ -1256,7 +1256,7 @@ SmShowSymbolSet::SmShowSymbolSet(Window *pParent, const ResId& rResId) : #endif // genau passend machen - aOutputSize.Width() = nColumns * nLen; + aOutputSize.Width() = nColumns * nLen; aOutputSize.Height() = nRows * nLen; aVScrollBar.SetPosSizePixel(Point(aOutputSize.Width() + 1, -1), @@ -1275,7 +1275,7 @@ SmShowSymbolSet::SmShowSymbolSet(Window *pParent, const ResId& rResId) : void SmShowSymbolSet::SetSymbolSet(const SymbolPtrVec_t& rSymbolSet) { aSymbolSet = rSymbolSet; - + if (static_cast< USHORT >(aSymbolSet.size()) > (nColumns * nRows)) { aVScrollBar.SetRange(Range(0, ((aSymbolSet.size() + (nColumns - 1)) / nColumns) - nRows)); @@ -1448,7 +1448,7 @@ IMPL_LINK( SmSymbolDialog, EditClickHdl, Button *, EMPTYARG pButton ) aSymbolSet = rSymbolMgr.GetSymbolSet( aSymbolSetName ); aSymbolSetDisplay.SetSymbolSet( aSymbolSet ); } - + if (nSymPos >= aSymbolSet.size()) nSymPos = static_cast< USHORT >(aSymbolSet.size()) - 1; SelectSymbol( nSymPos ); @@ -1481,7 +1481,7 @@ IMPL_LINK( SmSymbolDialog, GetClickHdl, Button *, EMPTYARG pButton ) const SmSym *pSym = GetSymbol(); if (pSym) { - XubString aText ('%'); + XubString aText ('%'); aText += pSym->GetName(); aText += (sal_Unicode)' '; @@ -1509,7 +1509,7 @@ IMPL_LINK_INLINE_END( SmSymbolDialog, CloseClickHdl, Button *, pButton ) SmSymbolDialog::SmSymbolDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr, SmViewShell &rViewShell, BOOL bFreeRes) : - ModalDialog (pParent, SmResId(RID_SYMBOLDIALOG)), + ModalDialog (pParent, SmResId(RID_SYMBOLDIALOG)), aSymbolSetText (this, SmResId(1)), aSymbolSets (this, SmResId(1)), aSymbolSetDisplay (this, SmResId(1)), @@ -1536,13 +1536,13 @@ SmSymbolDialog::SmSymbolDialog(Window *pParent, OutputDevice *pFntListDevice, // preview like controls should have a 2D look aSymbolDisplay.SetBorderStyle( WINDOW_BORDER_MONO ); - aSymbolSets .SetSelectHdl (LINK(this, SmSymbolDialog, SymbolSetChangeHdl)); + aSymbolSets .SetSelectHdl (LINK(this, SmSymbolDialog, SymbolSetChangeHdl)); aSymbolSetDisplay.SetSelectHdl (LINK(this, SmSymbolDialog, SymbolChangeHdl)); aSymbolSetDisplay.SetDblClickHdl(LINK(this, SmSymbolDialog, SymbolDblClickHdl)); - aSymbolDisplay .SetDblClickHdl(LINK(this, SmSymbolDialog, SymbolDblClickHdl)); - aCloseBtn .SetClickHdl (LINK(this, SmSymbolDialog, CloseClickHdl)); - aEditBtn .SetClickHdl (LINK(this, SmSymbolDialog, EditClickHdl)); - aGetBtn .SetClickHdl (LINK(this, SmSymbolDialog, GetClickHdl)); + aSymbolDisplay .SetDblClickHdl(LINK(this, SmSymbolDialog, SymbolDblClickHdl)); + aCloseBtn .SetClickHdl (LINK(this, SmSymbolDialog, CloseClickHdl)); + aEditBtn .SetClickHdl (LINK(this, SmSymbolDialog, EditClickHdl)); + aGetBtn .SetClickHdl (LINK(this, SmSymbolDialog, GetClickHdl)); } @@ -1587,8 +1587,8 @@ void SmSymbolDialog::DataChanged( const DataChangedEvent& rDCEvt ) BOOL SmSymbolDialog::SelectSymbolSet(const XubString &rSymbolSetName) { - BOOL bRet = FALSE; - USHORT nPos = aSymbolSets.GetEntryPos(rSymbolSetName); + BOOL bRet = FALSE; + USHORT nPos = aSymbolSets.GetEntryPos(rSymbolSetName); aSymbolSetName = String(); aSymbolSet.clear(); @@ -1949,13 +1949,13 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton ) aSymbolDisplay.SetFont( aNewSymbol.GetFace() ); aSymbolName.SetText( aNewSymbol.GetName() ); aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() ); - + // update list box entries FillSymbolSets(aOldSymbolSets, FALSE); FillSymbolSets(aSymbolSets, FALSE); FillSymbols(aOldSymbols ,FALSE); FillSymbols(aSymbols ,FALSE); - + UpdateButtons(); return 0; @@ -2030,7 +2030,7 @@ void SmSymDefineDialog::UpdateButtons() SmSymDefineDialog::SmSymDefineDialog(Window * pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr, BOOL bFreeRes) : - ModalDialog (pParent, SmResId(RID_SYMDEFINEDIALOG)), + ModalDialog (pParent, SmResId(RID_SYMDEFINEDIALOG)), aOldSymbolText (this, SmResId(1)), aOldSymbols (this, SmResId(1)), aOldSymbolSetText (this, SmResId(2)), @@ -2071,7 +2071,7 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent, pOrigSymbol = 0; - // auto completion is troublesome since that symbols character also gets automatically selected in the + // auto completion is troublesome since that symbols character also gets automatically selected in the // display and if the user previously selected a character to define/redefine that one this is bad aOldSymbols.EnableAutocomplete( FALSE, TRUE ); aSymbols .EnableAutocomplete( FALSE, TRUE ); @@ -2084,13 +2084,13 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent, SetSymbolSetManager(rSymbolMgr); - aOldSymbols .SetSelectHdl(LINK(this, SmSymDefineDialog, OldSymbolChangeHdl)); + aOldSymbols .SetSelectHdl(LINK(this, SmSymDefineDialog, OldSymbolChangeHdl)); aOldSymbolSets .SetSelectHdl(LINK(this, SmSymDefineDialog, OldSymbolSetChangeHdl)); aSymbolSets .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl)); aOldSymbolSets .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl)); aSymbols .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl)); aOldSymbols .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl)); - aStyles .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl)); + aStyles .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl)); aFonts .SetSelectHdl(LINK(this, SmSymDefineDialog, FontChangeHdl)); aFontsSubsetLB .SetSelectHdl(LINK(this, SmSymDefineDialog, SubsetChangeHdl)); aStyles .SetSelectHdl(LINK(this, SmSymDefineDialog, StyleChangeHdl)); @@ -2135,7 +2135,7 @@ void SmSymDefineDialog::InitColor_Impl() aOldSymbolDisplay.SetTextColor( aTxtColor ); aSymbolDisplay .SetBackground( aWall ); aSymbolDisplay .SetTextColor( aTxtColor ); - + const Image &rArrowRight = bHighContrast ? aRigthArrow_Im_HC : aRigthArrow_Im; aRightArrow.SetImage( rArrowRight ); } diff --git a/starmath/source/dialog.hrc b/starmath/source/dialog.hrc index 29d87ba1d287..026c17e70063 100644 --- a/starmath/source/dialog.hrc +++ b/starmath/source/dialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,17 +31,17 @@ #define FL_PRINTOPTIONS 10 #define CB_TITLEROW 11 -#define CB_EQUATION_TEXT 12 +#define CB_EQUATION_TEXT 12 #define CB_FRAME 13 #define FL_PRINT_FORMAT 20 -#define RB_ORIGINAL_SIZE 21 -#define RB_FIT_TO_PAGE 22 +#define RB_ORIGINAL_SIZE 21 +#define RB_FIT_TO_PAGE 22 #define RB_ZOOM 23 #define MF_ZOOM 24 #define FL_MISC_OPTIONS 30 -#define CB_IGNORE_SPACING 31 +#define CB_IGNORE_SPACING 31 #define FT_FONTS_SUBSET 110 #define LB_FONTS_SUBSET 111 diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index b912903fdff6..d2d893f57c99 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -107,7 +107,7 @@ using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::uno; -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define DOCUMENT_BUFFER_SIZE (USHORT)32768 static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; @@ -456,7 +456,7 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSel //angepasst werden. rPosition.X() += aFormat.GetDistance( DIS_LEFTSPACE ); - rPosition.Y() += aFormat.GetDistance( DIS_TOPSPACE ); + rPosition.Y() += aFormat.GetDistance( DIS_TOPSPACE ); //! in case of high contrast-mode (accessibility option!) //! the draw mode needs to be set to default, because when imbedding @@ -625,11 +625,11 @@ Printer* SmDocShell::GetPrt() { SfxItemSet *pOptions = new SfxItemSet(GetPool(), - SID_PRINTSIZE, SID_PRINTSIZE, - SID_PRINTZOOM, SID_PRINTZOOM, - SID_PRINTTITLE, SID_PRINTTITLE, - SID_PRINTTEXT, SID_PRINTTEXT, - SID_PRINTFRAME, SID_PRINTFRAME, + SID_PRINTSIZE, SID_PRINTSIZE, + SID_PRINTZOOM, SID_PRINTZOOM, + SID_PRINTTITLE, SID_PRINTTITLE, + SID_PRINTTEXT, SID_PRINTTEXT, + SID_PRINTFRAME, SID_PRINTFRAME, SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES, 0); @@ -661,7 +661,7 @@ void SmDocShell::SetPrinter( SfxPrinter *pNew ) RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetPrinter" ); delete pPrinter; - pPrinter = pNew; //Eigentumsuebergang! + pPrinter = pNew; //Eigentumsuebergang! pPrinter->SetMapMode( MapMode(MAP_100TH_MM) ); SetFormulaArranged(FALSE); Repaint(); @@ -703,13 +703,13 @@ void SmDocShell::Repaint() SmDocShell::SmDocShell( const sal_uInt64 i_nSfxCreationFlags ) : SfxObjectShell( i_nSfxCreationFlags ), - pTree ( 0 ), + pTree ( 0 ), pEditEngineItemPool ( 0 ), pEditEngine ( 0 ), - pPrinter ( 0 ), + pPrinter ( 0 ), pTmpPrinter ( 0 ), - nModifyCount ( 0 ), - bIsFormulaArranged ( FALSE ) + nModifyCount ( 0 ), + bIsFormulaArranged ( FALSE ) { pCursor = NULL; RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SmDocShell" ); @@ -761,7 +761,7 @@ BOOL SmDocShell::ConvertFrom(SfxMedium &rMedium) { RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::ConvertFrom" ); - BOOL bSuccess = FALSE; + BOOL bSuccess = FALSE; const String& rFltName = rMedium.GetFilter()->GetFilterName(); OSL_ENSURE( !rFltName.EqualsAscii( STAROFFICE_XML ), "Wrong filter!"); @@ -1224,7 +1224,7 @@ void SmDocShell::GetState(SfxItemSet &rSet) case SID_AUTO_REDRAW : { SmModule *pp = SM_MOD(); - BOOL bRedraw = pp->GetConfig()->IsAutoRedraw(); + BOOL bRedraw = pp->GetConfig()->IsAutoRedraw(); rSet.Put(SfxBoolItem(SID_AUTO_REDRAW, bRedraw)); } @@ -1386,15 +1386,15 @@ void SmDocShell::FillClass(SvGlobalName* pClassName, if (nFileFormat == SOFFICE_FILEFORMAT_60 ) { - *pClassName = SvGlobalName(SO3_SM_CLASSID_60); - *pFormat = SOT_FORMATSTR_ID_STARMATH_60; + *pClassName = SvGlobalName(SO3_SM_CLASSID_60); + *pFormat = SOT_FORMATSTR_ID_STARMATH_60; *pFullTypeName = String(SmResId(STR_MATH_DOCUMENT_FULLTYPE_CURRENT)); *pShortTypeName = String(SmResId(RID_DOCUMENTSTR)); } else if (nFileFormat == SOFFICE_FILEFORMAT_8 ) { - *pClassName = SvGlobalName(SO3_SM_CLASSID_60); - *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE : SOT_FORMATSTR_ID_STARMATH_8; + *pClassName = SvGlobalName(SO3_SM_CLASSID_60); + *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE : SOT_FORMATSTR_ID_STARMATH_8; *pFullTypeName = String(SmResId(STR_MATH_DOCUMENT_FULLTYPE_CURRENT)); *pShortTypeName = String(SmResId(RID_DOCUMENTSTR)); } diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 83fcfab0351b..cf2c1865bb31 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ #include "starmath.hrc" -#define ITEMID_FONT 1 -#define ITEMID_FONTHEIGHT 2 -#define ITEMID_LRSPACE 3 -#define ITEMID_WEIGHT 4 +#define ITEMID_FONT 1 +#define ITEMID_FONTHEIGHT 2 +#define ITEMID_LRSPACE 3 +#define ITEMID_WEIGHT 4 #include <vcl/menu.hxx> @@ -65,12 +65,12 @@ #include "document.hxx" #include "config.hxx" -#define SCROLL_LINE 24 +#define SCROLL_LINE 24 -#define MINWIDTH 200 -#define MINHEIGHT 200 -#define MINSPLIT 40 -#define SPLITTERWIDTH 2 +#define MINWIDTH 200 +#define MINHEIGHT 200 +#define MINSPLIT 40 +#define SPLITTERWIDTH 2 using namespace com::sun::star::accessibility; @@ -85,13 +85,13 @@ void SmGetLeftSelectionPart(const ESelection aSel, // returns paragraph number and position of the selections left part { // compare start and end of selection and use the one that comes first - if ( aSel.nStartPara < aSel.nEndPara - || (aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos) ) - { nPara = aSel.nStartPara; + if ( aSel.nStartPara < aSel.nEndPara + || (aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos) ) + { nPara = aSel.nStartPara; nPos = aSel.nStartPos; } else - { nPara = aSel.nEndPara; + { nPara = aSel.nEndPara; nPos = aSel.nEndPos; } } @@ -255,7 +255,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& ) // unfortunately this resets the whole edit engine // thus we need to save at least the text String aTxt( pEditEngine->GetText( LINEEND_LF ) ); - pEditEngine->Clear(); //#77957 incorrect font size + pEditEngine->Clear(); //#77957 incorrect font size pEditEngine->SetText( aTxt ); } diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx index 2a553fb862e4..a1086e183712 100644 --- a/starmath/source/eqnolefilehdr.cxx +++ b/starmath/source/eqnolefilehdr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) EQNOLEFILEHDR aHdr; aHdr.Read(pS); *pS >> nVer; - + if (!pS->GetError()) { nVersion = nVer; diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx index cdc592d8ea0c..cca3c4938fb1 100644 --- a/starmath/source/eqnolefilehdr.hxx +++ b/starmath/source/eqnolefilehdr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index 1117da96421a..0594bbf4f9e2 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,53 +109,53 @@ String GetDefaultFontName( LanguageType nLang, USHORT nIdent ) ///////////////////////////////////////////////////////////////// SmFormat::SmFormat() -: aBaseSize(0, SmPtsTo100th_mm(12)) +: aBaseSize(0, SmPtsTo100th_mm(12)) { - nVersion = SM_FMT_VERSION_NOW; + nVersion = SM_FMT_VERSION_NOW; eHorAlign = AlignCenter; nGreekCharStyle = 0; bIsTextmode = bScaleNormalBrackets = FALSE; - vSize[SIZ_TEXT] = 100; - vSize[SIZ_INDEX] = 60; + vSize[SIZ_TEXT] = 100; + vSize[SIZ_INDEX] = 60; vSize[SIZ_FUNCTION] = vSize[SIZ_OPERATOR] = 100; - vSize[SIZ_LIMITS] = 60; - - vDist[DIS_HORIZONTAL] = 10; - vDist[DIS_VERTICAL] = 5; - vDist[DIS_ROOT] = 0; - vDist[DIS_SUPERSCRIPT] = - vDist[DIS_SUBSCRIPT] = 20; - vDist[DIS_NUMERATOR] = - vDist[DIS_DENOMINATOR] = 0; - vDist[DIS_FRACTION] = 10; - vDist[DIS_STROKEWIDTH] = 5; - vDist[DIS_UPPERLIMIT] = - vDist[DIS_LOWERLIMIT] = 0; - vDist[DIS_BRACKETSIZE] = - vDist[DIS_BRACKETSPACE] = 5; - vDist[DIS_MATRIXROW] = 3; - vDist[DIS_MATRIXCOL] = 30; - vDist[DIS_ORNAMENTSIZE] = - vDist[DIS_ORNAMENTSPACE] = 0; - vDist[DIS_OPERATORSIZE] = 50; - vDist[DIS_OPERATORSPACE] = 20; - vDist[DIS_LEFTSPACE] = - vDist[DIS_RIGHTSPACE] = 100; - vDist[DIS_TOPSPACE] = - vDist[DIS_BOTTOMSPACE] = - vDist[DIS_NORMALBRACKETSIZE] = 0; - - vFont[FNT_VARIABLE] = - vFont[FNT_FUNCTION] = - vFont[FNT_NUMBER] = - vFont[FNT_TEXT] = - vFont[FNT_SERIF] = SmFace(C2S(FNTNAME_TIMES), aBaseSize); - vFont[FNT_SANS] = SmFace(C2S(FNTNAME_HELV), aBaseSize); - vFont[FNT_FIXED] = SmFace(C2S(FNTNAME_COUR), aBaseSize); - vFont[FNT_MATH] = SmFace(C2S(FNTNAME_MATH), aBaseSize); + vSize[SIZ_LIMITS] = 60; + + vDist[DIS_HORIZONTAL] = 10; + vDist[DIS_VERTICAL] = 5; + vDist[DIS_ROOT] = 0; + vDist[DIS_SUPERSCRIPT] = + vDist[DIS_SUBSCRIPT] = 20; + vDist[DIS_NUMERATOR] = + vDist[DIS_DENOMINATOR] = 0; + vDist[DIS_FRACTION] = 10; + vDist[DIS_STROKEWIDTH] = 5; + vDist[DIS_UPPERLIMIT] = + vDist[DIS_LOWERLIMIT] = 0; + vDist[DIS_BRACKETSIZE] = + vDist[DIS_BRACKETSPACE] = 5; + vDist[DIS_MATRIXROW] = 3; + vDist[DIS_MATRIXCOL] = 30; + vDist[DIS_ORNAMENTSIZE] = + vDist[DIS_ORNAMENTSPACE] = 0; + vDist[DIS_OPERATORSIZE] = 50; + vDist[DIS_OPERATORSPACE] = 20; + vDist[DIS_LEFTSPACE] = + vDist[DIS_RIGHTSPACE] = 100; + vDist[DIS_TOPSPACE] = + vDist[DIS_BOTTOMSPACE] = + vDist[DIS_NORMALBRACKETSIZE] = 0; + + vFont[FNT_VARIABLE] = + vFont[FNT_FUNCTION] = + vFont[FNT_NUMBER] = + vFont[FNT_TEXT] = + vFont[FNT_SERIF] = SmFace(C2S(FNTNAME_TIMES), aBaseSize); + vFont[FNT_SANS] = SmFace(C2S(FNTNAME_HELV), aBaseSize); + vFont[FNT_FIXED] = SmFace(C2S(FNTNAME_COUR), aBaseSize); + vFont[FNT_MATH] = SmFace(C2S(FNTNAME_MATH), aBaseSize); vFont[FNT_MATH].SetCharSet( RTL_TEXTENCODING_UNICODE ); diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx index 8f009293fb9c..0aec1ea45eb6 100644 --- a/starmath/source/math_pch.cxx +++ b/starmath/source/math_pch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,10 +33,10 @@ #include "starmath.hrc" -#define ITEMID_FONT 1 -#define ITEMID_FONTHEIGHT 2 -#define ITEMID_LRSPACE 3 -#define ITEMID_WEIGHT 4 +#define ITEMID_FONT 1 +#define ITEMID_FONTHEIGHT 2 +#define ITEMID_LRSPACE 3 +#define ITEMID_WEIGHT 4 //--------- ab hier die "generierten" #include <tools/string.hxx> diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index cefb16823bdc..00ad280ac0ad 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx index 65c524fe0f40..fb108972a17e 100644 --- a/starmath/source/mathmlexport.hxx +++ b/starmath/source/mathmlexport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ class SmXMLExportWrapper public: SmXMLExportWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rRef) : xModel(rRef), bFlat(sal_True) {} - + sal_Bool Export(SfxMedium &rMedium); void SetFlat(sal_Bool bIn) {bFlat = bIn;} @@ -70,7 +70,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet, const sal_Char* pComponentName ); - + sal_Bool WriteThroughComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 29d776e4d256..7fdd931c1463 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx index 473efa97bd75..d5e4d18d7464 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/source/mathmlimport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,14 +54,14 @@ class SmXMLImportWrapper public: SmXMLImportWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rRef) : xModel(rRef) {} - + ULONG Import(SfxMedium &rMedium); ULONG ReadThroughComponent( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xModelComponent, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rFactory, - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet, const sal_Char* pFilterName, sal_Bool bEncrypted ); @@ -72,7 +72,7 @@ public: const sal_Char* pStreamName, const sal_Char* pCompatibilityStreamName, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rFactory, - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet, const sal_Char* pFilterName ); }; @@ -108,11 +108,11 @@ public: // XUnoTunnel sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - + void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, const rtl::OUString &rLocalName, const com::sun::star::uno::Reference < @@ -241,7 +241,7 @@ public: const rtl::OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); - + const SvXMLTokenMap &GetPresLayoutElemTokenMap(); const SvXMLTokenMap &GetPresLayoutAttrTokenMap(); const SvXMLTokenMap &GetFencedAttrTokenMap(); @@ -251,7 +251,7 @@ public: const SvXMLTokenMap &GetPresScriptEmptyElemTokenMap(); const SvXMLTokenMap &GetPresTableElemTokenMap(); const SvXMLTokenMap &GetColorTokenMap(); - + SmNodeStack & GetNodeStack() {return aNodeStack;} SmNode *GetTree() { return aNodeStack.Pop();} sal_Bool GetSuccess() { return bSuccess; } diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index bbfe4f5952ca..9721fad277d6 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -514,17 +514,17 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion, case 0xE425: pC = " leslant "; break; - case 0xeb01: //no space - case 0xeb08: //normal space + case 0xeb01: //no space + case 0xeb08: //normal space bRet=TRUE; break; - case 0xef04: //tiny space - case 0xef05: //tiny space - case 0xeb02: //small space - case 0xeb04: //medium space + case 0xef04: //tiny space + case 0xef05: //tiny space + case 0xeb02: //small space + case 0xeb04: //medium space rRet.Append('`'); break; - case 0xeb05: //large space + case 0xeb05: //large space rRet.Append('~'); break; case 0x3a9: @@ -610,7 +610,7 @@ int MathType::Parse(SotStorage *pStor) APPEND(rRet,"{}"); #if OSL_DEBUG_LEVEL > 1 -# ifdef CAOLAN +# ifdef CAOLAN //sanity check //sigh, theres no point! MathType (in some bizarre subvarient) pads @@ -618,7 +618,7 @@ int MathType::Parse(SotStorage *pStor) ULONG nEnd = pS->Tell(); OSL_ENSURE(nEnd == pS->Seek(STREAM_SEEK_TO_END), "Possibly unfully parsed formula"); -# endif +# endif #endif return nRet; } @@ -3146,11 +3146,11 @@ void MathType::HandleMath(SmNode *pNode, int /*nLevel*/) } else if (nArse == 0x2225) *pS << sal_uInt16(0xEC09); - else if (nArse == 0xE421) + else if (nArse == 0xE421) *pS << sal_uInt16(0x2265); else if (nArse == 0x230A) *pS << sal_uInt16(0xF8F0); - else if (nArse == 0x230B) + else if (nArse == 0x230B) *pS << sal_uInt16(0xF8FB); else if (nArse == 0xE425) *pS << sal_uInt16(0x2264); @@ -3224,7 +3224,7 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel) case TUNDERLINE: nOldPending = StartTemplate(0x10); break; - case TOVERLINE: //If the next node is not text + case TOVERLINE: //If the next node is not text //or text with more than one char if ((pIsText->GetToken().eType != TTEXT) || (pIsText->GetText().Len() > 1)) @@ -3325,7 +3325,7 @@ void MathType::HandleText(SmNode *pNode, int /*nLevel*/) if ((nPendingAttributes) && (i == ((pTemp->GetText().Len()+1)/2)-1)) { - *pS << sal_uInt8(0x22); //char, with attributes right + *pS << sal_uInt8(0x22); //char, with attributes right //after the character } else diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx index 881209cdfdaa..b03d943402eb 100644 --- a/starmath/source/mathtype.hxx +++ b/starmath/source/mathtype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,23 +62,23 @@ typedef ::std::set< MathTypeFont, LessMathTypeFont > MathTypeFontSet; class MathType { public: - MathType(String &rIn) : + MathType(String &rIn) : rRet(rIn), nHAlign(0), nVAlign(0), nDefaultSize(12), nLSize(0), nDSize(0), nCurSize(0), nLastSize(0), bIsSilent(sal_False) { Init(); } - MathType(String &rIn,SmNode *pIn) : + MathType(String &rIn,SmNode *pIn) : rRet(rIn), pTree(pIn), nHAlign(2), nVAlign(0), nInsertion(0), nDefaultSize(12), nLSize(0), nDSize(0), nCurSize(0), nLastSize(0), nSpec(0), bIsSilent(sal_False) { Init(); } - + int Parse( SotStorage* pStor ); int ConvertFromStarMath( SfxMedium& rMedium ); - + private: /*Ver 2 Header*/ sal_uInt8 nVersion; diff --git a/starmath/source/menu_tmpl.src b/starmath/source/menu_tmpl.src index c6eeeb60b7cd..70348c73d042 100644 --- a/starmath/source/menu_tmpl.src +++ b/starmath/source/menu_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index ecfa7d52b08c..9af5027eea5e 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -140,7 +140,7 @@ void SmTmpDevice::SetFont(const Font &rNewFont) SmNode::SmNode(SmNodeType eNodeType, const SmToken &rNodeToken) { - eType = eNodeType; + eType = eNodeType; eScaleMode = SCALE_NONE; aNodeToken = rNodeToken; nAccIndex = -1; @@ -173,7 +173,7 @@ SmNode * SmNode::GetSubNode(USHORT /*nIndex*/) SmNode * SmNode::GetLeftMost() - // returns leftmost node of current subtree. + // returns leftmost node of current subtree. //! (this assumes the one with index 0 is always the leftmost subnode //! for the current node). { @@ -190,7 +190,7 @@ void SmNode::SetPhantom(BOOL bIsPhantomP) bIsPhantom = bIsPhantomP; SmNode *pNode; - USHORT nSize = GetNumSubNodes(); + USHORT nSize = GetNumSubNodes(); for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->SetPhantom(bIsPhantom); @@ -203,7 +203,7 @@ void SmNode::SetColor(const Color& rColor) GetFont().SetColor(rColor); SmNode *pNode; - USHORT nSize = GetNumSubNodes(); + USHORT nSize = GetNumSubNodes(); for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->SetColor(rColor); @@ -252,7 +252,7 @@ void SmNode::SetFont(const SmFace &rFace) GetFont() = rFace; SmNode *pNode; - USHORT nSize = GetNumSubNodes(); + USHORT nSize = GetNumSubNodes(); for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->SetFont(rFace); @@ -268,7 +268,7 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType) { Fraction aVal (SmPtsTo100th_mm(rSize.GetNumerator()), rSize.GetDenominator()); - long nHeight = (long)aVal; + long nHeight = (long)aVal; aFntSize = GetFont().GetSize(); aFntSize.Width() = 0; @@ -299,7 +299,7 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType) } // check the requested size against maximum value - static int __READONLY_DATA nMaxVal = SmPtsTo100th_mm(128); + static int __READONLY_DATA nMaxVal = SmPtsTo100th_mm(128); if (aFntSize.Height() > nMaxVal) aFntSize.Height() = nMaxVal; @@ -307,8 +307,8 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType) } SmNode *pNode; - USHORT nSize = GetNumSubNodes(); - for (USHORT i = 0; i < nSize; i++) + USHORT nSize = GetNumSubNodes(); + for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->SetFontSize(rSize, nType); } @@ -319,8 +319,8 @@ void SmNode::SetSize(const Fraction &rSize) GetFont() *= rSize; SmNode *pNode; - USHORT nSize = GetNumSubNodes(); - for (USHORT i = 0; i < nSize; i++) + USHORT nSize = GetNumSubNodes(); + for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->SetSize(rSize); } @@ -344,7 +344,7 @@ void SmNode::SetRectHorAlign(RectHorAlign eHorAlign, BOOL bApplyToSubTree ) void SmNode::PrepareAttributes() { - GetFont().SetWeight((Attributes() & ATTR_BOLD) ? WEIGHT_BOLD : WEIGHT_NORMAL); + GetFont().SetWeight((Attributes() & ATTR_BOLD) ? WEIGHT_BOLD : WEIGHT_NORMAL); GetFont().SetItalic((Attributes() & ATTR_ITALIC) ? ITALIC_NORMAL : ITALIC_NONE); } @@ -352,18 +352,18 @@ void SmNode::PrepareAttributes() void SmNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) { #if OSL_DEBUG_LEVEL > 1 - bIsDebug = TRUE; + bIsDebug = TRUE; #else - bIsDebug = FALSE; + bIsDebug = FALSE; #endif - bIsPhantom = FALSE; - nFlags = 0; + bIsPhantom = FALSE; + nFlags = 0; nAttributes = 0; switch (rFormat.GetHorAlign()) - { case AlignLeft: eRectHorAlign = RHA_LEFT; break; - case AlignCenter: eRectHorAlign = RHA_CENTER; break; - case AlignRight: eRectHorAlign = RHA_RIGHT; break; + { case AlignLeft: eRectHorAlign = RHA_LEFT; break; + case AlignCenter: eRectHorAlign = RHA_CENTER; break; + case AlignRight: eRectHorAlign = RHA_RIGHT; break; } GetFont() = rFormat.GetFont(FNT_MATH); @@ -373,7 +373,7 @@ void SmNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) GetFont().SetItalic(ITALIC_NONE); SmNode *pNode; - USHORT nSize = GetNumSubNodes(); + USHORT nSize = GetNumSubNodes(); for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->Prepare(rFormat, rDocShell); @@ -389,7 +389,7 @@ void SmNode::ToggleDebug() const pThis->bIsDebug = bIsDebug ? FALSE : TRUE; SmNode *pNode; - USHORT nSize = GetNumSubNodes(); + USHORT nSize = GetNumSubNodes(); for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = pThis->GetSubNode(i))) pNode->ToggleDebug(); @@ -399,14 +399,14 @@ void SmNode::ToggleDebug() const void SmNode::Move(const Point& rPosition) { - if (rPosition.X() == 0 && rPosition.Y() == 0) + if (rPosition.X() == 0 && rPosition.Y() == 0) return; SmRect::Move(rPosition); SmNode *pNode; - USHORT nSize = GetNumSubNodes(); - for (USHORT i = 0; i < nSize; i++) + USHORT nSize = GetNumSubNodes(); + for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->Move(rPosition); } @@ -415,8 +415,8 @@ void SmNode::Move(const Point& rPosition) void SmNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) { SmNode *pNode; - USHORT nSize = GetNumSubNodes(); - for (USHORT i = 0; i < nSize; i++) + USHORT nSize = GetNumSubNodes(); + for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->Arrange(rDev, rFormat); } @@ -424,10 +424,10 @@ void SmNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) void SmNode::CreateTextFromNode(String &rText) { SmNode *pNode; - USHORT nSize = GetNumSubNodes(); + USHORT nSize = GetNumSubNodes(); if (nSize > 1) rText.Append('{'); - for (USHORT i = 0; i < nSize; i++) + for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->CreateTextFromNode(rText); if (nSize > 1) @@ -453,15 +453,15 @@ const SmNode * SmNode::FindTokenAt(USHORT nRow, USHORT nCol) const // position 'nRow', 'nCol'. //! (there should be exactly one such node if any) { - if ( IsVisible() - && nRow == GetToken().nRow - && nCol >= GetToken().nCol && nCol < GetToken().nCol + GetToken().aText.Len()) + if ( IsVisible() + && nRow == GetToken().nRow + && nCol >= GetToken().nCol && nCol < GetToken().nCol + GetToken().aText.Len()) return this; else { - USHORT nNumSubNodes = GetNumSubNodes(); - for (USHORT i = 0; i < nNumSubNodes; i++) - { const SmNode *pNode = GetSubNode(i); + USHORT nNumSubNodes = GetNumSubNodes(); + for (USHORT i = 0; i < nNumSubNodes; i++) + { const SmNode *pNode = GetSubNode(i); if (!pNode) continue; @@ -478,16 +478,16 @@ const SmNode * SmNode::FindTokenAt(USHORT nRow, USHORT nCol) const const SmNode * SmNode::FindRectClosestTo(const Point &rPoint) const { - long nDist = LONG_MAX; + long nDist = LONG_MAX; const SmNode *pResult = 0; if (IsVisible()) pResult = this; else { - USHORT nNumSubNodes = GetNumSubNodes(); - for (USHORT i = 0; i < nNumSubNodes; i++) - { const SmNode *pNode = GetSubNode(i); + USHORT nNumSubNodes = GetNumSubNodes(); + for (USHORT i = 0; i < nNumSubNodes; i++) + { const SmNode *pNode = GetSubNode(i); if (!pNode) continue; @@ -495,7 +495,7 @@ const SmNode * SmNode::FindRectClosestTo(const Point &rPoint) const long nTmp; const SmNode *pFound = pNode->FindRectClosestTo(rPoint); if (pFound && (nTmp = pFound->OrientedDist(rPoint)) < nDist) - { nDist = nTmp; + { nDist = nTmp; pResult = pFound; // quit immediately if 'rPoint' is inside the *should not @@ -532,8 +532,8 @@ const SmNode * SmNode::FindNodeWithAccessibleIndex(xub_StrLen nAccIdx) const pResult = this; else { - USHORT nNumSubNodes = GetNumSubNodes(); - for (USHORT i = 0; i < nNumSubNodes; i++) + USHORT nNumSubNodes = GetNumSubNodes(); + for (USHORT i = 0; i < nNumSubNodes; i++) { const SmNode *pNode = GetSubNode(i); if (!pNode) @@ -667,7 +667,7 @@ SmStructureNode::~SmStructureNode() { SmNode *pNode; - for (USHORT i = 0; i < GetNumSubNodes(); i++) + for (USHORT i = 0; i < GetNumSubNodes(); i++) if (NULL != (pNode = GetSubNode(i))) delete pNode; } @@ -785,10 +785,10 @@ void SmGraphicNode::GetAccessibleText( String &rText ) const void SmExpressionNode::CreateTextFromNode(String &rText) { SmNode *pNode; - USHORT nSize = GetNumSubNodes(); + USHORT nSize = GetNumSubNodes(); if (nSize > 1) rText.Append('{'); - for (USHORT i = 0; i < nSize; i++) + for (USHORT i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) { pNode->CreateTextFromNode(rText); @@ -815,7 +815,7 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) Point rPosition; SmNode *pNode; - USHORT nSize = GetNumSubNodes(); + USHORT nSize = GetNumSubNodes(); // make distance depend on font size long nDist = +(rFormat.GetDistance(DIS_VERTICAL) @@ -828,9 +828,9 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) long nMaxWidth = 0, nTmp; USHORT i; - for (i = 0; i < nSize; i++) + for (i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) - { pNode->Arrange(rDev, rFormat); + { pNode->Arrange(rDev, rFormat); if ((nTmp = pNode->GetItalicWidth()) > nMaxWidth) nMaxWidth = nTmp; } @@ -839,8 +839,8 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SmRect::operator = (SmRect(nMaxWidth, 0)); for (i = 0; i < nSize; i++) { if (NULL != (pNode = GetSubNode(i))) - { const SmRect &rNodeRect = pNode->GetRect(); - const SmNode *pCoNode = pNode->GetLeftMost(); + { const SmRect &rNodeRect = pNode->GetRect(); + const SmNode *pCoNode = pNode->GetLeftMost(); RectHorAlign eHorAlign = pCoNode->GetRectHorAlign(); aPos = rNodeRect.AlignTo(*this, RP_BOTTOM, @@ -881,9 +881,9 @@ void SmLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) // arranges all subnodes in one row with some extra space between { SmNode *pNode; - USHORT nSize = GetNumSubNodes(); + USHORT nSize = GetNumSubNodes(); USHORT i; - for (i = 0; i < nSize; i++) + for (i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->Arrange(rDev, rFormat); @@ -934,7 +934,7 @@ void SmExpressionNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat { SmLineNode::Arrange(rDev, rFormat); - // copy alignment of leftmost subnode if any + // copy alignment of leftmost subnode if any SmNode *pNode = GetLeftMost(); if (pNode) SetRectHorAlign(pNode->GetRectHorAlign(), FALSE); @@ -989,7 +989,7 @@ void SmRootNode::GetHeightVerOffset(const SmRect &rRect, rVerOffset = (rRect.GetBottom() - rRect.GetAlignB()) / 2; rHeight = rRect.GetHeight() - rVerOffset; - OSL_ENSURE(rHeight >= 0, "Sm : Ooops..."); + OSL_ENSURE(rHeight >= 0, "Sm : Ooops..."); OSL_ENSURE(rVerOffset >= 0, "Sm : Ooops..."); } @@ -1023,11 +1023,11 @@ void SmRootNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) //! not to get the root symbol but the pExtra when clicking on it in the //! GraphicWindow. (That is because of the simplicity of the algorithm //! that finds the node corresponding to a mouseclick in the window.) - SmNode *pExtra = GetSubNode(0), + SmNode *pExtra = GetSubNode(0), *pRootSym = GetSubNode(1), - *pBody = GetSubNode(2); + *pBody = GetSubNode(2); OSL_ENSURE(pRootSym, "Sm: NULL pointer"); - OSL_ENSURE(pBody, "Sm: NULL pointer"); + OSL_ENSURE(pBody, "Sm: NULL pointer"); pBody->Arrange(rDev, rFormat); @@ -1050,7 +1050,7 @@ void SmRootNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) pRootSym->MoveTo(aPos); if (pExtra) - { pExtra->SetSize(Fraction(rFormat.GetRelSize(SIZ_INDEX), 100)); + { pExtra->SetSize(Fraction(rFormat.GetRelSize(SIZ_INDEX), 100)); pExtra->Arrange(rDev, rFormat); aPos = GetExtraPos(*pRootSym, *pExtra); @@ -1142,9 +1142,9 @@ void SmBinVerNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) pDenom->Arrange(rDev, rFormat); long nFontHeight = GetFont().GetSize().Height(), - nExtLen = nFontHeight * rFormat.GetDistance(DIS_FRACTION) / 100L, - nThick = nFontHeight * rFormat.GetDistance(DIS_STROKEWIDTH) / 100L, - nWidth = Max(pNum->GetItalicWidth(), pDenom->GetItalicWidth()), + nExtLen = nFontHeight * rFormat.GetDistance(DIS_FRACTION) / 100L, + nThick = nFontHeight * rFormat.GetDistance(DIS_STROKEWIDTH) / 100L, + nWidth = Max(pNum->GetItalicWidth(), pDenom->GetItalicWidth()), nNumDist = bIsTextmode ? 0 : nFontHeight * rFormat.GetDistance(DIS_NUMERATOR) / 100L, nDenomDist = bIsTextmode ? 0 : @@ -1156,7 +1156,7 @@ void SmBinVerNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) pLine->Arrange(rDev, rFormat); // get horizontal alignment for numerator - const SmNode *pLM = pNum->GetLeftMost(); + const SmNode *pLM = pNum->GetLeftMost(); RectHorAlign eHorAlign = pLM->GetRectHorAlign(); // move numerator to its position @@ -1165,7 +1165,7 @@ void SmBinVerNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) pNum->MoveTo(aPos); // get horizontal alignment for denominator - pLM = pDenom->GetLeftMost(); + pLM = pDenom->GetLeftMost(); eHorAlign = pLM->GetRectHorAlign(); // move denominator to its position @@ -1251,7 +1251,7 @@ USHORT GetLineIntersectionPoint(Point &rResult, { // hier achten wir nicht auf Rechengenauigkeit // (das wuerde aufwendiger und lohnt sich hier kaum) - double fLambda = ( (rPoint1.Y() - rPoint2.Y()) * rHeading2.X() + double fLambda = ( (rPoint1.Y() - rPoint2.Y()) * rHeading2.X() - (rPoint1.X() - rPoint2.X()) * rHeading2.Y()) / fDet; rResult = Point(rPoint1.X() + (long) (fLambda * rHeading1.X()), @@ -1264,7 +1264,7 @@ USHORT GetLineIntersectionPoint(Point &rResult, SmBinDiagonalNode::SmBinDiagonalNode(const SmToken &rNodeToken) -: SmStructureNode(NBINDIAGONAL, rNodeToken) +: SmStructureNode(NBINDIAGONAL, rNodeToken) { bAscending = FALSE; SetNumSubNodes(3); @@ -1275,18 +1275,18 @@ void SmBinDiagonalNode::GetOperPosSize(Point &rPos, Size &rSize, const Point &rDiagPoint, double fAngleDeg) const // gibt die Position und Groesse fuer den Diagonalstrich zurueck. // Vor.: das SmRect des Nodes gibt die Begrenzung vor(!), muss also selbst - // bereits bekannt sein. + // bereits bekannt sein. { const double fPi = 3.1415926535897932384626433; double fAngleRad = fAngleDeg / 180.0 * fPi; - long nRectLeft = GetItalicLeft(), + long nRectLeft = GetItalicLeft(), nRectRight = GetItalicRight(), nRectTop = GetTop(), nRectBottom = GetBottom(); - Point aRightHdg (100, 0), - aDownHdg (0, 100), - aDiagHdg ( (long)(100.0 * cos(fAngleRad)), + Point aRightHdg (100, 0), + aDownHdg (0, 100), + aDiagHdg ( (long)(100.0 * cos(fAngleRad)), (long)(-100.0 * sin(fAngleRad)) ); long nLeft, nRight, nTop, nBottom; // Raender des Rechtecks fuer die @@ -1488,9 +1488,9 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) long nDelta, nDist; // iterate over all possible sub-/supscripts - SmRect aTmpRect (rBodyRect); + SmRect aTmpRect (rBodyRect); for (int i = 0; i < SUBSUP_NUM_ENTRIES; i++) - { SmSubSup eSubSup = (SmSubSup) i; // cast + { SmSubSup eSubSup = (SmSubSup) i; // cast SmNode *pSubSup = GetSubSup(eSubSup); if (!pSubSup) @@ -1499,8 +1499,8 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) // switch position of limits if we are in textmode if (rFormat.IsTextmode() && (GetToken().nGroup & TGLIMIT)) switch (eSubSup) - { case CSUB: eSubSup = RSUB; break; - case CSUP: eSubSup = RSUP; break; + { case CSUB: eSubSup = RSUB; break; + case CSUP: eSubSup = RSUP; break; default: break; } @@ -1522,7 +1522,7 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) //! be sure that CSUB, CSUP are handled before the other cases! switch (eSubSup) - { case RSUB : + { case RSUB : case LSUB : if (!bIsTextmode) nDist = nOrigHeight @@ -1684,14 +1684,14 @@ void SmBraceNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) pBody->Arrange(rDev, rFormat); BOOL bIsScaleNormal = rFormat.IsScaleNormalBrackets(), - bScale = pBody->GetHeight() > 0 && + bScale = pBody->GetHeight() > 0 && (GetScaleMode() == SCALE_HEIGHT || bIsScaleNormal), - bIsABS = GetToken().eType == TABS; + bIsABS = GetToken().eType == TABS; long nFaceHeight = GetFont().GetSize().Height(); // Uebergroesse in % ermitteln - USHORT nPerc = 0; + USHORT nPerc = 0; if (!bIsABS && bScale) { // im Fall von Klammern mit Uebergroesse... USHORT nIndex = GetScaleMode() == SCALE_HEIGHT ? @@ -1746,7 +1746,7 @@ void SmBraceNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) // damit auch "\(a\) - (a) - left ( a right )" vernuenftig aussieht RectVerAlign eVerAlign = bScale ? RVA_CENTERY : RVA_BASELINE; - Point aPos; + Point aPos; aPos = pLeft->AlignTo(*pBody, RP_LEFT, RHA_CENTER, eVerAlign); aPos.X() -= nDist; pLeft->MoveTo(aPos); @@ -1966,14 +1966,14 @@ void SmAlignNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) { OSL_ENSURE(GetNumSubNodes() > 0, "Sm: missing subnode"); - SmNode *pNode = GetSubNode(0); + SmNode *pNode = GetSubNode(0); RectHorAlign eHorAlign = RHA_CENTER; switch (GetToken().eType) { - case TALIGNL: eHorAlign = RHA_LEFT; break; - case TALIGNC: eHorAlign = RHA_CENTER; break; - case TALIGNR: eHorAlign = RHA_RIGHT; break; + case TALIGNL: eHorAlign = RHA_LEFT; break; + case TALIGNC: eHorAlign = RHA_CENTER; break; + case TALIGNR: eHorAlign = RHA_RIGHT; break; default: break; } @@ -2003,9 +2003,9 @@ void SmAttributNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) // get relative position of attribut RectVerAlign eVerAlign; - long nDist = 0; + long nDist = 0; switch (GetToken().eType) - { case TUNDERLINE : + { case TUNDERLINE : eVerAlign = RVA_ATTRIBUT_LO; break; case TOVERSTRIKE : @@ -2126,9 +2126,9 @@ void SmFontNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) int nFnt = -1; switch (GetToken().eType) { - case TFIXED: nFnt = FNT_FIXED; break; - case TSANS: nFnt = FNT_SANS; break; - case TSERIF: nFnt = FNT_SERIF; break; + case TFIXED: nFnt = FNT_FIXED; break; + case TSANS: nFnt = FNT_SANS; break; + case TSERIF: nFnt = FNT_SERIF; break; default: break; } @@ -2149,7 +2149,7 @@ void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) OSL_ENSURE(pNode, "Sm: missing subnode"); switch (GetToken().eType) - { case TSIZE : + { case TSIZE : pNode->SetFontSize(aFontSize, nSizeType); break; case TSANS : @@ -2157,22 +2157,22 @@ void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) case TFIXED : pNode->SetFont(GetFont()); break; - case TUNKNOWN : break; // no assertion on "font <?> <?>" - - case TPHANTOM : SetPhantom(TRUE); break; - case TBOLD : SetAttribut(ATTR_BOLD); break; - case TITALIC : SetAttribut(ATTR_ITALIC); break; - case TNBOLD : ClearAttribut(ATTR_BOLD); break; - case TNITALIC : ClearAttribut(ATTR_ITALIC); break; - - case TBLACK : SetColor(Color(COL_BLACK)); break; - case TWHITE : SetColor(Color(COL_WHITE)); break; - case TRED : SetColor(Color(COL_RED)); break; - case TGREEN : SetColor(Color(COL_GREEN)); break; - case TBLUE : SetColor(Color(COL_BLUE)); break; - case TCYAN : SetColor(Color(COL_CYAN)); break; - case TMAGENTA : SetColor(Color(COL_MAGENTA)); break; - case TYELLOW : SetColor(Color(COL_YELLOW)); break; + case TUNKNOWN : break; // no assertion on "font <?> <?>" + + case TPHANTOM : SetPhantom(TRUE); break; + case TBOLD : SetAttribut(ATTR_BOLD); break; + case TITALIC : SetAttribut(ATTR_ITALIC); break; + case TNBOLD : ClearAttribut(ATTR_BOLD); break; + case TNITALIC : ClearAttribut(ATTR_ITALIC); break; + + case TBLACK : SetColor(Color(COL_BLACK)); break; + case TWHITE : SetColor(Color(COL_WHITE)); break; + case TRED : SetColor(Color(COL_RED)); break; + case TGREEN : SetColor(Color(COL_GREEN)); break; + case TBLUE : SetColor(Color(COL_BLUE)); break; + case TCYAN : SetColor(Color(COL_CYAN)); break; + case TMAGENTA : SetColor(Color(COL_MAGENTA)); break; + case TYELLOW : SetColor(Color(COL_YELLOW)); break; default: OSL_ENSURE(FALSE, "Sm: unknown case"); @@ -2195,7 +2195,7 @@ void SmFontNode::SetSizeParameter(const Fraction& rValue, USHORT Type) SmPolyLineNode::SmPolyLineNode(const SmToken &rNodeToken) -: SmGraphicNode(NPOLYLINE, rNodeToken) +: SmGraphicNode(NPOLYLINE, rNodeToken) { aPoly.SetSize(2); nWidth = 0; @@ -2248,7 +2248,7 @@ void SmPolyLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) aPoly.SetPoint(aPointA, 0); aPoly.SetPoint(aPointB, 1); - long nThick = GetFont().GetSize().Height() + long nThick = GetFont().GetSize().Height() * rFormat.GetDistance(DIS_STROKEWIDTH) / 100L; nWidth = nThick + 2 * nBorderwidth; @@ -2296,7 +2296,7 @@ void SmRectangleNode::Arrange(const OutputDevice &rDev, const SmFormat &/*rForma if (nHeight == 0) nHeight = nFontHeight / 30; if (nWidth == 0) - nWidth = nFontHeight / 3; + nWidth = nFontHeight / 3; SmTmpDevice aTmpDev ((OutputDevice &) rDev, TRUE); aTmpDev.SetFont(GetFont()); @@ -2358,7 +2358,7 @@ void SmTextNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) { PrepareAttributes(); - USHORT nSizeDesc = GetFontDesc() == FNT_FUNCTION ? + USHORT nSizeDesc = GetFontDesc() == FNT_FUNCTION ? SIZ_FUNCTION : SIZ_TEXT; GetFont() *= Fraction (rFormat.GetRelSize(nSizeDesc), 100); @@ -2480,7 +2480,7 @@ void SmMatrixNode::CreateTextFromNode(String &rText) void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) { - Point aPosition, + Point aPosition, aOffset; SmNode *pNode; USHORT i, j; @@ -2488,7 +2488,7 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) // initialize array that is to hold the maximum widhts of all // elements (subnodes) in that column. long *pColWidth = new long[nNumCols]; - for (j = 0; j < nNumCols; j++) + for (j = 0; j < nNumCols; j++) pColWidth[j] = 0; // arrange subnodes and calculate the aboves arrays contents @@ -2515,17 +2515,17 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) // build array that holds the leftmost position for each column long *pColLeft = new long[nNumCols]; long nX = 0; - for (j = 0; j < nNumCols; j++) - { pColLeft[j] = nX; + for (j = 0; j < nNumCols; j++) + { pColLeft[j] = nX; nX += pColWidth[j] + nHorDist; } - Point aPos, aDelta; - SmRect aLineRect; + Point aPos, aDelta; + SmRect aLineRect; SmRect::operator = (SmRect()); - for (i = 0; i < nNumRows; i++) - { aLineRect = SmRect(); - for (j = 0; j < nNumCols; j++) + for (i = 0; i < nNumRows; i++) + { aLineRect = SmRect(); + for (j = 0; j < nNumCols; j++) { SmNode *pTmpNode = GetSubNode(i * nNumCols + j); OSL_ENSURE(pTmpNode, "Sm: NULL pointer"); @@ -2542,7 +2542,7 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) // caculate horizontal position of element depending on column // and horizontal alignment switch (eHorAlign) - { case RHA_LEFT: + { case RHA_LEFT: aPos.X() = rNodeRect.GetLeft() + pColLeft[j]; break; case RHA_CENTER: @@ -2564,10 +2564,10 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) aPos.Y() += nVerDist; // move 'aLineRect' and rectangles in that line to final position - aDelta.X() = 0; // since horizontal alignment is already done + aDelta.X() = 0; // since horizontal alignment is already done aDelta.Y() = aPos.Y() - aLineRect.GetTop(); aLineRect.Move(aDelta); - for (j = 0; j < nNumCols; j++) + for (j = 0; j < nNumCols; j++) if (NULL != (pNode = GetSubNode(i * nNumCols + j))) pNode->Move(aDelta); @@ -2596,7 +2596,7 @@ SmNode * SmMatrixNode::GetLeftMost() SmMathSymbolNode::SmMathSymbolNode(const SmToken &rNodeToken) -: SmSpecialNode(NMATH, rNodeToken, FNT_MATH) +: SmSpecialNode(NMATH, rNodeToken, FNT_MATH) { xub_Unicode cChar = GetToken().cMathChar; if ((xub_Unicode) '\0' != cChar) @@ -2684,7 +2684,7 @@ void SmMathSymbolNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat const XubString &rText = GetText(); if (rText.Len() == 0 || rText.GetChar(0) == xub_Unicode('\0')) - { SmRect::operator = (SmRect()); + { SmRect::operator = (SmRect()); return; } @@ -2726,7 +2726,7 @@ void SmRectangleNode::CreateTextFromNode(String &rText) void SmAttributNode::CreateTextFromNode(String &rText) { SmNode *pNode; - USHORT nSize = GetNumSubNodes(); + USHORT nSize = GetNumSubNodes(); OSL_ENSURE(nSize == 2, "Node missing members"); rText.Append('{'); sal_Unicode nLast=0; @@ -2804,7 +2804,7 @@ SmSpecialNode::SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, US SmSpecialNode::SmSpecialNode(const SmToken &rNodeToken) : - SmTextNode(NSPECIAL, rNodeToken, FNT_MATH) //! default Font nicht immer richtig + SmTextNode(NSPECIAL, rNodeToken, FNT_MATH) //! default Font nicht immer richtig { bIsFromGreekSymbolSet = lcl_IsFromGreekSymbolSet( rNodeToken.aText ); } @@ -2814,7 +2814,7 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell { SmNode::Prepare(rFormat, rDocShell); - const SmSym *pSym; + const SmSym *pSym; SmModule *pp = SM_MOD(); String aName( GetToken().aText.Copy(1) ); @@ -2954,8 +2954,8 @@ void SmBlankNode::IncreaseBy(const SmToken &rToken) { switch(rToken.eType) { - case TBLANK: nNum += 4; break; - case TSBLANK: nNum += 1; break; + case TBLANK: nNum += 4; break; + case TSBLANK: nNum += 1; break; default: break; } diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 4b91b23f25da..072d433c5540 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -61,10 +61,10 @@ static inline BOOL strnccmp(const String &u1, xub_StrLen nIdx, static const sal_Unicode aDelimiterTable[] = { - ' ', '\t', '\n', '\r', '+', '-', '*', '/', '=', '#', - '%', '\\', '"', '~', '`', '>', '<', '&', '|', '(', - ')', '{', '}', '[', ']', '^', '_', - '\0' // end of list symbol + ' ', '\t', '\n', '\r', '+', '-', '*', '/', '=', '#', + '%', '\\', '"', '~', '`', '>', '<', '&', '|', '(', + ')', '{', '}', '[', ']', '^', '_', + '\0' // end of list symbol }; @@ -76,8 +76,8 @@ static inline BOOL IsDigit( sal_Unicode cChar ) /////////////////////////////////////////////////////////////////////////// SmToken::SmToken() : - eType (TUNKNOWN), - cMathChar ('\0') + eType (TUNKNOWN), + cMathChar ('\0') { nGroup = nCol = nRow = nLevel = 0; } @@ -152,12 +152,12 @@ static const SmTokenTableEntry aTokenTable[] = { "dlarrow" , TDLARROW, MS_DLARROW, TGSTANDALONE, 5}, { "dlrarrow" , TDLRARROW, MS_DLRARROW, TGSTANDALONE, 5}, { "dot", TDOT, MS_DOT, TGATTRIBUT, 5}, - { "dotsaxis", TDOTSAXIS, MS_DOTSAXIS, TGSTANDALONE, 5}, // 5 to continue expression - { "dotsdiag", TDOTSDIAG, MS_DOTSUP, TGSTANDALONE, 5}, // + { "dotsaxis", TDOTSAXIS, MS_DOTSAXIS, TGSTANDALONE, 5}, // 5 to continue expression + { "dotsdiag", TDOTSDIAG, MS_DOTSUP, TGSTANDALONE, 5}, // { "dotsdown", TDOTSDOWN, MS_DOTSDOWN, TGSTANDALONE, 5}, // { "dotslow", TDOTSLOW, MS_DOTSLOW, TGSTANDALONE, 5}, // { "dotsup", TDOTSUP, MS_DOTSUP, TGSTANDALONE, 5}, // - { "dotsvert", TDOTSVERT, MS_DOTSVERT, TGSTANDALONE, 5}, // + { "dotsvert", TDOTSVERT, MS_DOTSVERT, TGSTANDALONE, 5}, // { "downarrow" , TDOWNARROW, MS_DOWNARROW, TGSTANDALONE, 5}, { "drarrow" , TDRARROW, MS_DRARROW, TGSTANDALONE, 5}, { "emptyset" , TEMPTYSET, MS_EMPTYSET, TGSTANDALONE, 5}, @@ -214,7 +214,7 @@ static const SmTokenTableEntry aTokenTable[] = { "magenta", TMAGENTA, '\0', TGCOLOR, 0}, { "matrix", TMATRIX, '\0', 0, 5}, { "minusplus", TMINUSPLUS, MS_MINUSPLUS, TGUNOPER | TGSUM, 5}, - { "mline", TMLINE, MS_LINE, 0, 0}, //! nicht in TGRBRACES, Level 0 + { "mline", TMLINE, MS_LINE, 0, 0}, //! nicht in TGRBRACES, Level 0 { "nabla", TNABLA, MS_NABLA, TGSTANDALONE, 5}, { "nbold", TNBOLD, '\0', TGFONTATTR, 5}, { "ndivides", TNDIVIDES, MS_NDIVIDES, TGRELATION, 0}, @@ -250,16 +250,16 @@ static const SmTokenTableEntry aTokenTable[] = { "plusminus", TPLUSMINUS, MS_PLUSMINUS, TGUNOPER | TGSUM, 5}, { "prod", TPROD, MS_PROD, TGOPER, 5}, { "prop", TPROP, MS_PROP, TGRELATION, 0}, - { "rangle", TRANGLE, MS_RANGLE, TGRBRACES, 0}, //! 0 to terminate expression - { "rbrace", TRBRACE, MS_RBRACE, TGRBRACES, 0}, // - { "rceil", TRCEIL, MS_RCEIL, TGRBRACES, 0}, // - { "rdbracket", TRDBRACKET, MS_RDBRACKET, TGRBRACES, 0}, // - { "rdline", TRDLINE, MS_DLINE, TGRBRACES, 0}, // + { "rangle", TRANGLE, MS_RANGLE, TGRBRACES, 0}, //! 0 to terminate expression + { "rbrace", TRBRACE, MS_RBRACE, TGRBRACES, 0}, // + { "rceil", TRCEIL, MS_RCEIL, TGRBRACES, 0}, // + { "rdbracket", TRDBRACKET, MS_RDBRACKET, TGRBRACES, 0}, // + { "rdline", TRDLINE, MS_DLINE, TGRBRACES, 0}, // { "red", TRED, '\0', TGCOLOR, 0}, - { "rfloor", TRFLOOR, MS_RFLOOR, TGRBRACES, 0}, //! 0 to terminate expression + { "rfloor", TRFLOOR, MS_RFLOOR, TGRBRACES, 0}, //! 0 to terminate expression { "right", TRIGHT, '\0', 0, 0}, { "rightarrow" , TRIGHTARROW, MS_RIGHTARROW, TGSTANDALONE, 5}, - { "rline", TRLINE, MS_LINE, TGRBRACES, 0}, //! 0 to terminate expression + { "rline", TRLINE, MS_LINE, TGRBRACES, 0}, //! 0 to terminate expression { "rsub", TRSUB, '\0', TGPOWER, 0}, { "rsup", TRSUP, '\0', TGPOWER, 0}, { "sans", TSANS, '\0', TGFONT, 0}, @@ -405,10 +405,10 @@ void SmParser::NextToken() { static const String aEmptyStr; - xub_StrLen nBufLen = BufferString.Len(); - ParseResult aRes; - xub_StrLen nRealStart; - BOOL bCont; + xub_StrLen nBufLen = BufferString.Len(); + ParseResult aRes; + xub_StrLen nRealStart; + BOOL bCont; BOOL bNumStart = FALSE; CharClass aCC(SM_MOD()->GetSysLocale().GetCharClass().getLocale()); do @@ -478,16 +478,16 @@ void SmParser::NextToken() // set index of current token nTokenIndex = BufferIndex; - CurToken.nRow = Row; - CurToken.nCol = nRealStart - ColOff + 1; + CurToken.nRow = Row; + CurToken.nCol = nRealStart - ColOff + 1; BOOL bHandled = TRUE; if (nRealStart >= nBufLen) { - CurToken.eType = TEND; + CurToken.eType = TEND; CurToken.cMathChar = '\0'; - CurToken.nGroup = 0; - CurToken.nLevel = 0; + CurToken.nGroup = 0; + CurToken.nLevel = 0; CurToken.aText.Erase(); } else if ((aRes.TokenType & (KParseType::ASC_NUMBER | KParseType::UNI_NUMBER)) @@ -514,7 +514,7 @@ void SmParser::NextToken() CurToken.cMathChar = '\0'; CurToken.nGroup = 0; CurToken.nLevel = 5; - CurToken.aText = aRes.DequotedNameOrString; + CurToken.aText = aRes.DequotedNameOrString; CurToken.nRow = Row; CurToken.nCol = nRealStart - ColOff + 2; } @@ -551,10 +551,10 @@ void SmParser::NextToken() } else if (aRes.TokenType == 0 && '_' == BufferString.GetChar( nRealStart )) { - CurToken.eType = TRSUB; + CurToken.eType = TRSUB; CurToken.cMathChar = '\0'; - CurToken.nGroup = TGPOWER; - CurToken.nLevel = 0; + CurToken.nGroup = TGPOWER; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "_" ); aRes.EndPos = nRealStart + 1; @@ -574,10 +574,10 @@ void SmParser::NextToken() if (BufferString.Copy( nRealStart, 2 ). EqualsAscii( "<<" )) { - CurToken.eType = TLL; + CurToken.eType = TLL; CurToken.cMathChar = MS_LL; - CurToken.nGroup = TGRELATION; - CurToken.nLevel = 0; + CurToken.nGroup = TGRELATION; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "<<" ); rnEndPos = nRealStart + 2; @@ -585,10 +585,10 @@ void SmParser::NextToken() else if (BufferString.Copy( nRealStart, 2 ). EqualsAscii( "<=" )) { - CurToken.eType = TLE; + CurToken.eType = TLE; CurToken.cMathChar = MS_LE; - CurToken.nGroup = TGRELATION; - CurToken.nLevel = 0; + CurToken.nGroup = TGRELATION; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "<=" ); rnEndPos = nRealStart + 2; @@ -596,10 +596,10 @@ void SmParser::NextToken() else if (BufferString.Copy( nRealStart, 2 ). EqualsAscii( "<>" )) { - CurToken.eType = TNEQ; + CurToken.eType = TNEQ; CurToken.cMathChar = MS_NEQ; - CurToken.nGroup = TGRELATION; - CurToken.nLevel = 0; + CurToken.nGroup = TGRELATION; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "<>" ); rnEndPos = nRealStart + 2; @@ -607,20 +607,20 @@ void SmParser::NextToken() else if (BufferString.Copy( nRealStart, 3 ). EqualsAscii( "<?>" )) { - CurToken.eType = TPLACE; + CurToken.eType = TPLACE; CurToken.cMathChar = MS_PLACE; - CurToken.nGroup = 0; - CurToken.nLevel = 5; + CurToken.nGroup = 0; + CurToken.nLevel = 5; CurToken.aText.AssignAscii( "<?>" ); rnEndPos = nRealStart + 3; } else { - CurToken.eType = TLT; + CurToken.eType = TLT; CurToken.cMathChar = MS_LT; - CurToken.nGroup = TGRELATION; - CurToken.nLevel = 0; + CurToken.nGroup = TGRELATION; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "<" ); } } @@ -630,10 +630,10 @@ void SmParser::NextToken() if (BufferString.Copy( nRealStart, 2 ). EqualsAscii( ">=" )) { - CurToken.eType = TGE; + CurToken.eType = TGE; CurToken.cMathChar = MS_GE; - CurToken.nGroup = TGRELATION; - CurToken.nLevel = 0; + CurToken.nGroup = TGRELATION; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( ">=" ); rnEndPos = nRealStart + 2; @@ -641,20 +641,20 @@ void SmParser::NextToken() else if (BufferString.Copy( nRealStart, 2 ). EqualsAscii( ">>" )) { - CurToken.eType = TGG; + CurToken.eType = TGG; CurToken.cMathChar = MS_GG; - CurToken.nGroup = TGRELATION; - CurToken.nLevel = 0; + CurToken.nGroup = TGRELATION; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( ">>" ); rnEndPos = nRealStart + 2; } else { - CurToken.eType = TGT; + CurToken.eType = TGT; CurToken.cMathChar = MS_GT; - CurToken.nGroup = TGRELATION; - CurToken.nLevel = 0; + CurToken.nGroup = TGRELATION; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( ">" ); } } @@ -727,82 +727,82 @@ void SmParser::NextToken() break; case '[': { - CurToken.eType = TLBRACKET; + CurToken.eType = TLBRACKET; CurToken.cMathChar = MS_LBRACKET; - CurToken.nGroup = TGLBRACES; - CurToken.nLevel = 5; + CurToken.nGroup = TGLBRACES; + CurToken.nLevel = 5; CurToken.aText.AssignAscii( "[" ); } break; case '\\': { - CurToken.eType = TESCAPE; + CurToken.eType = TESCAPE; CurToken.cMathChar = '\0'; - CurToken.nGroup = 0; - CurToken.nLevel = 5; + CurToken.nGroup = 0; + CurToken.nLevel = 5; CurToken.aText.AssignAscii( "\\" ); } break; case ']': { - CurToken.eType = TRBRACKET; + CurToken.eType = TRBRACKET; CurToken.cMathChar = MS_RBRACKET; - CurToken.nGroup = TGRBRACES; - CurToken.nLevel = 0; + CurToken.nGroup = TGRBRACES; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "]" ); } break; case '^': { - CurToken.eType = TRSUP; + CurToken.eType = TRSUP; CurToken.cMathChar = '\0'; - CurToken.nGroup = TGPOWER; - CurToken.nLevel = 0; + CurToken.nGroup = TGPOWER; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "^" ); } break; case '`': { - CurToken.eType = TSBLANK; + CurToken.eType = TSBLANK; CurToken.cMathChar = '\0'; - CurToken.nGroup = TGBLANK; - CurToken.nLevel = 5; + CurToken.nGroup = TGBLANK; + CurToken.nLevel = 5; CurToken.aText.AssignAscii( "`" ); } break; case '{': { - CurToken.eType = TLGROUP; + CurToken.eType = TLGROUP; CurToken.cMathChar = MS_LBRACE; - CurToken.nGroup = 0; - CurToken.nLevel = 5; + CurToken.nGroup = 0; + CurToken.nLevel = 5; CurToken.aText.AssignAscii( "{" ); } break; case '|': { - CurToken.eType = TOR; + CurToken.eType = TOR; CurToken.cMathChar = MS_OR; - CurToken.nGroup = TGSUM; - CurToken.nLevel = 0; + CurToken.nGroup = TGSUM; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "|" ); } break; case '}': { - CurToken.eType = TRGROUP; + CurToken.eType = TRGROUP; CurToken.cMathChar = MS_RBRACE; - CurToken.nGroup = 0; - CurToken.nLevel = 0; + CurToken.nGroup = 0; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "}" ); } break; case '~': { - CurToken.eType = TBLANK; + CurToken.eType = TBLANK; CurToken.cMathChar = '\0'; - CurToken.nGroup = TGBLANK; - CurToken.nLevel = 5; + CurToken.nGroup = TGBLANK; + CurToken.nLevel = 5; CurToken.aText.AssignAscii( "~" ); } break; @@ -811,57 +811,57 @@ void SmParser::NextToken() if (BufferString.Copy( nRealStart, 2 ). EqualsAscii( "##" )) { - CurToken.eType = TDPOUND; + CurToken.eType = TDPOUND; CurToken.cMathChar = '\0'; - CurToken.nGroup = 0; - CurToken.nLevel = 0; + CurToken.nGroup = 0; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "##" ); rnEndPos = nRealStart + 2; } else { - CurToken.eType = TPOUND; + CurToken.eType = TPOUND; CurToken.cMathChar = '\0'; - CurToken.nGroup = 0; - CurToken.nLevel = 0; + CurToken.nGroup = 0; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "#" ); } } break; case '&': { - CurToken.eType = TAND; + CurToken.eType = TAND; CurToken.cMathChar = MS_AND; - CurToken.nGroup = TGPRODUCT; - CurToken.nLevel = 0; + CurToken.nGroup = TGPRODUCT; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "&" ); } break; case '(': { - CurToken.eType = TLPARENT; + CurToken.eType = TLPARENT; CurToken.cMathChar = MS_LPARENT; - CurToken.nGroup = TGLBRACES; - CurToken.nLevel = 5; //! 0 to continue expression + CurToken.nGroup = TGLBRACES; + CurToken.nLevel = 5; //! 0 to continue expression CurToken.aText.AssignAscii( "(" ); } break; case ')': { - CurToken.eType = TRPARENT; + CurToken.eType = TRPARENT; CurToken.cMathChar = MS_RPARENT; - CurToken.nGroup = TGRBRACES; - CurToken.nLevel = 0; //! 0 to terminate expression + CurToken.nGroup = TGRBRACES; + CurToken.nLevel = 0; //! 0 to terminate expression CurToken.aText.AssignAscii( ")" ); } break; case '*': { - CurToken.eType = TMULTIPLY; + CurToken.eType = TMULTIPLY; CurToken.cMathChar = MS_MULTIPLY; - CurToken.nGroup = TGPRODUCT; - CurToken.nLevel = 0; + CurToken.nGroup = TGPRODUCT; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "*" ); } break; @@ -870,20 +870,20 @@ void SmParser::NextToken() if (BufferString.Copy( nRealStart, 2 ). EqualsAscii( "+-" )) { - CurToken.eType = TPLUSMINUS; + CurToken.eType = TPLUSMINUS; CurToken.cMathChar = MS_PLUSMINUS; - CurToken.nGroup = TGUNOPER | TGSUM; - CurToken.nLevel = 5; + CurToken.nGroup = TGUNOPER | TGSUM; + CurToken.nLevel = 5; CurToken.aText.AssignAscii( "+-" ); rnEndPos = nRealStart + 2; } else { - CurToken.eType = TPLUS; + CurToken.eType = TPLUS; CurToken.cMathChar = MS_PLUS; - CurToken.nGroup = TGUNOPER | TGSUM; - CurToken.nLevel = 5; + CurToken.nGroup = TGUNOPER | TGSUM; + CurToken.nLevel = 5; CurToken.aText.AssignAscii( "+" ); } } @@ -893,20 +893,20 @@ void SmParser::NextToken() if (BufferString.Copy( nRealStart, 2 ). EqualsAscii( "-+" )) { - CurToken.eType = TMINUSPLUS; + CurToken.eType = TMINUSPLUS; CurToken.cMathChar = MS_MINUSPLUS; - CurToken.nGroup = TGUNOPER | TGSUM; - CurToken.nLevel = 5; + CurToken.nGroup = TGUNOPER | TGSUM; + CurToken.nLevel = 5; CurToken.aText.AssignAscii( "-+" ); rnEndPos = nRealStart + 2; } else { - CurToken.eType = TMINUS; + CurToken.eType = TMINUS; CurToken.cMathChar = MS_MINUS; - CurToken.nGroup = TGUNOPER | TGSUM; - CurToken.nLevel = 5; + CurToken.nGroup = TGUNOPER | TGSUM; + CurToken.nLevel = 5; CurToken.aText.AssignAscii( "-" ); } } @@ -918,7 +918,7 @@ void SmParser::NextToken() // will be treated as numbers CurToken.eType = TNUMBER; CurToken.cMathChar = '\0'; - CurToken.nGroup = 0; + CurToken.nGroup = 0; CurToken.nLevel = 5; xub_StrLen nTxtStart = BufferIndex; @@ -936,19 +936,19 @@ void SmParser::NextToken() break; case '/': { - CurToken.eType = TDIVIDEBY; + CurToken.eType = TDIVIDEBY; CurToken.cMathChar = MS_SLASH; - CurToken.nGroup = TGPRODUCT; - CurToken.nLevel = 0; + CurToken.nGroup = TGPRODUCT; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "/" ); } break; case '=': { - CurToken.eType = TASSIGN; + CurToken.eType = TASSIGN; CurToken.cMathChar = MS_ASSIGN; - CurToken.nGroup = TGRELATION; - CurToken.nLevel = 0; + CurToken.nGroup = TGRELATION; + CurToken.nLevel = 0; CurToken.aText.AssignAscii( "=" ); } break; @@ -1019,14 +1019,14 @@ void SmParser::Align() if (CONVERT_40_TO_50 == GetConversion()) // encapsulate expression to be aligned in group braces // (here group-open brace) - { Insert('{', GetTokenIndex()); + { Insert('{', GetTokenIndex()); bNeedGroupClose = TRUE; // get first valid align statement in sequence // (the dominant one in 4.0) and erase all others (especially old // discarded tokens) from command string. while (TokenInGroup(TGALIGN)) - { if (TokenInGroup(TGDISCARDED) || pSNode) + { if (TokenInGroup(TGDISCARDED) || pSNode) { BufferIndex = GetTokenIndex(); BufferString.Erase(BufferIndex, CurToken.aText.Len()); } @@ -1044,7 +1044,7 @@ void SmParser::Align() // allow for just one align statement in 5.0 if (CONVERT_40_TO_50 != GetConversion() && TokenInGroup(TGALIGN)) - { Error(PE_DOUBLE_ALIGN); + { Error(PE_DOUBLE_ALIGN); return; } } @@ -1056,7 +1056,7 @@ void SmParser::Align() Insert('}', GetTokenIndex()); if (pSNode) - { pSNode->SetSubNodes(NodeStack.Pop(), 0); + { pSNode->SetSubNodes(NodeStack.Pop(), 0); NodeStack.Push(pSNode); } } @@ -1073,7 +1073,7 @@ void SmParser::Line() // (and go on with expressions that must not have alignment // statements in 'while' loop below. See also 'Expression()'.) if (CurToken.eType != TEND && CurToken.eType != TNEWLINE) - { Align(); + { Align(); ExpressionArray.resize(++n); ExpressionArray[n - 1] = NodeStack.Pop(); } @@ -1112,7 +1112,7 @@ void SmParser::Expression() NodeStack.Push(pNode); // push the node from above again (now to be used as argument to this current 'nospace' node) } - USHORT n = 0; + USHORT n = 0; SmNodeArray RelationArray; RelationArray.resize(n); @@ -1122,7 +1122,7 @@ void SmParser::Expression() RelationArray[n - 1] = NodeStack.Pop(); while (CurToken.nLevel >= 4) - { Relation(); + { Relation(); RelationArray.resize(++n); RelationArray[n - 1] = NodeStack.Pop(); } @@ -1177,7 +1177,7 @@ void SmParser::Product() Power(); while (TokenInGroup(TGPRODUCT)) - { SmStructureNode *pSNode; + { SmStructureNode *pSNode; SmNode *pFirst = NodeStack.Pop(), *pOper; BOOL bSwitchArgs = FALSE; @@ -1272,7 +1272,7 @@ void SmParser::SubSup(ULONG nActiveGroup) // process all sub-/supscripts int nIndex = 0; while (TokenInGroup(nActiveGroup)) - { SmTokenType eType (CurToken.eType); + { SmTokenType eType (CurToken.eType); // skip sub-/supscript token NextToken(); @@ -1287,19 +1287,19 @@ void SmParser::SubSup(ULONG nActiveGroup) Term(); switch (eType) - { case TRSUB : nIndex = (int) RSUB; break; - case TRSUP : nIndex = (int) RSUP; break; + { case TRSUB : nIndex = (int) RSUB; break; + case TRSUP : nIndex = (int) RSUP; break; case TFROM : - case TCSUB : nIndex = (int) CSUB; break; + case TCSUB : nIndex = (int) CSUB; break; case TTO : - case TCSUP : nIndex = (int) CSUP; break; - case TLSUB : nIndex = (int) LSUB; break; - case TLSUP : nIndex = (int) LSUP; break; + case TCSUP : nIndex = (int) CSUP; break; + case TLSUB : nIndex = (int) LSUB; break; + case TLSUP : nIndex = (int) LSUP; break; default : OSL_ENSURE(FALSE, "Sm: unknown case"); } nIndex++; - OSL_ENSURE(1 <= nIndex && nIndex <= 1 + SUBSUP_NUM_ENTRIES, + OSL_ENSURE(1 <= nIndex && nIndex <= 1 + SUBSUP_NUM_ENTRIES, "SmParser::Power() : sub-/supscript index falsch"); // set sub-/supscript if not already done @@ -1488,17 +1488,17 @@ void SmParser::Term() default: if (TokenInGroup(TGLBRACES)) - { Brace(); + { Brace(); } else if (TokenInGroup(TGOPER)) - { Operator(); + { Operator(); } else if (TokenInGroup(TGUNOPER)) - { UnOper(); + { UnOper(); } else if ( TokenInGroup(TGATTRIBUT) || TokenInGroup(TGFONTATTR)) - { SmStructureNodeArray aArray; + { SmStructureNodeArray aArray; BOOL bIsAttr; USHORT n = 0; @@ -1530,9 +1530,9 @@ void SmParser::Term() } else if (TokenInGroup(TGFUNCTION)) { if (CONVERT_40_TO_50 != GetConversion()) - { Function(); + { Function(); } - else // encapsulate old 4.0 style parsing in braces + else // encapsulate old 4.0 style parsing in braces { // insert opening brace Insert('{', GetTokenIndex()); @@ -1545,10 +1545,10 @@ void SmParser::Term() SmNode *pFunc = NodeStack.Pop(); if (CurToken.eType == TLPARENT) - { Term(); + { Term(); } else - { Align(); + { Align(); } // insert closing brace @@ -1569,28 +1569,28 @@ void SmParser::Escape() { NextToken(); - sal_Unicode cChar; + sal_Unicode cChar; switch (CurToken.eType) - { case TLPARENT : cChar = MS_LPARENT; break; - case TRPARENT : cChar = MS_RPARENT; break; - case TLBRACKET : cChar = MS_LBRACKET; break; - case TRBRACKET : cChar = MS_RBRACKET; break; + { case TLPARENT : cChar = MS_LPARENT; break; + case TRPARENT : cChar = MS_RPARENT; break; + case TLBRACKET : cChar = MS_LBRACKET; break; + case TRBRACKET : cChar = MS_RBRACKET; break; case TLDBRACKET : cChar = MS_LDBRACKET; break; case TRDBRACKET : cChar = MS_RDBRACKET; break; case TLBRACE : - case TLGROUP : cChar = MS_LBRACE; break; + case TLGROUP : cChar = MS_LBRACE; break; case TRBRACE : - case TRGROUP : cChar = MS_RBRACE; break; - case TLANGLE : cChar = MS_LANGLE; break; - case TRANGLE : cChar = MS_RANGLE; break; - case TLCEIL : cChar = MS_LCEIL; break; - case TRCEIL : cChar = MS_RCEIL; break; - case TLFLOOR : cChar = MS_LFLOOR; break; - case TRFLOOR : cChar = MS_RFLOOR; break; + case TRGROUP : cChar = MS_RBRACE; break; + case TLANGLE : cChar = MS_LANGLE; break; + case TRANGLE : cChar = MS_RANGLE; break; + case TLCEIL : cChar = MS_LCEIL; break; + case TRCEIL : cChar = MS_RCEIL; break; + case TLFLOOR : cChar = MS_LFLOOR; break; + case TRFLOOR : cChar = MS_RFLOOR; break; case TLLINE : - case TRLINE : cChar = MS_LINE; break; + case TRLINE : cChar = MS_LINE; break; case TLDLINE : - case TRDLINE : cChar = MS_DLINE; break; + case TRDLINE : cChar = MS_DLINE; break; default: Error(PE_UNEXPECTED_TOKEN); } @@ -1605,7 +1605,7 @@ void SmParser::Escape() void SmParser::Operator() { if (TokenInGroup(TGOPER)) - { SmStructureNode *pSNode = new SmOperNode(CurToken); + { SmStructureNode *pSNode = new SmOperNode(CurToken); // put operator on top of stack Oper(); @@ -1649,9 +1649,9 @@ void SmParser::Oper() const sal_Char* pLim = 0; switch (eType) { - case TLIM : pLim = "lim"; break; - case TLIMSUP : pLim = "lim sup"; break; - case TLIMINF : pLim = "lim inf"; break; + case TLIM : pLim = "lim"; break; + case TLIMSUP : pLim = "lim sup"; break; + case TLIMINF : pLim = "lim inf"; break; default: break; } @@ -1686,9 +1686,9 @@ void SmParser::UnOper() { OSL_ENSURE(TokenInGroup(TGUNOPER), "Sm: wrong token"); - SmToken aNodeToken = CurToken; - SmTokenType eType = CurToken.eType; - BOOL bIsPostfix = eType == TFACT; + SmToken aNodeToken = CurToken; + SmTokenType eType = CurToken.eType; + BOOL bIsPostfix = eType == TFACT; SmStructureNode *pSNode; SmNode *pOper = 0, @@ -1736,7 +1736,7 @@ void SmParser::UnOper() pArg = NodeStack.Pop(); if (eType == TABS) - { pSNode = new SmBraceNode(aNodeToken); + { pSNode = new SmBraceNode(aNodeToken); pSNode->SetScaleMode(SCALE_HEIGHT); // build nodes for left & right lines @@ -1753,12 +1753,12 @@ void SmParser::UnOper() pSNode->SetSubNodes(pLeft, pArg, pRight); } else if (eType == TSQRT || eType == TNROOT) - { pSNode = new SmRootNode(aNodeToken); + { pSNode = new SmRootNode(aNodeToken); pOper = new SmRootSymbolNode(aNodeToken); pSNode->SetSubNodes(pExtra, pOper, pArg); } else - { pSNode = new SmUnHorNode(aNodeToken); + { pSNode = new SmUnHorNode(aNodeToken); if (bIsPostfix) pSNode->SetSubNodes(pArg, pOper); @@ -1775,13 +1775,13 @@ void SmParser::Attribut() { OSL_ENSURE(TokenInGroup(TGATTRIBUT), "Sm: wrong token group"); - SmStructureNode *pSNode = new SmAttributNode(CurToken); - SmNode *pAttr; + SmStructureNode *pSNode = new SmAttributNode(CurToken); + SmNode *pAttr; SmScaleMode eScaleMode = SCALE_NONE; // get appropriate node for the attribut itself switch (CurToken.eType) - { case TUNDERLINE : + { case TUNDERLINE : case TOVERLINE : case TOVERSTRIKE : pAttr = new SmRectangleNode(CurToken); @@ -1847,10 +1847,10 @@ void SmParser::Color() // last color rules, get that one SmToken aToken; do - { NextToken(); + { NextToken(); if (TokenInGroup(TGCOLOR)) - { aToken = CurToken; + { aToken = CurToken; NextToken(); } else @@ -1868,10 +1868,10 @@ void SmParser::Font() // last font rules, get that one SmToken aToken; do - { NextToken(); + { NextToken(); if (TokenInGroup(TGFONT)) - { aToken = CurToken; + { aToken = CurToken; NextToken(); } else @@ -1908,18 +1908,18 @@ void SmParser::FontSize() { OSL_ENSURE(CurToken.eType == TSIZE, "Sm : Ooops..."); - USHORT Type; + USHORT Type; SmFontNode *pFontNode = new SmFontNode(CurToken); NextToken(); switch (CurToken.eType) { - case TNUMBER: Type = FNTSIZ_ABSOLUT; break; - case TPLUS: Type = FNTSIZ_PLUS; break; - case TMINUS: Type = FNTSIZ_MINUS; break; - case TMULTIPLY: Type = FNTSIZ_MULTIPLY; break; - case TDIVIDEBY: Type = FNTSIZ_DIVIDE; break; + case TNUMBER: Type = FNTSIZ_ABSOLUT; break; + case TPLUS: Type = FNTSIZ_PLUS; break; + case TMINUS: Type = FNTSIZ_MINUS; break; + case TMULTIPLY: Type = FNTSIZ_MULTIPLY; break; + case TDIVIDEBY: Type = FNTSIZ_DIVIDE; break; default: delete pFontNode; @@ -1986,7 +1986,7 @@ void SmParser::Brace() SmParseError eError = PE_NONE; if (CurToken.eType == TLEFT) - { NextToken(); + { NextToken(); eScaleMode = SCALE_HEIGHT; @@ -2000,7 +2000,7 @@ void SmParser::Brace() pBody = NodeStack.Pop(); if (CurToken.eType == TRIGHT) - { NextToken(); + { NextToken(); // check for right bracket if (TokenInGroup(TGLBRACES) || TokenInGroup(TGRBRACES)) @@ -2029,15 +2029,15 @@ void SmParser::Brace() SmTokenType eExpectedType = TUNKNOWN; switch (pLeft->GetToken().eType) - { case TLPARENT : eExpectedType = TRPARENT; break; - case TLBRACKET : eExpectedType = TRBRACKET; break; - case TLBRACE : eExpectedType = TRBRACE; break; - case TLDBRACKET : eExpectedType = TRDBRACKET; break; - case TLLINE : eExpectedType = TRLINE; break; - case TLDLINE : eExpectedType = TRDLINE; break; - case TLANGLE : eExpectedType = TRANGLE; break; - case TLFLOOR : eExpectedType = TRFLOOR; break; - case TLCEIL : eExpectedType = TRCEIL; break; + { case TLPARENT : eExpectedType = TRPARENT; break; + case TLBRACKET : eExpectedType = TRBRACKET; break; + case TLBRACE : eExpectedType = TRBRACE; break; + case TLDBRACKET : eExpectedType = TRDBRACKET; break; + case TLLINE : eExpectedType = TRLINE; break; + case TLDLINE : eExpectedType = TRDLINE; break; + case TLANGLE : eExpectedType = TRANGLE; break; + case TLFLOOR : eExpectedType = TRFLOOR; break; + case TLCEIL : eExpectedType = TRCEIL; break; default : OSL_ENSURE(0, "Sm: unknown case"); } @@ -2062,7 +2062,7 @@ void SmParser::Brace() NodeStack.Push(pSNode); } else - { delete pSNode; + { delete pSNode; delete pBody; delete pLeft; delete pRight; @@ -2075,8 +2075,8 @@ void SmParser::Brace() void SmParser::Bracebody(BOOL bIsLeftRight) { SmStructureNode *pBody = new SmBracebodyNode(CurToken); - SmNodeArray aNodes; - USHORT nNum = 0; + SmNodeArray aNodes; + USHORT nNum = 0; // get body if any if (bIsLeftRight) @@ -2090,7 +2090,7 @@ void SmParser::Bracebody(BOOL bIsLeftRight) nNum++; } else if (CurToken.eType != TRIGHT) - { Align(); + { Align(); nNum++; if (CurToken.eType != TMLINE && CurToken.eType != TRIGHT) @@ -2109,7 +2109,7 @@ void SmParser::Bracebody(BOOL bIsLeftRight) nNum++; } else if (!TokenInGroup(TGRBRACES)) - { Align(); + { Align(); nNum++; if (CurToken.eType != TMLINE && !TokenInGroup(TGRBRACES)) @@ -2134,7 +2134,7 @@ void SmParser::Function() switch (CurToken.eType) { case TFUNC: - NextToken(); // skip "FUNC"-statement + NextToken(); // skip "FUNC"-statement // fall through case TSIN : @@ -2169,7 +2169,7 @@ void SmParser::Function() void SmParser::Binom() { SmNodeArray ExpressionArray; - SmStructureNode *pSNode = new SmTableNode(CurToken); + SmStructureNode *pSNode = new SmTableNode(CurToken); NextToken(); @@ -2371,7 +2371,7 @@ void SmParser::GlyphSpecial() void SmParser::Error(SmParseError eError) { SmStructureNode *pSNode = new SmExpressionNode(CurToken); - SmErrorNode *pErr = new SmErrorNode(eError, CurToken); + SmErrorNode *pErr = new SmErrorNode(eError, CurToken); pSNode->SetSubNodes(pErr, 0); //! put a structure node on the stack (instead of the error node itself) @@ -2402,9 +2402,9 @@ SmNode *SmParser::Parse(const String &rBuffer) BufferString.ConvertLineEnd( LINEEND_LF ); BufferIndex = 0; nTokenIndex = 0; - Row = 1; - ColOff = 0; - CurError = -1; + Row = 1; + ColOff = 0; + CurError = -1; for (USHORT i = 0; i < ErrDescList.Count(); i++) delete ErrDescList.Remove(i); @@ -2456,19 +2456,19 @@ USHORT SmParser::AddError(SmParseError Type, SmNode *pNode) USHORT nRID; switch (Type) { - case PE_UNEXPECTED_CHAR: nRID = RID_ERR_UNEXPECTEDCHARACTER; break; - case PE_LGROUP_EXPECTED: nRID = RID_ERR_LGROUPEXPECTED; break; - case PE_RGROUP_EXPECTED: nRID = RID_ERR_RGROUPEXPECTED; break; - case PE_LBRACE_EXPECTED: nRID = RID_ERR_LBRACEEXPECTED; break; - case PE_RBRACE_EXPECTED: nRID = RID_ERR_RBRACEEXPECTED; break; - case PE_FUNC_EXPECTED: nRID = RID_ERR_FUNCEXPECTED; break; - case PE_UNOPER_EXPECTED: nRID = RID_ERR_UNOPEREXPECTED; break; - case PE_BINOPER_EXPECTED: nRID = RID_ERR_BINOPEREXPECTED; break; - case PE_SYMBOL_EXPECTED: nRID = RID_ERR_SYMBOLEXPECTED; break; - case PE_IDENTIFIER_EXPECTED: nRID = RID_ERR_IDENTEXPECTED; break; - case PE_POUND_EXPECTED: nRID = RID_ERR_POUNDEXPECTED; break; - case PE_COLOR_EXPECTED: nRID = RID_ERR_COLOREXPECTED; break; - case PE_RIGHT_EXPECTED: nRID = RID_ERR_RIGHTEXPECTED; break; + case PE_UNEXPECTED_CHAR: nRID = RID_ERR_UNEXPECTEDCHARACTER; break; + case PE_LGROUP_EXPECTED: nRID = RID_ERR_LGROUPEXPECTED; break; + case PE_RGROUP_EXPECTED: nRID = RID_ERR_RGROUPEXPECTED; break; + case PE_LBRACE_EXPECTED: nRID = RID_ERR_LBRACEEXPECTED; break; + case PE_RBRACE_EXPECTED: nRID = RID_ERR_RBRACEEXPECTED; break; + case PE_FUNC_EXPECTED: nRID = RID_ERR_FUNCEXPECTED; break; + case PE_UNOPER_EXPECTED: nRID = RID_ERR_UNOPEREXPECTED; break; + case PE_BINOPER_EXPECTED: nRID = RID_ERR_BINOPEREXPECTED; break; + case PE_SYMBOL_EXPECTED: nRID = RID_ERR_SYMBOLEXPECTED; break; + case PE_IDENTIFIER_EXPECTED: nRID = RID_ERR_IDENTEXPECTED; break; + case PE_POUND_EXPECTED: nRID = RID_ERR_POUNDEXPECTED; break; + case PE_COLOR_EXPECTED: nRID = RID_ERR_COLOREXPECTED; break; + case PE_RIGHT_EXPECTED: nRID = RID_ERR_RIGHTEXPECTED; break; default: nRID = RID_ERR_UNKOWN; diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx index 895bb0a18186..228d5c09a557 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,15 +108,15 @@ SmRect::SmRect() SmRect::SmRect(const SmRect &rRect) -: aTopLeft(rRect.aTopLeft), +: aTopLeft(rRect.aTopLeft), aSize(rRect.aSize) { bHasBaseline = rRect.bHasBaseline; - nBaseline = rRect.nBaseline; - nAlignT = rRect.nAlignT; - nAlignM = rRect.nAlignM; - nAlignB = rRect.nAlignB; - nGlyphTop = rRect.nGlyphTop; + nBaseline = rRect.nBaseline; + nAlignT = rRect.nAlignT; + nAlignM = rRect.nAlignM; + nAlignB = rRect.nAlignB; + nGlyphTop = rRect.nGlyphTop; nGlyphBottom = rRect.nGlyphBottom; nHiAttrFence = rRect.nHiAttrFence; nLoAttrFence = rRect.nLoAttrFence; @@ -129,14 +129,14 @@ SmRect::SmRect(const SmRect &rRect) void SmRect::CopyAlignInfo(const SmRect &rRect) { - nBaseline = rRect.nBaseline; - bHasBaseline = rRect.bHasBaseline; - nAlignT = rRect.nAlignT; - nAlignM = rRect.nAlignM; - nAlignB = rRect.nAlignB; + nBaseline = rRect.nBaseline; + bHasBaseline = rRect.bHasBaseline; + nAlignT = rRect.nAlignT; + nAlignM = rRect.nAlignM; + nAlignB = rRect.nAlignB; bHasAlignInfo = rRect.bHasAlignInfo; - nLoAttrFence = rRect.nLoAttrFence; - nHiAttrFence = rRect.nHiAttrFence; + nLoAttrFence = rRect.nLoAttrFence; + nHiAttrFence = rRect.nHiAttrFence; } @@ -149,25 +149,25 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat, const FontMetric aFM (rDev.GetFontMetric()); BOOL bIsMath = aFM.GetName().EqualsIgnoreCaseAscii( FONTNAME_MATH ); - BOOL bAllowSmaller = bIsMath && !SmIsMathAlpha(rText); - const long nFontHeight = rDev.GetFont().GetSize().Height(); + BOOL bAllowSmaller = bIsMath && !SmIsMathAlpha(rText); + const long nFontHeight = rDev.GetFont().GetSize().Height(); nBorderWidth = nBorder; bHasAlignInfo = TRUE; bHasBaseline = TRUE; - nBaseline = aFM.GetAscent(); - nAlignT = nBaseline - nFontHeight * 750L / 1000L; - nAlignM = nBaseline - nFontHeight * 121L / 422L; + nBaseline = aFM.GetAscent(); + nAlignT = nBaseline - nFontHeight * 750L / 1000L; + nAlignM = nBaseline - nFontHeight * 121L / 422L; // that's where the horizontal bars of '+', '-', ... are // (1/3 of ascent over baseline) // (121 = 1/3 of 12pt ascent, 422 = 12pt fontheight) - nAlignB = nBaseline; + nAlignB = nBaseline; // workaround for printer fonts with very small (possible 0 or even // negative(!)) leading if (aFM.GetIntLeading() < 5 && rDev.GetOutDevType() == OUTDEV_PRINTER) { - OutputDevice *pWindow = Application::GetDefaultDevice(); + OutputDevice *pWindow = Application::GetDefaultDevice(); pWindow->Push(PUSH_MAPMODE | PUSH_FONT); @@ -176,7 +176,7 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat, long nDelta = pWindow->GetFontMetric().GetIntLeading(); if (nDelta == 0) - { // dieser Wert entspricht etwa einem Leading von 80 bei einer + { // dieser Wert entspricht etwa einem Leading von 80 bei einer // Fonthoehe von 422 (12pt) nDelta = nFontHeight * 8L / 43; } @@ -258,16 +258,16 @@ SmRect::SmRect(long nWidth, long nHeight) // it will not provide useful values for baseline, AlignT and AlignB! // It's purpose is to get a 'SmRect' for the horizontal line in fractions // as used in 'SmBinVerNode'. -: aSize(nWidth, nHeight) +: aSize(nWidth, nHeight) { OSL_ENSURE(aTopLeft == Point(0, 0), "Sm: ooops..."); bHasBaseline = FALSE; bHasAlignInfo = TRUE; - nBaseline = 0; - nAlignT = GetTop(); - nAlignB = GetBottom(); - nAlignM = (nAlignT + nAlignB) / 2; // this is the default + nBaseline = 0; + nAlignT = GetTop(); + nAlignB = GetBottom(); + nAlignM = (nAlignT + nAlignB) / 2; // this is the default nItalicLeftSpace = nItalicRightSpace = 0; nGlyphTop = nHiAttrFence = GetTop(); nGlyphBottom = nLoAttrFence = GetBottom(); @@ -278,7 +278,7 @@ SmRect::SmRect(long nWidth, long nHeight) void SmRect::SetLeft(long nLeft) { if (nLeft <= GetRight()) - { aSize.Width() = GetRight() - nLeft + 1; + { aSize.Width() = GetRight() - nLeft + 1; aTopLeft.X() = nLeft; } } @@ -301,7 +301,7 @@ void SmRect::SetBottom(long nBottom) void SmRect::SetTop(long nTop) { if (nTop <= GetBottom()) - { aSize.Height() = GetBottom() - nTop + 1; + { aSize.Height() = GetBottom() - nTop + 1; aTopLeft.Y() = nTop; } } @@ -315,7 +315,7 @@ void SmRect::Move(const Point &rPosition) long nDelta = rPosition.Y(); nBaseline += nDelta; nAlignT += nDelta; - nAlignM += nDelta; + nAlignM += nDelta; nAlignB += nDelta; nGlyphTop += nDelta; nGlyphBottom += nDelta; @@ -326,13 +326,13 @@ void SmRect::Move(const Point &rPosition) const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos, RectHorAlign eHor, RectVerAlign eVer) const -{ Point aPos (GetTopLeft()); +{ Point aPos (GetTopLeft()); // will become the topleft point of the new rectangle position // set horizontal or vertical new rectangle position depending on // 'ePos' is one of 'RP_LEFT', 'RP_RIGHT' or 'RP_TOP', 'RP_BOTTOM' switch (ePos) - { case RP_LEFT : + { case RP_LEFT : aPos.X() = rRect.GetItalicLeft() - GetItalicRightSpace() - GetWidth(); break; @@ -357,7 +357,7 @@ const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos, if (ePos == RP_LEFT || ePos == RP_RIGHT || ePos == RP_ATTRIBUT) // correct error in current vertical position switch (eVer) - { case RVA_TOP : + { case RVA_TOP : aPos.Y() += rRect.GetAlignT() - GetAlignT(); break; case RVA_MID : @@ -391,10 +391,10 @@ const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos, } // check if vertical position is already set - if (ePos == RP_TOP || ePos == RP_BOTTOM) + if (ePos == RP_TOP || ePos == RP_BOTTOM) // correct error in current horizontal position switch (eHor) - { case RHA_LEFT : + { case RHA_LEFT : aPos.X() += rRect.GetItalicLeft() - GetItalicLeft(); break; case RHA_CENTER : @@ -427,7 +427,7 @@ SmRect & SmRect::Union(const SmRect &rRect) nGT = rRect.nGlyphTop, nGB = rRect.nGlyphBottom; if (!IsEmpty()) - { long nTmp; + { long nTmp; if ((nTmp = GetLeft()) < nL) nL = nTmp; @@ -473,14 +473,14 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode) if (!HasAlignInfo()) CopyAlignInfo(rRect); else if (rRect.HasAlignInfo()) - { nAlignT = Min(GetAlignT(), rRect.GetAlignT()); + { nAlignT = Min(GetAlignT(), rRect.GetAlignT()); nAlignB = Max(GetAlignB(), rRect.GetAlignB()); nHiAttrFence = Min(GetHiAttrFence(), rRect.GetHiAttrFence()); nLoAttrFence = Max(GetLoAttrFence(), rRect.GetLoAttrFence()); OSL_ENSURE(HasAlignInfo(), "Sm: ooops..."); switch (eCopyMode) - { case RCP_THIS: + { case RCP_THIS: // already done break; case RCP_ARG: @@ -529,15 +529,15 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode, long nOldAlignT = GetAlignT(), nOldAlignM = GetAlignM(), nOldAlignB = GetAlignB(), - nOldBaseline = nBaseline; //! depends not on 'HasBaseline' + nOldBaseline = nBaseline; //! depends not on 'HasBaseline' BOOL bOldHasAlignInfo = HasAlignInfo(); ExtendBy(rRect, eCopyMode); if (bKeepVerAlignParams) - { nAlignT = nOldAlignT; - nAlignM = nOldAlignM; - nAlignB = nOldAlignB; + { nAlignT = nOldAlignT; + nAlignM = nOldAlignM; + nAlignB = nOldAlignB; nBaseline = nOldBaseline; bHasAlignInfo = bOldHasAlignInfo; } @@ -557,7 +557,7 @@ long SmRect::OrientedDist(const Point &rPoint) const // build reference point to define the distance Point aRef; if (bIsInside) - { Point aIC (GetItalicCenterX(), GetCenterY()); + { Point aIC (GetItalicCenterX(), GetCenterY()); aRef.X() = rPoint.X() >= aIC.X() ? GetItalicRight() : GetItalicLeft(); aRef.Y() = rPoint.Y() >= aIC.Y() ? GetBottom() : GetTop(); @@ -592,7 +592,7 @@ long SmRect::OrientedDist(const Point &rPoint) const BOOL SmRect::IsInsideRect(const Point &rPoint) const { - return rPoint.Y() >= GetTop() + return rPoint.Y() >= GetTop() && rPoint.Y() <= GetBottom() && rPoint.X() >= GetLeft() && rPoint.X() <= GetRight(); @@ -601,7 +601,7 @@ BOOL SmRect::IsInsideRect(const Point &rPoint) const BOOL SmRect::IsInsideItalicRect(const Point &rPoint) const { - return rPoint.Y() >= GetTop() + return rPoint.Y() >= GetTop() && rPoint.Y() <= GetBottom() && rPoint.X() >= GetItalicLeft() && rPoint.X() <= GetItalicRight(); @@ -629,11 +629,11 @@ void SmRect::Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const rDev.Push(PUSH_LINECOLOR); if (nFlags & SM_RECT_LINES) - { long nLeftSpace = 0, + { long nLeftSpace = 0, nRightSpace = 0; if (nFlags & SM_RECT_ITALIC) - { nLeftSpace = GetItalicLeftSpace(); + { nLeftSpace = GetItalicLeftSpace(); nRightSpace = GetItalicRightSpace(); } @@ -643,24 +643,24 @@ void SmRect::Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const Point aOffset (rPosition - GetTopLeft()); rDev.SetLineColor(COL_LIGHTBLUE); - rDev.DrawLine(Point(nLeft, GetAlignB()) += aOffset, + rDev.DrawLine(Point(nLeft, GetAlignB()) += aOffset, Point(nRight, GetAlignB()) += aOffset); - rDev.DrawLine(Point(nLeft, GetAlignT()) += aOffset, + rDev.DrawLine(Point(nLeft, GetAlignT()) += aOffset, Point(nRight, GetAlignT()) += aOffset); if (HasBaseline()) - rDev.DrawLine(Point(nLeft, GetBaseline()) += aOffset, + rDev.DrawLine(Point(nLeft, GetBaseline()) += aOffset, Point(nRight, GetBaseline()) += aOffset); rDev.SetLineColor(COL_GRAY); - rDev.DrawLine(Point(nLeft, GetHiAttrFence()) += aOffset, + rDev.DrawLine(Point(nLeft, GetHiAttrFence()) += aOffset, Point(nRight, GetHiAttrFence()) += aOffset); } if (nFlags & SM_RECT_MID) - { Point aCenter = rPosition + { Point aCenter = rPosition + (Point(GetItalicCenterX(), GetAlignM()) -= GetTopLeft()), - aLenX (GetWidth() / 5, 0), - aLenY (0, GetHeight() / 16); + aLenX (GetWidth() / 5, 0), + aLenY (0, GetHeight() / 16); rDev.SetLineColor(COL_LIGHTGREEN); rDev.DrawLine(aCenter - aLenX, aCenter + aLenX); @@ -685,10 +685,10 @@ void SmDrawFrame(OutputDevice &rDev, const Rectangle &rRec, rDev.SetLineColor(aCol); - rDev.DrawLine(rRec.TopLeft(), rRec.BottomLeft()); + rDev.DrawLine(rRec.TopLeft(), rRec.BottomLeft()); rDev.DrawLine(rRec.BottomLeft(), rRec.BottomRight()); rDev.DrawLine(rRec.BottomRight(), rRec.TopRight()); - rDev.DrawLine(rRec.TopRight(), rRec.TopLeft()); + rDev.DrawLine(rRec.TopRight(), rRec.TopLeft()); rDev.Pop(); } @@ -704,7 +704,7 @@ BOOL SmGetGlyphBoundRect(const OutputDevice &rDev, // handle special case first xub_StrLen nLen = rText.Len(); if (nLen == 0) - { rRect.SetEmpty(); + { rRect.SetEmpty(); return TRUE; } @@ -734,7 +734,7 @@ BOOL SmGetGlyphBoundRect(const OutputDevice &rDev, long nScaleFactor = 1; while( aFntSize.Height() > 2000 * nScaleFactor ) nScaleFactor *= 2; - + aFnt.SetSize( Size( aFntSize.Width() / nScaleFactor, aFntSize.Height() / nScaleFactor ) ); pGlyphDev->SetFont(aFnt); diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx index 3a303e62d16c..a8fcfd350c0a 100644 --- a/starmath/source/register.cxx +++ b/starmath/source/register.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,7 +120,7 @@ void SAL_CALL component_getImplementationEnvironment( } sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, - void* pRegistryKey ) + void* pRegistryKey ) { Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) ) ; @@ -212,9 +212,9 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, // Set default return value for this operation - if it failed. void* pReturn = NULL ; - if ( - ( pImplementationName != NULL ) && - ( pServiceManager != NULL ) + if ( + ( pImplementationName != NULL ) && + ( pServiceManager != NULL ) ) { // Define variables which are used in following macros. diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index f599dc1070bb..417078acf08f 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx index ae5fc38852ce..27202cb56564 100644 --- a/starmath/source/smdetect.hxx +++ b/starmath/source/smdetect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx index d425db27f924..bbfe37c39331 100644 --- a/starmath/source/smdll.cxx +++ b/starmath/source/smdll.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 904394d01735..964e8d347142 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ SmResId::SmResId( USHORT nId ) SmLocalizedSymbolData::SmLocalizedSymbolData() : Resource( SmResId(RID_LOCALIZED_NAMES) ), - aUiSymbolNamesAry ( SmResId(RID_UI_SYMBOL_NAMES) ), + aUiSymbolNamesAry ( SmResId(RID_UI_SYMBOL_NAMES) ), aExportSymbolNamesAry ( SmResId(RID_EXPORT_SYMBOL_NAMES) ), aUiSymbolSetNamesAry ( SmResId(RID_UI_SYMBOLSET_NAMES) ), aExportSymbolSetNamesAry( SmResId(RID_EXPORT_SYMBOLSET_NAMES) ), @@ -346,19 +346,19 @@ void SmModule::FillStatusBar(StatusBar &rBar) } -SfxItemSet* SmModule::CreateItemSet( USHORT nId ) +SfxItemSet* SmModule::CreateItemSet( USHORT nId ) { - SfxItemSet* pRet = 0; + SfxItemSet* pRet = 0; if(nId == SID_SM_EDITOPTIONS) { pRet = new SfxItemSet(GetPool(), //TP_SMPRINT - SID_PRINTSIZE, SID_PRINTSIZE, - SID_PRINTZOOM, SID_PRINTZOOM, - SID_PRINTTITLE, SID_PRINTTITLE, - SID_PRINTTEXT, SID_PRINTTEXT, - SID_PRINTFRAME, SID_PRINTFRAME, - SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES, + SID_PRINTSIZE, SID_PRINTSIZE, + SID_PRINTZOOM, SID_PRINTZOOM, + SID_PRINTTITLE, SID_PRINTTITLE, + SID_PRINTTEXT, SID_PRINTTEXT, + SID_PRINTFRAME, SID_PRINTFRAME, + SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES, 0 ); GetConfig()->ConfigToItemSet(*pRet); @@ -372,9 +372,9 @@ void SmModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet ) GetConfig()->ItemSetToConfig(rSet); } } -SfxTabPage* SmModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SmModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ) { - SfxTabPage* pRet = 0; + SfxTabPage* pRet = 0; if(nId == SID_SM_TP_PRINTOPTIONS) pRet = SmPrintOptionsTabPage::Create( pParent, rSet ); return pRet; diff --git a/starmath/source/smres.src b/starmath/source/smres.src index c35d77c9afcf..7270427e0b42 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1064,7 +1064,7 @@ ModalDialog RID_SYMBOLDIALOG { OutputSize = TRUE ; SVLook = TRUE ; - Closeable = TRUE; // Close Button in Window Leiste explizit einbauen + Closeable = TRUE; // Close Button in Window Leiste explizit einbauen Size = MAP_APPFONT ( 239 , 123 ) ; Text [ en-US ] = "Symbols" ; Moveable = TRUE ; @@ -1273,7 +1273,7 @@ ModalDialog RID_SYMDEFINEDIALOG Size = MAP_APPFONT ( 54 , 8 ) ; }; Image 1 - { + { ImageBitmap = Bitmap { File = "ar_right.bmp" ; }; MaskColor = IMAGE_STDBTN_COLOR ; }; @@ -3560,7 +3560,7 @@ StringArray RID_PRINTUIOPTIONS < "~Formula text"; >; < "Specifies whether to include the contents of the 'Commands' window at the bottom of the printout."; >; < "B~orders"; >; - < "Applies a thin border to the formula area in the printout."; >; + < "Applies a thin border to the formula area in the printout."; >; < "Size"; >; < "O~riginal size"; >; < "Prints the formula without adjusting the current font size."; >; diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx index fd2c7ea76f76..5e2c62faca03 100644 --- a/starmath/source/symbol.cxx +++ b/starmath/source/symbol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,7 +118,7 @@ bool SmSym::IsEqualInUI( const SmSym& rSymbol ) const return m_aName == rSymbol.m_aName && m_aFace == rSymbol.m_aFace && m_cChar == rSymbol.m_cChar; -} +} /**************************************************************************/ @@ -193,13 +193,13 @@ const SymbolPtrVec_t SmSymbolManager::GetSymbols() const bool SmSymbolManager::AddOrReplaceSymbol( const SmSym &rSymbol, bool bForceChange ) { bool bAdded = false; - + const String aSymbolName( rSymbol.GetName() ); if (aSymbolName.Len() > 0 && rSymbol.GetSymbolSetName().Len() > 0) { const SmSym *pFound = GetSymbolByName( aSymbolName ); const bool bSymbolConflict = pFound && !pFound->IsEqualInUI( rSymbol ); - + // avoid having the same symbol name twice but with different symbols in use if (!pFound || bForceChange) { @@ -208,11 +208,11 @@ bool SmSymbolManager::AddOrReplaceSymbol( const SmSym &rSymbol, bool bForceChang } else if (pFound && !bForceChange && bSymbolConflict) { - // TODO: but what ... + // TODO: but what ... OSL_ENSURE( 0, "symbol conflict, different symbol with same name found!" ); - } + } } - + OSL_ENSURE( bAdded, "failed to add symbol" ); if (bAdded) m_bModified = true; @@ -231,7 +231,7 @@ void SmSymbolManager::RemoveSymbol( const String & rSymbolName ) } } - + std::set< String > SmSymbolManager::GetSymbolSetNames() const { std::set< String > aRes; @@ -241,7 +241,7 @@ std::set< String > SmSymbolManager::GetSymbolSetNames() const return aRes; } - + const SymbolPtrVec_t SmSymbolManager::GetSymbolSet( const String& rSymbolSetName ) { SymbolPtrVec_t aRes; @@ -256,7 +256,7 @@ const SymbolPtrVec_t SmSymbolManager::GetSymbolSet( const String& rSymbolSetName } return aRes; } - + void SmSymbolManager::Load() { diff --git a/starmath/source/symbol.src b/starmath/source/symbol.src index 7f8e15a15817..36c12cfaa4e8 100644 --- a/starmath/source/symbol.src +++ b/starmath/source/symbol.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index ff253fbb80f1..5cc134d5c28e 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -141,7 +141,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings, SetStyle( GetStyle() | WB_DIALOGCONTROL ); nActiveCategoryRID = sal::static_int_cast< USHORT >(-1); - + aToolBoxCat.SetClickHdl(LINK(this, SmToolBoxWindow, CategoryClickHdl)); USHORT i; @@ -194,7 +194,7 @@ const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, BOOL bHighContra // list for later use in the respective array. const ImageList *pIL = 0; - + // get index to use USHORT nCategoryRID = GetCategoryRID( nResId ); sal_Int16 nIndex = GetToolBoxCategoriesIndex( nCategoryRID ); @@ -217,13 +217,13 @@ const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, BOOL bHighContra void SmToolBoxWindow::ApplyImageLists( USHORT nCategoryRID ) { BOOL bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - + // set image list for toolbox 'catalog' const ImageList *pImageList = GetImageList( bHighContrast ? RID_ILH_CATALOG : RID_IL_CATALOG, bHighContrast ); OSL_ENSURE( pImageList, "image list missing" ); if (pImageList) aToolBoxCat.SetImageList( *pImageList ); - + // set image list for active (visible) category of 'catalog' sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID ); USHORT nResId = GetImageListRID( nCategoryRID, bHighContrast ); diff --git a/starmath/source/toolbox.hrc b/starmath/source/toolbox.hrc index 687521d76a32..9b15d99e20ae 100644 --- a/starmath/source/toolbox.hrc +++ b/starmath/source/toolbox.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx index 1816e483ab90..10145e4ad4ab 100644 --- a/starmath/source/typemap.cxx +++ b/starmath/source/typemap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/types.cxx b/starmath/source/types.cxx index aeb06d7eb5a9..c1ba0f1ce915 100644 --- a/starmath/source/types.cxx +++ b/starmath/source/types.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx index 4f0205f5cd38..9fae49f7826b 100644 --- a/starmath/source/unodoc.cxx +++ b/starmath/source/unodoc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 6edee27b11a8..1ca204e3b409 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,8 +74,8 @@ using namespace ::com::sun::star::script; using rtl::OUString; -#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) -#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) +#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) +#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) //////////////////////////////////////////////////////////// @@ -91,16 +91,16 @@ SmPrintUIOptions::SmPrintUIOptions() OSL_ENSURE( pConfig, "SmConfig not found" ); if (!pConfig) return; - + // create sequence of print UI options // (Actually IsIgnoreSpacesRight is a parser option. Without it we need only 8 properties here.) m_aUIProperties.realloc( 9 ); - + // create Section for formula (results in an extra tab page in dialog) SvtModuleOptions aOpt; String aAppGroupname( aLocalizedStrings.GetString( 0 ) ); aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), - aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) ); + aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) ); m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() ); // create subgroup for print options @@ -140,7 +140,7 @@ SmPrintUIOptions::SmPrintUIOptions() aPrintFormatProp, aChoices, static_cast< sal_Int32 >(pConfig->GetPrintSize()) ); - + // create a numeric box for scale dependent on PrintFormat = "Scaling" (matches to SID_PRINTZOOM) vcl::PrinterOptionsHelper::UIControlOptions aRangeOpt( aPrintFormatProp, 2, sal_True ); m_aUIProperties[ 7 ].Value = getRangeControlOpt( rtl::OUString(), @@ -150,7 +150,7 @@ SmPrintUIOptions::SmPrintUIOptions() 10, // min value 1000, // max value aRangeOpt ); - + Sequence< PropertyValue > aHintNoLayoutPage( 1 ); aHintNoLayoutPage[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HintNoLayoutPage" ) ); aHintNoLayoutPage[0].Value = makeAny( sal_True ); @@ -237,68 +237,68 @@ PropertySetInfo * lcl_createModelPropertyInfo () { static PropertyMapEntry aModelPropertyInfoMap[] = { - { RTL_CONSTASCII_STRINGPARAM( "Alignment" ), HANDLE_ALIGNMENT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM( "BaseFontHeight" ), HANDLE_BASE_FONT_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM( "Alignment" ), HANDLE_ALIGNMENT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM( "BaseFontHeight" ), HANDLE_BASE_FONT_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0}, { RTL_CONSTASCII_STRINGPARAM( "BasicLibraries" ), HANDLE_BASIC_LIBRARIES , &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), PropertyAttribute::READONLY, 0}, - { RTL_CONSTASCII_STRINGPARAM( "BottomMargin" ), HANDLE_BOTTOM_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BOTTOMSPACE }, - { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameFixed" ), HANDLE_CUSTOM_FONT_NAME_FIXED , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_FIXED }, - { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSans" ), HANDLE_CUSTOM_FONT_NAME_SANS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_SANS }, - { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSerif" ), HANDLE_CUSTOM_FONT_NAME_SERIF , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_SERIF }, + { RTL_CONSTASCII_STRINGPARAM( "BottomMargin" ), HANDLE_BOTTOM_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BOTTOMSPACE }, + { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameFixed" ), HANDLE_CUSTOM_FONT_NAME_FIXED , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_FIXED }, + { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSans" ), HANDLE_CUSTOM_FONT_NAME_SANS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_SANS }, + { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSerif" ), HANDLE_CUSTOM_FONT_NAME_SERIF , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_SERIF }, { RTL_CONSTASCII_STRINGPARAM( "DialogLibraries" ), HANDLE_DIALOG_LIBRARIES , &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), PropertyAttribute::READONLY, 0}, - { RTL_CONSTASCII_STRINGPARAM( "FontFixedIsBold"), HANDLE_CUSTOM_FONT_FIXED_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FIXED}, + { RTL_CONSTASCII_STRINGPARAM( "FontFixedIsBold"), HANDLE_CUSTOM_FONT_FIXED_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FIXED}, { RTL_CONSTASCII_STRINGPARAM( "FontFixedIsItalic"), HANDLE_CUSTOM_FONT_FIXED_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FIXED}, - { RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsBold"), HANDLE_FONT_FUNCTIONS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FUNCTION}, + { RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsBold"), HANDLE_FONT_FUNCTIONS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FUNCTION}, { RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsItalic"), HANDLE_FONT_FUNCTIONS_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FUNCTION}, - { RTL_CONSTASCII_STRINGPARAM( "FontNameFunctions" ), HANDLE_FONT_NAME_FUNCTIONS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_FUNCTION }, - { RTL_CONSTASCII_STRINGPARAM( "FontNameNumbers" ), HANDLE_FONT_NAME_NUMBERS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_NUMBER }, - { RTL_CONSTASCII_STRINGPARAM( "FontNameText" ), HANDLE_FONT_NAME_TEXT , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_TEXT }, - { RTL_CONSTASCII_STRINGPARAM( "FontNameVariables" ), HANDLE_FONT_NAME_VARIABLES , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_VARIABLE }, - { RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsBold"), HANDLE_FONT_NUMBERS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_NUMBER}, + { RTL_CONSTASCII_STRINGPARAM( "FontNameFunctions" ), HANDLE_FONT_NAME_FUNCTIONS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_FUNCTION }, + { RTL_CONSTASCII_STRINGPARAM( "FontNameNumbers" ), HANDLE_FONT_NAME_NUMBERS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_NUMBER }, + { RTL_CONSTASCII_STRINGPARAM( "FontNameText" ), HANDLE_FONT_NAME_TEXT , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_TEXT }, + { RTL_CONSTASCII_STRINGPARAM( "FontNameVariables" ), HANDLE_FONT_NAME_VARIABLES , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_VARIABLE }, + { RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsBold"), HANDLE_FONT_NUMBERS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_NUMBER}, { RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsItalic"), HANDLE_FONT_NUMBERS_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_NUMBER}, - { RTL_CONSTASCII_STRINGPARAM( "FontSansIsBold"), HANDLE_CUSTOM_FONT_SANS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SANS}, + { RTL_CONSTASCII_STRINGPARAM( "FontSansIsBold"), HANDLE_CUSTOM_FONT_SANS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SANS}, { RTL_CONSTASCII_STRINGPARAM( "FontSansIsItalic"), HANDLE_CUSTOM_FONT_SANS_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SANS}, - { RTL_CONSTASCII_STRINGPARAM( "FontSerifIsBold"), HANDLE_CUSTOM_FONT_SERIF_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SERIF}, + { RTL_CONSTASCII_STRINGPARAM( "FontSerifIsBold"), HANDLE_CUSTOM_FONT_SERIF_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SERIF}, { RTL_CONSTASCII_STRINGPARAM( "FontSerifIsItalic"), HANDLE_CUSTOM_FONT_SERIF_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SERIF}, { RTL_CONSTASCII_STRINGPARAM( "FontTextIsBold"), HANDLE_FONT_TEXT_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_TEXT}, { RTL_CONSTASCII_STRINGPARAM( "FontTextIsItalic"), HANDLE_FONT_TEXT_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_TEXT}, { RTL_CONSTASCII_STRINGPARAM( "FontVariablesIsBold"), HANDLE_FONT_VARIABLES_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_VARIABLE}, { RTL_CONSTASCII_STRINGPARAM( "FontVariablesIsItalic"), HANDLE_FONT_VARIABLES_POSTURE, &::getBooleanCppuType(), PROPERTY_NONE, FNT_VARIABLE}, - { RTL_CONSTASCII_STRINGPARAM( "Formula" ), HANDLE_FORMULA , &::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM( "IsScaleAllBrackets" ), HANDLE_IS_SCALE_ALL_BRACKETS , &::getBooleanCppuType(), PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM( "IsTextMode" ), HANDLE_IS_TEXT_MODE , &::getBooleanCppuType(), PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM( "Formula" ), HANDLE_FORMULA , &::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM( "IsScaleAllBrackets" ), HANDLE_IS_SCALE_ALL_BRACKETS , &::getBooleanCppuType(), PROPERTY_NONE, 0}, + { RTL_CONSTASCII_STRINGPARAM( "IsTextMode" ), HANDLE_IS_TEXT_MODE , &::getBooleanCppuType(), PROPERTY_NONE, 0}, { RTL_CONSTASCII_STRINGPARAM( "GreekCharStyle" ), HANDLE_GREEK_CHAR_STYLE, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0}, - { RTL_CONSTASCII_STRINGPARAM( "LeftMargin" ), HANDLE_LEFT_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_LEFTSPACE }, - { RTL_CONSTASCII_STRINGPARAM( "PrinterName" ), HANDLE_PRINTER_NAME , &::getCppuType((const OUString*)0), PROPERTY_NONE, 0 }, - { RTL_CONSTASCII_STRINGPARAM( "PrinterSetup" ), HANDLE_PRINTER_SETUP , &::getCppuType((const Sequence < sal_Int8 >*)0), PROPERTY_NONE, 0 }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketDistance" ), HANDLE_RELATIVE_BRACKET_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BRACKETSPACE }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketExcessSize" ), HANDLE_RELATIVE_BRACKET_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BRACKETSIZE }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightFunctions" ), HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_FUNCTION}, - { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightIndices" ), HANDLE_RELATIVE_FONT_HEIGHT_INDICES , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_INDEX }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightLimits" ), HANDLE_RELATIVE_FONT_HEIGHT_LIMITS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_LIMITS }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightOperators" ), HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_OPERATOR}, - { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightText" ), HANDLE_RELATIVE_FONT_HEIGHT_TEXT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_TEXT }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarExcessLength"), HANDLE_RELATIVE_FRACTION_BAR_EXCESS_LENGTH, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_FRACTION }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarLineWeight" ), HANDLE_RELATIVE_FRACTION_BAR_LINE_WEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_STROKEWIDTH }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionDenominatorDepth"), HANDLE_RELATIVE_FRACTION_DENOMINATOR_DEPTH, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_DENOMINATOR }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionNumeratorHeight" ), HANDLE_RELATIVE_FRACTION_NUMERATOR_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_NUMERATOR }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSubscript" ), HANDLE_RELATIVE_INDEX_SUBSCRIPT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_SUBSCRIPT }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSuperscript" ), HANDLE_RELATIVE_INDEX_SUPERSCRIPT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_SUPERSCRIPT }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeLineSpacing" ), HANDLE_RELATIVE_LINE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_VERTICAL }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeLowerLimitDistance" ), HANDLE_RELATIVE_LOWER_LIMIT_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_LOWERLIMIT }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixColumnSpacing" ), HANDLE_RELATIVE_MATRIX_COLUMN_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_MATRIXCOL}, - { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixLineSpacing" ), HANDLE_RELATIVE_MATRIX_LINE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_MATRIXROW}, - { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorExcessSize" ), HANDLE_RELATIVE_OPERATOR_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_OPERATORSIZE }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorSpacing" ), HANDLE_RELATIVE_OPERATOR_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_OPERATORSPACE}, - { RTL_CONSTASCII_STRINGPARAM( "RelativeRootSpacing" ), HANDLE_RELATIVE_ROOT_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ROOT }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeScaleBracketExcessSize" ), HANDLE_RELATIVE_SCALE_BRACKET_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_NORMALBRACKETSIZE}, - { RTL_CONSTASCII_STRINGPARAM( "RelativeSpacing" ), HANDLE_RELATIVE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_HORIZONTAL }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolMinimumHeight" ), HANDLE_RELATIVE_SYMBOL_MINIMUM_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSPACE }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolPrimaryHeight" ), HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSIZE }, - { RTL_CONSTASCII_STRINGPARAM( "RelativeUpperLimitDistance" ), HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_UPPERLIMIT }, - { RTL_CONSTASCII_STRINGPARAM( "RightMargin" ), HANDLE_RIGHT_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_RIGHTSPACE }, + { RTL_CONSTASCII_STRINGPARAM( "LeftMargin" ), HANDLE_LEFT_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_LEFTSPACE }, + { RTL_CONSTASCII_STRINGPARAM( "PrinterName" ), HANDLE_PRINTER_NAME , &::getCppuType((const OUString*)0), PROPERTY_NONE, 0 }, + { RTL_CONSTASCII_STRINGPARAM( "PrinterSetup" ), HANDLE_PRINTER_SETUP , &::getCppuType((const Sequence < sal_Int8 >*)0), PROPERTY_NONE, 0 }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketDistance" ), HANDLE_RELATIVE_BRACKET_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BRACKETSPACE }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketExcessSize" ), HANDLE_RELATIVE_BRACKET_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BRACKETSIZE }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightFunctions" ), HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_FUNCTION}, + { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightIndices" ), HANDLE_RELATIVE_FONT_HEIGHT_INDICES , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_INDEX }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightLimits" ), HANDLE_RELATIVE_FONT_HEIGHT_LIMITS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_LIMITS }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightOperators" ), HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_OPERATOR}, + { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightText" ), HANDLE_RELATIVE_FONT_HEIGHT_TEXT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_TEXT }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarExcessLength"), HANDLE_RELATIVE_FRACTION_BAR_EXCESS_LENGTH, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_FRACTION }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarLineWeight" ), HANDLE_RELATIVE_FRACTION_BAR_LINE_WEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_STROKEWIDTH }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionDenominatorDepth"), HANDLE_RELATIVE_FRACTION_DENOMINATOR_DEPTH, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_DENOMINATOR }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionNumeratorHeight" ), HANDLE_RELATIVE_FRACTION_NUMERATOR_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_NUMERATOR }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSubscript" ), HANDLE_RELATIVE_INDEX_SUBSCRIPT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_SUBSCRIPT }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSuperscript" ), HANDLE_RELATIVE_INDEX_SUPERSCRIPT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_SUPERSCRIPT }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeLineSpacing" ), HANDLE_RELATIVE_LINE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_VERTICAL }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeLowerLimitDistance" ), HANDLE_RELATIVE_LOWER_LIMIT_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_LOWERLIMIT }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixColumnSpacing" ), HANDLE_RELATIVE_MATRIX_COLUMN_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_MATRIXCOL}, + { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixLineSpacing" ), HANDLE_RELATIVE_MATRIX_LINE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_MATRIXROW}, + { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorExcessSize" ), HANDLE_RELATIVE_OPERATOR_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_OPERATORSIZE }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorSpacing" ), HANDLE_RELATIVE_OPERATOR_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_OPERATORSPACE}, + { RTL_CONSTASCII_STRINGPARAM( "RelativeRootSpacing" ), HANDLE_RELATIVE_ROOT_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ROOT }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeScaleBracketExcessSize" ), HANDLE_RELATIVE_SCALE_BRACKET_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_NORMALBRACKETSIZE}, + { RTL_CONSTASCII_STRINGPARAM( "RelativeSpacing" ), HANDLE_RELATIVE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_HORIZONTAL }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolMinimumHeight" ), HANDLE_RELATIVE_SYMBOL_MINIMUM_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSPACE }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolPrimaryHeight" ), HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSIZE }, + { RTL_CONSTASCII_STRINGPARAM( "RelativeUpperLimitDistance" ), HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_UPPERLIMIT }, + { RTL_CONSTASCII_STRINGPARAM( "RightMargin" ), HANDLE_RIGHT_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_RIGHTSPACE }, { RTL_CONSTASCII_STRINGPARAM( "RuntimeUID" ), HANDLE_RUNTIME_UID , &::getCppuType(static_cast< const rtl::OUString * >(0)), PropertyAttribute::READONLY, 0 }, - { RTL_CONSTASCII_STRINGPARAM( "Symbols" ), HANDLE_SYMBOLS , &::getCppuType((const Sequence < SymbolDescriptor > *)0), PROPERTY_NONE, 0 }, - { RTL_CONSTASCII_STRINGPARAM( "TopMargin" ), HANDLE_TOP_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_TOPSPACE }, + { RTL_CONSTASCII_STRINGPARAM( "Symbols" ), HANDLE_SYMBOLS , &::getCppuType((const Sequence < SymbolDescriptor > *)0), PROPERTY_NONE, 0 }, + { RTL_CONSTASCII_STRINGPARAM( "TopMargin" ), HANDLE_TOP_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_TOPSPACE }, // --> PB 2004-08-25 #i33095# Security Options { RTL_CONSTASCII_STRINGPARAM( "LoadReadonly" ), HANDLE_LOAD_READONLY, &::getBooleanCppuType(), PROPERTY_NONE, 0 }, // <-- @@ -373,7 +373,7 @@ const uno::Sequence< sal_Int8 > & SmModel::getUnoTunnelId() if(!aSeq.getLength()) { aSeq.realloc( 16 ); - rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); + rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); } return aSeq; } @@ -787,7 +787,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu *pValue <<= nVal; } break; - case HANDLE_RELATIVE_FONT_HEIGHT_TEXT : + case HANDLE_RELATIVE_FONT_HEIGHT_TEXT : case HANDLE_RELATIVE_FONT_HEIGHT_INDICES : case HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS : case HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS : @@ -992,7 +992,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SmModel::getRenderer( if (!m_pPrintUIOptions) m_pPrintUIOptions = new SmPrintUIOptions(); m_pPrintUIOptions->appendPrintUIOptions( aRenderer ); - + return aRenderer; } diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 330314118ad7..71f140377cc8 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ // return pointer to active SmViewShell, if this is not possible // return 0 instead. -//!! Since this method is based on the current focus it is somewhat +//!! Since this method is based on the current focus it is somewhat //!! unreliable and may return unexpected 0 pointers! SmViewShell * SmGetActiveView() { @@ -77,7 +77,7 @@ SmPickList::~SmPickList() SmPickList& SmPickList::operator=(const SmPickList& rList) { - USHORT nPos; + USHORT nPos; Clear(); nSize = rList.nSize; @@ -103,7 +103,7 @@ void SmPickList::Insert(const void *pItem) void SmPickList::Update(const void *pItem, const void *pNewItem) { - USHORT nPos; + USHORT nPos; for (nPos = 0; nPos < Count(); nPos++) if (CompareItem(GetPtr(nPos), pItem)) @@ -116,7 +116,7 @@ void SmPickList::Update(const void *pItem, const void *pNewItem) void SmPickList::Remove(const void *pItem) { - USHORT nPos; + USHORT nPos; for (nPos = 0; nPos < Count(); nPos++) if (CompareItem(GetPtr(nPos), pItem)) @@ -129,7 +129,7 @@ void SmPickList::Remove(const void *pItem) void SmPickList::Clear() { - USHORT nPos; + USHORT nPos; for (nPos = 0; nPos < Count(); nPos++) DestroyItem(GetPtr(nPos)); @@ -158,15 +158,15 @@ void SmFontPickList::DestroyItem(void *pItem) BOOL SmFontPickList::CompareItem(const void *pFirstItem, const void *pSecondItem) const { - Font *pFirstFont, *pSecondFont; + Font *pFirstFont, *pSecondFont; - pFirstFont = (Font *)pFirstItem; + pFirstFont = (Font *)pFirstItem; pSecondFont = (Font *)pSecondItem; if (pFirstFont->GetName() == pSecondFont->GetName()) - if ((pFirstFont->GetFamily() == pSecondFont->GetFamily()) && + if ((pFirstFont->GetFamily() == pSecondFont->GetFamily()) && (pFirstFont->GetCharSet() == pSecondFont->GetCharSet()) && - (pFirstFont->GetWeight() == pSecondFont->GetWeight()) && + (pFirstFont->GetWeight() == pSecondFont->GetWeight()) && (pFirstFont->GetItalic() == pSecondFont->GetItalic())) return (TRUE); @@ -176,7 +176,7 @@ BOOL SmFontPickList::CompareItem(const void *pFirstItem, const void *pSecondItem String SmFontPickList::GetStringItem(void *pItem) { Font *pFont; - String aString; + String aString; const sal_Char *pDelim = ", "; pFont = (Font *)pItem; @@ -231,8 +231,8 @@ void SmFontPickList::WriteTo(SmFontDialog& rDialog) const IMPL_LINK( SmFontPickListBox, SelectHdl, ListBox *, /*pListBox*/ ) { - USHORT nPos; - String aString; + USHORT nPos; + String aString; nPos = GetSelectEntryPos(); @@ -337,7 +337,7 @@ void SmFace::SetSize(const Size& rSize) Size aSize (rSize); // check the requested size against minimum value - static int __READONLY_DATA nMinVal = SmPtsTo100th_mm(2); + static int __READONLY_DATA nMinVal = SmPtsTo100th_mm(2); if (aSize.Height() < nMinVal) aSize.Height() = nMinVal; @@ -371,9 +371,9 @@ SmFace & operator *= (SmFace &rFace, const Fraction &rFrac) // scales the width and height of 'rFace' by 'rFrac' and returns a // reference to 'rFace'. // It's main use is to make scaling fonts look easier. -{ const Size &rFaceSize = rFace.GetSize(); +{ const Size &rFaceSize = rFace.GetSize(); - rFace.SetSize(Size(Fraction(rFaceSize.Width()) *= rFrac, + rFace.SetSize(Size(Fraction(rFaceSize.Width()) *= rFrac, Fraction(rFaceSize.Height()) *= rFrac)); return rFace; } diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index a48fe61b2444..7874d0666ece 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -79,13 +79,13 @@ #include "mathmlimport.hxx" #include "cursor.hxx" -#define MINWIDTH 200 -#define MINHEIGHT 200 -#define MINSPLIT 40 -#define SPLITTERWIDTH 2 +#define MINWIDTH 200 +#define MINHEIGHT 200 +#define MINSPLIT 40 +#define SPLITTERWIDTH 2 -#define MINZOOM 25 -#define MAXZOOM 800 +#define MINZOOM 25 +#define MAXZOOM 800 #define SmViewShell #include "smslots.hxx" @@ -186,7 +186,7 @@ void SmGraphicWindow::MouseButtonDown(const MouseEvent& rMEvt) pNode = pTree->FindRectClosestTo(aPos); if (pNode) - { SmEditWindow *pEdit = pViewShell->GetEditWindow(); + { SmEditWindow *pEdit = pViewShell->GetEditWindow(); const SmToken aToken (pNode->GetToken()); // set selection to the beginning of the token @@ -278,10 +278,10 @@ void SmGraphicWindow::SetCursor(const Rectangle &rRect) SmModule *pp = SM_MOD(); if (IsCursorVisible()) - ShowCursor(FALSE); // clean up remainings of old cursor + ShowCursor(FALSE); // clean up remainings of old cursor aCursorRect = rRect; if (pp->GetConfig()->IsShowFormulaCursor()) - ShowCursor(TRUE); // draw new cursor + ShowCursor(TRUE); // draw new cursor } const SmNode * SmGraphicWindow::SetCursorPos(USHORT nRow, USHORT nCol) @@ -316,7 +316,7 @@ void SmGraphicWindow::Paint(const Rectangle&) SmDocShell &rDoc = *pViewShell->GetDoc(); Point aPoint; - rDoc.DrawFormula(*this, aPoint, TRUE); //! modifies aPoint to be the topleft + rDoc.DrawFormula(*this, aPoint, TRUE); //! modifies aPoint to be the topleft //! corner of the formula SetFormulaDrawPos(aPoint); if(IsInlineEditEnabled()) { @@ -324,12 +324,12 @@ void SmGraphicWindow::Paint(const Rectangle&) if(pViewShell->GetDoc()->HasCursor()) pViewShell->GetDoc()->GetCursor().Draw(*this, aPoint); } else { - SetIsCursorVisible(FALSE); // (old) cursor must be drawn again + SetIsCursorVisible(FALSE); // (old) cursor must be drawn again const SmEditWindow *pEdit = pViewShell->GetEditWindow(); if (pEdit) - { // get new position for formula-cursor (for possible altered formula) - USHORT nRow, nCol; + { // get new position for formula-cursor (for possible altered formula) + USHORT nRow, nCol; SmGetLeftSelectionPart(pEdit->GetSelection(), nRow, nCol); nRow++; nCol++; @@ -545,8 +545,8 @@ void SmGraphicWindow::ZoomToFitInWindow() // set defined mapmode before calling 'LogicToPixel' below SetMapMode(MapMode(MAP_100TH_MM)); - Size aSize (LogicToPixel(rDoc.GetSize())); - Size aWindowSize (GetSizePixel()); + Size aSize (LogicToPixel(rDoc.GetSize())); + Size aWindowSize (GetSizePixel()); if (aSize.Width() > 0 && aSize.Height() > 0) { @@ -571,7 +571,7 @@ uno::Reference< XAccessible > SmGraphicWindow::CreateAccessible() SmGraphicController::SmGraphicController(SmGraphicWindow &rSmGraphic, USHORT nId_, - SfxBindings &rBindings) : + SfxBindings &rBindings) : SfxControllerItem(nId_, rBindings), rGraphic(rSmGraphic) { @@ -652,17 +652,17 @@ void SmCmdBoxWindow::Resize() { switch (GetAlignment()) { - case SFX_ALIGN_TOP: aRect.Bottom()--; break; - case SFX_ALIGN_BOTTOM: aRect.Top()++; break; - case SFX_ALIGN_LEFT: aRect.Right()--; break; - case SFX_ALIGN_RIGHT: aRect.Left()++; break; + case SFX_ALIGN_TOP: aRect.Bottom()--; break; + case SFX_ALIGN_BOTTOM: aRect.Top()++; break; + case SFX_ALIGN_LEFT: aRect.Right()--; break; + case SFX_ALIGN_RIGHT: aRect.Left()++; break; default: break; } } DecorationView aView(this); - aRect.Left() += 8; aRect.Top() += 8; + aRect.Left() += 8; aRect.Top() += 8; aRect.Right()-= 8; aRect.Bottom()-= 8; aRect = aView.DrawFrame( aRect, FRAME_DRAW_DOUBLEIN ); @@ -708,7 +708,7 @@ void SmCmdBoxWindow::Paint(const Rectangle& /*rRect*/) DrawLine( aFrom, aTo ); aView.DrawFrame(aRect, FRAME_DRAW_OUT); } - aRect.Left() += 8; aRect.Top() += 8; + aRect.Left() += 8; aRect.Top() += 8; aRect.Right()-= 8; aRect.Bottom()-= 8; aRect = aView.DrawFrame( aRect, FRAME_DRAW_DOUBLEIN ); } @@ -966,11 +966,11 @@ Size SmViewShell::GetTextSize(OutputDevice& rDevice, const String& rText, long M { RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::GetTextSize" ); - Size aSize; - String aLine; - Size TextSize; - String aText; - USHORT nLines = rText.GetTokenCount('\n'); + Size aSize; + String aLine; + Size TextSize; + String aText; + USHORT nLines = rText.GetTokenCount('\n'); for (USHORT i = 0; i < nLines; i++) { @@ -985,7 +985,7 @@ Size SmViewShell::GetTextSize(OutputDevice& rDevice, const String& rText, long M { do { - xub_StrLen m = aLine.Len(); + xub_StrLen m = aLine.Len(); xub_StrLen nLen = m; for (xub_StrLen n = 0; n < nLen; n++) @@ -1028,9 +1028,9 @@ void SmViewShell::DrawTextLine(OutputDevice& rDevice, const Point& rPosition, co { RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::DrawTextLine" ); - String aText; - Point aPoint (rPosition); - USHORT nTabs = rLine.GetTokenCount('\t'); + String aText; + Point aPoint (rPosition); + USHORT nTabs = rLine.GetTokenCount('\t'); if (nTabs > 0) { @@ -1057,11 +1057,11 @@ void SmViewShell::DrawText(OutputDevice& rDevice, const Point& rPosition, const { RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::DrawText" ); - USHORT nLines = rText.GetTokenCount('\n'); - Point aPoint (rPosition); - Size aSize; - String aLine; - String aText; + USHORT nLines = rText.GetTokenCount('\n'); + Point aPoint (rPosition); + Size aSize; + String aLine; + String aText; for (USHORT i = 0; i < nLines; i++) { @@ -1074,7 +1074,7 @@ void SmViewShell::DrawText(OutputDevice& rDevice, const Point& rPosition, const { do { - xub_StrLen m = aLine.Len(); + xub_StrLen m = aLine.Len(); xub_StrLen nLen = m; for (xub_StrLen n = 0; n < nLen; n++) @@ -1230,7 +1230,7 @@ void SmViewShell::Impl_Print( Size OutputSize (rOutDev.LogicToPixel(Size(aOutRect.GetWidth(), aOutRect.GetHeight()), MapMode(MAP_100TH_MM))); Size GraphicSize (rOutDev.LogicToPixel(aSize, MapMode(MAP_100TH_MM))); - USHORT nZ = (USHORT) Min((long)Fraction(OutputSize.Width() * 100L, GraphicSize.Width()), + USHORT nZ = (USHORT) Min((long)Fraction(OutputSize.Width() * 100L, GraphicSize.Width()), (long)Fraction(OutputSize.Height() * 100L, GraphicSize.Height())); Fraction aFraction ((USHORT) Max ((USHORT) MINZOOM, Min((USHORT) MAXZOOM, (USHORT) (nZ - 10))), (USHORT) 100); @@ -1324,7 +1324,7 @@ SmEditWindow *SmViewShell::GetEditWindow() if (pWrapper != NULL) { - SmEditWindow *pEditWin = pWrapper->GetEditWindow(); + SmEditWindow *pEditWin = pWrapper->GetEditWindow(); OSL_ENSURE( pEditWin, "SmEditWindow missing" ); return pEditWin; } @@ -1760,10 +1760,10 @@ void SmViewShell::Execute(SfxRequest& rReq) SfxPrinter *pPrinter = GetPrinter( TRUE ); Point aPoint; Rectangle OutputRect(aPoint, pPrinter->GetOutputSize()); - Size OutputSize(pPrinter->LogicToPixel(Size(OutputRect.GetWidth(), + Size OutputSize(pPrinter->LogicToPixel(Size(OutputRect.GetWidth(), OutputRect.GetHeight()), aMap)); - Size GraphicSize(pPrinter->LogicToPixel(GetDoc()->GetSize(), aMap)); - USHORT nZ = (USHORT) Min((long)Fraction(OutputSize.Width() * 100L, GraphicSize.Width()), + Size GraphicSize(pPrinter->LogicToPixel(GetDoc()->GetSize(), aMap)); + USHORT nZ = (USHORT) Min((long)Fraction(OutputSize.Width() * 100L, GraphicSize.Width()), (long)Fraction(OutputSize.Height() * 100L, GraphicSize.Height())); aGraphic.SetZoom (nZ); break; diff --git a/starmath/util/hidother.src b/starmath/util/hidother.src index e55a97852b62..5a87a5709eaa 100644 --- a/starmath/util/hidother.src +++ b/starmath/util/hidother.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,92 +26,92 @@ ************************************************************************/ #include "../inc/starmath.hrc" -hidspecial HID_SMA_OPTIONSDIALOG { HelpId = HID_SMA_OPTIONSDIALOG; }; -hidspecial HID_SMA_FONTDIALOG { HelpId = HID_SMA_FONTDIALOG; }; -hidspecial HID_SMA_FONTSIZEDIALOG { HelpId = HID_SMA_FONTSIZEDIALOG; }; -hidspecial HID_SMA_FONTTYPEDIALOG { HelpId = HID_SMA_FONTTYPEDIALOG; }; -hidspecial HID_SMA_DISTANCEDIALOG { HelpId = HID_SMA_DISTANCEDIALOG; }; -hidspecial HID_SMA_ALIGNDIALOG { HelpId = HID_SMA_ALIGNDIALOG; }; -hidspecial HID_SMA_PRINTOPTIONPAGE { HelpId = HID_SMA_PRINTOPTIONPAGE; }; -hidspecial HID_SMA_SYMBOLDIALOG { HelpId = HID_SMA_SYMBOLDIALOG; }; -hidspecial HID_SMA_SYMDEFINEDIALOG { HelpId = HID_SMA_SYMDEFINEDIALOG; }; -hidspecial HID_SMA_EXTRAOPTIONPAGE { HelpId = HID_SMA_EXTRAOPTIONPAGE; }; -hidspecial HID_SMA_DOCSAVEQUERY { HelpId = HID_SMA_DOCSAVEQUERY; }; -hidspecial HID_SMA_OBJECTSAVEQUERY { HelpId = HID_SMA_OBJECTSAVEQUERY; }; -hidspecial HID_SMA_DEFAULTSAVEQUERY { HelpId = HID_SMA_DEFAULTSAVEQUERY; }; -hidspecial HID_SMA_ILLEGALOBJECTERROR { HelpId = HID_SMA_ILLEGALOBJECTERROR; }; -hidspecial HID_SMA_ILLEGALFILEERROR { HelpId = HID_SMA_ILLEGALFILEERROR; }; -hidspecial HID_SMA_WRITESYMBOLERROR { HelpId = HID_SMA_WRITESYMBOLERROR; }; -hidspecial HID_SMA_READSYMBOLERROR { HelpId = HID_SMA_READSYMBOLERROR; }; +hidspecial HID_SMA_OPTIONSDIALOG { HelpId = HID_SMA_OPTIONSDIALOG; }; +hidspecial HID_SMA_FONTDIALOG { HelpId = HID_SMA_FONTDIALOG; }; +hidspecial HID_SMA_FONTSIZEDIALOG { HelpId = HID_SMA_FONTSIZEDIALOG; }; +hidspecial HID_SMA_FONTTYPEDIALOG { HelpId = HID_SMA_FONTTYPEDIALOG; }; +hidspecial HID_SMA_DISTANCEDIALOG { HelpId = HID_SMA_DISTANCEDIALOG; }; +hidspecial HID_SMA_ALIGNDIALOG { HelpId = HID_SMA_ALIGNDIALOG; }; +hidspecial HID_SMA_PRINTOPTIONPAGE { HelpId = HID_SMA_PRINTOPTIONPAGE; }; +hidspecial HID_SMA_SYMBOLDIALOG { HelpId = HID_SMA_SYMBOLDIALOG; }; +hidspecial HID_SMA_SYMDEFINEDIALOG { HelpId = HID_SMA_SYMDEFINEDIALOG; }; +hidspecial HID_SMA_EXTRAOPTIONPAGE { HelpId = HID_SMA_EXTRAOPTIONPAGE; }; +hidspecial HID_SMA_DOCSAVEQUERY { HelpId = HID_SMA_DOCSAVEQUERY; }; +hidspecial HID_SMA_OBJECTSAVEQUERY { HelpId = HID_SMA_OBJECTSAVEQUERY; }; +hidspecial HID_SMA_DEFAULTSAVEQUERY { HelpId = HID_SMA_DEFAULTSAVEQUERY; }; +hidspecial HID_SMA_ILLEGALOBJECTERROR { HelpId = HID_SMA_ILLEGALOBJECTERROR; }; +hidspecial HID_SMA_ILLEGALFILEERROR { HelpId = HID_SMA_ILLEGALFILEERROR; }; +hidspecial HID_SMA_WRITESYMBOLERROR { HelpId = HID_SMA_WRITESYMBOLERROR; }; +hidspecial HID_SMA_READSYMBOLERROR { HelpId = HID_SMA_READSYMBOLERROR; }; hidspecial HID_SMA_NOMATHTYPEFACEWARNING { HelpId = HID_SMA_NOMATHTYPEFACEWARNING; }; -hidspecial HID_SMA_OBJECTNAME { HelpId = HID_SMA_OBJECTNAME; }; -hidspecial HID_SMA_VIEWNAME { HelpId = HID_SMA_VIEWNAME; }; -hidspecial HID_SMA_UNDOEDITNAME { HelpId = HID_SMA_UNDOEDITNAME; }; -hidspecial HID_SMA_UNDOFORMATNAME { HelpId = HID_SMA_UNDOFORMATNAME; }; -hidspecial HID_SMA_APPICO { HelpId = HID_SMA_APPICO; }; -hidspecial HID_SMA_DOCICO { HelpId = HID_SMA_DOCICO; }; -hidspecial HID_SMA_TMPICO { HelpId = HID_SMA_TMPICO; }; -hidspecial HID_SMA_COMMANDMENU { HelpId = HID_SMA_COMMANDMENU; }; -hidspecial HID_SMA_VIEWMENU { HelpId = HID_SMA_VIEWMENU; }; -hidspecial HID_SMA_DISTANCEMENU { HelpId = HID_SMA_DISTANCEMENU; }; -hidspecial HID_SMA_FONTMENU { HelpId = HID_SMA_FONTMENU; }; -hidspecial HID_SMA_STARTUPWINDOW { HelpId = HID_SMA_STARTUPWINDOW; }; -hidspecial HID_SMA_TOOLBOXWINDOW { HelpId = HID_SMA_TOOLBOXWINDOW; }; -hidspecial HID_SMA_CMDBOXWINDOW { HelpId = HID_SMA_CMDBOXWINDOW; }; -hidspecial HID_SMA_UPDATEOBJECT { HelpId = HID_SMA_UPDATEOBJECT; }; -hidspecial HID_SMA_FONTREGULAR { HelpId = HID_SMA_FONTREGULAR; }; -hidspecial HID_SMA_FONTITALIC { HelpId = HID_SMA_FONTITALIC; }; -hidspecial HID_SMA_FONTBOLD { HelpId = HID_SMA_FONTBOLD; }; -hidspecial HID_SMA_PRINTOPTION { HelpId = HID_SMA_PRINTOPTION; }; -hidspecial HID_SMA_DOCUMENTSTR { HelpId = HID_SMA_DOCUMENTSTR; }; -hidspecial HID_SMA_SYMBOLFILESSTR { HelpId = HID_SMA_SYMBOLFILESSTR; }; -hidspecial HID_SMA_ALLFILESSTR { HelpId = HID_SMA_ALLFILESSTR; }; -hidspecial HID_SMA_CREATORSTR { HelpId = HID_SMA_CREATORSTR; }; -hidspecial HID_SMA_FILESMFTYP { HelpId = HID_SMA_FILESMFTYP; }; -hidspecial HID_SMA_FILESYMTYP { HelpId = HID_SMA_FILESYMTYP; }; -hidspecial HID_SMA_WIN_DOCUMENT { HelpId = HID_SMA_WIN_DOCUMENT; }; -hidspecial HID_SMA_VIEWSHELL_DOCUMENT { HelpId = HID_SMA_VIEWSHELL_DOCUMENT; }; -hidspecial HID_SMA_COMMAND_WIN_EDIT { HelpId = HID_SMA_COMMAND_WIN_EDIT; }; +hidspecial HID_SMA_OBJECTNAME { HelpId = HID_SMA_OBJECTNAME; }; +hidspecial HID_SMA_VIEWNAME { HelpId = HID_SMA_VIEWNAME; }; +hidspecial HID_SMA_UNDOEDITNAME { HelpId = HID_SMA_UNDOEDITNAME; }; +hidspecial HID_SMA_UNDOFORMATNAME { HelpId = HID_SMA_UNDOFORMATNAME; }; +hidspecial HID_SMA_APPICO { HelpId = HID_SMA_APPICO; }; +hidspecial HID_SMA_DOCICO { HelpId = HID_SMA_DOCICO; }; +hidspecial HID_SMA_TMPICO { HelpId = HID_SMA_TMPICO; }; +hidspecial HID_SMA_COMMANDMENU { HelpId = HID_SMA_COMMANDMENU; }; +hidspecial HID_SMA_VIEWMENU { HelpId = HID_SMA_VIEWMENU; }; +hidspecial HID_SMA_DISTANCEMENU { HelpId = HID_SMA_DISTANCEMENU; }; +hidspecial HID_SMA_FONTMENU { HelpId = HID_SMA_FONTMENU; }; +hidspecial HID_SMA_STARTUPWINDOW { HelpId = HID_SMA_STARTUPWINDOW; }; +hidspecial HID_SMA_TOOLBOXWINDOW { HelpId = HID_SMA_TOOLBOXWINDOW; }; +hidspecial HID_SMA_CMDBOXWINDOW { HelpId = HID_SMA_CMDBOXWINDOW; }; +hidspecial HID_SMA_UPDATEOBJECT { HelpId = HID_SMA_UPDATEOBJECT; }; +hidspecial HID_SMA_FONTREGULAR { HelpId = HID_SMA_FONTREGULAR; }; +hidspecial HID_SMA_FONTITALIC { HelpId = HID_SMA_FONTITALIC; }; +hidspecial HID_SMA_FONTBOLD { HelpId = HID_SMA_FONTBOLD; }; +hidspecial HID_SMA_PRINTOPTION { HelpId = HID_SMA_PRINTOPTION; }; +hidspecial HID_SMA_DOCUMENTSTR { HelpId = HID_SMA_DOCUMENTSTR; }; +hidspecial HID_SMA_SYMBOLFILESSTR { HelpId = HID_SMA_SYMBOLFILESSTR; }; +hidspecial HID_SMA_ALLFILESSTR { HelpId = HID_SMA_ALLFILESSTR; }; +hidspecial HID_SMA_CREATORSTR { HelpId = HID_SMA_CREATORSTR; }; +hidspecial HID_SMA_FILESMFTYP { HelpId = HID_SMA_FILESMFTYP; }; +hidspecial HID_SMA_FILESYMTYP { HelpId = HID_SMA_FILESYMTYP; }; +hidspecial HID_SMA_WIN_DOCUMENT { HelpId = HID_SMA_WIN_DOCUMENT; }; +hidspecial HID_SMA_VIEWSHELL_DOCUMENT { HelpId = HID_SMA_VIEWSHELL_DOCUMENT; }; +hidspecial HID_SMA_COMMAND_WIN_EDIT { HelpId = HID_SMA_COMMAND_WIN_EDIT; }; -hidspecial HID_SMA_DEFAULT_DIST { HelpId = HID_SMA_DEFAULT_DIST; }; -hidspecial HID_SMA_LINE_DIST { HelpId = HID_SMA_LINE_DIST; }; -hidspecial HID_SMA_ROOT_DIST { HelpId = HID_SMA_ROOT_DIST; }; -hidspecial HID_SMA_SUP_DIST { HelpId = HID_SMA_SUP_DIST; }; -hidspecial HID_SMA_SUB_DIST { HelpId = HID_SMA_SUB_DIST; }; -hidspecial HID_SMA_NUMERATOR_DIST { HelpId = HID_SMA_NUMERATOR_DIST; }; -hidspecial HID_SMA_DENOMINATOR_DIST { HelpId = HID_SMA_DENOMINATOR_DIST; }; -hidspecial HID_SMA_FRACLINE_EXCWIDTH { HelpId = HID_SMA_FRACLINE_EXCWIDTH; }; -hidspecial HID_SMA_FRACLINE_LINEWIDTH { HelpId = HID_SMA_FRACLINE_LINEWIDTH; }; -hidspecial HID_SMA_UPPERLIMIT_DIST { HelpId = HID_SMA_UPPERLIMIT_DIST; }; -hidspecial HID_SMA_LOWERLIMIT_DIST { HelpId = HID_SMA_LOWERLIMIT_DIST; }; -hidspecial HID_SMA_BRACKET_EXCHEIGHT { HelpId = HID_SMA_BRACKET_EXCHEIGHT; }; -hidspecial HID_SMA_BRACKET_DIST { HelpId = HID_SMA_BRACKET_DIST; }; -hidspecial HID_SMA_BRACKET_EXCHEIGHT2 { HelpId = HID_SMA_BRACKET_EXCHEIGHT2; }; -hidspecial HID_SMA_MATRIXROW_DIST { HelpId = HID_SMA_MATRIXROW_DIST; }; -hidspecial HID_SMA_MATRIXCOL_DIST { HelpId = HID_SMA_MATRIXCOL_DIST; }; -hidspecial HID_SMA_ATTRIBUT_DIST { HelpId = HID_SMA_ATTRIBUT_DIST; }; -hidspecial HID_SMA_INTERATTRIBUT_DIST { HelpId = HID_SMA_INTERATTRIBUT_DIST; }; -hidspecial HID_SMA_OPERATOR_EXCHEIGHT { HelpId = HID_SMA_OPERATOR_EXCHEIGHT; }; -hidspecial HID_SMA_OPERATOR_DIST { HelpId = HID_SMA_OPERATOR_DIST; }; -hidspecial HID_SMA_LEFTBORDER_DIST { HelpId = HID_SMA_LEFTBORDER_DIST; }; -hidspecial HID_SMA_RIGHTBORDER_DIST { HelpId = HID_SMA_RIGHTBORDER_DIST; }; -hidspecial HID_SMA_UPPERBORDER_DIST { HelpId = HID_SMA_UPPERBORDER_DIST; }; -hidspecial HID_SMA_LOWERBORDER_DIST { HelpId = HID_SMA_LOWERBORDER_DIST; }; +hidspecial HID_SMA_DEFAULT_DIST { HelpId = HID_SMA_DEFAULT_DIST; }; +hidspecial HID_SMA_LINE_DIST { HelpId = HID_SMA_LINE_DIST; }; +hidspecial HID_SMA_ROOT_DIST { HelpId = HID_SMA_ROOT_DIST; }; +hidspecial HID_SMA_SUP_DIST { HelpId = HID_SMA_SUP_DIST; }; +hidspecial HID_SMA_SUB_DIST { HelpId = HID_SMA_SUB_DIST; }; +hidspecial HID_SMA_NUMERATOR_DIST { HelpId = HID_SMA_NUMERATOR_DIST; }; +hidspecial HID_SMA_DENOMINATOR_DIST { HelpId = HID_SMA_DENOMINATOR_DIST; }; +hidspecial HID_SMA_FRACLINE_EXCWIDTH { HelpId = HID_SMA_FRACLINE_EXCWIDTH; }; +hidspecial HID_SMA_FRACLINE_LINEWIDTH { HelpId = HID_SMA_FRACLINE_LINEWIDTH; }; +hidspecial HID_SMA_UPPERLIMIT_DIST { HelpId = HID_SMA_UPPERLIMIT_DIST; }; +hidspecial HID_SMA_LOWERLIMIT_DIST { HelpId = HID_SMA_LOWERLIMIT_DIST; }; +hidspecial HID_SMA_BRACKET_EXCHEIGHT { HelpId = HID_SMA_BRACKET_EXCHEIGHT; }; +hidspecial HID_SMA_BRACKET_DIST { HelpId = HID_SMA_BRACKET_DIST; }; +hidspecial HID_SMA_BRACKET_EXCHEIGHT2 { HelpId = HID_SMA_BRACKET_EXCHEIGHT2; }; +hidspecial HID_SMA_MATRIXROW_DIST { HelpId = HID_SMA_MATRIXROW_DIST; }; +hidspecial HID_SMA_MATRIXCOL_DIST { HelpId = HID_SMA_MATRIXCOL_DIST; }; +hidspecial HID_SMA_ATTRIBUT_DIST { HelpId = HID_SMA_ATTRIBUT_DIST; }; +hidspecial HID_SMA_INTERATTRIBUT_DIST { HelpId = HID_SMA_INTERATTRIBUT_DIST; }; +hidspecial HID_SMA_OPERATOR_EXCHEIGHT { HelpId = HID_SMA_OPERATOR_EXCHEIGHT; }; +hidspecial HID_SMA_OPERATOR_DIST { HelpId = HID_SMA_OPERATOR_DIST; }; +hidspecial HID_SMA_LEFTBORDER_DIST { HelpId = HID_SMA_LEFTBORDER_DIST; }; +hidspecial HID_SMA_RIGHTBORDER_DIST { HelpId = HID_SMA_RIGHTBORDER_DIST; }; +hidspecial HID_SMA_UPPERBORDER_DIST { HelpId = HID_SMA_UPPERBORDER_DIST; }; +hidspecial HID_SMA_LOWERBORDER_DIST { HelpId = HID_SMA_LOWERBORDER_DIST; }; //! this shouldn't have been necessary! -hidspecial HID_SMA_ALEPH { HelpId = HID_SMA_ALEPH; }; -hidspecial HID_SMA_EMPTYSET { HelpId = HID_SMA_EMPTYSET; }; -hidspecial HID_SMA_RE { HelpId = HID_SMA_RE; }; -hidspecial HID_SMA_IM { HelpId = HID_SMA_IM; }; -hidspecial HID_SMA_INFINITY { HelpId = HID_SMA_INFINITY; }; -hidspecial HID_SMA_PARTIAL { HelpId = HID_SMA_PARTIAL; }; -hidspecial HID_SMA_WP { HelpId = HID_SMA_WP; }; -hidspecial HID_SMA_DOTSAXIS { HelpId = HID_SMA_DOTSAXIS; }; -hidspecial HID_SMA_DOTSUP { HelpId = HID_SMA_DOTSUP; }; -hidspecial HID_SMA_DOTSDOWN { HelpId = HID_SMA_DOTSDOWN; }; -hidspecial HID_SMA_DOTSLOW { HelpId = HID_SMA_DOTSLOW; }; -hidspecial HID_SMA_DOTSVERT { HelpId = HID_SMA_DOTSVERT; }; -hidspecial HID_SMA_NABLA { HelpId = HID_SMA_NABLA; }; -hidspecial HID_SMA_EXISTS { HelpId = HID_SMA_EXISTS; }; -hidspecial HID_SMA_FORALL { HelpId = HID_SMA_FORALL; }; +hidspecial HID_SMA_ALEPH { HelpId = HID_SMA_ALEPH; }; +hidspecial HID_SMA_EMPTYSET { HelpId = HID_SMA_EMPTYSET; }; +hidspecial HID_SMA_RE { HelpId = HID_SMA_RE; }; +hidspecial HID_SMA_IM { HelpId = HID_SMA_IM; }; +hidspecial HID_SMA_INFINITY { HelpId = HID_SMA_INFINITY; }; +hidspecial HID_SMA_PARTIAL { HelpId = HID_SMA_PARTIAL; }; +hidspecial HID_SMA_WP { HelpId = HID_SMA_WP; }; +hidspecial HID_SMA_DOTSAXIS { HelpId = HID_SMA_DOTSAXIS; }; +hidspecial HID_SMA_DOTSUP { HelpId = HID_SMA_DOTSUP; }; +hidspecial HID_SMA_DOTSDOWN { HelpId = HID_SMA_DOTSDOWN; }; +hidspecial HID_SMA_DOTSLOW { HelpId = HID_SMA_DOTSLOW; }; +hidspecial HID_SMA_DOTSVERT { HelpId = HID_SMA_DOTSVERT; }; +hidspecial HID_SMA_NABLA { HelpId = HID_SMA_NABLA; }; +hidspecial HID_SMA_EXISTS { HelpId = HID_SMA_EXISTS; }; +hidspecial HID_SMA_FORALL { HelpId = HID_SMA_FORALL; }; diff --git a/starmath/workben/smath-dump-watch.sh b/starmath/workben/smath-dump-watch.sh index 21ec5f14ad35..6ca1b0c703a9 100755 --- a/starmath/workben/smath-dump-watch.sh +++ b/starmath/workben/smath-dump-watch.sh @@ -1,7 +1,7 @@ #!/bin/bash -# Watches for formula dumps by starmath and renders them +# Watches for formula dumps by starmath and renders them # If starmath is compiled with the macro DEBUG_ENABLE_DUMPASDOT defined. # shift+enter, in the visual formula editor will make starmath dump a # graphviz graph of the formula tree structure. This is very useful when @@ -20,7 +20,7 @@ touch /tmp/smath-dump.gv; while inotifywait -q -e close_write /tmp/smath-dump.gv; do - dot -Tpng < /tmp/smath-dump.gv > /tmp/smath-dump.png; > /dev/null - kill `pidof -s feh`; > /dev/null - feh /tmp/smath-dump.png & > /dev/null + dot -Tpng < /tmp/smath-dump.gv > /tmp/smath-dump.png; > /dev/null + kill `pidof -s feh`; > /dev/null + feh /tmp/smath-dump.png & > /dev/null done |