[Libreoffice-commits] core.git: 2 commits - framework/source include/toolkit include/tools include/vcl toolkit/source tools/source vcl/generic vcl/inc vcl/opengl vcl/source vcl/unx
Noel Grandin
noel at peralex.com
Wed Apr 1 01:37:53 PDT 2015
framework/source/uielement/menubarmanager.cxx | 3 +--
include/toolkit/controls/geometrycontrolmodel.hxx | 2 +-
include/toolkit/controls/roadmapcontrol.hxx | 2 +-
include/toolkit/controls/stdtabcontroller.hxx | 2 +-
include/toolkit/controls/unocontrolmodel.hxx | 4 ++--
include/tools/wldcrd.hxx | 2 +-
include/vcl/FilterConfigItem.hxx | 6 +++---
include/vcl/bitmap.hxx | 2 +-
include/vcl/builder.hxx | 8 ++++----
include/vcl/dialog.hxx | 2 +-
include/vcl/graphicfilter.hxx | 4 ++--
include/vcl/layout.hxx | 4 ++--
include/vcl/menu.hxx | 4 ++--
include/vcl/opengl/OpenGLContext.hxx | 2 +-
include/vcl/outdev.hxx | 2 +-
include/vcl/ppdparser.hxx | 2 +-
include/vcl/texteng.hxx | 2 +-
include/vcl/textview.hxx | 4 ++--
include/vcl/vclmedit.hxx | 2 +-
include/vcl/window.hxx | 2 +-
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
toolkit/source/controls/geometrycontrolmodel.cxx | 2 +-
toolkit/source/controls/stdtabcontroller.cxx | 2 +-
toolkit/source/controls/tree/treedatamodel.cxx | 2 +-
toolkit/source/controls/unocontrolmodel.cxx | 2 +-
tools/source/fsys/wldcrd.cxx | 2 +-
tools/source/inet/inetmsg.cxx | 4 ++--
tools/source/ref/errinf.cxx | 4 ++--
vcl/generic/fontmanager/fontcache.cxx | 6 +++---
vcl/generic/fontmanager/fontconfig.cxx | 13 ++++---------
vcl/generic/fontmanager/fontmanager.cxx | 6 +++---
vcl/generic/print/glyphset.hxx | 8 ++++----
vcl/inc/brdwin.hxx | 20 ++++++++++----------
vcl/inc/fontcache.hxx | 6 +++---
vcl/inc/fontmanager.hxx | 14 +++++++-------
vcl/inc/fontsubset.hxx | 2 +-
vcl/inc/generic/geninst.h | 2 +-
vcl/inc/generic/printergfx.hxx | 4 ++--
vcl/inc/generic/printerjob.hxx | 4 ++--
vcl/inc/impimagetree.hxx | 2 +-
vcl/inc/opengl/framebuffer.hxx | 2 +-
vcl/inc/opengl/salbmp.hxx | 4 ++--
vcl/inc/openglgdiimpl.hxx | 2 +-
vcl/inc/regionband.hxx | 2 +-
vcl/inc/sallayout.hxx | 2 +-
vcl/opengl/salbmp.cxx | 4 ++--
vcl/opengl/scale.cxx | 8 ++++----
vcl/opengl/texture.cxx | 2 +-
vcl/source/filter/ixpm/xpmread.hxx | 16 ++++++++--------
vcl/source/filter/jpeg/Exif.hxx | 2 +-
vcl/source/filter/wmf/winmtf.hxx | 2 +-
vcl/source/gdi/alpha.cxx | 2 +-
vcl/source/gdi/bitmap.cxx | 20 ++++++++++----------
vcl/source/gdi/bitmap3.cxx | 4 ++--
vcl/source/gdi/bitmap4.cxx | 12 ++++++------
vcl/source/gdi/bmpfast.cxx | 18 +++++++++---------
vcl/source/gdi/impvect.cxx | 2 +-
vcl/source/gdi/impvect.hxx | 14 +++++++-------
vcl/source/gdi/pdfwriter_impl.cxx | 4 ++--
vcl/source/gdi/sallayout.cxx | 6 +++---
vcl/source/opengl/OpenGLContext.cxx | 2 +-
vcl/source/outdev/font.cxx | 2 +-
vcl/source/outdev/textline.cxx | 2 +-
vcl/source/window/brdwin.cxx | 2 +-
vcl/source/window/layout.cxx | 4 ++--
vcl/source/window/menuwindow.hxx | 4 ++--
vcl/unx/generic/gdi/cairotextrender.cxx | 3 +--
vcl/unx/generic/printer/ppdparser.cxx | 4 ++--
vcl/unx/gtk/window/gtksalmenu.cxx | 3 +--
69 files changed, 157 insertions(+), 165 deletions(-)
New commits:
commit 3e672693e35e720177eac98094c42570fca9cfbb
Author: Noel Grandin <noel at peralex.com>
Date: Wed Apr 1 08:33:09 2015 +0200
loplugin:staticfunction
Change-Id: I909cf7e77f9d7194575636248196fda311fffdb6
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index af103c3..845791a 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -391,8 +391,7 @@ throw ( RuntimeException, std::exception )
SolarMutexGuard aSolarGuard;
{
- vcl::MenuInvalidator aInvalidator;
- aInvalidator.Invalidated();
+ vcl::MenuInvalidator::Invalidated();
}
{
if ( m_bDisposed )
diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx
index adb08cb..88694f0 100644
--- a/include/vcl/FilterConfigItem.hxx
+++ b/include/vcl/FilterConfigItem.hxx
@@ -40,9 +40,9 @@ class VCL_DLLPUBLIC FilterConfigItem
bool bModified;
- bool ImplGetPropertyValue( ::com::sun::star::uno::Any& rAny,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet,
- const OUString& rPropName,
+ static bool ImplGetPropertyValue( ::com::sun::star::uno::Any& rAny,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet,
+ const OUString& rPropName,
bool bTestPropertyAvailability );
void ImpInitTree( const OUString& rTree );
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 37f9954..89fef35 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -216,7 +216,7 @@ public:
return (-3.0 <= x && x < 3.0) ? SincFilter(x) * SincFilter( x / 3.0 ) : 0.0;
}
- inline double SincFilter(double x) const
+ static inline double SincFilter(double x)
{
if (x == 0.0)
{
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 2257343..824e2c4 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -366,9 +366,9 @@ private:
void handlePacking(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader);
void applyPackingProperty(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader);
void collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rVec);
- void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap);
- void collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rMap);
- void collectAccelerator(xmlreader::XmlReader &reader, stringmap &rMap);
+ static void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap);
+ static void collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rMap);
+ static void collectAccelerator(xmlreader::XmlReader &reader, stringmap &rMap);
void insertMenuObject(
PopupMenu *pParent,
@@ -397,7 +397,7 @@ private:
PackingData get_window_packing_data(const vcl::Window *pWindow) const;
void set_window_packing_position(const vcl::Window *pWindow, sal_Int32 nPosition);
- vcl::Window* prepareWidgetOwnScrolling(vcl::Window *pParent, WinBits &rWinStyle);
+ static vcl::Window* prepareWidgetOwnScrolling(vcl::Window *pParent, WinBits &rWinStyle);
void cleanupWidgetOwnScrolling(vcl::Window *pScrollParent, vcl::Window *pWindow, stringmap &rMap);
void set_response(const OString& sID, short nResponse);
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index ab95f52..3dbde87 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -103,7 +103,7 @@ public:
long GetResult() const;
private:
bool ImplStartExecuteModal();
- void ImplEndExecuteModal();
+ static void ImplEndExecuteModal();
public:
// Dialog::Execute replacement API
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index c262563..5249d73 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -259,7 +259,7 @@ public:
OUString GetImportFormatTypeName( sal_uInt16 nFormat );
OUString GetImportFormatMediaType( sal_uInt16 nFormat );
OUString GetImportFormatShortName( sal_uInt16 nFormat );
- OUString GetImportOSFileType( sal_uInt16 nFormat );
+ static OUString GetImportOSFileType( sal_uInt16 nFormat );
OUString GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 );
bool IsImportPixelFormat( sal_uInt16 nFormat );
@@ -273,7 +273,7 @@ public:
OUString GetExportFormatTypeName( sal_uInt16 nFormat );
OUString GetExportFormatMediaType( sal_uInt16 nFormat );
OUString GetExportFormatShortName( sal_uInt16 nFormat );
- OUString GetExportOSFileType( sal_uInt16 nFormat );
+ static OUString GetExportOSFileType( sal_uInt16 nFormat );
OUString GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 );
bool IsExportPixelFormat( sal_uInt16 nFormat );
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index efeabf8..24ad217 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -380,7 +380,7 @@ private:
typedef boost::multi_array<ExtendedGridEntry, 2> ext_array_type;
array_type assembleGrid() const;
- bool isNullGrid(const array_type& A) const;
+ static bool isNullGrid(const array_type& A);
public:
struct Value
{
@@ -389,7 +389,7 @@ public:
Value() : m_nValue(0), m_bExpand(false) {}
};
private:
- void calcMaxs(const array_type &A, std::vector<Value> &rWidths, std::vector<Value> &rHeights) const;
+ static void calcMaxs(const array_type &A, std::vector<Value> &rWidths, std::vector<Value> &rHeights);
Size calculateRequisitionForSpacings(sal_Int32 nRowSpacing, sal_Int32 nColSpacing) const;
virtual Size calculateRequisition() const SAL_OVERRIDE;
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 95bf37f..4fd81d2 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -385,8 +385,8 @@ namespace vcl
{
public:
MenuInvalidator();
- VclEventListeners2* GetMenuInvalidateListeners();
- void Invalidated();
+ static VclEventListeners2* GetMenuInvalidateListeners();
+ static void Invalidated();
};
}
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 8be646e..56c34c0 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -192,7 +192,7 @@ public:
bool BindFramebuffer( OpenGLFramebuffer* pFramebuffer );
bool AcquireDefaultFramebuffer();
OpenGLFramebuffer* AcquireFramebuffer( const OpenGLTexture& rTexture );
- void ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer );
+ static void ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer );
#ifdef DBG_UTIL
void AddRef(SalGraphicsImpl*);
void DeRef(SalGraphicsImpl*);
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 47c77ad..4cf2454 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -912,7 +912,7 @@ public:
MetricVector* pVector = NULL, OUString* pDisplayText = NULL,
::vcl::ITextLayout* _pTextLayout = NULL );
- void ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect,
+ static void ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect,
const OUString& rOrigStr, sal_uInt16 nStyle,
MetricVector* pVector, OUString* pDisplayText, ::vcl::ITextLayout& _rLayout );
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index c9a10ef..71cc210 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -242,7 +242,7 @@ public:
void getDefaultResolution( int& rXRes, int& rYRes ) const;
// values in dpi
- void getResolutionFromString( const OUString&, int&, int& ) const;
+ static void getResolutionFromString( const OUString&, int&, int& );
// helper function
int getDuplexTypes() const
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 6fae3b5..5df2098 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -201,7 +201,7 @@ protected:
long ImpGetXPos( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, bool bPreferPortionStart = false );
long ImpGetOutputOffset( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, sal_uInt16 nIndex2 );
sal_uInt8 ImpGetRightToLeft( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16* pStart = NULL, sal_uInt16* pEnd = NULL );
- void ImpInitLayoutMode( OutputDevice* pOutDev, bool bDrawingR2LPortion = false );
+ static void ImpInitLayoutMode( OutputDevice* pOutDev, bool bDrawingR2LPortion = false );
TxtAlign ImpGetAlign() const;
sal_uLong CalcTextHeight();
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index 9aa9498..baf97a9 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -182,9 +182,9 @@ public:
TextPaM CursorWordRight( const TextPaM& rPaM );
TextPaM CursorStartOfLine( const TextPaM& rPaM );
TextPaM CursorEndOfLine( const TextPaM& rPaM );
- TextPaM CursorStartOfParagraph( const TextPaM& rPaM );
+ static TextPaM CursorStartOfParagraph( const TextPaM& rPaM );
TextPaM CursorEndOfParagraph( const TextPaM& rPaM );
- TextPaM CursorStartOfDoc();
+ static TextPaM CursorStartOfDoc();
TextPaM CursorEndOfDoc();
/**
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index d0ecd51c..649725b 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -51,7 +51,7 @@ protected:
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
using Control::ImplInitSettings;
void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
- WinBits ImplInitStyle( WinBits nStyle );
+ static WinBits ImplInitStyle( WinBits nStyle );
ExtTextEngine* GetTextEngine() const;
ExtTextView* GetTextView() const;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 3712ada..5b681f2 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -680,7 +680,7 @@ protected:
void SetCompoundControl( bool bCompound );
void CallEventListeners( sal_uLong nEvent, void* pData = NULL );
- void FireVclEvent( VclSimpleEvent* pEvent );
+ static void FireVclEvent( VclSimpleEvent* pEvent );
virtual bool AcquireGraphics() const SAL_OVERRIDE;
virtual void ReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE;
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx
index e978eb7..3dcba18 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -475,7 +475,7 @@ void FontCache::read()
/*
* FontCache::copyPrintFont
*/
-void FontCache::copyPrintFont( const PrintFontManager::PrintFont* pFrom, PrintFontManager::PrintFont* pTo ) const
+void FontCache::copyPrintFont( const PrintFontManager::PrintFont* pFrom, PrintFontManager::PrintFont* pTo )
{
if( pFrom->m_eType != pTo->m_eType )
return;
@@ -519,7 +519,7 @@ void FontCache::copyPrintFont( const PrintFontManager::PrintFont* pFrom, PrintFo
/*
* FontCache::equalsPrintFont
*/
-bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, PrintFontManager::PrintFont* pRight ) const
+bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, PrintFontManager::PrintFont* pRight )
{
if( pLeft->m_eType != pRight->m_eType )
return false;
@@ -580,7 +580,7 @@ bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, Print
/*
* FontCache::clonePrintFont
*/
-PrintFontManager::PrintFont* FontCache::clonePrintFont( const PrintFontManager::PrintFont* pOldFont ) const
+PrintFontManager::PrintFont* FontCache::clonePrintFont( const PrintFontManager::PrintFont* pOldFont )
{
PrintFontManager::PrintFont* pFont = NULL;
switch( pOldFont->m_eType )
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index f872164..0804791 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -252,14 +252,9 @@ void FontCfgWrapper::release()
namespace
{
- class localizedsorter
- {
- public:
- localizedsorter() {};
- FcChar8* bestname(const std::vector<lang_and_element> &elements, const LanguageTag & rLangTag);
- };
+ static FcChar8* bestname(const std::vector<lang_and_element> &elements, const LanguageTag & rLangTag);
- FcChar8* localizedsorter::bestname(const std::vector<lang_and_element> &elements, const LanguageTag & rLangTag)
+ FcChar8* bestname(const std::vector<lang_and_element> &elements, const LanguageTag & rLangTag)
{
FcChar8* candidate = elements.begin()->second;
/* FIXME-BCP47: once fontconfig supports language tags this
@@ -359,7 +354,7 @@ FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern* pPattern, FcChar
osl_getProcessLocale(&pLoc);
m_pLanguageTag = new LanguageTag(*pLoc);
}
- *element = localizedsorter().bestname(lang_and_elements, *m_pLanguageTag);
+ *element = bestname(lang_and_elements, *m_pLanguageTag);
//if this element is a fontname, map the other names to this best-name
if (rtl_str_compare(elementtype, FC_FAMILY) == 0)
@@ -1171,7 +1166,7 @@ public:
};
ImplFontOptions* PrintFontManager::getFontOptions(
- const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void*)) const
+ const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void*))
{
FontCfgWrapper& rWrapper = FontCfgWrapper::get();
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index f2b67d1..37cc0e7 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -977,7 +977,7 @@ std::vector<fontID> PrintFontManager::findFontFileIDs( int nDirID, const OString
return aIds;
}
-OUString PrintFontManager::convertTrueTypeName( void* pRecord ) const
+OUString PrintFontManager::convertTrueTypeName( void* pRecord )
{
NameRecord* pNameRecord = static_cast<NameRecord*>(pRecord);
OUString aValue;
@@ -1120,7 +1120,7 @@ namespace
}
}
-void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OUString >& rNames ) const
+void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OUString >& rNames )
{
OUString aFamily;
@@ -1618,7 +1618,7 @@ int PrintFontManager::getFontFaceNumber( fontID nFontID ) const
return nRet;
}
-FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const
+FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily )
{
typedef struct {
const char* mpName;
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index 41cff16..1d8a461 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -78,10 +78,10 @@ private:
bool AddGlyphID (sal_GlyphId nGlyphId, sal_Unicode nUnicode,
unsigned char* nOutGlyphID,
sal_Int32* nOutGlyphSetID);
- void AddNotdef (char_map_t &rCharMap);
- void AddNotdef (glyph_map_t &rGlyphMap);
- unsigned char GetAnsiMapping (sal_Unicode nUnicodeChar);
- unsigned char GetSymbolMapping (sal_Unicode nUnicodeChar);
+ static void AddNotdef (char_map_t &rCharMap);
+ static void AddNotdef (glyph_map_t &rGlyphMap);
+ static unsigned char GetAnsiMapping (sal_Unicode nUnicodeChar);
+ static unsigned char GetSymbolMapping (sal_Unicode nUnicodeChar);
void ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
const sal_Unicode* pStr, sal_Int16 nLen);
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index e859e35..d47f071 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -217,9 +217,9 @@ class ImplBorderWindowView
public:
virtual ~ImplBorderWindowView();
- virtual bool MouseMove( const MouseEvent& rMEvt );
- virtual bool MouseButtonDown( const MouseEvent& rMEvt );
- virtual bool Tracking( const TrackingEvent& rTEvt );
+ virtual bool MouseMove( const MouseEvent& rMEvt );
+ virtual bool MouseButtonDown( const MouseEvent& rMEvt );
+ virtual bool Tracking( const TrackingEvent& rTEvt );
virtual OUString RequestHelp( const Point& rPos, Rectangle& rHelpRect );
virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ) = 0;
@@ -229,13 +229,13 @@ public:
virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev = NULL, const Point* pOffset = NULL ) = 0;
virtual Rectangle GetMenuRect() const;
- void ImplInitTitle( ImplBorderFrameData* pData );
- sal_uInt16 ImplHitTest( ImplBorderFrameData* pData, const Point& rPos );
- bool ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
- bool ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
- bool ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt );
- OUString ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect );
- long ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const;
+ static void ImplInitTitle( ImplBorderFrameData* pData );
+ static sal_uInt16 ImplHitTest( ImplBorderFrameData* pData, const Point& rPos );
+ static bool ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
+ bool ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
+ bool ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt );
+ static OUString ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect );
+ static long ImplCalcTitleWidth( const ImplBorderFrameData* pData );
};
class ImplNoBorderWindowView : public ImplBorderWindowView
diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx
index 98d9029..416319c 100644
--- a/vcl/inc/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
@@ -61,9 +61,9 @@ class VCL_PLUGIN_PUBLIC FontCache
void read();
void clearCache();
- void copyPrintFont( const PrintFontManager::PrintFont* pFrom, PrintFontManager::PrintFont* pTo ) const;
- bool equalsPrintFont( const PrintFontManager::PrintFont* pLeft, PrintFontManager::PrintFont* pRight ) const;
- PrintFontManager::PrintFont* clonePrintFont( const PrintFontManager::PrintFont* pFont ) const;
+ static void copyPrintFont( const PrintFontManager::PrintFont* pFrom, PrintFontManager::PrintFont* pTo );
+ static bool equalsPrintFont( const PrintFontManager::PrintFont* pLeft, PrintFontManager::PrintFont* pRight );
+ static PrintFontManager::PrintFont* clonePrintFont( const PrintFontManager::PrintFont* pFont );
void createCacheDir( int nDirID );
public:
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index 2cf6e6a..a5e18d6 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -272,8 +272,8 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
OString getFontFile( PrintFont* pFont ) const;
bool analyzeFontFile( int nDirID, const OString& rFileName, std::list< PrintFont* >& rNewFonts, const char *pFormat=NULL ) const;
- OUString convertTrueTypeName( void* pNameRecord ) const; // actually a NameRecord* formt font subsetting code
- void analyzeTrueTypeFamilyName( void* pTTFont, std::list< OUString >& rnames ) const; // actually a TrueTypeFont* from font subsetting code
+ static OUString convertTrueTypeName( void* pNameRecord ); // actually a NameRecord* formt font subsetting code
+ static void analyzeTrueTypeFamilyName( void* pTTFont, std::list< OUString >& rnames ); // actually a TrueTypeFont* from font subsetting code
bool analyzeTrueTypeFile( PrintFont* pFont ) const;
// finds the font id for the nFaceIndex face in this font file
// There may be multiple font ids for TrueType collections
@@ -287,7 +287,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
return findFontFileID(nDirID, rFile, 0) != 0;
}
- FontFamily matchFamilyName( const OUString& rFamily ) const;
+ static FontFamily matchFamilyName( const OUString& rFamily );
PrintFont* getFont( fontID nID ) const
{
@@ -305,11 +305,11 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
called from <code>initialize()</code>
*/
- void initFontconfig();
+ static void initFontconfig();
void countFontconfigFonts( std::unordered_map<OString, int, OStringHash>& o_rVisitedPaths );
/* deinitialize fontconfig
*/
- void deinitFontconfig();
+ static void deinitFontconfig();
/* register an application specific font directory for libfontconfig
@@ -321,7 +321,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
true if libfontconfig accepted the directory
false else (e.g. no libfontconfig found)
*/
- bool addFontconfigDir(const OString& rDirectory);
+ static bool addFontconfigDir(const OString& rDirectory);
std::set<OString> m_aPreviousLangSupportRequests;
std::vector<OString> m_aCurrentRequests;
@@ -528,7 +528,7 @@ public:
false else
*/
bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale );
- ImplFontOptions* getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*)) const;
+ static ImplFontOptions* getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*));
bool Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes );
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index cc5b147..c571658 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -85,7 +85,7 @@ private:
protected:
bool CreateFontSubsetFromCff( sal_Int32* pOutGlyphWidths = NULL );
bool CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths = NULL );
- bool CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths = NULL );
+ static bool CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths = NULL );
};
#endif // INCLUDED_VCL_INC_FONTSUBSET_HXX
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h
index 165b3d9..7e3a75d 100644
--- a/vcl/inc/generic/geninst.h
+++ b/vcl/inc/generic/geninst.h
@@ -110,7 +110,7 @@ public:
static int FetchFontSubstitutionFlags();
protected:
- void configurePspInfoPrinter( PspSalInfoPrinter* pInfoPrinter,
+ static void configurePspInfoPrinter( PspSalInfoPrinter* pInfoPrinter,
SalPrinterQueueInfo* pQueueInfo,
ImplJobSetup* pSetupData );
};
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index 93de736..348b44c 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -194,10 +194,10 @@ private:
osl::File* mpPageHeader;
osl::File* mpPageBody;
- void TranslateCoordinates (sal_Int32 &rXOut, sal_Int32 &rYOut,
+ static void TranslateCoordinates (sal_Int32 &rXOut, sal_Int32 &rYOut,
sal_Int32 nXIn, sal_Int32 nYIn )
{ rXOut = nXIn; rYOut = nYIn; }
- void TranslateCoordinates (Point& rOut, const Point& rIn)
+ static void TranslateCoordinates (Point& rOut, const Point& rIn)
{ rOut = rIn; }
/* text/font related data, for a type1 font it has to be checked
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx
index 218a4b5..686c890 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/generic/printerjob.hxx
@@ -79,8 +79,8 @@ private: // private methods
bool writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup );
bool writeSetup( osl::File* pFile, const JobData& );
bool writePageSetup( osl::File* pFile, const JobData&, bool bWriteFeatures = true );
- void writeJobPatch( osl::File* File, const JobData& );
- bool writeProlog (osl::File* pFile, const JobData& );
+ static void writeJobPatch( osl::File* File, const JobData& );
+ static bool writeProlog (osl::File* pFile, const JobData& );
public: // for usage in PrinterGfx
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index 807c69c..31f6cf3 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -107,7 +107,7 @@ private:
Must not be cyclic :-) The last theme in the chain returns an empty string.
*/
- OUString fallbackStyle(const OUString &style);
+ static OUString fallbackStyle(const OUString &style);
};
typedef salhelper::SingletonRef< ImplImageTree > ImplImageTreeSingletonRef;
diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx
index 915008c..4e8f9cc 100644
--- a/vcl/inc/opengl/framebuffer.hxx
+++ b/vcl/inc/opengl/framebuffer.hxx
@@ -32,7 +32,7 @@ public:
int GetHeight() const { return mnHeight; };
void Bind();
- void Unbind();
+ static void Unbind();
bool IsFree() const;
bool IsAttached( const OpenGLTexture& rTexture ) const;
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index e7b3052..7536144 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -88,7 +88,7 @@ public:
bool Create( const OpenGLTexture& rTex, long nX, long nY, long nWidth, long nHeight );
OpenGLTexture& GetTexture() const;
- OpenGLContext* GetBitmapContext() const;
+ static OpenGLContext* GetBitmapContext();
private:
@@ -102,7 +102,7 @@ private:
private:
bool ImplScaleFilter( const double& rScaleX, const double& rScaleY, GLenum nFilter );
- void ImplCreateKernel( const double& fScale, const Kernel& rKernel, GLfloat*& pWeights, sal_uInt32& aKernelSize );
+ static void ImplCreateKernel( const double& fScale, const Kernel& rKernel, GLfloat*& pWeights, sal_uInt32& aKernelSize );
bool ImplScaleConvolution( const double& rScaleX, const double& rScaleY, const Kernel& aKernel );
bool ImplScaleArea( double rScaleX, double rScaleY );
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 36aa5a3..c5a7abc 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -128,7 +128,7 @@ protected:
bool ReleaseContext();
// retrieve the default context for offscreen rendering
- OpenGLContext* GetDefaultContext();
+ static OpenGLContext* GetDefaultContext();
// create a new context for window rendering
virtual OpenGLContext* CreateWinContext() = 0;
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index 277e2c7..14606f2 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -62,7 +62,7 @@ public:
void Move(long nHorzMove, long nVertMove);
void Scale(double fScaleX, double fScaleY);
void InsertBands(long nTop, long nBottom);
- bool InsertSingleBand(ImplRegionBand* pBand, long nYBandPosition);
+ static bool InsertSingleBand(ImplRegionBand* pBand, long nYBandPosition);
void Union(long nLeft, long nTop, long nRight, long nBottom);
void Intersect(long nLeft, long nTop, long nRight, long nBottom);
void Union(const RegionBand& rSource);
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 7ad8866..990e9d8 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -190,7 +190,7 @@ public:
virtual bool GetOutline( SalGraphics&, ::basegfx::B2DPolyPolygonVector& ) const;
virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const;
- bool IsSpacingGlyph( sal_GlyphId ) const;
+ static bool IsSpacingGlyph( sal_GlyphId );
// reference counting
void Release() const;
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 3b60843..982de8b 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -460,7 +460,7 @@ sal_uInt16 OpenGLSalBitmap::GetBitCount() const
return mnBits;
}
-OpenGLContext* OpenGLSalBitmap::GetBitmapContext() const
+OpenGLContext* OpenGLSalBitmap::GetBitmapContext()
{
return ImplGetDefaultWindow()->GetGraphics()->GetOpenGLContext();
}
@@ -608,7 +608,7 @@ bool OpenGLSalBitmap::Replace( const Color& rSearchColor, const Color& rReplaceC
pProgram->DrawTexture( maTexture );
pProgram->Clean();
- mpContext->ReleaseFramebuffer( pFramebuffer );
+ OpenGLContext::ReleaseFramebuffer( pFramebuffer );
maTexture = aNewTex;
CHECK_GL_ERROR();
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index a7a05a4..741d973 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -69,7 +69,7 @@ bool OpenGLSalBitmap::ImplScaleFilter(
maTexture.SetFilter( nOldFilter );
pProgram->Clean();
- mpContext->ReleaseFramebuffer( pFramebuffer );
+ OpenGLContext::ReleaseFramebuffer( pFramebuffer );
mnWidth = nNewWidth;
mnHeight = nNewHeight;
@@ -156,7 +156,7 @@ bool OpenGLSalBitmap::ImplScaleConvolution(
pProgram->Clean();
maTexture = aScratchTex;
- mpContext->ReleaseFramebuffer( pFramebuffer );
+ OpenGLContext::ReleaseFramebuffer( pFramebuffer );
}
// vertical scaling in final texture
@@ -178,7 +178,7 @@ bool OpenGLSalBitmap::ImplScaleConvolution(
pProgram->Clean();
maTexture = aScratchTex;
- mpContext->ReleaseFramebuffer( pFramebuffer );
+ OpenGLContext::ReleaseFramebuffer( pFramebuffer );
}
mnWidth = nNewWidth;
@@ -252,7 +252,7 @@ bool OpenGLSalBitmap::ImplScaleArea( double rScaleX, double rScaleY )
pProgram->Clean();
maTexture = aScratchTex;
- mpContext->ReleaseFramebuffer( pFramebuffer );
+ OpenGLContext::ReleaseFramebuffer( pFramebuffer );
mnWidth = nNewWidth;
mnHeight = nNewHeight;
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index d727d8b..732830b 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -318,7 +318,7 @@ void OpenGLTexture::Read( GLenum nFormat, GLenum nType, sal_uInt8* pData )
pFramebuffer = pContext->AcquireFramebuffer( *this );
glReadPixels( maRect.Left(), mpImpl->mnHeight - maRect.Top(), GetWidth(), GetHeight(), nFormat, nType, pData );
- pContext->ReleaseFramebuffer( pFramebuffer );
+ OpenGLContext::ReleaseFramebuffer( pFramebuffer );
CHECK_GL_ERROR();
}
diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx
index c8f7636..88e4c60 100644
--- a/vcl/source/filter/ixpm/xpmread.hxx
+++ b/vcl/source/filter/ixpm/xpmread.hxx
@@ -84,14 +84,14 @@ private:
sal_uLong mnParaSize;
sal_uInt8* mpPara;
- bool ImplGetString( void );
- bool ImplGetColor( sal_uLong );
- bool ImplGetScanLine( sal_uLong );
- bool ImplGetColSub( sal_uInt8* );
- bool ImplGetColKey( sal_uInt8 );
- void ImplGetRGBHex( sal_uInt8*, sal_uLong );
- bool ImplGetPara( sal_uLong numb );
- bool ImplCompare( sal_uInt8 const *, sal_uInt8 const *, sal_uLong, sal_uLong nmode = XPMCASENONSENSITIVE );
+ bool ImplGetString( void );
+ bool ImplGetColor( sal_uLong );
+ bool ImplGetScanLine( sal_uLong );
+ bool ImplGetColSub( sal_uInt8* );
+ bool ImplGetColKey( sal_uInt8 );
+ void ImplGetRGBHex( sal_uInt8*, sal_uLong );
+ bool ImplGetPara( sal_uLong numb );
+ static bool ImplCompare( sal_uInt8 const *, sal_uInt8 const *, sal_uLong, sal_uLong nmode = XPMCASENONSENSITIVE );
sal_uLong ImplGetULONG( sal_uLong nPara );
public:
diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
index 5d8bbaa..459a36b 100644
--- a/vcl/source/filter/jpeg/Exif.hxx
+++ b/vcl/source/filter/jpeg/Exif.hxx
@@ -69,7 +69,7 @@ private:
sal_uInt32 offset;
};
- Orientation convertToOrientation(sal_Int32 value);
+ static Orientation convertToOrientation(sal_Int32 value);
public :
Exif();
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index af06cd7..cc930c4 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -757,7 +757,7 @@ class EnhWMFReader : public WinMtf
bool ReadHeader();
// reads and converts the rectangle
- Rectangle ReadRectangle( sal_Int32, sal_Int32, sal_Int32, sal_Int32 );
+ static Rectangle ReadRectangle( sal_Int32, sal_Int32, sal_Int32, sal_Int32 );
public:
EnhWMFReader(SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, FilterConfigItem* pConfigItem = NULL);
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx
index 1a26072..ad1b5cc 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/gdi/alpha.cxx
@@ -100,7 +100,7 @@ bool AlphaMask::Replace( const Bitmap& rMask, sal_uInt8 cReplaceTransparency )
pAcc->SetPixel( nY, nX, aReplace );
}
- ( (Bitmap&) rMask ).ReleaseAccess( pMaskAcc );
+ Bitmap::ReleaseAccess( pMaskAcc );
ReleaseAccess( pAcc );
return bRet;
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 71ae7a3..3df5896 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -702,7 +702,7 @@ bool Bitmap::Rotate( long nAngle10, const Color& rFillColor )
pWriteAcc->SetPixel( nY, nX, pReadAcc->GetPixel( nOtherY--, nOtherX ) );
}
- aNewBmp.ReleaseAccess( pWriteAcc );
+ Bitmap::ReleaseAccess( pWriteAcc );
}
aRotatedBmp = aNewBmp;
@@ -772,7 +772,7 @@ bool Bitmap::Rotate( long nAngle10, const Color& rFillColor )
}
}
- aNewBmp.ReleaseAccess( pWriteAcc );
+ Bitmap::ReleaseAccess( pWriteAcc );
}
aRotatedBmp = aNewBmp;
@@ -818,7 +818,7 @@ bool Bitmap::Crop( const Rectangle& rRectPixel )
for( long nX = 0, nX2 = nOldX; nX < nNewWidth; nX++, nX2++ )
pWriteAcc->SetPixel( nY, nX, pReadAcc->GetPixel( nY2, nX2 ) );
- aNewBmp.ReleaseAccess( pWriteAcc );
+ Bitmap::ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -899,7 +899,7 @@ bool Bitmap::CopyPixel( const Rectangle& rRectDst,
}
if( pSrcAcc )
- pSrc->ReleaseAccess( pSrcAcc );
+ Bitmap::ReleaseAccess( pSrcAcc );
if( pDstAcc )
ReleaseAccess( pDstAcc );
@@ -953,7 +953,7 @@ bool Bitmap::CopyPixel( const Rectangle& rRectDst,
bRet = ( nWidth > 0L ) && ( nHeight > 0L );
}
- pSrc->ReleaseAccess( pReadAcc );
+ Bitmap::ReleaseAccess( pReadAcc );
}
}
}
@@ -1060,7 +1060,7 @@ bool Bitmap::CopyPixel_AlphaOptimized( const Rectangle& rRectDst, const Rectangl
bRet = ( nWidth > 0L ) && ( nHeight > 0L );
}
- pSrc->ReleaseAccess( pReadAcc );
+ Bitmap::ReleaseAccess( pReadAcc );
}
}
}
@@ -1168,7 +1168,7 @@ bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor )
for( nX = 0; nX < nNewWidth; nX++ )
pWriteAcc->SetPixel( nY, nX, aColor );
- aNewBmp.ReleaseAccess( pWriteAcc );
+ Bitmap::ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -1543,7 +1543,7 @@ bool Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor )
bRet = true;
}
- ( (Bitmap&) rMask ).ReleaseAccess( pMaskAcc );
+ Bitmap::ReleaseAccess( pMaskAcc );
ReleaseAccess( pAcc );
return bRet;
@@ -1577,7 +1577,7 @@ bool Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor )
ReleaseAccess( pAcc );
( (AlphaMask&) rAlpha ).ReleaseAccess( pAlphaAcc );
- aNewBmp.ReleaseAccess( pNewAcc );
+ Bitmap::ReleaseAccess( pNewAcc );
if( bRet )
{
@@ -1921,7 +1921,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
bRet = true;
}
- ( (Bitmap&) rMask ).ReleaseAccess( pMaskAcc );
+ Bitmap::ReleaseAccess( pMaskAcc );
ReleaseAccess( pAcc );
return bRet;
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 5bf275d..60ed14d 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -2447,12 +2447,12 @@ void Bitmap::ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal,
bool Bitmap::Vectorize( tools::PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress )
{
- return ImplVectorizer().ImplVectorize( *this, rPolyPoly, nFlags, pProgress );
+ return ImplVectorizer::ImplVectorize( *this, rPolyPoly, nFlags, pProgress );
}
bool Bitmap::Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress )
{
- return ImplVectorizer().ImplVectorize( *this, rMtf, cReduce, nFlags, pProgress );
+ return ImplVectorizer::ImplVectorize( *this, rMtf, cReduce, nFlags, pProgress );
}
bool Bitmap::Adjust( short nLuminancePercent, short nContrastPercent,
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index e4b15f1..d5dc470 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -234,7 +234,7 @@ bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
delete[] pColm;
delete[] pRows;
- aNewBmp.ReleaseAccess( pWriteAcc );
+ Bitmap::ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -363,7 +363,7 @@ bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
delete[] pColm;
delete[] pRows;
- aNewBmp.ReleaseAccess( pWriteAcc );
+ Bitmap::ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -489,7 +489,7 @@ bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link*
delete[] pHMap;
delete[] pVMap;
- aNewBmp.ReleaseAccess( pWriteAcc );
+ Bitmap::ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -601,7 +601,7 @@ bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*p
delete[] pHMap;
delete[] pVMap;
- aNewBmp.ReleaseAccess( pWriteAcc );
+ Bitmap::ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -735,7 +735,7 @@ bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pProgr
}
}
- aNewBmp.ReleaseAccess( pWriteAcc );
+ Bitmap::ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -899,7 +899,7 @@ bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProg
if( pNewBmp )
{
- pNewBmp->ReleaseAccess( pWriteAcc );
+ Bitmap::ReleaseAccess( pWriteAcc );
if( bRet )
{
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index ff51c23..eba1f92 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -63,8 +63,8 @@ public:
PIXBYTE GetRed() const { return mpPixel[0]; }
PIXBYTE GetGreen() const { return mpPixel[1]; }
PIXBYTE GetBlue() const { return mpPixel[2]; }
- PIXBYTE GetAlpha() const { return 0; }
- void SetAlpha( PIXBYTE ) const {}
+ static PIXBYTE GetAlpha() { return 0; }
+ static void SetAlpha( PIXBYTE ) {}
void SetColor( PIXBYTE r, PIXBYTE g, PIXBYTE b ) const
{
@@ -83,8 +83,8 @@ public:
PIXBYTE GetRed() const { return mpPixel[2]; }
PIXBYTE GetGreen() const { return mpPixel[1]; }
PIXBYTE GetBlue() const { return mpPixel[0]; }
- PIXBYTE GetAlpha() const { return 0; }
- void SetAlpha( PIXBYTE ) const {}
+ static PIXBYTE GetAlpha() { return 0; }
+ static void SetAlpha( PIXBYTE ) {}
void SetColor( PIXBYTE r, PIXBYTE g, PIXBYTE b ) const
{
@@ -184,8 +184,8 @@ public:
PIXBYTE GetRed() const { return (mpPixel[0] & 0xF8U); }
PIXBYTE GetGreen() const { return (mpPixel[0]<<5U) | ((mpPixel[1]>>3U)&28U); }
PIXBYTE GetBlue() const { return (mpPixel[1]<<3U); }
- PIXBYTE GetAlpha() const { return 0; }
- void SetAlpha( PIXBYTE ) const {}
+ static PIXBYTE GetAlpha() { return 0; }
+ static void SetAlpha( PIXBYTE ) {}
void SetColor( PIXBYTE r, PIXBYTE g, PIXBYTE b ) const
{
@@ -204,8 +204,8 @@ public:
PIXBYTE GetRed() const { return (mpPixel[1] & 0xF8U); }
PIXBYTE GetGreen() const { return (mpPixel[1]<<5U) | ((mpPixel[0]>>3U)&28U); }
PIXBYTE GetBlue() const { return (mpPixel[0]<<3U); }
- PIXBYTE GetAlpha() const { return 0; }
- void SetAlpha( PIXBYTE ) const {}
+ static PIXBYTE GetAlpha() { return 0; }
+ static void SetAlpha( PIXBYTE ) {}
void SetColor( PIXBYTE r, PIXBYTE g, PIXBYTE b ) const
{
@@ -221,7 +221,7 @@ public:
void operator++() { mpPixel += 1; }
PIXBYTE GetAlpha() const { return mpPixel[0]; }
void SetAlpha( PIXBYTE a ) const { mpPixel[0] = a; }
- void SetColor( PIXBYTE, PIXBYTE, PIXBYTE ) const {}
+ static void SetColor( PIXBYTE, PIXBYTE, PIXBYTE ) {}
};
// TODO: for some reason many Alpha maps are BMP_FORMAT_8BIT_PAL
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 30cc102..024d53f 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -1059,7 +1059,7 @@ bool ImplVectorizer::ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, Im
return true;
}
-bool ImplVectorizer::ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const
+bool ImplVectorizer::ImplIsUp( ImplVectMap* pMap, long nY, long nX )
{
if( pMap->IsDone( nY - 1L, nX ) )
return true;
diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx
index f36f3c1..0051bef 100644
--- a/vcl/source/gdi/impvect.hxx
+++ b/vcl/source/gdi/impvect.hxx
@@ -33,20 +33,20 @@ class ImplVectorizer
{
private:
- ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor );
- void ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags );
- bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain );
- bool ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const;
- void ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly );
+ static ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor );
+ static void ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags );
+ static bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain );
+ static bool ImplIsUp( ImplVectMap* pMap, long nY, long nX );
+ static void ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly );
public:
ImplVectorizer();
~ImplVectorizer();
- bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
+ static bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress );
- bool ImplVectorize( const Bitmap& rMonoBmp, tools::PolyPolygon& rPolyPoly,
+ static bool ImplVectorize( const Bitmap& rMonoBmp, tools::PolyPolygon& rPolyPoly,
sal_uLong nFlags, const Link* pProgress );
};
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index a85e751..eabf0c1 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -9135,7 +9135,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool
if( !rLayout.GetNextGlyphs( 1, &aGlyphId, aPos, nStart, &nAdvance ) )
break;
- if( !rLayout.IsSpacingGlyph( aGlyphId ) )
+ if( !SalLayout::IsSpacingGlyph( aGlyphId ) )
{
if( !nWidth )
aStartPt = aPos;
@@ -9235,7 +9235,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool
if( !rLayout.GetNextGlyphs( 1, &aGlyphId, aPos, nStart, &nAdvance ) )
break;
- if( !rLayout.IsSpacingGlyph( aGlyphId ) )
+ if( !SalLayout::IsSpacingGlyph( aGlyphId ) )
{
Point aAdjOffset = aOffset;
aAdjOffset.X() += (nAdvance - nEmphWidth) / 2;
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 82d87c3..15883f4 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -807,7 +807,7 @@ bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, Rectangle& rRect ) cons
return bRet;
}
-bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const
+bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph )
{
bool bRet = false;
if( nGlyph & GF_ISCHAR )
@@ -1674,7 +1674,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
mpLayouts[n]->AdjustLayout( aMultiArgs );
// disable glyph-injection for glyph-fallback SalLayout iteration
- mpLayouts[n]->DisableGlyphInjection( true );
+ SalLayout::DisableGlyphInjection( true );
// remove unused parts of component
if( n > 0 )
@@ -1933,7 +1933,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
// reenable glyph-injection
for( n = 0; n < mnLevel; ++n )
- mpLayouts[n]->DisableGlyphInjection( false );
+ SalLayout::DisableGlyphInjection( false );
}
void MultiSalLayout::InitFont() const
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 1845716..be14c22 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1480,7 +1480,7 @@ bool OpenGLContext::BindFramebuffer( OpenGLFramebuffer* pFramebuffer )
if( pFramebuffer )
pFramebuffer->Bind();
else
- mpCurrentFramebuffer->Unbind();
+ OpenGLFramebuffer::Unbind();
mpCurrentFramebuffer = pFramebuffer;
}
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index c891483..1bf2df8 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -2000,7 +2000,7 @@ void OutputDevice::ImplDrawEmphasisMarks( SalLayout& rSalLayout )
if( !mpGraphics->GetGlyphBoundRect( aGlyphId, aRectangle ) )
continue;
- if( !rSalLayout.IsSpacingGlyph( aGlyphId ) )
+ if( !SalLayout::IsSpacingGlyph( aGlyphId ) )
{
Point aAdjPoint = aOffset;
aAdjPoint.X() += aRectangle.Left() + (aRectangle.GetWidth() - nEmphasisWidth) / 2;
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index e7476b7..8b68080 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -763,7 +763,7 @@ void OutputDevice::ImplDrawTextLines( SalLayout& rSalLayout, FontStrikeout eStri
break;
// calculate the boundaries of each word
- if( !rSalLayout.IsSpacingGlyph( aGlyphId ) )
+ if( !SalLayout::IsSpacingGlyph( aGlyphId ) )
{
if( !nWidth )
{
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 106d77d..882818f 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -943,7 +943,7 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
return aHelpStr;
}
-long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const
+long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData )
{
// title is not visible therefore no width
if ( !pData->mnTitleHeight )
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 9c74a18..74a9593 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -905,7 +905,7 @@ VclGrid::array_type VclGrid::assembleGrid() const
return B;
}
-bool VclGrid::isNullGrid(const array_type &A) const
+bool VclGrid::isNullGrid(const array_type &A)
{
sal_Int32 nMaxX = A.shape()[0];
sal_Int32 nMaxY = A.shape()[1];
@@ -915,7 +915,7 @@ bool VclGrid::isNullGrid(const array_type &A) const
return false;
}
-void VclGrid::calcMaxs(const array_type &A, std::vector<Value> &rWidths, std::vector<Value> &rHeights) const
+void VclGrid::calcMaxs(const array_type &A, std::vector<Value> &rWidths, std::vector<Value> &rHeights)
{
sal_Int32 nMaxX = A.shape()[0];
sal_Int32 nMaxY = A.shape()[1];
diff --git a/vcl/source/window/menuwindow.hxx b/vcl/source/window/menuwindow.hxx
index 74e36c3..391bc08 100644
--- a/vcl/source/window/menuwindow.hxx
+++ b/vcl/source/window/menuwindow.hxx
@@ -54,10 +54,10 @@ public:
virtual ~MenuWindow() {}
/// Sets up some visual properties of the underlying window.
- void ImplInitMenuWindow(vcl::Window* pWin, bool bFont, bool bMenuBar);
+ static void ImplInitMenuWindow(vcl::Window* pWin, bool bFont, bool bMenuBar);
/// Show the appropriate help tooltip.
- bool ImplHandleHelpEvent(vcl::Window* pMenuWindow, Menu* pMenu, sal_uInt16 nHighlightedItem,
+ static bool ImplHandleHelpEvent(vcl::Window* pMenuWindow, Menu* pMenu, sal_uInt16 nHighlightedItem,
const HelpEvent& rHEvt, const Rectangle &rHighlightRect);
};
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 05e6096..24c79db 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -477,8 +477,7 @@ ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, in
aInfo.m_eWeight = rFontAttributes.GetWeight();
aInfo.m_eWidth = rFontAttributes.GetWidthType();
- const psp::PrintFontManager& rPFM = psp::PrintFontManager::get();
- return rPFM.getFontOptions(aInfo, nSize, cairosubcallback);
+ return psp::PrintFontManager::getFontOptions(aInfo, nSize, cairosubcallback);
}
void
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 3037fbf..62f1845 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1410,7 +1410,7 @@ OUString PPDParser::getDefaultInputSlot() const
void PPDParser::getResolutionFromString(
const OUString& rString,
- int& rXRes, int& rYRes ) const
+ int& rXRes, int& rYRes )
{
sal_Int32 nDPIPos;
@@ -1855,7 +1855,7 @@ int PPDContext::getRenderResolution() const
{
const PPDValue* pValue = getValue( pKey );
if( pValue )
- m_pParser->getResolutionFromString( pValue->m_aOption, nDPIx, nDPIy );
+ PPDParser::getResolutionFromString( pValue->m_aOption, nDPIx, nDPIy );
else
m_pParser->getDefaultResolution( nDPIx, nDPIy );
}
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 3a92b6b..f2ea9f2 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -496,8 +496,7 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
{
SolarMutexGuard aGuard;
{
- vcl::MenuInvalidator aInvalidator;
- aInvalidator.GetMenuInvalidateListeners()->addListener(*getRefreshLinkInstance());
+ vcl::MenuInvalidator::GetMenuInvalidateListeners()->addListener(*getRefreshLinkInstance());
}
assert(mbMenuBar);
commit edc189dbfac35d9a587ec50d0f382bb66444eca8
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 30 13:32:08 2015 +0200
loplugin:staticfunction
Change-Id: I89f5984d73e7d42269189dc1d1bc2d59e5ab193f
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index 18c6460..72fc9ca 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -83,7 +83,7 @@ namespace com { namespace sun { namespace star {
bool m_bCloneable;
protected:
- ::com::sun::star::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle) const;
+ static ::com::sun::star::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle);
::com::sun::star::uno::Any ImplGetPropertyValueByHandle(sal_Int32 nHandle) const;
void ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue);
diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx
index 1d0f35c..a935bad 100644
--- a/include/toolkit/controls/roadmapcontrol.hxx
+++ b/include/toolkit/controls/roadmapcontrol.hxx
@@ -86,7 +86,7 @@ namespace toolkit
void MakeRMItemValidation( sal_Int32 Index, css::uno::Reference< XInterface > xRoadmapItem );
css::container::ContainerEvent GetContainerEvent(sal_Int32 Index, css::uno::Reference< XInterface > );
void SetRMItemDefaultProperties( const sal_Int32 _Index, css::uno::Reference< XInterface > );
- sal_Int16 GetCurrentItemID( css::uno::Reference< css::beans::XPropertySet > xPropertySet );
+ static sal_Int16 GetCurrentItemID( css::uno::Reference< css::beans::XPropertySet > xPropertySet );
sal_Int32 GetUniqueID();
diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx
index 789eb77..39dd117 100644
--- a/include/toolkit/controls/stdtabcontroller.hxx
+++ b/include/toolkit/controls/stdtabcontroller.hxx
@@ -44,7 +44,7 @@ private:
protected:
::osl::Mutex& GetMutex() { return maMutex; }
- bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, bool bPeerComponent ) const;
+ static bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, bool bPeerComponent );
// if sequence length of rModels is less than rControls, return only the matching elements in rModels sequence and remove corresponding elements from rControls
void ImplActivateControl( bool bFirst ) const;
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index eeb02c6..dd872bb 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -91,13 +91,13 @@ protected:
) const;
/// ensures that two property values in a sequence have a certain order
- void ImplEnsureHandleOrder(
+ static void ImplEnsureHandleOrder(
const sal_Int32 _nCount, /// number of entries in the array
sal_Int32* _pHandles, /// pointer to the handles
::com::sun::star::uno::Any* _pValues, /// pointer to the values
sal_Int32 _nFirstHandle, /// first handle, which should precede _nSecondHandle in the sequence
sal_Int32 _nSecondHandle /// second handle, which should supersede _nFirstHandle in the sequence
- ) const;
+ );
protected:
#ifdef _MSC_VER
diff --git a/include/tools/wldcrd.hxx b/include/tools/wldcrd.hxx
index e219edb..0e42b43 100644
--- a/include/tools/wldcrd.hxx
+++ b/include/tools/wldcrd.hxx
@@ -29,7 +29,7 @@ private:
OString aWildString;
char cSepSymbol;
- bool ImpMatch( const char *pWild, const char *pStr ) const;
+ static bool ImpMatch( const char *pWild, const char *pStr );
public:
WildCard()
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 1dce0dd..22ce651 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -182,7 +182,7 @@ protected:
virtual void SAL_CALL disposing() SAL_OVERRIDE;
- vcl::Window* ImplCreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor& rDescriptor, vcl::Window* pParent, WinBits nWinBits );
+ static vcl::Window* ImplCreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor& rDescriptor, vcl::Window* pParent, WinBits nWinBits );
css::uno::Reference< css::awt::XWindowPeer > ImplCreateWindow( const css::awt::WindowDescriptor& Descriptor, WinBits nWinBits );
public:
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 385633e..f184213 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -182,7 +182,7 @@
}
- ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetDefaultValueByHandle(sal_Int32 nHandle) const
+ ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetDefaultValueByHandle(sal_Int32 nHandle)
{
::com::sun::star::uno::Any aDefault;
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 65ced01..3134587 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -57,7 +57,7 @@ bool StdTabController::ImplCreateComponentSequence(
const Sequence< Reference< XControlModel > >& rModels,
Sequence< Reference< XWindow > >& rComponents,
Sequence< Any>* pTabStops,
- bool bPeerComponent ) const
+ bool bPeerComponent )
{
bool bOK = true;
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index 3f50b3d..a3e07ff 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -123,7 +123,7 @@ public:
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
static MutableTreeNode* getImplementation( const Reference< XTreeNode >& xNode, bool bThrows ) throw (IllegalArgumentException);
- Reference< XTreeNode > getReference( MutableTreeNode* pNode )
+ static Reference< XTreeNode > getReference( MutableTreeNode* pNode )
{
return Reference< XTreeNode >( pNode );
}
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index d5c10c6..b4b4bc9 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -1364,7 +1364,7 @@ void UnoControlModel::ImplNormalizePropertySequence( const sal_Int32, sal_Int32*
}
void UnoControlModel::ImplEnsureHandleOrder( const sal_Int32 _nCount, sal_Int32* _pHandles,
- uno::Any* _pValues, sal_Int32 _nFirstHandle, sal_Int32 _nSecondHandle ) const
+ uno::Any* _pValues, sal_Int32 _nFirstHandle, sal_Int32 _nSecondHandle )
{
for ( sal_Int32 i=0; i < _nCount; ++_pHandles, ++_pValues, ++i )
{
diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx
index 66425bc..4adfb7c 100644
--- a/tools/source/fsys/wldcrd.cxx
+++ b/tools/source/fsys/wldcrd.cxx
@@ -25,7 +25,7 @@
* '?' in pWild mean match exactly one character.
*
*/
-bool WildCard::ImpMatch( const char *pWild, const char *pStr ) const
+bool WildCard::ImpMatch( const char *pWild, const char *pStr )
{
int pos=0;
int flag=0;
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 1198b62..cbcc7be 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -597,7 +597,7 @@ void INetMIMEMessage::CopyImp (const INetMIMEMessage& rMsg)
if (pChild->pParent == &rMsg)
{
- pChild = pChild->CreateMessage (*pChild);
+ pChild = INetMIMEMessage::CreateMessage (*pChild);
pChild->pParent = this;
}
aChildren.push_back( pChild );
@@ -607,7 +607,7 @@ void INetMIMEMessage::CopyImp (const INetMIMEMessage& rMsg)
INetMIMEMessage *INetMIMEMessage::CreateMessage (
const INetMIMEMessage& rMsg) const
{
- return (new INetMIMEMessage (rMsg));
+ return new INetMIMEMessage (rMsg);
}
// Header Field Parser
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index 3ab7252..0ddbafd 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -51,7 +51,7 @@ class EDcr_Impl
sal_uInt16 nMask;
void RegisterEDcr(DynamicErrorInfo *);
- void UnRegisterEDcr(DynamicErrorInfo *);
+ static void UnRegisterEDcr(DynamicErrorInfo *);
static ErrorInfo *GetDynamicErrorInfo(sal_uIntPtr lId);
friend class DynamicErrorInfo;
@@ -143,7 +143,7 @@ DynamicErrorInfo::DynamicErrorInfo(sal_uIntPtr lArgUserId, sal_uInt16 nMask)
DynamicErrorInfo::~DynamicErrorInfo()
{
- pImpl->UnRegisterEDcr(this);
+ EDcr_Impl::UnRegisterEDcr(this);
delete pImpl;
}
More information about the Libreoffice-commits
mailing list