slidecopy: merged latest DEV300.m80 changes

5 files changed, 13 insertions, 4 deletions

diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index 1540dbd8743f..ab6183ad7724 100755
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -483,6 +483,12 @@ Gruppenliste HID_TEMPLATE_FILTER
 Interlace filter:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED
 TransparentSpeichern filter:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT
 
+*GridControlDialogStarter ACTIVE
+ShowGridcontrol sym:showGridcontrol
+
+*GridControlDialog sym:gridcontroldialog
+gridcontrolcontrol sym:gridcontrolself
+
 *GroupingDlg HID_SC_DPDATEGROUP
 AutoStart sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOSTART
 ManualStart sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANSTART
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index d91003bdddd6..0e2fd251d285 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -316,7 +316,7 @@ ReplaceWith svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE
 ReplaceWithStyle svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE
 SearchNow svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH
 SearchAll svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL
-Replace svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE
+ReplaceBtn svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE
 ReplaceAll svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL
 MatchCase svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE
 WholeWordsOnly svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS
@@ -454,7 +454,7 @@ HanjaOnly   cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY
 ReplaceByCharacter   cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER
 Ignore HID_HANGULDLG_BUTTON_IGNORE
 AlwaysIgnore HID_HANGULDLG_BUTTON_IGNOREALL
-Replace HID_HANGULDLG_BUTTON_CHANGE
+ReplaceBtn HID_HANGULDLG_BUTTON_CHANGE
 AlwaysReplace HID_HANGULDLG_BUTTON_CHANGEALL
 Options HID_HANGULDLG_BUTTON_OPTIONS
 Grid HID_HANGULDLG_SUGGESTIONS_GRID
@@ -485,4 +485,4 @@ DeleteEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE
 Automatic   sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_AUTOMATIC
 Custom   sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_CUSTOM
 CustomLanguage sc:ListBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:LB_CUSTOM_LANG
-DetectSpecialNumbers sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE
\ No newline at end of file
+DetectSpecialNumbers sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index a95316d03619..a97b3b3ed8be 100644
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
@@ -257,6 +257,9 @@ RightFieldCell   HID_RELATIONDIALOG_RIGHTFIELDCELL
 *Relief SID_GRFFILTER_EMBOSS
 LightSource HID_GRFFILTER_EMBOSS_LIGHT
 
+*RenameAutoFormat HID_SC_REN_AFMT_DLG
+RenameAutoFormatName HID_SC_REN_AFMT_NAME
+
 *RenameElement HID_MM_ADD_RENAME_ENTRY
 FieldTitle sw:Edit:DLG_MM_ADD_RENAME_ENTRY:ED_FIELDNAME
 
diff --git a/testautomation/global/win/spadmin.win b/testautomation/global/win/spadmin.win
index 056a2605ecc9..1e8de27e9b15 100755
--- a/testautomation/global/win/spadmin.win
+++ b/testautomation/global/win/spadmin.win
@@ -67,7 +67,6 @@ PBDefault padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD
 PBRemove padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL
 PBTestpage padmin:PushButton:RID_PADIALOG:RID_PA_TESTPAGE
 PBNewPrinter padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD
-PBFonts padmin:PushButton:RID_PADIALOG:RID_PA_BTN_FONTS
 
 *TabSPACommand padmin:TabPage:RID_RTS_COMMANDPAGE
 EFlpr padmin:ComboBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_COMMANDS
diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win
index af6d933aefb4..a3135d80e1dd 100755
--- a/testautomation/global/win/tab_a_d.win
+++ b/testautomation/global/win/tab_a_d.win
@@ -151,6 +151,7 @@ GenauigkeitWieAngezeigt sc:CheckBox:RID_SCPAGE_CALC:BTN_CALC
 Suchkriterien sc:CheckBox:RID_SCPAGE_CALC:BTN_MATCH
 RegulaererAusdruck sc:CheckBox:RID_SCPAGE_CALC:BTN_REGEX
 SpaltenZeilenbeschriftung sc:CheckBox:RID_SCPAGE_CALC:BTN_LOOKUP
+LimitDecimals sc:CheckBox:RID_SCPAGE_CALC:BTN_GENERAL_PREC
 
 *TabBereiche HID_INSERT_SECTION_PAGE
 Bereichsliste sw:ComboBox:TP_INSERT_SECTION:ED_RNAME