summaryrefslogtreecommitdiff
path: root/vcl/osx/salframe.cxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-02 16:45:44 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-02 16:54:18 +0300
commit50bf123ddbeb457b89636621a99c971834adf3ab (patch)
treeb7782261998ca0b6bece98543e2c66e3c96f4d3c /vcl/osx/salframe.cxx
parentdb1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff)
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/osx/salframe.cxx')
-rw-r--r--vcl/osx/salframe.cxx79
1 files changed, 0 insertions, 79 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index fa4fe5464261..23748fe7fe49 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string>
#include "rtl/ustrbuf.hxx"
@@ -54,12 +53,8 @@
using namespace std;
-
-
AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
-
-
AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) :
mpNSWindow(nil),
mpNSView(nil),
@@ -99,8 +94,6 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) :
pSalData->maFrameCheck.insert( this );
}
-
-
AquaSalFrame::~AquaSalFrame()
{
// if the frame is destroyed and has the current menubar
@@ -135,8 +128,6 @@ AquaSalFrame::~AquaSalFrame()
[mpNSWindow release];
}
-
-
void AquaSalFrame::initWindowAndView()
{
// initialize mirroring parameters
@@ -227,8 +218,6 @@ void AquaSalFrame::initWindowAndView()
[mpNSWindow setContentView: mpNSView];
}
-
-
void AquaSalFrame::CocoaToVCL( NSRect& io_rRect, bool bRelativeToScreen )
{
if( bRelativeToScreen )
@@ -261,8 +250,6 @@ void AquaSalFrame::VCLToCocoa( NSPoint& io_rPoint, bool bRelativeToScreen )
io_rPoint.y = maGeometry.nHeight - io_rPoint.y;
}
-
-
void AquaSalFrame::screenParametersChanged()
{
UpdateFrameGeometry();
@@ -272,8 +259,6 @@ void AquaSalFrame::screenParametersChanged()
CallCallback( SALEVENT_DISPLAYCHANGED, 0 );
}
-
-
SalGraphics* AquaSalFrame::AcquireGraphics()
{
if ( mbGraphics )
@@ -289,8 +274,6 @@ SalGraphics* AquaSalFrame::AcquireGraphics()
return mpGraphics;
}
-
-
void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
{
(void)pGraphics;
@@ -298,15 +281,12 @@ void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
mbGraphics = FALSE;
}
-
-
bool AquaSalFrame::PostEvent( void *pData )
{
GetSalData()->mpFirstInstance->PostUserEvent( this, SALEVENT_USEREVENT, pData );
return TRUE;
}
-
void AquaSalFrame::SetTitle(const OUString& rTitle)
{
if ( !mpNSWindow )
@@ -343,14 +323,10 @@ void AquaSalFrame::SetTitle(const OUString& rTitle)
[pTitle release];
}
-
-
void AquaSalFrame::SetIcon( sal_uInt16 )
{
}
-
-
void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL )
{
// #i113170# may not be the main thread if called from UNO API
@@ -369,8 +345,6 @@ void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL )
}
}
-
-
void AquaSalFrame::initShow()
{
mbInitShow = false;
@@ -422,8 +396,6 @@ void AquaSalFrame::SendPaintEvent( const Rectangle* pRect )
CallCallback(SALEVENT_PAINT, &aPaintEvt);
}
-
-
void AquaSalFrame::Show(bool bVisible, bool bNoActivate)
{
if ( !mpNSWindow )
@@ -485,14 +457,10 @@ void AquaSalFrame::Show(bool bVisible, bool bNoActivate)
}
}
-
-
void AquaSalFrame::Enable( bool )
{
}
-
-
void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight )
{
// #i113170# may not be the main thread if called from UNO API
@@ -516,8 +484,6 @@ void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight )
}
}
-
-
void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight )
{
// #i113170# may not be the main thread if called from UNO API
@@ -545,8 +511,6 @@ void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight )
}
}
-
-
void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight )
{
if( mbShown || mbInitShow )
@@ -561,8 +525,6 @@ void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight )
}
}
-
-
void AquaSalFrame::SetWindowState( const SalFrameState* pState )
{
// #i113170# may not be the main thread if called from UNO API
@@ -591,7 +553,6 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
else if( [mpNSWindow isMiniaturized] )
[mpNSWindow deminiaturize: NSApp];
-
/* ZOOMED is not really maximized (actually it toggles between a user set size and
the program specified one), but comes closest since the default behavior is
"maximized" if the user did not intervene
@@ -637,8 +598,6 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
}
}
-
-
bool AquaSalFrame::GetWindowState( SalFrameState* pState )
{
if ( !mpNSWindow )
@@ -671,8 +630,6 @@ bool AquaSalFrame::GetWindowState( SalFrameState* pState )
return TRUE;
}
-
-
void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
{
if ( !mpNSWindow )
@@ -711,8 +668,6 @@ void AquaSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ )
{
}
-
-
void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay )
{
if ( !mpNSWindow )
@@ -808,8 +763,6 @@ void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay )
SendPaintEvent();
}
-
-
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
class PreventSleepTimer : public AutoTimer
{
@@ -866,14 +819,10 @@ void AquaSalFrame::StartPresentation( bool bStart )
}
}
-
-
void AquaSalFrame::SetAlwaysOnTop( bool )
{
}
-
-
void AquaSalFrame::ToTop(sal_uInt16 nFlags)
{
if ( !mpNSWindow )
@@ -893,8 +842,6 @@ void AquaSalFrame::ToTop(sal_uInt16 nFlags)
[mpNSWindow orderFront: NSApp];
}
-
-
NSCursor* AquaSalFrame::getCurrentCursor() const
{
NSCursor* pCursor = nil;
@@ -949,8 +896,6 @@ void AquaSalFrame::SetPointer( PointerStyle ePointerStyle )
[mpNSWindow invalidateCursorRectsForView: mpNSView];
}
-
-
void AquaSalFrame::SetPointerPos( long nX, long nY )
{
// FIXME: use Cocoa functions
@@ -961,8 +906,6 @@ void AquaSalFrame::SetPointerPos( long nX, long nY )
CGDisplayMoveCursorToPoint( mainDisplayID, aPoint );
}
-
-
void AquaSalFrame::Flush( void )
{
if( !(mbGraphics && mpGraphics && mpNSView && mbShown) )
@@ -971,7 +914,6 @@ void AquaSalFrame::Flush( void )
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
-
[mpNSView setNeedsDisplay: YES];
// outside of the application's event loop (e.g. IntroWindow)
@@ -983,8 +925,6 @@ void AquaSalFrame::Flush( void )
}
}
-
-
void AquaSalFrame::Flush( const Rectangle& rRect )
{
if( !(mbGraphics && mpGraphics && mpNSView && mbShown) )
@@ -1006,8 +946,6 @@ void AquaSalFrame::Flush( const Rectangle& rRect )
}
}
-
-
void AquaSalFrame::Sync()
{
if( mbGraphics && mpGraphics && mpNSView && mbShown )
@@ -1020,8 +958,6 @@ void AquaSalFrame::Sync()
}
}
-
-
void AquaSalFrame::SetInputContext( SalInputContext* pContext )
{
if (!pContext)
@@ -1036,14 +972,10 @@ void AquaSalFrame::SetInputContext( SalInputContext* pContext )
return;
}
-
-
void AquaSalFrame::EndExtTextInput( sal_uInt16 )
{
}
-
-
OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
{
static std::map< sal_uInt16, OUString > aKeyMap;
@@ -1129,8 +1061,6 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
return aResult.makeStringAndClear();
}
-
-
static void getAppleScrollBarVariant(StyleSettings &rSettings)
{
bool bIsScrollbarDoubleMax = true; // default is DoubleMax
@@ -1328,22 +1258,16 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
[mpNSView unlockFocus];
}
-
-
const SystemEnvData* AquaSalFrame::GetSystemData() const
{
return &maSysData;
}
-
-
void AquaSalFrame::Beep()
{
NSBeep();
}
-
-
void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags)
{
if ( !mpNSWindow )
@@ -1534,7 +1458,6 @@ SalPointerState AquaSalFrame::GetPointerState()
state.mnState |= KEY_MOD1;
}
-
return state;
}
@@ -1663,8 +1586,6 @@ void AquaSalFrame::UpdateFrameGeometry()
maGeometry.nHeight = static_cast<unsigned int>(aContentRect.size.height);
}
-
-
void AquaSalFrame::CaptureMouse( bool bCapture )
{
/* Remark: