diff options
Diffstat (limited to 'editeng/source/xml/xmltxtexp.cxx')
| -rw-r--r-- | editeng/source/xml/xmltxtexp.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index b6f3f5cf14b0..0ebb3819b350 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <xmloff/xmlmetae.hxx> #include <comphelper/processfactory.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/streamwrap.hxx> #include <xmloff/xmlexp.hxx> #include <editeng/unoedsrc.hxx> @@ -48,9 +48,7 @@ using namespace com::sun::star; using namespace com::sun::star::container; -using namespace com::sun::star::document; using namespace com::sun::star::uno; -using namespace com::sun::star::awt; using namespace com::sun::star::lang; using namespace com::sun::star::xml::sax; using namespace cppu; @@ -135,12 +133,12 @@ uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( co || aServiceSpecifier == "com.sun.star.text.TextField.DateTime" ) { - return static_cast<cppu::OWeakObject *>(new SvxUnoTextField( text::textfield::Type::DATE )); + return cppu::getXWeak(new SvxUnoTextField( text::textfield::Type::DATE )); } if( aServiceSpecifier == "com.sun.star.text.TextField.URL" ) { - return static_cast<cppu::OWeakObject *>(new SvxUnoTextField(text::textfield::Type::URL)); + return cppu::getXWeak(new SvxUnoTextField(text::textfield::Type::URL)); } return SvxUnoTextCreateTextField( aServiceSpecifier ); @@ -275,11 +273,10 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( { SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, - { u"" UNO_NAME_NUMBERING_RULES, EE_PARA_NUMBULLET, cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, - { u"" UNO_NAME_NUMBERING, EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 }, - { u"" UNO_NAME_NUMBERING_LEVEL, EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { UNO_NAME_NUMBERING_RULES, EE_PARA_NUMBULLET, cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, + { UNO_NAME_NUMBERING, EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 }, + { UNO_NAME_NUMBERING_LEVEL, EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, SVX_UNOEDIT_PARA_PROPERTIES, - { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSvxXMLTextExportComponentPropertySet( SvxXMLTextExportComponentPropertyMap, EditEngine::GetGlobalItemPool() ); @@ -305,7 +302,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( rStream ) ); /* testcode - static const OUStringLiteral aURL( u"file:///e:/test.xml" ); + static constexpr OUStringLiteral aURL( u"file:///e:/test.xml" ); SvFileStream aStream(aURL, StreamMode::WRITE | StreamMode::TRUNC); xOut = new utl::OOutputStreamWrapper(aStream); */ |