diff options
60 files changed, 325 insertions, 325 deletions
diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx index 0e944656f716..91288e2d7d58 100644 --- a/include/xmloff/maptype.hxx +++ b/include/xmloff/maptype.hxx @@ -30,7 +30,7 @@ */ struct XMLPropertyMapEntry { - const sal_Char* msApiName; /// Property-Name + const char* msApiName; /// Property-Name sal_Int32 nApiNameLength; /// length of property name sal_uInt16 mnNameSpace; /** declares the Namespace in which this property exists */ diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx index 84f687713911..4024740d25b4 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -83,7 +83,7 @@ public: // const OUString* pPrefix = 0); // void exportStyleFamily( -// const sal_Char *pFamily, const OUString& rXMLFamily, +// const char *pFamily, const OUString& rXMLFamily, // const rtl::Reference < XMLPropertySetMapper >& rPropMapper, // bool bUsed, sal_uInt16 nFamily = 0, // const OUString* pPrefix = 0); @@ -100,7 +100,7 @@ public: const OUString* pPrefix = nullptr); void exportStyleFamily( - const sal_Char *pFamily, const OUString& rXMLFamily, + const char *pFamily, const OUString& rXMLFamily, const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix = nullptr); diff --git a/include/xmloff/xmlement.hxx b/include/xmloff/xmlement.hxx index 4591cb945bbe..92173b31b2b0 100644 --- a/include/xmloff/xmlement.hxx +++ b/include/xmloff/xmlement.hxx @@ -63,7 +63,7 @@ public: #define ENUM_STRING_MAP_END() { nullptr, 0, 0 } -/** Map a const sal_Char* (with length) to a sal_uInt16 value. +/** Map a const char* (with length) to a sal_uInt16 value. * To be used with SvXMLUnitConverter::convertEnum(...) */ template<typename EnumT> diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx index 5907d7acb4e6..433d9b076201 100644 --- a/include/xmloff/xmlevent.hxx +++ b/include/xmloff/xmlevent.hxx @@ -49,7 +49,7 @@ struct XMLEventName OUString m_aName; XMLEventName() : m_nPrefix( 0 ) {} - XMLEventName( sal_uInt16 n, const sal_Char *p ) : + XMLEventName( sal_uInt16 n, const char *p ) : m_nPrefix( n ), m_aName( OUString::createFromAscii(p) ) {} @@ -74,9 +74,9 @@ struct XMLEventName */ struct XMLEventNameTranslation { - const sal_Char* sAPIName; + const char* sAPIName; sal_uInt16 const nPrefix; // namespace prefix - const sal_Char* sXMLName; + const char* sXMLName; }; /// a translation table for the events defined in the XEventsSupplier service diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index b413f00b922a..bb4fb6b92ad2 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -335,9 +335,9 @@ public: void ClearAttrList(); // Add an attribute to the common attribute list. - void AddAttributeASCII( sal_uInt16 nPrefix, const sal_Char *pName, - const sal_Char *pValue ); - void AddAttribute( sal_uInt16 nPrefix, const sal_Char *pName, + void AddAttributeASCII( sal_uInt16 nPrefix, const char *pName, + const char *pValue ); + void AddAttribute( sal_uInt16 nPrefix, const char *pName, const OUString& rValue ); void AddAttribute( sal_uInt16 nPrefix, const OUString& rName, const OUString& rValue ); @@ -649,7 +649,7 @@ public: // The constructor prints a start tag that has the common attributes // of the XMLExport instance attached. SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix, - const sal_Char *pName, + const char *pName, bool bIgnWSOutside, bool bIgnWSInside ); SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix, const OUString& rName, diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx index baf01aa2eadd..ecb9f2145d1e 100644 --- a/include/xmloff/xmlprmap.hxx +++ b/include/xmloff/xmlprmap.hxx @@ -105,7 +105,7 @@ public: /** searches for an entry that matches the given api name, namespace and local name or -1 if nothing found */ sal_Int32 FindEntryIndex( - const sal_Char* sApiName, sal_uInt16 nNameSpace, const OUString& sXMLName ) const; + const char* sApiName, sal_uInt16 nNameSpace, const OUString& sXMLName ) const; /** searches for an entry that matches the given ContextId or gives -1 if nothing found */ sal_Int32 FindEntryIndex( const sal_Int16 nContextId ) const; 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; diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 0c02bdf1c466..975e338bf5c2 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -327,7 +327,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin { sal_uInt32 pos = 0; sal_uInt64 nRead; - sal_Char buffer[2048]; + char buffer[2048]; sal_Unicode lineBuffer[1028]; OUStringBuffer fileContent; @@ -600,7 +600,7 @@ void KeywordInfo::KeywordElement::init( Databases const *pDatabases,helpdatafile listAnchor[i] = anchor[i]; helpdatafileproxy::HDFData aHDFData; - const sal_Char* pData = nullptr; + const char* pData = nullptr; if( pHdf ) { @@ -1020,7 +1020,7 @@ void Databases::setActiveText( const OUString& Module, helpdatafileproxy::HDFData aHDFData; int nSize = 0; - const sal_Char* pData = nullptr; + const char* pData = nullptr; bool bSuccess = false; if( !bFoundAsEmpty ) diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx index bf8da3ce7f04..f8a38ecd8199 100644 --- a/xmlhelp/source/cxxhelp/provider/db.cxx +++ b/xmlhelp/source/cxxhelp/provider/db.cxx @@ -166,7 +166,7 @@ bool Hdf::getValueForKey( const OString& rKey, HDFData& rValue ) sal_Int32 nRead = xIn->readBytes( aData, nValueLen ); if( nRead == nValueLen ) { - const char* pData = reinterpret_cast<const sal_Char*>(aData.getConstArray()); + const char* pData = reinterpret_cast<const char*>(aData.getConstArray()); rValue.copyToBuffer( pData, nValueLen ); bSuccess = true; } diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx index 5778a27ce6e5..f1541d5c4b87 100644 --- a/xmlhelp/source/cxxhelp/provider/services.cxx +++ b/xmlhelp/source/cxxhelp/provider/services.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star; extern "C" SAL_DLLPUBLIC_EXPORT void * ucpchelp_component_getFactory( - const sal_Char * pImplName, + const char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 6dbe5bd9a09b..2ec811373c76 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -240,7 +240,7 @@ void URLParameter::readHelpDataFile() DataBaseIterator aDbIt( *m_pDatabases, aModule, aLanguage, false ); bool bSuccess = false; - const sal_Char* pData = nullptr; + const char* pData = nullptr; helpdatafileproxy::HDFData aHDFData; OUString aExtensionPath; diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx index a4c33513d5ff..11269c4d04a2 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx @@ -35,7 +35,7 @@ namespace chelp { { public: - explicit DbtToStringConverter( const sal_Char* ptr ) + explicit DbtToStringConverter( const char* ptr ) : m_ptr( ptr ) { } @@ -86,11 +86,11 @@ namespace chelp { //fdo#82025 - use strlen instead of stored length byte to determine string len //There is a one byte length field at m_ptr[2 + m_ptr[0] + m_ptr[1 - //+ m_ptr[0]]] but by default sal_Char is signed so anything larger + //+ m_ptr[0]]] but by default char is signed so anything larger //than 127 defaults to a negative value, casting it would allow up //to 255 but instead make use of the null termination to avoid //running into a later problem with strings >= 255 - const sal_Char* pTitle = m_ptr + 3 + m_ptr[0] + static_cast<sal_Int32>(m_ptr[ 1+ static_cast<sal_Int32>(m_ptr[0]) ]); + const char* pTitle = m_ptr + 3 + m_ptr[0] + static_cast<sal_Int32>(m_ptr[ 1+ static_cast<sal_Int32>(m_ptr[0]) ]); return OUString(pTitle, rtl_str_getLength(pTitle), RTL_TEXTENCODING_UTF8); } @@ -98,7 +98,7 @@ namespace chelp { private: - const sal_Char* m_ptr; + const char* m_ptr; }; diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx index aa1c3cbe2c74..cfe1a51ee369 100644 --- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx +++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx @@ -43,7 +43,7 @@ void print_rtl_OUString( const OUString bla ) { OString bluber = OString( bla.getStr(),bla.getLength(),RTL_TEXTENCODING_UTF8 ); char* bluberChr = new char[ 1+bluber.getLength() ]; - const sal_Char* jux = bluber.getStr(); + const char* jux = bluber.getStr(); for( int i = 0; i < bluber.getLength(); ++i ) bluberChr[i] = jux[i]; diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx index 0c7f6e9aa8ca..4e1c18958fbd 100644 --- a/xmloff/inc/MultiPropertySetHelper.hxx +++ b/xmloff/inc/MultiPropertySetHelper.hxx @@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { /** * The MultiPropertySetHelper performs the following functions: * - * Given a list of property names (as sal_Char** or OUString*), it can + * Given a list of property names (as char** or OUString*), it can * query an XMultiPropertySet (or XPropertySet) which of these properties * it supports (method hasProperties(...)). The properties *MUST* be * sorted alphabetically. @@ -79,7 +79,7 @@ class MultiPropertySetHelper public: - MultiPropertySetHelper( const sal_Char** pNames ); + MultiPropertySetHelper( const char** pNames ); ~MultiPropertySetHelper(); diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx index 638c76561091..0144a590a806 100644 --- a/xmloff/inc/animations.hxx +++ b/xmloff/inc/animations.hxx @@ -46,7 +46,7 @@ extern const SvXMLEnumMapEntry<sal_Int16> aAnimations_EnumMap_Command[]; struct ImplAttributeNameConversion { token::XMLTokenEnum const meXMLToken; - const sal_Char* mpAPIName; + const char* mpAPIName; }; extern const struct ImplAttributeNameConversion* getAnimationAttributeNamesConversionList(); diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 6d2c78064c90..0ca05a051c4e 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -126,7 +126,7 @@ public: XMLTextFieldImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper - const sal_Char* pService, /// name of SO API service + const char* pService, /// name of SO API service sal_uInt16 nPrfx, /// namespace prefix const OUString& rLocalName); /// element name w/o prefix @@ -405,7 +405,7 @@ protected: /// protected constructor: only for subclasses XMLDatabaseFieldImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, - const sal_Char* pServiceName, + const char* pServiceName, sal_uInt16 nPrfx, const OUString& sLocalName, bool bUseDisplay ); @@ -454,7 +454,7 @@ protected: // for use in child classes XMLDatabaseNextImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, - const sal_Char* pServiceName, + const char* pServiceName, sal_uInt16 nPrfx, const OUString& sLocalName); @@ -556,7 +556,7 @@ protected: virtual void PrepareField( const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; - static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken); + static const char* MapTokenToServiceName(sal_uInt16 nToken); }; /** import docinfo fields with date or time attributes and numberformats */ @@ -824,7 +824,7 @@ private: virtual void PrepareField( const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; - static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken); + static const char* MapTokenToServiceName(sal_uInt16 nToken); }; /** import page variable fields (<text:get-page-variable>) */ @@ -1090,7 +1090,7 @@ private: virtual void PrepareField( const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; - static const sal_Char* MapBibliographyFieldName(const OUString& sName); + static const char* MapBibliographyFieldName(const OUString& sName); }; /** Import an annotation field (<text:annotation>) */ diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index b242ead1a264..4a68674a7dfd 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -137,7 +137,7 @@ public: // for XMLTextFieldImportContext: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// text import helper - const sal_Char* pServiceName, /// name of SO API service + const char* pServiceName, /// name of SO API service sal_uInt16 nPrfx, /// namespace prefix const OUString& rLocalName, /// element name w/o prefix // config variables for PrepareField behavior: @@ -240,7 +240,7 @@ public: // for XMLTextFieldImportContext: SvXMLImport& rImport, /// see XMLTextFieldImportContext XMLTextImportHelper& rHlp, /// see XMLTextFieldImportContext - const sal_Char* pServiceName, /// see XMLTextFieldImportContext + const char* pServiceName, /// see XMLTextFieldImportContext sal_uInt16 nPrfx, /// see XMLTextFieldImportContext const OUString& rLocalName, /// see XMLTextFieldImportContext // for finding appropriate field master (see EndElement()) diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index a6018bf06ed6..3233bb85a12f 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -43,7 +43,7 @@ extern "C" classname##_getSupportedServiceNames() );\ } -XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +XMLOFF_DLLPUBLIC void * xo_component_getFactory( const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; if( pServiceManager ) diff --git a/xmloff/source/core/fasttokenhandler.cxx b/xmloff/source/core/fasttokenhandler.cxx index 7e7673bfb791..d2a44b1228a8 100644 --- a/xmloff/source/core/fasttokenhandler.cxx +++ b/xmloff/source/core/fasttokenhandler.cxx @@ -39,13 +39,13 @@ TokenMap::TokenMap() : maTokenNamesUtf8( static_cast< size_t >( XML_TOKEN_COUNT ) ), maTokenNames( static_cast< size_t >( XML_TOKEN_COUNT ) ) { - static const sal_Char* sppcTokenNames[] = + static const char* sppcTokenNames[] = { #include <tokennames.inc> "" }; - const sal_Char* const* ppcTokenName = sppcTokenNames; + const char* const* ppcTokenName = sppcTokenNames; int i = 0; for( auto& rTokenName : maTokenNamesUtf8 ) { diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 6bf39cd993cb..7ee74bb4e6ce 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -104,7 +104,7 @@ using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::io; using namespace ::xmloff::token; -sal_Char const sXML_1_2[] = "1.2"; +char const sXML_1_2[] = "1.2"; #define XML_MODEL_SERVICE_WRITER "com.sun.star.text.TextDocument" #define XML_MODEL_SERVICE_CALC "com.sun.star.sheet.SpreadsheetDocument" @@ -122,9 +122,9 @@ namespace { struct XMLServiceMapEntry_Impl { - const sal_Char *sModelService; + const char *sModelService; sal_Int32 const nModelServiceLen; - const sal_Char *sFilterService; + const char *sFilterService; sal_Int32 const nFilterServiceLen; }; @@ -910,8 +910,8 @@ SvXMLExport::EnsureNamespace(OUString const & i_rNamespace) } void SvXMLExport::AddAttributeASCII( sal_uInt16 nPrefixKey, - const sal_Char *pName, - const sal_Char *pValue ) + const char *pName, + const char *pValue ) { OUString sName( OUString::createFromAscii( pName ) ); OUString sValue( OUString::createFromAscii( pValue ) ); @@ -920,7 +920,7 @@ void SvXMLExport::AddAttributeASCII( sal_uInt16 nPrefixKey, GetNamespaceMap_().GetQNameByKey( nPrefixKey, sName ), sValue ); } -void SvXMLExport::AddAttribute( sal_uInt16 nPrefixKey, const sal_Char *pName, +void SvXMLExport::AddAttribute( sal_uInt16 nPrefixKey, const char *pName, const OUString& rValue ) { OUString sName( OUString::createFromAscii( pName ) ); @@ -1320,7 +1320,7 @@ ErrCode SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) } // office:version = ... - const sal_Char* pVersion = nullptr; + const char* pVersion = nullptr; switch (getDefaultVersion()) { case SvtSaveOptions::ODFVER_LATEST: pVersion = sXML_1_2; break; @@ -2406,7 +2406,7 @@ void SvXMLElementExport::StartElement( SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefixKey, - const sal_Char *pLName, + const char *pLName, bool bIWSOutside, bool bIWSInside ) : mrExport( rExp ) diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 86344f0d05b9..62ddf00a081d 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -30,7 +30,7 @@ namespace xmloff { namespace token { struct XMLTokenEntry { sal_Int32 const nLength; - const sal_Char* pChar; + const char* pChar; OUString* pOUString; #if OSL_DEBUG_LEVEL > 0 XMLTokenEnum const eToken; diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index dfff05c31f7e..b7530decf44a 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -278,7 +278,7 @@ static int lcl_gethex( int nChar ) return 0; } -static const sal_Char aHexTab[] = "0123456789abcdef"; +static const char aHexTab[] = "0123456789abcdef"; /** convert double number to string (using ::rtl::math) */ diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index e40be35d9969..d44a90832161 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -120,7 +120,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, css::uno::Reference<css::container::XIndexContainer> const & xMap, - const sal_Char* pServiceName); + const char* pServiceName); void StartElement( const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; @@ -149,7 +149,7 @@ XMLImageMapObjectContext::XMLImageMapObjectContext( sal_uInt16 nPrefix, const OUString& rLocalName, Reference<XIndexContainer> const & xMap, - const sal_Char* pServiceName) : + const char* pServiceName) : SvXMLImportContext(rImport, nPrefix, rLocalName), xImageMap(xMap), bIsActive(true), diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index d5b2c7d1d3fa..5da1b3466321 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -609,7 +609,7 @@ AnimationNodeContext::AnimationNodeContext( { sal_Int16 nPresetClass = EffectPresetClass::CUSTOM; - const sal_Char* pServiceName = nullptr; + const char* pServiceName = nullptr; sal_Int16 nNodeType = static_cast<sal_Int16>(mpHelper->getAnimationNodeTokenMap().Get( nPrfx, rLocalName )); switch( nNodeType ) diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 68854c836b68..98df3dc0c091 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1315,7 +1315,7 @@ void SdXMLExport::ImpPrepDrawPageInfos() } } -static OUString findOrAppendImpl( std::vector< OUString >& rVector, const OUString& rText, const sal_Char* pPrefix ) +static OUString findOrAppendImpl( std::vector< OUString >& rVector, const OUString& rText, const char* pPrefix ) { // search rVector if there is already a string that equals rText auto aIter = std::find(rVector.begin(), rVector.end(), rText); @@ -1330,7 +1330,7 @@ static OUString findOrAppendImpl( std::vector< OUString >& rVector, const OUStri return OUString::createFromAscii( pPrefix ) + OUString::number( nIndex ); } -static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, const OUString& rText, bool bFixed, sal_Int32 nFormat, const sal_Char* pPrefix ) +static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, const OUString& rText, bool bFixed, sal_Int32 nFormat, const char* pPrefix ) { // search rVector if there is already a DateTimeDeclImpl with rText,bFixed and nFormat auto aIter = std::find_if(rVector.begin(), rVector.end(), @@ -1356,9 +1356,9 @@ static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, cons return OUString::createFromAscii( pPrefix ) + OUString::number( nIndex ); } -static const sal_Char gpStrHeaderTextPrefix[] = "hdr"; -static const sal_Char gpStrFooterTextPrefix[] = "ftr"; -static const sal_Char gpStrDateTimeTextPrefix[] = "dtd"; +static const char gpStrHeaderTextPrefix[] = "hdr"; +static const char gpStrFooterTextPrefix[] = "ftr"; +static const char gpStrDateTimeTextPrefix[] = "dtd"; HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( const Reference<XDrawPage>& xDrawPage ) { diff --git a/xmloff/source/forms/controlelement.cxx b/xmloff/source/forms/controlelement.cxx index 72a92d25c66a..e7fc96e71e97 100644 --- a/xmloff/source/forms/controlelement.cxx +++ b/xmloff/source/forms/controlelement.cxx @@ -23,7 +23,7 @@ namespace xmloff { //= OControlElement - const sal_Char* OControlElement::getElementName(ElementType _eType) + const char* OControlElement::getElementName(ElementType _eType) { switch (_eType) { diff --git a/xmloff/source/forms/controlelement.hxx b/xmloff/source/forms/controlelement.hxx index 0ddbed419310..8a28ecaa3155 100644 --- a/xmloff/source/forms/controlelement.hxx +++ b/xmloff/source/forms/controlelement.hxx @@ -72,7 +72,7 @@ namespace xmloff @param _eType the element type */ - static const sal_Char* getElementName(ElementType _eType); + static const char* getElementName(ElementType _eType); }; } // namespace xmloff diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 95e6cffadaf6..12e57e4228f9 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -139,7 +139,7 @@ namespace xmloff exportEvents(); } - void OElementExport::implStartElement(const sal_Char* _pName) + void OElementExport::implStartElement(const char* _pName) { m_pXMLElement = std::make_unique<SvXMLElementExport>(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, _pName, true, true); } @@ -732,8 +732,8 @@ namespace xmloff if ((CCAFlags::CurrentValue | CCAFlags::Value) & m_nIncludeCommon) { - const sal_Char* pCurrentValuePropertyName = nullptr; - const sal_Char* pValuePropertyName = nullptr; + const char* pCurrentValuePropertyName = nullptr; + const char* pValuePropertyName = nullptr; // get the property names getValuePropertyNames(m_eType, m_nClassId, pCurrentValuePropertyName, pValuePropertyName); @@ -741,7 +741,7 @@ namespace xmloff // add the attributes if necessary and possible if (pCurrentValuePropertyName && (CCAFlags::CurrentValue & m_nIncludeCommon)) { - static const sal_Char* pCurrentValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::CurrentValue); + static const char* pCurrentValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::CurrentValue); // don't export the current-value if this value originates from a data binding // #i26944# if ( controlHasActiveDataBinding() ) @@ -759,7 +759,7 @@ namespace xmloff if (pValuePropertyName && (CCAFlags::Value & m_nIncludeCommon)) { - static const sal_Char* pValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::Value); + static const char* pValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::Value); static const sal_uInt16 nValueAttributeNamespaceKey = OAttributeMetaData::getCommonControlAttributeNamespace(CCAFlags::Value); exportGenericPropertyAttribute( nValueAttributeNamespaceKey, @@ -1153,8 +1153,8 @@ namespace xmloff // need to export the min value and the max value as attributes // It depends on the real type (FormComponentType) of the control, which properties hold these // values - const sal_Char* pMinValuePropertyName = nullptr; - const sal_Char* pMaxValuePropertyName = nullptr; + const char* pMinValuePropertyName = nullptr; + const char* pMaxValuePropertyName = nullptr; getValueLimitPropertyNames(m_nClassId, pMinValuePropertyName, pMaxValuePropertyName); OSL_ENSURE((nullptr == pMinValuePropertyName) == (SCAFlags::NONE == (SCAFlags::MinValue & m_nIncludeSpecial)), @@ -1163,8 +1163,8 @@ namespace xmloff "OControlExport::exportCommonControlAttributes: no property found for the max value attribute!"); // add the two attributes - static const sal_Char* pMinValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCAFlags::MinValue); - static const sal_Char* pMaxValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCAFlags::MaxValue); + static const char* pMinValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCAFlags::MinValue); + static const char* pMaxValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCAFlags::MaxValue); static const sal_uInt16 nMinValueNamespaceKey = OAttributeMetaData::getSpecialAttributeNamespace(SCAFlags::MinValue); static const sal_uInt16 nMaxValueNamespaceKey = OAttributeMetaData::getSpecialAttributeNamespace(SCAFlags::MaxValue); @@ -1361,10 +1361,10 @@ namespace xmloff } } - void OControlExport::implStartElement(const sal_Char* _pName) + void OControlExport::implStartElement(const char* _pName) { // before we let the base class start it's outer element, we add a wrapper element - const sal_Char *pOuterElementName = getOuterXMLElementName(); + const char *pOuterElementName = getOuterXMLElementName(); if (pOuterElementName) m_pOuterElement = std::make_unique<SvXMLElementExport>( m_rContext.getGlobalContext(), @@ -1388,12 +1388,12 @@ namespace xmloff m_pOuterElement.reset(); } - const sal_Char* OControlExport::getOuterXMLElementName() const + const char* OControlExport::getOuterXMLElementName() const { return nullptr; } - const sal_Char* OControlExport::getXMLElementName() const + const char* OControlExport::getXMLElementName() const { return getElementName(m_eType); } @@ -1953,7 +1953,7 @@ namespace xmloff } - const sal_Char* OColumnExport::getOuterXMLElementName() const + const char* OColumnExport::getOuterXMLElementName() const { return "column"; } @@ -2002,7 +2002,7 @@ namespace xmloff OSL_ENSURE(m_xProps.is(), "OFormExport::OFormExport: invalid arguments!"); } - const sal_Char* OFormExport::getXMLElementName() const + const char* OFormExport::getXMLElementName() const { return "form"; } diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index 58b66c4f3604..9095aa9a69b3 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -56,7 +56,7 @@ namespace xmloff protected: /// get the name of the XML element - virtual const sal_Char* getXMLElementName() const = 0; + virtual const char* getXMLElementName() const = 0; /// examine the element we're exporting virtual void examine(); /// export the attributes @@ -73,7 +73,7 @@ namespace xmloff virtual void exportServiceNameAttribute(); /// start the XML element - virtual void implStartElement(const sal_Char* _pName); + virtual void implStartElement(const char* _pName); /// ends the XML element virtual void implEndElement(); @@ -123,16 +123,16 @@ namespace xmloff protected: /// start the XML element - virtual void implStartElement(const sal_Char* _pName) override; + virtual void implStartElement(const char* _pName) override; /// ends the XML element virtual void implEndElement() override; /// get the name of the outer XML element - virtual const sal_Char* getOuterXMLElementName() const; + virtual const char* getOuterXMLElementName() const; // get the name of the XML element - virtual const sal_Char* getXMLElementName() const override; + virtual const char* getXMLElementName() const override; /** examine the control. Some kind of CtorImpl. */ @@ -275,7 +275,7 @@ namespace xmloff protected: // OControlExport overridables - virtual const sal_Char* getOuterXMLElementName() const override; + virtual const char* getOuterXMLElementName() const override; virtual void exportServiceNameAttribute() override; virtual void exportAttributes() override; @@ -303,7 +303,7 @@ namespace xmloff ); protected: - virtual const sal_Char* getXMLElementName() const override; + virtual const char* getXMLElementName() const override; virtual void exportSubTags() override; virtual void exportAttributes() override; }; diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 1e3281750996..25824d8e08c6 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -571,7 +571,7 @@ namespace xmloff m_rEventManager.registerEvents(m_xElement, _rEvents); } - void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault) + void OElementImport::simulateDefaultedAttribute(const char* _pAttributeName, const OUString& _rPropertyName, const char* _pAttributeDefault) { OSL_ENSURE( m_xInfo.is(), "OPropertyImport::simulateDefaultedAttribute: the component should be more gossipy about it's properties!" ); @@ -602,7 +602,7 @@ namespace xmloff OUString OControlImport::determineDefaultServiceName() const { - const sal_Char* pServiceName = nullptr; + const char* pServiceName = nullptr; switch ( m_eElementType ) { case OControlElement::TEXT: @@ -639,7 +639,7 @@ namespace xmloff bool OControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { - static const sal_Char* pLinkedCellAttributeName = OAttributeMetaData::getBindingAttributeName(BAFlags::LinkedCell); + static const char* pLinkedCellAttributeName = OAttributeMetaData::getBindingAttributeName(BAFlags::LinkedCell); if (IsXMLToken(_rLocalName, XML_ID)) { // it's the control id @@ -690,11 +690,11 @@ namespace xmloff if ( OElementImport::tryGenericAttribute( _nNamespaceKey, _rLocalName, _rValue ) ) return true; - static const sal_Char* pValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::Value); - static const sal_Char* pCurrentValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::CurrentValue); - static const sal_Char* pMinValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCAFlags::MinValue); - static const sal_Char* pMaxValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCAFlags::MaxValue); - static const sal_Char* pRepeatDelayAttributeName = OAttributeMetaData::getSpecialAttributeName( SCAFlags::RepeatDelay ); + static const char* pValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::Value); + static const char* pCurrentValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::CurrentValue); + static const char* pMinValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCAFlags::MinValue); + static const char* pMaxValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCAFlags::MaxValue); + static const char* pRepeatDelayAttributeName = OAttributeMetaData::getSpecialAttributeName( SCAFlags::RepeatDelay ); sal_Int32 nHandle = -1; if ( _rLocalName.equalsAscii( pValueAttributeName ) ) @@ -767,10 +767,10 @@ namespace xmloff return; } - const sal_Char* pValueProperty = nullptr; - const sal_Char* pCurrentValueProperty = nullptr; - const sal_Char* pMinValueProperty = nullptr; - const sal_Char* pMaxValueProperty = nullptr; + const char* pValueProperty = nullptr; + const char* pCurrentValueProperty = nullptr; + const char* pMinValueProperty = nullptr; + const char* pMaxValueProperty = nullptr; bool bRetrievedValues = false; bool bRetrievedValueLimits = false; @@ -928,8 +928,8 @@ namespace xmloff OSL_FAIL( "OControlImport::EndElement: caught an exception while retrieving the class id!" ); } - const sal_Char* pValueProperty = nullptr; - const sal_Char* pDefaultValueProperty = nullptr; + const char* pValueProperty = nullptr; + const char* pDefaultValueProperty = nullptr; getRuntimeValuePropertyNames(m_eElementType, nClassId, pValueProperty, pDefaultValueProperty); if ( pDefaultValueProperty && pValueProperty ) { @@ -1060,7 +1060,7 @@ namespace xmloff bool OImagePositionImport::handleAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ) { - static const sal_Char* s_pImageDataAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::ImageData); + static const char* s_pImageDataAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::ImageData); if (_rLocalName.equalsAscii(s_pImageDataAttributeName)) { @@ -1183,8 +1183,8 @@ namespace xmloff { // need special handling for the State & CurrentState properties: // they're stored as booleans, but expected to be int16 properties - static const sal_Char* pCurrentSelectedAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::CurrentSelected); - static const sal_Char* pSelectedAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::Selected); + static const char* pCurrentSelectedAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::CurrentSelected); + static const char* pSelectedAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCAFlags::Selected); if ( _rLocalName.equalsAscii( pCurrentSelectedAttributeName ) || _rLocalName.equalsAscii( pSelectedAttributeName ) ) @@ -1217,8 +1217,8 @@ namespace xmloff bool OURLReferenceImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { - static const sal_Char* s_pTargetLocationAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCAFlags::TargetLocation ); - static const sal_Char* s_pImageDataAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCAFlags::ImageData ); + static const char* s_pTargetLocationAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCAFlags::TargetLocation ); + static const char* s_pImageDataAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCAFlags::ImageData ); // need to make the URL absolute if // * it's the image-data attribute @@ -1587,7 +1587,7 @@ namespace xmloff bool OListAndComboImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { - static const sal_Char* pListSourceAttributeName = OAttributeMetaData::getDatabaseAttributeName(DAFlags::ListSource); + static const char* pListSourceAttributeName = OAttributeMetaData::getDatabaseAttributeName(DAFlags::ListSource); if ( _rLocalName.equalsAscii(pListSourceAttributeName) ) { PropertyValue aListSource; diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index aa7cdfcc3d52..b0e8f3ce1407 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -145,7 +145,7 @@ namespace xmloff property value as if the attribute was encountered.</p> @see encounteredAttribute */ - void simulateDefaultedAttribute(const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault); + void simulateDefaultedAttribute(const char* _pAttributeName, const OUString& _rPropertyName, const char* _pAttributeDefault); /** to be called from within handleAttribute, checks whether the given attribute is covered by our generic attribute handler mechanisms @@ -564,7 +564,7 @@ namespace xmloff protected: OContainerImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, - const sal_Char* _pWrapperElementName) + const char* _pWrapperElementName) :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) ,m_sWrapperElementName(OUString::createFromAscii(_pWrapperElementName)) { diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 75c6f5f17805..54046cac8085 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -32,7 +32,7 @@ namespace xmloff using namespace ::com::sun::star::beans; //= OAttributeMetaData - const sal_Char* OAttributeMetaData::getCommonControlAttributeName(CCAFlags _nId) + const char* OAttributeMetaData::getCommonControlAttributeName(CCAFlags _nId) { switch (_nId) { @@ -78,7 +78,7 @@ namespace xmloff return XML_NAMESPACE_FORM; } - const sal_Char* OAttributeMetaData::getFormAttributeName(FormAttributes _eAttrib) + const char* OAttributeMetaData::getFormAttributeName(FormAttributes _eAttrib) { switch (_eAttrib) { @@ -115,7 +115,7 @@ namespace xmloff return XML_NAMESPACE_FORM; } - const sal_Char* OAttributeMetaData::getDatabaseAttributeName(DAFlags _nId) + const char* OAttributeMetaData::getDatabaseAttributeName(DAFlags _nId) { switch (_nId) { @@ -131,7 +131,7 @@ namespace xmloff return ""; } - const sal_Char* OAttributeMetaData::getBindingAttributeName(BAFlags _nId) + const char* OAttributeMetaData::getBindingAttributeName(BAFlags _nId) { switch (_nId) { @@ -144,7 +144,7 @@ namespace xmloff return ""; } - const sal_Char* OAttributeMetaData::getSpecialAttributeName(SCAFlags _nId) + const char* OAttributeMetaData::getSpecialAttributeName(SCAFlags _nId) { switch (_nId) { @@ -182,7 +182,7 @@ namespace xmloff return XML_NAMESPACE_FORM; } - const sal_Char* OAttributeMetaData::getOfficeFormsAttributeName(OfficeFormsAttributes _eAttrib) + const char* OAttributeMetaData::getOfficeFormsAttributeName(OfficeFormsAttributes _eAttrib) { switch (_eAttrib) { @@ -213,13 +213,13 @@ namespace xmloff } void OAttribute2Property::addStringProperty( - const sal_Char* _pAttributeName, const OUString& _rPropertyName) + const char* _pAttributeName, const OUString& _rPropertyName) { implAdd(_pAttributeName, _rPropertyName, ::cppu::UnoType<OUString>::get()); } void OAttribute2Property::addBooleanProperty( - const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const char* _pAttributeName, const OUString& _rPropertyName, const bool /*_bAttributeDefault*/, const bool _bInverseSemantics) { AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, cppu::UnoType<bool>::get()); @@ -227,19 +227,19 @@ namespace xmloff } void OAttribute2Property::addInt16Property( - const sal_Char* _pAttributeName, const OUString& _rPropertyName) + const char* _pAttributeName, const OUString& _rPropertyName) { implAdd(_pAttributeName, _rPropertyName, ::cppu::UnoType<sal_Int16>::get()); } void OAttribute2Property::addInt32Property( - const sal_Char* _pAttributeName, const OUString& _rPropertyName) + const char* _pAttributeName, const OUString& _rPropertyName) { implAdd( _pAttributeName, _rPropertyName, ::cppu::UnoType<sal_Int32>::get() ); } void OAttribute2Property::addEnumPropertyImpl( - const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const char* _pAttributeName, const OUString& _rPropertyName, const SvXMLEnumMapEntry<sal_uInt16>* _pValueMap, const css::uno::Type* _pType) { @@ -249,7 +249,7 @@ namespace xmloff } OAttribute2Property::AttributeAssignment& OAttribute2Property::implAdd( - const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const char* _pAttributeName, const OUString& _rPropertyName, const css::uno::Type& _rType) { OSL_ENSURE(m_aKnownProperties.end() == m_aKnownProperties.find(OUString::createFromAscii(_pAttributeName)), diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index 285ba25fb407..464cffa83f77 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -182,7 +182,7 @@ namespace xmloff @param _nId the id of the attribute. Has to be one of the CCA_* constants. */ - static const sal_Char* getCommonControlAttributeName(CCAFlags _nId); + static const char* getCommonControlAttributeName(CCAFlags _nId); /** calculates the xml namespace key to use for a common control attribute @param _nId @@ -194,7 +194,7 @@ namespace xmloff @param _eAttrib enum value specifying the attribute */ - static const sal_Char* getFormAttributeName(FormAttributes _eAttrib); + static const char* getFormAttributeName(FormAttributes _eAttrib); /** calculates the xml namespace key to use for an attribute of a form xml representation @param _eAttrib @@ -206,7 +206,7 @@ namespace xmloff @param _nId the id of the attribute. Has to be one of the DA_* constants. */ - static const sal_Char* getDatabaseAttributeName(DAFlags _nId); + static const char* getDatabaseAttributeName(DAFlags _nId); /** calculates the xml namespace key to use for a database attribute. @param _nId @@ -222,13 +222,13 @@ namespace xmloff @param _nId the id of the attribute. Has to be one of the SCA_* constants. */ - static const sal_Char* getSpecialAttributeName(SCAFlags _nId); + static const char* getSpecialAttributeName(SCAFlags _nId); /** calculates the xml attribute representation of a binding attribute. @param _nId the id of the attribute. Has to be one of the BA_* constants. */ - static const sal_Char* getBindingAttributeName(BAFlags _nId); + static const char* getBindingAttributeName(BAFlags _nId); /** calculates the xml namespace key to use for a binding attribute. @param _nId @@ -250,7 +250,7 @@ namespace xmloff @param _nId the id of the attribute */ - static const sal_Char* getOfficeFormsAttributeName(OfficeFormsAttributes _eAttrib); + static const char* getOfficeFormsAttributeName(OfficeFormsAttributes _eAttrib); /** calculates the xml namedspace key of an attribute of the office:forms element @param _nId @@ -313,7 +313,7 @@ namespace xmloff the name of the property assigned to the attribute */ void addStringProperty( - const sal_Char* _pAttributeName, const OUString& _rPropertyName); + const char* _pAttributeName, const OUString& _rPropertyName); /** add an attribute assignment referring to a boolean property to the map @@ -328,7 +328,7 @@ namespace xmloff if <FALSE/>, the attribute value is used as property value directly */ void addBooleanProperty( - const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const char* _pAttributeName, const OUString& _rPropertyName, const bool _bAttributeDefault, const bool _bInverseSemantics = false); /** add an attribute assignment referring to an int16 property to the map @@ -339,7 +339,7 @@ namespace xmloff the name of the property assigned to the attribute */ void addInt16Property( - const sal_Char* _pAttributeName, const OUString& _rPropertyName); + const char* _pAttributeName, const OUString& _rPropertyName); /** add an attribute assignment referring to an int32 property to the map @@ -349,7 +349,7 @@ namespace xmloff the name of the property assigned to the attribute */ void addInt32Property( - const sal_Char* _pAttributeName, const OUString& _rPropertyName ); + const char* _pAttributeName, const OUString& _rPropertyName ); /** add an attribute assignment referring to an enum property to the map @@ -364,7 +364,7 @@ namespace xmloff */ template<typename EnumT> void addEnumProperty( - const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const char* _pAttributeName, const OUString& _rPropertyName, const SvXMLEnumMapEntry<EnumT>* _pValueMap, const css::uno::Type* _pType = nullptr) { @@ -374,12 +374,12 @@ namespace xmloff private: void addEnumPropertyImpl( - const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const char* _pAttributeName, const OUString& _rPropertyName, const SvXMLEnumMapEntry<sal_uInt16>* _pValueMap, const css::uno::Type* _pType); /// some common code for the various add*Property methods AttributeAssignment& implAdd( - const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const char* _pAttributeName, const OUString& _rPropertyName, const css::uno::Type& _rType); }; } // namespace xmloff diff --git a/xmloff/source/forms/logging.cxx b/xmloff/source/forms/logging.cxx index 9f887ab135ff..6c2bb5922469 100644 --- a/xmloff/source/forms/logging.cxx +++ b/xmloff/source/forms/logging.cxx @@ -24,7 +24,7 @@ namespace xmloff #ifdef TIMELOG //= OStackedLogging - void OStackedLogging::enterContext( const sal_Char* _pContextName ) + void OStackedLogging::enterContext( const char* _pContextName ) { m_aLogger.push( new ::rtl::Logfile( _pContextName ) ); } diff --git a/xmloff/source/forms/logging.hxx b/xmloff/source/forms/logging.hxx index 03007adc7141..bb5e6b9c1a2c 100644 --- a/xmloff/source/forms/logging.hxx +++ b/xmloff/source/forms/logging.hxx @@ -40,7 +40,7 @@ namespace xmloff OStackedLogging() { } protected: - void enterContext( const sal_Char* _pContextName ); + void enterContext( const char* _pContextName ); void leaveTopContext( ); }; diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index ca507c0d675a..383e0b09e7df 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -235,7 +235,7 @@ namespace xmloff } } - void OPropertyExport::exportStringPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, + void OPropertyExport::exportStringPropertyAttribute( const sal_uInt16 _nNamespaceKey, const char* _pAttributeName, const OUString& _rPropertyName ) { DBG_CHECK_PROPERTY( _rPropertyName, OUString ); @@ -257,7 +257,7 @@ namespace xmloff exportedProperty( _rPropertyName ); } - void OPropertyExport::exportBooleanPropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, + void OPropertyExport::exportBooleanPropertyAttribute(const sal_uInt16 _nNamespaceKey, const char* _pAttributeName, const OUString& _rPropertyName, const BoolAttrFlags _nBooleanAttributeFlags) { DBG_CHECK_PROPERTY_NO_TYPE( _rPropertyName ); @@ -295,7 +295,7 @@ namespace xmloff exportedProperty( _rPropertyName ); } - void OPropertyExport::exportInt16PropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, + void OPropertyExport::exportInt16PropertyAttribute(const sal_uInt16 _nNamespaceKey, const char* _pAttributeName, const OUString& _rPropertyName, const sal_Int16 _nDefault, bool force) { DBG_CHECK_PROPERTY( _rPropertyName, sal_Int16 ); @@ -315,7 +315,7 @@ namespace xmloff exportedProperty( _rPropertyName ); } - void OPropertyExport::exportInt32PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, + void OPropertyExport::exportInt32PropertyAttribute( const sal_uInt16 _nNamespaceKey, const char* _pAttributeName, const OUString& _rPropertyName, const sal_Int32 _nDefault ) { DBG_CHECK_PROPERTY( _rPropertyName, sal_Int32 ); @@ -336,7 +336,7 @@ namespace xmloff } void OPropertyExport::exportEnumPropertyAttributeImpl( - const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, + const sal_uInt16 _nNamespaceKey, const char* _pAttributeName, const OUString &rPropertyName, const SvXMLEnumMapEntry<sal_uInt16>* _pValueMap, const sal_uInt16 _nDefault, const bool _bVoidDefault) { @@ -441,7 +441,7 @@ namespace xmloff } void OPropertyExport::exportGenericPropertyAttribute( - const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName, const sal_Char* _pPropertyName) + const sal_uInt16 _nAttributeNamespaceKey, const char* _pAttributeName, const char* _pPropertyName) { DBG_CHECK_PROPERTY_ASCII_NO_TYPE( _pPropertyName ); @@ -468,7 +468,7 @@ namespace xmloff AddAttribute(_nAttributeNamespaceKey, _pAttributeName, sValue); } - void OPropertyExport::exportStringSequenceAttribute(const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName, + void OPropertyExport::exportStringSequenceAttribute(const sal_uInt16 _nAttributeNamespaceKey, const char* _pAttributeName, const OUString& _rPropertyName) { const sal_Unicode _aListSeparator = ','; @@ -625,7 +625,7 @@ namespace xmloff } #ifdef DBG_UTIL - void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue) + void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, const char* _pName, const OUString& _rValue) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(), "OPropertyExport::AddAttribute: already have such an attribute"); diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx index d79c8cdb08ca..fbf568880307 100644 --- a/xmloff/source/forms/propertyexport.hxx +++ b/xmloff/source/forms/propertyexport.hxx @@ -131,7 +131,7 @@ namespace xmloff */ void exportStringPropertyAttribute( const sal_uInt16 _nNamespaceKey, - const sal_Char* _pAttributeName, + const char* _pAttributeName, const OUString& _rPropertyName ); @@ -149,7 +149,7 @@ namespace xmloff */ void exportBooleanPropertyAttribute( const sal_uInt16 _nNamespaceKey, - const sal_Char* _pAttributeName, + const char* _pAttributeName, const OUString& _rPropertyName, const BoolAttrFlags _nBooleanAttributeFlags); @@ -172,7 +172,7 @@ namespace xmloff */ void exportInt16PropertyAttribute( const sal_uInt16 _nNamespaceKey, - const sal_Char* _pAttributeName, + const char* _pAttributeName, const OUString& _rPropertyName, const sal_Int16 _nDefault, const bool force = false); @@ -192,7 +192,7 @@ namespace xmloff */ void exportInt32PropertyAttribute( const sal_uInt16 _nNamespaceKey, - const sal_Char* _pAttributeName, + const char* _pAttributeName, const OUString& _rPropertyName, const sal_Int32 _nDefault); @@ -214,7 +214,7 @@ namespace xmloff template<typename EnumT> void exportEnumPropertyAttribute( const sal_uInt16 _nNamespaceKey, - const sal_Char* _pAttributeName, + const char* _pAttributeName, const OUString& _rPropertyName, const SvXMLEnumMapEntry<EnumT>* _pValueMap, const EnumT _nDefault, @@ -226,7 +226,7 @@ namespace xmloff } void exportEnumPropertyAttributeImpl( const sal_uInt16 _nNamespaceKey, - const sal_Char* _pAttributeName, + const char* _pAttributeName, const OUString& _rPropertyName, const SvXMLEnumMapEntry<sal_uInt16>* _pValueMap, const sal_uInt16 _nDefault, @@ -293,8 +293,8 @@ namespace xmloff */ void exportGenericPropertyAttribute( const sal_uInt16 _nAttributeNamespaceKey, - const sal_Char* _pAttributeName, - const sal_Char* _pPropertyName); + const char* _pAttributeName, + const char* _pPropertyName); /** exports a property value, which is a string sequence, as attribute @@ -317,7 +317,7 @@ namespace xmloff */ void exportStringSequenceAttribute( const sal_uInt16 _nAttributeNamespaceKey, - const sal_Char* _pAttributeName, + const char* _pAttributeName, const OUString& _rPropertyName); /** determines whether the given property is to be exported @@ -356,13 +356,13 @@ namespace xmloff static ::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const css::uno::Type& _rType); #ifdef DBG_UTIL - void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue); + void AddAttribute(sal_uInt16 _nPrefix, const char* _pName, const OUString& _rValue); void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ); void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue); void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue ); #else // in the product version, inline this, so it does not cost us extra time calling into our method - void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue) + void AddAttribute(sal_uInt16 _nPrefix, const char* _pName, const OUString& _rValue) { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _pName, _rValue); } void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ) { m_rContext.getGlobalContext().AddAttribute( _nPrefix, _rName, _rValue ); } @@ -389,7 +389,7 @@ namespace xmloff const css::uno::Type* _pType); // void dbg_implCheckProperty( -// const sal_Char* _rPropertyName, +// const char* _rPropertyName, // const css::uno::Type* _pType) // { // dbg_implCheckProperty(OUString::createFromAscii(_rPropertyName), _pType); diff --git a/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx index 1728ad7f4c90..c2f60e5a29f1 100644 --- a/xmloff/source/forms/valueproperties.cxx +++ b/xmloff/source/forms/valueproperties.cxx @@ -30,7 +30,7 @@ namespace xmloff //= OValuePropertiesMetaData void OValuePropertiesMetaData::getValuePropertyNames( OControlElement::ElementType _eType, sal_Int16 _nFormComponentType, - sal_Char const * & _rpCurrentValuePropertyName, sal_Char const * & _rpValuePropertyName) + char const * & _rpCurrentValuePropertyName, char const * & _rpValuePropertyName) { // reset the pointers in case we can't determine the property names _rpCurrentValuePropertyName = _rpValuePropertyName = nullptr; @@ -92,7 +92,7 @@ namespace xmloff } void OValuePropertiesMetaData::getValueLimitPropertyNames(sal_Int16 _nFormComponentType, - sal_Char const * & _rpMinValuePropertyName, sal_Char const * & _rpMaxValuePropertyName) + char const * & _rpMinValuePropertyName, char const * & _rpMaxValuePropertyName) { _rpMinValuePropertyName = _rpMaxValuePropertyName = nullptr; switch (_nFormComponentType) @@ -126,7 +126,7 @@ namespace xmloff void OValuePropertiesMetaData::getRuntimeValuePropertyNames( OControlElement::ElementType _eType, sal_Int16 _nFormComponentType, - sal_Char const * & _rpValuePropertyName, sal_Char const * & _rpDefaultValuePropertyName ) + char const * & _rpValuePropertyName, char const * & _rpDefaultValuePropertyName ) { // reset the pointers in case we can't determine the property names _rpValuePropertyName = _rpDefaultValuePropertyName = nullptr; diff --git a/xmloff/source/forms/valueproperties.hxx b/xmloff/source/forms/valueproperties.hxx index 37cef5fd6042..7098cebbec32 100644 --- a/xmloff/source/forms/valueproperties.hxx +++ b/xmloff/source/forms/valueproperties.hxx @@ -40,8 +40,8 @@ namespace xmloff static void getValuePropertyNames( OControlElement::ElementType _eType, sal_Int16 _nFormComponentType, - sal_Char const * & _rpCurrentValuePropertyName, - sal_Char const * & _rpValuePropertyName); + char const * & _rpCurrentValuePropertyName, + char const * & _rpValuePropertyName); /** calculate the property names for the <em>min-value</em> and the <em>max-value</em> attribute. @@ -50,8 +50,8 @@ namespace xmloff */ static void getValueLimitPropertyNames( sal_Int16 _nFormComponentType, - sal_Char const * & _rpMinValuePropertyName, - sal_Char const * & _rpMaxValuePropertyName); + char const * & _rpMinValuePropertyName, + char const * & _rpMaxValuePropertyName); /** calculate the names of the properties which, at runtime, are used for <em>value</em> and <em>default value</em>. @@ -59,8 +59,8 @@ namespace xmloff static void getRuntimeValuePropertyNames( OControlElement::ElementType _eType, sal_Int16 _nFormComponentType, - sal_Char const * & _rpValuePropertyName, - sal_Char const * & _rpDefaultValuePropertyName); + char const * & _rpValuePropertyName, + char const * & _rpDefaultValuePropertyName); }; } // namespace xmloff diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index eeb9a97882d7..44620578f1c7 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -134,7 +134,7 @@ ErrCode XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) nPos = GetNamespaceMap().GetNextKey( nPos ); } - const sal_Char* pVersion = nullptr; + const char* pVersion = nullptr; switch( getDefaultVersion() ) { case SvtSaveOptions::ODFVER_LATEST: pVersion = "1.2"; break; diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx index c7288be476ea..f8efe405c87d 100644 --- a/xmloff/source/style/MultiPropertySetHelper.cxx +++ b/xmloff/source/style/MultiPropertySetHelper.cxx @@ -34,14 +34,14 @@ using ::com::sun::star::uno::UNO_QUERY; MultiPropertySetHelper::MultiPropertySetHelper( - const sal_Char** pNames ) : + const char** pNames ) : nLength( 0 ), aPropertySequence(), aValues(), pValues( nullptr ) { // first count the elements - for( const sal_Char** pPtr = pNames; *pPtr != nullptr; pPtr++ ) + for( const char** pPtr = pNames; *pPtr != nullptr; pPtr++ ) nLength++; // allocate array and create strings diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index d5569f633eec..5b7a9dfd04be 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -400,7 +400,7 @@ void XMLStyleExport::exportDefaultStyle( } void XMLStyleExport::exportStyleFamily( - const sal_Char *pFamily, + const char *pFamily, const OUString& rXMLFamily, const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix) diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx index 58be75a638e2..ae84852baa12 100644 --- a/xmloff/source/style/xmlprmap.cxx +++ b/xmloff/source/style/xmlprmap.cxx @@ -271,7 +271,7 @@ sal_Int32 XMLPropertySetMapper::GetEntryIndex( /** searches for an entry that matches the given api name, namespace and local name or -1 if nothing found */ sal_Int32 XMLPropertySetMapper::FindEntryIndex( - const sal_Char* sApiName, + const char* sApiName, sal_uInt16 nNameSpace, const OUString& sXMLName ) const { diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index 1fe7f134193b..b17062e9cbce 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -57,7 +57,7 @@ using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::lang::IllegalArgumentException; -static const sal_Char* aIndexServiceMap[] = +static const char* aIndexServiceMap[] = { "com.sun.star.text.ContentIndex", "com.sun.star.text.DocumentIndex", diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index 66be9d7a576e..4cf8c4c9cccd 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -57,7 +57,7 @@ XMLIndexTemplateContext::XMLIndexTemplateContext( const OUString& rLocalName, const SvXMLEnumMapEntry<sal_uInt16>* pLevelNameMap, enum XMLTokenEnum eLevelAttrName, - const sal_Char** pLevelStylePropMap, + const char** pLevelStylePropMap, const bool* pAllowedTokenTypes, bool bT ) : SvXMLImportContext(rImport, nPrfx, rLocalName) @@ -161,7 +161,7 @@ void XMLIndexTemplateContext::EndElement() if (bStyleNameOK) { - const sal_Char* pStyleProperty = + const char* pStyleProperty = pOutlineLevelStylePropMap[nOutlineLevel]; DBG_ASSERT(nullptr != pStyleProperty, "need property name"); @@ -315,7 +315,7 @@ const SvXMLEnumMapEntry<sal_uInt16> aSvLevelNameTOCMap[] = { XML_TOKEN_INVALID, 0 } }; -const sal_Char* aLevelStylePropNameTOCMap[] = +const char* aLevelStylePropNameTOCMap[] = { nullptr, "ParaStyleLevel1", "ParaStyleLevel2", "ParaStyleLevel3", "ParaStyleLevel4", "ParaStyleLevel5", "ParaStyleLevel6", "ParaStyleLevel7", "ParaStyleLevel8", "ParaStyleLevel9", @@ -357,7 +357,7 @@ const SvXMLEnumMapEntry<sal_uInt16> aLevelNameAlphaMap[] = { XML_TOKEN_INVALID, 0 } }; -const sal_Char* aLevelStylePropNameAlphaMap[] = +const char* aLevelStylePropNameAlphaMap[] = { nullptr, "ParaStyleSeparator", "ParaStyleLevel1", "ParaStyleLevel2", "ParaStyleLevel3", nullptr }; @@ -404,7 +404,7 @@ const SvXMLEnumMapEntry<sal_uInt16> aLevelNameBibliographyMap[] = }; // TODO: replace with real property names, when available -const sal_Char* aLevelStylePropNameBibliographyMap[] = +const char* aLevelStylePropNameBibliographyMap[] = { nullptr, "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1", @@ -433,7 +433,7 @@ const bool aAllowedTokenTypesBibliography[] = // no name map const SvXMLEnumMapEntry<sal_uInt16>* aLevelNameTableMap = nullptr; -const sal_Char* aLevelStylePropNameTableMap[] = +const char* aLevelStylePropNameTableMap[] = { nullptr, "ParaStyleLevel1", nullptr }; const bool aAllowedTokenTypesTable[] = diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index c319aac9480c..5af747e0fad5 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -39,23 +39,23 @@ template<typename EnumT> struct SvXMLEnumMapEntry; // TOC and user defined index: extern const SvXMLEnumMapEntry<sal_uInt16> aSvLevelNameTOCMap[]; -extern const sal_Char* aLevelStylePropNameTOCMap[]; +extern const char* aLevelStylePropNameTOCMap[]; extern const bool aAllowedTokenTypesTOC[]; extern const bool aAllowedTokenTypesUser[]; // alphabetical index: extern const SvXMLEnumMapEntry<sal_uInt16> aLevelNameAlphaMap[]; -extern const sal_Char* aLevelStylePropNameAlphaMap[]; +extern const char* aLevelStylePropNameAlphaMap[]; extern const bool aAllowedTokenTypesAlpha[]; // bibliography: extern const SvXMLEnumMapEntry<sal_uInt16> aLevelNameBibliographyMap[]; -extern const sal_Char* aLevelStylePropNameBibliographyMap[]; +extern const char* aLevelStylePropNameBibliographyMap[]; extern const bool aAllowedTokenTypesBibliography[]; // table, illustration and object tables: extern const SvXMLEnumMapEntry<sal_uInt16>* aLevelNameTableMap; // NULL: no outline-level -extern const sal_Char* aLevelStylePropNameTableMap[]; +extern const char* aLevelStylePropNameTableMap[]; extern const bool aAllowedTokenTypesTable[]; @@ -71,7 +71,7 @@ class XMLIndexTemplateContext : public SvXMLImportContext const SvXMLEnumMapEntry<sal_uInt16>* pOutlineLevelNameMap; enum ::xmloff::token::XMLTokenEnum const eOutlineLevelAttrName; - const sal_Char** pOutlineLevelStylePropMap; + const char** pOutlineLevelStylePropMap; const bool* pAllowedTokenTypesMap; sal_Int32 nOutlineLevel; @@ -91,7 +91,7 @@ public: const OUString& rLocalName, const SvXMLEnumMapEntry<EnumT>* aLevelNameMap, enum ::xmloff::token::XMLTokenEnum eLevelAttrName, - const sal_Char** aLevelStylePropNameMap, + const char** aLevelStylePropNameMap, const bool* aAllowedTokenTypes, bool bTOC_=false) : XMLIndexTemplateContext(rImport,rPropSet,nPrfx,rLocalName, @@ -104,7 +104,7 @@ public: const OUString& rLocalName, const SvXMLEnumMapEntry<sal_uInt16>* aLevelNameMap, enum ::xmloff::token::XMLTokenEnum eLevelAttrName, - const sal_Char** aLevelStylePropNameMap, + const char** aLevelStylePropNameMap, const bool* aAllowedTokenTypes, bool bTOC); diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index 6ac62d6d6cb2..9b925830d59a 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -610,7 +610,7 @@ void XMLRedlineExport::WriteComment(const OUString& rComment) { // iterate over all string-pieces separated by return (0x0a) and // put each inside a paragraph element. - SvXMLTokenEnumerator aEnumerator(rComment, sal_Char(0x0a)); + SvXMLTokenEnumerator aEnumerator(rComment, char(0x0a)); OUString aSubString; while (aEnumerator.getNextToken(aSubString)) { diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index db936652cea4..aaeb9b244d21 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -910,17 +910,17 @@ static const XMLTokenEnum* aTypeLevelNameMap[] = aLevelNameBibliographyMap // bibliography }; -static const sal_Char* aLevelStylePropNameTOCMap[] = +static const char* aLevelStylePropNameTOCMap[] = { nullptr, "ParaStyleLevel1", "ParaStyleLevel2", "ParaStyleLevel3", "ParaStyleLevel4", "ParaStyleLevel5", "ParaStyleLevel6", "ParaStyleLevel7", "ParaStyleLevel8", "ParaStyleLevel9", "ParaStyleLevel10", nullptr }; -static const sal_Char* aLevelStylePropNameTableMap[] = +static const char* aLevelStylePropNameTableMap[] = { nullptr, "ParaStyleLevel1", nullptr }; -static const sal_Char* aLevelStylePropNameAlphaMap[] = +static const char* aLevelStylePropNameAlphaMap[] = { nullptr, "ParaStyleSeparator", "ParaStyleLevel1", "ParaStyleLevel2", "ParaStyleLevel3", nullptr }; -static const sal_Char* aLevelStylePropNameBibliographyMap[] = +static const char* aLevelStylePropNameBibliographyMap[] = // TODO: replace with real property names, when available { nullptr, "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1", @@ -932,7 +932,7 @@ static const sal_Char* aLevelStylePropNameBibliographyMap[] = "ParaStyleLevel1", nullptr }; -static const sal_Char** aTypeLevelStylePropNameMap[] = +static const char** aTypeLevelStylePropNameMap[] = { aLevelStylePropNameTOCMap, // TOC aLevelStylePropNameTableMap, // table index @@ -1007,7 +1007,7 @@ bool XMLSectionExport::ExportIndexTemplate( } // paragraph level style name - const sal_Char* pPropName( + const char* pPropName( aTypeLevelStylePropNameMap[eType-TEXT_SECTION_TYPE_TOC][nOutlineLevel]); OSL_ENSURE(nullptr != pPropName, "can't find property name"); if (nullptr != pPropName) diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index a1c04371666f..8c325bb4b54a 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -82,76 +82,76 @@ using namespace ::com::sun::star::container; using namespace ::xmloff::token; -static sal_Char const FIELD_SERVICE_SENDER[] = "ExtendedUser"; -static sal_Char const FIELD_SERVICE_AUTHOR[] = "Author"; -static sal_Char const FIELD_SERVICE_JUMPEDIT[] = "JumpEdit"; -static sal_Char const FIELD_SERVICE_GETEXP[] = "GetExpression"; -static sal_Char const FIELD_SERVICE_SETEXP[] = "SetExpression"; -static sal_Char const FIELD_SERVICE_USER[] = "User"; -static sal_Char const FIELD_SERVICE_INPUT[] = "Input"; -static sal_Char const FIELD_SERVICE_USERINPUT[] = "InputUser"; -static sal_Char const FIELD_SERVICE_DATETIME[] = "DateTime"; -static sal_Char const FIELD_SERVICE_PAGENUMBER[] = "PageNumber"; -static sal_Char const FIELD_SERVICE_DB_NEXT[] = "DatabaseNextSet"; -static sal_Char const FIELD_SERVICE_DB_SELECT[] = "DatabaseNumberOfSet"; -static sal_Char const FIELD_SERVICE_DB_NUMBER[] = "DatabaseSetNumber"; -static sal_Char const FIELD_SERVICE_DB_DISPLAY[] = "Database"; -static sal_Char const FIELD_SERVICE_DB_NAME[] = "DatabaseName"; -static sal_Char const FIELD_SERVICE_CONDITIONAL_TEXT[] = "ConditionalText"; -static sal_Char const FIELD_SERVICE_HIDDEN_TEXT[] = "HiddenText"; -static sal_Char const FIELD_SERVICE_HIDDEN_PARAGRAPH[] = "HiddenParagraph"; -static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR[] = "DocInfo.ChangeAuthor"; -static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR2[] = "docinfo.ChangeAuthor"; -static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME[] = "DocInfo.ChangeDateTime"; -static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME2[] = "docinfo.ChangeDateTime"; -static sal_Char const FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime"; -static sal_Char const FIELD_SERVICE_DOC_INFO_EDIT_TIME2[] = "docinfo.EditTime"; -static sal_Char const FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "DocInfo.Description"; -static sal_Char const FIELD_SERVICE_DOC_INFO_DESCRIPTION2[] = "docinfo.Description"; -static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR[] = "DocInfo.CreateAuthor"; -static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR2[] = "docinfo.CreateAuthor"; -static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME[] = "DocInfo.CreateDateTime"; -static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME2[] = "docinfo.CreateDateTime"; -static sal_Char const FIELD_SERVICE_DOC_INFO_CUSTOM[] = "DocInfo.Custom"; -static sal_Char const FIELD_SERVICE_DOC_INFO_CUSTOM2[] = "docinfo.Custom"; -static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "DocInfo.PrintAuthor"; -static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR2[] = "docinfo.PrintAuthor"; -static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME[] = "DocInfo.PrintDateTime"; -static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME2[] = "docinfo.PrintDateTime"; -static sal_Char const FIELD_SERVICE_DOC_INFO_KEY_WORDS[] = "DocInfo.KeyWords"; -static sal_Char const FIELD_SERVICE_DOC_INFO_KEY_WORDS2[] = "docinfo.KeyWords"; -static sal_Char const FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject"; -static sal_Char const FIELD_SERVICE_DOC_INFO_SUBJECT2[] = "docinfo.Subject"; -static sal_Char const FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title"; -static sal_Char const FIELD_SERVICE_DOC_INFO_TITLE2[] = "docinfo.Title"; -static sal_Char const FIELD_SERVICE_DOC_INFO_REVISION[] = "DocInfo.Revision"; -static sal_Char const FIELD_SERVICE_DOC_INFO_REVISION2[] = "docinfo.Revision"; -static sal_Char const FIELD_SERVICE_FILE_NAME[] = "FileName"; -static sal_Char const FIELD_SERVICE_CHAPTER[] = "Chapter"; -static sal_Char const FIELD_SERVICE_TEMPLATE_NAME[] = "TemplateName"; -static sal_Char const FIELD_SERVICE_PAGE_COUNT[] = "PageCount"; -static sal_Char const FIELD_SERVICE_PARAGRAPH_COUNT[] = "ParagraphCount"; -static sal_Char const FIELD_SERVICE_WORD_COUNT[] = "WordCount"; -static sal_Char const FIELD_SERVICE_CHARACTER_COUNT[] = "CharacterCount"; -static sal_Char const FIELD_SERVICE_TABLE_COUNT[] = "TableCount"; -static sal_Char const FIELD_SERVICE_GRAPHIC_COUNT[] = "GraphicObjectCount"; -static sal_Char const FIELD_SERVICE_OBJECT_COUNT[] = "EmbeddedObjectCount"; -static sal_Char const FIELD_SERVICE_REFERENCE_PAGE_SET[] = "ReferencePageSet"; -static sal_Char const FIELD_SERVICE_REFERENCE_PAGE_GET[] = "ReferencePageGet"; -static sal_Char const FIELD_SERVICE_SHEET_NAME[] = "SheetName"; -static sal_Char const FIELD_SERVICE_PAGE_NAME[] = "PageName"; -static sal_Char const FIELD_SERVICE_MACRO[] = "Macro"; -static sal_Char const FIELD_SERVICE_GET_REFERENCE[] = "GetReference"; -static sal_Char const FIELD_SERVICE_DDE[] = "DDE"; -static sal_Char const FIELD_SERVICE_URL[] = "URL"; -static sal_Char const FIELD_SERVICE_BIBLIOGRAPHY[] = "Bibliography"; -static sal_Char const FIELD_SERVICE_SCRIPT[] = "Script"; -static sal_Char const FIELD_SERVICE_ANNOTATION[] = "Annotation"; -static sal_Char const FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedCharacters"; -static sal_Char const FIELD_SERVICE_META[] = "MetadataField"; -static sal_Char const FIELD_SERVICE_MEASURE[] = "Measure"; -static sal_Char const FIELD_SERVICE_TABLE_FORMULA[] = "TableFormula"; -static sal_Char const FIELD_SERVICE_DROP_DOWN[] = "DropDown"; +static char const FIELD_SERVICE_SENDER[] = "ExtendedUser"; +static char const FIELD_SERVICE_AUTHOR[] = "Author"; +static char const FIELD_SERVICE_JUMPEDIT[] = "JumpEdit"; +static char const FIELD_SERVICE_GETEXP[] = "GetExpression"; +static char const FIELD_SERVICE_SETEXP[] = "SetExpression"; +static char const FIELD_SERVICE_USER[] = "User"; +static char const FIELD_SERVICE_INPUT[] = "Input"; +static char const FIELD_SERVICE_USERINPUT[] = "InputUser"; +static char const FIELD_SERVICE_DATETIME[] = "DateTime"; +static char const FIELD_SERVICE_PAGENUMBER[] = "PageNumber"; +static char const FIELD_SERVICE_DB_NEXT[] = "DatabaseNextSet"; +static char const FIELD_SERVICE_DB_SELECT[] = "DatabaseNumberOfSet"; +static char const FIELD_SERVICE_DB_NUMBER[] = "DatabaseSetNumber"; +static char const FIELD_SERVICE_DB_DISPLAY[] = "Database"; +static char const FIELD_SERVICE_DB_NAME[] = "DatabaseName"; +static char const FIELD_SERVICE_CONDITIONAL_TEXT[] = "ConditionalText"; +static char const FIELD_SERVICE_HIDDEN_TEXT[] = "HiddenText"; +static char const FIELD_SERVICE_HIDDEN_PARAGRAPH[] = "HiddenParagraph"; +static char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR[] = "DocInfo.ChangeAuthor"; +static char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR2[] = "docinfo.ChangeAuthor"; +static char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME[] = "DocInfo.ChangeDateTime"; +static char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME2[] = "docinfo.ChangeDateTime"; +static char const FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime"; +static char const FIELD_SERVICE_DOC_INFO_EDIT_TIME2[] = "docinfo.EditTime"; +static char const FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "DocInfo.Description"; +static char const FIELD_SERVICE_DOC_INFO_DESCRIPTION2[] = "docinfo.Description"; +static char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR[] = "DocInfo.CreateAuthor"; +static char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR2[] = "docinfo.CreateAuthor"; +static char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME[] = "DocInfo.CreateDateTime"; +static char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME2[] = "docinfo.CreateDateTime"; +static char const FIELD_SERVICE_DOC_INFO_CUSTOM[] = "DocInfo.Custom"; +static char const FIELD_SERVICE_DOC_INFO_CUSTOM2[] = "docinfo.Custom"; +static char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "DocInfo.PrintAuthor"; +static char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR2[] = "docinfo.PrintAuthor"; +static char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME[] = "DocInfo.PrintDateTime"; +static char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME2[] = "docinfo.PrintDateTime"; +static char const FIELD_SERVICE_DOC_INFO_KEY_WORDS[] = "DocInfo.KeyWords"; +static char const FIELD_SERVICE_DOC_INFO_KEY_WORDS2[] = "docinfo.KeyWords"; +static char const FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject"; +static char const FIELD_SERVICE_DOC_INFO_SUBJECT2[] = "docinfo.Subject"; +static char const FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title"; +static char const FIELD_SERVICE_DOC_INFO_TITLE2[] = "docinfo.Title"; +static char const FIELD_SERVICE_DOC_INFO_REVISION[] = "DocInfo.Revision"; +static char const FIELD_SERVICE_DOC_INFO_REVISION2[] = "docinfo.Revision"; +static char const FIELD_SERVICE_FILE_NAME[] = "FileName"; +static char const FIELD_SERVICE_CHAPTER[] = "Chapter"; +static char const FIELD_SERVICE_TEMPLATE_NAME[] = "TemplateName"; +static char const FIELD_SERVICE_PAGE_COUNT[] = "PageCount"; +static char const FIELD_SERVICE_PARAGRAPH_COUNT[] = "ParagraphCount"; +static char const FIELD_SERVICE_WORD_COUNT[] = "WordCount"; +static char const FIELD_SERVICE_CHARACTER_COUNT[] = "CharacterCount"; +static char const FIELD_SERVICE_TABLE_COUNT[] = "TableCount"; +static char const FIELD_SERVICE_GRAPHIC_COUNT[] = "GraphicObjectCount"; +static char const FIELD_SERVICE_OBJECT_COUNT[] = "EmbeddedObjectCount"; +static char const FIELD_SERVICE_REFERENCE_PAGE_SET[] = "ReferencePageSet"; +static char const FIELD_SERVICE_REFERENCE_PAGE_GET[] = "ReferencePageGet"; +static char const FIELD_SERVICE_SHEET_NAME[] = "SheetName"; +static char const FIELD_SERVICE_PAGE_NAME[] = "PageName"; +static char const FIELD_SERVICE_MACRO[] = "Macro"; +static char const FIELD_SERVICE_GET_REFERENCE[] = "GetReference"; +static char const FIELD_SERVICE_DDE[] = "DDE"; +static char const FIELD_SERVICE_URL[] = "URL"; +static char const FIELD_SERVICE_BIBLIOGRAPHY[] = "Bibliography"; +static char const FIELD_SERVICE_SCRIPT[] = "Script"; +static char const FIELD_SERVICE_ANNOTATION[] = "Annotation"; +static char const FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedCharacters"; +static char const FIELD_SERVICE_META[] = "MetadataField"; +static char const FIELD_SERVICE_MEASURE[] = "Measure"; +static char const FIELD_SERVICE_TABLE_FORMULA[] = "TableFormula"; +static char const FIELD_SERVICE_DROP_DOWN[] = "DropDown"; namespace { @@ -2533,7 +2533,7 @@ void XMLTextFieldExport::ProcessParagraphSequence( { // iterate over all string-pieces separated by return (0x0a) and // put each inside a paragraph element. - SvXMLTokenEnumerator aEnumerator(sParagraphSequence, sal_Char(0x0a)); + SvXMLTokenEnumerator aEnumerator(sParagraphSequence, char(0x0a)); OUString aSubString; while (aEnumerator.getNextToken(aSubString)) { diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 391b047dd5cb..ea18f21f7ff7 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -80,44 +80,44 @@ using namespace ::xmloff::token; // service prefix and service names -const sal_Char sAPI_textfield_prefix[] = "com.sun.star.text.TextField."; -const sal_Char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster."; -const sal_Char sAPI_presentation_prefix[] = "com.sun.star.presentation.TextField."; - -const sal_Char sAPI_date_time[] = "DateTime"; -const sal_Char sAPI_page_number[] = "PageNumber"; -const sal_Char sAPI_docinfo_change_date_time[] = "DocInfo.ChangeDateTime"; -const sal_Char sAPI_docinfo_create_date_time[] = "DocInfo.CreateDateTime"; -const sal_Char sAPI_docinfo_custom[] = "DocInfo.Custom"; -const sal_Char sAPI_docinfo_print_date_time[] = "DocInfo.PrintDateTime"; -const sal_Char sAPI_dde[] = "DDE"; -const sal_Char sAPI_url[] = "URL"; +const char sAPI_textfield_prefix[] = "com.sun.star.text.TextField."; +const char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster."; +const char sAPI_presentation_prefix[] = "com.sun.star.presentation.TextField."; + +const char sAPI_date_time[] = "DateTime"; +const char sAPI_page_number[] = "PageNumber"; +const char sAPI_docinfo_change_date_time[] = "DocInfo.ChangeDateTime"; +const char sAPI_docinfo_create_date_time[] = "DocInfo.CreateDateTime"; +const char sAPI_docinfo_custom[] = "DocInfo.Custom"; +const char sAPI_docinfo_print_date_time[] = "DocInfo.PrintDateTime"; +const char sAPI_dde[] = "DDE"; +const char sAPI_url[] = "URL"; // property names -const sal_Char sAPI_is_fixed[] = "IsFixed"; -const sal_Char sAPI_content[] = "Content"; -const sal_Char sAPI_author[] = "Author"; -const sal_Char sAPI_hint[] = "Hint"; -const sal_Char sAPI_name[] = "Name"; -const sal_Char sAPI_sub_type[] = "SubType"; -const sal_Char sAPI_date_time_value[] = "DateTimeValue"; -const sal_Char sAPI_number_format[] = "NumberFormat"; -const sal_Char sAPI_numbering_type[] = "NumberingType"; -const sal_Char sAPI_offset[] = "Offset"; -const sal_Char sAPI_condition[] = "Condition"; -const sal_Char sAPI_set_number[] = "SetNumber"; -const sal_Char sAPI_file_format[] = "FileFormat"; -const sal_Char sAPI_is_date[] = "IsDate"; -const sal_Char sAPI_current_presentation[] = "CurrentPresentation"; -const sal_Char sAPI_is_hidden[] = "IsHidden"; -const sal_Char sAPI_is_fixed_language[] = "IsFixedLanguage"; - -const sal_Char sAPI_true[] = "TRUE"; +const char sAPI_is_fixed[] = "IsFixed"; +const char sAPI_content[] = "Content"; +const char sAPI_author[] = "Author"; +const char sAPI_hint[] = "Hint"; +const char sAPI_name[] = "Name"; +const char sAPI_sub_type[] = "SubType"; +const char sAPI_date_time_value[] = "DateTimeValue"; +const char sAPI_number_format[] = "NumberFormat"; +const char sAPI_numbering_type[] = "NumberingType"; +const char sAPI_offset[] = "Offset"; +const char sAPI_condition[] = "Condition"; +const char sAPI_set_number[] = "SetNumber"; +const char sAPI_file_format[] = "FileFormat"; +const char sAPI_is_date[] = "IsDate"; +const char sAPI_current_presentation[] = "CurrentPresentation"; +const char sAPI_is_hidden[] = "IsHidden"; +const char sAPI_is_fixed_language[] = "IsFixedLanguage"; + +const char sAPI_true[] = "TRUE"; XMLTextFieldImportContext::XMLTextFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, - const sal_Char* pService, + const char* pService, sal_uInt16 nPrefix, const OUString& rElementName) : SvXMLImportContext( rImport, nPrefix, rElementName ) , rTextImportHelper(rHlp) @@ -1143,7 +1143,7 @@ static const OUStringLiteral gsPropertyIsVisible("IsVisible"); XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, - const sal_Char* pServiceName, sal_uInt16 nPrfx, + const char* pServiceName, sal_uInt16 nPrfx, const OUString& sLocalName, bool bUseDisply) : XMLTextFieldImportContext(rImport, rHlp, pServiceName, nPrfx, sLocalName) , nCommandType( sdb::CommandType::TABLE ) @@ -1291,7 +1291,7 @@ void XMLDatabaseNameImportContext::ProcessAttribute( XMLDatabaseNextImportContext::XMLDatabaseNextImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, - const sal_Char* pServiceName, sal_uInt16 nPrfx, + const char* pServiceName, sal_uInt16 nPrfx, const OUString& sLocalName) : XMLDatabaseFieldImportContext(rImport, rHlp, pServiceName, nPrfx, sLocalName, false), @@ -1535,10 +1535,10 @@ void XMLSimpleDocInfoImportContext::PrepareField( } } -const sal_Char* XMLSimpleDocInfoImportContext::MapTokenToServiceName( +const char* XMLSimpleDocInfoImportContext::MapTokenToServiceName( sal_uInt16 nToken) { - const sal_Char* pServiceName = nullptr; + const char* pServiceName = nullptr; switch(nToken) { @@ -2272,10 +2272,10 @@ void XMLCountFieldImportContext::PrepareField( } } -const sal_Char* XMLCountFieldImportContext::MapTokenToServiceName( +const char* XMLCountFieldImportContext::MapTokenToServiceName( sal_uInt16 nToken) { - const sal_Char* pServiceName = nullptr; + const char* pServiceName = nullptr; switch (nToken) { @@ -3132,10 +3132,10 @@ void XMLBibliographyFieldImportContext::PrepareField( xPropertySet->setPropertyValue("Fields", Any(aValueSequence)); } -const sal_Char* XMLBibliographyFieldImportContext::MapBibliographyFieldName( +const char* XMLBibliographyFieldImportContext::MapBibliographyFieldName( const OUString& sName) { - const sal_Char* pName = nullptr; + const char* pName = nullptr; if (IsXMLToken(sName, XML_IDENTIFIER)) { @@ -3488,7 +3488,7 @@ void XMLAnnotationImportContext::PrepareField( if ( sBuffer.getLength() ) { // delete last paragraph mark (if necessary) - if (sal_Char(0x0a) == sBuffer[sBuffer.getLength()-1]) + if (char(0x0a) == sBuffer[sBuffer.getLength()-1]) sBuffer = sBuffer.copy(0, sBuffer.getLength()-1); xPropertySet->setPropertyValue(sAPI_content, makeAny(sBuffer)); } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 00b4968aa5fe..e23c78b5a962 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -347,7 +347,7 @@ static bool txtparae_bContainsIllegalCharacters = false; // For the export pass all properties can be queried using a multi property // set. -static const sal_Char* aParagraphPropertyNamesAuto[] = +static const char* aParagraphPropertyNamesAuto[] = { "NumberingRules", "ParaConditionalStyleName", @@ -366,7 +366,7 @@ enum eParagraphPropertyNamesEnumAuto } -static const sal_Char* aParagraphPropertyNames[] = +static const char* aParagraphPropertyNames[] = { "NumberingIsNumber", "NumberingStyleName", diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 257180699e9e..e8b30eb39aa1 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -50,18 +50,18 @@ // service names -static const sal_Char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster."; -static const sal_Char sAPI_get_expression[] = "GetExpression"; -static const sal_Char sAPI_set_expression[] = "SetExpression"; -static const sal_Char sAPI_user[] = "User"; -static const sal_Char sAPI_database[] = "com.sun.star.text.TextField.Database"; +static const char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster."; +static const char sAPI_get_expression[] = "GetExpression"; +static const char sAPI_set_expression[] = "SetExpression"; +static const char sAPI_user[] = "User"; +static const char sAPI_database[] = "com.sun.star.text.TextField.Database"; // property names -static const sal_Char sAPI_content[] = "Content"; -static const sal_Char sAPI_sub_type[] = "SubType"; -static const sal_Char sAPI_number_format[] = "NumberFormat"; -static const sal_Char sAPI_is_visible[] = "IsVisible"; -static const sal_Char sAPI_current_presentation[] = "CurrentPresentation"; +static const char sAPI_content[] = "Content"; +static const char sAPI_sub_type[] = "SubType"; +static const char sAPI_number_format[] = "NumberFormat"; +static const char sAPI_is_visible[] = "IsVisible"; +static const char sAPI_current_presentation[] = "CurrentPresentation"; using namespace ::com::sun::star; @@ -77,7 +77,7 @@ using namespace ::xmloff::token; XMLVarFieldImportContext::XMLVarFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, - const sal_Char* pServiceName, sal_uInt16 nPrfx, + const char* pServiceName, sal_uInt16 nPrfx, const OUString& rLocalName, bool bFormula, bool bFormulaDefault, bool bDescription, bool bHelp, bool bHint, bool bVisible, @@ -244,7 +244,7 @@ void XMLVarFieldImportContext::PrepareField( XMLSetVarFieldImportContext::XMLSetVarFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, - const sal_Char* pServiceName, sal_uInt16 nPrfx, + const char* pServiceName, sal_uInt16 nPrfx, const OUString& rLocalName, VarType eVarType, bool bFormula, bool bFormulaDefault, bool bDescription, bool bHelp, bool bHint, bool bVisible, bool bIsDisplayFormula, @@ -754,7 +754,7 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext( } case XML_TOK_TEXTFIELD_NUMBERING_SEPARATOR: cSeparationChar = - static_cast<sal_Char>(xAttrList->getValueByIndex(i).toChar()); + static_cast<char>(xAttrList->getValueByIndex(i).toChar()); break; default: diff --git a/xmloff/source/transform/EventMap.hxx b/xmloff/source/transform/EventMap.hxx index 4665a3571215..9584e6eebd9a 100644 --- a/xmloff/source/transform/EventMap.hxx +++ b/xmloff/source/transform/EventMap.hxx @@ -25,8 +25,8 @@ struct XMLTransformerEventMapEntry { sal_uInt16 const m_nOASISPrefix; - const sal_Char *m_pOASISName; - const sal_Char *m_pOOoName; + const char *m_pOASISName; + const char *m_pOOoName; }; extern XMLTransformerEventMapEntry const aTransformerEventMap[]; diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index acc7c541fbdf..40de2304f94c 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -974,7 +974,7 @@ bool XMLTransformerBase::ReplaceInWithInch( OUString& rValue ) bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const { - static const sal_Char aHexTab[] = "0123456789abcdef"; + static const char aHexTab[] = "0123456789abcdef"; bool bEncoded = false; diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index 447f258a86d8..804c7581998e 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -86,7 +86,7 @@ namespace extern "C" { -SAL_DLLPUBLIC_EXPORT void* xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* xof_component_getFactory( const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; if( pServiceManager ) diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index 2235af1e2079..264eb299d9d3 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -108,7 +108,7 @@ namespace { struct ExportTable { - const sal_Char* pPropertyName; + const char* pPropertyName; sal_uInt16 const nNamespace; sal_uInt16 const nToken; convert_t const aConverter; diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index e6fce092b762..4c5ff6e24381 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -39,7 +39,7 @@ namespace xmlscript extern "C" { SAL_DLLPUBLIC_EXPORT void * xmlscript_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, ::xmlscript::s_entries ); diff --git a/xmlsecurity/qa/certext/SanCertExt.cxx b/xmlsecurity/qa/certext/SanCertExt.cxx index a961f9cb5ab1..c117f4c00139 100644 --- a/xmlsecurity/qa/certext/SanCertExt.cxx +++ b/xmlsecurity/qa/certext/SanCertExt.cxx @@ -140,7 +140,7 @@ namespace { for (sal_Int32 i = 0 ; i < extensions.getLength(); i++) { uno::Reference< security::XCertificateExtension >element = extensions[i]; - OString aId ( (const sal_Char *)element->getExtensionId().getArray(), element->getExtensionId().getLength()); + OString aId ( (const char *)element->getExtensionId().getArray(), element->getExtensionId().getLength()); if (aId.equals(OID_SUBJECT_ALTERNATIVE_NAME)) { uno::Reference< security::XSanExtension > sanExtension ( element, uno::UNO_QUERY ); diff --git a/xmlsecurity/source/gpg/GpgComponentFactory.cxx b/xmlsecurity/source/gpg/GpgComponentFactory.cxx index fecf2ce3c852..ef539a04b981 100644 --- a/xmlsecurity/source/gpg/GpgComponentFactory.cxx +++ b/xmlsecurity/source/gpg/GpgComponentFactory.cxx @@ -20,7 +20,7 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_gpg_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_gpg_component_getFactory( const char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ ) { void* pRet = nullptr; Reference< XSingleServiceFactory > xFactory ; |