diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 20:09:46 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 20:09:46 +0200 |
commit | ae2ebf8fac893aeb2a328918ce1b12ef6834f16d (patch) | |
tree | d75f454c5866f8c605245814daadd7fafa1ec98d /unoxml/source/rdf/CLiteral.cxx | |
parent | fixing rebase errors (diff) | |
parent | do not set solid line border and fill as default for chartarea (diff) | |
download | core-ae2ebf8fac893aeb2a328918ce1b12ef6834f16d.tar.gz core-ae2ebf8fac893aeb2a328918ce1b12ef6834f16d.zip |
Merge branch 'master' into feature/gnumake4
Conflicts:
filter/source/config/cache/filtercache.cxx
filter/source/odfflatxml/makefile.mk
oox/Library_oox.mk
oox/Makefile
oox/Module_oox.mk
oox/Package_generated.mk
oox/Package_inc.mk
oox/prj/build.lst
oox/prj/d.lst
oox/prj/makefile.mk
oox/source/dump/makefile.mk
unoxml/Library_unordf.mk
unoxml/Library_unoxml.mk
writerfilter/CppunitTest_writerfilter_doctok.mk
writerfilter/Library_writerfilter.mk
writerfilter/Module_writerfilter.mk
writerfilter/Package_inc.mk
writerfilter/inc/resourcemodel/TagLogger.hxx
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
writerfilter/prj/build.lst
writerfilter/prj/makefile.mk
writerfilter/qa/complex/ooxml/makefile.mk
writerfilter/qa/cppunittests/doctok/makefile.mk
writerfilter/qa/cppunittests/doctok/testdoctok.cxx
writerfilter/qa/cppunittests/xxml/testXXML.cxx
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/FontTable.cxx
writerfilter/source/dmapper/GraphicHelpers.cxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyMap.cxx
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/dmapper/StyleSheetTable.cxx
writerfilter/source/dmapper/TablePropertiesHandler.cxx
writerfilter/source/dmapper/TblStylePrHandler.cxx
writerfilter/source/dmapper/ThemeTable.cxx
writerfilter/source/doctok/WW8DocumentImpl.cxx
writerfilter/source/doctok/resourcesimpl.xsl
writerfilter/source/filter/WriterFilter.cxx
writerfilter/source/generated.mk
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
writerfilter/source/ooxml/OOXMLFactory.cxx
writerfilter/source/ooxml/OOXMLFactory.hxx
writerfilter/source/ooxml/OOXMLStreamImpl.cxx
writerfilter/source/ooxml/RefAndPointer.hxx
writerfilter/source/resourcemodel/TagLogger.cxx
writerfilter/unocomponent/component.cxx
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
Diffstat (limited to 'unoxml/source/rdf/CLiteral.cxx')
-rw-r--r-- | unoxml/source/rdf/CLiteral.cxx | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index 30c72ccc841e..549cee2146f4 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,23 +111,23 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u const sal_Int32 len( aArguments.getLength() ); if (len < 1 || len > 2) { throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("CLiteral::initialize: " - "must give 1 or 2 argument(s)"), *this, 2); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: " + "must give 1 or 2 argument(s)")), *this, 2); } ::rtl::OUString arg0; if (!(aArguments[0] >>= arg0)) { throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("CLiteral::initialize: " - "argument must be string"), *this, 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: " + "argument must be string")), *this, 0); } //FIXME: what is legal? if (true) { m_Value = arg0; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("CLiteral::initialize: " - "argument is not valid literal value"), *this, 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: " + "argument is not valid literal value")), *this, 0); } if (len > 1) { @@ -137,21 +138,21 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u m_Language = arg1; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("CLiteral::initialize: " - "argument is not valid language"), *this, 1); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: " + "argument is not valid language")), *this, 1); } } else if ((aArguments[1] >>= xURI)) { if (xURI.is()) { m_xDatatype = xURI; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("CLiteral::initialize: " - "argument is null"), *this, 1); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: " + "argument is null")), *this, 1); } } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("CLiteral::initialize: " - "argument must be string or URI"), *this, 1); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: " + "argument must be string or URI")), *this, 1); } } } @@ -159,7 +160,7 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u // ::com::sun::star::rdf::XNode: ::rtl::OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException) { - if (!m_Language.equalsAscii("")) { + if (m_Language.getLength()) { ::rtl::OUStringBuffer buf(m_Value); buf.appendAscii("@"); buf.append(m_Language); @@ -219,3 +220,4 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( } // closing component helper namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |