officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 4 ++-- xmloff/source/forms/elementimport.cxx | 9 ++++++++- xmloff/source/forms/elementimport.hxx | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-)
New commits: commit 23e16b91ad69a123e795d63f2d4862d94412d582 Author: Tsutomu Uchino <[email protected]> Date: Sat Jan 31 07:26:19 2015 +0000 #i114416# use default service name for scroll bar if failed to detect the control-implementation diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 672d9a7..89ad745 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 dacda2e..eb04e84 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); }; commit 459c1d18f71552db70b349ef50828142cd6f744f Author: Tsutomu Uchino <[email protected]> Date: Sat Jan 31 06:50:26 2015 +0000 #i116863# remove extra spaces from labels of line spacing commands diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 0a17cdb..d4b350f 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4832,7 +4832,7 @@ </node> <node oor:name=".uno:SpacePara15" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Line Spacing : 1.5</value> + <value xml:lang="en-US">Line Spacing: 1.5</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>15</value> @@ -4840,7 +4840,7 @@ </node> <node oor:name=".uno:SpacePara2" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Line Spacing : 2</value> + <value xml:lang="en-US">Line Spacing: 2</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>15</value> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
