summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/FormControlHelper.cxx
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2011-02-11 16:41:33 +0000
committerNoel Power <noel.power@novell.com>2011-02-11 16:42:21 +0000
commit2de38f8b653face5f8c2952e353186bcbcfd781e (patch)
tree0fe214026c4ea42a30e0b8bf41d5300bf8d035f1 /writerfilter/source/dmapper/FormControlHelper.cxx
parentb96434c98eaae70a62e1fa3333c3579b56126a48 (diff)
fix compile error related to floor and move #TODO closer to related item
Diffstat (limited to 'writerfilter/source/dmapper/FormControlHelper.cxx')
-rw-r--r--writerfilter/source/dmapper/FormControlHelper.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx
index 1df2fbb9c863..1401706e5bb7 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/writerfilter/source/dmapper/FormControlHelper.cxx
@@ -215,7 +215,6 @@ bool FormControlHelper::createDropdown(uno::Reference<text::XTextRange> xTextRan
}
}
- // #FIXME improve the auto height width calculation
// some fallback values ( to display something )
m_pImpl->aSize.Width = 2381;
@@ -225,11 +224,13 @@ bool FormControlHelper::createDropdown(uno::Reference<text::XTextRange> xTextRan
{
uno::Reference<beans::XPropertySet> xTextRangeProps(xTextRange, uno::UNO_QUERY_THROW);
static ::rtl::OUString sCharHeight(RTL_CONSTASCII_USTRINGPARAM("CharHeight"));
+ // #FIXME improve the auto height width calculation ( but this
+ // should be removed when we use form fields instead of controls
float fComboBoxHeight = 0.0;
xTextRangeProps->getPropertyValue(sCharHeight) >>= fComboBoxHeight;
m_pImpl->aSize.Height = floor(fComboBoxHeight * 35.3);
if ( nMaxChars )
- m_pImpl->aSize.Width = floor( m_pImpl->aSize.Height * nMaxChars );
+ m_pImpl->aSize.Width = m_pImpl->aSize.Height * nMaxChars;
}
catch( uno::Exception& e )
{