diff options
| author | Tsutomu Uchino <hanya@apache.org> | 2015-01-31 07:26:19 +0000 |
|---|---|---|
| committer | Tsutomu Uchino <hanya@apache.org> | 2015-01-31 07:26:19 +0000 |
| commit | 23e16b91ad69a123e795d63f2d4862d94412d582 (patch) | |
| tree | 97478eda2019fc8889d2098909da32996b077787 | |
| parent | 459c1d18f71552db70b349ef50828142cd6f744f (diff) | |
#i114416# use default service name for scroll bar if failed to detect the control-implementation
Notes
Notes:
merged as: f2ae6d2053256e1917104f1c44485099966155be
| -rw-r--r-- | xmloff/source/forms/elementimport.cxx | 9 | ||||
| -rw-r--r-- | xmloff/source/forms/elementimport.hxx | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 672d9a79207a..89ad7456806b 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -190,7 +190,7 @@ namespace xmloff } if ( !m_sServiceName.getLength() ) - determineDefaultServiceName(); + m_sServiceName = determineDefaultServiceName(); // create the object *now*. This allows setting properties in the various handleAttribute methods. // (Though currently not all code is migrated to this pattern, most attributes are still handled @@ -712,6 +712,7 @@ namespace xmloff case OControlElement::IMAGE_FRAME: pServiceName = "com.sun.star.form.component.DatabaseImageControl"; break; case OControlElement::HIDDEN: pServiceName = "com.sun.star.form.component.HiddenControl"; break; case OControlElement::GRID: pServiceName = "com.sun.star.form.component.GridControl"; break; + case OControlElement::VALUERANGE: pServiceName = "com.sun.star.form.component.ScrollBar"; break; case OControlElement::TIME: pServiceName = "com.sun.star.form.component.DateField"; break; case OControlElement::DATE: pServiceName = "com.sun.star.form.component.TimeField"; break; default: break; @@ -2221,6 +2222,12 @@ namespace xmloff } } + //--------------------------------------------------------------------- + ::rtl::OUString OFormImport::determineDefaultServiceName() const + { + return ::rtl::OUString::createFromAscii( "com.sun.star.form.component.Form" ); + } + //......................................................................... } // namespace xmloff //......................................................................... diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index dacda2e33353..eb04e84ba506 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -740,7 +740,7 @@ namespace xmloff sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, OControlElement::ElementType _eType ); - + virtual ::rtl::OUString determineDefaultServiceName() const; void implTranslateStringListProperty(const ::rtl::OUString& _rPropertyName, const ::rtl::OUString& _rValue); }; |