diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-24 12:48:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-25 15:55:19 +0100 |
| commit | 6eef1937db49788ac55a1fd2df3f1e2505e27499 (patch) | |
| tree | 48265bf66a1ffffd26816202125a72193dee6869 /writerfilter | |
| parent | 4797a92297883f2a8c62f0ffaa83b89b8d0737cb (diff) | |
sal_Char->char in xmloff..xmlsecurity
Change-Id: I292d699ce1de10ca9341525161f5da2592102ff7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85778
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 12 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index b3e8730e2252..0ca7ffa7027a 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -174,8 +174,8 @@ namespace { struct FieldConversion { - const sal_Char* cFieldServiceName; - FieldId const eFieldId; + const char* cFieldServiceName; + FieldId const eFieldId; }; } @@ -2969,7 +2969,7 @@ static sal_Int16 lcl_ParseNumberingType( const OUString& rCommand ) //todo: might make sense to hash this list, too struct NumberingPairs { - const sal_Char* cWordName; + const char* cWordName; sal_Int16 const nType; }; static const NumberingPairs aNumberingPairs[] = @@ -3478,7 +3478,7 @@ void DomainMapper_Impl::ChainTextFrames() } } -uno::Reference<beans::XPropertySet> DomainMapper_Impl::FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName) +uno::Reference<beans::XPropertySet> DomainMapper_Impl::FindOrCreateFieldMaster(const char* pFieldMasterService, const OUString& rFieldMasterName) { // query master, create if not available uno::Reference< text::XTextFieldsSupplier > xFieldsSupplier( GetTextDocument(), uno::UNO_QUERY_THROW ); @@ -3999,8 +3999,8 @@ void DomainMapper_Impl::handleAuthor constexpr sal_uInt8 SET_DATE = 0x04; struct DocPropertyMap { - const sal_Char* pDocPropertyName; - const sal_Char* pServiceName; + const char* pDocPropertyName; + const char* pServiceName; sal_uInt8 const nFlags; }; static const DocPropertyMap aDocProperties[] = diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 6988045f73ab..fde0749d1f8d 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -575,7 +575,7 @@ private: void GetCurrentLocale(css::lang::Locale& rLocale); void SetNumberFormat(const OUString& rCommand, css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, bool bDetectFormat = false); /// @throws css::uno::Exception - css::uno::Reference<css::beans::XPropertySet> FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName); + css::uno::Reference<css::beans::XPropertySet> FindOrCreateFieldMaster(const char* pFieldMasterService, const OUString& rFieldMasterName); css::uno::Reference<css::beans::XPropertySet> const & GetDocumentSettings(); std::map<sal_Int32, css::uno::Any> deferredCharacterProperties; |