diff options
author | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-05-14 16:36:40 +0200 |
---|---|---|
committer | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-05-14 16:36:40 +0200 |
commit | c9d620f5dd472902fe6d5aed93ed55dec6dd7f7b (patch) | |
tree | e7c54fa83ffb999555f8e36afcc066583ff79007 | |
parent | 99ee7093162c1922a2740e4731b82a1528283e3c (diff) |
sw33bf04: #160026# method <WW8Export::DoComboBox(..)> - property "Help" does not exist and asking for it causes exception --> asking for property "HelpText"
-rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 6686ae5b13d7..004eef715822 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -170,10 +170,20 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet) rtl::OUString sHelp; { - uno::Any aTmp = xPropSet->getPropertyValue(C2U("Help")); - const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); - if (pStr) - sHelp = *pStr; + // --> OD 2010-05-14 #160026# + // property "Help" does not exist and due to the no-existence an exception is thrown. +// uno::Any aTmp = xPropSet->getPropertyValue(C2U("Help")); + try + { + uno::Any aTmp = xPropSet->getPropertyValue(C2U("HelpText")); + // <-- + const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); + if (pStr) + sHelp = *pStr; + } + catch( uno::Exception& ) + {} + // <-- } rtl::OUString sToolTip; |