summaryrefslogtreecommitdiff
path: root/starmath/source
diff options
context:
space:
mode:
Diffstat (limited to 'starmath/source')
-rw-r--r--starmath/source/dialog.cxx11
-rw-r--r--starmath/source/edit.cxx3
-rw-r--r--starmath/source/smmod.cxx11
-rw-r--r--starmath/source/smres.src93
-rw-r--r--starmath/source/view.cxx6
5 files changed, 19 insertions, 105 deletions
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index c73db4dae4a0..280261322f08 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -764,7 +764,7 @@ IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox )
}
-void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId)
+void SmDistanceDialog::SetHelpId(MetricField &rField, const rtl::OString& sHelpId)
{
//! HelpID's die auf diese Weise explizit gesetzt werden, muessen im
//! util Verzeichnis im File "hidother.src" mit Hilfe von "hidspecial"
@@ -775,9 +775,7 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId)
DBG_ASSERT(aEmptyText.Len() == 0, "Sm: Ooops...");
#endif
- // FIXME: HELPID
- (void)nHelpId;
- rField.SetHelpId(""/*nHelpId*/);
+ rField.SetHelpId(sHelpId);
rField.SetHelpText(aEmptyText);
// since MetricField inherits from SpinField which has a sub Edit field
@@ -786,8 +784,7 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId)
Edit *pSubEdit = rField.GetSubEdit();
if (pSubEdit)
{
- // FIXME: HELPID
- pSubEdit->SetHelpId(""/*nHelpId*/);
+ pSubEdit->SetHelpId(sHelpId);
pSubEdit->SetHelpText(aEmptyText);
}
}
@@ -805,7 +802,7 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
#if OSL_DEBUG_LEVEL > 1
DBG_ASSERT(NOCATEGORIES == 10, "Sm : Array passt nicht zu Anzahl der Kategorien");
#endif
- ULONG __READONLY_DATA aCatMf2Hid[10][4] =
+ const char* __READONLY_DATA aCatMf2Hid[10][4] =
{
{ HID_SMA_DEFAULT_DIST, HID_SMA_LINE_DIST, HID_SMA_ROOT_DIST, 0 },
{ HID_SMA_SUP_DIST, HID_SMA_SUB_DIST , 0, 0 },
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 0471b1111e1f..94e30ce82501 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -107,8 +107,7 @@ SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) :
pVScrollBar (0),
pScrollBox (0)
{
- // FIXME: HELPID
- SetHelpId(""/*HID_SMA_COMMAND_WIN_EDIT*/);
+ SetHelpId(HID_SMA_COMMAND_WIN_EDIT);
SetMapMode(MAP_PIXEL);
// Even RTL languages don't use RTL for math
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 18b3912ecf45..1fd0d2ab8d3c 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -336,17 +336,6 @@ void SmModule::GetState(SfxItemSet &rSet)
}
}
-void SmModule::FillStatusBar(StatusBar &rBar)
-{
- rBar.InsertItem(SID_TEXTSTATUS, 300, SIB_LEFT | SIB_IN);
- rBar.InsertItem(SID_ATTR_ZOOM, rBar.GetTextWidth(C2S(" 100% ")));
- rBar.InsertItem(SID_MODIFYSTATUS, rBar.GetTextWidth(C2S(" * ")));
- rBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rBar ), SIB_USERDRAW );
- // FIXME: HELPID
- rBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/);
-
-}
-
/* -----------------15.02.99 12:45-------------------
*
* --------------------------------------------------*/
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index ec6d8114759b..93b584ae8381 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -31,6 +31,7 @@
#include "starmath.hrc"
#include "dialog.hrc"
#include "toolbox.hrc"
+#include "smcommands.h"
#define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
#define IMAGE_STDBTN_COLOR_HC IMAGE_STDBTN_COLOR
@@ -109,7 +110,7 @@ ModalDialog RID_FONTSIZEDIALOG
Moveable = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- HelpID = SID_FONTSIZE ;
+ HelpId = CMD_SID_FONTSIZE ;
Size = MAP_APPFONT ( 171 , 120 ) ;
Text [ en-US ] = "Font Sizes" ;
FixedText 1
@@ -269,7 +270,7 @@ ModalDialog RID_FONTTYPEDIALOG
{
OutputSize = TRUE ;
SVLook = TRUE ;
- HelpID = SID_FONT ;
+ HelpId = CMD_SID_FONT ;
Size = MAP_APPFONT ( 282 , 153 ) ;
Text [ en-US ] = "Fonts" ;
Moveable = TRUE ;
@@ -425,7 +426,7 @@ ModalDialog RID_DISTANCEDIALOG
Moveable = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- HelpID = SID_DISTANCE ;
+ HelpId = CMD_SID_DISTANCE ;
Size = MAP_APPFONT ( 240 , 90 ) ;
Text [ en-US ] = "Spacing" ;
FixedText 1
@@ -919,7 +920,7 @@ ModalDialog RID_ALIGNDIALOG
Moveable = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- HelpID = SID_ALIGN ;
+ HelpId = CMD_SID_ALIGN ;
Size = MAP_APPFONT ( 139 , 66 ) ;
Text [ en-US ] = "Alignment" ;
RadioButton 1
@@ -1402,37 +1403,37 @@ Menu RID_VIEWMENU
MenuItem
{
Identifier = SID_VIEW050 ;
- HelpID = SID_VIEW050 ;
+ HelpId = CMD_SID_VIEW050 ;
Text [ en-US ] = "~View 50%" ;
};
MenuItem
{
Identifier = SID_VIEW100 ;
- HelpID = SID_VIEW100 ;
+ HelpId = CMD_SID_VIEW100 ;
Text [ en-US ] = "View ~100%" ;
};
MenuItem
{
Identifier = SID_VIEW200 ;
- HelpID = SID_VIEW200 ;
+ HelpId = CMD_SID_VIEW200 ;
Text [ en-US ] = "View ~200%" ;
};
MenuItem
{
Identifier = SID_ZOOMIN ;
- HelpID = SID_ZOOMIN ;
+ HelpId = CMD_SID_ZOOMIN ;
Text [ en-US ] = "~Zoom In" ;
};
MenuItem
{
Identifier = SID_ZOOMOUT ;
- HelpID = SID_ZOOMOUT ;
+ HelpId = CMD_SID_ZOOMOUT ;
Text [ en-US ] = "Zoom ~Out" ;
};
MenuItem
{
Identifier = SID_ADJUST ;
- HelpID = SID_ADJUST ;
+ HelpId = CMD_SID_ADJUST ;
Text [ en-US ] = "~Display All" ;
};
MenuItem
@@ -1442,7 +1443,7 @@ Menu RID_VIEWMENU
MenuItem
{
Identifier = SID_DRAW ;
- HelpID = SID_DRAW ;
+ HelpId = CMD_SID_DRAW ;
Text [ en-US ] = "U~pdate" ;
};
};
@@ -3478,76 +3479,6 @@ String RID_ERR_RIGHTEXPECTED
Text [ en-US ] = "'RIGHT' expected" ;
};
-#include "menu.src"
-
-ToolBox RID_MATH_TOOLBOX
-{
- HelpId = RID_MATH_TOOLBOX ;
- Customize = TRUE ;
- LineSpacing = TRUE ;
- Dockable = TRUE ;
- Moveable = TRUE ;
- Sizeable = TRUE ;
- Closeable = TRUE ;
- Zoomable = TRUE ;
- Scroll = TRUE ;
- HideWhenDeactivate = TRUE ;
- Border = TRUE ;
- SVLook = TRUE ;
- Align = BOXALIGN_LEFT ;
- Size = MAP_APPFONT ( 0 , 0 ) ;
- MenuStrings = TRUE ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = SID_ZOOMIN ;
- HelpID = SID_ZOOMIN ;
- Text [ en-US ] = "Zoom In" ;
- };
- ToolBoxItem
- {
- Identifier = SID_ZOOMOUT ;
- HelpID = SID_ZOOMOUT ;
- Text [ en-US ] = "Zoom Out" ;
- };
- ToolBoxItem
- {
- Identifier = SID_VIEW100 ;
- HelpID = SID_VIEW100 ;
- Text [ en-US ] = "Zoom 100%" ;
- };
- ToolBoxItem
- {
- Identifier = SID_ADJUST ;
- HelpID = SID_ADJUST ;
- Text [ en-US ] = "Entire Formula" ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_DRAW ;
- HelpID = SID_DRAW ;
- Text [ en-US ] = "Refresh" ;
- };
- ToolBoxItem
- {
- Identifier = SID_FORMULACURSOR ;
- HelpID = SID_FORMULACURSOR ;
- Text [ en-US ] = "Formula Cursor";
- };
- ToolBoxItem
- {
- Identifier = SID_SYMBOLS_CATALOGUE ;
- HelpID = SID_SYMBOLS_CATALOGUE ;
- Text [ en-US ] = "Symbols" ;
- };
- };
-};
-
String RID_MATH_TOOLBOX
{
Text [ en-US ] = "Main Toolbar" ;
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index ddb6a37da33a..1552d4edc231 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -111,10 +111,8 @@ SmGraphicWindow::SmGraphicWindow(SmViewShell* pShell):
SetTotalSize();
- // FIXME: HELPID
- SetHelpId(""/*HID_SMA_WIN_DOCUMENT*/);
- // FIXME: HELPID
- SetUniqueId(""/*HID_SMA_WIN_DOCUMENT*/);
+ SetHelpId(HID_SMA_WIN_DOCUMENT);
+ SetUniqueId(HID_SMA_WIN_DOCUMENT);
}
SmGraphicWindow::~SmGraphicWindow()
generated by cgit (git 2.34.1) at 2024-07-10 14:47:52 +0000