diff options
| -rw-r--r-- | svtools/inc/svtools/solar.hrc | 6 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/svtools/inc/svtools/solar.hrc b/svtools/inc/svtools/solar.hrc index 71e02a169008..348422ef6477 100644 --- a/svtools/inc/svtools/solar.hrc +++ b/svtools/inc/svtools/solar.hrc @@ -164,6 +164,9 @@ #define RID_RPT_START (RID_OBJ_START+768) #define RID_RPT_END (RID_OBJ_START+1000) + +#define RID_FORMULA_START (RID_OBJ_START+1001) +#define RID_FORMULA_END (RID_OBJ_START+1200) // Help-Ids -------------------------------------------------------------- #define HID_OK_BUTTON 0 @@ -302,5 +305,8 @@ #define HID_RPT_START (HID_OBJ_START+1681) #define HID_RPT_END (HID_OBJ_START+2080) +#define HID_FORMULA_START (HID_OBJ_START+2081) +#define HID_FORMULA_END (HID_OBJ_START+2280) + #endif diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 0595a7a9ab8a..d70f607a6cc6 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1447,11 +1447,19 @@ Window* Window::ImplGetTopmostFrameWindow() // making these Methods out of line to be able to change them lateron without complete rebuild // TODO: Set the SmartId in here and remove mpWindowImpl->mnHelpId -void Window::SetHelpId( ULONG nHelpId ) { mpWindowImpl->mnHelpId = nHelpId; } -ULONG Window::GetHelpId() const { return mpWindowImpl->mnHelpId; } +void Window::SetHelpId( ULONG nHelpId ) +{ + SetSmartHelpId(SmartId(nHelpId)); +} + +ULONG Window::GetHelpId() const +{ + return mpWindowImpl->mnHelpId; +} void Window::SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode ) { + mpWindowImpl->maHelpText = String(); // create SmartId if required if ( (aMode == SMART_SET_STR) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasString() ) ) { @@ -1464,7 +1472,9 @@ void Window::SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode ) ImplGetWinData()->mpSmartHelpId->UpdateId( aId, aMode ); if ( (aMode == SMART_SET_NUM) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasNumeric() ) ) + { mpWindowImpl->mnHelpId = aId.GetNum(); + } } SmartId Window::GetSmartHelpId() const |