summaryrefslogtreecommitdiff
path: root/sc/uiconfig
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-11-20 14:55:37 +0200
committerTor Lillqvist <tml@collabora.com>2014-11-20 14:58:32 +0200
commit92c5e9b2812571329a758d54b15273f5fc68f95c (patch)
treea95d39d956e59b8cd2e9b11c8d72107c0c1349a2 /sc/uiconfig
parenta55f740045d6d30e1ef5522889d2dc359ca5784a (diff)
Use regexps in the OpenCL blacklist/whitelist
Drop version number bounds, use regexps instead. Not entirely ideal, but as vendors are free to put arbitrary stuff into the driver version string (part of which might be numbers, part free text, part significant, part just informative), just comparing against lower and upper bounds with strverscmp() was not ideal either. Change-Id: Ic4ef4d8e15f79f1c96e6e03f6c01e62ae92dc2fc
Diffstat (limited to 'sc/uiconfig')
-rw-r--r--sc/uiconfig/scalc/ui/formulacalculationoptions.ui31
1 files changed, 4 insertions, 27 deletions
diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
index 5d359ebc78cc..a157f8d92283 100644
--- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
+++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
@@ -302,12 +302,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="opencldriverversionminlabel">
+ <object class="GtkLabel" id="opencldriverversionlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">OpenCL Driver Version Lower Bound</property>
- <property name="mnemonic_widget">opencldriverversionmin:border</property>
+ <property name="label" translatable="yes">OpenCL Driver Version</property>
+ <property name="mnemonic_widget">opencldriverversion:border</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -315,7 +315,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="opencldriverversionmin:border">
+ <object class="GtkEntry" id="opencldriverversion:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
@@ -324,29 +324,6 @@
<property name="top_attach">9</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="opencldriverversionmaxlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">OpenCL Driver Version Upper Bound</property>
- <property name="mnemonic_widget">opencldriverversionmax:border</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">10</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="opencldriverversionmax:border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">11</property>
- </packing>
- </child>
</object>
<packing>
<property name="left_attach">1</property>