sw/inc/calc.hxx | 60 ++--- sw/inc/charfmt.hxx | 2 sw/inc/fmtcol.hxx | 6 sw/inc/format.hxx | 2 sw/inc/frmfmt.hxx | 2 sw/inc/iodetect.hxx | 2 sw/inc/swfltopt.hxx | 4 sw/qa/extras/uiwriter/uiwriter.cxx | 4 sw/source/core/access/acccell.cxx | 2 sw/source/core/access/acccontext.hxx | 2 sw/source/core/access/accdoc.cxx | 4 sw/source/core/access/accembedded.cxx | 2 sw/source/core/access/accfootnote.cxx | 4 sw/source/core/access/accheaderfooter.cxx | 4 sw/source/core/access/accpage.cxx | 2 sw/source/core/access/accpara.cxx | 4 sw/source/core/access/accpreview.cxx | 2 sw/source/core/access/acctable.cxx | 2 sw/source/core/attr/format.cxx | 2 sw/source/core/bastyp/calc.cxx | 72 +++--- sw/source/core/doc/doccomp.cxx | 16 - sw/source/core/edit/edfcol.cxx | 2 sw/source/core/layout/atrfrm.cxx | 2 sw/source/core/layout/dbg_lay.cxx | 4 sw/source/core/tox/txmsrt.cxx | 2 sw/source/core/unocore/unochart.cxx | 10 sw/source/core/unocore/unofield.cxx | 2 sw/source/core/unocore/unotext.cxx | 2 sw/source/filter/ascii/parasc.cxx | 8 sw/source/filter/basflt/fltini.cxx | 6 sw/source/filter/basflt/iodetect.cxx | 8 sw/source/filter/html/css1atr.cxx | 58 ++-- sw/source/filter/html/css1kywd.cxx | 322 +++++++++++++-------------- sw/source/filter/html/css1kywd.hxx | 320 +++++++++++++------------- sw/source/filter/html/htmlatr.cxx | 6 sw/source/filter/html/htmlcss1.cxx | 4 sw/source/filter/html/htmldrawwriter.cxx | 2 sw/source/filter/html/htmlfld.cxx | 6 sw/source/filter/html/htmlfldw.cxx | 6 sw/source/filter/html/htmlflywriter.cxx | 16 - sw/source/filter/html/htmlform.cxx | 10 sw/source/filter/html/htmlform.hxx | 8 sw/source/filter/html/htmlforw.cxx | 6 sw/source/filter/html/htmlftn.cxx | 4 sw/source/filter/html/htmlnumwriter.cxx | 4 sw/source/filter/html/parcss1.cxx | 2 sw/source/filter/html/svxcss1.hxx | 2 sw/source/filter/html/swhtml.hxx | 4 sw/source/filter/html/wrthtml.cxx | 10 sw/source/filter/html/wrthtml.hxx | 30 +- sw/source/filter/inc/wwstyles.hxx | 2 sw/source/filter/writer/writer.cxx | 4 sw/source/filter/ww8/attributeoutputbase.hxx | 4 sw/source/filter/ww8/docxattributeoutput.cxx | 14 - sw/source/filter/ww8/docxattributeoutput.hxx | 2 sw/source/filter/ww8/rtfattributeoutput.cxx | 32 +- sw/source/filter/ww8/rtfattributeoutput.hxx | 2 sw/source/filter/ww8/rtfexport.cxx | 11 sw/source/filter/ww8/rtfexport.hxx | 6 sw/source/filter/ww8/styles.cxx | 6 sw/source/filter/ww8/wrtw8nds.cxx | 2 sw/source/filter/ww8/wrtww8.cxx | 4 sw/source/filter/ww8/ww8atr.cxx | 4 sw/source/filter/ww8/ww8par.cxx | 16 - sw/source/filter/ww8/ww8par2.cxx | 2 sw/source/filter/ww8/ww8par3.cxx | 2 sw/source/filter/ww8/ww8par5.cxx | 56 ++-- sw/source/filter/ww8/ww8par6.cxx | 2 sw/source/filter/ww8/ww8scan.cxx | 2 sw/source/filter/ww8/ww8struc.hxx | 2 sw/source/filter/xml/swxml.cxx | 8 sw/source/filter/xml/wrtxml.cxx | 6 sw/source/filter/xml/wrtxml.hxx | 6 sw/source/filter/xml/xmltexti.cxx | 2 sw/source/ui/vba/service.cxx | 2 sw/source/ui/vba/vbadialog.cxx | 2 sw/source/ui/vba/vbadocumentproperties.cxx | 2 sw/source/ui/vba/vbarow.cxx | 2 sw/source/ui/vba/vbastyles.cxx | 6 sw/source/uibase/app/docsh2.cxx | 2 sw/source/uibase/dochdl/swdtflvr.cxx | 2 sw/source/uibase/inc/unodispatch.hxx | 2 sw/source/uibase/uiview/srcview.cxx | 6 sw/source/uibase/uno/unodispatch.cxx | 4 sw/source/uibase/uno/unofreg.cxx | 2 sw/source/uibase/uno/unotxdoc.cxx | 4 sw/source/uibase/utlui/unotools.cxx | 2 test/source/helper/transferable.cxx | 4 testtools/source/bridgetest/bridgetest.cxx | 2 testtools/source/bridgetest/cppobj.cxx | 2 testtools/source/performance/ubobject.cxx | 2 testtools/source/performance/ubtest.cxx | 26 +- 92 files changed, 668 insertions(+), 669 deletions(-)
New commits: commit 667d49fd5cc4d5bd8551a88ef803badf70296c00 Author: Noel Grandin <[email protected]> AuthorDate: Mon Dec 23 10:37:01 2019 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Dec 23 10:51:05 2019 +0100 sal_Char->char in test..testtools Change-Id: I060d5fc9124dc46b57400d108a889e4c879b5e8c Reviewed-on: https://gerrit.libreoffice.org/85731 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/test/source/helper/transferable.cxx b/test/source/helper/transferable.cxx index ec182f53e961..febcb294242d 100644 --- a/test/source/helper/transferable.cxx +++ b/test/source/helper/transferable.cxx @@ -68,14 +68,14 @@ OString OOO_DLLPUBLIC_TEST getTextSelection( if (bConvert) aRet = OUStringToOString(aString, RTL_TEXTENCODING_UTF8); else - aRet = OString(reinterpret_cast<const sal_Char*>(aString.getStr()), + aRet = OString(reinterpret_cast<const char*>(aString.getStr()), aString.getLength() * sizeof(sal_Unicode)); } else { uno::Sequence<sal_Int8> aSequence; aAny >>= aSequence; - aRet = OString(reinterpret_cast<sal_Char*>(aSequence.getArray()), aSequence.getLength()); + aRet = OString(reinterpret_cast<char*>(aSequence.getArray()), aSequence.getLength()); } return aRet; } diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index c2b39378b8e6..6bae24fe1219 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -1214,7 +1214,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * component_getFactory( - const sal_Char * pImplName, void * pServiceManager, + const char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * ) { void * pRet = nullptr; diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 5cc360985609..1a0e1bfdf214 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -1128,7 +1128,7 @@ static Reference< XInterface > Test_Impl_create( extern "C" { SAL_DLLPUBLIC_EXPORT void * component_getFactory( - const sal_Char * pImplName, SAL_UNUSED_PARAMETER void * pServiceManager, + const char * pImplName, SAL_UNUSED_PARAMETER void * pServiceManager, SAL_UNUSED_PARAMETER void * ) { void * pRet = nullptr; diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx index 8aff1663ed9c..e437e9c9cdaa 100644 --- a/testtools/source/performance/ubobject.cxx +++ b/testtools/source/performance/ubobject.cxx @@ -252,7 +252,7 @@ sal_Bool SAL_CALL component_writeInfo( } SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = 0; diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index a45792a07a4b..c30f31ba7150 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -111,12 +111,12 @@ static inline sal_uInt32 getSystemTicks() } -static void out( const sal_Char * pText, FILE * stream = stderr, - sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) +static void out( const char * pText, FILE * stream = stderr, + sal_Int32 nStart = -1, char cFillchar = ' ' ) { static sal_Int32 s_nPos = 0; - sal_Char ar[2] = { cFillchar, 0 }; + char ar[2] = { cFillchar, 0 }; while (s_nPos < nStart) { ::fprintf( stream, ar ); @@ -125,7 +125,7 @@ static void out( const sal_Char * pText, FILE * stream = stderr, ::fprintf( stream, pText ); - for ( const sal_Char * p = pText; *p; ++p ) + for ( const char * p = pText; *p; ++p ) { if (*p == '\n') s_nPos = 0; @@ -135,24 +135,24 @@ static void out( const sal_Char * pText, FILE * stream = stderr, } static inline void out( const OUString & rText, FILE * stream = stderr, - sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) + sal_Int32 nStart = -1, char cFillchar = ' ' ) { OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) ); out( aText.getStr(), stream, nStart, cFillchar ); } static inline void out( double fVal, FILE * stream = stderr, - sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) + sal_Int32 nStart = -1, char cFillchar = ' ' ) { - sal_Char ar[128]; + char ar[128]; ::snprintf( ar, sizeof(ar), (fVal < 0.000001 ? "%g" : "%f"), fVal ); out( ar, stream, nStart, cFillchar ); } static inline void out( sal_Int64 nVal, FILE * stream = stderr, - sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) + sal_Int32 nStart = -1, char cFillchar = ' ' ) { - sal_Char ar[128]; + char ar[128]; ::snprintf( ar, sizeof(ar), "%ld", nVal ); out( ar, stream, nStart, cFillchar ); } @@ -186,7 +186,7 @@ Reference< XSingleServiceFactory > loadLibComponentFactory( { uno_Environment * pCurrentEnv = 0; uno_Environment * pEnv = 0; - const sal_Char * pEnvTypeName = 0; + const char * pEnvTypeName = 0; (*((component_getImplementationEnvironmentFunc)pSym))( &pEnvTypeName, &pEnv ); sal_Bool bNeedsMapping = @@ -528,10 +528,10 @@ typedef std::map< std::string, TimeEntry > t_TimeEntryMap; struct TimingSheet { t_TimeEntryMap _entries; - void insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nTicks ); + void insert( const char * pText, sal_Int64 nLoop, sal_uInt32 nTicks ); }; -void TimingSheet::insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nTicks ) +void TimingSheet::insert( const char * pText, sal_Int64 nLoop, sal_uInt32 nTicks ) { _entries[ pText ] = TimeEntry( nLoop, nTicks ); } @@ -1249,7 +1249,7 @@ sal_Bool SAL_CALL component_writeInfo( } SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = 0; commit 40a7abaab8bead1b1f04774324b7d652ce7f75f1 Author: Noel Grandin <[email protected]> AuthorDate: Mon Dec 23 10:21:49 2019 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Dec 23 10:50:52 2019 +0100 sal_Char->char in sw Change-Id: I63fb87a8e8eaf9c9da7bf7b8b6f5706222ffcc07 Reviewed-on: https://gerrit.libreoffice.org/85730 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 5edec81f5e96..bf3fef1711f9 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -58,36 +58,36 @@ enum SwCalcOper }; // Calculate Operations Strings -extern const sal_Char sCalc_Add[]; -extern const sal_Char sCalc_Sub[]; -extern const sal_Char sCalc_Mul[]; -extern const sal_Char sCalc_Div[]; -extern const sal_Char sCalc_Phd[]; -extern const sal_Char sCalc_Sqrt[]; -extern const sal_Char sCalc_Pow[]; -extern const sal_Char sCalc_Or[]; -extern const sal_Char sCalc_Xor[]; -extern const sal_Char sCalc_And[]; -extern const sal_Char sCalc_Not[]; -extern const sal_Char sCalc_Eq[]; -extern const sal_Char sCalc_Neq[]; -extern const sal_Char sCalc_Leq[]; -extern const sal_Char sCalc_Geq[]; -extern const sal_Char sCalc_L[]; -extern const sal_Char sCalc_G[]; -extern const sal_Char sCalc_Sum[]; -extern const sal_Char sCalc_Mean[]; -extern const sal_Char sCalc_Min[]; -extern const sal_Char sCalc_Max[]; -extern const sal_Char sCalc_Sin[]; -extern const sal_Char sCalc_Cos[]; -extern const sal_Char sCalc_Tan[]; -extern const sal_Char sCalc_Asin[]; -extern const sal_Char sCalc_Acos[]; -extern const sal_Char sCalc_Atan[]; -extern const sal_Char sCalc_Tdif[]; -extern const sal_Char sCalc_Round[]; -extern const sal_Char sCalc_Date[]; +extern const char sCalc_Add[]; +extern const char sCalc_Sub[]; +extern const char sCalc_Mul[]; +extern const char sCalc_Div[]; +extern const char sCalc_Phd[]; +extern const char sCalc_Sqrt[]; +extern const char sCalc_Pow[]; +extern const char sCalc_Or[]; +extern const char sCalc_Xor[]; +extern const char sCalc_And[]; +extern const char sCalc_Not[]; +extern const char sCalc_Eq[]; +extern const char sCalc_Neq[]; +extern const char sCalc_Leq[]; +extern const char sCalc_Geq[]; +extern const char sCalc_L[]; +extern const char sCalc_G[]; +extern const char sCalc_Sum[]; +extern const char sCalc_Mean[]; +extern const char sCalc_Min[]; +extern const char sCalc_Max[]; +extern const char sCalc_Sin[]; +extern const char sCalc_Cos[]; +extern const char sCalc_Tan[]; +extern const char sCalc_Asin[]; +extern const char sCalc_Acos[]; +extern const char sCalc_Atan[]; +extern const char sCalc_Tdif[]; +extern const char sCalc_Round[]; +extern const char sCalc_Date[]; // Calculate ErrorCodes enum class SwCalcError diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx index 76e44fe10247..a2f1ff69c24b 100644 --- a/sw/inc/charfmt.hxx +++ b/sw/inc/charfmt.hxx @@ -27,7 +27,7 @@ class SwCharFormat final : public SwFormat friend class SwDoc; friend class SwTextFormatColl; - SwCharFormat( SwAttrPool& rPool, const sal_Char* pFormatName, + SwCharFormat( SwAttrPool& rPool, const char* pFormatName, SwCharFormat *pDerivedFrom ) : SwFormat( rPool, pFormatName, aCharFormatSetRange, pDerivedFrom, RES_CHRFMT ) {} diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 08879efc5594..cc612d48ce38 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -34,7 +34,7 @@ namespace sw{ class DocumentStylePoolManager; } class SAL_DLLPUBLIC_RTTI SwFormatColl : public SwFormat { protected: - SwFormatColl( SwAttrPool& rPool, const sal_Char* pFormatName, + SwFormatColl( SwAttrPool& rPool, const char* pFormatName, const sal_uInt16* pWhichRanges, SwFormatColl* pDerFrom, sal_uInt16 nFormatWhich ) : SwFormat( rPool, pFormatName, pWhichRanges, pDerFrom, nFormatWhich ) @@ -67,7 +67,7 @@ class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl protected: - SwTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName, + SwTextFormatColl( SwAttrPool& rPool, const char* pFormatCollName, SwTextFormatColl* pDerFrom = nullptr, sal_uInt16 nFormatWh = RES_TXTFMTCOLL ) : SwFormatColl(rPool, pFormatCollName, aTextFormatCollSetRange, pDerFrom, nFormatWh) @@ -139,7 +139,7 @@ class SwGrfFormatColl final : public SwFormatColl { friend class SwDoc; - SwGrfFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName, + SwGrfFormatColl( SwAttrPool& rPool, const char* pFormatCollName, SwGrfFormatColl* pDerFrom = nullptr ) : SwFormatColl( rPool, pFormatCollName, aGrfFormatCollSetRange, pDerFrom, RES_GRFFMTCOLL ) diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 849b14d8b688..2c437e656e71 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -62,7 +62,7 @@ class SW_DLLPUBLIC SwFormat : public sw::BroadcastingModify std::shared_ptr<SfxGrabBagItem> m_pGrabBagItem; ///< Style InteropGrabBag. protected: - SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, + SwFormat( SwAttrPool& rPool, const char* pFormatNm, const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrame, sal_uInt16 nFormatWhich ); SwFormat( SwAttrPool& rPool, const OUString &rFormatNm, const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrame, sal_uInt16 nFormatWhich ); diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 193bb64e03bd..a7f9fa8d9b57 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -84,7 +84,7 @@ class SW_DLLPUBLIC SwFrameFormat protected: SwFrameFormat( SwAttrPool& rPool, - const sal_Char* pFormatNm, + const char* pFormatNm, SwFrameFormat *pDrvdFrame, sal_uInt16 nFormatWhich = RES_FRMFMT, const sal_uInt16* pWhichRange = nullptr); diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index 113468412282..f8d55334ee6a 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -103,7 +103,7 @@ public: static bool IsValidStgFilter( SotStorage& , const SfxFilter& ); static bool IsValidStgFilter( const css::uno::Reference < css::embed::XStorage >& rStg, const SfxFilter& rFilter); - static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen, + static bool IsDetectableText( const char* pBuf, sal_uLong &rLen, rtl_TextEncoding *pCharSet, bool *pSwap, LineEnd *pLineEnd ); static OUString GetSubStorageName( const SfxFilter& rFltr ); diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx index 0e08345bf302..8fca62493ae1 100644 --- a/sw/inc/swfltopt.hxx +++ b/sw/inc/swfltopt.hxx @@ -28,10 +28,10 @@ private: virtual void ImplCommit() override; public: - SwFilterOptions( sal_uInt16 nCnt, const sal_Char** ppNames, + SwFilterOptions( sal_uInt16 nCnt, const char** ppNames, sal_uInt64* pValues ); - void GetValues( sal_uInt16 nCnt, const sal_Char** ppNames, + void GetValues( sal_uInt16 nCnt, const char** ppNames, sal_uInt64* pValues ); virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; }; diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index dbd90d905a3b..3cba57e29251 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -964,7 +964,7 @@ void SwUiWriterTest::testImportRTF() // Insert the RTF at the cursor position. OString aData = "{\\rtf1 Hello world!\\par}"; - SvMemoryStream aStream(const_cast<sal_Char*>(aData.getStr()), aData.getLength(), StreamMode::READ); + SvMemoryStream aStream(const_cast<char*>(aData.getStr()), aData.getLength(), StreamMode::READ); SwReader aReader(aStream, OUString(), OUString(), *pWrtShell->GetCursor()); Reader* pRTFReader = SwReaderWriter::GetRtfReader(); CPPUNIT_ASSERT(pRTFReader != nullptr); @@ -996,7 +996,7 @@ void SwUiWriterTest::testExportRTF() SwWriter aWrt(aStream, *xClpDoc); aWrt.Write(xWrt); - OString aData(static_cast<const sal_Char*>(aStream.GetData()), aStream.GetSize()); + OString aData(static_cast<const char*>(aStream.GetData()), aStream.GetSize()); //Amusingly eventually there was a commit id with "ccc" in it, and so the rtf contained //{\*\generator LibreOfficeDev/4.4.0.0.alpha0$Linux_X86_64 LibreOffice_project/f70664ccc6837f2cc21a29bb4f44e41e100efe6b} diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 61c0144d5d87..f7d689a62980 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace sw::access; -const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleCellView"; +const char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleCellView"; bool SwAccessibleCell::IsSelected() { diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index ddbc019b2e6a..a42c0f569fb2 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -41,7 +41,7 @@ namespace accessibility { class AccessibleShape; } -const sal_Char sAccessibleServiceName[] = "com.sun.star.accessibility.Accessible"; +const char sAccessibleServiceName[] = "com.sun.star.accessibility.Accessible"; class SwAccessibleContext : public ::cppu::WeakImplHelper< diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index da85ddacc2e0..9633d6b9a4db 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -54,8 +54,8 @@ #include <dview.hxx> #include <dcontact.hxx> #include <svx/svdmark.hxx> -const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextDocumentView"; -const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentView"; +const char sServiceName[] = "com.sun.star.text.AccessibleTextDocumentView"; +const char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentView"; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 9804cbc0b27e..58d9a7672c31 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleEmbeddedObject"; +const char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleEmbeddedObject"; SwAccessibleEmbeddedObject::SwAccessibleEmbeddedObject( std::shared_ptr<SwAccessibleMap> const& pInitMap, diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index 2a96b0149f30..eb843ca3601d 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -33,8 +33,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -const sal_Char sImplementationNameFootnote[] = "com.sun.star.comp.Writer.SwAccessibleFootnoteView"; -const sal_Char sImplementationNameEndnote[] = "com.sun.star.comp.Writer.SwAccessibleEndnoteView"; +const char sImplementationNameFootnote[] = "com.sun.star.comp.Writer.SwAccessibleFootnoteView"; +const char sImplementationNameEndnote[] = "com.sun.star.comp.Writer.SwAccessibleEndnoteView"; SwAccessibleFootnote::SwAccessibleFootnote( std::shared_ptr<SwAccessibleMap> const& pInitMap, diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index e998b5c0e74d..b40bcf58d954 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -29,8 +29,8 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; -const sal_Char sImplementationNameHeader[] = "com.sun.star.comp.Writer.SwAccessibleHeaderView"; -const sal_Char sImplementationNameFooter[] = "com.sun.star.comp.Writer.SwAccessibleFooterView"; +const char sImplementationNameHeader[] = "com.sun.star.comp.Writer.SwAccessibleHeaderView"; +const char sImplementationNameFooter[] = "com.sun.star.comp.Writer.SwAccessibleFooterView"; SwAccessibleHeaderFooter::SwAccessibleHeaderFooter( std::shared_ptr<SwAccessibleMap> const& pInitMap, diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index e6388c145f0b..54fae7d81186 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::accessibility; using uno::RuntimeException; using uno::Sequence; -const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessiblePageView"; +const char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessiblePageView"; bool SwAccessiblePage::IsSelected() { diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 331cc1a7c2fd..0ffeea847e82 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -109,8 +109,8 @@ namespace com::sun::star::text { class XText; } -const sal_Char sServiceName[] = "com.sun.star.text.AccessibleParagraphView"; -const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleParagraphView"; +const char sServiceName[] = "com.sun.star.text.AccessibleParagraphView"; +const char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleParagraphView"; OUString const & SwAccessibleParagraph::GetString() { diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index 28026690c81e..ded2788497f5 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -22,7 +22,7 @@ #include <strings.hrc> #include "accpreview.hxx" -const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentPageView"; +const char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentPageView"; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Sequence; diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 3de840d534ff..0a2fc87c75f8 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1732,7 +1732,7 @@ uno::Reference< XAccessibleTable > OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName() { - static const sal_Char sImplName[] = "com.sun.star.comp.Writer.SwAccessibleTableColumnHeadersView"; + static const char sImplName[] = "com.sun.star.comp.Writer.SwAccessibleTableColumnHeadersView"; return sImplName; } diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index f030e78ec9e0..3a707437f2f9 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -36,7 +36,7 @@ using namespace com::sun::star; -SwFormat::SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, +SwFormat::SwFormat( SwAttrPool& rPool, const char* pFormatNm, const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrame, sal_uInt16 nFormatWhich ) : m_aFormatName( OUString::createFromAscii(pFormatNm) ), diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 19dd4e7751f0..b82a328ad3d8 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -54,41 +54,41 @@ using namespace ::com::sun::star; -const sal_Char sCalc_Add[] = "add"; -const sal_Char sCalc_Sub[] = "sub"; -const sal_Char sCalc_Mul[] = "mul"; -const sal_Char sCalc_Div[] = "div"; -const sal_Char sCalc_Phd[] = "phd"; -const sal_Char sCalc_Sqrt[] = "sqrt"; -const sal_Char sCalc_Pow[] = "pow"; -const sal_Char sCalc_Or[] = "or"; -const sal_Char sCalc_Xor[] = "xor"; -const sal_Char sCalc_And[] = "and"; -const sal_Char sCalc_Not[] = "not"; -const sal_Char sCalc_Eq[] = "eq"; -const sal_Char sCalc_Neq[] = "neq"; -const sal_Char sCalc_Leq[] = "leq"; -const sal_Char sCalc_Geq[] = "geq"; -const sal_Char sCalc_L[] = "l"; -const sal_Char sCalc_G[] = "g"; -const sal_Char sCalc_Sum[] = "sum"; -const sal_Char sCalc_Mean[] = "mean"; -const sal_Char sCalc_Min[] = "min"; -const sal_Char sCalc_Max[] = "max"; -const sal_Char sCalc_Sin[] = "sin"; -const sal_Char sCalc_Cos[] = "cos"; -const sal_Char sCalc_Tan[] = "tan"; -const sal_Char sCalc_Asin[] = "asin"; -const sal_Char sCalc_Acos[] = "acos"; -const sal_Char sCalc_Atan[] = "atan"; -const sal_Char sCalc_Round[]= "round"; -const sal_Char sCalc_Date[] = "date"; +const char sCalc_Add[] = "add"; +const char sCalc_Sub[] = "sub"; +const char sCalc_Mul[] = "mul"; +const char sCalc_Div[] = "div"; +const char sCalc_Phd[] = "phd"; +const char sCalc_Sqrt[] = "sqrt"; +const char sCalc_Pow[] = "pow"; +const char sCalc_Or[] = "or"; +const char sCalc_Xor[] = "xor"; +const char sCalc_And[] = "and"; +const char sCalc_Not[] = "not"; +const char sCalc_Eq[] = "eq"; +const char sCalc_Neq[] = "neq"; +const char sCalc_Leq[] = "leq"; +const char sCalc_Geq[] = "geq"; +const char sCalc_L[] = "l"; +const char sCalc_G[] = "g"; +const char sCalc_Sum[] = "sum"; +const char sCalc_Mean[] = "mean"; +const char sCalc_Min[] = "min"; +const char sCalc_Max[] = "max"; +const char sCalc_Sin[] = "sin"; +const char sCalc_Cos[] = "cos"; +const char sCalc_Tan[] = "tan"; +const char sCalc_Asin[] = "asin"; +const char sCalc_Acos[] = "acos"; +const char sCalc_Atan[] = "atan"; +const char sCalc_Round[]= "round"; +const char sCalc_Date[] = "date"; // ATTENTION: sorted list of all operators struct CalcOp { union{ - const sal_Char* pName; + const char* pName; const OUString* pUName; }; SwCalcOper eOp; @@ -229,7 +229,7 @@ SwCalc::SwCalc( SwDoc& rD ) m_sCurrSym = comphelper::string::strip(m_pLocaleDataWrapper->getCurrSymbol(), ' '); m_sCurrSym = m_pCharClass->lowercase( m_sCurrSym ); - static sal_Char const + static char const sNType0[] = "false", sNType1[] = "true", sNType2[] = "pi", @@ -259,7 +259,7 @@ SwCalc::SwCalc( SwDoc& rD ) sNType25[] = "user_state" , sNType26[] = "graph" ; - static const sal_Char* const sNTypeTab[ 27 ] = + static const char* const sNTypeTab[ 27 ] = { sNType0, sNType1, sNType2, sNType3, sNType4, sNType5, sNType6, sNType7, sNType8, sNType9, sNType10, sNType11, @@ -1440,7 +1440,7 @@ SwSbxValue& SwSbxValue::MakeDouble() #include <stdio.h> void main() { - static sal_Char + static char sNType0[] = "false", sNType1[] = "true", sNType2[] = "pi", sNType3[] = "e", sNType4[] = "tables", sNType5[] = "graf", sNType6[] = "ole", sNType7[] = "page", sNType8[] = "para", @@ -1455,7 +1455,7 @@ void main() sNType25[] = "user_state", sNType26[] = "graph" ; - static const sal_Char* sNTypeTab[ 27 ] = + static const char* sNTypeTab[ 27 ] = { sNType0, sNType1, sNType2, sNType3, sNType4, sNType5, sNType6, sNType7, sNType8, sNType9, sNType10, sNType11, @@ -1466,12 +1466,12 @@ void main() const unsigned short nTableSize = 47; int aArr[ nTableSize ] = { 0 }; - sal_Char ch; + char ch; for( int n = 0; n < 27; ++n ) { unsigned int ii = 0; - const sal_Char* pp = sNTypeTab[ n ]; + const char* pp = sNTypeTab[ n ]; while( *pp ) { diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 165b3a20298f..2fcf30ad8412 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -206,7 +206,7 @@ public: sal_uLong nCount; public: - MovedData( CompareData& rData, const sal_Char* pDiscard ); + MovedData( CompareData& rData, const char* pDiscard ); sal_uLong GetIndex( sal_uLong n ) const { return pIndex[ n ]; } sal_uLong GetLineNum( sal_uLong n ) const { return pLineNum[ n ]; } @@ -232,8 +232,8 @@ private: static void CountDifference( const CompareData& rData, sal_uLong* pCounts ); static void SetDiscard( const CompareData& rData, - sal_Char* pDiscard, const sal_uLong* pCounts ); - static void CheckDiscard( sal_uLong nLen, sal_Char* pDiscard ); + char* pDiscard, const sal_uLong* pCounts ); + static void CheckDiscard( sal_uLong nLen, char* pDiscard ); static void ShiftBoundaries( CompareData& rData1, CompareData& rData2 ); public: @@ -571,8 +571,8 @@ Compare::Compare( sal_uLong nDiff, CompareData& rData1, CompareData& rData2 ) std::unique_ptr<MovedData> pMD1, pMD2; // Look for the differing lines { - std::unique_ptr<sal_Char[]> pDiscard1( new sal_Char[ rData1.GetLineCount() ] ); - std::unique_ptr<sal_Char[]> pDiscard2( new sal_Char[ rData2.GetLineCount() ] ); + std::unique_ptr<char[]> pDiscard1( new char[ rData1.GetLineCount() ] ); + std::unique_ptr<char[]> pDiscard2( new char[ rData2.GetLineCount() ] ); std::unique_ptr<sal_uLong[]> pCount1(new sal_uLong[ nDiff ]); std::unique_ptr<sal_uLong[]> pCount2(new sal_uLong[ nDiff ]); @@ -613,7 +613,7 @@ void Compare::CountDifference( const CompareData& rData, sal_uLong* pCounts ) } void Compare::SetDiscard( const CompareData& rData, - sal_Char* pDiscard, const sal_uLong* pCounts ) + char* pDiscard, const sal_uLong* pCounts ) { const sal_uLong nLen = rData.GetLineCount(); @@ -636,7 +636,7 @@ void Compare::SetDiscard( const CompareData& rData, } } -void Compare::CheckDiscard( sal_uLong nLen, sal_Char* pDiscard ) +void Compare::CheckDiscard( sal_uLong nLen, char* pDiscard ) { for( sal_uLong n = 0; n < nLen; ++n ) { @@ -748,7 +748,7 @@ void Compare::CheckDiscard( sal_uLong nLen, sal_Char* pDiscard ) } } -Compare::MovedData::MovedData( CompareData& rData, const sal_Char* pDiscard ) +Compare::MovedData::MovedData( CompareData& rData, const char* pDiscard ) : nCount( 0 ) { sal_uLong nLen = rData.GetLineCount(); diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index eb3036093329..411857dc0152 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -390,7 +390,7 @@ std::pair<bool, OUString> lcl_MakeParagraphSignatureFieldText(const SignatureDes if (aDescr.isValid()) { - const sal_Char* pData = utf8Text.getStr(); + const char* pData = utf8Text.getStr(); const std::vector<unsigned char> data(pData, pData + utf8Text.getLength()); OString encSignature; diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 09f0974d22d1..9f5710cbc4f5 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2407,7 +2407,7 @@ SwHeaderAndFooterEatSpacingItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItem SwFrameFormat::SwFrameFormat( SwAttrPool& rPool, - const sal_Char* pFormatNm, + const char* pFormatNm, SwFrameFormat *pDrvdFrame, sal_uInt16 nFormatWhich, const sal_uInt16* pWhichRange) diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index ec09f8c4305c..2f0f5cacf229 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -403,7 +403,7 @@ void SwImplProtocol::FileInit() nInitFile = 0; while( aStream.good() ) { - sal_Char c; + char c; aStream.ReadChar( c ); if( '\n' == c || '\r' == c ) // line ending { @@ -463,7 +463,7 @@ static void lcl_Padded(OStringBuffer& rOut, const OString& s, size_t length) static void lcl_Padded(OStringBuffer& rOut, const long n, size_t length = 5) { - sal_Char sz[RTL_STR_MAX_VALUEOFINT64]; + char sz[RTL_STR_MAX_VALUEOFINT64]; rtl_str_valueOfInt64(sz, n, 10); OString s(sz); lcl_Padded(rOut, s, length); diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 8b362c33ff48..cc77ef66e10d 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -676,7 +676,7 @@ OUString SwTOXPara::GetURL() const if( pFly ) { aText = "#" + pFly->GetName() + OUStringChar(cMarkSeparator); - const sal_Char* pStr; + const char* pStr; switch( eType ) { case SwTOXElement::Ole: pStr = "ole"; break; diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 58e4e019b21a..66c5bffc0a30 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -649,7 +649,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData // all the ranges to use in sal_Int32 nRows = pTable->GetTabLines().size(); sal_Int32 nCols = pTable->GetTabLines().front()->GetTabBoxes().size(); - std::vector<std::vector<sal_Char>> aMap(nRows); + std::vector<std::vector<char>> aMap(nRows); for (sal_Int32 i = 0; i < nRows; ++i) aMap[i].resize(nCols); @@ -704,7 +704,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData ii = 0; while (ii < iiEnd) { - sal_Char &rChar = bDtaSrcIsColumns ? aMap[ii][oi] : aMap[oi][ii]; + char &rChar = bDtaSrcIsColumns ? aMap[ii][oi] : aMap[oi][ii]; // label should be used but is not yet found? if (rChar == 'x' && bFirstIsLabel && aLabelIdx[oi] == -1) @@ -986,7 +986,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume sal_Int32 nTableCols = 0; // data used to build 'CellRangeRepresentation' from later on - std::vector< std::vector< sal_Char > > aMap; + std::vector< std::vector< char > > aMap; uno::Sequence< sal_Int32 > aSequenceMapping( nNumDS_LDS ); sal_Int32 *pSequenceMapping = aSequenceMapping.getArray(); @@ -1121,7 +1121,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume { for (sal_Int32 k = nStartCol; k <= nEndCol; ++k) { - sal_Char &rChar = aMap[i][k]; + char &rChar = aMap[i][k]; if (rChar == '\0') // check for overlapping values and/or labels rChar = 'L'; else @@ -1143,7 +1143,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume { for (sal_Int32 k = nStartCol; k <= nEndCol; ++k) { - sal_Char &rChar = aMap[i][k]; + char &rChar = aMap[i][k]; if (rChar == '\0') // check for overlapping values and/or labels rChar = 'x'; else diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 3b97450bb5ef..38dc1c997c00 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -485,7 +485,7 @@ namespace OUString getServiceName(const SwFieldIds aId) { - const sal_Char* pEntry; + const char* pEntry; switch (aId) { case SwFieldIds::User: diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index cc38066a118b..8df24a11b701 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -70,7 +70,7 @@ using namespace ::com::sun::star; -const sal_Char cInvalidObject[] = "this object is invalid"; +const char cInvalidObject[] = "this object is invalid"; class SwXText::Impl { diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 9f197d184658..c0203686bf8d 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -51,7 +51,7 @@ class SwASCIIParser SwDoc* pDoc; std::unique_ptr<SwPaM> pPam; SvStream& rInput; - std::unique_ptr<sal_Char[]> pArr; + std::unique_ptr<char[]> pArr; const SwAsciiOptions& rOpt; std::unique_ptr<SfxItemSet> pItemSet; long nFileSize; @@ -98,7 +98,7 @@ SwASCIIParser::SwASCIIParser(SwDoc* pD, const SwPaM& rCursor, SvStream& rIn, , bNewDoc(bReadNewDoc) { pPam.reset( new SwPaM( *rCursor.GetPoint() ) ); - pArr.reset( new sal_Char [ ASC_BUFFLEN + 2 ] ); + pArr.reset( new char [ ASC_BUFFLEN + 2 ] ); pItemSet = std::make_unique<SfxItemSet>( pDoc->GetAttrPool(), svl::Items<RES_CHRATR_FONT, RES_CHRATR_LANGUAGE, @@ -351,10 +351,10 @@ ErrCode SwASCIIParser::ReadChars() if( bSwapUnicode ) { - sal_Char* pF = pArr.get(), *pN = pArr.get() + 1; + char* pF = pArr.get(), *pN = pArr.get() + 1; for( sal_uLong n = 0; n < lGCount; n += 2, pF += 2, pN += 2 ) { - sal_Char c = *pF; + char c = *pF; *pF = *pN; *pN = c; } diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index b9cfbe68e579..50db587e63be 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -227,14 +227,14 @@ bool StgWriter::IsStgWriter() const { return true; } </FilterFlags> */ -SwFilterOptions::SwFilterOptions( sal_uInt16 nCnt, const sal_Char** ppNames, +SwFilterOptions::SwFilterOptions( sal_uInt16 nCnt, const char** ppNames, sal_uInt64* pValues ) : ConfigItem( "Office.Writer/FilterFlags" ) { GetValues( nCnt, ppNames, pValues ); } -void SwFilterOptions::GetValues( sal_uInt16 nCnt, const sal_Char** ppNames, +void SwFilterOptions::GetValues( sal_uInt16 nCnt, const char** ppNames, sal_uInt64* pValues ) { Sequence<OUString> aNames( nCnt ); @@ -399,7 +399,7 @@ namespace struct CharSetNameMap { rtl_TextEncoding const eCode; - const sal_Char* pName; + const char* pName; }; const CharSetNameMap *GetCharSetNameMap() diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index e837b47a8847..5f9929e8f2b7 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -237,7 +237,7 @@ std::shared_ptr<const SfxFilter> SwIoSystem::GetFileFilter(const OUString& rFile return SwIoSystem::GetFilterOfFormat(FILTER_TEXT); } -bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, sal_uLong &rLen, +bool SwIoSystem::IsDetectableText(const char* pBuf, sal_uLong &rLen, rtl_TextEncoding *pCharSet, bool *pSwap, LineEnd *pLineEnd) { bool bSwap = false; @@ -306,11 +306,11 @@ bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, sal_uLong &rLen, if (bLE != bNativeLE) { bSwap = true; - sal_Char* pF = reinterpret_cast<char*>(pNewBuf); - sal_Char* pN = pF+1; + char* pF = reinterpret_cast<char*>(pNewBuf); + char* pN = pF+1; for(sal_uLong n = 0; n < nNewLen; ++n, pF+=2, pN+=2 ) { - sal_Char c = *pF; + char c = *pF; *pF = *pN; *pN = c; } diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index b801f67e9811..709da0fbc878 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -161,21 +161,21 @@ static Writer& OutCSS1_SwFormatLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt namespace { -const sal_Char sCSS1_rule_end[] = " }"; -const sal_Char sCSS1_span_tag_end[] = "\">"; -const sal_Char cCSS1_style_opt_end = '\"'; +const char sCSS1_rule_end[] = " }"; +const char sCSS1_span_tag_end[] = "\">"; +const char cCSS1_style_opt_end = '\"'; -const sal_Char* const sHTML_FTN_fontheight = "57%"; +const char* const sHTML_FTN_fontheight = "57%"; OString lclConvToHex(sal_uInt16 nHex) { - sal_Char aNToABuf[] = "00"; + char aNToABuf[] = "00"; // set pointer to end of buffer - sal_Char *pStr = aNToABuf + (sizeof(aNToABuf)-1); + char *pStr = aNToABuf + (sizeof(aNToABuf)-1); for( sal_uInt8 n = 0; n < 2; ++n ) { - *(--pStr) = static_cast<sal_Char>(nHex & 0xf ) + 48; + *(--pStr) = static_cast<char>(nHex & 0xf ) + 48; if( *pStr > '9' ) *pStr += 39; nHex >>= 4; @@ -234,8 +234,8 @@ public: } -void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, - const sal_Char *pVal, +void SwHTMLWriter::OutCSS1_Property( const char *pProp, + const char *pVal, const OUString *pSVal ) { if (IgnorePropertyForReqIF(mbReqIF, pProp)) @@ -370,7 +370,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, long nMul = 1000; long nDiv = 1; long nFac = 100; - const sal_Char *pUnit; + const char *pUnit; switch( eUnit ) { case FieldUnit::MM_100TH: @@ -486,14 +486,14 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, rOut.append(pUnit); } -void SwHTMLWriter::OutCSS1_UnitProperty( const sal_Char *pProp, long nVal ) +void SwHTMLWriter::OutCSS1_UnitProperty( const char *pProp, long nVal ) { OStringBuffer sOut; AddUnitPropertyValue(sOut, nVal, m_eCSS1Unit); OutCSS1_PropertyAscii(pProp, sOut.makeStringAndClear()); } -void SwHTMLWriter::OutCSS1_PixelProperty( const sal_Char *pProp, long nVal, +void SwHTMLWriter::OutCSS1_PixelProperty( const char *pProp, long nVal, bool bVert ) { OString sOut(OString::number(ToPixel(nVal,bVert)) + sCSS1_UNIT_px); @@ -1148,7 +1148,7 @@ void SwHTMLWriter::PrepareFontList( const SvxFontItem& rFontItem, if( !bContainsKeyword && bGeneric ) { - const sal_Char *pStr = nullptr; + const char *pStr = nullptr; switch( rFontItem.GetFamily() ) { case FAMILY_ROMAN: pStr = sCSS1_PV_serif; break; @@ -1650,7 +1650,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, if( bPseudo ) { - const sal_Char *pPseudo = nullptr; + const char *pPseudo = nullptr; switch( rPageDesc.GetPoolFormatId() ) { case RES_POOLPAGE_FIRST: pPseudo = sCSS1_first; break; @@ -1909,7 +1909,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat if( !(nFrameOpts & HtmlFrmOpts::Align) ) { // float - const sal_Char *pStr = text::HoriOrientation::RIGHT==rHoriOri.GetHoriOrient() + const char *pStr = text::HoriOrientation::RIGHT==rHoriOri.GetHoriOrient() ? sCSS1_PV_right : sCSS1_PV_left; OutCSS1_PropertyAscii( sCSS1_P_float, pStr ); @@ -2245,7 +2245,7 @@ static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt, SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt); bool bNone = false; - const sal_Char *pUStr = nullptr; + const char *pUStr = nullptr; if( pUItem ) { switch( pUItem->GetLineStyle() ) @@ -2268,7 +2268,7 @@ static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt, } } - const sal_Char *pOStr = nullptr; + const char *pOStr = nullptr; if( pOItem ) { switch( pOItem->GetLineStyle() ) @@ -2291,7 +2291,7 @@ static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt, } } - const sal_Char *pCOStr = nullptr; + const char *pCOStr = nullptr; if( pCOItem ) { switch( pCOItem->GetStrikeout() ) @@ -2314,7 +2314,7 @@ static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt, } } - const sal_Char *pBStr = nullptr; + const char *pBStr = nullptr; if( pBItem ) { if( !pBItem->GetValue() ) @@ -2495,7 +2495,7 @@ static Writer& OutCSS1_SvxPosture( Writer& rWrt, const SfxPoolItem& rHt ) if( !rHTMLWrt.IsCSS1Script( nScript ) ) return rWrt; - const sal_Char *pStr = nullptr; + const char *pStr = nullptr; switch( static_cast<const SvxPostureItem&>(rHt).GetPosture() ) { case ITALIC_NONE: pStr = sCSS1_PV_normal; break; @@ -2629,7 +2629,7 @@ static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt ) if( !rHTMLWrt.IsCSS1Script( nScript ) ) return rWrt; - const sal_Char *pStr = nullptr; + const char *pStr = nullptr; switch( static_cast<const SvxWeightItem&>(rHt).GetWeight() ) { case WEIGHT_ULTRALIGHT: pStr = sCSS1_PV_extra_light; break; @@ -2733,7 +2733,7 @@ static Writer& OutCSS1_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt ) !rHTMLWrt.m_bNoAlign) return rWrt; - const sal_Char* pStr = nullptr; + const char* pStr = nullptr; switch( static_cast<const SvxAdjustItem&>(rHt).GetAdjust() ) { case SvxAdjust::Left: pStr = sCSS1_PV_left; break; @@ -2754,7 +2754,7 @@ static Writer& OutCSS1_SvxFormatSplit( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt); - const sal_Char *pStr = static_cast<const SvxFormatSplitItem&>(rHt).GetValue() + const char *pStr = static_cast<const SvxFormatSplitItem&>(rHt).GetValue() ? sCSS1_PV_auto : sCSS1_PV_avoid; rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_page_break_inside, pStr ); @@ -2766,7 +2766,7 @@ static Writer& OutCSS1_SwFormatLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt { SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt); - const sal_Char *pStr = static_cast<const SwFormatLayoutSplit&>(rHt).GetValue() + const char *pStr = static_cast<const SwFormatLayoutSplit&>(rHt).GetValue() ? sCSS1_PV_auto : sCSS1_PV_avoid; rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_page_break_inside, pStr ); @@ -3028,8 +3028,8 @@ static Writer& OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( Writer& rWrt, if( !rHTMLWrt.IsHTMLMode(HTMLMODE_PRINT_EXT) ) return rWrt; - const sal_Char *pBreakBefore = nullptr; - const sal_Char *pBreakAfter = nullptr; + const char *pBreakBefore = nullptr; + const char *pBreakAfter = nullptr; if( pKeepItem ) { @@ -3190,7 +3190,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt, return rWrt; // if necessary, add the orientation of the Graphic - const sal_Char *pRepeat = nullptr, *pHori = nullptr, *pVert = nullptr; + const char *pRepeat = nullptr, *pHori = nullptr, *pVert = nullptr; if( pGrf || !aLink.isEmpty() ) { if( GPOS_TILED==ePos ) @@ -3310,7 +3310,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt, } static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt, - const sal_Char *pProperty, + const char *pProperty, const SvxBorderLine *pLine ) { if( !pLine || pLine->isEmpty() ) @@ -3467,7 +3467,7 @@ static Writer& OutCSS1_SvxFrameDirection( Writer& rWrt, const SfxPoolItem& rHt ) SvxFrameDirection nDir = static_cast< const SvxFrameDirectionItem& >( rHt ).GetValue(); - const sal_Char* pStr = nullptr; + const char* pStr = nullptr; switch( nDir ) { case SvxFrameDirection::Horizontal_LR_TB: diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx index 0f7a2862b073..a99b5929a5ed 100644 --- a/sw/source/filter/html/css1kywd.cxx +++ b/sw/source/filter/html/css1kywd.cxx @@ -19,225 +19,225 @@ #include "css1kywd.hxx" -const sal_Char* const sCSS_mimetype = "text/css"; +const char* const sCSS_mimetype = "text/css"; -const sal_Char* const sCSS1_import = "import"; +const char* const sCSS1_import = "import"; -const sal_Char* const sCSS1_page = "page"; -//const sal_Char* const sCSS1_media = "media"; +const char* const sCSS1_page = "page"; +//const char* const sCSS1_media = "media"; -const sal_Char* const sCSS1_important = "important"; +const char* const sCSS1_important = "important"; -const sal_Char* const sCSS1_link = "link"; -const sal_Char* const sCSS1_visited = "visited"; -const sal_Char* const sCSS1_first_letter = "first-letter"; +const char* const sCSS1_link = "link"; +const char* const sCSS1_visited = "visited"; +const char* const sCSS1_first_letter = "first-letter"; -const sal_Char* const sCSS1_left = "left"; -const sal_Char* const sCSS1_right = "right"; -const sal_Char* const sCSS1_first = "first"; +const char* const sCSS1_left = "left"; +const char* const sCSS1_right = "right"; +const char* const sCSS1_first = "first"; -const sal_Char* const sCSS1_url = "url"; -const sal_Char* const sCSS1_rgb = "rgb"; +const char* const sCSS1_url = "url"; +const char* const sCSS1_rgb = "rgb"; -const sal_Char* const sCSS1_UNIT_pt = "pt"; -const sal_Char* const sCSS1_UNIT_mm = "mm"; -const sal_Char* const sCSS1_UNIT_cm = "cm"; -const sal_Char* const sCSS1_UNIT_pc = "pc"; -const sal_Char* const sCSS1_UNIT_inch = "in"; -const sal_Char* const sCSS1_UNIT_px = "px"; -const sal_Char* const sCSS1_UNIT_em = "em"; -const sal_Char* const sCSS1_UNIT_ex = "ex"; +const char* const sCSS1_UNIT_pt = "pt"; +const char* const sCSS1_UNIT_mm = "mm"; +const char* const sCSS1_UNIT_cm = "cm"; +const char* const sCSS1_UNIT_pc = "pc"; +const char* const sCSS1_UNIT_inch = "in"; +const char* const sCSS1_UNIT_px = "px"; +const char* const sCSS1_UNIT_em = "em"; +const char* const sCSS1_UNIT_ex = "ex"; // Strings for font properties -const sal_Char* const sCSS1_P_font_family = "font-family"; +const char* const sCSS1_P_font_family = "font-family"; -const sal_Char* const sCSS1_PV_serif = "serif"; -const sal_Char* const sCSS1_PV_sans_serif = "sans-serif"; -const sal_Char* const sCSS1_PV_cursive = "cursive"; -const sal_Char* const sCSS1_PV_fantasy = "fantasy"; -const sal_Char* const sCSS1_PV_monospace = "monospace"; +const char* const sCSS1_PV_serif = "serif"; +const char* const sCSS1_PV_sans_serif = "sans-serif"; +const char* const sCSS1_PV_cursive = "cursive"; +const char* const sCSS1_PV_fantasy = "fantasy"; +const char* const sCSS1_PV_monospace = "monospace"; -const sal_Char* const sCSS1_P_font_style = "font-style"; +const char* const sCSS1_P_font_style = "font-style"; -const sal_Char* const sCSS1_PV_normal = "normal"; -const sal_Char* const sCSS1_PV_italic = "italic"; -const sal_Char* const sCSS1_PV_oblique = "oblique"; +const char* const sCSS1_PV_normal = "normal"; +const char* const sCSS1_PV_italic = "italic"; +const char* const sCSS1_PV_oblique = "oblique"; -const sal_Char* const sCSS1_P_font_variant = "font-variant"; +const char* const sCSS1_P_font_variant = "font-variant"; -//const sal_Char* const sCSS1_PV_normal = "normal"; -const sal_Char* const sCSS1_PV_small_caps = "small-caps"; +//const char* const sCSS1_PV_normal = "normal"; +const char* const sCSS1_PV_small_caps = "small-caps"; -const sal_Char* const sCSS1_P_font_weight = "font-weight"; +const char* const sCSS1_P_font_weight = "font-weight"; -const sal_Char* const sCSS1_PV_extra_light = "extra-light"; -const sal_Char* const sCSS1_PV_light = "light"; -const sal_Char* const sCSS1_PV_demi_light = "demi-light"; -//const sal_Char* const sCSS1_PV_medium = "medium"; -const sal_Char* const sCSS1_PV_demi_bold = "demi-bold"; -const sal_Char* const sCSS1_PV_bold = "bold"; -const sal_Char* const sCSS1_PV_extra_bold = "extra-bold"; -const sal_Char* const sCSS1_PV_lighter = "lighter"; -const sal_Char* const sCSS1_PV_bolder = "bolder"; +const char* const sCSS1_PV_extra_light = "extra-light"; +const char* const sCSS1_PV_light = "light"; +const char* const sCSS1_PV_demi_light = "demi-light"; +//const char* const sCSS1_PV_medium = "medium"; +const char* const sCSS1_PV_demi_bold = "demi-bold"; +const char* const sCSS1_PV_bold = "bold"; +const char* const sCSS1_PV_extra_bold = "extra-bold"; +const char* const sCSS1_PV_lighter = "lighter"; +const char* const sCSS1_PV_bolder = "bolder"; -const sal_Char* const sCSS1_P_text_transform = "text-transform"; +const char* const sCSS1_P_text_transform = "text-transform"; -const sal_Char* const sCSS1_PV_capitalize = "capitalize"; -const sal_Char* const sCSS1_PV_uppercase = "uppercase"; -const sal_Char* const sCSS1_PV_lowercase = "lowercase"; +const char* const sCSS1_PV_capitalize = "capitalize"; +const char* const sCSS1_PV_uppercase = "uppercase"; +const char* const sCSS1_PV_lowercase = "lowercase"; -const sal_Char* const sCSS1_P_font_size = "font-size"; +const char* const sCSS1_P_font_size = "font-size"; -const sal_Char* const sCSS1_PV_xx_small = "xx-small"; -const sal_Char* const sCSS1_PV_x_small = "x-small"; -const sal_Char* const sCSS1_PV_small = "small"; -const sal_Char* const sCSS1_PV_medium = "medium"; -const sal_Char* const sCSS1_PV_large = "large"; -const sal_Char* const sCSS1_PV_x_large = "x-large"; -const sal_Char* const sCSS1_PV_xx_large = "xx-large"; +const char* const sCSS1_PV_xx_small = "xx-small"; +const char* const sCSS1_PV_x_small = "x-small"; +const char* const sCSS1_PV_small = "small"; +const char* const sCSS1_PV_medium = "medium"; +const char* const sCSS1_PV_large = "large"; +const char* const sCSS1_PV_x_large = "x-large"; +const char* const sCSS1_PV_xx_large = "xx-large"; -const sal_Char* const sCSS1_PV_larger = "larger"; -const sal_Char* const sCSS1_PV_smaller = "smaller"; +const char* const sCSS1_PV_larger = "larger"; +const char* const sCSS1_PV_smaller = "smaller"; -const sal_Char* const sCSS1_P_font = "font"; +const char* const sCSS1_P_font = "font"; // Strings for color and background properties -const sal_Char* const sCSS1_P_color = "color"; +const char* const sCSS1_P_color = "color"; -const sal_Char* const sCSS1_P_background = "background"; -const sal_Char* const sCSS1_P_background_color = "background-color"; +const char* const sCSS1_P_background = "background"; +const char* const sCSS1_P_background_color = "background-color"; -const sal_Char* const sCSS1_PV_transparent = "transparent"; +const char* const sCSS1_PV_transparent = "transparent"; -const sal_Char* const sCSS1_PV_repeat = "repeat"; -const sal_Char* const sCSS1_PV_repeat_x = "repeat-x"; -const sal_Char* const sCSS1_PV_repeat_y = "repeat-y"; -const sal_Char* const sCSS1_PV_no_repeat = "no-repeat"; +const char* const sCSS1_PV_repeat = "repeat"; +const char* const sCSS1_PV_repeat_x = "repeat-x"; +const char* const sCSS1_PV_repeat_y = "repeat-y"; +const char* const sCSS1_PV_no_repeat = "no-repeat"; -const sal_Char* const sCSS1_PV_top = "top"; -const sal_Char* const sCSS1_PV_middle = "middle"; -const sal_Char* const sCSS1_PV_bottom = "bottom"; +const char* const sCSS1_PV_top = "top"; +const char* const sCSS1_PV_middle = "middle"; +const char* const sCSS1_PV_bottom = "bottom"; -const sal_Char* const sCSS1_PV_scroll = "scroll"; +const char* const sCSS1_PV_scroll = "scroll"; // Strings for text properties -const sal_Char* const sCSS1_P_letter_spacing = "letter-spacing"; +const char* const sCSS1_P_letter_spacing = "letter-spacing"; -const sal_Char* const sCSS1_P_text_decoration = "text-decoration"; +const char* const sCSS1_P_text_decoration = "text-decoration"; -const sal_Char* const sCSS1_PV_none = "none"; -const sal_Char* const sCSS1_PV_underline = "underline"; -const sal_Char* const sCSS1_PV_overline = "overline"; -const sal_Char* const sCSS1_PV_line_through = "line-through"; -const sal_Char* const sCSS1_PV_blink = "blink"; +const char* const sCSS1_PV_none = "none"; +const char* const sCSS1_PV_underline = "underline"; +const char* const sCSS1_PV_overline = "overline"; +const char* const sCSS1_PV_line_through = "line-through"; +const char* const sCSS1_PV_blink = "blink"; -const sal_Char* const sCSS1_P_text_align = "text-align"; +const char* const sCSS1_P_text_align = "text-align"; -const sal_Char* const sCSS1_PV_left = "left"; -const sal_Char* const sCSS1_PV_center = "center"; -const sal_Char* const sCSS1_PV_right = "right"; -const sal_Char* const sCSS1_PV_justify = "justify"; +const char* const sCSS1_PV_left = "left"; +const char* const sCSS1_PV_center = "center"; +const char* const sCSS1_PV_right = "right"; +const char* const sCSS1_PV_justify = "justify"; -const sal_Char* const sCSS1_P_text_indent = "text-indent"; +const char* const sCSS1_P_text_indent = "text-indent"; -const sal_Char* const sCSS1_P_line_height = "line-height"; -const sal_Char* const sCSS1_P_list_style_type = "list-style-type"; +const char* const sCSS1_P_line_height = "line-height"; +const char* const sCSS1_P_list_style_type = "list-style-type"; // Strings for box properties -const sal_Char* const sCSS1_P_margin_left = "margin-left"; -const sal_Char* const sCSS1_P_margin_right = "margin-right"; -const sal_Char* const sCSS1_P_margin_top = "margin-top"; -const sal_Char* const sCSS1_P_margin_bottom = "margin-bottom"; -const sal_Char* const sCSS1_P_margin = "margin"; - -const sal_Char* const sCSS1_P_padding_top = "padding-top"; -const sal_Char* const sCSS1_P_padding_bottom = "padding-bottom"; -const sal_Char* const sCSS1_P_padding_left = "padding-left"; -const sal_Char* const sCSS1_P_padding_right = "padding-right"; -const sal_Char* const sCSS1_P_padding = "padding"; - -const sal_Char* const sCSS1_PV_auto = "auto"; - -const sal_Char* const sCSS1_P_border_left_width = "border-left-width"; -const sal_Char* const sCSS1_P_border_right_width = "border-right-width"; -const sal_Char* const sCSS1_P_border_top_width = "border-top-width"; -const sal_Char* const sCSS1_P_border_bottom_width = "border-bottom-width"; -const sal_Char* const sCSS1_P_border_width = "border-width"; -const sal_Char* const sCSS1_P_border_color = "border-color"; -const sal_Char* const sCSS1_P_border_style = "border-style"; -const sal_Char* const sCSS1_P_border_left = "border-left"; -const sal_Char* const sCSS1_P_border_right = "border-right"; -const sal_Char* const sCSS1_P_border_top = "border-top"; -const sal_Char* const sCSS1_P_border_bottom = "border-bottom"; -const sal_Char* const sCSS1_P_border = "border"; - -const sal_Char* const sCSS1_PV_thin = "thin"; -//const sal_Char* const sCSS1_PV_medium = "medium"; -const sal_Char* const sCSS1_PV_thick = "thick"; - -//const sal_Char* const sCSS1_PV_none = "none"; -const sal_Char* const sCSS1_PV_dotted = "dotted"; -const sal_Char* const sCSS1_PV_dashed = "dashed"; -const sal_Char* const sCSS1_PV_solid = "solid"; -const sal_Char* const sCSS1_PV_double = "double"; -const sal_Char* const sCSS1_PV_groove = "groove"; -const sal_Char* const sCSS1_PV_ridge = "ridge"; -const sal_Char* const sCSS1_PV_inset = "inset"; -const sal_Char* const sCSS1_PV_outset = "outset"; - -const sal_Char* const sCSS1_P_width = "width"; -const sal_Char* const sCSS1_P_max_width = "max-width"; - -const sal_Char* const sCSS1_P_height = "height"; - -const sal_Char* const sCSS1_P_float = "float"; - -const sal_Char* const sCSS1_P_column_count = "column-count"; +const char* const sCSS1_P_margin_left = "margin-left"; +const char* const sCSS1_P_margin_right = "margin-right"; +const char* const sCSS1_P_margin_top = "margin-top"; +const char* const sCSS1_P_margin_bottom = "margin-bottom"; +const char* const sCSS1_P_margin = "margin"; + +const char* const sCSS1_P_padding_top = "padding-top"; +const char* const sCSS1_P_padding_bottom = "padding-bottom"; +const char* const sCSS1_P_padding_left = "padding-left"; +const char* const sCSS1_P_padding_right = "padding-right"; +const char* const sCSS1_P_padding = "padding"; + +const char* const sCSS1_PV_auto = "auto"; + +const char* const sCSS1_P_border_left_width = "border-left-width"; +const char* const sCSS1_P_border_right_width = "border-right-width"; +const char* const sCSS1_P_border_top_width = "border-top-width"; +const char* const sCSS1_P_border_bottom_width = "border-bottom-width"; +const char* const sCSS1_P_border_width = "border-width"; +const char* const sCSS1_P_border_color = "border-color"; +const char* const sCSS1_P_border_style = "border-style"; +const char* const sCSS1_P_border_left = "border-left"; +const char* const sCSS1_P_border_right = "border-right"; +const char* const sCSS1_P_border_top = "border-top"; +const char* const sCSS1_P_border_bottom = "border-bottom"; +const char* const sCSS1_P_border = "border"; + +const char* const sCSS1_PV_thin = "thin"; +//const char* const sCSS1_PV_medium = "medium"; +const char* const sCSS1_PV_thick = "thick"; + +//const char* const sCSS1_PV_none = "none"; +const char* const sCSS1_PV_dotted = "dotted"; +const char* const sCSS1_PV_dashed = "dashed"; +const char* const sCSS1_PV_solid = "solid"; +const char* const sCSS1_PV_double = "double"; +const char* const sCSS1_PV_groove = "groove"; +const char* const sCSS1_PV_ridge = "ridge"; +const char* const sCSS1_PV_inset = "inset"; +const char* const sCSS1_PV_outset = "outset"; + +const char* const sCSS1_P_width = "width"; +const char* const sCSS1_P_max_width = "max-width"; + +const char* const sCSS1_P_height = "height"; + +const char* const sCSS1_P_float = "float"; + +const char* const sCSS1_P_column_count = "column-count"; // Strings for positioning -const sal_Char* const sCSS1_P_position = "position"; +const char* const sCSS1_P_position = "position"; -const sal_Char* const sCSS1_PV_absolute = "absolute"; -const sal_Char* const sCSS1_PV_relative = "relative"; -const sal_Char* const sCSS1_PV_static = "static"; +const char* const sCSS1_PV_absolute = "absolute"; +const char* const sCSS1_PV_relative = "relative"; +const char* const sCSS1_PV_static = "static"; -const sal_Char* const sCSS1_P_left = "left"; +const char* const sCSS1_P_left = "left"; -const sal_Char* const sCSS1_P_top = "top"; +const char* const sCSS1_P_top = "top"; // Strings for printing extensions -const sal_Char* const sCSS1_P_page_break_before = "page-break-before"; -const sal_Char* const sCSS1_P_page_break_after = "page-break-after"; -const sal_Char* const sCSS1_P_page_break_inside = "page-break-inside"; -const sal_Char* const sCSS1_P_size = "size"; -const sal_Char* const sCSS1_P_widows = "widows"; -const sal_Char* const sCSS1_P_orphans = "orphans"; -//const sal_Char* const sCSS1_P_marks = "marks"; +const char* const sCSS1_P_page_break_before = "page-break-before"; +const char* const sCSS1_P_page_break_after = "page-break-after"; +const char* const sCSS1_P_page_break_inside = "page-break-inside"; +const char* const sCSS1_P_size = "size"; +const char* const sCSS1_P_widows = "widows"; +const char* const sCSS1_P_orphans = "orphans"; +//const char* const sCSS1_P_marks = "marks"; -const sal_Char* const sCSS1_PV_always = "always"; -const sal_Char* const sCSS1_PV_avoid = "avoid"; +const char* const sCSS1_PV_always = "always"; +const char* const sCSS1_PV_avoid = "avoid"; -const sal_Char* const sCSS1_PV_portrait = "portrait"; -const sal_Char* const sCSS1_PV_landscape = "landscape"; +const char* const sCSS1_PV_portrait = "portrait"; +const char* const sCSS1_PV_landscape = "landscape"; -//const sal_Char* const sCSS1_PV_crop = "crop"; -//const sal_Char* const sCSS1_PV_cross = "cross"; +//const char* const sCSS1_PV_crop = "crop"; +//const char* const sCSS1_PV_cross = "cross"; -const sal_Char* const sCSS1_class_abs_pos = "sd-abs-pos"; +const char* const sCSS1_class_abs_pos = "sd-abs-pos"; -const sal_Char* const sCSS1_P_so_language = "so-language"; +const char* const sCSS1_P_so_language = "so-language"; -const sal_Char* const sCSS1_P_direction = "direction"; -const sal_Char* const sCSS1_PV_ltr = "ltr"; -const sal_Char* const sCSS1_PV_rtl = "rtl"; -const sal_Char* const sCSS1_PV_inherit = "inherit"; +const char* const sCSS1_P_direction = "direction"; +const char* const sCSS1_PV_ltr = "ltr"; +const char* const sCSS1_PV_rtl = "rtl"; +const char* const sCSS1_PV_inherit = "inherit"; -const sal_Char* const sCSS1_P_display = "display"; +const char* const sCSS1_P_display = "display"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx index 982fddc89c3d..00de608c0af9 100644 --- a/sw/source/filter/html/css1kywd.hxx +++ b/sw/source/filter/html/css1kywd.hxx @@ -22,226 +22,226 @@ #include <sal/types.h> -extern const sal_Char* const sCSS_mimetype; +extern const char* const sCSS_mimetype; -extern const sal_Char* const sCSS1_import; +extern const char* const sCSS1_import; -extern const sal_Char* const sCSS1_page; +extern const char* const sCSS1_page; -extern const sal_Char* const sCSS1_important; +extern const char* const sCSS1_important; -extern const sal_Char* const sCSS1_link; -extern const sal_Char* const sCSS1_visited; -extern const sal_Char* const sCSS1_first_letter; +extern const char* const sCSS1_link; +extern const char* const sCSS1_visited; +extern const char* const sCSS1_first_letter; -extern const sal_Char* const sCSS1_left; -extern const sal_Char* const sCSS1_right; -extern const sal_Char* const sCSS1_first; +extern const char* const sCSS1_left; +extern const char* const sCSS1_right; +extern const char* const sCSS1_first; -extern const sal_Char* const sCSS1_url; -extern const sal_Char* const sCSS1_rgb; +extern const char* const sCSS1_url; +extern const char* const sCSS1_rgb; -extern const sal_Char* const sCSS1_UNIT_pt; -extern const sal_Char* const sCSS1_UNIT_mm; -extern const sal_Char* const sCSS1_UNIT_cm; -extern const sal_Char* const sCSS1_UNIT_pc; -extern const sal_Char* const sCSS1_UNIT_inch; -extern const sal_Char* const sCSS1_UNIT_px; -extern const sal_Char* const sCSS1_UNIT_em; -extern const sal_Char* const sCSS1_UNIT_ex; +extern const char* const sCSS1_UNIT_pt; +extern const char* const sCSS1_UNIT_mm; +extern const char* const sCSS1_UNIT_cm; +extern const char* const sCSS1_UNIT_pc; +extern const char* const sCSS1_UNIT_inch; +extern const char* const sCSS1_UNIT_px; +extern const char* const sCSS1_UNIT_em; +extern const char* const sCSS1_UNIT_ex; // Strings for font properties -extern const sal_Char* const sCSS1_P_font_family; +extern const char* const sCSS1_P_font_family; -extern const sal_Char* const sCSS1_PV_serif; -extern const sal_Char* const sCSS1_PV_sans_serif; -extern const sal_Char* const sCSS1_PV_cursive; -extern const sal_Char* const sCSS1_PV_fantasy; -extern const sal_Char* const sCSS1_PV_monospace; +extern const char* const sCSS1_PV_serif; +extern const char* const sCSS1_PV_sans_serif; +extern const char* const sCSS1_PV_cursive; +extern const char* const sCSS1_PV_fantasy; +extern const char* const sCSS1_PV_monospace; -extern const sal_Char* const sCSS1_P_font_style; +extern const char* const sCSS1_P_font_style; -extern const sal_Char* const sCSS1_PV_normal; -extern const sal_Char* const sCSS1_PV_italic; -extern const sal_Char* const sCSS1_PV_oblique; +extern const char* const sCSS1_PV_normal; +extern const char* const sCSS1_PV_italic; +extern const char* const sCSS1_PV_oblique; -extern const sal_Char* const sCSS1_P_font_variant; +extern const char* const sCSS1_P_font_variant; -//extern const sal_Char* const sCSS1_PV_normal; -extern const sal_Char* const sCSS1_PV_small_caps; +//extern const char* const sCSS1_PV_normal; +extern const char* const sCSS1_PV_small_caps; -extern const sal_Char* const sCSS1_P_text_transform; +extern const char* const sCSS1_P_text_transform; -extern const sal_Char* const sCSS1_PV_capitalize; -extern const sal_Char* const sCSS1_PV_uppercase; -extern const sal_Char* const sCSS1_PV_lowercase; +extern const char* const sCSS1_PV_capitalize; +extern const char* const sCSS1_PV_uppercase; +extern const char* const sCSS1_PV_lowercase; -extern const sal_Char* const sCSS1_P_font_weight; +extern const char* const sCSS1_P_font_weight; -extern const sal_Char* const sCSS1_PV_extra_light; -extern const sal_Char* const sCSS1_PV_light; -extern const sal_Char* const sCSS1_PV_demi_light; -//extern const sal_Char* const sCSS1_PV_medium; -extern const sal_Char* const sCSS1_PV_demi_bold; -extern const sal_Char* const sCSS1_PV_bold; -extern const sal_Char* const sCSS1_PV_extra_bold; -extern const sal_Char* const sCSS1_PV_lighter; -extern const sal_Char* const sCSS1_PV_bolder; +extern const char* const sCSS1_PV_extra_light; +extern const char* const sCSS1_PV_light; +extern const char* const sCSS1_PV_demi_light; +//extern const char* const sCSS1_PV_medium; +extern const char* const sCSS1_PV_demi_bold; +extern const char* const sCSS1_PV_bold; +extern const char* const sCSS1_PV_extra_bold; +extern const char* const sCSS1_PV_lighter; +extern const char* const sCSS1_PV_bolder; -extern const sal_Char* const sCSS1_P_font_size; +extern const char* const sCSS1_P_font_size; -extern const sal_Char* const sCSS1_PV_xx_small; -extern const sal_Char* const sCSS1_PV_x_small; -extern const sal_Char* const sCSS1_PV_small; -extern const sal_Char* const sCSS1_PV_medium; -extern const sal_Char* const sCSS1_PV_large; -extern const sal_Char* const sCSS1_PV_x_large; -extern const sal_Char* const sCSS1_PV_xx_large; +extern const char* const sCSS1_PV_xx_small; +extern const char* const sCSS1_PV_x_small; +extern const char* const sCSS1_PV_small; +extern const char* const sCSS1_PV_medium; +extern const char* const sCSS1_PV_large; +extern const char* const sCSS1_PV_x_large; +extern const char* const sCSS1_PV_xx_large; -extern const sal_Char* const sCSS1_PV_larger; -extern const sal_Char* const sCSS1_PV_smaller; +extern const char* const sCSS1_PV_larger; +extern const char* const sCSS1_PV_smaller; -extern const sal_Char* const sCSS1_P_font; +extern const char* const sCSS1_P_font; // Strings for color and background properties -extern const sal_Char* const sCSS1_P_color; +extern const char* const sCSS1_P_color; -extern const sal_Char* const sCSS1_P_background; -extern const sal_Char* const sCSS1_P_background_color; +extern const char* const sCSS1_P_background; +extern const char* const sCSS1_P_background_color; -extern const sal_Char* const sCSS1_PV_transparent; +extern const char* const sCSS1_PV_transparent; -extern const sal_Char* const sCSS1_PV_repeat; -extern const sal_Char* const sCSS1_PV_repeat_x; -extern const sal_Char* const sCSS1_PV_repeat_y; -extern const sal_Char* const sCSS1_PV_no_repeat; +extern const char* const sCSS1_PV_repeat; +extern const char* const sCSS1_PV_repeat_x; +extern const char* const sCSS1_PV_repeat_y; +extern const char* const sCSS1_PV_no_repeat; -extern const sal_Char* const sCSS1_PV_top; -extern const sal_Char* const sCSS1_PV_middle; -extern const sal_Char* const sCSS1_PV_bottom; +extern const char* const sCSS1_PV_top; +extern const char* const sCSS1_PV_middle; +extern const char* const sCSS1_PV_bottom; -extern const sal_Char* const sCSS1_PV_scroll; +extern const char* const sCSS1_PV_scroll; // Strings for text properties -extern const sal_Char* const sCSS1_P_letter_spacing; +extern const char* const sCSS1_P_letter_spacing; -extern const sal_Char* const sCSS1_P_text_decoration; +extern const char* const sCSS1_P_text_decoration; -extern const sal_Char* const sCSS1_PV_none; -extern const sal_Char* const sCSS1_PV_underline; -extern const sal_Char* const sCSS1_PV_overline; -extern const sal_Char* const sCSS1_PV_line_through; -extern const sal_Char* const sCSS1_PV_blink; +extern const char* const sCSS1_PV_none; +extern const char* const sCSS1_PV_underline; +extern const char* const sCSS1_PV_overline; +extern const char* const sCSS1_PV_line_through; +extern const char* const sCSS1_PV_blink; -extern const sal_Char* const sCSS1_P_text_align; +extern const char* const sCSS1_P_text_align; -extern const sal_Char* const sCSS1_PV_left; -extern const sal_Char* const sCSS1_PV_center; -extern const sal_Char* const sCSS1_PV_right; -extern const sal_Char* const sCSS1_PV_justify; +extern const char* const sCSS1_PV_left; +extern const char* const sCSS1_PV_center; +extern const char* const sCSS1_PV_right; +extern const char* const sCSS1_PV_justify; -extern const sal_Char* const sCSS1_P_text_indent; +extern const char* const sCSS1_P_text_indent; -extern const sal_Char* const sCSS1_P_line_height; +extern const char* const sCSS1_P_line_height; -extern const sal_Char* const sCSS1_P_list_style_type; +extern const char* const sCSS1_P_list_style_type; // Strings for box properties -extern const sal_Char* const sCSS1_P_margin_left; -extern const sal_Char* const sCSS1_P_margin_right; -extern const sal_Char* const sCSS1_P_margin_top; -extern const sal_Char* const sCSS1_P_margin_bottom; -extern const sal_Char* const sCSS1_P_margin; - -extern const sal_Char* const sCSS1_P_padding_top; -extern const sal_Char* const sCSS1_P_padding_bottom; -extern const sal_Char* const sCSS1_P_padding_left; -extern const sal_Char* const sCSS1_P_padding_right; -extern const sal_Char* const sCSS1_P_padding; - -extern const sal_Char* const sCSS1_PV_auto; - -extern const sal_Char* const sCSS1_P_border_left_width; -extern const sal_Char* const sCSS1_P_border_right_width; -extern const sal_Char* const sCSS1_P_border_top_width; -extern const sal_Char* const sCSS1_P_border_bottom_width; -extern const sal_Char* const sCSS1_P_border_width; -extern const sal_Char* const sCSS1_P_border_color; -extern const sal_Char* const sCSS1_P_border_style; -extern const sal_Char* const sCSS1_P_border_left; -extern const sal_Char* const sCSS1_P_border_right; -extern const sal_Char* const sCSS1_P_border_top; -extern const sal_Char* const sCSS1_P_border_bottom; -extern const sal_Char* const sCSS1_P_border; - -extern const sal_Char* const sCSS1_PV_thin; -//extern const sal_Char* const sCSS1_PV_medium; -extern const sal_Char* const sCSS1_PV_thick; - -//extern const sal_Char* const sCSS1_PV_none; -extern const sal_Char* const sCSS1_PV_dotted; -extern const sal_Char* const sCSS1_PV_dashed; -extern const sal_Char* const sCSS1_PV_solid; -extern const sal_Char* const sCSS1_PV_double; -extern const sal_Char* const sCSS1_PV_groove; -extern const sal_Char* const sCSS1_PV_ridge; -extern const sal_Char* const sCSS1_PV_inset; -extern const sal_Char* const sCSS1_PV_outset; - -extern const sal_Char* const sCSS1_P_width; -extern const sal_Char* const sCSS1_P_max_width; - -extern const sal_Char* const sCSS1_P_height; - -extern const sal_Char* const sCSS1_P_float; - -extern const sal_Char* const sCSS1_P_column_count; +extern const char* const sCSS1_P_margin_left; +extern const char* const sCSS1_P_margin_right; +extern const char* const sCSS1_P_margin_top; +extern const char* const sCSS1_P_margin_bottom; +extern const char* const sCSS1_P_margin; + +extern const char* const sCSS1_P_padding_top; +extern const char* const sCSS1_P_padding_bottom; +extern const char* const sCSS1_P_padding_left; +extern const char* const sCSS1_P_padding_right; +extern const char* const sCSS1_P_padding; + +extern const char* const sCSS1_PV_auto; + +extern const char* const sCSS1_P_border_left_width; +extern const char* const sCSS1_P_border_right_width; +extern const char* const sCSS1_P_border_top_width; +extern const char* const sCSS1_P_border_bottom_width; +extern const char* const sCSS1_P_border_width; +extern const char* const sCSS1_P_border_color; +extern const char* const sCSS1_P_border_style; +extern const char* const sCSS1_P_border_left; +extern const char* const sCSS1_P_border_right; +extern const char* const sCSS1_P_border_top; +extern const char* const sCSS1_P_border_bottom; +extern const char* const sCSS1_P_border; + +extern const char* const sCSS1_PV_thin; +//extern const char* const sCSS1_PV_medium; +extern const char* const sCSS1_PV_thick; + +//extern const char* const sCSS1_PV_none; +extern const char* const sCSS1_PV_dotted; +extern const char* const sCSS1_PV_dashed; +extern const char* const sCSS1_PV_solid; +extern const char* const sCSS1_PV_double; +extern const char* const sCSS1_PV_groove; +extern const char* const sCSS1_PV_ridge; +extern const char* const sCSS1_PV_inset; +extern const char* const sCSS1_PV_outset; + +extern const char* const sCSS1_P_width; +extern const char* const sCSS1_P_max_width; + +extern const char* const sCSS1_P_height; + +extern const char* const sCSS1_P_float; + +extern const char* const sCSS1_P_column_count; // Strings for positioning -extern const sal_Char* const sCSS1_P_position; +extern const char* const sCSS1_P_position; -extern const sal_Char* const sCSS1_PV_absolute; -extern const sal_Char* const sCSS1_PV_relative; -extern const sal_Char* const sCSS1_PV_static; +extern const char* const sCSS1_PV_absolute; +extern const char* const sCSS1_PV_relative; +extern const char* const sCSS1_PV_static; -extern const sal_Char* const sCSS1_P_left; +extern const char* const sCSS1_P_left; -extern const sal_Char* const sCSS1_P_top; +extern const char* const sCSS1_P_top; // Strings for printing extensions -extern const sal_Char* const sCSS1_P_page_break_before; -extern const sal_Char* const sCSS1_P_page_break_after; -extern const sal_Char* const sCSS1_P_page_break_inside; -extern const sal_Char* const sCSS1_P_size; -extern const sal_Char* const sCSS1_P_widows; -extern const sal_Char* const sCSS1_P_orphans; -//extern const sal_Char* const sCSS1_P_marks; +extern const char* const sCSS1_P_page_break_before; +extern const char* const sCSS1_P_page_break_after; +extern const char* const sCSS1_P_page_break_inside; +extern const char* const sCSS1_P_size; +extern const char* const sCSS1_P_widows; +extern const char* const sCSS1_P_orphans; +//extern const char* const sCSS1_P_marks; -extern const sal_Char* const sCSS1_PV_always; -extern const sal_Char* const sCSS1_PV_avoid; +extern const char* const sCSS1_PV_always; +extern const char* const sCSS1_PV_avoid; -extern const sal_Char* const sCSS1_PV_portrait; -extern const sal_Char* const sCSS1_PV_landscape; +extern const char* const sCSS1_PV_portrait; +extern const char* const sCSS1_PV_landscape; -//extern const sal_Char* const sCSS1_PV_crop; -//extern const sal_Char* const sCSS1_PV_cross; +//extern const char* const sCSS1_PV_crop; +//extern const char* const sCSS1_PV_cross; -extern const sal_Char* const sCSS1_class_abs_pos; +extern const char* const sCSS1_class_abs_pos; -extern const sal_Char* const sCSS1_P_so_language; -extern const sal_Char* const sCSS1_P_direction; -extern const sal_Char* const sCSS1_PV_ltr; -extern const sal_Char* const sCSS1_PV_rtl; -extern const sal_Char* const sCSS1_PV_inherit; +extern const char* const sCSS1_P_so_language; +extern const char* const sCSS1_P_direction; +extern const char* const sCSS1_PV_ltr; +extern const char* const sCSS1_PV_rtl; +extern const char* const sCSS1_PV_inherit; -extern const sal_Char* const sCSS1_P_display; +extern const char* const sCSS1_P_display; #endif diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index d21caceb42ea..7c1258ae90bd 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2545,7 +2545,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) if( rHTMLWrt.m_bClearLeft || rHTMLWrt.m_bClearRight ) { - const sal_Char* pString; + const char* pString; if( rHTMLWrt.m_bClearLeft ) { if( rHTMLWrt.m_bClearRight ) @@ -2974,7 +2974,7 @@ Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat, if( bScriptDependent ) { sOut += " " OOO_STRING_SVTOOLS_HTML_O_class "=\""; - const sal_Char* pStr = nullptr; + const char* pStr = nullptr; switch( rHTMLWrt.m_nCSS1Script ) { case CSS1_OUTMODE_WESTERN: @@ -3172,7 +3172,7 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; const SvxAdjustItem& rAdjust = static_cast<const SvxAdjustItem&>(rHt); - const sal_Char* pStr = nullptr; + const char* pStr = nullptr; switch( rAdjust.GetAdjust() ) { case SvxAdjust::Center: pStr = OOO_STRING_SVTOOLS_HTML_AL_center; break; diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 3dba704e9954..3a0c5cb34aae 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1125,7 +1125,7 @@ SwCharFormat* SwCSS1Parser::GetChrFormat( HtmlTokenId nToken2, const OUString& r { // search the corresponding style sal_uInt16 nPoolId = 0; - const sal_Char* sName = nullptr; + const char* sName = nullptr; switch( nToken2 ) { case HtmlTokenId::EMPHASIS_ON: nPoolId = RES_POOLCHR_HTML_EMPHASIS; break; @@ -1691,7 +1691,7 @@ bool SwHTMLParser::FileDownload( const OUString& rURL, SvMemoryStream aStream; aStream.WriteStream( *pStream ); - rStr = OUString(static_cast<const sal_Char *>(aStream.GetData()), aStream.TellEnd(), + rStr = OUString(static_cast<const char *>(aStream.GetData()), aStream.TellEnd(), GetSrcEncoding()); } diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index 7418be69fa9a..a1b6f6aa094b 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -140,7 +140,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt, SdrTextAniKind::Slide==eAniKind, "Text-Draw-Object not suitable for marquee" ); - const sal_Char *pStr = nullptr; + const char *pStr = nullptr; switch( eAniKind ) { case SdrTextAniKind::Scroll: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_scroll; break; diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index b3873dc92145..2d8a71082cee 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -42,7 +42,7 @@ namespace { struct HTMLNumFormatTableEntry { - const sal_Char *pName; + const char *pName; NfIndexTableOffset const eFormat; }; @@ -583,7 +583,7 @@ void SwHTMLParser::InsertFieldText() } } -void SwHTMLParser::InsertCommentText( const sal_Char *pTag ) +void SwHTMLParser::InsertCommentText( const char *pTag ) { bool bEmpty = m_aContents.isEmpty(); if( !bEmpty ) @@ -596,7 +596,7 @@ void SwHTMLParser::InsertCommentText( const sal_Char *pTag ) } } -void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag ) +void SwHTMLParser::InsertComment( const OUString& rComment, const char *pTag ) { OUString aComment( rComment ); if( pTag ) diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 2f058945196d..33014b6dddef 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -39,9 +39,9 @@ using namespace nsSwDocInfoSubType; -const sal_Char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFormat ) +const char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFormat ) { - const sal_Char *pFormatStr = nullptr; + const char *pFormatStr = nullptr; switch( static_cast<SvxNumType>(nFormat) ) { @@ -71,7 +71,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, SwFieldIds nField = pFieldTyp->Which(); sal_uLong nFormat = pField->GetFormat(); - const sal_Char *pTypeStr=nullptr, // TYPE + const char *pTypeStr=nullptr, // TYPE *pSubStr=nullptr, // SUBTYPE *pFormatStr=nullptr; // FORMAT (SW) OUString aValue; // VALUE (SW) diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index c9f1d06ded86..93c948f76013 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -529,7 +529,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, if( (nFrameOpts & (HtmlFrmOpts::Id|HtmlFrmOpts::Name)) && !rFrameFormat.GetName().isEmpty() ) { - const sal_Char *pStr = + const char *pStr = (nFrameOpts & HtmlFrmOpts::Id) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name; sOut.append(' ').append(pStr). append("=\""); @@ -557,7 +557,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, } // ALIGN - const sal_Char *pStr = nullptr; + const char *pStr = nullptr; RndStdIds eAnchorId = rFrameFormat.GetAnchor().GetAnchorId(); if( (nFrameOpts & HtmlFrmOpts::Align) && ((RndStdIds::FLY_AT_PARA == eAnchorId) || (RndStdIds::FLY_AT_CHAR == eAnchorId)) ) @@ -810,7 +810,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma if( (nFrameOptions & (HtmlFrmOpts::Id|HtmlFrmOpts::Name)) && !rFrameFormat.GetName().isEmpty() && !bReplacement) { - const sal_Char* pAttributeName = (nFrameOptions & HtmlFrmOpts::Id) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name; + const char* pAttributeName = (nFrameOptions & HtmlFrmOpts::Id) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name; aHtml.attribute(pAttributeName, rFrameFormat.GetName()); } @@ -829,7 +829,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma } // align - const sal_Char* pAlignString = nullptr; + const char* pAlignString = nullptr; RndStdIds eAnchorId = rFrameFormat.GetAnchor().GetAnchorId(); if( (nFrameOptions & HtmlFrmOpts::Align) && ((RndStdIds::FLY_AT_PARA == eAnchorId) || (RndStdIds::FLY_AT_CHAR == eAnchorId)) && !bReplacement) @@ -1002,7 +1002,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma (RndStdIds::FLY_AT_CHAR == rFrameFormat.GetAnchor().GetAnchorId())) && SfxItemState::SET == rItemSet.GetItemState( RES_SURROUND, true, &pItem )) { - const sal_Char* pSurroundString = nullptr; + const char* pSurroundString = nullptr; const SwFormatSurround* pSurround = static_cast<const SwFormatSurround*>(pItem); sal_Int16 eHoriOri = rFrameFormat.GetHoriOrient().GetHoriOrient(); @@ -1160,7 +1160,7 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con rHTMLWrt.m_aImgMapNames.push_back(aIMapName); OString aIndMap, aIndArea; - const sal_Char *pIndArea = nullptr, *pIndMap = nullptr; + const char *pIndArea = nullptr, *pIndMap = nullptr; if (rHTMLWrt.m_bLFPossible) { @@ -1201,7 +1201,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat, const OUString& rGraphicURL, Graphic const & rGraphic, const OUString& rAlternateText, const Size &rRealSize, HtmlFrmOpts nFrameOpts, - const sal_Char *pMarkType, + const char *pMarkType, const ImageMap *pAltImgMap, const OUString& rMimeType ) { @@ -1449,7 +1449,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat, } Writer& OutHTML_BulletImage( Writer& rWrt, - const sal_Char *pTag, + const char *pTag, const SvxBrushItem* pBrush, const OUString &rGraphicURL) { diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 21631bb9ad12..b89807242701 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -129,7 +129,7 @@ static SvMacroItemId aEventTypeTable[] = SvMacroItemId::NONE }; -const sal_Char * aEventListenerTable[] = +const char * aEventListenerTable[] = { "XSubmitListener", "XResetListener", @@ -141,7 +141,7 @@ const sal_Char * aEventListenerTable[] = "" }; -const sal_Char * aEventMethodTable[] = +const char * aEventMethodTable[] = { "approveSubmit", "approveReset", @@ -153,7 +153,7 @@ const sal_Char * aEventMethodTable[] = "" }; -const sal_Char * aEventSDOptionTable[] = +const char * aEventSDOptionTable[] = { OOO_STRING_SVTOOLS_HTML_O_SDonsubmit, OOO_STRING_SVTOOLS_HTML_O_SDonreset, @@ -165,7 +165,7 @@ const sal_Char * aEventSDOptionTable[] = nullptr }; -const sal_Char * aEventOptionTable[] = +const char * aEventOptionTable[] = { OOO_STRING_SVTOOLS_HTML_O_onsubmit, OOO_STRING_SVTOOLS_HTML_O_onreset, @@ -1545,7 +1545,7 @@ void SwHTMLParser::InsertInput() } // Default is HTMLInputType::Text - const sal_Char *pType = "TextField"; + const char *pType = "TextField"; bool bKeepCRLFInValue = false; switch( eType ) { diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx index 562bb65089d7..5564a7d29315 100644 --- a/sw/source/filter/html/htmlform.hxx +++ b/sw/source/filter/html/htmlform.hxx @@ -22,10 +22,10 @@ #include <sal/types.h> -extern const sal_Char * aEventListenerTable[]; -extern const sal_Char * aEventMethodTable[]; -extern const sal_Char * aEventSDOptionTable[]; -extern const sal_Char * aEventOptionTable[]; +extern const char * aEventListenerTable[]; +extern const char * aEventMethodTable[]; +extern const char * aEventSDOptionTable[]; +extern const char * aEventOptionTable[]; #endif diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 371daae0a26e..4b00a5b57705 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -150,7 +150,7 @@ static void lcl_html_outEvents( SvStream& rStrm, } OUString sMethod( rDesc.EventMethod ); - const sal_Char *pOpt = nullptr; + const char *pOpt = nullptr; for( int j=0; aEventListenerTable[j]; j++ ) { if( sListener.equalsAscii( aEventListenerTable[j] ) && @@ -487,7 +487,7 @@ void SwHTMLWriter::OutForm( bool bOn, aTmp = xFormPropSet->getPropertyValue( "SubmitEncoding" ); if( auto eEncType = o3tl::tryAccess<form::FormSubmitEncoding>(aTmp) ) { - const sal_Char *pStr = nullptr; + const char *pStr = nullptr; switch( *eEncType ) { case form::FormSubmitEncoding_MULTIPART: @@ -840,7 +840,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, (aTmp.getValueType() == cppu::UnoType<bool>::get() && !*o3tl::forceAccess<bool>(aTmp)) ) { - const sal_Char *pWrapStr = nullptr; + const char *pWrapStr = nullptr; auto aTmp2 = xPropSet->getPropertyValue( "HardLineBreaks" ); auto b = o3tl::tryAccess<bool>(aTmp2); pWrapStr = (b && *b) ? OOO_STRING_SVTOOLS_HTML_WW_hard diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 79c61648ab98..a55b3801cc01 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -460,7 +460,7 @@ static int lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo, sal_Int16 eFormat = rInfo.aFormat.GetNumberingType(); if( (bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC) != eFormat ) { - const sal_Char *pStr = SwHTMLWriter::GetNumFormat( eFormat ); + const char *pStr = SwHTMLWriter::GetNumFormat( eFormat ); if( pStr ) { pParts[0] = OUString::createFromAscii( pStr ); @@ -487,7 +487,7 @@ static int lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo, } static void lcl_html_outFootEndNoteInfo( Writer& rWrt, OUString const *pParts, - int nParts, const sal_Char *pName ) + int nParts, const char *pName ) { SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt); diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx index 9658b510a3a4..8977e0dbf684 100644 --- a/sw/source/filter/html/htmlnumwriter.cxx +++ b/sw/source/filter/html/htmlnumwriter.cxx @@ -183,7 +183,7 @@ Writer& OutHTML_NumberBulletListStart( SwHTMLWriter& rWrt, sOut += OString(OOO_STRING_SVTOOLS_HTML_unorderlist); // determine the type by the bullet character - const sal_Char *pStr = nullptr; + const char *pStr = nullptr; switch( rNumFormat.GetBulletChar() ) { case HTML_BULLETCHAR_DISC: @@ -218,7 +218,7 @@ Writer& OutHTML_NumberBulletListStart( SwHTMLWriter& rWrt, sOut += OString(OOO_STRING_SVTOOLS_HTML_orderlist); // determine the type by the format - sal_Char cType = 0; + char cType = 0; switch( eType ) { case SVX_NUM_CHARS_UPPER_LETTER: diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index ba436978a9d7..8527410527fc 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -389,7 +389,7 @@ CSS1Token CSS1Parser::GetNextToken() aIdent += sTmpBuffer2; // Is it a unit? - const sal_Char *pCmp1 = nullptr, *pCmp2 = nullptr, *pCmp3 = nullptr; + const char *pCmp1 = nullptr, *pCmp2 = nullptr, *pCmp3 = nullptr; double nScale1 = 1., nScale2 = 1.; CSS1Token nToken1 = CSS1_LENGTH, nToken2 = CSS1_LENGTH, diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index bb4dc73ae525..cb871452569c 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -85,7 +85,7 @@ namespace o3tl { struct CSS1PropertyEnum { - const sal_Char *pName; // property value + const char *pName; // property value sal_uInt16 const nEnum; // and the corresponding value of enum }; diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index c8d58de80b6a..07f7e87c41e8 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -720,8 +720,8 @@ private: // insert bookmark void InsertBookmark( const OUString& rName ); - void InsertCommentText( const sal_Char *pTag ); - void InsertComment( const OUString& rName, const sal_Char *pTag = nullptr ); + void InsertCommentText( const char *pTag ); + void InsertComment( const OUString& rName, const char *pTag = nullptr ); // Has the current paragraph bookmarks? bool HasCurrentParaBookmarks( bool bIgnoreStack=false ) const; diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 401c279895ef..91dc026ba61a 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -86,7 +86,7 @@ using namespace css; -static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = +static char sIndentTabs[MAX_INDENT_LEVEL+2] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL, const OUString& rFilterOptions ) @@ -302,7 +302,7 @@ ErrCode SwHTMLWriter::WriteStream() bool bWriteUTF8 = m_bWriteClipboardDoc; m_eDestEnc = bWriteUTF8 ? RTL_TEXTENCODING_UTF8 : rHtmlOptions.GetTextEncoding(); - const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( m_eDestEnc ); + const char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( m_eDestEnc ); m_eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet ); // Only for the MS-IE we favour the export of styles. @@ -642,7 +642,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aEncURL, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); - const sal_Char* const pDelim = "ÿ"; + const char* const pDelim = "ÿ"; if( !aFilter.isEmpty() || !aSection.isEmpty() || bURLContainsDelim ) rHTMLWrt.Strm().WriteCharPtr( pDelim ); if( !aFilter.isEmpty() ) @@ -865,7 +865,7 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam ) } // write the StyleTable, general data, header/footer/footnotes -static void OutBodyColor( const sal_Char* pTag, const SwFormat *pFormat, +static void OutBodyColor( const char* pTag, const SwFormat *pFormat, SwHTMLWriter& rHWrt ) { const SwFormat *pRefFormat = nullptr; @@ -1214,7 +1214,7 @@ void SwHTMLWriter::OutPointFieldmarks( const SwPosition& rPos ) } void SwHTMLWriter::OutImplicitMark( const OUString& rMark, - const sal_Char *pMarkType ) + const char *pMarkType ) { if( !rMark.isEmpty() && !m_aImplicitMarks.empty() ) { diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index b0b6b96ad104..27304b8705da 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -418,7 +418,7 @@ public: void OutAnchor( const OUString& rName ); void OutBookmarks(); void OutPointFieldmarks( const SwPosition& rPos ); - void OutImplicitMark( const OUString& rMark, const sal_Char *pMarkType ); + void OutImplicitMark( const OUString& rMark, const char *pMarkType ); OUString convertHyperlinkHRefValue(const OUString& rURL); @@ -451,15 +451,15 @@ public: void OutStyleSheet( const SwPageDesc& rPageDesc ); - inline void OutCSS1_PropertyAscii( const sal_Char *pProp, - const sal_Char *pVal ); - inline void OutCSS1_PropertyAscii( const sal_Char *pProp, + inline void OutCSS1_PropertyAscii( const char *pProp, + const char *pVal ); + inline void OutCSS1_PropertyAscii( const char *pProp, const OString& rVal ); - inline void OutCSS1_Property( const sal_Char *pProp, const OUString& rVal ); - void OutCSS1_Property( const sal_Char *pProp, const sal_Char *pVal, + inline void OutCSS1_Property( const char *pProp, const OUString& rVal ); + void OutCSS1_Property( const char *pProp, const char *pVal, const OUString *pSVal ); - void OutCSS1_UnitProperty( const sal_Char *pProp, long nVal ); - void OutCSS1_PixelProperty( const sal_Char *pProp, long nVal, bool bVert ); + void OutCSS1_UnitProperty( const char *pProp, long nVal ); + void OutCSS1_PixelProperty( const char *pProp, long nVal, bool bVert ); void OutCSS1_SfxItemSet( const SfxItemSet& rItemSet, bool bDeep=true ); // events of BODY tag from SFX configuration @@ -574,7 +574,7 @@ public: inline bool IsCSS1Source( sal_uInt16 n ) const; inline bool IsCSS1Script( sal_uInt16 n ) const; - static const sal_Char *GetNumFormat( sal_uInt16 nFormat ); + static const char *GetNumFormat( sal_uInt16 nFormat ); static void PrepareFontList( const SvxFontItem& rFontItem, OUString& rNames, sal_Unicode cQuote, bool bGeneric ); static sal_uInt16 GetCSS1ScriptForScriptType( sal_uInt16 nScriptType ); @@ -599,19 +599,19 @@ inline bool SwHTMLWriter::IsCSS1Script( sal_uInt16 n ) const return CSS1_OUTMODE_ANY_SCRIPT == nScript || n == nScript; } -inline void SwHTMLWriter::OutCSS1_PropertyAscii( const sal_Char *pProp, - const sal_Char *pVal ) +inline void SwHTMLWriter::OutCSS1_PropertyAscii( const char *pProp, + const char *pVal ) { OutCSS1_Property( pProp, pVal, nullptr ); } -inline void SwHTMLWriter::OutCSS1_PropertyAscii( const sal_Char *pProp, +inline void SwHTMLWriter::OutCSS1_PropertyAscii( const char *pProp, const OString& rVal ) { OutCSS1_Property( pProp, rVal.getStr(), nullptr ); } -inline void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, +inline void SwHTMLWriter::OutCSS1_Property( const char *pProp, const OUString& rVal ) { OutCSS1_Property( pProp, nullptr, &rVal ); @@ -666,11 +666,11 @@ Writer& OutHTML_Image( Writer&, const SwFrameFormat& rFormat, ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
