diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-03-04 12:07:34 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-03-04 12:18:23 +0100 |
| commit | 35a2f39de795fca22696224d4490224a6cf93d21 (patch) | |
| tree | 2acf875495dfd24cce11d005e8463086900ea13a | |
| parent | 0ed226d25db933609fdce54cfa8242a8c3dd3a23 (diff) | |
vcl: don't assert when lack of unit is intentional
The Writer zoom dialog had this issue. Also change the drawinglayer
gradient background tabpage to stop using a custom unit text, when the
real unit text will be set from code anyway.
Change-Id: Ib2e12572abb5c407b7c49dfa4a34dbdd6b6068d4
| -rw-r--r-- | cui/uiconfig/ui/gradientpage.ui | 2 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui index d0eafe67c1c1..bea9f2ea5092 100644 --- a/cui/uiconfig/ui/gradientpage.ui +++ b/cui/uiconfig/ui/gradientpage.ui @@ -153,7 +153,7 @@ </packing> </child> <child> - <object class="GtkSpinButton" id="anglemtr: degrees"> + <object class="GtkSpinButton" id="anglemtr:0"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 3716a02bd644..58afbe4d1b19 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -684,7 +684,9 @@ namespace else if (sUnit == "%") eUnit = FUNIT_PERCENT; - assert(eUnit != FUNIT_NONE); //unknown unit + // if lack of unit is not intentional + if (sUnit != "0") + assert(eUnit != FUNIT_NONE); //unknown unit return eUnit; } |