linguistic/source/lngsvcmgr.cxx | 2 +- sd/uiconfig/simpress/ui/slidetransitionspanel.ui | 1 - vcl/source/control/field.cxx | 7 +------ 3 files changed, 2 insertions(+), 8 deletions(-)
New commits: commit 3b1cca8c547ce53b2af29b3edecc22c7694a0621 Author: Caolán McNamara <[email protected]> Date: Fri Mar 21 16:57:27 2014 +0000 Related: fdo#74468 drop hard-coded 'sec' and use FUNIT_SECONDS Change-Id: I11e2aa39d77c01446387b13ba4bc9f40b61a958a diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui index 2d7bde2..52836f3 100644 --- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui +++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui @@ -255,7 +255,6 @@ <property name="can_focus">True</property> <property name="invisible_char">â</property> <property name="invisible_char_set">True</property> - <property name="format">sec</property> <property name="digits">2</property> <property name="spin_size">25</property> </object> diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index ad67f9f..bd60588 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1592,12 +1592,7 @@ Size MetricField::CalcMinimumSize() const bool MetricField::set_property(const OString &rKey, const OString &rValue) { - if (rKey == "format") - { - maCustomUnitText = OStringToOUString(rValue, RTL_TEXTENCODING_UTF8); - meUnit = FUNIT_CUSTOM; - } - else if (rKey == "digits") + if (rKey == "digits") SetDecimalDigits(rValue.toInt32()); else if (rKey == "spin-size") SetSpinSize(rValue.toInt32()); commit 973ff09ee7e7a1926326db6accf9e3e40e901874 Author: Caolán McNamara <[email protected]> Date: Fri Mar 21 16:25:18 2014 +0000 coverity#982461 Unchecked dynamic_cast Change-Id: I3933b2cd03b8e1dff7bcb106d841a429e4d0ba53 diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 041cea7..014c3ec 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1021,7 +1021,7 @@ void LngSvcMgr::GetGrammarCheckerDsp_Impl( sal_Bool bSetSvcList ) pGrammarDsp = dynamic_cast< GrammarCheckingIterator * >(xGCI.get()); xGrammarDsp = xGCI; SAL_WARN_IF( pGrammarDsp == NULL, "linguistic", "failed to get implementation" ); - if (bSetSvcList) + if (bSetSvcList && pGrammarDsp) SetCfgServiceLists( *pGrammarDsp ); } }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
