From 88515548af02c2e2129acedb50f1ecd2e76dc169 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Tue, 19 May 2009 15:01:25 +0000 Subject: [PATCH] #i10000#: undo wrong merge conflict resolution --- testautomation/global/win/tab_a_d.win | 1 + 1 file changed, 1 insertion(+) diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win index b675ffb84d46..d97b2423c1e1 100755 --- a/testautomation/global/win/tab_a_d.win +++ b/testautomation/global/win/tab_a_d.win @@ -54,6 +54,7 @@ VorschauInSchriftlisten svx:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW SchriftenHistorie svx:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY UseHardwareAcceleration svx:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL UseAntiAliasing svx:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE +IconsInMenueAnzeigen svx:ListBox:OFA_TP_VIEW:LB_MENU_ICONS MausAktion svx:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE MousePositioning svx:ListBox:OFA_TP_VIEW:LB_MOUSEPOS UseSystemFont svx:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT