diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-23 10:21:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-23 10:50:52 +0100 |
| commit | 40a7abaab8bead1b1f04774324b7d652ce7f75f1 (patch) | |
| tree | 4aaed5c2679c23357cd64177514480ab4080975f /sw/source | |
| parent | 68a5afaaabd0c75bba3439cfdff90fb75d1cdd3f (diff) | |
sal_Char->char in sw
Change-Id: I63fb87a8e8eaf9c9da7bf7b8b6f5706222ffcc07
Reviewed-on: https://gerrit.libreoffice.org/85730
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source')
79 files changed, 609 insertions, 610 deletions
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, const OUString& rGraphicURL, Graphic const & rGraphic, const OUString& rAlternateText, const Size& rRealSize, HtmlFrmOpts nFrameOpts, - const sal_Char *pMarkType, + const char *pMarkType, const ImageMap *pGenImgMap, const OUString& rMimeType = OUString() ); -Writer& OutHTML_BulletImage( Writer& rWrt, const sal_Char *pTag, +Writer& OutHTML_BulletImage( Writer& rWrt, const char *pTag, const SvxBrushItem* pBrush, const OUString& rGraphicURL); diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx index 3644a8193046..19faeaad118e 100644 --- a/sw/source/filter/inc/wwstyles.hxx +++ b/sw/source/filter/inc/wwstyles.hxx @@ -159,7 +159,7 @@ namespace ww @return the name word would give it if it's an inbuilt name, otherwise NULL */ - const sal_Char* GetEnglishNameFromSti(sti eSti) throw(); + const char* GetEnglishNameFromSti(sti eSti) throw(); /** Determine if the WinWord sti is standard Character Style diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 7214c84b3ca7..bb761851da6c 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -42,13 +42,13 @@ namespace { SvStream& lcl_OutLongExt( SvStream& rStrm, sal_uLong nVal, bool bNeg ) { - sal_Char aBuf[28]; + char aBuf[28]; int i = SAL_N_ELEMENTS(aBuf); aBuf[--i] = 0; do { - aBuf[--i] = '0' + static_cast<sal_Char>(nVal % 10); + aBuf[--i] = '0' + static_cast<char>(nVal % 10); nVal /= 10; } while (nVal); diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index dfcbd9162ea4..b05c6804c7da 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -677,7 +677,7 @@ public: class WW8Ruby { sal_Int32 m_nJC; - sal_Char m_cDirective; + char m_cDirective; sal_uInt32 m_nRubyHeight; sal_uInt32 m_nBaseHeight; OUString m_sFontFamily; @@ -685,7 +685,7 @@ class WW8Ruby public: WW8Ruby(const SwTextNode& rNode, const SwFormatRuby& rRuby, const MSWordExportBase& rExport ); sal_Int32 GetJC() const { return m_nJC; } - sal_Char GetDirective() const { return m_cDirective; } + char GetDirective() const { return m_cDirective; } sal_uInt32 GetRubyHeight() const { return m_nRubyHeight; } sal_uInt32 GetBaseHeight() const { return m_nBaseHeight; } OUString const & GetFontFamily() const { return m_sFontFamily; } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 922b70e0f12c..684944b0311f 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3630,7 +3630,7 @@ namespace { /// Does the same as comphelper::string::padToLength(), but extends the start, not the end. -OString lcl_padStartToLength(OString const & aString, sal_Int32 nLen, sal_Char cFill) +OString lcl_padStartToLength(OString const & aString, sal_Int32 nLen, char cFill) { if (nLen > aString.getLength()) { @@ -5834,7 +5834,7 @@ void DocxAttributeOutput::StartStyle( const OUString& rName, StyleType eType, } // MSO exports English names and writerfilter only recognize them. - const sal_Char *pEnglishName = nullptr; + const char *pEnglishName = nullptr; const char* pType = nullptr; switch (eType) { @@ -7167,13 +7167,13 @@ void DocxAttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines ) OString sBracket; if ((cStart == '{') || (cEnd == '}')) - sBracket = const_cast<sal_Char *>("curly"); + sBracket = const_cast<char *>("curly"); else if ((cStart == '<') || (cEnd == '>')) - sBracket = const_cast<sal_Char *>("angle"); + sBracket = const_cast<char *>("angle"); else if ((cStart == '[') || (cEnd == ']')) - sBracket = const_cast<sal_Char *>("square"); + sBracket = const_cast<char *>("square"); else - sBracket = const_cast<sal_Char *>("round"); + sBracket = const_cast<char *>("round"); AddToAttrList( m_pEastAsianLayoutAttrList, FSNS( XML_w, XML_combineBrackets ), sBracket.getStr() ); } @@ -9214,7 +9214,7 @@ void DocxAttributeOutput::BulletDefinition(int nId, const Graphic& rGraphic, Siz m_pSerializer->endElementNS(XML_w, XML_numPicBullet); } -void DocxAttributeOutput::AddToAttrList( rtl::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue ) +void DocxAttributeOutput::AddToAttrList( rtl::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const char* sAttrValue ) { AddToAttrList( pAttrList, 1, nAttrName, sAttrValue ); } diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 7f3f0e6edb57..e44adc02be40 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -726,7 +726,7 @@ private: void EndField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos& rInfos ); void DoWriteFieldRunProperties( const SwTextNode* pNode, sal_Int32 nPos, bool bWriteCombChars = false ); - static void AddToAttrList( rtl::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue ); + static void AddToAttrList( rtl::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const char* sAttrValue ); static void AddToAttrList( rtl::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nArgs, ... ); rtl::Reference<sax_fastparser::FastAttributeList> m_pFontsAttrList; diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 512c5cb77b15..152f5141e1d6 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -98,7 +98,7 @@ using namespace ::com::sun::star; using namespace sw::util; static OString OutTBLBorderLine(RtfExport const& rExport, const editeng::SvxBorderLine* pLine, - const sal_Char* pStr) + const char* pStr) { OStringBuffer aRet; if (!pLine->isEmpty()) @@ -190,7 +190,7 @@ static OString OutTBLBorderLine(RtfExport const& rExport, const editeng::SvxBord } static OString OutBorderLine(RtfExport const& rExport, const editeng::SvxBorderLine* pLine, - const sal_Char* pStr, sal_uInt16 nDist, + const char* pStr, sal_uInt16 nDist, SvxShadowLocation eShadowLocation = SvxShadowLocation::NONE) { OStringBuffer aRet; @@ -1687,7 +1687,7 @@ void RtfAttributeOutput::WriteAnnotationMarks_Impl(std::vector<OUString>& rStart } void RtfAttributeOutput::WriteHeaderFooter_Impl(const SwFrameFormat& rFormat, bool bHeader, - const sal_Char* pStr, bool bTitlepg) + const char* pStr, bool bTitlepg) { OStringBuffer aSectionBreaks = m_aSectionBreaks; m_aSectionBreaks.setLength(0); @@ -2100,7 +2100,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi OStringBuffer aBuf; OString aStr; OUString aTmp; - const sal_Char* pStr; + const char* pStr; m_aRun->append(OUStringToOString(FieldString(ww::eFORMTEXT), m_rExport.GetCurrentEncoding())); @@ -2108,18 +2108,18 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_DATAFIELD " "); for (int i = 0; i < 8; i++) - aBuf.append(sal_Char(0x00)); + aBuf.append(char(0x00)); xPropSet->getPropertyValue("Name") >>= aTmp; aStr = OUStringToOString(aTmp, m_rExport.GetCurrentEncoding()); - aBuf.append(static_cast<sal_Char>(aStr.getLength())); + aBuf.append(static_cast<char>(aStr.getLength())); aBuf.append(aStr); - aBuf.append(sal_Char(0x00)); + aBuf.append(char(0x00)); xPropSet->getPropertyValue("DefaultText") >>= aTmp; aStr = OUStringToOString(aTmp, m_rExport.GetCurrentEncoding()); - aBuf.append(static_cast<sal_Char>(aStr.getLength())); + aBuf.append(static_cast<char>(aStr.getLength())); aBuf.append(aStr); for (int i = 0; i < 11; i++) - aBuf.append(sal_Char(0x00)); + aBuf.append(char(0x00)); aStr = aBuf.makeStringAndClear(); pStr = aStr.getStr(); for (int i = 0; i < aStr.getLength(); i++, pStr++) @@ -2686,7 +2686,7 @@ void RtfAttributeOutput::CharScaleWidth(const SvxCharScaleWidthItem& rScaleWidth void RtfAttributeOutput::CharRelief(const SvxCharReliefItem& rRelief) { - const sal_Char* pStr; + const char* pStr; switch (rRelief.GetValue()) { case FontRelief::Embossed: @@ -2889,7 +2889,7 @@ void RtfAttributeOutput::ParaTabStop(const SvxTabStopItem& rTabStop) if (pFill) m_aStyles.append(pFill); - const sal_Char* pAdjStr = nullptr; + const char* pAdjStr = nullptr; switch (rTS.GetAdjustment()) { case SvxTabAdjust::Right: @@ -3426,7 +3426,7 @@ void RtfAttributeOutput::FormatBox(const SvxBoxItem& rBox) { static const SvxBoxItemLine aBorders[] = { SvxBoxItemLine::TOP, SvxBoxItemLine::LEFT, SvxBoxItemLine::BOTTOM, SvxBoxItemLine::RIGHT }; - static const sal_Char* aBorderNames[] + static const char* aBorderNames[] = { OOO_STRING_SVTOOLS_RTF_BRDRT, OOO_STRING_SVTOOLS_RTF_BRDRL, OOO_STRING_SVTOOLS_RTF_BRDRB, OOO_STRING_SVTOOLS_RTF_BRDRR }; @@ -3487,7 +3487,7 @@ void RtfAttributeOutput::FormatBox(const SvxBoxItem& rBox) eShadowLocation = static_cast<const SvxShadowItem*>(pItem)->GetLocation(); const SvxBoxItemLine* pBrd = aBorders; - const sal_Char** pBrdNms = aBorderNames; + const char** pBrdNms = aBorderNames; for (int i = 0; i < 4; ++i, ++pBrd, ++pBrdNms) { if (const editeng::SvxBorderLine* pLn = rBox.GetLine(*pBrd)) @@ -3942,7 +3942,7 @@ void RtfAttributeOutput::FlyFrameOLEReplacement(const SwFlyFrameFormat* pFlyFram const Graphic* pGraphic = rOLENode.GetGraphic(); Size aMapped(pGraphic->GetPrefSize()); auto& rCr = static_cast<const SwCropGrf&>(rOLENode.GetAttr(RES_GRFATR_CROPGRF)); - const sal_Char* pBLIPType = OOO_STRING_SVTOOLS_RTF_PNGBLIP; + const char* pBLIPType = OOO_STRING_SVTOOLS_RTF_PNGBLIP; const sal_uInt8* pGraphicAry = nullptr; SvMemoryStream aStream; if (GraphicConverter::Export(aStream, *pGraphic, ConvertDataFormat::PNG) != ERRCODE_NONE) @@ -4021,10 +4021,10 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat return; ConvertDataFormat aConvertDestinationFormat = ConvertDataFormat::WMF; - const sal_Char* pConvertDestinationBLIPType = OOO_STRING_SVTOOLS_RTF_WMETAFILE; + const char* pConvertDestinationBLIPType = OOO_STRING_SVTOOLS_RTF_WMETAFILE; GfxLink aGraphicLink; - const sal_Char* pBLIPType = nullptr; + const char* pBLIPType = nullptr; if (rGraphic.IsGfxLink()) { aGraphicLink = rGraphic.GetGfxLink(); diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index 3003ec585d14..b96887479273 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -220,7 +220,7 @@ public: FieldFlags nMode); void WriteBookmarks_Impl(std::vector<OUString>& rStarts, std::vector<OUString>& rEnds); void WriteAnnotationMarks_Impl(std::vector<OUString>& rStarts, std::vector<OUString>& rEnds); - void WriteHeaderFooter_Impl(const SwFrameFormat& rFormat, bool bHeader, const sal_Char* pStr, + void WriteHeaderFooter_Impl(const SwFrameFormat& rFormat, bool bHeader, const char* pStr, bool bTitlepg); void WriteBookmarkInActParagraph(const OUString& /*rName*/, sal_Int32 /*nFirstRunPos*/, sal_Int32 /*nLastRunPos*/) override{}; diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 696172264680..c9eb068556f3 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1074,7 +1074,7 @@ OString RtfExport::getStream() OString aRet; if (m_pStream) - aRet = OString(static_cast<const sal_Char*>(m_pStream->GetData()), m_pStream->Tell()); + aRet = OString(static_cast<const char*>(m_pStream->GetData()), m_pStream->Tell()); return aRet; } @@ -1085,7 +1085,7 @@ SvStream& RtfExport::OutULong(sal_uLong nVal) { return Writer::OutULong(Strm(), SvStream& RtfExport::OutLong(long nVal) { return Writer::OutLong(Strm(), nVal); } -void RtfExport::OutUnicode(const sal_Char* pToken, const OUString& rContent, bool bUpr) +void RtfExport::OutUnicode(const char* pToken, const OUString& rContent, bool bUpr) { if (!rContent.isEmpty()) { @@ -1102,7 +1102,7 @@ void RtfExport::OutUnicode(const sal_Char* pToken, const OUString& rContent, boo } } -void RtfExport::OutDateTime(const sal_Char* pStr, const util::DateTime& rDT) +void RtfExport::OutDateTime(const char* pStr, const util::DateTime& rDT) { Strm().WriteChar('{').WriteCharPtr(pStr).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_YR); OutULong(rDT.Year).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MO); @@ -1408,8 +1408,7 @@ void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader) SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start"); - const sal_Char* pStr - = (bHeader ? OOO_STRING_SVTOOLS_RTF_HEADER : OOO_STRING_SVTOOLS_RTF_FOOTER); + const char* pStr = (bHeader ? OOO_STRING_SVTOOLS_RTF_HEADER : OOO_STRING_SVTOOLS_RTF_FOOTER); /* is this a title page? */ if (m_pCurrentPageDesc->GetFollow() && m_pCurrentPageDesc->GetFollow() != m_pCurrentPageDesc) { @@ -1423,7 +1422,7 @@ void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader) SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end"); } -void RtfExport::WriteHeaderFooter(const SwFrameFormat& rFormat, bool bHeader, const sal_Char* pStr, +void RtfExport::WriteHeaderFooter(const SwFrameFormat& rFormat, bool bHeader, const char* pStr, bool bTitlepg) { SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start"); diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 055aa50ff04e..5b212bb3ac42 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -187,8 +187,8 @@ public: void resetStream(); SvStream& OutULong(sal_uLong nVal); SvStream& OutLong(long nVal); - void OutUnicode(const sal_Char* pToken, const OUString& rContent, bool bUpr = false); - void OutDateTime(const sal_Char* pStr, const css::util::DateTime& rDT); + void OutUnicode(const char* pToken, const OUString& rContent, bool bUpr = false); + void OutDateTime(const char* pStr, const css::util::DateTime& rDT); void OutPageDescription(const SwPageDesc& rPgDsc, bool bCheckForFirstPage); sal_uInt16 GetColor(const Color& rColor) const; @@ -220,7 +220,7 @@ private: /// This is necessary to have the numbering table ready before the main text is being processed. void BuildNumbering(); void WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader); - void WriteHeaderFooter(const SwFrameFormat& rFormat, bool bHeader, const sal_Char* pStr, + void WriteHeaderFooter(const SwFrameFormat& rFormat, bool bHeader, const char* pStr, bool bTitlepg = false); RtfColorTable m_aColTable; diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx index 2265337e6f0b..5da6157f732b 100644 --- a/sw/source/filter/ww8/styles.cxx +++ b/sw/source/filter/ww8/styles.cxx @@ -23,9 +23,9 @@ namespace { - const sal_Char **GetStiNames() throw() + const char **GetStiNames() throw() { - static const sal_Char *stiName[] = + static const char *stiName[] = { "Normal", "Heading 1", @@ -128,7 +128,7 @@ namespace namespace ww { - const sal_Char* GetEnglishNameFromSti(sti eSti) throw() + const char* GetEnglishNameFromSti(sti eSti) throw() { if (eSti >= stiMax) return nullptr; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index ec28de57150b..d85b3750453c 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1231,7 +1231,7 @@ void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAt break; case TOX_USER: - sText += "\" \\f \"" + OUStringChar(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) )); + sText += "\" \\f \"" + OUStringChar(static_cast<char>( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) )); [[fallthrough]]; case TOX_CONTENT: { diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 5e66e9f1932c..84c69998fab8 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1747,8 +1747,8 @@ void SwWW8Writer::InsAsString8(ww::bytes &rO, const OUString& rStr, rtl_TextEncoding eCodeSet) { OString sTmp(OUStringToOString(rStr, eCodeSet)); - const sal_Char *pStart = sTmp.getStr(); - const sal_Char *pEnd = pStart + sTmp.getLength(); + const char *pStart = sTmp.getStr(); + const char *pEnd = pStart + sTmp.getLength(); rO.reserve(rO.size() + sTmp.getLength()); std::copy(pStart, pEnd, std::inserter(rO, rO.end())); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 5db07effbb79..1cd428abc422 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2185,7 +2185,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) { if ( const SwTOXBase* pTOX = rSect.GetTOXBase() ) { - static const sal_Char sEntryEnd[] = "\" "; + static const char sEntryEnd[] = "\" "; ww::eField eCode = ww::eTOC; OUString sStr = pTOX ->GetMSTOCExpression(); @@ -2311,7 +2311,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) if( TOX_USER == pTOX->GetType() ) { sStr += "\"" - + OUStringChar(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *pTOX->GetTOXType() ) )) + + OUStringChar(static_cast<char>( 'A' + GetExport( ).GetId( *pTOX->GetTOXType() ) )) + sEntryEnd; } } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index afd94ee89ecc..97dd8ae286d2 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2905,7 +2905,7 @@ void SwWW8ImplReader::PostProcessAttrs() convert from 1252 on the undefined character */ static std::size_t Custom8BitToUnicode(rtl_TextToUnicodeConverter hConverter, - sal_Char const *pIn, std::size_t nInLen, sal_Unicode *pOut, std::size_t nOutLen) + char const *pIn, std::size_t nInLen, sal_Unicode *pOut, std::size_t nOutLen) { const sal_uInt32 nFlags = RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | @@ -3099,14 +3099,14 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp sal_Unicode* pBuffer = pStr->buffer; sal_Unicode* pWork = pBuffer; - std::unique_ptr<sal_Char[]> p8Bits; + std::unique_ptr<char[]> p8Bits; rtl_TextToUnicodeConverter hConverter = nullptr; if (!m_bIsUnicode || m_bVer67) hConverter = rtl_createTextToUnicodeConverter(eSrcCharSet); if (!m_bIsUnicode) - p8Bits.reset( new sal_Char[nStrLen] ); + p8Bits.reset( new char[nStrLen] ); // read the stream data sal_uInt8 nBCode = 0; @@ -3149,16 +3149,16 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp { if (nUCode >= 0x3000) //0x8000 ? { - sal_Char aTest[2]; - aTest[0] = static_cast< sal_Char >((nUCode & 0xFF00) >> 8); - aTest[1] = static_cast< sal_Char >(nUCode & 0x00FF); + char aTest[2]; + aTest[0] = static_cast< char >((nUCode & 0xFF00) >> 8); + aTest[1] = static_cast< char >(nUCode & 0x00FF); OUString aTemp(aTest, 2, eSrcCJKCharSet); OSL_ENSURE(aTemp.getLength() == 1, "so much for that theory"); *pWork++ = aTemp[0]; } else { - sal_Char cTest = static_cast< sal_Char >(nUCode & 0x00FF); + char cTest = static_cast< char >(nUCode & 0x00FF); pWork += Custom8BitToUnicode(hConverter, &cTest, 1, pWork, 1); } } @@ -6167,7 +6167,7 @@ ErrCode SwWW8ImplReader::LoadDoc(WW8Glossary *pGloss) ErrCode nErrRet = ERRCODE_NONE; { - static const sal_Char* aNames[ 13 ] = { + static const char* aNames[ 13 ] = { "WinWord/WW", "WinWord/WW8", "WinWord/WWFT", "WinWord/WWFLX", "WinWord/WWFLY", "WinWord/WWF", diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 54fa9782332f..4577a4e08fc4 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -4300,7 +4300,7 @@ void WW8RStyle::ImportOldFormatStyles() if (sName.isEmpty()) { ww::sti eSti = ww::GetCanonicalStiFromStc(stc); - if (const sal_Char *pStr = GetEnglishNameFromSti(eSti)) + if (const char *pStr = GetEnglishNameFromSti(eSti)) sName = OUString(pStr, strlen(pStr), RTL_TEXTENCODING_ASCII_US); } diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 4a8c500bc345..52fa05de6de5 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2256,7 +2256,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, struct CtrlFontMapEntry { sal_uInt16 nWhichId; - const sal_Char* pPropNm; + const char* pPropNm; }; const CtrlFontMapEntry aMapTable[] = { diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 6b72388c6b07..c5bdbc4d53d0 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -1565,57 +1565,57 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr ) possible name sets (english, german, french, spanish) */ - static const sal_Char* aName10 = "\x0F"; // SW field code - static const sal_Char* aName11 // German + static const char* aName10 = "\x0F"; // SW field code + static const char* aName11 // German = "TITEL"; - static const sal_Char* aName12 // French + static const char* aName12 // French = "TITRE"; - static const sal_Char* aName13 // English + static const char* aName13 // English = "TITLE"; - static const sal_Char* aName14 // Spanish + static const char* aName14 // Spanish = "TITRO"; - static const sal_Char* aName20 = "\x15"; // SW field code - static const sal_Char* aName21 // German + static const char* aName20 = "\x15"; // SW field code + static const char* aName21 // German = "ERSTELLDATUM"; - static const sal_Char* aName22 // French + static const char* aName22 // French = "CR\xC9\xC9"; - static const sal_Char* aName23 // English + static const char* aName23 // English = "CREATED"; - static const sal_Char* aName24 // Spanish + static const char* aName24 // Spanish = "CREADO"; - static const sal_Char* aName30 = "\x16"; // SW field code - static const sal_Char* aName31 // German + static const char* aName30 = "\x16"; // SW field code + static const char* aName31 // German = "ZULETZTGESPEICHERTZEIT"; - static const sal_Char* aName32 // French + static const char* aName32 // French = "DERNIERENREGISTREMENT"; - static const sal_Char* aName33 // English + static const char* aName33 // English = "SAVED"; - static const sal_Char* aName34 // Spanish + static const char* aName34 // Spanish = "MODIFICADO"; - static const sal_Char* aName40 = "\x17"; // SW field code - static const sal_Char* aName41 // German + static const char* aName40 = "\x17"; // SW field code + static const char* aName41 // German = "ZULETZTGEDRUCKT"; - static const sal_Char* aName42 // French + static const char* aName42 // French = "DERNI\xC8" "REIMPRESSION"; - static const sal_Char* aName43 // English + static const char* aName43 // English = "LASTPRINTED"; - static const sal_Char* aName44 // Spanish + static const char* aName44 // Spanish = "HUPS PUPS"; - static const sal_Char* aName50 = "\x18"; // SW field code - static const sal_Char* aName51 // German + static const char* aName50 = "\x18"; // SW field code + static const char* aName51 // German = "\xDC" "BERARBEITUNGSNUMMER"; - static const sal_Char* aName52 // French + static const char* aName52 // French = "NUM\xC9" "RODEREVISION"; - static const sal_Char* aName53 // English + static const char* aName53 // English = "REVISIONNUMBER"; - static const sal_Char* aName54 // Spanish + static const char* aName54 // Spanish = "SNUBBEL BUBBEL"; static const sal_uInt16 nFieldCnt = 5; // additional fields are to be coded soon! static const sal_uInt16 nLangCnt = 4; - static const sal_Char *aNameSet_26[nFieldCnt][nLangCnt+1] = + static const char *aNameSet_26[nFieldCnt][nLangCnt+1] = { {aName10, aName11, aName12, aName13, aName14}, {aName20, aName21, aName22, aName23, aName24}, @@ -3657,7 +3657,7 @@ void SwWW8ImplReader::Read_FieldVanish( sal_uInt16, const sal_uInt8*, short nLen const int nChunk = 64; //number of characters to read at one time // Careful: MEMICMP doesn't work with fieldnames including umlauts! - const static sal_Char *aFieldNames[] = { "\x06""INHALT", "\x02""XE", // dt. + const static char *aFieldNames[] = { "\x06""INHALT", "\x02""XE", // dt. "\x02""TC" }; // us const static sal_uInt8 aFieldId[] = { 9, 4, 9 }; @@ -3727,7 +3727,7 @@ void SwWW8ImplReader::Read_FieldVanish( sal_uInt16, const sal_uInt8*, short nLen for( int i = 0; i < 3; i++ ) { - const sal_Char* pName = aFieldNames[i]; + const char* pName = aFieldNames[i]; const sal_Int32 nNameLen = static_cast<sal_Int32>(*pName++); if( sFieldName.matchIgnoreAsciiCaseAsciiL( pName, nNameLen, nC ) ) { diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 675351f956de..6e83c5e6afb2 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2931,7 +2931,7 @@ void SwWW8ImplReader::Read_Symbol(sal_uInt16, const sal_uInt8* pData, short nLen { //convert single byte from MS1252 to Unicode m_cSymbol = OUString( - reinterpret_cast<const sal_Char*>(pData+2), 1, + reinterpret_cast<const char*>(pData+2), 1, RTL_TEXTENCODING_MS_1252).toChar(); } else diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 7411e02f8223..e3c5ac3a4098 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -7036,7 +7036,7 @@ struct WW8_FFN_Ver6 { WW8_FFN_BASE base; // from Ver6 - sal_Char szFfn[maxStrSize]; // 0x6 or 0x40 from Ver8 on zero terminated string that + char szFfn[maxStrSize]; // 0x6 or 0x40 from Ver8 on zero terminated string that // records name of font. // Maximal size of szFfn is 65 characters. // Attention: This array can also be smaller!!! diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index dc9a2e403f56..0e3f3bfe77c2 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -866,7 +866,7 @@ struct WW8_ATRDEXTRA struct WW67_ATRD // for versions 6/7 { - sal_Char xstUsrInitl[ 10 ]; // pascal-style String holding initials + char xstUsrInitl[ 10 ]; // pascal-style String holding initials // of annotation author SVBT16 ibst; // index into GrpXstAtnOwners SVBT16 ak; // not used diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 7123d61ab190..780479c1e992 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -134,7 +134,7 @@ ErrCode ReadThroughComponent( uno::Reference<XComponent> const & xModelComponent, const OUString& rStreamName, uno::Reference<uno::XComponentContext> const & rxContext, - const sal_Char* pFilterName, + const char* pFilterName, const Sequence<Any>& rFilterArguments, const OUString& rName, bool bMustBeSuccessfull, @@ -261,10 +261,10 @@ ErrCode ReadThroughComponent( ErrCode ReadThroughComponent( uno::Reference<embed::XStorage> const & xStorage, uno::Reference<XComponent> const & xModelComponent, - const sal_Char* pStreamName, - const sal_Char* pCompatibilityStreamName, + const char* pStreamName, + const char* pCompatibilityStreamName, uno::Reference<uno::XComponentContext> const & rxContext, - const sal_Char* pFilterName, + const char* pFilterName, const Sequence<Any>& rFilterArguments, const OUString& rName, bool bMustBeSuccessfull) diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index d101d613219e..d0d5b1e48094 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -465,9 +465,9 @@ ErrCode SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed, bool SwXMLWriter::WriteThroughComponent( const uno::Reference<XComponent> & xComponent, - const sal_Char* pStreamName, + const char* pStreamName, const uno::Reference<uno::XComponentContext> & rxContext, - const sal_Char* pServiceName, + const char* pServiceName, const Sequence<Any> & rArguments, const Sequence<beans::PropertyValue> & rMediaDesc ) { @@ -524,7 +524,7 @@ bool SwXMLWriter::WriteThroughComponent( const uno::Reference<io::XOutputStream> & xOutputStream, const uno::Reference<XComponent> & xComponent, const uno::Reference<XComponentContext> & rxContext, - const sal_Char* pServiceName, + const char* pServiceName, const Sequence<Any> & rArguments, const Sequence<PropertyValue> & rMediaDesc ) { diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index a82a0315e056..0e24bbda914c 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -63,10 +63,10 @@ private: bool WriteThroughComponent( // the component we export const css::uno::Reference<css::lang::XComponent> & xComponent, - const sal_Char* pStreamName, // the stream name + const char* pStreamName, // the stream name // service factory for pServiceName const css::uno::Reference<css::uno::XComponentContext> & rFactory, - const sal_Char* pServiceName, // service name of the component + const char* pServiceName, // service name of the component // the argument (XInitialization) const css::uno::Sequence<css::uno::Any> & rArguments, // output descriptor @@ -78,7 +78,7 @@ private: const css::uno::Reference<css::io::XOutputStream> & xOutputStream, const css::uno::Reference<css::lang::XComponent> & xComponent, const css::uno::Reference<css::uno::XComponentContext> & rFactory, - const sal_Char* pServiceName, + const char* pServiceName, const css::uno::Sequence<css::uno::Any> & rArguments, const css::uno::Sequence<css::beans::PropertyValue> & rMediaDesc ); }; diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 00a6537e43d6..4a3fd2437ea4 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -72,7 +72,7 @@ namespace { struct XMLServiceMapEntry_Impl { - const sal_Char *sFilterService; + const char *sFilterService; sal_Int32 const nFilterServiceLen; sal_uInt32 const n1; diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index 00e8797fd67b..39421b941d51 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -27,7 +27,7 @@ namespace sdecl = comphelper::service_decl; extern "C" SAL_DLLPUBLIC_EXPORT void * vbaswobj_component_getFactory( - const sal_Char * pImplName, void *, void *) + const char * pImplName, void *, void *) { void* pRet = sdecl::component_getFactoryHelper(pImplName, {&globals::serviceDecl, &::document::serviceDecl, diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx index f47eff0e977b..4eab159b6a90 100644 --- a/sw/source/ui/vba/vbadialog.cxx +++ b/sw/source/ui/vba/vbadialog.cxx @@ -27,7 +27,7 @@ namespace { struct WordDialogTable { sal_Int32 const wdDialog; - const sal_Char* ooDialog; + const char* ooDialog; }; } diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 5d1d570f5356..c784e0bb6b99 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -364,7 +364,7 @@ public: return aItem; } - static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, std::shared_ptr< PropertGetSetHelper > const & rHelper ) + static DocPropInfo createDocPropInfo( const char* sDesc, const char* sPropName, std::shared_ptr< PropertGetSetHelper > const & rHelper ) { return createDocPropInfo( OUString::createFromAscii( sDesc ), OUString::createFromAscii( sPropName ), rHelper ); } diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx index 7e482b7321a3..8cf0c5b811fd 100644 --- a/sw/source/ui/vba/vbarow.cxx +++ b/sw/source/ui/vba/vbarow.cxx @@ -86,7 +86,7 @@ void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const u SwVbaTableHelper aTableHelper( xTextTable ); sal_Int32 nColCount = aTableHelper.getTabColumnsCount( nEndRow ); // FIXME: the column count > 26 - //sal_Char cCol = 'A' + nColCount - 1; + //char cCol = 'A' + nColCount - 1; OUString sCol = SwVbaTableHelper::getColumnStr( nColCount - 1); sRangeName += ":" + sCol + OUString::number(nEndRow + 1); diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index b3f927a01b5f..32cf08c84ae0 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -36,7 +36,7 @@ namespace { struct BuiltinStyleTable { sal_Int32 const wdBuiltinStyle; - const sal_Char* pOOoStyleName; + const char* pOOoStyleName; sal_Int32 const wdStyleType; }; @@ -154,8 +154,8 @@ namespace { struct MSOStyleNameTable { - const sal_Char* pMSOStyleName; - const sal_Char* pOOoStyleName; + const char* pMSOStyleName; + const char* pOOoStyleName; }; } diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index df49f29b5761..b892d2606f79 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -880,7 +880,7 @@ void SwDocShell::Execute(SfxRequest& rReq) { rtl::Reference<TransferDataContainer> pClipCntnr = new TransferDataContainer; - pClipCntnr->CopyAnyData( SotClipboardFormatId::RTF, static_cast<sal_Char const *>( + pClipCntnr->CopyAnyData( SotClipboardFormatId::RTF, static_cast<char const *>( pStrm->GetData()), pStrm->GetEndOfData() ); pClipCntnr->CopyToClipboard( GetView()? &GetView()->GetEditWin() : nullptr ); diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 4823706a4a3d..894bba367db7 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -4185,7 +4185,7 @@ bool SwTransferDdeLink::WriteData( SvStream& rStrm ) pDocShell->GetTitle(SFX_TITLE_FULLNAME), eEncoding)); const OString aName(OUStringToOString(sName, eEncoding)); - std::unique_ptr<sal_Char[]> pMem(new sal_Char[ aAppNm.getLength() + aTopic.getLength() + aName.getLength() + 4 ]); + std::unique_ptr<char[]> pMem(new char[ aAppNm.getLength() + aTopic.getLength() + aName.getLength() + 4 ]); sal_Int32 nLen = aAppNm.getLength(); memcpy( pMem.get(), aAppNm.getStr(), nLen ); diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx index ec9a722ed12a..14218153cee1 100644 --- a/sw/source/uibase/inc/unodispatch.hxx +++ b/sw/source/uibase/inc/unodispatch.hxx @@ -119,7 +119,7 @@ public: //XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; - static const sal_Char* GetDBChangeURL(); + static const char* GetDBChangeURL(); }; #endif diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 36795a5d02ed..68a0c3ebf144 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -176,7 +176,7 @@ static rtl_TextEncoding lcl_GetStreamCharSet(rtl_TextEncoding eLoadEncoding) if(RTL_TEXTENCODING_DONTKNOW == eRet) { SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get(); - const sal_Char *pCharSet = + const char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( rHtmlOptions.GetTextEncoding() ); eRet = rtl_getTextEncodingFromMimeCharset( pCharSet ); } @@ -771,7 +771,7 @@ void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) void SwSrcView::Load(SwDocShell* pDocShell) { SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get(); - const sal_Char *pCharSet = + const char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( rHtmlOptions.GetTextEncoding() ); rtl_TextEncoding eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet ); @@ -792,7 +792,7 @@ void SwSrcView::Load(SwDocShell* pDocShell) pDocShell->GetHeaderAttributes() ); if( RTL_TEXTENCODING_DONTKNOW == eHeaderEnc ) { - const sal_Char *pTmpCharSet = + const char *pTmpCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ); eHeaderEnc = rtl_getTextEncodingFromMimeCharset( pTmpCharSet ); } diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx index 14c24347b726..6b4716843503 100644 --- a/sw/source/uibase/uno/unodispatch.cxx +++ b/sw/source/uibase/uno/unodispatch.cxx @@ -39,7 +39,7 @@ static const char cURLFormLetter[] = ".uno:DataSourceBrowser/FormLetter"; static const char cURLInsertContent[] = ".uno:DataSourceBrowser/InsertContent";//data into fields static const char cURLInsertColumns[] = ".uno:DataSourceBrowser/InsertColumns";//data into text static const char cURLDocumentDataSource[] = ".uno:DataSourceBrowser/DocumentDataSource";//current data source of the document -static const sal_Char cInternalDBChangeNotification[] = ".uno::Writer/DataSourceChanged"; +static const char cInternalDBChangeNotification[] = ".uno::Writer/DataSourceChanged"; SwXDispatchProviderInterceptor::SwXDispatchProviderInterceptor(SwView& rVw) : m_pView(&rVw) @@ -378,7 +378,7 @@ void SwXDispatch::disposing( const lang::EventObject& rSource ) m_pView = nullptr; } -const sal_Char* SwXDispatch::GetDBChangeURL() +const char* SwXDispatch::GetDBChangeURL() { return cInternalDBChangeNotification; } diff --git a/sw/source/uibase/uno/unofreg.cxx b/sw/source/uibase/uno/unofreg.cxx index eed079f6801a..e81858bc62b0 100644 --- a/sw/source/uibase/uno/unofreg.cxx +++ b/sw/source/uibase/uno/unofreg.cxx @@ -43,7 +43,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * sw_component_getFactory( - const sal_Char * pImplName, + const char * pImplName, void * pServiceManager, void * ) { diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index cc53e58ae758..7e4d32c2ff59 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2330,7 +2330,7 @@ static VclPtr< OutputDevice > lcl_GetOutputDevice( const SwPrintUIOptions &rPrin static bool lcl_SeqHasProperty( const uno::Sequence< beans::PropertyValue >& rOptions, - const sal_Char *pPropName ) + const char *pPropName ) { return std::any_of(rOptions.begin(), rOptions.end(), [&pPropName](const beans::PropertyValue& rProp) { @@ -2339,7 +2339,7 @@ static bool lcl_SeqHasProperty( static bool lcl_GetBoolProperty( const uno::Sequence< beans::PropertyValue >& rOptions, - const sal_Char *pPropName ) + const char *pPropName ) { bool bRes = false; auto pOption = std::find_if(rOptions.begin(), rOptions.end(), diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index abe8d64a50bf..bf7aa52569a6 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -62,7 +62,7 @@ using namespace ::com::sun::star; -const sal_Char cFactory[] = "private:factory/swriter"; +const char cFactory[] = "private:factory/swriter"; static void disableScrollBars(uno::Reference< beans::XPropertySet > const & xViewProps, bool bEnableOnlineMode) |