#i10000#: undo wrong merge conflict resolution

This commit is contained in:
Jens-Heiner Rechtien
2009-05-19 15:01:25 +00:00
parent ff55637967
commit 88515548af

View File

@@ -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