vcl/inc/osx/salmenu.h | 1 -
vcl/inc/osx/salprn.h | 2 +-
vcl/inc/quartz/salgdi.h | 6 +-----
vcl/osx/DropTarget.cxx | 5 +++--
vcl/osx/DropTarget.hxx | 2 +-
vcl/osx/salmenu.cxx | 32 ++++++++++++++++++--------------
vcl/osx/salprn.cxx | 4 ++--
vcl/quartz/ctfonts.cxx | 5 -----
vcl/quartz/salgdi.cxx | 5 +----
vcl/quartz/salgdicommon.cxx | 6 +++++-
vcl/source/opengl/OpenGLContext.cxx | 3 +++
vcl/source/outdev/outdev.cxx | 1 +
12 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit 6183a945de03dcd5fe0b967d5814a0add954a8c8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 23:46:54 2015 +0200
False loplugin:staticmethods
Change-Id: Icc026ebb422c299caca6c24d6a56416076589fc8
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 8d298a4..9beed93 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1330,6 +1330,7 @@ bool OpenGLContext::isCurrent()
return (wglGetCurrentContext() == m_aGLWin.hRC &&
wglGetCurrentDC() == m_aGLWin.hDC);
#elif defined( MACOSX )
+ (void) this; // loplugin:staticmethods
return false;
#elif defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
return false;
@@ -1409,6 +1410,7 @@ void OpenGLContext::resetCurrent()
#if defined( WNT )
wglMakeCurrent( m_aGLWin.hDC, 0 );
#elif defined( MACOSX )
+ (void) this; // loplugin:staticmethods
OpenGLWrapper::resetCurrent();
#elif defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
// nothing
@@ -1436,6 +1438,7 @@ void OpenGLContext::sync()
#if defined( WNT )
// nothing
#elif defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) ||
defined(LIBO_HEADLESS)
+ (void) this; // loplugin:staticmethods
// nothing
#elif defined( UNX )
glXWaitGL();
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 855a2d4..e9e6228 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -335,6 +335,7 @@ bool OutputDevice::SupportsCairo() const
return mpGraphics->SupportsCairo();
#else
+ (void) this; // loplugin:staticmethods
return false;
#endif
}
commit deca1830c8b2446fde35a443248638354b37239b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 23:46:26 2015 +0200
loplugin:staticmethods
Change-Id: I186c81923857d06ac7a87caf9d5961f44b89b559
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index 28843b2..b52e433 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -99,7 +99,8 @@ namespace /* private */
-(BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
{
- return mDropTarget->prepareForDragOperation(sender);
+ (void) sender;
+ return DropTarget::prepareForDragOperation();
}
-(BOOL)performDragOperation:(id <NSDraggingInfo>)sender
@@ -282,7 +283,7 @@ void DropTarget::draggingExited(id /*sender*/)
[[NSCursor arrowCursor] set];
}
-BOOL DropTarget::prepareForDragOperation(id /*sender*/)
+BOOL DropTarget::prepareForDragOperation()
{
return 1;
}
diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx
index d67b647..09f4ee8 100644
--- a/vcl/osx/DropTarget.hxx
+++ b/vcl/osx/DropTarget.hxx
@@ -124,7 +124,7 @@ public:
NSDragOperation draggingEntered(id sender);
NSDragOperation draggingUpdated(id sender);
void draggingExited(id sender);
- BOOL prepareForDragOperation(id sender);
+ static BOOL prepareForDragOperation();
BOOL performDragOperation(id sender);
void concludeDragOperation(id sender);
commit 8d66fe43a1c6ee197517135bd34b51654d0cd7f8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 23:45:53 2015 +0200
loplugin:staticmethods
Change-Id: I9fa42eeeabb4a6c7ee18b52d24c480a3f7a6a753
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 35fd6b8..12c3144 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -433,7 +433,7 @@ private:
void Pattern50Fill();
UInt32 getState( ControlState nState );
UInt32 getTrackState( ControlState nState );
- bool GetRawFontData( const PhysicalFontFace* pFontData,
+ static bool GetRawFontData( const PhysicalFontFace* pFontData,
std::vector<unsigned char>& rBuffer,
bool* pJustCFF );
};
commit 91cfdc9fbd84d1e7f2103efb702f52ccfd9993e5
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 23:45:18 2015 +0200
loplugin:staticmethods
Change-Id: Iafb48b20496924c64f9aaa3ec0965b023aef6a07
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 346602c..35fd6b8 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -298,7 +298,6 @@ public:
virtual bool drawAlphaRect( long nX, long nY, long nWidth,
long nHeight, sal_uInt8
nTransparency ) SAL_OVERRIDE;
- CGPoint* makeCGptArray(sal_uInt32 nPoints, const SalPoint*
pPtAry);
// native widget rendering methods that require mirroring
#ifdef MACOSX
virtual bool hitTestNativeControl( ControlType nType,
ControlPart nPart, const Rectangle& rControlRegion,
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index ac65c77..d0be52a 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1803,7 +1803,9 @@ void AquaSalGraphics::invert( long nX, long nY, long
nWidth, long nHeight, SalIn
}
}
-CGPoint* AquaSalGraphics::makeCGptArray(sal_uInt32 nPoints, const SalPoint*
pPtAry)
+namespace {
+
+CGPoint* makeCGptArray(sal_uInt32 nPoints, const SalPoint* pPtAry)
{
CGPoint *CGpoints = new CGPoint[nPoints];
if ( CGpoints )
@@ -1817,6 +1819,8 @@ CGPoint* AquaSalGraphics::makeCGptArray(sal_uInt32
nPoints, const SalPoint* pPtA
return CGpoints;
}
+}
+
void AquaSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
SalInvert nSalFlags )
{
if ( CheckContext() )
commit 8e9650ff54efd0e53973cf2dcf715cf7bfa2c8d3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 23:43:18 2015 +0200
Remove dead CoreTextStyle::SetTextColor
...unclear to me why 507efabe8b40e34c2bebfdaa00d4264c5345d3dd
"Resolves: #i124922# allow late setting of the font color..." left it in
Change-Id: I741ca3d7eca6fa5dff81af50d91bd6c5d1cba989
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 05f6180..346602c 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -97,8 +97,6 @@ public:
bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) const;
bool GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) const;
- void SetTextColor( const RGBAColor& ) {}
-
const CoreTextFontData* mpFontData;
/// <1.0: font is squeezed, >1.0 font is stretched, else 1.0
float mfFontStretch;
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 859fa95..52cf48a 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -307,8 +307,6 @@ void AquaSalGraphics::SetTextColor( SalColor nSalColor )
{
maTextColor = RGBAColor( nSalColor );
// SAL_ DEBUG(std::hex << nSalColor << std::dec << "={" <<
maTextColor.GetRed() << ", " << maTextColor.GetGreen() << ", " <<
maTextColor.GetBlue() << ", " << maTextColor.GetAlpha() << "}");
- if( mpTextStyle)
- mpTextStyle->SetTextColor( maTextColor );
}
void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int
/*nFallbackLevel*/ )
@@ -436,7 +434,6 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern*
pReqFont, int /*nFallbac
// update the text style
mpFontData = static_cast<const CoreTextFontData*>( pReqFont->mpFontData );
mpTextStyle = new CoreTextStyle( *pReqFont );
- mpTextStyle->SetTextColor( maTextColor );
SAL_INFO("vcl.ct",
"SetFont"
commit 0e8be4beac6dc73d02b798962cb41c31b0ff1b8a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 23:39:31 2015 +0200
Remove trivial CoreTextFontData::CreateTextStyle wrapper
Change-Id: Ic57551d9a3590769f97742d41f089dbb3ce248a9
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index e9cddd8..05f6180 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -63,7 +63,6 @@ public:
ImplFontEntry* CreateFontInstance( FontSelectPattern& )
const SAL_OVERRIDE;
sal_IntPtr GetFontId() const SAL_OVERRIDE;
- CoreTextStyle* CreateTextStyle( const FontSelectPattern&
) const;
int GetFontTable( const char pTagName[5],
unsigned char* ) const;
const FontCharMapPtr GetFontCharMap() const;
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 700c0e1..16cde93 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -223,11 +223,6 @@ PhysicalFontFace* CoreTextFontData::Clone() const
return new CoreTextFontData( *this);
}
-CoreTextStyle* CoreTextFontData::CreateTextStyle( const FontSelectPattern&
rFSD ) const
-{
- return new CoreTextStyle( rFSD);
-}
-
ImplFontEntry* CoreTextFontData::CreateFontInstance( /*const*/
FontSelectPattern& rFSD ) const
{
return new ImplFontEntry( rFSD);
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 99e10e8..859fa95 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -435,7 +435,7 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern*
pReqFont, int /*nFallbac
// update the text style
mpFontData = static_cast<const CoreTextFontData*>( pReqFont->mpFontData );
- mpTextStyle = mpFontData->CreateTextStyle( *pReqFont );
+ mpTextStyle = new CoreTextStyle( *pReqFont );
mpTextStyle->SetTextColor( maTextColor );
SAL_INFO("vcl.ct",
commit 565611a1c87ce368f4823a324564dddc4e7f2ed2
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 23:36:24 2015 +0200
loplugin:staticmethods
Change-Id: I1aeec1e8b00ab0f9e7ec130b6d72b69f35a304cf
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 18f0bba..0f3152a 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -97,7 +97,7 @@ class AquaSalInfoPrinter : public SalInfoPrinter
bool AbortJob();
SalGraphics* StartPage( ImplJobSetup* i_pSetupData, bool
i_bNewJobData );
bool EndPage();
- sal_uLong GetErrorCode() const;
+ static sal_uLong GetErrorCode();
NSPrintInfo* getPrintInfo() const { return mpPrintInfo; }
void setStartPageOffset( int nOffsetX, int nOffsetY ) { mnStartPageOffsetX
= nOffsetX; mnStartPageOffsetY = nOffsetY; }
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index ed631b0..4995ae0 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -563,7 +563,7 @@ bool AquaSalInfoPrinter::EndPage()
return true;
}
-sal_uLong AquaSalInfoPrinter::GetErrorCode() const
+sal_uLong AquaSalInfoPrinter::GetErrorCode()
{
return 0;
}
@@ -620,7 +620,7 @@ bool AquaSalPrinter::EndPage()
sal_uLong AquaSalPrinter::GetErrorCode()
{
- return mpInfoPrinter->GetErrorCode();
+ return AquaSalInfoPrinter::GetErrorCode();
}
void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
commit 27cff71ce4db252d78d144411233c85adc114f5c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 23:35:15 2015 +0200
loplugin:staticmethods
Change-Id: Ie99d1dd241dc2bfa5c5ac2bff9f2330c491327bc
diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h
index cac87f0..1419050 100644
--- a/vcl/inc/osx/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -50,7 +50,6 @@ private:
std::vector< MenuBarButtonEntry > maButtons;
MenuBarButtonEntry* findButtonItem( sal_uInt16 i_nItemId );
- void releaseButtonEntry( MenuBarButtonEntry& i_rEntry );
static void statusLayout();
public:
AquaSalMenu( bool bMenuBar );
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 61e7b76..4d7fb8f 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -39,6 +39,24 @@
#include <objc/objc-runtime.h>
+namespace {
+
+void releaseButtonEntry( AquaSalMenu::MenuBarButtonEntry& i_rEntry )
+{
+ if( i_rEntry.mpNSImage )
+ {
+ [i_rEntry.mpNSImage release];
+ i_rEntry.mpNSImage = nil;
+ }
+ if( i_rEntry.mpToolTipString )
+ {
+ [i_rEntry.mpToolTipString release];
+ i_rEntry.mpToolTipString = nil;
+ }
+}
+
+}
+
const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL;
@interface MainMenuSelector : NSObject
@@ -797,20 +815,6 @@ void AquaSalMenu::statusLayout()
}
}
-void AquaSalMenu::releaseButtonEntry( MenuBarButtonEntry& i_rEntry )
-{
- if( i_rEntry.mpNSImage )
- {
- [i_rEntry.mpNSImage release];
- i_rEntry.mpNSImage = nil;
- }
- if( i_rEntry.mpToolTipString )
- {
- [i_rEntry.mpToolTipString release];
- i_rEntry.mpToolTipString = nil;
- }
-}
-
bool AquaSalMenu::AddMenuBarButton( const SalMenuButtonItem& i_rNewItem )
{
if( ! mbMenuBar || ! VisibleMenuBar() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
