diff options
33 files changed, 109 insertions, 142 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index f7d5fc77b9fa..60421240ac89 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -97,8 +97,6 @@ OUString EncryptBlockName_Imp(const OUString& rName); TYPEINIT0(SvxAutoCorrect) -typedef SvxAutoCorrectLanguageLists* SvxAutoCorrectLanguageListsPtr; - static inline bool IsWordDelim( const sal_Unicode c ) { return ' ' == c || '\t' == c || 0x0a == c || @@ -1565,7 +1563,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool b OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true, false, false )); OUString sShareDirFile( sUserDirFile ); - SvxAutoCorrectLanguageListsPtr pLists = 0; + SvxAutoCorrectLanguageLists* pLists = 0; tools::Time nMinTime( 0, 2 ), nAktTime( tools::Time::SYSTEM ), nLastCheckTime( tools::Time::EMPTY ); @@ -1694,7 +1692,7 @@ static void GeneratePackageName ( const OUString& rShort, OUString& rPackageName } static const SvxAutocorrWord* lcl_SearchWordsInList( - SvxAutoCorrectLanguageListsPtr pList, const OUString& rTxt, + SvxAutoCorrectLanguageLists* pList, const OUString& rTxt, sal_Int32& rStt, sal_Int32 nEndPos) { const SvxAutocorrWordList* pAutoCorrWordList = pList->GetAutocorrWordList(); diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index a15182dfd566..aa89563264f7 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -426,7 +426,7 @@ void SvxRTFParser::ReadColorTable() { // one color is finished, fill in the table // try to map the values to SV internal names - ColorPtr pColor = new Color( nRed, nGreen, nBlue ); + Color* pColor = new Color( nRed, nGreen, nBlue ); if( aColorTbl.empty() && sal_uInt8(-1) == nRed && sal_uInt8(-1) == nGreen && sal_uInt8(-1) == nBlue ) pColor->SetColor( COL_AUTO ); diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index cda8769d0204..df76903bbf80 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -28,10 +28,11 @@ #include "bibresid.hxx" #include "datman.hxx" #include "bibconfig.hxx" -static PtrBibModul pBibModul=NULL; -static sal_uInt32 nBibModulCount=0; #include <ucbhelper/content.hxx> +static BibModul* pBibModul=NULL; +static sal_uInt32 nBibModulCount=0; + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; diff --git a/extensions/source/bibliography/bibmod.hxx b/extensions/source/bibliography/bibmod.hxx index 4c7afb525fe7..7a2758d72681 100644 --- a/extensions/source/bibliography/bibmod.hxx +++ b/extensions/source/bibliography/bibmod.hxx @@ -42,8 +42,7 @@ class BibModul }; -typedef BibModul* PtrBibModul; -typedef PtrBibModul* HdlBibModul; +typedef BibModul** HdlBibModul; HdlBibModul OpenBibModul(); void CloseBibModul(HdlBibModul ppBibModul); diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 42098f663220..5dcb23efda69 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -76,8 +76,7 @@ public: }; -typedef Color* ColorPtr; -typedef std::deque< ColorPtr > SvxRTFColorTbl; +typedef std::deque< Color* > SvxRTFColorTbl; typedef boost::ptr_map<short, vcl::Font> SvxRTFFontTbl; typedef boost::ptr_map<sal_uInt16, SvxRTFStyleType> SvxRTFStyleTbl; @@ -391,7 +390,7 @@ public: inline const Color& SvxRTFParser::GetColor( size_t nId ) const { - ColorPtr pColor = (ColorPtr)pDfltColor; + Color* pColor = pDfltColor; if( nId < aColorTbl.size() ) pColor = aColorTbl[ nId ]; return *pColor; diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index 9b52bf3e18a0..e84628917757 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -150,10 +150,6 @@ private: maInteropTransformations; /// Unaltered list of transformations for interoperability purposes }; -typedef std::shared_ptr< Color > ColorPtr; - - - } // namespace drawingml } // namespace oox diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index d400a87285f2..6f1fd0e16812 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -79,7 +79,6 @@ class SVX_DLLPUBLIC NumSettings_Impl ~NumSettings_Impl(){} }; -typedef NumSettings_Impl* NumSettings_ImplPtr; typedef std::vector< std::shared_ptr<NumSettings_Impl> > NumSettingsArr_Impl; class SVX_DLLPUBLIC BulletsSettings @@ -163,7 +162,6 @@ class SVX_DLLPUBLIC NumberSettings_Impl ~NumberSettings_Impl(){} }; -typedef NumberSettings_Impl* NumberSettings_ImplPtr; typedef std::vector< std::shared_ptr<NumberSettings_Impl> > NumberSettingsArr_Impl; class SVX_DLLPUBLIC OutlineSettings_Impl diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index c145d88393f1..4a9d398e16e8 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -33,8 +33,7 @@ typedef sal_uInt8* HPBYTE; typedef HPBYTE Scanline; -typedef const sal_uInt8* ConstHPBYTE; -typedef ConstHPBYTE ConstScanline; +typedef const sal_uInt8* ConstScanline; // - Bitmap formats - @@ -219,19 +218,19 @@ public: inline sal_uLong GetGreenMask() const; inline sal_uLong GetBlueMask() const; - inline void GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const; + inline void GetColorFor8Bit( BitmapColor& rColor, const sal_uInt8* pPixel ) const; inline void SetColorFor8Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; - inline void GetColorFor16BitMSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const; + inline void GetColorFor16BitMSB( BitmapColor& rColor, const sal_uInt8* pPixel ) const; inline void SetColorFor16BitMSB( const BitmapColor& rColor, HPBYTE pPixel ) const; - inline void GetColorFor16BitLSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const; + inline void GetColorFor16BitLSB( BitmapColor& rColor, const sal_uInt8* pPixel ) const; inline void SetColorFor16BitLSB( const BitmapColor& rColor, HPBYTE pPixel ) const; - inline void GetColorFor24Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const; + inline void GetColorFor24Bit( BitmapColor& rColor, const sal_uInt8* pPixel ) const; inline void SetColorFor24Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; - inline void GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const; - inline void GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& rAlpha, ConstHPBYTE pPixel ) const; + inline void GetColorFor32Bit( BitmapColor& rColor, const sal_uInt8* pPixel ) const; + inline void GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& rAlpha, const sal_uInt8* pPixel ) const; inline void SetColorFor32Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; }; @@ -673,7 +672,7 @@ inline sal_uLong ColorMask::GetBlueMask() const return mnBMask; } -inline void ColorMask::GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const +inline void ColorMask::GetColorFor8Bit( BitmapColor& rColor, const sal_uInt8* pPixel ) const { const sal_uInt32 nVal = *pPixel; MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); @@ -684,7 +683,7 @@ inline void ColorMask::SetColorFor8Bit( const BitmapColor& rColor, HPBYTE pPixel *pPixel = (sal_uInt8) COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, mnAlphaChannel ); } -inline void ColorMask::GetColorFor16BitMSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const +inline void ColorMask::GetColorFor16BitMSB( BitmapColor& rColor, const sal_uInt8* pPixel ) const { const sal_uInt32 nVal = pPixel[ 1 ] | ( (sal_uInt32) pPixel[ 0 ] << 8UL ); @@ -699,7 +698,7 @@ inline void ColorMask::SetColorFor16BitMSB( const BitmapColor& rColor, HPBYTE pP pPixel[ 1 ] = (sal_uInt8) nVal; } -inline void ColorMask::GetColorFor16BitLSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const +inline void ColorMask::GetColorFor16BitLSB( BitmapColor& rColor, const sal_uInt8* pPixel ) const { const sal_uInt32 nVal = pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ); @@ -714,7 +713,7 @@ inline void ColorMask::SetColorFor16BitLSB( const BitmapColor& rColor, HPBYTE pP pPixel[ 1 ] = (sal_uInt8)(nVal >> 8U); } -inline void ColorMask::GetColorFor24Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const +inline void ColorMask::GetColorFor24Bit( BitmapColor& rColor, const sal_uInt8* pPixel ) const { const sal_uInt32 nVal = pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ) | ( (sal_uInt32) pPixel[ 2 ] << 16UL ); MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); @@ -726,7 +725,7 @@ inline void ColorMask::SetColorFor24Bit( const BitmapColor& rColor, HPBYTE pPixe pPixel[ 0 ] = (sal_uInt8) nVal; pPixel[ 1 ] = (sal_uInt8) ( nVal >> 8UL ); pPixel[ 2 ] = (sal_uInt8) ( nVal >> 16UL ); } -inline void ColorMask::GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const +inline void ColorMask::GetColorFor32Bit( BitmapColor& rColor, const sal_uInt8* pPixel ) const { const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ) | ( (sal_uInt32) pPixel[ 2 ] << 16UL ) | ( (sal_uInt32) pPixel[ 3 ] << 24UL ); @@ -734,7 +733,7 @@ inline void ColorMask::GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); } -inline void ColorMask::GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& rAlpha, ConstHPBYTE pPixel ) const +inline void ColorMask::GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& rAlpha, const sal_uInt8* pPixel ) const { const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ) | ( (sal_uInt32) pPixel[ 2 ] << 16UL ) | ( (sal_uInt32) pPixel[ 3 ] << 24UL ); diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx index 3cb4a09fd233..f2b49599d65b 100644 --- a/lotuswordpro/source/filter/bencont.cxx +++ b/lotuswordpro/source/filter/bencont.cxx @@ -175,7 +175,7 @@ LtcBenContainer::LtcBenContainer(LwpSvStream * pStream) * @param number of bytes read * @return BenError */ -BenError LtcBenContainer::Read(BenDataPtr pBuffer, unsigned long MaxSize, +BenError LtcBenContainer::Read(void * pBuffer, unsigned long MaxSize, unsigned long * pAmtRead) { *pAmtRead = cpStream->Read(pBuffer, MaxSize); @@ -188,7 +188,7 @@ BenError LtcBenContainer::Read(BenDataPtr pBuffer, unsigned long MaxSize, * @param number of bytes to be read * @return BenError */ -BenError LtcBenContainer::ReadKnownSize(BenDataPtr pBuffer, unsigned long Amt) +BenError LtcBenContainer::ReadKnownSize(void * pBuffer, unsigned long Amt) { sal_uLong ulLength; ulLength = cpStream->Read(pBuffer, Amt); diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index dcd5acf1754f..4090d3b844f7 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -132,8 +132,6 @@ UtDefClassP(CBenTypeName); typedef unsigned char BenByte; typedef unsigned short BenWord; typedef unsigned long BenDWord; -typedef void * BenDataPtr; -typedef const void * BenConstDataPtr; typedef unsigned long BenContainerPos; typedef unsigned long BenObjectID; @@ -216,9 +214,9 @@ public: // Internal methods LtcBenContainer(LwpSvStream * pStream); ~LtcBenContainer(); - BenError Read(BenDataPtr pBuffer, unsigned long MaxSize, + BenError Read(void * pBuffer, unsigned long MaxSize, unsigned long * pAmtRead); - BenError ReadKnownSize(BenDataPtr pBuffer, unsigned long Amt); + BenError ReadKnownSize(void * pBuffer, unsigned long Amt); BenError SeekToPosition(BenContainerPos Pos); BenError SeekFromEnd(long Offset); @@ -267,7 +265,7 @@ class CBenValue : public CBenIDListElmt { public: unsigned long GetValueSize(); - BenError ReadValueData(BenDataPtr pBuffer, + BenError ReadValueData(void * pBuffer, unsigned long Offset, unsigned long MaxSize, unsigned long * pAmtRead); pCBenProperty BEN_EXPORT GetProperty() { return cpProperty; } @@ -351,14 +349,14 @@ public: // Internal methods unsigned long Size) : CUtListElmt(&pValue->GetValueSegments()) { cpValue = pValue; cImmediate = false; cPos = Pos; cSize = Size; } - CBenValueSegment(pCBenValue pValue, BenConstDataPtr pImmData, + CBenValueSegment(pCBenValue pValue, const void * pImmData, unsigned short Size) : CUtListElmt(&pValue->GetValueSegments()) { cpValue = pValue; cImmediate = true; UtHugeMemcpy(cImmData, pImmData, Size); cSize = Size; } CBenValueSegment(BenContainerPos Pos, unsigned long Size) { cpValue = NULL; cImmediate = false; cPos = Pos; cSize = Size; } - CBenValueSegment(BenConstDataPtr pImmData, unsigned short Size) + CBenValueSegment(const void * pImmData, unsigned short Size) { cpValue = NULL; cImmediate = true; UtHugeMemcpy(cImmData, pImmData, Size); cSize = Size; } bool IsLast() diff --git a/lotuswordpro/source/filter/benval.cxx b/lotuswordpro/source/filter/benval.cxx index db505a84035f..239159eb9047 100644 --- a/lotuswordpro/source/filter/benval.cxx +++ b/lotuswordpro/source/filter/benval.cxx @@ -69,7 +69,7 @@ CBenValue::GetValueSize() } BenError -CBenValue::ReadValueData(BenDataPtr pReadBuffer, unsigned long Offset, +CBenValue::ReadValueData(void * pReadBuffer, unsigned long Offset, unsigned long Amt, unsigned long * pAmtRead) { BenError Err; @@ -77,7 +77,7 @@ CBenValue::ReadValueData(BenDataPtr pReadBuffer, unsigned long Offset, *pAmtRead = 0; pCBenValueSegment pCurrSeg = NULL; pLtcBenContainer pContainer = GetContainer(); - BenByteDataPtr pBuffer = static_cast<BenByteDataPtr>(pReadBuffer); + BenByte* pBuffer = static_cast<BenByte*>(pReadBuffer); /// pReadBuffer -- pointer to buffer of read result, allocated outside this function /// Offset -- read buffer's start offset address, relative value in the whole value stream diff --git a/lotuswordpro/source/filter/first.hxx b/lotuswordpro/source/filter/first.hxx index 68d20ce2d0a9..37311920a0ce 100644 --- a/lotuswordpro/source/filter/first.hxx +++ b/lotuswordpro/source/filter/first.hxx @@ -64,9 +64,6 @@ namespace OpenStormBento // String constants extern const char gsBenMagicBytes[]; -typedef BenByte * BenByteDataPtr; -typedef const BenByte * BenConstByteDataPtr; - pCBenNamedObject FindNamedObject(pCUtList pList, const char * sName, pCUtListElmt * ppPrev); diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx index 42f444588fe9..44ba3890609e 100644 --- a/lotuswordpro/source/filter/tocread.cxx +++ b/lotuswordpro/source/filter/tocread.cxx @@ -498,7 +498,7 @@ CBenTOCReader::GetCode() } BenError -CBenTOCReader::GetData(BenDataPtr pBuffer, unsigned long Amt) +CBenTOCReader::GetData(void * pBuffer, unsigned long Amt) { if (! CanGetData(Amt)) return BenErr_ReadPastEndOfTOC; diff --git a/lotuswordpro/source/filter/tocread.hxx b/lotuswordpro/source/filter/tocread.hxx index 7568bc963a1d..ebd21c6cc157 100644 --- a/lotuswordpro/source/filter/tocread.hxx +++ b/lotuswordpro/source/filter/tocread.hxx @@ -81,11 +81,11 @@ private: // Methods BenError GetByte(BenByte * pByte); BenError GetDWord(BenDWord * pDWord); BenByte GetCode(); - BenError GetData(BenDataPtr pBuffer, unsigned long Amt); + BenError GetData(void * pBuffer, unsigned long Amt); private: // Data pLtcBenContainer cpContainer; - BenByteDataPtr cpTOC; + BenByte* cpTOC; unsigned long cBlockSize; unsigned long cCurr; unsigned long cTOCSize; diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx index c864d2c0fbaf..c81fa293c068 100644 --- a/oox/inc/drawingml/textparagraphproperties.hxx +++ b/oox/inc/drawingml/textparagraphproperties.hxx @@ -59,7 +59,7 @@ public: void setStyleName( const OUString& rStyleName ) { maStyleName <<= rStyleName; } void setGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rXGraphic ); - ::oox::drawingml::ColorPtr maBulletColorPtr; + std::shared_ptr< ::oox::drawingml::Color > maBulletColorPtr; ::com::sun::star::uno::Any mbBulletColorFollowText; ::com::sun::star::uno::Any mbBulletFontFollowText; ::oox::drawingml::TextFont maBulletFont; diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 5955afbb3459..1c364e3fc420 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -209,7 +209,7 @@ void ScFormulaDlg::fill() } else { - PtrTabViewShell pTabViewShell; + ScTabViewShell* pTabViewShell; ScInputHandler* pInputHdl = GetNextInputHandler(pData->GetDocShell(),&pTabViewShell); if ( pInputHdl == NULL ) //no more InputHandler for DocShell @@ -278,7 +278,7 @@ bool ScFormulaDlg::IsInputHdl(ScInputHandler* pHdl) } -ScInputHandler* ScFormulaDlg::GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh) +ScInputHandler* ScFormulaDlg::GetNextInputHandler(ScDocShell* pDocShell, ScTabViewShell** ppViewSh) { ScInputHandler* pHdl=NULL; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 0f069f8d435c..62f9c511253f 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -40,8 +40,6 @@ class ScInputHandler; class ScDocShell; class ScFormulaCell; -typedef ScTabViewShell* PtrTabViewShell; - class ScFormulaDlg : public formula::FormulaDlg, public IAnyRefDialog { @@ -105,7 +103,7 @@ protected: static void SaveLRUEntry(const ScFuncDesc* pFuncDesc); static bool IsInputHdl(ScInputHandler* pHdl); - static ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh); + static ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell, ScTabViewShell** ppViewSh); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FORMULA_HXX diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx index 2d2ddf3f3cd1..9e96d30398b4 100644 --- a/sfx2/source/view/viewimp.hxx +++ b/sfx2/source/view/viewimp.hxx @@ -34,8 +34,7 @@ class SfxBaseController; -typedef SfxShell* SfxShellPtr_Impl; -typedef std::vector<SfxShellPtr_Impl> SfxShellArr_Impl; +typedef std::vector<SfxShell*> SfxShellArr_Impl; class SfxClipboardChangeListener; class SfxInPlaceClientList; diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 2ea3ffbeabd1..af213e2ee08b 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -92,10 +92,10 @@ static const sal_Unicode aDefaultBulletTypes[] = 0x2714 }; -NumSettings_ImplPtr lcl_CreateNumberingSettingsPtr(const Sequence<PropertyValue>& rLevelProps) +NumSettings_Impl* lcl_CreateNumberingSettingsPtr(const Sequence<PropertyValue>& rLevelProps) { const PropertyValue* pValues = rLevelProps.getConstArray(); - NumSettings_ImplPtr pNew = new NumSettings_Impl; + NumSettings_Impl* pNew = new NumSettings_Impl; for(sal_Int32 j = 0; j < rLevelProps.getLength(); j++) { if(pValues[j].Name == "NumberingType") @@ -1307,7 +1307,7 @@ void NumberingTypeMgr::Init() const Sequence<PropertyValue>* pValuesArr = aNumberings.getConstArray(); for(sal_Int32 i = 0; i < nLength; i++) { - NumSettings_ImplPtr pNew = lcl_CreateNumberingSettingsPtr(pValuesArr[i]); + NumSettings_Impl* pNew = lcl_CreateNumberingSettingsPtr(pValuesArr[i]); NumberSettings_Impl* pNumEntry = new NumberSettings_Impl; pNumEntry->nIndex = i + 1; pNumEntry->nIndexDefault = i; @@ -1341,7 +1341,7 @@ sal_uInt16 NumberingTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 m sal_uInt16 nCount = pNumberSettingsArr->size(); for(sal_uInt16 i = nFromIndex; i < nCount; ++i) { - NumberSettings_ImplPtr _pSet = (*pNumberSettingsArr)[i].get(); + NumberSettings_Impl* _pSet = (*pNumberSettingsArr)[i].get(); sal_Int16 eNType = _pSet->pNumSetting->nNumberType; OUString sLocalPrefix = _pSet->pNumSetting->sPrefix; OUString sLocalSuffix = _pSet->pNumSetting->sSuffix; @@ -1379,7 +1379,7 @@ bool NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_ if ( nIndex >= nCount ) return false; - NumberSettings_ImplPtr _pSet = (*pNumberSettingsArr)[nIndex].get(); + NumberSettings_Impl* _pSet = (*pNumberSettingsArr)[nIndex].get(); _pSet->pNumSetting->sPrefix = aFmt.GetPrefix(); _pSet->pNumSetting->sSuffix = aFmt.GetSuffix(); @@ -1413,7 +1413,7 @@ bool NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uIn return false; NumberSettingsArr_Impl* pCurrentNumberSettingsArr=pNumberSettingsArr; if (isDefault) pCurrentNumberSettingsArr=pDefaultNumberSettingsArr; - NumberSettings_ImplPtr _pSet = (*pCurrentNumberSettingsArr)[nIndex].get(); + NumberSettings_Impl* _pSet = (*pCurrentNumberSettingsArr)[nIndex].get(); sal_Int16 eNewType = _pSet->pNumSetting->nNumberType; sal_uInt16 nMask = 1; @@ -1530,7 +1530,7 @@ void OutlineTypeMgr::Init() Any aValueAny = xLevel->getByIndex(nLevel); Sequence<PropertyValue> aLevelProps; aValueAny >>= aLevelProps; - NumSettings_ImplPtr pNew = lcl_CreateNumberingSettingsPtr(aLevelProps); + NumSettings_Impl* pNew = lcl_CreateNumberingSettingsPtr(aLevelProps); SvxNumberFormat aNumFmt( aDefNumRule.GetLevel( nLevel) ); pNew->eLabelFollowedBy = aNumFmt.GetLabelFollowedBy(); pNew->nTabValue = aNumFmt.GetListtabPos(); @@ -1556,7 +1556,7 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m sal_uInt16 nCount = pItemArr->pNumSettingsArr->size(); for (sal_uInt16 iLevel=0;iLevel < nCount;iLevel++) { - NumSettings_ImplPtr _pSet = (*pItemArr->pNumSettingsArr)[iLevel].get(); + NumSettings_Impl* _pSet = (*pItemArr->pNumSettingsArr)[iLevel].get(); sal_Int16 eNType = _pSet->nNumberType; SvxNumberFormat aFmt(aNum.GetLevel(iLevel)); @@ -1640,7 +1640,7 @@ bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI //sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix())[0]; sal_Int16 eNumType = aFmt.GetNumberingType(); - NumSettings_ImplPtr _pSet = (*pItemArr->pNumSettingsArr)[iLevel].get(); + NumSettings_Impl* _pSet = (*pItemArr->pNumSettingsArr)[iLevel].get(); _pSet->eLabelFollowedBy = aFmt.GetLabelFollowedBy(); _pSet->nTabValue = aFmt.GetListtabPos(); @@ -1710,7 +1710,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 //Font& rActBulletFont = lcl_GetDefaultBulletFont(); NumSettingsArr_Impl *pNumSettingsArr=pItemArr->pNumSettingsArr; - NumSettings_ImplPtr pLevelSettings = 0; + NumSettings_Impl* pLevelSettings = 0; OUString sBulletCharFormatName = GetBulCharFmtName(); for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) { diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx index c00f1c94fe06..07b07b8a805c 100644 --- a/sw/source/core/doc/acmplwrd.cxx +++ b/sw/source/core/doc/acmplwrd.cxx @@ -75,8 +75,7 @@ public: void RemoveDocument(const SwDoc& rDoc); }; -typedef const SwDoc* SwDocPtr; -typedef std::vector<SwDocPtr> SwDocPtrVector; +typedef std::vector<const SwDoc*> SwDocPtrVector; class SwAutoCompleteString : public editeng::IAutoCompleteString { diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 2c8c2e0160a5..0622b4797d79 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -165,9 +165,6 @@ SwHTMLTableLayoutConstraints *SwHTMLTableLayoutConstraints::InsertNext( return pConstr; } -typedef SwHTMLTableLayoutColumn *SwHTMLTableLayoutColumnPtr; -typedef SwHTMLTableLayoutCell *SwHTMLTableLayoutCellPtr; - SwHTMLTableLayout::SwHTMLTableLayout( const SwTable * pTable, sal_uInt16 nRws, sal_uInt16 nCls, bool bColsOpt, bool bColTgs, @@ -179,8 +176,8 @@ SwHTMLTableLayout::SwHTMLTableLayout( const SwTable * pTable, sal_uInt16 nRightBWidth, sal_uInt16 nInhLeftBWidth, sal_uInt16 nInhRightBWidth ) - : aColumns( new SwHTMLTableLayoutColumnPtr[nCls] ) - , aCells( new SwHTMLTableLayoutCellPtr[static_cast<size_t>(nRws)*nCls] ) + : aColumns( new SwHTMLTableLayoutColumn*[nCls] ) + , aCells( new SwHTMLTableLayoutCell*[static_cast<size_t>(nRws)*nCls] ) , pSwTable( pTable ) , pLeftFillerBox( 0 ) , pRightFillerBox( 0 ) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 617a604d8457..6d02cd3b8021 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -400,7 +400,7 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) SvTreeListEntry* pEntry = m_pTree->FirstSelected(); while( pEntry ) { - SectReprPtr pRepr = static_cast<SectReprPtr>(pEntry->GetUserData()); + SectRepr* pRepr = static_cast<SectRepr*>(pEntry->GetUserData()); if (!pRepr->GetTempPasswd().getLength() && pRepr->GetSectionData().GetPassword().getLength()) { @@ -559,7 +559,7 @@ void SwEditRegionDlg::SelectSection(const OUString& rSectionName) SvTreeListEntry* pEntry = m_pTree->First(); while(pEntry) { - SectReprPtr pRepr = static_cast<SectReprPtr>(pEntry->GetUserData()); + SectRepr* pRepr = static_cast<SectRepr*>(pEntry->GetUserData()); if (pRepr->GetSectionData().GetSectionName() == rSectionName) break; pEntry = m_pTree->Next(pEntry); @@ -778,7 +778,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) while( pEntry ) { - SectReprPtr pRepr = static_cast<SectReprPtr>(pEntry->GetUserData()); + SectRepr* pRepr = static_cast<SectRepr*>(pEntry->GetUserData()); SwSectionFormat* pFormat = aOrigArray[ pRepr->GetArrPos() ]; if (!pRepr->GetSectionData().IsProtectFlag()) { @@ -847,7 +847,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox ) bool bCheck = TRISTATE_TRUE == pBox->GetState(); while( pEntry ) { - SectReprPtr pRepr = static_cast<SectReprPtr>(pEntry->GetUserData()); + SectRepr* pRepr = static_cast<SectRepr*>(pEntry->GetUserData()); pRepr->GetSectionData().SetProtectFlag(bCheck); Image aImage = BuildBitmap(bCheck, TRISTATE_TRUE == m_pHideCB->GetState()); @@ -870,7 +870,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox ) OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { - SectReprPtr pRepr = static_cast<SectReprPtr>(pEntry->GetUserData()); + SectRepr* pRepr = static_cast<SectRepr*>(pEntry->GetUserData()); pRepr->GetSectionData().SetHidden(TRISTATE_TRUE == pBox->GetState()); Image aImage = BuildBitmap(TRISTATE_TRUE == m_pProtectCB->GetState(), @@ -897,7 +897,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox ) OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { - SectReprPtr pRepr = static_cast<SectReprPtr>(pEntry->GetUserData()); + SectRepr* pRepr = static_cast<SectRepr*>(pEntry->GetUserData()); pRepr->GetSectionData().SetEditInReadonlyFlag( TRISTATE_TRUE == pBox->GetState()); pEntry = m_pTree->NextSelected(pEntry); @@ -917,7 +917,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) // at first mark all selected while(pEntry) { - const SectReprPtr pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); + SectRepr* const pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); pSectRepr->SetSelected(); pEntry = m_pTree->NextSelected(pEntry); } @@ -925,7 +925,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) // then delete while(pEntry) { - const SectReprPtr pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); + SectRepr* const pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); SvTreeListEntry* pRemove = 0; bool bRestart = false; if(pSectRepr->IsSelected()) @@ -984,7 +984,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) { while(pEntry) { - const SectReprPtr pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); + SectRepr* const pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); bool bContent = pSectRepr->IsContent(); if( pBox->IsChecked() && bContent && rSh.HasSelection() ) { @@ -1050,7 +1050,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) if(pEntry) { - SectReprPtr pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); + SectRepr* pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); SfxItemSet aSet(rSh.GetView().GetPool(), RES_COL, RES_COL, RES_COLUMNBALANCE, RES_FRAMEDIR, @@ -1116,7 +1116,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) SvTreeListEntry* pSelEntry = m_pTree->FirstSelected(); while( pSelEntry ) { - SectReprPtr pRepr = static_cast<SectReprPtr>(pSelEntry->GetUserData()); + SectRepr* pRepr = static_cast<SectRepr*>(pSelEntry->GetUserData()); if( SfxItemState::SET == eColState ) pRepr->GetCol() = *static_cast<const SwFormatCol*>(pColItem); if( SfxItemState::SET == eBrushState ) @@ -1151,7 +1151,7 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) pEdit->SetSelection(aSelect); SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); - SectReprPtr pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); + SectRepr* pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); if (pEdit == m_pFileNameED) { m_bSubRegionsFilled = false; @@ -1200,7 +1200,7 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox ) if(pEntry) { bool bFile = m_pFileCB->IsChecked(); - SectReprPtr pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); + SectRepr* pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); SwSectionData & rData( pSectRepr->GetSectionData() ); bool bDDE = pBox->IsChecked(); if(bDDE) @@ -1255,7 +1255,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { - SectReprPtr pRepr = static_cast<SectReprPtr>(pEntry->GetUserData()); + SectRepr* pRepr = static_cast<SectRepr*>(pEntry->GetUserData()); if(bSet) { if(!pRepr->GetTempPasswd().getLength() || bChange) @@ -1306,7 +1306,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl) { const OUString aName = m_pCurName->GetText(); m_pTree->SetEntryText(pEntry,aName); - SectReprPtr pRepr = static_cast<SectReprPtr>(pEntry->GetUserData()); + SectRepr* pRepr = static_cast<SectRepr*>(pEntry->GetUserData()); pRepr->GetSectionData().SetSectionName(aName); m_pOK->Enable(!aName.isEmpty()); @@ -1324,7 +1324,7 @@ IMPL_LINK( SwEditRegionDlg, ConditionEditHdl, Edit *, pEdit ) OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { - SectReprPtr pRepr = static_cast<SectReprPtr>(pEntry->GetUserData()); + SectRepr* pRepr = static_cast<SectRepr*>(pEntry->GetUserData()); pRepr->GetSectionData().SetCondition(pEdit->GetText()); pEntry = m_pTree->NextSelected(pEntry); } @@ -1352,7 +1352,7 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg ) OSL_ENSURE( pEntry, "no entry found" ); if ( pEntry ) { - SectReprPtr pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); + SectRepr* pSectRepr = static_cast<SectRepr*>(pEntry->GetUserData()); pSectRepr->SetFile( sFileName ); pSectRepr->SetFilter( sFilterName ); pSectRepr->GetSectionData().SetLinkFilePassword(sPassword); diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 1490b6bd1c82..f346fef74360 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -59,11 +59,9 @@ typedef boost::ptr_vector<SwRedlineDataParent> SwRedlineDataParentArr; class SwRedlineDataParentSortArr : public o3tl::sorted_vector<SwRedlineDataParent*, o3tl::less_ptr_to<SwRedlineDataParent> > {}; -typedef SwRedlineDataChild* SwRedlineDataChildPtr; typedef boost::ptr_vector<SwRedlineDataChild> SwRedlineDataChildArr; -typedef SvTreeListEntry* SvLBoxEntryPtr; -typedef std::vector<SvLBoxEntryPtr> SvLBoxEntryArr; +typedef std::vector<SvTreeListEntry*> SvLBoxEntryArr; class SW_DLLPUBLIC SwRedlineAcceptDlg { diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index c231eed0c8f6..c4687102da78 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -56,7 +56,6 @@ namespace sfx2 // dialog "edit regions" class SectRepr; -typedef SectRepr* SectReprPtr; typedef boost::ptr_set<SectRepr> SectReprArr; class SwEditRegionDlg : public SfxModalDialog diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index a435591d0480..6b3d37ea4372 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -594,7 +594,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRa { pRedlineData = pRedlineData->Next(); - SwRedlineDataChildPtr pRedlineChild = new SwRedlineDataChild; + SwRedlineDataChild* pRedlineChild = new SwRedlineDataChild; pRedlineChild->pChild = pRedlineData; aRedlineChildren.push_back(pRedlineChild); @@ -674,7 +674,7 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd) { if (!bChildrenRemoved && aRedlineParents[i].pNext) { - SwRedlineDataChildPtr pChildPtr = const_cast<SwRedlineDataChildPtr>(aRedlineParents[i].pNext); + SwRedlineDataChild* pChildPtr = const_cast<SwRedlineDataChild*>(aRedlineParents[i].pNext); for( SwRedlineDataChildArr::iterator it = aRedlineChildren.begin(); it != aRedlineChildren.end(); ++it) if (&*it == pChildPtr) @@ -682,7 +682,7 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd) sal_uInt16 nChildren = 0; while (pChildPtr) { - pChildPtr = const_cast<SwRedlineDataChildPtr>(pChildPtr->pNext); + pChildPtr = const_cast<SwRedlineDataChild*>(pChildPtr->pNext); nChildren++; } diff --git a/tools/inc/poly.h b/tools/inc/poly.h index d677bcd8b0ac..0a202bca1615 100644 --- a/tools/inc/poly.h +++ b/tools/inc/poly.h @@ -48,13 +48,12 @@ public: #define MAX_POLYGONS ((sal_uInt16)0x3FF0) class Polygon; -typedef Polygon* SVPPOLYGON; class SAL_WARN_UNUSED ImplPolyPolygon { public: - SVPPOLYGON* mpPolyAry; - sal_uIntPtr mnRefCount; + Polygon** mpPolyAry; + sal_uIntPtr mnRefCount; sal_uInt16 mnCount; sal_uInt16 mnSize; sal_uInt16 mnResize; diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index d390a6e862db..d1dddb17733a 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -41,7 +41,7 @@ ImplPolyPolygon::ImplPolyPolygon( sal_uInt16 nInitSize ) mnCount = nInitSize; mnSize = nInitSize; mnResize = 16; - mpPolyAry = new SVPPOLYGON[ nInitSize ]; + mpPolyAry = new Polygon*[ nInitSize ]; } ImplPolyPolygon::ImplPolyPolygon( const ImplPolyPolygon& rImplPolyPoly ) @@ -53,7 +53,7 @@ ImplPolyPolygon::ImplPolyPolygon( const ImplPolyPolygon& rImplPolyPoly ) if ( rImplPolyPoly.mpPolyAry ) { - mpPolyAry = new SVPPOLYGON[mnSize]; + mpPolyAry = new Polygon*[mnSize]; for ( sal_uInt16 i = 0; i < mnCount; i++ ) mpPolyAry[i] = new Polygon( *rImplPolyPoly.mpPolyAry[i] ); } @@ -128,19 +128,19 @@ void PolyPolygon::Insert( const Polygon& rPoly, sal_uInt16 nPos ) nPos = mpImplPolyPolygon->mnCount; if ( !mpImplPolyPolygon->mpPolyAry ) - mpImplPolyPolygon->mpPolyAry = new SVPPOLYGON[mpImplPolyPolygon->mnSize]; + mpImplPolyPolygon->mpPolyAry = new Polygon*[mpImplPolyPolygon->mnSize]; else if ( mpImplPolyPolygon->mnCount == mpImplPolyPolygon->mnSize ) { sal_uInt16 nOldSize = mpImplPolyPolygon->mnSize; sal_uInt16 nNewSize = nOldSize + mpImplPolyPolygon->mnResize; - SVPPOLYGON* pNewAry; + Polygon** pNewAry; if ( nNewSize >= MAX_POLYGONS ) nNewSize = MAX_POLYGONS; - pNewAry = new SVPPOLYGON[nNewSize]; - memcpy( pNewAry, mpImplPolyPolygon->mpPolyAry, nPos*sizeof(SVPPOLYGON) ); + pNewAry = new Polygon*[nNewSize]; + memcpy( pNewAry, mpImplPolyPolygon->mpPolyAry, nPos*sizeof(Polygon*) ); memcpy( pNewAry+nPos+1, mpImplPolyPolygon->mpPolyAry+nPos, - (nOldSize-nPos)*sizeof(SVPPOLYGON) ); + (nOldSize-nPos)*sizeof(Polygon*) ); delete[] mpImplPolyPolygon->mpPolyAry; mpImplPolyPolygon->mpPolyAry = pNewAry; mpImplPolyPolygon->mnSize = nNewSize; @@ -149,7 +149,7 @@ void PolyPolygon::Insert( const Polygon& rPoly, sal_uInt16 nPos ) { memmove( mpImplPolyPolygon->mpPolyAry+nPos+1, mpImplPolyPolygon->mpPolyAry+nPos, - (mpImplPolyPolygon->mnCount-nPos)*sizeof(SVPPOLYGON) ); + (mpImplPolyPolygon->mnCount-nPos)*sizeof(Polygon*) ); } mpImplPolyPolygon->mpPolyAry[nPos] = new Polygon( rPoly ); @@ -170,7 +170,7 @@ void PolyPolygon::Remove( sal_uInt16 nPos ) mpImplPolyPolygon->mnCount--; memmove( mpImplPolyPolygon->mpPolyAry+nPos, mpImplPolyPolygon->mpPolyAry+nPos+1, - (mpImplPolyPolygon->mnCount-nPos)*sizeof(SVPPOLYGON) ); + (mpImplPolyPolygon->mnCount-nPos)*sizeof(Polygon*) ); } void PolyPolygon::Replace( const Polygon& rPoly, sal_uInt16 nPos ) diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 5688aac71867..85e01f3c598d 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -55,8 +55,6 @@ #include "rtl/instance.hxx" -typedef const FT_Vector* FT_Vector_CPtr; - #include <vector> // TODO: move file mapping stuff to OSL @@ -1471,7 +1469,7 @@ extern "C" { // TODO: wait till all compilers accept that calling conventions // for functions are the same independent of implementation constness, // then uncomment the const-tokens in the function interfaces below -static int FT_move_to( FT_Vector_CPtr p0, void* vpPolyArgs ) +static int FT_move_to( const FT_Vector* p0, void* vpPolyArgs ) { PolyArgs& rA = *static_cast<PolyArgs*>(vpPolyArgs); @@ -1482,14 +1480,14 @@ static int FT_move_to( FT_Vector_CPtr p0, void* vpPolyArgs ) return 0; } -static int FT_line_to( FT_Vector_CPtr p1, void* vpPolyArgs ) +static int FT_line_to( const FT_Vector* p1, void* vpPolyArgs ) { PolyArgs& rA = *static_cast<PolyArgs*>(vpPolyArgs); rA.AddPoint( p1->x, p1->y, POLY_NORMAL ); return 0; } -static int FT_conic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, void* vpPolyArgs ) +static int FT_conic_to( const FT_Vector* p1, const FT_Vector* p2, void* vpPolyArgs ) { PolyArgs& rA = *static_cast<PolyArgs*>(vpPolyArgs); @@ -1506,7 +1504,7 @@ static int FT_conic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, void* vpPolyArgs ) return 0; } -static int FT_cubic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, FT_Vector_CPtr p3, void* vpPolyArgs ) +static int FT_cubic_to( const FT_Vector* p1, const FT_Vector* p2, const FT_Vector* p3, void* vpPolyArgs ) { PolyArgs& rA = *static_cast<PolyArgs*>(vpPolyArgs); rA.AddPoint( p1->x, p1->y, POLY_CONTROL ); diff --git a/vcl/inc/octree.hxx b/vcl/inc/octree.hxx index ad2968121e49..5210387967bc 100644 --- a/vcl/inc/octree.hxx +++ b/vcl/inc/octree.hxx @@ -39,9 +39,6 @@ typedef struct OctreeNode bool bLeaf; } NODE; -typedef NODE* PNODE; -typedef PNODE* PPNODE; - class ImpNodeCache; class BitmapReadAccess; @@ -50,11 +47,11 @@ class VCL_PLUGIN_PUBLIC Octree private: BitmapPalette aPal; - sal_uLong nMax; - sal_uLong nLeafCount; - sal_uLong nLevel; - PNODE pTree; - PNODE pReduce[ OCTREE_BITS + 1 ]; + sal_uLong nMax; + sal_uLong nLeafCount; + sal_uLong nLevel; + NODE* pTree; + NODE* pReduce[ OCTREE_BITS + 1 ]; BitmapColor* pColor; ImpNodeCache* pNodeCache; const BitmapReadAccess* pAcc; @@ -62,12 +59,12 @@ private: Octree() {} - void CreatePalette( PNODE pNode ); - void GetPalIndex( PNODE pNode ); + void CreatePalette( NODE* pNode ); + void GetPalIndex( NODE* pNode ); SAL_DLLPRIVATE void ImplCreateOctree(); - SAL_DLLPRIVATE void ImplDeleteOctree( PPNODE ppNode ); - SAL_DLLPRIVATE void ImplAdd( PPNODE ppNode ); + SAL_DLLPRIVATE void ImplDeleteOctree( NODE** ppNode ); + SAL_DLLPRIVATE void ImplAdd( NODE** ppNode ); SAL_DLLPRIVATE void ImplReduce(); public: diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 107f10cb3b7d..0fbc87de6114 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -280,12 +280,11 @@ public: }; #define MULTITEXTLINEINFO_RESIZE 16 -typedef ImplTextLineInfo* PImplTextLineInfo; class ImplMultiTextLineInfo { private: - PImplTextLineInfo* mpLines; + ImplTextLineInfo** mpLines; sal_Int32 mnLines; sal_Int32 mnSize; diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h index 4a4e0f666481..b380988b1071 100644 --- a/vcl/inc/quartz/salvd.h +++ b/vcl/inc/quartz/salvd.h @@ -37,8 +37,7 @@ struct SalVirDevData }; typedef struct SalVirDevData SalVirDevData; -typedef SalVirDevData *SalVirDevDataPtr; -typedef SalVirDevDataPtr *SalVirDevDataHandle; +typedef SalVirDevData** SalVirDevDataHandle; class AquaSalGraphics; diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx index 1de20edf9dfe..6a0d891910c8 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/gdi/octree.cxx @@ -65,7 +65,7 @@ Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) : pAcc ( &rReadAcc ) { pNodeCache = new ImpNodeCache( nColors ); - memset( pReduce, 0, ( OCTREE_BITS + 1 ) * sizeof( PNODE ) ); + memset( pReduce, 0, ( OCTREE_BITS + 1 ) * sizeof( NODE* ) ); ImplCreateOctree(); } @@ -119,7 +119,7 @@ void Octree::ImplCreateOctree() } } -void Octree::ImplDeleteOctree( PPNODE ppNode ) +void Octree::ImplDeleteOctree( NODE** ppNode ) { for ( sal_uLong i = 0UL; i < 8UL; i++ ) { @@ -131,7 +131,7 @@ void Octree::ImplDeleteOctree( PPNODE ppNode ) *ppNode = NULL; } -void Octree::ImplAdd( PPNODE ppNode ) +void Octree::ImplAdd( NODE** ppNode ) { // ggf. neuen Knoten erzeugen if( !*ppNode ) @@ -171,7 +171,7 @@ void Octree::ImplAdd( PPNODE ppNode ) void Octree::ImplReduce() { sal_uLong i; - PNODE pNode; + NODE* pNode; sal_uLong nRedSum = 0L; sal_uLong nGreenSum = 0L; sal_uLong nBlueSum = 0L; @@ -186,7 +186,7 @@ void Octree::ImplReduce() { if ( pNode->pChild[ i ] ) { - PNODE pChild = pNode->pChild[ i ]; + NODE* pChild = pNode->pChild[ i ]; nRedSum += pChild->nRed; nGreenSum += pChild->nGreen; @@ -206,7 +206,7 @@ void Octree::ImplReduce() nLeafCount -= --nChildren; } -void Octree::CreatePalette( PNODE pNode ) +void Octree::CreatePalette( NODE* pNode ) { if( pNode->bLeaf ) { @@ -221,7 +221,7 @@ void Octree::CreatePalette( PNODE pNode ) } -void Octree::GetPalIndex( PNODE pNode ) +void Octree::GetPalIndex( NODE* pNode ) { if ( pNode->bLeaf ) nPalIndex = pNode->nPalIndex; diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 78aca0e192d7..f6808fae3a48 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -57,7 +57,7 @@ ImplMultiTextLineInfo::ImplMultiTextLineInfo() { - mpLines = new PImplTextLineInfo[MULTITEXTLINEINFO_RESIZE]; + mpLines = new ImplTextLineInfo*[MULTITEXTLINEINFO_RESIZE]; mnLines = 0; mnSize = MULTITEXTLINEINFO_RESIZE; } @@ -74,8 +74,8 @@ void ImplMultiTextLineInfo::AddLine( ImplTextLineInfo* pLine ) if ( mnSize == mnLines ) { mnSize += MULTITEXTLINEINFO_RESIZE; - PImplTextLineInfo* pNewLines = new PImplTextLineInfo[mnSize]; - memcpy( pNewLines, mpLines, mnLines*sizeof(PImplTextLineInfo) ); + ImplTextLineInfo** pNewLines = new ImplTextLineInfo*[mnSize]; + memcpy( pNewLines, mpLines, mnLines*sizeof(ImplTextLineInfo*) ); mpLines = pNewLines; } |