You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ha...@apache.org on 2015/01/31 08:26:19 UTC
svn commit: r1656169 - in /openoffice/trunk/main/xmloff/source/forms:
elementimport.cxx elementimport.hxx
Author: hanya
Date: Sat Jan 31 07:26:19 2015
New Revision: 1656169
URL: http://svn.apache.org/r1656169
Log:
#i114416# use default service name for scroll bar if failed to detect the control-implementation
Modified:
openoffice/trunk/main/xmloff/source/forms/elementimport.cxx
openoffice/trunk/main/xmloff/source/forms/elementimport.hxx
Modified: openoffice/trunk/main/xmloff/source/forms/elementimport.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/forms/elementimport.cxx?rev=1656169&r1=1656168&r2=1656169&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/forms/elementimport.cxx (original)
+++ openoffice/trunk/main/xmloff/source/forms/elementimport.cxx Sat Jan 31 07:26:19 2015
@@ -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;
@@ -2220,6 +2221,12 @@ namespace xmloff
return new OControlImport(m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer, _eType);
}
}
+
+ //---------------------------------------------------------------------
+ ::rtl::OUString OFormImport::determineDefaultServiceName() const
+ {
+ return ::rtl::OUString::createFromAscii( "com.sun.star.form.component.Form" );
+ }
//.........................................................................
} // namespace xmloff
Modified: openoffice/trunk/main/xmloff/source/forms/elementimport.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/forms/elementimport.hxx?rev=1656169&r1=1656168&r2=1656169&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/forms/elementimport.hxx (original)
+++ openoffice/trunk/main/xmloff/source/forms/elementimport.hxx Sat Jan 31 07:26:19 2015
@@ -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);
};