INTEGRATION: CWS hcshared08 (1.10.12); FILE MERGED

2007/01/31 14:17:13 ufi 1.10.12.1: some changes

1 files changed, 34 insertions, 10 deletions

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 5405a483bd..8fd64d14a5 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -450,6 +450,7 @@ FN_TABLE_VERT_BOTTOM,20587,.uno:CellVertBottom
 FN_TABLE_VERT_CENTER,20586,.uno:CellVertCenter
 FN_TABLE_VERT_NONE,20585,.uno:CellVertTop
 FN_THESAURUS_DLG,20603,.uno:ThesaurusDialog
+FN_TITLE_DESCRIPTION_SHAPE,21615,
 FN_TOOL_ANKER,20349,.uno:ToggleAnchorType
 FN_TOOL_ANKER_AT_CHAR,21412,.uno:SetAnchorAtChar
 FN_TOOL_ANKER_CHAR,20384,.uno:SetAnchorToChar
@@ -807,6 +808,7 @@ HID_BACKGROUND_CTL_BGDCOLORSET,33868,
 HID_BACKGROUND_CTL_POSITION,33871,
 HID_BACKINGWINDOW,40368,
 HID_BASICIDE_ACTIV,63557,
+HID_BASICIDE_ADDNEW_CONTROL,63574,
 HID_BASICIDE_BREAKPOINTWINDOW,63564,
 HID_BASICIDE_BRKDLG,63556,
 HID_BASICIDE_BRKPROPS,63558,
@@ -818,6 +820,7 @@ HID_BASICIDE_LIBS,63545,
 HID_BASICIDE_LIBSDLG_TREE,63549,
 HID_BASICIDE_LIBS_TREE,63548,
 HID_BASICIDE_MACROS,63544,
+HID_BASICIDE_MANAGE_LANGUAGE,63571,
 HID_BASICIDE_MODULES_TREE,63547,
 HID_BASICIDE_MODULWINDOW,63561,
 HID_BASICIDE_OBJCAT_HELP,63555,
@@ -828,6 +831,7 @@ HID_BASICIDE_OBJECTS,63537,
 HID_BASICIDE_PROP_BROWSER,63551,
 HID_BASICIDE_PROP_BROWSER_LBOX,63552,
 HID_BASICIDE_REMOVEWATCH,63559,
+HID_BASICIDE_SETDEFAULT_LANGUAGE,63572,
 HID_BASICIDE_STACKWINDOW,63566,
 HID_BASICIDE_STACKWINDOW_LIST,63570,
 HID_BASICIDE_TABBAR,63567,
@@ -1163,6 +1167,8 @@ HID_DBWIZ_FINISH,39058,
 HID_DBWIZ_NEXT,39056,
 HID_DBWIZ_PREVIOUS,39055,
 HID_DB_SELECTION_TLB,54845,
+HID_DEPLOYMENT_GUI_UPDATE,42786,
+HID_DEPLOYMENT_GUI_UPDATEINSTALL,42787,
 HID_DESKTOP,33146,
 HID_DIALOG_HANGULHANJA,39883,
 HID_DID_SAVE_PACKED_XML,33368,
@@ -1502,6 +1508,8 @@ HID_DLG_MASTERPASSWORD_UUI,35840,
 HID_DLG_MESSBOX,33819,
 HID_DLG_NAME,33818,
 HID_DLG_NEW_USER_IDX,54858,
+HID_DLG_OBJECT_NAME,33827,
+HID_DLG_OBJECT_TITLE_DESC,33828,
 HID_DLG_ORDERCRIT,38784,
 HID_DLG_PASSWD_SECTION,53440,
 HID_DLG_PASSWORD,38964,
@@ -1547,6 +1555,7 @@ HID_DSADMIN_ADVANCED,39016,
 HID_DSADMIN_ALLOWLONG,38813,
 HID_DSADMIN_ALL_TABLES,38823,
 HID_DSADMIN_APPENDTABLEALIAS,39031,
+HID_DSADMIN_AS_BEFORE_CORRELATION_NAME,39065,
 HID_DSADMIN_AUTOINCREMENTVALUE,38994,
 HID_DSADMIN_AUTORETRIEVEENABLED,38998,
 HID_DSADMIN_BOOKMARK_TOOLBOX,38941,
@@ -3578,6 +3587,7 @@ HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE,54932,
 HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL,54927,
 HID_SEND_MASTER_CTRL_PUSHBUTTON_OK,54926,
 HID_SEND_MASTER_DIALOG,54925,
+HID_SMARTTAG_MAIN,53443,
 HID_SMA_ABSX,63130,
 HID_SMA_ACUTEX,63204,
 HID_SMA_ALEPH,63255,
@@ -4401,6 +4411,7 @@ SID_BASICIDE_APPEAR,30783,.uno:BasicIDEAppear
 SID_BASICIDE_BRKPNTSCHANGED,30804,.uno:BreakPointsChanged
 SID_BASICIDE_CHOOSEMACRO,30770,.uno:ChooseMacro
 SID_BASICIDE_CREATEMACRO,30772,.uno:CreateMacro
+SID_BASICIDE_CURRENT_LANG,30821,
 SID_BASICIDE_DELETECURRENT,30790,.uno:DeleteCurrent
 SID_BASICIDE_EDITMACRO,30771,.uno:EditMacro
 SID_BASICIDE_HIDECURPAGE,30778,.uno:HideCurPage
@@ -4409,6 +4420,7 @@ SID_BASICIDE_LIBREMOVED,30796,.uno:LibRemoved
 SID_BASICIDE_LIBSELECTED,30786,.uno:LibSelect
 SID_BASICIDE_LIBSELECTOR,30787,.uno:LibSelector
 SID_BASICIDE_MANAGEBRKPNTS,30810,.uno:ManageBreakPoints
+SID_BASICIDE_MANAGE_LANG,30820,
 SID_BASICIDE_MATCHGROUP,30782,.uno:MatchGroup
 SID_BASICIDE_MODULEDLG,30773,.uno:ModuleDialog
 SID_BASICIDE_NAMECHANGEDONTAB,30779,.uno:NameChangedOnTab
@@ -4638,6 +4650,7 @@ SID_DB_APP_DSPROPS,12268,
 SID_DB_APP_DSRELDESIGN,12264,
 SID_DB_APP_DSUSERADMIN,12265,
 SID_DB_APP_EDIT,12293,
+SID_DB_APP_EDIT_SQL_VIEW,12316,
 SID_DB_APP_FORM_DELETE,12283,
 SID_DB_APP_FORM_EDIT,12285,
 SID_DB_APP_FORM_OPEN,12286,
@@ -5346,6 +5359,7 @@ SID_OBJECT_MIRROR,27085,.uno:Mirror
 SID_OBJECT_ROTATE,10129,.uno:ToggleObjectRotateMode
 SID_OBJECT_SELECT,10128,.uno:SelectObject
 SID_OBJECT_SHEAR,27107,.uno:Shear
+SID_OBJECT_TITLE_DESCRIPTION,27033,
 SID_OBJECT_TOP,26657,.uno:ObjectTop
 SID_OBJECT_TRANSPARENCE,27100,.uno:InteractiveTransparence
 SID_OBJECT_WIDTH,26658,.uno:ObjectWidth
@@ -5585,6 +5599,7 @@ SID_SHOW_BROWSER,10163,.uno:ShowBrowser
 SID_SHOW_IME_STATUS_WINDOW,6680,.uno:ShowImeStatusWindow
 SID_SHOW_ITEMBROWSER,11001,.uno:ShowItemBrowser
 SID_SHOW_PROPERTYBROWSER,10943,.uno:ShowPropBrowser
+SID_SHOW_SLIDE,27440,
 SID_SIGNATURE,6643,.uno:Signature
 SID_SIM_EDITOPTIONS,10438,.uno:SimEditOptions
 SID_SIM_START,30000,.uno:LaunchStarImage
@@ -5685,6 +5700,7 @@ SID_TEXT_TO_COLUMNS,26339,.uno:TextInSpalten
 SID_THESAURUS,10245,.uno:Thesaurus
 SID_TIPWINDOW,6632,.uno:TipsDialog
 SID_TITLE,5307,.uno:Title
+SID_TITLE_DESCRIPTION_OBJECT,26094,
 SID_TITLE_MASTERPAGE,27351,.uno:TitleMasterPage
 SID_TOGGLESTATUSBAR,5920,.uno:StatusBarVisible
 SID_TOGGLETOOLBAR,5909,
@@ -5760,7 +5776,7 @@ SID_ZOOM_OUT,10097,.uno:ZoomPlus
 SID_ZOOM_PANNING,27017,.uno:ZoomPanning
 SID_ZOOM_PREV,10403,.uno:ZoomPrevious
 SID_ZOOM_TOOLBOX,10096,.uno:ZoomToolBox
-SRC680.m196,010101010101010,
+SRC680.m200,010101010101010,
 SW_BEZIERSHELL,266,
 SW_DRAWFORMSHELL,268,
 SW_DRAWSHELL,258,
@@ -5883,6 +5899,8 @@ basctl_Edit_RID_DLG_NEWLIB_RID_ED_LIBNAME,1317734441,
 basctl_Edit_RID_MACROCHOOSER_RID_ED_MACRONAME,1317865477,
 basctl_Edit_RID_MACROOPTIONS_RID_ED_HELPNAME,1317947404,
 basctl_FloatingWindow_RID_BASICIDE_OBJCAT,1855062016,
+basctl_ListBox_RID_DLG_MANAGE_LANGUAGE_LB_LANGUAGE,1343589890,
+basctl_ListBox_RID_DLG_SETDEF_LANGUAGE_LB_DEF_LANGUAGE,1343622658,
 basctl_ListBox_RID_TP_LIBS_RID_LB_BASICS,780799500,
 basctl_ModalDialog_RID_BASICIDE_BREAKPOINTDLG,1318354944,
 basctl_ModalDialog_RID_DLG_EXPORT,1317748736,
@@ -5896,6 +5914,9 @@ basctl_NumericField_RID_BASICIDE_BREAKPOINTDLG_RID_FLD_PASS,1318361098,
 basctl_NumericField_RID_MACROOPTIONS_RID_NF_HELPID,1317951498,
 basctl_PushButton_RID_BASICIDE_BREAKPOINTDLG_RID_PB_DEL,1318359558,
 basctl_PushButton_RID_BASICIDE_BREAKPOINTDLG_RID_PB_NEW,1318359557,
+basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_ADD_LANG,1343590915,
+basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_DEL_LANG,1343590916,
+basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_MAKE_DEFAULT,1343590917,
 basctl_PushButton_RID_MACROCHOOSER_RID_PB_ASSIGN,1317868045,
 basctl_PushButton_RID_MACROCHOOSER_RID_PB_DEL,1317868044,
 basctl_PushButton_RID_MACROCHOOSER_RID_PB_EDIT,1317868042,
@@ -6154,18 +6175,18 @@ dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_DEFDATA,851640833,
 dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_VIEW,851640835,
 dbaccess_TabPage_PAGE_CONNECTION,851542016,
 dbaccess_TabPage_PAGE_DBWIZARD_MYSQL_INTRO,852197376,
-dbaccess_TabPage_PAGE_DS_PROPERTIES_1,851820544,
-dbaccess_TabPage_PAGE_DS_PROPERTIES_2,851836928,
-dbaccess_TabPage_PAGE_DS_PROPERTIES_3,851918848,
-dbaccess_TabPage_PAGE_DS_PROPERTIES_4,851853312,
+dbaccess_TabPage_PAGE_DS_ADABAS_SETTINGS,851836928,
+dbaccess_TabPage_PAGE_DS_ADO_SETTINGS,851918848,
+dbaccess_TabPage_PAGE_DS_FULL_ADVANCED_SETTINGS,851853312,
+dbaccess_TabPage_PAGE_DS_MYSQL_SETTINGS,851951616,
 dbaccess_TabPage_PAGE_DS_PROPERTIES_ACCESS,851935232,
-dbaccess_TabPage_PAGE_DS_PROPERTIES_ENABLEOJ,851951616,
 dbaccess_TabPage_PAGE_DS_PROPERTIES_FILE,851869696,
 dbaccess_TabPage_PAGE_GENERATED_VALUES,851804160,
 dbaccess_TabPage_PAGE_MYSQL_JDBC,851771392,
 dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240,
 dbaccess_TabPage_PAGE_ORACLE_JDBC,851886080,
 dbaccess_TabPage_TAB_WIZ_NAME_MATCHING,851623936,
+desktop_CheckBox_RID_DLG_UPDATE_RID_DLG_UPDATE_ALL,1106592773,
 desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859,
 desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011,
 desktop_Edit_TP_USER_ED_USER_FATHER,586123282,
@@ -6177,13 +6198,17 @@ desktop_ModalDialog_DLG_CMDLINEHELP,1108164608,
 desktop_ModalDialog_RID_DLG_DEPENDENCIES,1106526208,
 desktop_ModalDialog_RID_DLG_LICENSE,1180237824,
 desktop_MultiLineEdit_RID_DLG_LICENSE_ML_LICENSE,1180240435,
+desktop_MultiLineEdit_RID_DLG_UPDATEINSTALL_RID_DLG_UPDATE_INSTALL_INFO,1106840076,
+desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS,1106594311,
 desktop_MultiLineEdit_TP_LICENSE_ML_LICENSE,586140166,
 desktop_PushButton_RID_DLG_LICENSE_PB_LICENSE_DOWN,1180242482,
 desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ADD,2180256276,
+desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_CHECK_UPDATES,2180256281,
 desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_DISABLE,2180256279,
 desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ENABLE,2180256278,
 desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_EXPORT,2180256280,
 desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_REMOVE,2180256277,
+desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK,1106596362,
 desktop_PushButton_TP_LICENSE_PB_LICENSE_DOWN,586142215,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER,586088966,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967,
@@ -7178,8 +7203,6 @@ sd_CheckBox_DLG_INSERT_PAGE_CBX_TEMPLATE,1401422849,
 sd_CheckBox_DLG_INSERT_PAGE_CBX_TITEL,1401422850,
 sd_CheckBox_DLG_MORPH_CBX_ATTRIBUTES,1084441601,
 sd_CheckBox_DLG_MORPH_CBX_ORIENTATION,1084441602,
-sd_CheckBox_DLG_NEW_FOIL_CBX_BACKGROUND,1085096961,
-sd_CheckBox_DLG_NEW_FOIL_CBX_OBJECTS,1085096962,
 sd_CheckBox_DLG_PRESLT_CBX_CHECK_MASTERS,1087964162,
 sd_CheckBox_DLG_PRESLT_CBX_MASTER_PAGE,1087964161,
 sd_CheckBox_DLG_PUBLISHING_PAGE2_CONTENT,1085850655,
@@ -7259,7 +7282,6 @@ sd_Edit_DLG_DEFINE_CUSTOMSHOW_EDT_NAME,1088325633,
 sd_Edit_DLG_DESIGNNAME_EDT_NAME,1085868035,
 sd_Edit_DLG_INSERT_LAYER_EDT_NAME,1077987329,
 sd_Edit_DLG_INSERT_PAGE_EDT_NAME,1401423873,
-sd_Edit_DLG_NEW_FOIL_EDT_NAME,1085097985,
 sd_Edit_DLG_PUBLISHING_PAGE2_CGI,1085851696,
 sd_Edit_DLG_PUBLISHING_PAGE2_INDEX,1085851692,
 sd_Edit_DLG_PUBLISHING_PAGE2_URL,1085851694,
@@ -7360,7 +7382,6 @@ sd_PushButton_DLG_CUSTOMSHOW_BTN_STARTSHOW,1087558149,
 sd_PushButton_DLG_DEFINE_CUSTOMSHOW_BTN_ADD,1088328193,
 sd_PushButton_DLG_DEFINE_CUSTOMSHOW_BTN_REMOVE,1088328195,
 sd_PushButton_DLG_INSERT_LAYER_BTN_DELETE,1077989889,
-sd_PushButton_DLG_NEW_FOIL_BTN_DELETE,1085100545,
 sd_PushButton_DLG_PRESLT_BTN_LOAD,1087967746,
 sd_PushButton_DLG_PUBLISHING_BUT_LAST,1085854408,
 sd_PushButton_DLG_PUBLISHING_BUT_NEXT,1085854409,
@@ -8030,6 +8051,8 @@ svx_Edit_RID_SVXDLG_JAVA_PARAMETER_ED_PARAMETER,1241745419,
 svx_Edit_RID_SVXDLG_MANAGE_NAMESPACE_ED_PREFIX,1368901643,
 svx_Edit_RID_SVXDLG_MANAGE_NAMESPACE_ED_URL,1368901645,
 svx_Edit_RID_SVXDLG_NAME_EDT_STRING,1238599681,
+svx_Edit_RID_SVXDLG_OBJECT_NAME_NTD_EDT_NAME,1238632450,
+svx_Edit_RID_SVXDLG_OBJECT_TITLE_DESC_NTD_EDT_TITLE,1238681603,
 svx_Edit_RID_SVXDLG_PASSWORD_ED_NEW_PASSWD,1239894037,
 svx_Edit_RID_SVXDLG_PASSWORD_ED_OLD_PASSWD,1239894027,
 svx_Edit_RID_SVXDLG_PASSWORD_ED_REPEAT_PASSWD,1239894039,
@@ -8538,6 +8561,7 @@ svx_MoreButton_RID_SVXDLG_SEARCH_BTN_MORE,2311664159,
 svx_MultiLineEdit_MD_INSERT_OBJECT_APPLET_ED_APPLET_OPTIONS,1598179860,
 svx_MultiLineEdit_MD_INSERT_OBJECT_PLUGIN_ED_PLUGINS_OPTIONS,1598163476,
 svx_MultiLineEdit_RID_SVXDLG_ADD_CONDITION_ED_CONDITION,1368869387,
+svx_MultiLineEdit_RID_SVXDLG_OBJECT_TITLE_DESC_NTD_EDT_DESC,1238682116,
 svx_MultiLineEdit_RID_SVXDLG_POSTIT_ED_EDIT,1237715469,
 svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD,2311850530,
 svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719,