summaryrefslogtreecommitdiff
path: root/sc/source/ui/miscdlgs
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/miscdlgs')
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx2
-rw-r--r--sc/source/ui/miscdlgs/acredlin.src4
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx6
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.src4
-rw-r--r--sc/source/ui/miscdlgs/highred.src7
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.src10
-rw-r--r--sc/source/ui/miscdlgs/linkarea.src6
-rw-r--r--sc/source/ui/miscdlgs/protectiondlg.src4
-rw-r--r--sc/source/ui/miscdlgs/retypepassdlg.src12
-rw-r--r--sc/source/ui/miscdlgs/scuiautofmt.cxx4
-rw-r--r--sc/source/ui/miscdlgs/sharedocdlg.src3
-rw-r--r--sc/source/ui/miscdlgs/shtabdlg.cxx6
-rw-r--r--sc/source/ui/miscdlgs/solveroptions.cxx2
-rw-r--r--sc/source/ui/miscdlgs/strindlg.cxx24
-rw-r--r--sc/source/ui/miscdlgs/tabbgcolordlg.cxx6
16 files changed, 64 insertions, 38 deletions
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index efeab20cf..cd09a35d3 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -179,7 +179,7 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
pTPView->SetRejectAllClickHdl( LINK( this, ScAcceptChgDlg,RejectAllHandle));
pTPView->SetAcceptAllClickHdl( LINK(this, ScAcceptChgDlg, AcceptAllHandle));
pTheView->SetCalcView();
- pTheView->SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
+ pTheView->SetStyle(pTheView->GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
pTheView->SetExpandingHdl( LINK(this, ScAcceptChgDlg, ExpandingHandle));
pTheView->SetSelectHdl( LINK(this, ScAcceptChgDlg, SelectHandle));
pTheView->SetDeselectHdl( LINK(this, ScAcceptChgDlg, SelectHandle));
diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src
index dab2c5d91..842644108 100644
--- a/sc/source/ui/miscdlgs/acredlin.src
+++ b/sc/source/ui/miscdlgs/acredlin.src
@@ -29,7 +29,7 @@
ModelessDialog RID_SCDLG_CHANGES
{
OutputSize = TRUE ;
- HelpId = FID_CHG_ACCEPT ;
+ HelpId = CMD_FID_CHG_ACCEPT ;
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 282 , 142 ) ;
@@ -60,6 +60,7 @@ ModelessDialog RID_SCDLG_CHANGES
};
Edit ED_ASSIGN
{
+ HelpID = "sc:Edit:RID_SCDLG_CHANGES:ED_ASSIGN";
Hide = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 119 ) ;
@@ -68,6 +69,7 @@ ModelessDialog RID_SCDLG_CHANGES
};
ImageButton RB_ASSIGN
{
+ HelpID = "sc:ImageButton:RID_SCDLG_CHANGES:RB_ASSIGN";
Hide = TRUE ;
Pos = MAP_APPFONT ( 142 , 118 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 7dd87b270..8d061b20d 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -690,7 +690,7 @@ ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow*
pActiveWin(NULL)
{
m_aHelper.SetWindow(/*this*/&m_rWindow);
- if(m_rWindow.GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId
+ if(m_rWindow.GetHelpId().getLength()==0) //Hack, da im SfxModelessDialog die HelpId
m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und
//in eine UniqueId gewandelt wird, machen
//wir das an dieser Stelle rueckgaengig.
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 161c6476b..776ddb62d 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -36,7 +36,7 @@
#include "conflictsdlg.hrc"
#include "scresid.hxx"
#include "viewdata.hxx"
-#include "tabview.hxx"
+#include "dbfunc.hxx"
//=============================================================================
@@ -514,7 +514,7 @@ ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocume
aHeader += maStrTitleDate;
maLbConflicts.InsertHeaderEntry( aHeader, HEADERBAR_APPEND, HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER );
- maLbConflicts.SetWindowBits( WB_HASLINES | WB_CLIPCHILDREN | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL );
+ maLbConflicts.SetStyle( maLbConflicts.GetStyle() | WB_HASLINES | WB_CLIPCHILDREN | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL );
maLbConflicts.SetSelectionMode( MULTIPLE_SELECTION );
maLbConflicts.SetHighlightRange();
@@ -660,7 +660,7 @@ IMPL_LINK( ScConflictsDlg, UpdateSelectionHdl, Timer*, EMPTYARG )
return 0;
}
- ScTabView* pTabView = reinterpret_cast< ScTabView* >( mpViewData->GetView() );
+ ScTabView* pTabView = mpViewData->GetView();
pTabView->DoneBlockMode();
BOOL bContMark = FALSE;
SvLBoxEntry* pEntry = maLbConflicts.FirstSelected();
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src
index dad8abb48..3f963b727 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.src
+++ b/sc/source/ui/miscdlgs/conflictsdlg.src
@@ -52,12 +52,14 @@ ModalDialog RID_SCDLG_CONFLICTS
};
PushButton BTN_KEEPMINE
{
+ HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE";
Pos = MAP_APPFONT ( 72 , 145 ) ;
Size = MAP_APPFONT ( 76 , 14 ) ;
Text [ en-US ] = "Keep ~Mine" ;
};
PushButton BTN_KEEPOTHER
{
+ HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER";
Pos = MAP_APPFONT ( 190 , 145 ) ;
Size = MAP_APPFONT ( 76 , 14 ) ;
Text [ en-US ] = "Keep ~Other" ;
@@ -69,12 +71,14 @@ ModalDialog RID_SCDLG_CONFLICTS
};
PushButton BTN_KEEPALLMINE
{
+ HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE";
Pos = MAP_APPFONT ( 6 , 172 ) ;
Size = MAP_APPFONT ( 104 , 14 ) ;
Text [ en-US ] = "~Keep All Mine" ;
};
PushButton BTN_KEEPALLOTHERS
{
+ HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS";
Pos = MAP_APPFONT ( 116 , 172 ) ;
Size = MAP_APPFONT ( 104 , 14 ) ;
Text [ en-US ] = "Keep ~All Others" ;
diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src
index ce6409347..31bbf2044 100644
--- a/sc/source/ui/miscdlgs/highred.src
+++ b/sc/source/ui/miscdlgs/highred.src
@@ -29,7 +29,7 @@
ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES
{
OutputSize = TRUE ;
- HelpId = FID_CHG_ACCEPT ;
+ HelpId = CMD_FID_CHG_ACCEPT ;
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 318 , 148 ) ;
@@ -38,6 +38,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES
// Dieser Dialog hat einen Cancel-Button !
CheckBox CB_HIGHLIGHT
{
+ HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT";
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 150 , 10 ) ;
TabStop = TRUE ;
@@ -51,6 +52,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES
};
CheckBox CB_HIGHLIGHT_ACCEPT
{
+ HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT";
Pos = MAP_APPFONT ( 12 , 118 ) ;
Size = MAP_APPFONT ( 246 , 10 ) ;
TabStop = TRUE ;
@@ -58,6 +60,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES
};
CheckBox CB_HIGHLIGHT_REJECT
{
+ HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT";
Pos = MAP_APPFONT ( 12 , 132 ) ;
Size = MAP_APPFONT ( 246 , 10 ) ;
TabStop = TRUE ;
@@ -84,6 +87,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES
};
Edit ED_ASSIGN
{
+ HelpID = "sc:Edit:RID_SCDLG_HIGHLIGHT_CHANGES:ED_ASSIGN";
Hide = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 119 ) ;
@@ -92,6 +96,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES
};
ImageButton RB_ASSIGN
{
+ HelpID = "sc:ImageButton:RID_SCDLG_HIGHLIGHT_CHANGES:RB_ASSIGN";
Hide = TRUE ;
Pos = MAP_APPFONT ( 142 , 118 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
diff --git a/sc/source/ui/miscdlgs/instbdlg.src b/sc/source/ui/miscdlgs/instbdlg.src
index 375dfc24f..7766cfe2a 100644
--- a/sc/source/ui/miscdlgs/instbdlg.src
+++ b/sc/source/ui/miscdlgs/instbdlg.src
@@ -28,6 +28,7 @@
#include "instbdlg.hrc"
ModalDialog RID_SCDLG_INSERT_TABLE
{
+ HelpID = "sc:ModalDialog:RID_SCDLG_INSERT_TABLE";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 274 , 190 ) ;
@@ -59,6 +60,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE
};
RadioButton RB_BEFORE
{
+ HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEFORE";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 197 , 10 ) ;
TabStop = TRUE ;
@@ -66,6 +68,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE
};
RadioButton RB_BEHIND
{
+ HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEHIND";
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 197 , 10 ) ;
TabStop = TRUE ;
@@ -79,6 +82,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE
};
RadioButton RB_NEW
{
+ HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_NEW";
Pos = MAP_APPFONT ( 12 , 55 ) ;
Size = MAP_APPFONT ( 197 , 10 ) ;
Text [ en-US ] = "~New sheet" ;
@@ -91,6 +95,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE
};
NumericField NF_COUNT
{
+ HelpID = "sc:NumericField:RID_SCDLG_INSERT_TABLE:NF_COUNT";
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 66 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -109,18 +114,21 @@ ModalDialog RID_SCDLG_INSERT_TABLE
};
Edit ED_TABNAME
{
+ HelpID = "sc:Edit:RID_SCDLG_INSERT_TABLE:ED_TABNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 82 ) ;
Size = MAP_APPFONT ( 137 , 12 ) ;
};
RadioButton RB_FROMFILE
{
+ HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_FROMFILE";
Pos = MAP_APPFONT ( 12 , 100 ) ;
Size = MAP_APPFONT ( 197 , 10 ) ;
Text [ en-US ] = "~From file" ;
};
MultiListBox LB_TABLES
{
+ HelpID = "sc:MultiListBox:RID_SCDLG_INSERT_TABLE:LB_TABLES";
SimpleMode = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 20 , 113 ) ;
@@ -129,12 +137,14 @@ ModalDialog RID_SCDLG_INSERT_TABLE
};
PushButton BTN_BROWSE
{
+ HelpID = "sc:PushButton:RID_SCDLG_INSERT_TABLE:BTN_BROWSE";
Pos = MAP_APPFONT ( 149 , 113 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Browse..." ;
};
CheckBox CB_LINK
{
+ HelpID = "sc:CheckBox:RID_SCDLG_INSERT_TABLE:CB_LINK";
Pos = MAP_APPFONT ( 149 , 131 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
/* ### ACHTUNG: Neuer Text in Resource? Ver~knüpfen : Ver~kn³pfen */
diff --git a/sc/source/ui/miscdlgs/linkarea.src b/sc/source/ui/miscdlgs/linkarea.src
index ec5e3d4b8..40417a978 100644
--- a/sc/source/ui/miscdlgs/linkarea.src
+++ b/sc/source/ui/miscdlgs/linkarea.src
@@ -29,6 +29,7 @@
ModalDialog RID_SCDLG_LINKAREA
{
+ HelpID = "sc:ModalDialog:RID_SCDLG_LINKAREA";
OutputSize = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
@@ -58,6 +59,7 @@ ModalDialog RID_SCDLG_LINKAREA
};
ComboBox CB_URL
{
+ HelpID = "sc:ComboBox:RID_SCDLG_LINKAREA:CB_URL";
Pos = MAP_APPFONT ( 12 , 15 ) ;
Size = MAP_APPFONT ( 174 , 80 ) ;
TabStop = TRUE ;
@@ -65,6 +67,7 @@ ModalDialog RID_SCDLG_LINKAREA
};
PushButton BTN_BROWSE
{
+ HelpID = "sc:PushButton:RID_SCDLG_LINKAREA:BTN_BROWSE";
Pos = MAP_APPFONT ( 190 , 14 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
Text = "~..." ;
@@ -84,6 +87,7 @@ ModalDialog RID_SCDLG_LINKAREA
};
MultiListBox LB_RANGES
{
+ HelpID = "sc:MultiListBox:RID_SCDLG_LINKAREA:LB_RANGES";
SimpleMode = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 74 ) ;
@@ -92,6 +96,7 @@ ModalDialog RID_SCDLG_LINKAREA
};
CheckBox BTN_RELOAD
{
+ HelpID = "sc:CheckBox:RID_SCDLG_LINKAREA:BTN_RELOAD";
Pos = MAP_APPFONT ( 12 , 168 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
@@ -99,6 +104,7 @@ ModalDialog RID_SCDLG_LINKAREA
};
NumericField NF_DELAY
{
+ HelpID = "sc:NumericField:RID_SCDLG_LINKAREA:NF_DELAY";
Border = TRUE ;
Pos = MAP_APPFONT ( 113 , 166 ) ;
Size = MAP_APPFONT ( 32 , 12 ) ;
diff --git a/sc/source/ui/miscdlgs/protectiondlg.src b/sc/source/ui/miscdlgs/protectiondlg.src
index 34ad4063d..ecafdc980 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.src
+++ b/sc/source/ui/miscdlgs/protectiondlg.src
@@ -29,6 +29,7 @@
ModalDialog RID_SCDLG_TABPROTECTION
{
+ HelpID = "sc:ModalDialog:RID_SCDLG_TABPROTECTION";
Text [ en-US ] = "Protect Sheet" ;
Size = MAP_APPFONT ( 220 , 135 ) ;
Moveable = TRUE ;
@@ -53,6 +54,7 @@ ModalDialog RID_SCDLG_TABPROTECTION
CheckBox BTN_PROTECT
{
+ HelpID = "sc:CheckBox:RID_SCDLG_TABPROTECTION:BTN_PROTECT";
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 150 , 10 );
@@ -69,6 +71,7 @@ ModalDialog RID_SCDLG_TABPROTECTION
Edit ED_PASSWORD1
{
+ HelpID = "sc:Edit:RID_SCDLG_TABPROTECTION:ED_PASSWORD1";
Border = TRUE;
PassWord = TRUE;
Pos = MAP_APPFONT ( 56, 22 );
@@ -85,6 +88,7 @@ ModalDialog RID_SCDLG_TABPROTECTION
Edit ED_PASSWORD2
{
+ HelpID = "sc:Edit:RID_SCDLG_TABPROTECTION:ED_PASSWORD2";
Border = TRUE;
PassWord = TRUE;
Pos = MAP_APPFONT ( 56, 39 );
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src
index 20cb3976a..240caaa89 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.src
+++ b/sc/source/ui/miscdlgs/retypepassdlg.src
@@ -30,6 +30,7 @@
ModalDialog RID_SCDLG_RETYPEPASS
{
+ HelpID = "sc:ModalDialog:RID_SCDLG_RETYPEPASS";
Text [ en-US ] = "Re-type Password" ;
Size = MAP_APPFONT ( 260 , 165 ) ;
Moveable = TRUE ;
@@ -82,6 +83,7 @@ ModalDialog RID_SCDLG_RETYPEPASS
PushButton BTN_RETYPE_DOC
{
+ HelpID = "sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_DOC";
Pos = MAP_APPFONT ( 158, 59 );
Size = MAP_APPFONT ( 30, 14 );
@@ -114,6 +116,7 @@ ModalDialog RID_SCDLG_RETYPEPASS
PushButton BTN_RETYPE_SHEET1
{
+ HelpID = "sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET1";
Pos = MAP_APPFONT ( 158, 94 );
Size = MAP_APPFONT ( 30, 14 );
@@ -138,6 +141,7 @@ ModalDialog RID_SCDLG_RETYPEPASS
PushButton BTN_RETYPE_SHEET2
{
+ HelpID = "sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET2";
Pos = MAP_APPFONT ( 158, 110 );
Size = MAP_APPFONT ( 30, 14 );
@@ -162,6 +166,7 @@ ModalDialog RID_SCDLG_RETYPEPASS
PushButton BTN_RETYPE_SHEET3
{
+ HelpID = "sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET3";
Pos = MAP_APPFONT ( 158, 126 );
Size = MAP_APPFONT ( 30, 14 );
@@ -186,6 +191,7 @@ ModalDialog RID_SCDLG_RETYPEPASS
PushButton BTN_RETYPE_SHEET4
{
+ HelpID = "sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET4";
Pos = MAP_APPFONT ( 158, 142 );
Size = MAP_APPFONT ( 30, 14 );
@@ -229,6 +235,7 @@ ModalDialog RID_SCDLG_RETYPEPASS
ModalDialog RID_SCDLG_RETYPEPASS_INPUT
{
+ HelpID = "sc:ModalDialog:RID_SCDLG_RETYPEPASS_INPUT";
Text [ en-US ] = "Re-type Password" ;
Size = MAP_APPFONT ( 230 , 110 ) ;
Moveable = TRUE ;
@@ -255,6 +262,7 @@ ModalDialog RID_SCDLG_RETYPEPASS_INPUT
RadioButton BTN_RETYPE_PASSWORD
{
+ HelpID = "sc:RadioButton:RID_SCDLG_RETYPEPASS_INPUT:BTN_RETYPE_PASSWORD";
Pos = MAP_APPFONT ( 11, 10 );
Size = MAP_APPFONT ( 150, 10 );
@@ -271,6 +279,7 @@ ModalDialog RID_SCDLG_RETYPEPASS_INPUT
Edit ED_PASSWORD1
{
+ HelpID = "sc:Edit:RID_SCDLG_RETYPEPASS_INPUT:ED_PASSWORD1";
Border = TRUE;
PassWord = TRUE;
Pos = MAP_APPFONT ( 65, 29 );
@@ -287,6 +296,7 @@ ModalDialog RID_SCDLG_RETYPEPASS_INPUT
Edit ED_PASSWORD2
{
+ HelpID = "sc:Edit:RID_SCDLG_RETYPEPASS_INPUT:ED_PASSWORD2";
Border = TRUE;
PassWord = TRUE;
Pos = MAP_APPFONT ( 65, 44 );
@@ -295,6 +305,7 @@ ModalDialog RID_SCDLG_RETYPEPASS_INPUT
CheckBox BTN_MATCH_OLD_PASSWORD
{
+ HelpID = "sc:CheckBox:RID_SCDLG_RETYPEPASS_INPUT:BTN_MATCH_OLD_PASSWORD";
Pos = MAP_APPFONT ( 20, 65 );
Size = MAP_APPFONT ( 150, 10 );
@@ -303,6 +314,7 @@ ModalDialog RID_SCDLG_RETYPEPASS_INPUT
RadioButton BTN_REMOVE_PASSWORD
{
+ HelpID = "sc:RadioButton:RID_SCDLG_RETYPEPASS_INPUT:BTN_REMOVE_PASSWORD";
Pos = MAP_APPFONT ( 11, 90 );
Size = MAP_APPFONT ( 150, 10 );
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index a7c902100..fb62eaba6 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -262,7 +262,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG )
aStrTitle,
aStrLabel,
aFormatName,
- HID_SC_ADD_AUTOFMT );
+ HID_SC_ADD_AUTOFMT, HID_SC_AUTOFMT_NAME );
if ( pDlg->Execute() == RET_OK )
{
@@ -369,7 +369,7 @@ IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG )
aStrRename,
aStrLabel,
aFormatName,
- HID_SC_REN_AFMT_DLG );
+ HID_SC_REN_AFMT_DLG, HID_SC_REN_AFMT_NAME );
if( pDlg->Execute() == RET_OK )
{
BOOL bFmtRenamed = FALSE;
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.src b/sc/source/ui/miscdlgs/sharedocdlg.src
index 13361b216..6a3ed0334 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.src
+++ b/sc/source/ui/miscdlgs/sharedocdlg.src
@@ -30,7 +30,7 @@
ModalDialog RID_SCDLG_SHAREDOCUMENT
{
OutputSize = TRUE ;
- HelpId = SID_SHARE_DOC ;
+ HelpId = CMD_SID_SHARE_DOC ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 204 , 186 ) ;
Text [ en-US ] = "Share Document" ;
@@ -38,6 +38,7 @@ ModalDialog RID_SCDLG_SHAREDOCUMENT
Closeable = TRUE ;
CheckBox CB_SHARE
{
+ HelpID = "sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE";
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 192 , 8 ) ;
Text [ en-US ] = "Share this spreadsheet with other users" ;
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index f71a4ab86..7a06c4c94 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -62,12 +62,12 @@ ScShowTabDlg::ScShowTabDlg( Window* pParent ) :
void ScShowTabDlg::SetDescription(
const String& rTitle, const String& rFixedText,
- ULONG nDlgHelpId, ULONG nLbHelpId )
+ const rtl::OString& rDlgHelpId, const rtl::OString& sLbHelpId )
{
SetText( rTitle );
aFtLbTitle.SetText( rFixedText );
- SetHelpId( nDlgHelpId );
- aLb.SetHelpId( nLbHelpId );
+ SetHelpId( rDlgHelpId );
+ aLb.SetHelpId( sLbHelpId );
}
void ScShowTabDlg::Insert( const String& rString, BOOL bSelected )
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index bd3b54c7f..2f5244329 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -145,7 +145,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent,
maBtnEdit.SetClickHdl( LINK( this, ScSolverOptionsDialog, ButtonHdl ) );
- maLbSettings.SetWindowBits( WB_CLIPCHILDREN|WB_FORCE_MAKEVISIBLE );
+ maLbSettings.SetStyle( maLbSettings.GetStyle()|WB_CLIPCHILDREN|WB_FORCE_MAKEVISIBLE );
maLbSettings.SetHelpId( HID_SC_SOLVEROPTIONS_LB );
maLbSettings.SetHighlightRange();
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx
index 3999d4dc4..db042d9b3 100644
--- a/sc/source/ui/miscdlgs/strindlg.cxx
+++ b/sc/source/ui/miscdlgs/strindlg.cxx
@@ -55,7 +55,7 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent,
const String& rTitle,
const String& rEditTitle,
const String& rDefault,
- ULONG nHelpId ) :
+ const rtl::OString& sHelpId, const rtl::OString& sEditHelpId ) :
ModalDialog ( pParent, ScResId( RID_SCDLG_STRINPUT ) ),
//
aFtEditTitle ( this, ScResId( FT_LABEL ) ),
@@ -64,30 +64,12 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent,
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) )
{
- SetHelpId( nHelpId );
+ SetHelpId( sHelpId );
SetText( rTitle );
aFtEditTitle.SetText( rEditTitle );
aEdInput.SetText( rDefault );
aEdInput.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
-
- // HelpId for Edit different for different uses
-
- if ( nHelpId == FID_TAB_APPEND )
- aEdInput.SetHelpId( HID_SC_APPEND_NAME );
- else if ( nHelpId == FID_TAB_RENAME )
- aEdInput.SetHelpId( HID_SC_RENAME_NAME );
- else if ( nHelpId == HID_SC_ADD_AUTOFMT )
- aEdInput.SetHelpId( HID_SC_AUTOFMT_NAME );
- else if ( nHelpId == HID_SC_REN_AFMT_DLG )
- aEdInput.SetHelpId( HID_SC_REN_AFMT_NAME );
- else if ( nHelpId == SID_RENAME_OBJECT )
- aEdInput.SetHelpId( HID_SC_RENAME_OBJECT );
- // #i68101#
- else if ( nHelpId == SID_TITLE_DESCRIPTION_OBJECT )
- aEdInput.SetHelpId( HID_SC_TITLE_DESCRIPTION_OBJECT );
- else
- DBG_ERRORFILE( "unknown ID" );
-
+ aEdInput.SetHelpId( sEditHelpId );
//-------------
FreeResource();
}
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 6fdf87a96..b5ba7899e 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -59,7 +59,7 @@ ScTabBgColorDlg::ScTabBgColorDlg( Window* pParent,
const String& rTitle,
const String& rTabBgColorNoColorText,
const Color& rDefaultColor,
- ULONG nHelpId ) :
+ const rtl::OString& sHelpId ) :
ModalDialog ( pParent, ScResId( RID_SCDLG_TAB_BG_COLOR ) ),
aBorderWin ( this, ScResId( TAB_BG_COLOR_CT_BORDER ) ),
aTabBgColorSet ( &aBorderWin, ScResId( TAB_BG_COLOR_SET_BGDCOLOR ), this ),
@@ -68,10 +68,10 @@ ScTabBgColorDlg::ScTabBgColorDlg( Window* pParent,
aBtnHelp ( this, ScResId( BTN_HELP ) ),
aTabBgColor ( rDefaultColor ),
aTabBgColorNoColorText ( rTabBgColorNoColorText ),
- mnHelpId ( nHelpId )
+ msHelpId ( sHelpId )
{
- SetHelpId( nHelpId );
+ SetHelpId( sHelpId );
this->SetText( rTitle );
this->SetStyle(GetStyle() | WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL | WB_SYSTEMWINDOW | WB_STANDALONE | WB_HIDE);
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-16 21:39:56 +0000