summaryrefslogtreecommitdiff
path: root/starmath/inc
diff options
context:
space:
mode:
Diffstat (limited to 'starmath/inc')
-rw-r--r--starmath/inc/action.hxx4
-rw-r--r--starmath/inc/applicat.hxx10
-rw-r--r--starmath/inc/config.hxx6
-rw-r--r--starmath/inc/dialog.hxx268
-rw-r--r--starmath/inc/document.hxx102
-rw-r--r--starmath/inc/edit.hxx66
-rw-r--r--starmath/inc/format.hxx150
-rw-r--r--starmath/inc/node.hxx198
-rw-r--r--starmath/inc/parse.hxx250
-rw-r--r--starmath/inc/pch/precompiled_starmath.cxx2
-rw-r--r--starmath/inc/pch/precompiled_starmath.hxx2
-rw-r--r--starmath/inc/rect.hxx120
-rw-r--r--starmath/inc/smdll.hxx2
-rw-r--r--starmath/inc/smmod.hxx12
-rw-r--r--starmath/inc/starmath.hrc1298
-rw-r--r--starmath/inc/symbol.hxx18
-rw-r--r--starmath/inc/toolbox.hxx16
-rw-r--r--starmath/inc/types.hxx4
-rw-r--r--starmath/inc/unomodel.hxx6
-rw-r--r--starmath/inc/utility.hxx116
-rw-r--r--starmath/inc/view.hxx62
21 files changed, 1356 insertions, 1356 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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 09:44:34 +0000