diff options
25 files changed, 56 insertions, 56 deletions
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index 882082a6313e..9077e45d92ff 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -580,7 +580,7 @@ private: inserted at a proper position to rString after all bracketed prefixes. */ SVL_DLLPRIVATE OUString ImpObtainCalendarAndNumerals( OUStringBuffer & rString, - sal_Int32 & nPos, + sal_Int32 nPos, LanguageType & nLang, const LocaleType & aTmpLocale ); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 3d7a4842ca91..18641b419422 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -256,7 +256,7 @@ public: sal_Int32 GetEntryCount() const; SvxIconChoiceCtrlEntry* GetEntry( sal_Int32 nPos ) const; - sal_Int32 GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const; + sal_Int32 GetEntryListPos( SvxIconChoiceCtrlEntry const * pEntry ) const; using Window::SetCursor; void SetCursor( SvxIconChoiceCtrlEntry* pEntry ); SvxIconChoiceCtrlEntry* GetCursor() const; diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index e95febf8fabd..23aac6fc2fcc 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -697,7 +697,7 @@ private: bool bRequiredStyle = false, RulerIndentStyle nRequiredStyle = RulerIndentStyle::Top ) const; SVT_DLLPRIVATE bool ImplDocHitTest( const Point& rPos, RulerType eDragType, RulerSelection* pHitTest ) const; - SVT_DLLPRIVATE bool ImplStartDrag( RulerSelection* pHitTest, sal_uInt16 nModifier ); + SVT_DLLPRIVATE bool ImplStartDrag( RulerSelection const * pHitTest, sal_uInt16 nModifier ); SVT_DLLPRIVATE void ImplDrag( const Point& rPos ); SVT_DLLPRIVATE void ImplEndDrag(); diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index b844807d7d48..66a056448b53 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -668,7 +668,7 @@ public: BitmapReadAccess const * pReadAcc, int aNumberOfContributions, const double* pWeights, - int* pPixels, + int const * pPixels, const int* pCount ); SAL_DLLPRIVATE bool ImplMakeMono( sal_uInt8 cThreshold ); diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 507d40208928..1f278b244616 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -189,7 +189,7 @@ struct Entity : public ParserData explicit Entity( const ParserData& rData ); Entity( const Entity& rEntity ); - void startElement( Event *pEvent ); + void startElement( Event const *pEvent ); void characters( const OUString& sChars ); void endElement(); void processingInstruction( const OUString& rTarget, const OUString& rData ); @@ -397,7 +397,7 @@ Entity::Entity(const Entity& e) { } -void Entity::startElement( Event *pEvent ) +void Entity::startElement( Event const *pEvent ) { const sal_Int32& nElementToken = pEvent->mnElementToken; const OUString& aNamespace = pEvent->msNamespace; diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx index acb85ae7fe6b..d363542bae57 100644 --- a/svl/source/crypto/cryptosign.cxx +++ b/svl/source/crypto/cryptosign.cxx @@ -1715,7 +1715,7 @@ namespace { #ifdef SVL_CRYPTO_NSS /// Similar to NSS_CMSAttributeArray_FindAttrByOidTag(), but works directly with a SECOidData. -NSSCMSAttribute* CMSAttributeArray_FindAttrByOidData(NSSCMSAttribute** attrs, SECOidData* oid, PRBool only) +NSSCMSAttribute* CMSAttributeArray_FindAttrByOidData(NSSCMSAttribute** attrs, SECOidData const * oid, PRBool only) { NSSCMSAttribute* attr1, *attr2; diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 1f2012f998ca..d3e48317f4d0 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -466,7 +466,7 @@ static bool lcl_SvNumberformat_IsBracketedPrefix( short nSymbolType ) /** Import extended LCID from Excel */ -OUString SvNumberformat::ImpObtainCalendarAndNumerals( OUStringBuffer& rString, sal_Int32& nPos, +OUString SvNumberformat::ImpObtainCalendarAndNumerals( OUStringBuffer& rString, sal_Int32 nPos, LanguageType& nLang, const LocaleType& aTmpLocale ) { OUString sCalendar; diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 882b0049910d..1f9efb0ce1b2 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -249,8 +249,8 @@ class SvxIconChoiceCtrl_Impl ); void SelectRange( - SvxIconChoiceCtrlEntry* pStart, - SvxIconChoiceCtrlEntry* pEnd, + SvxIconChoiceCtrlEntry const * pStart, + SvxIconChoiceCtrlEntry const * pEnd, bool bAdd ); @@ -447,7 +447,7 @@ public: } SvxIconChoiceCtrlEntry* GetFirstSelectedEntry() const; void SetSelectionMode( SelectionMode eMode ) { eSelectionMode=eMode; } - sal_Int32 GetEntryListPos( SvxIconChoiceCtrlEntry* ) const; + sal_Int32 GetEntryListPos( SvxIconChoiceCtrlEntry const * ) const; void InitSettings(); tools::Rectangle GetOutputRect() const; diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 424b080ff213..8366a8c497e1 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2564,8 +2564,8 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const tools::Rectangle& rRect, bool bAd } void SvxIconChoiceCtrl_Impl::SelectRange( - SvxIconChoiceCtrlEntry* pStart, - SvxIconChoiceCtrlEntry* pEnd, + SvxIconChoiceCtrlEntry const * pStart, + SvxIconChoiceCtrlEntry const * pEnd, bool bAdd ) { sal_uLong nFront = GetEntryListPos( pStart ); @@ -3047,7 +3047,7 @@ void IcnViewEdit_Impl::StopEditing() } } -sal_Int32 SvxIconChoiceCtrl_Impl::GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const +sal_Int32 SvxIconChoiceCtrl_Impl::GetEntryListPos( SvxIconChoiceCtrlEntry const * pEntry ) const { if( !(nFlags & IconChoiceFlags::EntryListPosValid )) const_cast<SvxIconChoiceCtrl_Impl*>(this)->SetListPositions(); diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index f1796d5704ac..31310df0313b 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -297,7 +297,7 @@ bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt ) bool bHandled = _pImpl->KeyInput( rKEvt ); return bHandled; } -sal_Int32 SvtIconChoiceCtrl::GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const +sal_Int32 SvtIconChoiceCtrl::GetEntryListPos( SvxIconChoiceCtrlEntry const * pEntry ) const { return _pImpl->GetEntryListPos( pEntry ); } diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 15e96da47f98..52198ae55f92 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -1744,7 +1744,7 @@ bool Ruler::ImplDocHitTest( const Point& rPos, RulerType eDragType, return false; } -bool Ruler::ImplStartDrag( RulerSelection* pHitTest, sal_uInt16 nModifier ) +bool Ruler::ImplStartDrag( RulerSelection const * pHitTest, sal_uInt16 nModifier ) { // don't trigger drag if a border that was clicked can not be changed if ( (pHitTest->eType == RulerType::Border) && diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index b64de3ffed69..9b169eabcd29 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -115,7 +115,7 @@ private: }; // For nice SAL_INFO logging of ImplLayoutArgs values -std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs); +std::ostream &operator <<(std::ostream& s, ImplLayoutArgs const &rArgs); // all positions/widths are in font units // one exception: drawposition is in pixel units diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index 80225dc04fd6..3d676aa371e8 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -344,7 +344,7 @@ namespace vcl * @ingroup sft * */ - int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, sal_uInt16 *glyphArray, sal_uInt8 *encoding, int nGlyphs, int wmode); + int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, sal_uInt16 const *glyphArray, sal_uInt8 *encoding, int nGlyphs, int wmode); /** * Generates a new TrueType font and dumps it to <b>outf</b> file. @@ -368,8 +368,8 @@ namespace vcl */ int CreateTTFromTTGlyphs(TrueTypeFont *ttf, const char *fname, - sal_uInt16 *glyphArray, - sal_uInt8 *encoding, + sal_uInt16 const *glyphArray, + sal_uInt8 const *encoding, int nGlyphs, int nNameRecs, NameRecord const *nr); @@ -397,7 +397,7 @@ namespace vcl int CreateT42FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *psname, - sal_uInt16 *glyphArray, + sal_uInt16 const *glyphArray, sal_uInt8 *encoding, int nGlyphs); diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx index 604b182b5bb1..7c0aecd5fa47 100644 --- a/vcl/source/filter/jpeg/JpegReader.cxx +++ b/vcl/source/filter/jpeg/JpegReader.cxx @@ -180,7 +180,7 @@ JPEGReader::~JPEGReader() { } -bool JPEGReader::CreateBitmap(JPEGCreateBitmapParam& rParam) +bool JPEGReader::CreateBitmap(JPEGCreateBitmapParam const & rParam) { if (rParam.nWidth > SAL_MAX_INT32 / 8 || rParam.nHeight > SAL_MAX_INT32 / 8) return false; // avoid overflows later diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx index 6c4f1dc3803b..84ad8c2a718c 100644 --- a/vcl/source/filter/jpeg/JpegReader.hxx +++ b/vcl/source/filter/jpeg/JpegReader.hxx @@ -64,7 +64,7 @@ public: ReadState Read(Graphic& rGraphic, GraphicFilterImportFlags nImportFlags, Bitmap::ScopedWriteAccess* ppAccess); - bool CreateBitmap(JPEGCreateBitmapParam& param); + bool CreateBitmap(JPEGCreateBitmapParam const & param); Bitmap& GetBitmap() { return *mpBitmap; } }; diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 19e40cb6d61c..098d54b41b2d 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -1770,7 +1770,7 @@ int GetTTGlyphComponents(TrueTypeFont *ttf, sal_uInt32 glyphID, std::vector< sal } int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, - sal_uInt16 *glyphArray, sal_uInt8 *encoding, int nGlyphs, + sal_uInt16 const *glyphArray, sal_uInt8 *encoding, int nGlyphs, int wmode) { ControlPoint *pa; @@ -1923,8 +1923,8 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, int CreateTTFromTTGlyphs(TrueTypeFont *ttf, const char *fname, - sal_uInt16 *glyphArray, - sal_uInt8 *encoding, + sal_uInt16 const *glyphArray, + sal_uInt8 const *encoding, int nGlyphs, int nNameRecs, NameRecord const *nr) @@ -2178,7 +2178,7 @@ static void DumpSfnts(FILE *outf, sal_uInt8 *sfntP, sal_uInt32 sfntLen) int CreateT42FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *psname, - sal_uInt16 *glyphArray, + sal_uInt16 const *glyphArray, sal_uInt8 *encoding, int nGlyphs) { diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index 2b30cb35ebc5..6ea929cd728d 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -615,7 +615,7 @@ static sal_uInt8 *PackCmapType0(CmapSubTable const *s, sal_uInt32 *length) return ptr; } -static sal_uInt8 *PackCmapType6(CmapSubTable *s, sal_uInt32 *length) +static sal_uInt8 *PackCmapType6(CmapSubTable const *s, sal_uInt32 *length) { sal_uInt8* ptr = static_cast<sal_uInt8*>(smalloc(s->n*2 + 10)); sal_uInt8 *p = ptr + 10; @@ -642,7 +642,7 @@ static sal_uInt8 *PackCmapType6(CmapSubTable *s, sal_uInt32 *length) } /* XXX it only handles Format 0 encoding tables */ -static sal_uInt8 *PackCmap(CmapSubTable *s, sal_uInt32 *length) +static sal_uInt8 *PackCmap(CmapSubTable const *s, sal_uInt32 *length) { if( s->xg[s->n-1] > 0xff ) return PackCmapType6(s, length); diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 4aef742fcc86..b509f6059737 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -2127,7 +2127,7 @@ bool Bitmap::Adjust( short nLuminancePercent, short nContrastPercent, return bRet; } -bool Bitmap::ImplConvolutionPass(Bitmap& aNewBitmap, BitmapReadAccess const * pReadAcc, int aNumberOfContributions, const double* pWeights, int* pPixels, const int* pCount) +bool Bitmap::ImplConvolutionPass(Bitmap& aNewBitmap, BitmapReadAccess const * pReadAcc, int aNumberOfContributions, const double* pWeights, int const * pPixels, const int* pCount) { if (!pReadAcc) return false; diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 3592ae115504..db6d337c0c2e 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -3026,7 +3026,7 @@ static void appendSubsetName( int nSubsetID, const OUString& rPSName, OStringBuf appendName( rPSName, rBuffer ); } -sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* pEncoding, +sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8 const * pEncoding, const sal_Ucs* pCodeUnits, const sal_Int32* pCodeUnitsPerGlyph, const sal_Int32* pEncToUnicodeIndex, @@ -3136,7 +3136,7 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* pEncoding, return nStream; } -sal_Int32 PDFWriterImpl::emitFontDescriptor( const PhysicalFontFace* pFont, FontSubsetInfo& rInfo, sal_Int32 nSubsetID, sal_Int32 nFontStream ) +sal_Int32 PDFWriterImpl::emitFontDescriptor( const PhysicalFontFace* pFont, FontSubsetInfo const & rInfo, sal_Int32 nSubsetID, sal_Int32 nFontStream ) { OStringBuffer aLine( 1024 ); // get font flags, see PDF reference 1.4 p. 358 @@ -8647,7 +8647,7 @@ void PDFWriterImpl::writeTransparentObject( TransparencyEmit& rObject ) CHECK_RETURN2( writeBuffer( aLine.getStr(), aLine.getLength() ) ); } -bool PDFWriterImpl::writeGradientFunction( GradientEmit& rObject ) +bool PDFWriterImpl::writeGradientFunction( GradientEmit const & rObject ) { // LO internal gradient -> PDF shading type: // * GradientStyle::Linear: axial shading, using sampled-function with 2 samples diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index b9e02ee0a69d..7aba8c50d0e6 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -861,7 +861,7 @@ i12626 /* writes the Do operation inside the content stream */ void drawBitmap( const Point& rDestPt, const Size& rDestSize, const BitmapEmit& rBitmap, const Color& rFillColor ); /* write the function object for a Gradient */ - bool writeGradientFunction( GradientEmit& rObject ); + bool writeGradientFunction( GradientEmit const & rObject ); /* creates a GradientEmit and returns its object number */ sal_Int32 createGradient( const Gradient& rGradient, const Size& rSize ); @@ -874,9 +874,9 @@ i12626 /* writes a type1 system font object and returns its mapping from font ids to object ids (or 0 in case of failure ) */ std::map< sal_Int32, sal_Int32 > emitSystemFont( const PhysicalFontFace*, EmbedFont const & ); /* writes a font descriptor and returns its object id (or 0) */ - sal_Int32 emitFontDescriptor( const PhysicalFontFace*, FontSubsetInfo&, sal_Int32 nSubsetID, sal_Int32 nStream ); + sal_Int32 emitFontDescriptor( const PhysicalFontFace*, FontSubsetInfo const &, sal_Int32 nSubsetID, sal_Int32 nStream ); /* writes a ToUnicode cmap, returns the corresponding stream object */ - sal_Int32 createToUnicodeCMap( sal_uInt8* pEncoding, const sal_Ucs* pCodeUnits, const sal_Int32* pCodeUnitsPerGlyph, + sal_Int32 createToUnicodeCMap( sal_uInt8 const * pEncoding, const sal_Ucs* pCodeUnits, const sal_Int32* pCodeUnitsPerGlyph, const sal_Int32* pEncToUnicodeIndex, int nGlyphs ); /* get resource dict object number */ diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index a3b2d019c783..e277e661f61e 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -50,7 +50,7 @@ #define GF_DROPPED 0xFFFFFFFF -std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs) +std::ostream &operator <<(std::ostream& s, ImplLayoutArgs const &rArgs) { #ifndef SAL_LOG_INFO (void) rArgs; diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 0befbf6f3a93..174eda36c3a4 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -65,7 +65,7 @@ static long ImplIndexFromColor( const BitmapColor& rCol ) static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, - Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, const long* pMapY ) + Scanline* pSrcScanMap, Scanline* pDstScanMap, long const * pMapX, const long* pMapY ) { const long nHeight1 = rDstBuffer.mnHeight - 1; const ColorMask& rSrcMask = rSrcBuffer.maColorMask; @@ -96,9 +96,9 @@ static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuff } } -static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer, +static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer const & rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, - Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, const long* pMapY ) + Scanline* pSrcScanMap, Scanline* pDstScanMap, long const * pMapX, const long* pMapY ) { const long nHeight1 = rDstBuffer.mnHeight - 1; const ColorMask& rSrcMask = rSrcBuffer.maColorMask; @@ -175,9 +175,9 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffe } } -static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer, +static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer const & rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, - Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, const long* pMapY ) + Scanline* pSrcScanMap, Scanline* pDstScanMap, long const * pMapX, const long* pMapY ) { const long nHeight1 = rDstBuffer.mnHeight - 1; const ColorMask& rSrcMask = rSrcBuffer.maColorMask; @@ -219,9 +219,9 @@ static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer } } -static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer, +static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer const & rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, - Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, const long* pMapY ) + Scanline* pSrcScanMap, Scanline* pDstScanMap, long const * pMapX, const long* pMapY ) { const long nHeight1 = rDstBuffer.mnHeight- 1; const ColorMask& rSrcMask = rSrcBuffer.maColorMask; diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 23afab02edf2..a4c0187097e6 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -42,7 +42,7 @@ struct ImplCursorData VclPtr<vcl::Window> mpWindow; // assigned window }; -static void ImplCursorInvert( ImplCursorData* pData ) +static void ImplCursorInvert( ImplCursorData const * pData ) { vcl::Window* pWindow = pData->mpWindow; std::unique_ptr<PaintBufferGuard> pGuard; diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 4200cdbc02d0..8541bed438dd 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -145,7 +145,7 @@ int ToolBox::ImplGetDragWidth() const return ToolBox::ImplGetDragWidth( *this, mbHorz ); } -ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType ) +ButtonType determineButtonType( ImplToolItem const * pItem, ButtonType defaultType ) { ButtonType tmpButtonType = defaultType; if ( pItem->mnBits & (ToolBoxItemBits::TEXT_ONLY | ToolBoxItemBits::ICON_ONLY) ) // item has custom setting diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 3c56adc27733..fdc584eb7513 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1955,7 +1955,7 @@ static MouseEventModifiers ImplGetMouseButtonMode( SalMouseEvent const * pEvent return nMode; } -inline bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent* pEvent ) +inline bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent const * pEvent ) { return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEMOVE, true, pEvent->mnX, pEvent->mnY, @@ -1963,7 +1963,7 @@ inline bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent* pEvent ImplGetMouseMoveMode( pEvent ) ); } -inline bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent* pEvent ) +inline bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent const * pEvent ) { return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEMOVE, false, pEvent->mnX, pEvent->mnY, @@ -1971,7 +1971,7 @@ inline bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent* pEvent ImplGetMouseMoveMode( pEvent ) ); } -inline bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseEvent* pEvent ) +inline bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseEvent const * pEvent ) { return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEBUTTONDOWN, false, pEvent->mnX, pEvent->mnY, @@ -1984,7 +1984,7 @@ inline bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseEvent* p ImplGetMouseButtonMode( pEvent ) ); } -inline bool ImplHandleSalMouseButtonUp( vcl::Window* pWindow, SalMouseEvent* pEvent ) +inline bool ImplHandleSalMouseButtonUp( vcl::Window* pWindow, SalMouseEvent const * pEvent ) { return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEBUTTONUP, false, pEvent->mnX, pEvent->mnY, @@ -2038,7 +2038,7 @@ static bool ImplHandleMenuEvent( vcl::Window const * pWindow, SalMenuEvent* pEve return bRet; } -static void ImplHandleSalKeyMod( vcl::Window* pWindow, SalKeyModEvent* pEvent ) +static void ImplHandleSalKeyMod( vcl::Window* pWindow, SalKeyModEvent const * pEvent ) { ImplSVData* pSVData = ImplGetSVData(); vcl::Window* pTrackWin = pSVData->maWinData.mpTrackWin; @@ -2283,7 +2283,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE switch ( nEvent ) { case SalEvent::MouseMove: - bRet = ImplHandleSalMouseMove( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) ); + bRet = ImplHandleSalMouseMove( pWindow, static_cast<SalMouseEvent const *>(pEvent) ); break; case SalEvent::ExternalMouseMove: { @@ -2300,10 +2300,10 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE } break; case SalEvent::MouseLeave: - bRet = ImplHandleSalMouseLeave( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) ); + bRet = ImplHandleSalMouseLeave( pWindow, static_cast<SalMouseEvent const *>(pEvent) ); break; case SalEvent::MouseButtonDown: - bRet = ImplHandleSalMouseButtonDown( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) ); + bRet = ImplHandleSalMouseButtonDown( pWindow, static_cast<SalMouseEvent const *>(pEvent) ); break; case SalEvent::ExternalMouseButtonDown: { @@ -2320,7 +2320,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE } break; case SalEvent::MouseButtonUp: - bRet = ImplHandleSalMouseButtonUp( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) ); + bRet = ImplHandleSalMouseButtonUp( pWindow, static_cast<SalMouseEvent const *>(pEvent) ); break; case SalEvent::ExternalMouseButtonUp: { @@ -2368,7 +2368,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE } break; case SalEvent::KeyModChange: - ImplHandleSalKeyMod( pWindow, const_cast<SalKeyModEvent *>(static_cast<SalKeyModEvent const *>(pEvent)) ); + ImplHandleSalKeyMod( pWindow, static_cast<SalKeyModEvent const *>(pEvent) ); break; case SalEvent::InputLanguageChange: |