diff options
author | Tsutomu Uchino <hanya@apache.org> | 2015-01-31 07:26:19 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-01 22:10:40 +0000 |
commit | f2ae6d2053256e1917104f1c44485099966155be (patch) | |
tree | ba83e989b5501ce889c1f0a9f3121f26dfe430fc /xmloff | |
parent | e112dc0df7344e98414f64e70ddb7f764790bd06 (diff) |
Resolves: #i114416# use default service name for scroll bar...
if failed to detect the control-implementation
(cherry picked from commit 23e16b91ad69a123e795d63f2d4862d94412d582)
Conflicts:
xmloff/source/forms/elementimport.cxx
xmloff/source/forms/elementimport.hxx
Change-Id: I0ab4f9ff909ceba18a74d38488f6d0bdb3126110
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/forms/elementimport.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/forms/elementimport.hxx | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 4f501778d77b..608fcb5c233f 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -683,6 +683,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.TimeField"; break; case OControlElement::DATE: pServiceName = "com.sun.star.form.component.DateField"; break; default: break; @@ -2112,6 +2113,11 @@ namespace xmloff } } + OUString OFormImport::determineDefaultServiceName() const + { + return OUString("com.sun.star.form.component.Form"); + } + } // namespace xmloff /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index 4d2592aadd8c..230ff6dd49a5 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -695,6 +695,7 @@ namespace xmloff sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType ); + virtual OUString determineDefaultServiceName() const SAL_OVERRIDE; void implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue); }; |