summaryrefslogtreecommitdiff
path: root/vcl/source/window
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/source/window
parentdb1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff)
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/accel.cxx54
-rw-r--r--vcl/source/window/accmgr.cxx14
-rw-r--r--vcl/source/window/brdwin.cxx150
-rw-r--r--vcl/source/window/btndlg.cxx1
-rw-r--r--vcl/source/window/builder.cxx1
-rw-r--r--vcl/source/window/cmdevt.cxx5
-rw-r--r--vcl/source/window/cursor.cxx39
-rw-r--r--vcl/source/window/decoview.cxx21
-rw-r--r--vcl/source/window/dialog.cxx3
-rw-r--r--vcl/source/window/dlgctrl.cxx40
-rw-r--r--vcl/source/window/dndevdis.cxx36
-rw-r--r--vcl/source/window/dndlcon.cxx49
-rw-r--r--vcl/source/window/dockingarea.cxx16
-rw-r--r--vcl/source/window/dockmgr.cxx12
-rw-r--r--vcl/source/window/dockwin.cxx4
-rw-r--r--vcl/source/window/floatwin.cxx4
-rw-r--r--vcl/source/window/introwin.cxx9
-rw-r--r--vcl/source/window/keycod.cxx13
-rw-r--r--vcl/source/window/keyevent.cxx4
-rw-r--r--vcl/source/window/layout.cxx1
-rw-r--r--vcl/source/window/menu.cxx33
-rw-r--r--vcl/source/window/mnemonic.cxx16
-rw-r--r--vcl/source/window/mouseevent.cxx1
-rw-r--r--vcl/source/window/msgbox.cxx64
-rw-r--r--vcl/source/window/popupmenuwindow.cxx3
-rw-r--r--vcl/source/window/printdlg.cxx6
-rw-r--r--vcl/source/window/scrwnd.cxx1
-rw-r--r--vcl/source/window/seleng.cxx14
-rw-r--r--vcl/source/window/split.cxx62
-rw-r--r--vcl/source/window/splitwin.cxx1
-rw-r--r--vcl/source/window/status.cxx120
-rw-r--r--vcl/source/window/syschild.cxx18
-rw-r--r--vcl/source/window/syswin.cxx60
-rw-r--r--vcl/source/window/tabdlg.cxx16
-rw-r--r--vcl/source/window/tabpage.cxx20
-rw-r--r--vcl/source/window/taskpanelist.cxx19
-rw-r--r--vcl/source/window/toolbox.cxx181
-rw-r--r--vcl/source/window/toolbox2.cxx5
-rw-r--r--vcl/source/window/window.cxx482
-rw-r--r--vcl/source/window/window2.cxx87
-rw-r--r--vcl/source/window/window3.cxx7
-rw-r--r--vcl/source/window/winproc.cxx89
-rw-r--r--vcl/source/window/wrkwin.cxx26
43 files changed, 0 insertions, 1807 deletions
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 8c70510b111e..f331d80b3068 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/debug.hxx>
#include <tools/rc.h>
@@ -27,15 +26,11 @@
#include <map>
#include <vector>
-
-
typedef ::std::map< sal_uLong, ImplAccelEntry* > ImplAccelMap;
typedef ::std::vector< ImplAccelEntry* > ImplAccelList;
#define ACCELENTRY_NOTFOUND ((sal_uInt16)0xFFFF)
-
-
class ImplAccelData
{
public:
@@ -43,11 +38,6 @@ public:
ImplAccelList maIdList; // Id-List
};
-
-
-
-
-
sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId,
sal_uInt16* pIndex = NULL )
{
@@ -95,8 +85,6 @@ sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId,
return ACCELENTRY_NOTFOUND;
}
-
-
static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry )
{
sal_uInt16 nInsIndex;
@@ -134,8 +122,6 @@ static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry )
}
}
-
-
static sal_uInt16 ImplAccelEntryGetFirstPos( ImplAccelList* pList, sal_uInt16 nId )
{
sal_uInt16 nIndex = ImplAccelEntryGetIndex( pList, nId );
@@ -155,8 +141,6 @@ static sal_uInt16 ImplAccelEntryGetFirstPos( ImplAccelList* pList, sal_uInt16 nI
return nIndex;
}
-
-
void Accelerator::ImplInit()
{
mnCurId = 0;
@@ -165,8 +149,6 @@ void Accelerator::ImplInit()
mpDel = NULL;
}
-
-
ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const
{
ImplAccelMap::iterator it = mpData->maKeyMap.find( rKeyCode.GetFullCode() );
@@ -176,8 +158,6 @@ ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const
return NULL;
}
-
-
void Accelerator::ImplCopyData( ImplAccelData& rAccelData )
{
// copy table
@@ -199,8 +179,6 @@ void Accelerator::ImplCopyData( ImplAccelData& rAccelData )
}
}
-
-
void Accelerator::ImplDeleteData()
{
// delete accelerator-entries using the id-table
@@ -214,8 +192,6 @@ void Accelerator::ImplDeleteData()
mpData->maIdList.clear();
}
-
-
void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode,
bool bEnable, Accelerator* pAutoAccel )
{
@@ -269,8 +245,6 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode,
ImplAccelEntryInsert( &(mpData->maIdList), pEntry );
}
-
-
Accelerator::Accelerator()
{
@@ -278,8 +252,6 @@ Accelerator::Accelerator()
mpData = new ImplAccelData;
}
-
-
Accelerator::Accelerator( const Accelerator& rAccel ) :
Resource(),
maHelpStr( rAccel.maHelpStr ),
@@ -291,8 +263,6 @@ Accelerator::Accelerator( const Accelerator& rAccel ) :
ImplCopyData( *((ImplAccelData*)(rAccel.mpData)) );
}
-
-
Accelerator::Accelerator( const ResId& rResId )
{
@@ -302,8 +272,6 @@ Accelerator::Accelerator( const ResId& rResId )
ImplLoadRes( rResId );
}
-
-
void Accelerator::ImplLoadRes( const ResId& rResId )
{
GetRes( rResId );
@@ -318,8 +286,6 @@ void Accelerator::ImplLoadRes( const ResId& rResId )
}
}
-
-
Accelerator::~Accelerator()
{
@@ -331,36 +297,26 @@ Accelerator::~Accelerator()
delete mpData;
}
-
-
void Accelerator::Activate()
{
maActivateHdl.Call( this );
}
-
-
void Accelerator::Deactivate()
{
maDeactivateHdl.Call( this );
}
-
-
void Accelerator::Select()
{
maSelectHdl.Call( this );
}
-
-
void Accelerator::InsertItem( sal_uInt16 nItemId, const KeyCode& rKeyCode )
{
ImplInsertAccel( nItemId, rKeyCode, true, NULL );
}
-
-
void Accelerator::InsertItem( const ResId& rResId )
{
@@ -393,16 +349,12 @@ void Accelerator::InsertItem( const ResId& rResId )
ImplInsertAccel( nAccelKeyId, aKeyCode, !bDisable, pAutoAccel );
}
-
-
sal_uInt16 Accelerator::GetItemCount() const
{
return (sal_uInt16)mpData->maIdList.size();
}
-
-
KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const
{
@@ -413,8 +365,6 @@ KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const
return KeyCode();
}
-
-
sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const
{
@@ -425,8 +375,6 @@ sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const
return 0;
}
-
-
Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const
{
@@ -437,8 +385,6 @@ Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const
return NULL;
}
-
-
Accelerator& Accelerator::operator=( const Accelerator& rAccel )
{
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index e3bccd74ca41..a5dfaba99e5b 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -17,26 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/debug.hxx>
#include <accel.h>
#include <vcl/accel.hxx>
#include <accmgr.hxx>
-
-
-
-
-
ImplAccelManager::~ImplAccelManager()
{
delete mpAccelList;
delete mpSequenceList;
}
-
-
bool ImplAccelManager::InsertAccel( Accelerator* pAccel )
{
if ( !mpAccelList ) {
@@ -53,8 +45,6 @@ bool ImplAccelManager::InsertAccel( Accelerator* pAccel )
return true;
}
-
-
void ImplAccelManager::RemoveAccel( Accelerator* pAccel )
{
// do we have a list ?
@@ -90,8 +80,6 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel )
}
}
-
-
void ImplAccelManager::EndSequence( bool bCancel )
{
// are we in a list ?
@@ -118,8 +106,6 @@ void ImplAccelManager::EndSequence( bool bCancel )
mpSequenceList = NULL;
}
-
-
bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat )
{
Accelerator* pAccel;
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index aca945654858..4ec9579a9465 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -41,8 +41,6 @@ using namespace ::com::sun::star::uno;
// useful caption height for title bar buttons
#define MIN_CAPTION_HEIGHT 18
-
-
static void ImplGetPinImage( sal_uInt16 nStyle, bool bPinIn, Image& rImage )
{
// load ImageList if not available yet
@@ -79,8 +77,6 @@ static void ImplGetPinImage( sal_uInt16 nStyle, bool bPinIn, Image& rImage )
rImage = pSVData->maCtrlData.mpPinImgList->GetImage( nId );
}
-
-
void Window::ImplCalcSymbolRect( Rectangle& rRect )
{
// Add border, not shown in the non-default representation,
@@ -99,8 +95,6 @@ void Window::ImplCalcSymbolRect( Rectangle& rRect )
rRect.Bottom() -= nExtraHeight;
}
-
-
static void ImplDrawBrdWinSymbol( OutputDevice* pDev,
const Rectangle& rRect, SymbolType eSymbol )
{
@@ -112,8 +106,6 @@ static void ImplDrawBrdWinSymbol( OutputDevice* pDev,
pDev->GetSettings().GetStyleSettings().GetButtonTextColor(), 0 );
}
-
-
static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev,
const Rectangle& rRect,
SymbolType eSymbol, sal_uInt16 nState )
@@ -148,54 +140,37 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev,
ImplDrawBrdWinSymbol( pDev, aTempRect, eSymbol );
}
-
-
-
-
// - ImplBorderWindowView -
-
ImplBorderWindowView::~ImplBorderWindowView()
{
}
-
-
bool ImplBorderWindowView::MouseMove( const MouseEvent& )
{
return false;
}
-
-
bool ImplBorderWindowView::MouseButtonDown( const MouseEvent& )
{
return false;
}
-
-
bool ImplBorderWindowView::Tracking( const TrackingEvent& )
{
return false;
}
-
-
OUString ImplBorderWindowView::RequestHelp( const Point&, Rectangle& )
{
return OUString();
}
-
-
Rectangle ImplBorderWindowView::GetMenuRect() const
{
return Rectangle();
}
-
-
void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData )
{
ImplBorderWindow* pBorderWindow = pData->mpBorderWindow;
@@ -230,8 +205,6 @@ void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData )
}
}
-
-
sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const Point& rPos )
{
ImplBorderWindow* pBorderWindow = pData->mpBorderWindow;
@@ -309,8 +282,6 @@ sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const
return 0;
}
-
-
bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt )
{
sal_uInt16 oldCloseState = pData->mnCloseState;
@@ -351,8 +322,6 @@ bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const Mous
return true;
}
-
-
bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt )
{
ImplBorderWindow* pBorderWindow = pData->mpBorderWindow;
@@ -471,8 +440,6 @@ bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, cons
return true;
}
-
-
bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt )
{
ImplBorderWindow* pBorderWindow = pData->mpBorderWindow;
@@ -924,8 +891,6 @@ bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track
return true;
}
-
-
OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
const Point& rPos,
Rectangle& rHelpRect )
@@ -995,8 +960,6 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
return aHelpStr;
}
-
-
long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const
{
// title is not visible therefore no width
@@ -1016,24 +979,16 @@ long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData
return nTitleWidth;
}
-
-
-
// - ImplNoBorderWindowView -
-
ImplNoBorderWindowView::ImplNoBorderWindowView( ImplBorderWindow* )
{
}
-
-
void ImplNoBorderWindowView::Init( OutputDevice*, long, long )
{
}
-
-
void ImplNoBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
{
@@ -1043,27 +998,17 @@ void ImplNoBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopB
rBottomBorder = 0;
}
-
-
long ImplNoBorderWindowView::CalcTitleWidth() const
{
return 0;
}
-
-
void ImplNoBorderWindowView::DrawWindow( sal_uInt16, OutputDevice*, const Point* )
{
}
-
-
-
// - ImplSmallBorderWindowView -
-
-
-
ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow )
: mpBorderWindow(pBorderWindow)
, mnLeftBorder(0)
@@ -1073,8 +1018,6 @@ ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderW
{
}
-
-
void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight )
{
mpOutDev = pDev;
@@ -1234,8 +1177,6 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
}
}
-
-
void ImplSmallBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
{
@@ -1245,15 +1186,11 @@ void ImplSmallBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rT
rBottomBorder = mnBottomBorder;
}
-
-
long ImplSmallBorderWindowView::CalcTitleWidth() const
{
return 0;
}
-
-
void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*, const Point* )
{
sal_uInt16 nBorderStyle = mpBorderWindow->GetBorderStyle();
@@ -1414,12 +1351,8 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*
}
}
-
-
-
// - ImplStdBorderWindowView -
-
ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow )
{
maFrameData.mpBorderWindow = pBorderWindow;
@@ -1438,51 +1371,37 @@ ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindo
mpDTitleVirDev = NULL;
}
-
-
ImplStdBorderWindowView::~ImplStdBorderWindowView()
{
delete mpATitleVirDev;
delete mpDTitleVirDev;
}
-
-
bool ImplStdBorderWindowView::MouseMove( const MouseEvent& rMEvt )
{
return ImplMouseMove( &maFrameData, rMEvt );
}
-
-
bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt )
{
return ImplMouseButtonDown( &maFrameData, rMEvt );
}
-
-
bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt )
{
return ImplTracking( &maFrameData, rTEvt );
}
-
-
OUString ImplStdBorderWindowView::RequestHelp( const Point& rPos, Rectangle& rHelpRect )
{
return ImplRequestHelp( &maFrameData, rPos, rHelpRect );
}
-
-
Rectangle ImplStdBorderWindowView::GetMenuRect() const
{
return maFrameData.maMenuRect;
}
-
-
void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight )
{
ImplBorderFrameData* pData = &maFrameData;
@@ -1629,8 +1548,6 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh
}
}
-
-
void ImplStdBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
{
@@ -1640,15 +1557,11 @@ void ImplStdBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTop
rBottomBorder = maFrameData.mnBottomBorder;
}
-
-
long ImplStdBorderWindowView::CalcTitleWidth() const
{
return ImplCalcTitleWidth( &maFrameData );
}
-
-
void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset )
{
ImplBorderFrameData* pData = &maFrameData;
@@ -1734,7 +1647,6 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* p
aTitleRect.Move( pOffset->X(), pOffset->Y() );
pDev->DrawRect( aTitleRect );
-
if ( pData->mnTitleType != BORDERWINDOW_TITLE_TEAROFF )
{
aInRect.Left() += 2;
@@ -1846,8 +1758,6 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* p
}
}
-
-
void ImplBorderWindow::ImplInit( Window* pParent,
WinBits nStyle, sal_uInt16 nTypeStyle,
const ::com::sun::star::uno::Any& )
@@ -1933,8 +1843,6 @@ void ImplBorderWindow::ImplInit( Window* pParent,
InitView();
}
-
-
ImplBorderWindow::ImplBorderWindow( Window* pParent,
SystemParentData* pSystemParentData,
WinBits nStyle, sal_uInt16 nTypeStyle
@@ -1943,8 +1851,6 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent,
ImplInit( pParent, nStyle, nTypeStyle, pSystemParentData );
}
-
-
ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle ,
sal_uInt16 nTypeStyle ) :
Window( WINDOW_BORDERWINDOW )
@@ -1952,36 +1858,26 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle ,
ImplInit( pParent, nStyle, nTypeStyle, ::com::sun::star::uno::Any() );
}
-
-
ImplBorderWindow::~ImplBorderWindow()
{
delete mpBorderView;
}
-
-
void ImplBorderWindow::MouseMove( const MouseEvent& rMEvt )
{
mpBorderView->MouseMove( rMEvt );
}
-
-
void ImplBorderWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
mpBorderView->MouseButtonDown( rMEvt );
}
-
-
void ImplBorderWindow::Tracking( const TrackingEvent& rTEvt )
{
mpBorderView->Tracking( rTEvt );
}
-
-
void ImplBorderWindow::Paint( const Rectangle& )
{
mpBorderView->DrawWindow( BORDERWINDOW_DRAW_ALL );
@@ -1992,16 +1888,12 @@ void ImplBorderWindow::Draw( const Rectangle&, OutputDevice* pOutDev, const Poin
mpBorderView->DrawWindow( BORDERWINDOW_DRAW_ALL, pOutDev, &rPos );
}
-
-
void ImplBorderWindow::Activate()
{
SetDisplayActive( true );
Window::Activate();
}
-
-
void ImplBorderWindow::Deactivate()
{
// remove active windows from the ruler, also ignore the Deactivate
@@ -2011,8 +1903,6 @@ void ImplBorderWindow::Deactivate()
Window::Deactivate();
}
-
-
void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt )
{
// no keyboard help for border window
@@ -2037,8 +1927,6 @@ void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt )
Window::RequestHelp( rHEvt );
}
-
-
void ImplBorderWindow::Resize()
{
Size aSize = GetOutputSizePixel();
@@ -2091,8 +1979,6 @@ void ImplBorderWindow::Resize()
Window::Resize();
}
-
-
void ImplBorderWindow::StateChanged( StateChangedType nType )
{
if ( (nType == STATE_CHANGE_TEXT) ||
@@ -2111,8 +1997,6 @@ void ImplBorderWindow::StateChanged( StateChangedType nType )
Window::StateChanged( nType );
}
-
-
void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( (rDCEvt.GetType() == DATACHANGED_FONTS) ||
@@ -2127,8 +2011,6 @@ void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
Window::DataChanged( rDCEvt );
}
-
-
void ImplBorderWindow::InitView()
{
if ( mbSmallOutBorder )
@@ -2148,8 +2030,6 @@ void ImplBorderWindow::InitView()
mpBorderView->Init( this, aSize.Width(), aSize.Height() );
}
-
-
void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize )
{
sal_Int32 nLeftBorder;
@@ -2191,8 +2071,6 @@ void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize )
}
}
-
-
void ImplBorderWindow::InvalidateBorder()
{
if ( IsReallyVisible() )
@@ -2224,8 +2102,6 @@ void ImplBorderWindow::InvalidateBorder()
}
}
-
-
void ImplBorderWindow::SetDisplayActive( bool bActive )
{
if ( mbDisplayActive != bActive )
@@ -2236,16 +2112,12 @@ void ImplBorderWindow::SetDisplayActive( bool bActive )
}
}
-
-
void ImplBorderWindow::SetTitleType( sal_uInt16 nTitleType, const Size& rSize )
{
mnTitleType = nTitleType;
UpdateView( false, rSize );
}
-
-
void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle )
{
if ( !mbFrameBorder && (mnBorderStyle != nStyle) )
@@ -2255,16 +2127,12 @@ void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle )
}
}
-
-
void ImplBorderWindow::SetPin( bool bPin )
{
mbPinned = bPin;
InvalidateBorder();
}
-
-
void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize )
{
mbRollUp = bRollUp;
@@ -2272,8 +2140,6 @@ void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize )
UpdateView( false, rSize );
}
-
-
void ImplBorderWindow::SetCloser()
{
SetStyle( GetStyle() | WB_CLOSEABLE );
@@ -2282,8 +2148,6 @@ void ImplBorderWindow::SetCloser()
InvalidateBorder();
}
-
-
void ImplBorderWindow::SetDockButton( bool bDockButton )
{
mbDockBtn = bDockButton;
@@ -2292,8 +2156,6 @@ void ImplBorderWindow::SetDockButton( bool bDockButton )
InvalidateBorder();
}
-
-
void ImplBorderWindow::SetHideButton( bool bHideButton )
{
mbHideBtn = bHideButton;
@@ -2302,8 +2164,6 @@ void ImplBorderWindow::SetHideButton( bool bHideButton )
InvalidateBorder();
}
-
-
void ImplBorderWindow::SetMenuButton( bool bMenuButton )
{
mbMenuBtn = bMenuButton;
@@ -2312,15 +2172,11 @@ void ImplBorderWindow::SetMenuButton( bool bMenuButton )
InvalidateBorder();
}
-
-
void ImplBorderWindow::UpdateMenuHeight()
{
Resize();
}
-
-
void ImplBorderWindow::SetMenuBarWindow( Window* pWindow )
{
mpMenuBarWindow = pWindow;
@@ -2329,16 +2185,12 @@ void ImplBorderWindow::SetMenuBarWindow( Window* pWindow )
pWindow->Show();
}
-
-
void ImplBorderWindow::SetMenuBarMode( bool bHide )
{
mbMenuHide = bHide;
UpdateMenuHeight();
}
-
-
void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
{
@@ -2347,8 +2199,6 @@ void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
rTopBorder += mpMenuBarWindow->GetSizePixel().Height();
}
-
-
long ImplBorderWindow::CalcTitleWidth() const
{
return mpBorderView->CalcTitleWidth();
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 9bc6a3eedccf..21e909f8765b 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/rc.h>
#include <svdata.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 6ba769d5864d..91a2b9769186 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2879,7 +2879,6 @@ void VclBuilder::handleActionWidget(xmlreader::XmlReader &reader)
set_response(sID, sResponse.toInt32());
}
-
void VclBuilder::collectAccelerator(xmlreader::XmlReader &reader, stringmap &rMap)
{
xmlreader::Span name;
diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx
index 9c7f010931c7..803d7e24f64a 100644
--- a/vcl/source/window/cmdevt.cxx
+++ b/vcl/source/window/cmdevt.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <vcl/cmdevt.hxx>
@@ -39,8 +38,6 @@ CommandExtTextInputData::CommandExtTextInputData( const OUString& rText,
mbOnlyCursor = bOnlyCursor;
}
-
-
CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData& rData ) :
maText( rData.maText )
{
@@ -56,8 +53,6 @@ CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData&
mbOnlyCursor = rData.mbOnlyCursor;
}
-
-
CommandExtTextInputData::~CommandExtTextInputData()
{
delete [] mpTextAttr;
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 669b05406070..3ccf0601bdca 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -27,9 +27,6 @@
#include <tools/poly.hxx>
-
-
-
struct ImplCursorData
{
AutoTimer maTimer; // Timer
@@ -44,8 +41,6 @@ struct ImplCursorData
Window* mpWindow; // Zugeordnetes Windows
};
-
-
static void ImplCursorInvert( ImplCursorData* pData )
{
Window* pWindow = pData->mpWindow;
@@ -120,8 +115,6 @@ static void ImplCursorInvert( ImplCursorData* pData )
pWindow->EnableMapMode( bMapMode );
}
-
-
void Cursor::ImplDraw()
{
if ( mpData && mpData->mpWindow && !mpData->mbCurVisible )
@@ -147,8 +140,6 @@ void Cursor::ImplDraw()
}
}
-
-
void Cursor::ImplRestore()
{
if ( mpData && mpData->mbCurVisible )
@@ -257,8 +248,6 @@ void Cursor::ImplNew()
}
}
-
-
IMPL_LINK_NOARG(Cursor, ImplTimerHdl)
{
if ( mpData->mbCurVisible )
@@ -268,8 +257,6 @@ IMPL_LINK_NOARG(Cursor, ImplTimerHdl)
return 0;
}
-
-
Cursor::Cursor()
{
mpData = NULL;
@@ -281,8 +268,6 @@ Cursor::Cursor()
mbVisible = false;
}
-
-
Cursor::Cursor( const Cursor& rCursor ) :
maSize( rCursor.maSize ),
maPos( rCursor.maPos )
@@ -296,8 +281,6 @@ Cursor::Cursor( const Cursor& rCursor ) :
mbVisible = rCursor.mbVisible;
}
-
-
Cursor::~Cursor()
{
if ( mpData )
@@ -309,8 +292,6 @@ Cursor::~Cursor()
}
}
-
-
void Cursor::SetStyle( sal_uInt16 nStyle )
{
if ( mnStyle != nStyle )
@@ -320,8 +301,6 @@ void Cursor::SetStyle( sal_uInt16 nStyle )
}
}
-
-
void Cursor::Show()
{
if ( !mbVisible )
@@ -331,8 +310,6 @@ void Cursor::Show()
}
}
-
-
void Cursor::Hide()
{
if ( mbVisible )
@@ -342,8 +319,6 @@ void Cursor::Hide()
}
}
-
-
void Cursor::SetWindow( Window* pWindow )
{
if ( mpWindow != pWindow )
@@ -353,8 +328,6 @@ void Cursor::SetWindow( Window* pWindow )
}
}
-
-
void Cursor::SetPos( const Point& rPoint )
{
if ( maPos != rPoint )
@@ -364,8 +337,6 @@ void Cursor::SetPos( const Point& rPoint )
}
}
-
-
void Cursor::SetSize( const Size& rSize )
{
if ( maSize != rSize )
@@ -375,8 +346,6 @@ void Cursor::SetSize( const Size& rSize )
}
}
-
-
void Cursor::SetWidth( long nNewWidth )
{
if ( maSize.Width() != nNewWidth )
@@ -386,8 +355,6 @@ void Cursor::SetWidth( long nNewWidth )
}
}
-
-
void Cursor::SetOrientation( short nNewOrientation )
{
if ( mnOrientation != nNewOrientation )
@@ -397,8 +364,6 @@ void Cursor::SetOrientation( short nNewOrientation )
}
}
-
-
void Cursor::SetDirection( unsigned char nNewDirection )
{
if ( mnDirection != nNewDirection )
@@ -408,8 +373,6 @@ void Cursor::SetDirection( unsigned char nNewDirection )
}
}
-
-
Cursor& Cursor::operator=( const Cursor& rCursor )
{
maPos = rCursor.maPos;
@@ -423,8 +386,6 @@ Cursor& Cursor::operator=( const Cursor& rCursor )
return *this;
}
-
-
bool Cursor::operator==( const Cursor& rCursor ) const
{
return
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index df13ce4b8358..d16295e71a4c 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -23,15 +23,11 @@
#include <vcl/window.hxx>
#include <vcl/ctrl.hxx>
-
-
#define BUTTON_DRAW_FLATTEST (BUTTON_DRAW_FLAT | \
BUTTON_DRAW_PRESSED | \
BUTTON_DRAW_CHECKED | \
BUTTON_DRAW_HIGHLIGHT)
-
-
namespace {
long AdjustRectToSquare( Rectangle &rRect )
@@ -122,7 +118,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
nRect.Right()-1, aCenter.Y()+n8 ) );
break;
-
case SYMBOL_SPIN_UP:
nRect.Top() += n4;
pDev->DrawPixel( Point( aCenter.X(), nRect.Top() ) );
@@ -423,7 +418,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
}
}
-
void ImplDrawDPILineRect( OutputDevice *const pDev, Rectangle& rRect,
const Color *const pColor, const bool bRound = false )
{
@@ -473,7 +467,6 @@ void ImplDrawDPILineRect( OutputDevice *const pDev, Rectangle& rRect,
rRect.Bottom() -= nLineHeight;
}
-
void ImplDraw2ColorFrame( OutputDevice *const pDev, Rectangle& rRect,
const Color& rLeftTopColor, const Color& rRightBottomColor )
{
@@ -491,7 +484,6 @@ void ImplDraw2ColorFrame( OutputDevice *const pDev, Rectangle& rRect,
--rRect.Bottom();
}
-
void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect,
const sal_uInt16 nStyle )
{
@@ -829,9 +821,6 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect,
}
-
-
-
void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType,
const Color& rColor, sal_uInt16 nStyle )
{
@@ -875,8 +864,6 @@ void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType,
mpOutDev->EnableMapMode( bOldMapMode );
}
-
-
void DecorationView::DrawFrame( const Rectangle& rRect,
const Color& rLeftTopColor,
const Color& rRightBottomColor )
@@ -890,8 +877,6 @@ void DecorationView::DrawFrame( const Rectangle& rRect,
mpOutDev->EnableMapMode( bOldMapMode );
}
-
-
void DecorationView::DrawHighlightFrame( const Rectangle& rRect,
sal_uInt16 nStyle )
{
@@ -940,8 +925,6 @@ void DecorationView::DrawHighlightFrame( const Rectangle& rRect,
DrawFrame( rRect, aLightColor, aShadowColor );
}
-
-
Rectangle DecorationView::DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle )
{
Rectangle aRect = rRect;
@@ -975,8 +958,6 @@ Rectangle DecorationView::DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle )
return aRect;
}
-
-
Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle )
{
if ( rRect.IsEmpty() )
@@ -1056,8 +1037,6 @@ Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle
return aRect;
}
-
-
void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical )
{
Point aStart( rStart ), aStop( rStop );
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index c8ea35aade49..a341a8326f70 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -367,7 +367,6 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle )
// Now, all Dialogs are per default system windows !!!
nStyle |= WB_SYSTEMWINDOW;
-
// parent is NULL: get the default Dialog parent
if ( !pParent )
{
@@ -400,7 +399,6 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle )
else if( pParent == DIALOG_NO_PARENT )
pParent = NULL;
-
if ( !pParent || (nStyle & WB_SYSTEMWINDOW) ||
(pParent->mpWindowImpl->mpFrameData->mbNeedSysWindow && !(nSysWinMode & SYSTEMWINDOW_MODE_NOAUTOMODE)) ||
(nSysWinMode & SYSTEMWINDOW_MODE_DIALOG) )
@@ -1083,7 +1081,6 @@ void Dialog::SetModalInputMode( bool bModal )
// ensure continued modality of prev dialog
// do not change modality counter
-
// #i119994# need find the last modal dialog before reactive it
Dialog * pPrevModalDlg = mpPrevExecuteDlg;
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index cb43d3431b70..2ff228b5f773 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/debug.hxx>
#include <svdata.hxx>
@@ -38,8 +37,6 @@
using namespace ::com::sun::star;
-
-
static bool ImplHasIndirectTabParent( Window* pWindow )
{
// The window has inderect tab parent if it is included in tab hierarchy
@@ -50,8 +47,6 @@ static bool ImplHasIndirectTabParent( Window* pWindow )
&& ( pNonLayoutParent->ImplGetWindow()->GetStyle() & WB_CHILDDLGCTRL ) );
}
-
-
static Window* ImplGetTopParentOfTabHierarchy( Window* pParent )
{
// The method allows to find the most close parent containing all the
@@ -73,8 +68,6 @@ static Window* ImplGetTopParentOfTabHierarchy( Window* pParent )
return pResult;
}
-
-
static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex )
{
Window* pTabPage = NULL;
@@ -144,8 +137,6 @@ static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16&
return pFoundWindow;
}
-
-
static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable )
{
pParent = ImplGetTopParentOfTabHierarchy( pParent );
@@ -178,8 +169,6 @@ static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nI
return pWindow;
}
-
-
static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable )
{
Window* pWindow = ImplGetChildWindow( pParent, n+1, nIndex, bTestEnable );
@@ -191,8 +180,6 @@ static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIn
return pWindow;
}
-
-
Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType,
sal_uInt16 nFormStart, sal_uInt16 nFormEnd,
sal_uInt16* pIndex )
@@ -297,8 +284,6 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType,
return pWindow;
}
-
-
static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIndex,
sal_uInt16& rFormStart, sal_uInt16& rFormEnd )
{
@@ -393,8 +378,6 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt
return pSWindow;
}
-
-
static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode,
sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable = true )
{
@@ -485,8 +468,6 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Uni
return NULL;
}
-
-
void Window::ImplControlFocus( sal_uInt16 nFlags )
{
if ( nFlags & GETFOCUS_MNEMONIC )
@@ -528,8 +509,6 @@ void Window::ImplControlFocus( sal_uInt16 nFlags )
}
}
-
-
namespace
{
bool isSuitableDestination(Window *pWindow)
@@ -962,8 +941,6 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
return false;
}
-
-
// checks if this window has dialog control
bool Window::ImplHasDlgCtrl()
{
@@ -1013,8 +990,6 @@ if ( !pDlgCtrlParent || (GetStyle() & WB_NODIALOGCONTROL) || ((pDlgCtrlParent->G
pWindow->ImplControlFocus();
}
-
-
static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow,
bool bGetFocus )
{
@@ -1072,8 +1047,6 @@ static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow,
}
}
-
-
void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus )
{
if ( mpWindowImpl->mpDlgCtrlDownWindow && !bGetFocus )
@@ -1085,8 +1058,6 @@ void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus )
ImplDlgCtrlUpdateDefButton( this, pWindow, bGetFocus );
}
-
-
Window* Window::ImplFindDlgCtrlWindow( Window* pWindow )
{
sal_uInt16 nIndex;
@@ -1097,23 +1068,16 @@ Window* Window::ImplFindDlgCtrlWindow( Window* pWindow )
return ::ImplFindDlgCtrlWindow( this, pWindow, nIndex, nFormStart, nFormEnd );
}
-
-
-
Window* Window::GetParentLabelFor( const Window* ) const
{
return NULL;
}
-
-
Window* Window::GetParentLabeledBy( const Window* ) const
{
return NULL;
}
-
-
static sal_Unicode getAccel( const OUString& rStr )
{
sal_Unicode nChar = 0;
@@ -1215,8 +1179,6 @@ Window* Window::getLegacyNonLayoutAccessibleRelationLabelFor() const
return pWindow;
}
-
-
static Window* ImplGetLabeledBy( Window* pFrameWindow, WindowType nMyType, Window* pLabeled )
{
Window* pWindow = NULL;
@@ -1357,8 +1319,6 @@ Window* Window::getLegacyNonLayoutAccessibleRelationMemberOf() const
return pWindow;
}
-
-
KeyEvent Window::GetActivationKey() const
{
KeyEvent aKeyEvent;
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index 0e433ec165e4..449af42c0bc3 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <dndevdis.hxx>
#include <dndlcon.hxx>
#include <window.h>
@@ -33,20 +32,16 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::datatransfer::dnd;
-
// DNDEventDispatcher::DNDEventDispatcher
-
DNDEventDispatcher::DNDEventDispatcher( Window * pTopWindow ):
m_pTopWindow( pTopWindow ),
m_pCurrentWindow( NULL )
{
}
-
// DNDEventDispatcher::~DNDEventDispatcher
-
DNDEventDispatcher::~DNDEventDispatcher()
{
}
@@ -76,10 +71,8 @@ Window* DNDEventDispatcher::findTopLevelWindow(Point location)
return pChildWindow;
}
-
// DNDEventDispatcher::drop
-
void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde )
throw(RuntimeException, std::exception)
{
@@ -116,10 +109,8 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde )
m_aDataFlavorList.realloc( 0 );
}
-
// DNDEventDispatcher::dragEnter
-
void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtdee )
throw(RuntimeException, std::exception)
{
@@ -144,10 +135,8 @@ void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtd
}
-
// DNDEventDispatcher::dragExit
-
void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ )
throw(RuntimeException, std::exception)
{
@@ -160,10 +149,8 @@ void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ )
m_aDataFlavorList.realloc( 0 );
}
-
// DNDEventDispatcher::dragOver
-
void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde )
throw(RuntimeException, std::exception)
{
@@ -201,10 +188,8 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde )
}
}
-
// DNDEventDispatcher::dropActionChanged
-
void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& dtde )
throw(RuntimeException, std::exception)
{
@@ -242,11 +227,8 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent&
}
}
-
-
// DNDEventDispatcher::dragGestureRecognized
-
void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& dge )
throw(RuntimeException, std::exception)
{
@@ -259,35 +241,27 @@ void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent&
fireDragGestureEvent( pChildWindow, dge.DragSource, dge.Event, origin, dge.DragAction );
}
-
// DNDEventDispatcher::disposing
-
void SAL_CALL DNDEventDispatcher::disposing( const EventObject& )
throw(RuntimeException, std::exception)
{
}
-
// DNDEventDispatcher::acceptDrag
-
void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ ) throw(RuntimeException, std::exception)
{
}
-
// DNDEventDispatcher::rejectDrag
-
void SAL_CALL DNDEventDispatcher::rejectDrag() throw(RuntimeException, std::exception)
{
}
-
// DNDEventDispatcher::fireDragEnterEvent
-
sal_Int32 DNDEventDispatcher::fireDragEnterEvent( Window *pWindow,
const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction,
const Point& rLocation, const sal_Int8 nSourceActions, const Sequence< DataFlavor >& aFlavorList
@@ -320,10 +294,8 @@ sal_Int32 DNDEventDispatcher::fireDragEnterEvent( Window *pWindow,
return n;
}
-
// DNDEventDispatcher::fireDragOverEvent
-
sal_Int32 DNDEventDispatcher::fireDragOverEvent( Window *pWindow,
const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction,
const Point& rLocation, const sal_Int8 nSourceActions
@@ -353,10 +325,8 @@ sal_Int32 DNDEventDispatcher::fireDragOverEvent( Window *pWindow,
return n;
}
-
// DNDEventDispatcher::fireDragExitEvent
-
sal_Int32 DNDEventDispatcher::fireDragExitEvent( Window *pWindow ) throw(RuntimeException)
{
sal_Int32 n = 0;
@@ -380,10 +350,8 @@ sal_Int32 DNDEventDispatcher::fireDragExitEvent( Window *pWindow ) throw(Runtime
return n;
}
-
// DNDEventDispatcher::fireDropActionChangedEvent
-
sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( Window *pWindow,
const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction,
const Point& rLocation, const sal_Int8 nSourceActions
@@ -413,10 +381,8 @@ sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( Window *pWindow,
return n;
}
-
// DNDEventDispatcher::fireDropEvent
-
sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow,
const Reference< XDropTargetDropContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation,
const sal_Int8 nSourceActions, const Reference< XTransferable >& xTransferable
@@ -458,10 +424,8 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow,
return n;
}
-
// DNDEventDispatcher::fireDragGestureRecognized
-
sal_Int32 DNDEventDispatcher::fireDragGestureEvent( Window *pWindow,
const Reference< XDragSource >& xSource, const Any event,
const Point& rOrigin, const sal_Int8 nDragAction
diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx
index fee57ec8cb79..1f3459c371c4 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlcon.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <dndlcon.hxx>
using namespace ::cppu;
@@ -25,10 +24,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::datatransfer::dnd;
-
-
-
-
DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions )
: WeakComponentImplHelper4< XDragGestureRecognizer, XDropTargetDragContext, XDropTargetDropContext, XDropTarget >(GetMutex())
{
@@ -36,107 +31,83 @@ DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions )
m_nDefaultActions = nDefaultActions;
}
-
-
-
-
DNDListenerContainer::~DNDListenerContainer()
{
}
-
// DNDListenerContainer::addDragGestureListener
-
void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDragGestureListener >& dgl )
throw(RuntimeException, std::exception)
{
rBHelper.addListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl );
}
-
// DNDListenerContainer::removeDragGestureListener
-
void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< XDragGestureListener >& dgl )
throw(RuntimeException, std::exception)
{
rBHelper.removeListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl );
}
-
// DNDListenerContainer::resetRecognizer
-
void SAL_CALL DNDListenerContainer::resetRecognizer( )
throw(RuntimeException, std::exception)
{
}
-
// DNDListenerContainer::addDropTargetListener
-
void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDropTargetListener >& dtl )
throw(RuntimeException, std::exception)
{
rBHelper.addListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl );
}
-
// DNDListenerContainer::removeDropTargetListener
-
void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< XDropTargetListener >& dtl )
throw(RuntimeException, std::exception)
{
rBHelper.removeListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl );
}
-
// DNDListenerContainer::isActive
-
sal_Bool SAL_CALL DNDListenerContainer::isActive( )
throw(RuntimeException, std::exception)
{
return m_bActive;
}
-
// DNDListenerContainer::setActive
-
void SAL_CALL DNDListenerContainer::setActive( sal_Bool active )
throw(RuntimeException, std::exception)
{
m_bActive = active;
}
-
// DNDListenerContainer::getDefaultActions
-
sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions( )
throw(RuntimeException, std::exception)
{
return m_nDefaultActions;
}
-
// DNDListenerContainer::setDefaultActions
-
void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions )
throw(RuntimeException, std::exception)
{
m_nDefaultActions = actions;
}
-
// DNDListenerContainer::fireDropEvent
-
sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDropContext >& context,
sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions,
const Reference< XTransferable >& transferable )
@@ -206,10 +177,8 @@ sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDrop
return nRet;
}
-
// DNDListenerContainer::fireDragExitEvent
-
sal_uInt32 DNDListenerContainer::fireDragExitEvent()
{
sal_uInt32 nRet = 0;
@@ -250,10 +219,8 @@ sal_uInt32 DNDListenerContainer::fireDragExitEvent()
return nRet;
}
-
// DNDListenerContainer::fireDragOverEvent
-
sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTargetDragContext >& context,
sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions )
{
@@ -315,10 +282,8 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget
return nRet;
}
-
// DNDListenerContainer::fireDragEnterEvent
-
sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTargetDragContext >& context,
sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions,
const Sequence< DataFlavor >& dataFlavors )
@@ -381,10 +346,8 @@ sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTarge
return nRet;
}
-
// DNDListenerContainer::fireDropActionChangedEvent
-
sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XDropTargetDragContext >& context,
sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions )
{
@@ -446,10 +409,8 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD
return nRet;
}
-
// DNDListenerContainer::fireDragGestureEvent
-
sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_Int32 dragOriginX,
sal_Int32 dragOriginY, const Reference< XDragSource >& dragSource, const Any& triggerEvent )
{
@@ -492,10 +453,8 @@ sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_
return nRet;
}
-
// DNDListenerContainer::acceptDrag
-
void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (RuntimeException, std::exception)
{
if( m_xDropTargetDragContext.is() )
@@ -505,38 +464,30 @@ void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (
}
}
-
// DNDListenerContainer::rejectDrag
-
void SAL_CALL DNDListenerContainer::rejectDrag( ) throw (RuntimeException, std::exception)
{
// nothing to do here
}
-
// DNDListenerContainer::acceptDrop
-
void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) throw (RuntimeException, std::exception)
{
if( m_xDropTargetDropContext.is() )
m_xDropTargetDropContext->acceptDrop( dropOperation );
}
-
// DNDListenerContainer::rejectDrop
-
void SAL_CALL DNDListenerContainer::rejectDrop( ) throw (RuntimeException, std::exception)
{
// nothing to do here
}
-
// DNDListenerContainer::dropComplete
-
void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool success ) throw (RuntimeException, std::exception)
{
if( m_xDropTargetDropContext.is() )
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index e7c6d92a2fa1..6cdc73e08f9c 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <vcl/dockingarea.hxx>
#include <vcl/syswin.hxx>
#include <vcl/menu.hxx>
@@ -27,8 +26,6 @@
#include <map>
-
-
class DockingAreaWindow::ImplData
{
public:
@@ -47,8 +44,6 @@ DockingAreaWindow::ImplData::~ImplData()
{
}
-
-
static void ImplInitBackground( DockingAreaWindow* pThis )
{
const BitmapEx& rPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader();
@@ -96,8 +91,6 @@ DockingAreaWindow::~DockingAreaWindow()
delete mpImplData;
}
-
-
void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -109,8 +102,6 @@ void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
-
static void ImplInvalidateMenubar( DockingAreaWindow* pThis )
{
// due to a possible comon gradient covering menubar and top dockingarea
@@ -138,8 +129,6 @@ void DockingAreaWindow::StateChanged( StateChangedType nType )
ImplInvalidateMenubar( this );
}
-
-
bool DockingAreaWindow::IsHorizontal() const
{
return ( mpImplData->meAlign == WINDOWALIGN_TOP || mpImplData->meAlign == WINDOWALIGN_BOTTOM );
@@ -160,8 +149,6 @@ WindowAlign DockingAreaWindow::GetAlign() const
return mpImplData->meAlign;
}
-
-
void DockingAreaWindow::Paint( const Rectangle& )
{
EnableNativeWidget( true ); // only required because the toolkit curently switches this flag off
@@ -229,7 +216,6 @@ void DockingAreaWindow::Paint( const Rectangle& )
ranges[ aPos.X() ] = aSize.Width();
}
-
// draw multiple toolbar backgrounds, i.e., one for each toolbar line
for( std::map<int,int>::const_iterator it = ranges.begin(); it != ranges.end(); ++it )
{
@@ -263,6 +249,4 @@ void DockingAreaWindow::Resize()
Invalidate();
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index c4f369d9e667..a382e809b595 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/time.hxx>
#include <tools/rc.h>
@@ -36,7 +35,6 @@
#include <vcl/unowrap.hxx>
#include <vcl/settings.hxx>
-
#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_PINABLE | WB_ROLLABLE )
class ImplDockFloatWin2 : public FloatingWindow
@@ -154,7 +152,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl)
return 0;
}
-
IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl)
{
// called during move of a floating window
@@ -228,7 +225,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl)
return 0;
}
-
void ImplDockFloatWin2::Move()
{
if( mbInMove )
@@ -461,11 +457,9 @@ Rectangle DockingManager::GetPosSizePixel( const Window *pWindow )
return aRect;
}
-
// special floating window for popup mode
// main purpose: provides tear-off area for undocking
-
// if TEAROFF_DASHED defined a single dashed line is used
// otherwise multiple smaller lines will be painted
//#define TEAROFF_DASHED
@@ -555,7 +549,6 @@ Window* ImplPopupFloatWin::GetPreferredKeyInputWindow()
return FloatingWindow::GetPreferredKeyInputWindow();
}
-
void ImplPopupFloatWin::ImplSetBorder()
{
// although we have no border in the sense of a borderwindow
@@ -803,7 +796,6 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent& rTEvt )
}
}
-
ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow )
{
ImplInitData();
@@ -1220,7 +1212,6 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd)
return 0;
}
-
bool ImplDockingWindowWrapper::IsInPopupMode() const
{
if( GetFloatingWindow() )
@@ -1377,10 +1368,8 @@ Size ImplDockingWindowWrapper::GetSizePixel() const
return mpDockingWindow->GetSizePixel();
}
-
// old inlines from DockingWindow
-
void ImplDockingWindowWrapper::SetMinOutputSizePixel( const Size& rSize )
{
if ( mpFloatWin )
@@ -1400,7 +1389,6 @@ bool ImplDockingWindowWrapper::IsFloatingMode() const
return (mpFloatWin != NULL);
}
-
void ImplDockingWindowWrapper::SetDragArea( const Rectangle& rRect )
{
maDragArea = rRect;
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 36887e816f39..b8bc4988fd23 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/time.hxx>
#include <tools/rc.h>
#include <vcl/event.hxx>
@@ -33,7 +32,6 @@
#include <brdwin.hxx>
#include <salframe.hxx>
-
#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_PINABLE | WB_ROLLABLE )
class DockingWindow::ImplData
@@ -86,7 +84,6 @@ public:
sal_uLong GetLastTicks() const { return mnLastTicks; }
};
-
ImplDockFloatWin::ImplDockFloatWin( Window* pParent, WinBits nWinBits,
DockingWindow* pDockingWin ) :
FloatingWindow( pParent, nWinBits ),
@@ -184,7 +181,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl)
return 0;
}
-
void ImplDockFloatWin::Move()
{
if( mbInMove )
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 41e9bcdc022a..56bd19a08963 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svdata.hxx>
#include <brdwin.hxx>
#include <window.h>
@@ -33,7 +32,6 @@
#include <tools/rc.h>
#include <tools/debug.hxx>
-
class FloatingWindow::ImplData
{
public:
@@ -248,7 +246,6 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
aScreenRect = Application::GetScreenPosSizePixel(
Application::GetBestScreen( bRTL ? devRectRTL : devRect ) );
-
sal_uInt16 nArrangeAry[5];
sal_uInt16 nArrangeIndex;
bool bBreak;
@@ -747,7 +744,6 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId )
while ( pSVData->maWinData.mpFirstFloat && pSVData->maWinData.mpFirstFloat != this )
pSVData->maWinData.mpFirstFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL );
-
// delete window from the list
pSVData->maWinData.mpFirstFloat = mpNextFloat;
mpNextFloat = NULL;
diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index f49f8601a21d..fa311d3129b5 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <vcl/wrkwin.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/introwin.hxx>
@@ -26,18 +25,12 @@
#include <svdata.hxx>
#include <salframe.hxx>
-
-
-
-
void IntroWindow::ImplInitIntroWindowData()
{
ImplSVData* pSVData = ImplGetSVData();
pSVData->mpIntroWindow = this;
}
-
-
IntroWindow::IntroWindow( ) :
WorkWindow( WINDOW_INTROWINDOW )
{
@@ -45,8 +38,6 @@ IntroWindow::IntroWindow( ) :
WorkWindow::ImplInit( 0, WB_INTROWIN, NULL );
}
-
-
IntroWindow::~IntroWindow()
{
ImplSVData* pSVData = ImplGetSVData();
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index a31ba0a2b61d..78f9b863ca10 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <salinst.hxx>
#include <salframe.hxx>
#include <svdata.hxx>
@@ -27,8 +26,6 @@
#include <tools/rc.h>
-
-
static const sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] =
{
0, 0, 0, 0, // KEYFUNC_DONTKNOW
@@ -52,8 +49,6 @@ static const sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] =
0, 0, 0, 0 // KEYFUNC_FRONT
};
-
-
void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 )
{
sal_uInt16 nIndex = (sal_uInt16)eFunc;
@@ -64,8 +59,6 @@ void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2,
rCode4 = aImplKeyFuncTab[nIndex+3];
}
-
-
KeyCode::KeyCode( KeyFuncType eFunction )
{
sal_uInt16 nDummy;
@@ -73,8 +66,6 @@ KeyCode::KeyCode( KeyFuncType eFunction )
eFunc = eFunction;
}
-
-
KeyCode::KeyCode( const ResId& rResId )
: nCode(0)
, eFunc(KEYFUNC_DONTKNOW)
@@ -101,8 +92,6 @@ KeyCode::KeyCode( const ResId& rResId )
}
}
-
-
OUString KeyCode::GetName( Window* pWindow ) const
{
if ( !pWindow )
@@ -110,8 +99,6 @@ OUString KeyCode::GetName( Window* pWindow ) const
return pWindow ? pWindow->ImplGetFrame()->GetKeyName( GetFullCode() ) : "";
}
-
-
KeyFuncType KeyCode::GetFunction() const
{
if ( eFunc != KEYFUNC_DONTKNOW )
diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx
index bc84e210c550..c133d1d37d95 100644
--- a/vcl/source/window/keyevent.cxx
+++ b/vcl/source/window/keyevent.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/awt/KeyEvent.hpp>
#include <com/sun/star/awt/KeyModifier.hpp>
#include <tools/debug.hxx>
@@ -64,9 +63,6 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const
return aClone;
}
-
-
-
const Point& HelpEvent::GetMousePosPixel() const
{
//DBG_ASSERT( !mbKeyboardActivated, "Keyboard help has no mouse position !");
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 4c8a77694635..5ae34120ad43 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2047,7 +2047,6 @@ void MessageDialog::SetMessagesWidths(Window *pParent,
pPrimaryMessage->SetMaxTextWidth(pPrimaryMessage->approximate_char_width() * 60);
}
-
short MessageDialog::Execute()
{
setDeferredProperties();
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 6cd7e7c218bc..fb6f98203366 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "tools/debug.hxx"
#include "tools/diagnose_ex.h"
#include "tools/rc.h"
@@ -50,7 +49,6 @@
#include "salmenu.hxx"
#include "salframe.hxx"
-
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/i18n/XCharacterClassification.hpp>
#include <com/sun/star/lang/XComponent.hpp>
@@ -81,7 +79,6 @@ struct MenuLayoutData : public ControlLayoutData
using namespace ::com::sun::star;
using namespace vcl;
-
#define ITEMPOS_INVALID 0xFFFF
#define EXTRASPACEY 2
@@ -213,7 +210,6 @@ public:
void InsertSeparator(const OString &rIdent, size_t nPos);
void Remove( size_t nPos );
-
MenuItemData* GetData( sal_uInt16 nSVId, size_t& rPos ) const;
MenuItemData* GetData( sal_uInt16 nSVId ) const
{
@@ -240,8 +236,6 @@ public:
}
};
-
-
MenuItemList::~MenuItemList()
{
for( size_t i = 0, n = maItemList.size(); i < n; ++i )
@@ -477,11 +471,8 @@ size_t MenuItemList::GetItemCount( KeyCode aKeyCode ) const
return nItems;
}
-
-
// - MenuFloatingWindow -
-
class MenuFloatingWindow : public FloatingWindow
{
friend void Menu::ImplFillLayoutData() const;
@@ -671,13 +662,11 @@ void DecoToolBox::SetImages( long nMaxHeight, bool bForce )
(lastSize - maImage.GetSizePixel().Height())/2 ),
maImage.GetSizePixel() );
-
aBmpExDst.CopyPixel( aDestRect, aSrcRect, &aBmpExSrc );
SetItemImage( IID_DOCUMENTCLOSE, Image( aBmpExDst ) );
}
}
-
// a basic class for both (due to pActivePopup, Timer,...) would be nice,
// but a container class should have been created then, as they
// would be derived from different windows
@@ -1555,7 +1544,6 @@ sal_uInt16 Menu::GetItemId(const OString &rIdent) const
return MENU_ITEM_NOTFOUND;
}
-
sal_uInt16 Menu::GetItemPos( sal_uInt16 nItemId ) const
{
size_t nPos;
@@ -2336,8 +2324,6 @@ bool Menu::ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long&
return false;
}
-
-
void Menu::ImplAddDel( ImplMenuDelData& rDel )
{
DBG_ASSERT( !rDel.mpMenu, "Menu::ImplAddDel(): cannot add ImplMenuDelData twice !" );
@@ -2349,8 +2335,6 @@ void Menu::ImplAddDel( ImplMenuDelData& rDel )
}
}
-
-
void Menu::ImplRemoveDel( ImplMenuDelData& rDel )
{
rDel.mpMenu = NULL;
@@ -2370,8 +2354,6 @@ void Menu::ImplRemoveDel( ImplMenuDelData& rDel )
}
}
-
-
Size Menu::ImplCalcSize( const Window* pWin )
{
// | Check/Radio/Image| Text| Accel/Popup|
@@ -3137,7 +3119,6 @@ Rectangle Menu::GetCharacterBounds( sal_uInt16 nItemID, long nIndex ) const
return (mpLayoutData && nItemIndex != -1) ? mpLayoutData->GetCharacterBounds( nItemIndex+nIndex ) : Rectangle();
}
-
long Menu::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const
{
long nIndex = -1;
@@ -3250,11 +3231,8 @@ void Menu::HighlightItem( sal_uInt16 nItemPos )
}
}
-
-
// - MenuBar -
-
MenuBar::MenuBar() : Menu( true )
{
mbDisplayable = true;
@@ -3355,8 +3333,6 @@ bool MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu )
return bDone;
}
-
-
void MenuBar::SelectEntry( sal_uInt16 nId )
{
MenuBarWindow* pMenuWin = (MenuBarWindow*) ImplGetWindow();
@@ -3378,8 +3354,6 @@ void MenuBar::SelectEntry( sal_uInt16 nId )
}
}
-
-
// handler for native menu selection and command events
bool MenuBar::HandleMenuActivateEvent( Menu *pMenu ) const
@@ -3479,8 +3453,6 @@ bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId ) const
return static_cast<MenuBarWindow*>(pWindow)->HandleMenuButtonEvent( i_nButtonId );
}
-
-
// bool PopupMenu::bAnyPopupInExecute = false;
PopupMenu::PopupMenu()
@@ -3662,7 +3634,6 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong
// #102790# context menus shall never show disabled entries
nMenuFlags |= MENU_FLAG_HIDEDISABLEDENTRIES;
-
sal_uInt16 nVisibleEntries = ImplGetVisibleItemCount();
if ( !nVisibleEntries )
{
@@ -3895,7 +3866,6 @@ long PopupMenu::ImplCalcHeight( sal_uInt16 nEntries ) const
return nHeight;
}
-
static void ImplInitMenuWindow( Window* pWin, bool bFont, bool bMenuBar )
{
const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings();
@@ -4537,7 +4507,6 @@ void MenuFloatingWindow::ImplScroll( bool bUp )
nFirstEntry = pMenu->ImplGetNextVisible( nFirstEntry );
DBG_ASSERT( nFirstEntry != ITEMPOS_INVALID, "Scroll?!" );
-
if ( !bScrollUp )
{
bScrollUp = true;
@@ -4791,7 +4760,6 @@ Rectangle MenuFloatingWindow::ImplGetItemRect( sal_uInt16 nPos )
return aRect;
}
-
void MenuFloatingWindow::ImplCursorUpDown( bool bUp, bool bHomeEnd )
{
if( ! pMenu )
@@ -5374,7 +5342,6 @@ void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst )
}
}
-
void MenuBarWindow::KillActivePopup()
{
if ( pActivePopup )
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index e42cadaac73b..730e6a2af554 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
@@ -29,16 +28,11 @@
using namespace ::com::sun::star;
-
-
-
MnemonicGenerator::MnemonicGenerator()
{
memset( maMnemonics, 1, sizeof( maMnemonics ) );
}
-
-
sal_uInt16 MnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c )
{
static sal_uInt16 const aImplMnemonicRangeTab[MNEMONIC_RANGES*2] =
@@ -62,8 +56,6 @@ sal_uInt16 MnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c )
return MNEMONIC_INDEX_NOTFOUND;
}
-
-
sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey )
{
sal_Int32 nIndex = 0;
@@ -78,8 +70,6 @@ sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey )
return 0;
}
-
-
void MnemonicGenerator::RegisterMnemonic( const OUString& rKey )
{
const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale();
@@ -121,8 +111,6 @@ void MnemonicGenerator::RegisterMnemonic( const OUString& rKey )
}
}
-
-
OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
{
if ( _rKey.isEmpty() || ImplFindMnemonic( _rKey ) )
@@ -345,8 +333,6 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
return rKey;
}
-
-
uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass()
{
if ( !mxCharClass.is() )
@@ -354,8 +340,6 @@ uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass
return mxCharClass;
}
-
-
OUString MnemonicGenerator::EraseAllMnemonicChars( const OUString& rStr )
{
OUString aStr = rStr;
diff --git a/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx
index 2a8d25315cc4..b23b9c037b68 100644
--- a/vcl/source/window/mouseevent.cxx
+++ b/vcl/source/window/mouseevent.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/awt/MouseEvent.hpp>
#include <com/sun/star/awt/KeyModifier.hpp>
#include <com/sun/star/awt/MouseButton.hpp>
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 9efff517e601..7a3c597c40a0 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/rc.h>
#include <svids.hrc>
@@ -35,9 +34,6 @@
#include <vcl/mnemonic.hxx>
#include <vcl/settings.hxx>
-
-
-
static void ImplInitMsgBoxImageList()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -54,8 +50,6 @@ static void ImplInitMsgBoxImageList()
}
}
-
-
void MessBox::ImplInitMessBoxData()
{
mpVCLMultiLineEdit = NULL;
@@ -65,8 +59,6 @@ void MessBox::ImplInitMessBoxData()
mbCheck = false;
}
-
-
void MessBox::ImplInitButtons()
{
WinBits nStyle = GetStyle();
@@ -144,8 +136,6 @@ void MessBox::ImplInitButtons()
}
}
-
-
MessBox::MessBox( Window* pParent, WinBits nStyle,
const OUString& rTitle, const OUString& rMessage ) :
ButtonDialog( WINDOW_MESSBOX ),
@@ -159,8 +149,6 @@ MessBox::MessBox( Window* pParent, WinBits nStyle,
SetText( rTitle );
}
-
-
MessBox::MessBox( Window* pParent, const ResId& rResId ) :
ButtonDialog( WINDOW_MESSBOX )
{
@@ -182,8 +170,6 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) :
ImplInitButtons();
}
-
-
void MessBox::ImplLoadRes( const ResId& )
{
SetText( ReadStringRes() );
@@ -191,8 +177,6 @@ void MessBox::ImplLoadRes( const ResId& )
SetHelpText( ReadStringRes() );
}
-
-
MessBox::~MessBox()
{
delete mpVCLMultiLineEdit;
@@ -200,8 +184,6 @@ MessBox::~MessBox()
delete mpCheckBox;
}
-
-
void MessBox::ImplPosControls()
{
if ( !GetHelpId().isEmpty() )
@@ -397,8 +379,6 @@ void MessBox::ImplPosControls()
SetPageSizePixel( aPageSize );
}
-
-
void MessBox::StateChanged( StateChangedType nType )
{
if ( nType == STATE_CHANGE_INITSHOW )
@@ -408,31 +388,23 @@ void MessBox::StateChanged( StateChangedType nType )
ButtonDialog::StateChanged( nType );
}
-
-
bool MessBox::GetCheckBoxState() const
{
return mpCheckBox ? mpCheckBox->IsChecked() : mbCheck;
}
-
-
void MessBox::SetCheckBoxState( bool bCheck )
{
if( mpCheckBox ) mpCheckBox->Check( bCheck );
mbCheck = bCheck;
}
-
-
Size MessBox::GetOptimalSize() const
{
// FIXME: base me on the font size ?
return Size( 250, 100 );
}
-
-
void InfoBox::ImplInitInfoBoxData()
{
// Default Text is the display title from the application
@@ -442,40 +414,30 @@ void InfoBox::ImplInitInfoBoxData()
SetImage( InfoBox::GetStandardImage() );
}
-
-
InfoBox::InfoBox( Window* pParent, const OUString& rMessage ) :
MessBox( pParent, WB_OK | WB_DEF_OK, OUString(), rMessage )
{
ImplInitInfoBoxData();
}
-
-
InfoBox::InfoBox( Window* pParent, const ResId & rResId ) :
MessBox( pParent, rResId.SetRT( RSC_INFOBOX ) )
{
ImplInitInfoBoxData();
}
-
-
InfoBox::InfoBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) :
MessBox( pParent, nStyle, OUString(), rMessage )
{
ImplInitInfoBoxData();
}
-
-
Image InfoBox::GetStandardImage()
{
ImplInitMsgBoxImageList();
return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 4 );
}
-
-
void WarningBox::ImplInitWarningBoxData()
{
// Default Text is the display title from the application
@@ -485,8 +447,6 @@ void WarningBox::ImplInitWarningBoxData()
SetImage( WarningBox::GetStandardImage() );
}
-
-
WarningBox::WarningBox( Window* pParent, WinBits nStyle,
const OUString& rMessage ) :
MessBox( pParent, nStyle, OUString(), rMessage )
@@ -494,16 +454,12 @@ WarningBox::WarningBox( Window* pParent, WinBits nStyle,
ImplInitWarningBoxData();
}
-
-
WarningBox::WarningBox( Window* pParent, const ResId& rResId ) :
MessBox( pParent, rResId.SetRT( RSC_WARNINGBOX ) )
{
ImplInitWarningBoxData();
}
-
-
void WarningBox::SetDefaultCheckBoxText()
{
ResMgr* pResMgr = ImplGetResMgr();
@@ -511,16 +467,12 @@ void WarningBox::SetDefaultCheckBoxText()
maCheckBoxText = ResId(SV_STDTEXT_DONTWARNAGAIN, *pResMgr).toString();
}
-
-
Image WarningBox::GetStandardImage()
{
ImplInitMsgBoxImageList();
return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 3 );
}
-
-
void ErrorBox::ImplInitErrorBoxData()
{
// Default Text is the display title from the application
@@ -530,8 +482,6 @@ void ErrorBox::ImplInitErrorBoxData()
SetImage( ErrorBox::GetStandardImage() );
}
-
-
ErrorBox::ErrorBox( Window* pParent, WinBits nStyle,
const OUString& rMessage ) :
MessBox( pParent, nStyle, OUString(), rMessage )
@@ -539,16 +489,12 @@ ErrorBox::ErrorBox( Window* pParent, WinBits nStyle,
ImplInitErrorBoxData();
}
-
-
ErrorBox::ErrorBox( Window* pParent, const ResId& rResId ) :
MessBox( pParent, rResId.SetRT( RSC_ERRORBOX ) )
{
ImplInitErrorBoxData();
}
-
-
Image ErrorBox::GetStandardImage()
{
try
@@ -564,8 +510,6 @@ Image ErrorBox::GetStandardImage()
return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 1 );
}
-
-
void QueryBox::ImplInitQueryBoxData()
{
// Default Text is the display title from the application
@@ -575,24 +519,18 @@ void QueryBox::ImplInitQueryBoxData()
SetImage( QueryBox::GetStandardImage() );
}
-
-
QueryBox::QueryBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) :
MessBox( pParent, nStyle, OUString(), rMessage )
{
ImplInitQueryBoxData();
}
-
-
QueryBox::QueryBox( Window* pParent, const ResId& rResId ) :
MessBox( pParent, rResId.SetRT( RSC_QUERYBOX ) )
{
ImplInitQueryBoxData();
}
-
-
void QueryBox::SetDefaultCheckBoxText()
{
ResMgr* pResMgr = ImplGetResMgr();
@@ -600,8 +538,6 @@ void QueryBox::SetDefaultCheckBoxText()
maCheckBoxText = ResId(SV_STDTEXT_DONTASKAGAIN, *pResMgr).toString();
}
-
-
Image QueryBox::GetStandardImage()
{
ImplInitMsgBoxImageList();
diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx
index 2cf4c059a15c..9ce03cea4f0b 100644
--- a/vcl/source/window/popupmenuwindow.cxx
+++ b/vcl/source/window/popupmenuwindow.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "vcl/popupmenuwindow.hxx"
#include <limits>
@@ -39,8 +38,6 @@ PopupMenuFloatingWindow::ImplData::~ImplData()
{
}
-
-
PopupMenuFloatingWindow::PopupMenuFloatingWindow( Window* pParent, WinBits nStyle ) :
FloatingWindow(pParent, nStyle),
mpImplData(new ImplData)
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 7f7cbd8468ea..e7a4284b12b7 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -267,7 +267,6 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap()
aOrigSize.Height() = aLogicSize.Height();
double fScale = double(aLogicSize.Width())/double(aOrigSize.Width());
-
maPageVDev.Erase();
maPageVDev.Push();
maPageVDev.SetMapMode( MAP_100TH_MM );
@@ -1249,7 +1248,6 @@ void PrintDialog::checkOptionalControlDependencies()
}
}
-
bool bIsEnabled = it->first->IsEnabled();
// Enable does not do a change check first, so can be less cheap than expected
if( bShouldbeEnabled != bIsEnabled )
@@ -1861,12 +1859,8 @@ void PrintDialog::previewBackward()
mpPageEdit->Down();
}
-
-
// PrintProgressDialog
-
-
PrintProgressDialog::PrintProgressDialog(Window* i_pParent, int i_nMax)
: ModelessDialog(i_pParent, "PrintProgressDialog",
"vcl/ui/printprogressdialog.ui")
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 6796d0a6711a..6a44ee41777b 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <limits.h>
#include <tools/time.hxx>
#include <tools/debug.hxx>
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index fc5e257a247b..c1fcbe938ce9 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <vcl/window.hxx>
#include <vcl/seleng.hxx>
#include <tools/debug.hxx>
@@ -26,16 +25,13 @@ FunctionSet::~FunctionSet()
{
}
-
inline bool SelectionEngine::ShouldDeselect( bool bModifierKey1 ) const
{
return eSelMode != MULTIPLE_SELECTION || !bModifierKey1;
}
-
// TODO: throw out FunctionSet::SelectAtPoint
-
SelectionEngine::SelectionEngine( Window* pWindow, FunctionSet* pFuncSet,
sal_uLong nAutoRepeatInterval ) :
pWin( pWindow ),
@@ -50,13 +46,11 @@ SelectionEngine::SelectionEngine( Window* pWindow, FunctionSet* pFuncSet,
aWTimer.SetTimeout( nUpdateInterval );
}
-
SelectionEngine::~SelectionEngine()
{
aWTimer.Stop();
}
-
IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog)
{
if ( !aArea.IsInside( aLastMove.GetPosPixel() ) )
@@ -64,13 +58,11 @@ IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog)
return 0;
}
-
void SelectionEngine::SetSelectionMode( SelectionMode eMode )
{
eSelMode = eMode;
}
-
void SelectionEngine::CursorPosChanging( bool bShift, bool bMod1 )
{
if ( !pFunctionSet )
@@ -119,7 +111,6 @@ void SelectionEngine::CursorPosChanging( bool bShift, bool bMod1 )
}
}
-
bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
{
nFlags &= (~SELENG_CMDEVT);
@@ -242,7 +233,6 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
return false;
}
-
bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt )
{
aWTimer.Stop();
@@ -286,7 +276,6 @@ bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt )
return true;
}
-
bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt )
{
@@ -319,7 +308,6 @@ bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt )
return true;
}
-
void SelectionEngine::SetWindow( Window* pNewWin )
{
if( pNewWin != pWin )
@@ -332,7 +320,6 @@ void SelectionEngine::SetWindow( Window* pNewWin )
}
}
-
void SelectionEngine::Reset()
{
aWTimer.Stop();
@@ -342,7 +329,6 @@ void SelectionEngine::Reset()
nLockedMods = 0;
}
-
void SelectionEngine::Command( const CommandEvent& rCEvt )
{
// Timer aWTimer is active during enlarging a selection
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 05d7d4b62c03..1fa4e6ee37e1 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -49,8 +49,6 @@ namespace
};
}
-
-
void Splitter::ImplInitSplitterData()
{
ImplGetWindowImpl()->mbSplitter = true;
@@ -64,8 +62,6 @@ void Splitter::ImplInitSplitterData()
mnKeyboardStepSize = SPLITTER_DEFAULTSTEPSIZE;
}
-
-
// Should only be called from a ImplInit method for initialization or
// after checking bNew is different from the current mbHorzSplit value.
// The public method that does that check is Splitter::SetHorizontal().
@@ -90,8 +86,6 @@ void Splitter::ImplInitHorVer(bool bNew)
SetPointer( Pointer( ePointerStyle ) );
}
-
-
void Splitter::ImplInit( Window* pParent, WinBits nWinStyle )
{
Window::ImplInit( pParent, nWinStyle, NULL );
@@ -109,8 +103,6 @@ void Splitter::ImplInit( Window* pParent, WinBits nWinStyle )
pTList->AddWindow( this );
}
-
-
void Splitter::ImplSplitMousePos( Point& rPos )
{
if ( mbHorzSplit )
@@ -129,8 +121,6 @@ void Splitter::ImplSplitMousePos( Point& rPos )
}
}
-
-
void Splitter::ImplDrawSplitter()
{
Rectangle aInvRect( maDragRect );
@@ -149,8 +139,6 @@ void Splitter::ImplDrawSplitter()
mpRefWin->InvertTracking( mpRefWin->PixelToLogic(aInvRect), SHOWTRACK_SPLIT );
}
-
-
Splitter::Splitter( Window* pParent, WinBits nStyle ) :
Window( WINDOW_SPLITTER )
{
@@ -161,8 +149,6 @@ Splitter::Splitter( Window* pParent, WinBits nStyle ) :
SetFillColor();
}
-
-
Splitter::Splitter( Window* pParent, const ResId& rResId ) :
Window( WINDOW_SPLITTER )
{
@@ -179,16 +165,12 @@ Splitter::Splitter( Window* pParent, const ResId& rResId ) :
Show();
}
-
-
Splitter::~Splitter()
{
TaskPaneList *pTList = GetSystemWindow()->GetTaskPaneList();
pTList->RemoveWindow( this );
}
-
-
void Splitter::SetHorizontal(bool bNew)
{
if(bNew != (bool)mbHorzSplit)
@@ -197,15 +179,11 @@ void Splitter::SetHorizontal(bool bNew)
}
}
-
-
void Splitter::SetKeyboardStepSize( long nStepSize )
{
mnKeyboardStepSize = nStepSize;
}
-
-
Splitter* Splitter::ImplFindSibling()
{
// look for another splitter with the same parent but different orientation
@@ -224,8 +202,6 @@ Splitter* Splitter::ImplFindSibling()
return NULL;
}
-
-
bool Splitter::ImplSplitterActive()
{
// is splitter in document or at scrollbar handle ?
@@ -249,8 +225,6 @@ bool Splitter::ImplSplitterActive()
return bActive;
}
-
-
void Splitter::MouseButtonDown( const MouseEvent& rMEvt )
{
if ( rMEvt.GetClicks() == 2 )
@@ -280,8 +254,6 @@ void Splitter::MouseButtonDown( const MouseEvent& rMEvt )
StartDrag();
}
-
-
void Splitter::Tracking( const TrackingEvent& rTEvt )
{
if ( rTEvt.IsTrackingEnded() )
@@ -356,8 +328,6 @@ void Splitter::Tracking( const TrackingEvent& rTEvt )
}
}
-
-
void Splitter::ImplKbdTracking( KeyCode aKeyCode )
{
sal_uInt16 nCode = aKeyCode.GetCode();
@@ -473,36 +443,26 @@ void Splitter::ImplKbdTracking( KeyCode aKeyCode )
}
}
-
-
void Splitter::StartSplit()
{
maStartSplitHdl.Call( this );
}
-
-
void Splitter::Split()
{
maSplitHdl.Call( this );
}
-
-
void Splitter::EndSplit()
{
if ( maEndSplitHdl.IsSet() )
maEndSplitHdl.Call( this );
}
-
-
void Splitter::Splitting( Point& /* rSplitPos */ )
{
}
-
-
void Splitter::SetDragRectPixel( const Rectangle& rDragRect, Window* _pRefWin )
{
maDragRect = rDragRect;
@@ -512,15 +472,11 @@ void Splitter::SetDragRectPixel( const Rectangle& rDragRect, Window* _pRefWin )
mpRefWin = _pRefWin;
}
-
-
void Splitter::SetSplitPosPixel( long nNewPos )
{
mnSplitPos = nNewPos;
}
-
-
void Splitter::StartDrag()
{
if ( IsTracking() )
@@ -546,9 +502,6 @@ void Splitter::StartDrag()
ImplDrawSplitter();
}
-
-
-
void Splitter::ImplStartKbdSplitting()
{
if( mbKbdSplitting )
@@ -577,8 +530,6 @@ void Splitter::ImplStartKbdSplitting()
mnStartSplitPos = maDragPos.Y();
}
-
-
void Splitter::ImplRestoreSplitter()
{
// set splitter in the center of the ref window
@@ -607,9 +558,6 @@ void Splitter::ImplRestoreSplitter()
EndSplit();
}
-
-
-
void Splitter::GetFocus()
{
if( !ImplSplitterActive() )
@@ -618,8 +566,6 @@ void Splitter::GetFocus()
Invalidate();
}
-
-
void Splitter::LoseFocus()
{
if( mbKbdSplitting )
@@ -631,8 +577,6 @@ void Splitter::LoseFocus()
Invalidate();
}
-
-
void Splitter::KeyInput( const KeyEvent& rKEvt )
{
if( mbInKeyEvent )
@@ -732,15 +676,11 @@ void Splitter::KeyInput( const KeyEvent& rKEvt )
mbInKeyEvent = 0;
}
-
-
bool Splitter::Notify( NotifyEvent& rNEvt )
{
return Window::Notify( rNEvt );
}
-
-
void Splitter::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -762,8 +702,6 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
-
void Splitter::Paint( const Rectangle& rPaintRect )
{
DrawRect( rPaintRect );
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index cabfb25ac7a0..b2882202aff9 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <tools/debug.hxx>
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index e492500e0c2b..0b8502e3af08 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/debug.hxx>
#include <tools/rc.h>
@@ -32,8 +31,6 @@
#include <svdata.hxx>
#include <window.h>
-
-
#define STATUSBAR_OFFSET_X STATUSBAR_OFFSET
#define STATUSBAR_OFFSET_Y 2
#define STATUSBAR_OFFSET_TEXTY 3
@@ -42,8 +39,6 @@
#define STATUSBAR_PRGS_COUNT 100
#define STATUSBAR_PRGS_MIN 5
-
-
class StatusBar::ImplData
{
public:
@@ -84,15 +79,11 @@ struct ImplStatusItem
OUString maCommand;
};
-
-
inline long ImplCalcProgessWidth( sal_uInt16 nMax, long nSize )
{
return ((nMax*(nSize+(nSize/2)))-(nSize/2)+(STATUSBAR_PRGS_OFFSET*2));
}
-
-
static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize,
sal_uInt16 nStyle )
{
@@ -112,8 +103,6 @@ static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize,
return Point( nX, nY );
}
-
-
bool StatusBar::ImplIsItemUpdate()
{
if ( !mbProgressMode && mbVisibleItems && IsReallyVisible() && IsUpdateMode() )
@@ -122,8 +111,6 @@ bool StatusBar::ImplIsItemUpdate()
return false;
}
-
-
void StatusBar::ImplInit( Window* pParent, WinBits nStyle )
{
mpImplData = new ImplData;
@@ -155,16 +142,12 @@ void StatusBar::ImplInit( Window* pParent, WinBits nStyle )
SetOutputSizePixel( CalcWindowSizePixel() );
}
-
-
StatusBar::StatusBar( Window* pParent, WinBits nStyle ) :
Window( WINDOW_STATUSBAR )
{
ImplInit( pParent, nStyle );
}
-
-
StatusBar::~StatusBar()
{
// delete all items
@@ -178,8 +161,6 @@ StatusBar::~StatusBar()
delete mpImplData;
}
-
-
void StatusBar::ImplInitSettings( bool bFont,
bool bForeground, bool bBackground )
{
@@ -233,8 +214,6 @@ void StatusBar::ImplInitSettings( bool bFont,
}
}
-
-
void StatusBar::ImplFormat()
{
ImplStatusItem* pItem;
@@ -309,8 +288,6 @@ void StatusBar::ImplFormat()
mbFormat = false;
}
-
-
Rectangle StatusBar::ImplGetItemRectPos( sal_uInt16 nPos ) const
{
Rectangle aRect;
@@ -330,8 +307,6 @@ Rectangle StatusBar::ImplGetItemRectPos( sal_uInt16 nPos ) const
return aRect;
}
-
-
sal_uInt16 StatusBar::ImplGetFirstVisiblePos() const
{
ImplStatusItem* pItem;
@@ -349,8 +324,6 @@ sal_uInt16 StatusBar::ImplGetFirstVisiblePos() const
return ~0;
}
-
-
void StatusBar::ImplDrawText( bool bOffScreen, long nOldTextWidth )
{
// prevent item box from being overwritten
@@ -386,8 +359,6 @@ void StatusBar::ImplDrawText( bool bOffScreen, long nOldTextWidth )
}
}
-
-
void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, bool bDrawFrame )
{
Rectangle aRect = ImplGetItemRectPos( nPos );
@@ -487,8 +458,6 @@ void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText,
ImplCallEventListeners( VCLEVENT_STATUSBAR_DRAWITEM, (void*) sal_IntPtr(pItem->mnId) );
}
-
-
void DrawProgress( Window* pWindow, const Point& rPos,
long nOffset, long nPrgsWidth, long nPrgsHeight,
sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount,
@@ -605,8 +574,6 @@ void DrawProgress( Window* pWindow, const Point& rPos,
}
}
-
-
void StatusBar::ImplDrawProgress( bool bPaint,
sal_uInt16 nPercent1, sal_uInt16 nPercent2 )
{
@@ -634,8 +601,6 @@ void StatusBar::ImplDrawProgress( bool bPaint,
nPercent1*100, nPercent2*100, mnPercentCount, maPrgsFrameRect );
}
-
-
void StatusBar::ImplCalcProgressRect()
{
// calculate text size
@@ -688,8 +653,6 @@ void StatusBar::ImplCalcProgressRect()
maPrgsTxtPos.Y() = mnTextY;
}
-
-
void StatusBar::MouseButtonDown( const MouseEvent& rMEvt )
{
// trigger toolbox only for left mouse button
@@ -727,8 +690,6 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt )
}
}
-
-
void StatusBar::Paint( const Rectangle& )
{
if ( mbFormat )
@@ -759,15 +720,11 @@ void StatusBar::Paint( const Rectangle& )
DrawLine( Point( 0, 0 ), Point( mnDX-1, 0 ) );
}
-
-
void StatusBar::Move()
{
Window::Move();
}
-
-
void StatusBar::Resize()
{
// save width and height
@@ -788,8 +745,6 @@ void StatusBar::Resize()
Invalidate();
}
-
-
void StatusBar::RequestHelp( const HelpEvent& rHEvt )
{
// no keyboard help in status bar
@@ -855,8 +810,6 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt )
Window::RequestHelp( rHEvt );
}
-
-
void StatusBar::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
@@ -884,8 +837,6 @@ void StatusBar::StateChanged( StateChangedType nType )
}
}
-
-
void StatusBar::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -917,30 +868,22 @@ void StatusBar::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
-
void StatusBar::Click()
{
ImplCallEventListeners( VCLEVENT_STATUSBAR_CLICK );
maClickHdl.Call( this );
}
-
-
void StatusBar::DoubleClick()
{
ImplCallEventListeners( VCLEVENT_STATUSBAR_DOUBLECLICK );
maDoubleClickHdl.Call( this );
}
-
-
void StatusBar::UserDraw( const UserDrawEvent& )
{
}
-
-
void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth,
StatusBarItemBits nBits,
long nOffset, sal_uInt16 nPos )
@@ -979,8 +922,6 @@ void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth,
ImplCallEventListeners( VCLEVENT_STATUSBAR_ITEMADDED, (void*) sal_IntPtr(nItemId) );
}
-
-
void StatusBar::RemoveItem( sal_uInt16 nItemId )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -997,8 +938,6 @@ void StatusBar::RemoveItem( sal_uInt16 nItemId )
}
}
-
-
void StatusBar::ShowItem( sal_uInt16 nItemId )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1019,8 +958,6 @@ void StatusBar::ShowItem( sal_uInt16 nItemId )
}
}
-
-
void StatusBar::HideItem( sal_uInt16 nItemId )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1041,8 +978,6 @@ void StatusBar::HideItem( sal_uInt16 nItemId )
}
}
-
-
bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) const
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1068,15 +1003,11 @@ void StatusBar::Clear()
ImplCallEventListeners( VCLEVENT_STATUSBAR_ALLITEMSREMOVED );
}
-
-
sal_uInt16 StatusBar::GetItemCount() const
{
return (sal_uInt16)mpItemList->size();
}
-
-
sal_uInt16 StatusBar::GetItemId( sal_uInt16 nPos ) const
{
if ( nPos < mpItemList->size() )
@@ -1084,8 +1015,6 @@ sal_uInt16 StatusBar::GetItemId( sal_uInt16 nPos ) const
return 0;
}
-
-
sal_uInt16 StatusBar::GetItemPos( sal_uInt16 nItemId ) const
{
for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) {
@@ -1097,8 +1026,6 @@ sal_uInt16 StatusBar::GetItemPos( sal_uInt16 nItemId ) const
return STATUSBAR_ITEM_NOTFOUND;
}
-
-
sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const
{
if ( AreItemsVisible() && !mbFormat )
@@ -1117,8 +1044,6 @@ sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const
return 0;
}
-
-
Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const
{
Rectangle aRect;
@@ -1142,8 +1067,6 @@ Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const
return aRect;
}
-
-
Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const
{
if ( !mbFormat )
@@ -1172,8 +1095,6 @@ Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const
return Point();
}
-
-
sal_uLong StatusBar::GetItemWidth( sal_uInt16 nItemId ) const
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1184,8 +1105,6 @@ sal_uLong StatusBar::GetItemWidth( sal_uInt16 nItemId ) const
return 0;
}
-
-
StatusBarItemBits StatusBar::GetItemBits( sal_uInt16 nItemId ) const
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1196,8 +1115,6 @@ StatusBarItemBits StatusBar::GetItemBits( sal_uInt16 nItemId ) const
return 0;
}
-
-
long StatusBar::GetItemOffset( sal_uInt16 nItemId ) const
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1208,8 +1125,6 @@ long StatusBar::GetItemOffset( sal_uInt16 nItemId ) const
return 0;
}
-
-
void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1244,8 +1159,6 @@ void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText )
}
}
-
-
const OUString& StatusBar::GetItemText( sal_uInt16 nItemId ) const
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1255,8 +1168,6 @@ const OUString& StatusBar::GetItemText( sal_uInt16 nItemId ) const
return (*mpItemList)[ nPos ]->maText;
}
-
-
void StatusBar::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1270,8 +1181,6 @@ void StatusBar::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand )
}
}
-
-
const OUString StatusBar::GetItemCommand( sal_uInt16 nItemId )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1282,8 +1191,6 @@ const OUString StatusBar::GetItemCommand( sal_uInt16 nItemId )
return OUString();
}
-
-
void StatusBar::SetItemData( sal_uInt16 nItemId, void* pNewData )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1333,8 +1240,6 @@ void StatusBar::RedrawItem( sal_uInt16 nItemId )
}
}
-
-
void StatusBar::SetHelpText( sal_uInt16 nItemId, const OUString& rText )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1343,8 +1248,6 @@ void StatusBar::SetHelpText( sal_uInt16 nItemId, const OUString& rText )
(*mpItemList)[ nPos ]->maHelpText = rText;
}
-
-
const OUString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1367,8 +1270,6 @@ const OUString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const
return pItem->maHelpText;
}
-
-
void StatusBar::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1377,8 +1278,6 @@ void StatusBar::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText )
(*mpItemList)[ nPos ]->maQuickHelpText = rText;
}
-
-
const OUString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1389,8 +1288,6 @@ const OUString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const
return pItem->maQuickHelpText;
}
-
-
void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1399,8 +1296,6 @@ void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId )
(*mpItemList)[ nPos ]->maHelpId = rHelpId;
}
-
-
OString StatusBar::GetHelpId( sal_uInt16 nItemId ) const
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1444,8 +1339,6 @@ void StatusBar::StartProgressMode( const OUString& rText )
}
}
-
-
void StatusBar::SetProgressValue( sal_uInt16 nNewPercent )
{
DBG_ASSERT( mbProgressMode, "StatusBar::SetProgressValue(): no progrss mode" );
@@ -1463,8 +1356,6 @@ void StatusBar::SetProgressValue( sal_uInt16 nNewPercent )
mnPercent = nNewPercent;
}
-
-
void StatusBar::EndProgressMode()
{
DBG_ASSERT( mbProgressMode, "StatusBar::EndProgressMode(): no progress mode" );
@@ -1482,8 +1373,6 @@ void StatusBar::EndProgressMode()
}
}
-
-
void StatusBar::SetText( const OUString& rText )
{
if ( (!mbVisibleItems || (GetStyle() & WB_RIGHT)) && !mbProgressMode &&
@@ -1517,8 +1406,6 @@ void StatusBar::SetText( const OUString& rText )
Window::SetText( rText );
}
-
-
Size StatusBar::CalcWindowSizePixel() const
{
size_t i = 0;
@@ -1573,9 +1460,6 @@ Size StatusBar::CalcWindowSizePixel() const
return Size( nCalcWidth, nCalcHeight );
}
-
-
-
void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1592,8 +1476,6 @@ void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName )
}
}
-
-
const OUString& StatusBar::GetAccessibleName( sal_uInt16 nItemId ) const
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1603,6 +1485,4 @@ const OUString& StatusBar::GetAccessibleName( sal_uInt16 nItemId ) const
return (*mpItemList)[ nPos ]->maAccessibleName;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 32c26c097a48..f70d25c67886 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -52,8 +52,6 @@
using namespace ::com::sun::star;
-
-
long ImplSysChildProc( void* pInst, SalObject* /* pObject */,
sal_uInt16 nEvent, const void* /* pEvent */ )
{
@@ -109,8 +107,6 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject */,
return nRet;
}
-
-
void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow )
{
mpWindowImpl->mpSysObj = ImplGetSVData()->mpDefInst->CreateObject( pParent->ImplGetFrame(), pData, bShow );
@@ -126,24 +122,18 @@ void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, Syste
}
}
-
-
SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle ) :
Window( WINDOW_SYSTEMCHILDWINDOW )
{
ImplInitSysChild( pParent, nStyle, NULL );
}
-
-
SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) :
Window( WINDOW_SYSTEMCHILDWINDOW )
{
ImplInitSysChild( pParent, nStyle, pData, bShow );
}
-
-
SystemChildWindow::~SystemChildWindow()
{
Hide();
@@ -154,8 +144,6 @@ SystemChildWindow::~SystemChildWindow()
}
}
-
-
const SystemEnvData* SystemChildWindow::GetSystemData() const
{
if ( mpWindowImpl->mpSysObj )
@@ -164,16 +152,12 @@ const SystemEnvData* SystemChildWindow::GetSystemData() const
return NULL;
}
-
-
void SystemChildWindow::EnableEraseBackground( bool bEnable )
{
if ( mpWindowImpl->mpSysObj )
mpWindowImpl->mpSysObj->EnableEraseBackground( bEnable );
}
-
-
void SystemChildWindow::ImplTestJavaException( void* pEnv )
{
#if HAVE_FEATURE_JAVA
@@ -212,8 +196,6 @@ void SystemChildWindow::SetForwardKey( bool bEnable )
mpWindowImpl->mpSysObj->SetForwardKey( bEnable );
}
-
-
sal_IntPtr SystemChildWindow::GetParentWindowHandle( bool bUseJava )
{
sal_IntPtr nRet = 0;
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 06635c8e7bb9..d24f76bbdfbb 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -40,7 +40,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-
class SystemWindow::ImplData
{
public:
@@ -65,8 +64,6 @@ SystemWindow::ImplData::~ImplData()
delete mpTaskPaneList;
}
-
-
SystemWindow::SystemWindow( WindowType nType ) :
Window( nType )
{
@@ -91,8 +88,6 @@ SystemWindow::~SystemWindow()
mpImplData = NULL;
}
-
-
bool SystemWindow::Notify( NotifyEvent& rNEvt )
{
// capture KeyEvents for menu handling
@@ -112,8 +107,6 @@ bool SystemWindow::Notify( NotifyEvent& rNEvt )
return Window::Notify( rNEvt );
}
-
-
bool SystemWindow::PreNotify( NotifyEvent& rNEvt )
{
// capture KeyEvents for taskpane cycling
@@ -156,8 +149,6 @@ bool SystemWindow::PreNotify( NotifyEvent& rNEvt )
return Window::PreNotify( rNEvt );
}
-
-
TaskPaneList* SystemWindow::GetTaskPaneList()
{
if( mpImplData->mpTaskPaneList )
@@ -178,8 +169,6 @@ TaskPaneList* SystemWindow::GetTaskPaneList()
}
}
-
-
bool SystemWindow::Close()
{
ImplDelData aDelData;
@@ -207,32 +196,22 @@ bool SystemWindow::Close()
return true;
}
-
-
void SystemWindow::TitleButtonClick( sal_uInt16 )
{
}
-
-
void SystemWindow::Pin()
{
}
-
-
void SystemWindow::Roll()
{
}
-
-
void SystemWindow::Resizing( Size& )
{
}
-
-
void SystemWindow::SetRepresentedURL( const OUString& i_rURL )
{
bool bChanged = (i_rURL != mpImplData->maRepresentedURL);
@@ -248,8 +227,6 @@ void SystemWindow::SetRepresentedURL( const OUString& i_rURL )
}
}
-
-
void SystemWindow::SetIcon( sal_uInt16 nIcon )
{
if ( mnIcon == nIcon )
@@ -268,8 +245,6 @@ void SystemWindow::SetIcon( sal_uInt16 nIcon )
}
}
-
-
void SystemWindow::EnableSaveBackground( bool bSave )
{
if( ImplGetSVData()->maWinData.mbNoSaveBackground )
@@ -286,8 +261,6 @@ void SystemWindow::EnableSaveBackground( bool bSave )
}
}
-
-
bool SystemWindow::IsSaveBackgroundEnabled() const
{
const Window* pWindow = this;
@@ -299,8 +272,6 @@ bool SystemWindow::IsSaveBackgroundEnabled() const
return false;
}
-
-
void SystemWindow::ShowTitleButton( sal_uInt16 nButton, bool bVisible )
{
if ( nButton == TITLE_BUTTON_DOCKING )
@@ -330,8 +301,6 @@ void SystemWindow::ShowTitleButton( sal_uInt16 nButton, bool bVisible )
return;
}
-
-
bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const
{
if ( nButton == TITLE_BUTTON_DOCKING )
@@ -340,8 +309,6 @@ bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const
return mbHideBtn;
}
-
-
void SystemWindow::SetPin( bool bPin )
{
if ( bPin != mbPinned )
@@ -352,8 +319,6 @@ void SystemWindow::SetPin( bool bPin )
}
}
-
-
void SystemWindow::RollUp()
{
if ( !mbRollUp )
@@ -372,8 +337,6 @@ void SystemWindow::RollUp()
}
}
-
-
void SystemWindow::RollDown()
{
if ( mbRollUp )
@@ -386,8 +349,6 @@ void SystemWindow::RollDown()
}
}
-
-
void SystemWindow::SetMinOutputSizePixel( const Size& rSize )
{
maMinOutSize = rSize;
@@ -401,8 +362,6 @@ void SystemWindow::SetMinOutputSizePixel( const Size& rSize )
mpWindowImpl->mpFrame->SetMinClientSize( rSize.Width(), rSize.Height() );
}
-
-
void SystemWindow::SetMaxOutputSizePixel( const Size& rSize )
{
Size aSize( rSize );
@@ -427,7 +386,6 @@ const Size& SystemWindow::GetMaxOutputSizePixel() const
return mpImplData->maMaxOutSize;
}
-
Size SystemWindow::GetResizeOutputSizePixel() const
{
Size aSize = GetOutputSizePixel();
@@ -438,8 +396,6 @@ Size SystemWindow::GetResizeOutputSizePixel() const
return aSize;
}
-
-
static void ImplWindowStateFromStr(WindowStateData& rData,
const OString& rStr)
{
@@ -554,8 +510,6 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
rData.SetMask( nValidMask );
}
-
-
static OString ImplWindowStateToStr(const WindowStateData& rData)
{
sal_uLong nValidMask = rData.GetMask();
@@ -600,8 +554,6 @@ static OString ImplWindowStateToStr(const WindowStateData& rData)
return rStrBuf.makeStringAndClear();
}
-
-
void SystemWindow::ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin )
{
Rectangle aScreenRect;
@@ -810,8 +762,6 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
}
}
-
-
void SystemWindow::GetWindowStateData( WindowStateData& rData ) const
{
sal_uLong nValidMask = rData.GetMask();
@@ -897,8 +847,6 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const
}
}
-
-
void SystemWindow::SetWindowState(const OString& rStr)
{
if (rStr.isEmpty())
@@ -909,8 +857,6 @@ void SystemWindow::SetWindowState(const OString& rStr)
SetWindowStateData( aData );
}
-
-
OString SystemWindow::GetWindowState( sal_uLong nMask ) const
{
WindowStateData aData;
@@ -920,8 +866,6 @@ OString SystemWindow::GetWindowState( sal_uLong nMask ) const
return ImplWindowStateToStr(aData);
}
-
-
void SystemWindow::SetMenuBar( MenuBar* pMenuBar )
{
if ( mpMenuBar != pMenuBar )
@@ -984,8 +928,6 @@ void SystemWindow::SetMenuBar( MenuBar* pMenuBar )
}
}
-
-
void SystemWindow::SetMenuBarMode( sal_uInt16 nMode )
{
if ( mnMenuBarMode != nMode )
@@ -1001,8 +943,6 @@ void SystemWindow::SetMenuBarMode( sal_uInt16 nMode )
}
}
-
-
bool SystemWindow::ImplIsInTaskPaneList( Window* pWin )
{
if( mpImplData && mpImplData->mpTaskPaneList )
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index b5c6b8df2719..68bfa0d6beba 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -23,10 +23,6 @@
#include <vcl/tabdlg.hxx>
#include <tools/rc.h>
-
-
-
-
void TabDialog::ImplInitTabDialogData()
{
mpFixedLine = NULL;
@@ -35,8 +31,6 @@ void TabDialog::ImplInitTabDialogData()
mbPosControls = true;
}
-
-
void TabDialog::ImplPosControls()
{
if (isLayoutEnabled())
@@ -212,8 +206,6 @@ void TabDialog::ImplPosControls()
mbPosControls = false;
}
-
-
TabDialog::TabDialog( Window* pParent, WinBits nStyle ) :
Dialog( WINDOW_TABDIALOG )
{
@@ -221,8 +213,6 @@ TabDialog::TabDialog( Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-
-
TabDialog::TabDialog( Window* pParent, const ResId& rResId ) :
Dialog( WINDOW_TABDIALOG )
{
@@ -237,15 +227,11 @@ TabDialog::TabDialog( Window* pParent, const OString& rID, const OUString& rUIXM
ImplInitTabDialogData();
}
-
-
TabDialog::~TabDialog()
{
delete mpFixedLine;
}
-
-
void TabDialog::StateChanged( StateChangedType nType )
{
if ( nType == STATE_CHANGE_INITSHOW )
@@ -257,8 +243,6 @@ void TabDialog::StateChanged( StateChangedType nType )
Dialog::StateChanged( nType );
}
-
-
void TabDialog::AdjustLayout()
{
SAL_WARN_IF(isLayoutEnabled(), "vcl.layout", "unnecessary to call TabDialog::AdjustLayout when layout enabled");
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 2ec86723ff37..a733824ece12 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/rc.h>
#include <vcl/event.hxx>
@@ -32,8 +31,6 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
-
-
void TabPage::ImplInit( Window* pParent, WinBits nStyle )
{
if ( !(nStyle & WB_NODIALOGCONTROL) )
@@ -49,8 +46,6 @@ void TabPage::ImplInit( Window* pParent, WinBits nStyle )
EnableChildTransparentMode( true );
}
-
-
void TabPage::ImplInitSettings()
{
Window* pParent = GetParent();
@@ -74,16 +69,12 @@ void TabPage::ImplInitSettings()
}
}
-
-
TabPage::TabPage( Window* pParent, WinBits nStyle ) :
Window( WINDOW_TABPAGE )
{
ImplInit( pParent, nStyle );
}
-
-
TabPage::TabPage( Window* pParent, const ResId& rResId ) :
Window( WINDOW_TABPAGE )
{
@@ -103,8 +94,6 @@ TabPage::TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDesc
m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID);
}
-
-
void TabPage::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
@@ -123,8 +112,6 @@ void TabPage::StateChanged( StateChangedType nType )
}
}
-
-
void TabPage::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -137,8 +124,6 @@ void TabPage::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
-
void TabPage::Paint( const Rectangle& )
{
// draw native tabpage only inside tabcontrols, standalone tabpages look ugly (due to bad dialog design)
@@ -161,7 +146,6 @@ void TabPage::Paint( const Rectangle& )
}
}
-
void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong )
{
Point aPos = pDev->LogicToPixel( rPos );
@@ -189,14 +173,10 @@ void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sa
pDev->Pop();
}
-
-
void TabPage::ActivatePage()
{
}
-
-
void TabPage::DeactivatePage()
{
}
diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx
index 47ed31576464..c70056d7e221 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/rcid.h>
#include <vcl/dockwin.hxx>
@@ -75,8 +74,6 @@ struct LTRSortBackward : public ::std::binary_function< const Window*, const Win
}
};
-
-
static void ImplTaskPaneListGrabFocus( Window *pWindow, bool bForward )
{
// put focus in child of floating windows which is typically a toolbar
@@ -86,8 +83,6 @@ static void ImplTaskPaneListGrabFocus( Window *pWindow, bool bForward )
pWindow->ImplGrabFocus( GETFOCUS_F6 | (bForward ? GETFOCUS_FORWARD : GETFOCUS_BACKWARD));
}
-
-
TaskPaneList::TaskPaneList()
{
}
@@ -96,8 +91,6 @@ TaskPaneList::~TaskPaneList()
{
}
-
-
void TaskPaneList::AddWindow( Window *pWindow )
{
if( pWindow )
@@ -136,8 +129,6 @@ void TaskPaneList::AddWindow( Window *pWindow )
}
}
-
-
void TaskPaneList::RemoveWindow( Window *pWindow )
{
::std::vector< Window* >::iterator p;
@@ -149,8 +140,6 @@ void TaskPaneList::RemoveWindow( Window *pWindow )
}
}
-
-
bool TaskPaneList::IsInList( Window *pWindow )
{
::std::vector< Window* >::iterator p;
@@ -161,8 +150,6 @@ bool TaskPaneList::IsInList( Window *pWindow )
return false;
}
-
-
bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent )
{
@@ -249,8 +236,6 @@ bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent )
return false;
}
-
-
// returns next splitter
Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward )
{
@@ -288,8 +273,6 @@ Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward )
return pWindow;
}
-
-
// returns first valid item (regardless of type) if pWindow==0, otherwise returns next valid float
Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward )
{
@@ -332,6 +315,4 @@ Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward )
return pWindow;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 61204c9bac0d..b8d4841e0b4f 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-
#include <tools/debug.hxx>
#include <tools/rc.h>
#include <tools/poly.hxx>
@@ -50,19 +48,12 @@
#include <vector>
#include <math.h>
-
-
-
-
-
#define SMALLBUTTON_HSIZE 7
#define SMALLBUTTON_VSIZE 7
#define SMALLBUTTON_OFF_NORMAL_X 3
#define SMALLBUTTON_OFF_NORMAL_Y 3
-
-
#define TB_TEXTOFFSET 2
#define TB_IMAGETEXTOFFSET 3
#define TB_LINESPACING 3
@@ -91,11 +82,8 @@
#define DOCK_LINETOP ((sal_uInt16)0x8000)
#define DOCK_LINEOFFSET 3
-
-
static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow );
-
typedef ::std::vector< ToolBox* > ImplTBList;
class ImplTBDragMgr
@@ -150,8 +138,6 @@ public:
bool IsResizeMode() { return mbResizeMode; }
};
-
-
static ImplTBDragMgr* ImplGetTBDragMgr()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -160,8 +146,6 @@ static ImplTBDragMgr* ImplGetTBDragMgr()
return pSVData->maCtrlData.mpTBDragMgr;
}
-
-
int ToolBox::ImplGetDragWidth( ToolBox* pThis )
{
#define TB_DRAGWIDTH 8 // the default width of the grip
@@ -199,8 +183,6 @@ ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType )
return tmpButtonType;
}
-
-
void ToolBox::ImplUpdateDragArea( ToolBox *pThis )
{
ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( pThis );
@@ -218,8 +200,6 @@ void ToolBox::ImplUpdateDragArea( ToolBox *pThis )
}
}
-
-
void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop,
long& rRight, long& rBottom, const ToolBox *pThis )
{
@@ -268,8 +248,6 @@ void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop,
}
}
-
-
static void ImplCheckUpdate( ToolBox *pThis )
{
// remove any pending invalidates to avoid
@@ -282,8 +260,6 @@ static void ImplCheckUpdate( ToolBox *pThis )
pThis->Update();
}
-
-
void ToolBox::ImplDrawGrip( ToolBox* pThis )
{
ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( pThis );
@@ -519,7 +495,6 @@ void ToolBox::ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion,
}
}
-
void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect )
{
// execute pending paint requests
@@ -537,7 +512,6 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect )
pThis->Push( PUSH_CLIPREGION );
pThis->IntersectClipRegion( aPaintRegion );
-
if( !pWrapper /*|| bIsInPopupMode*/ )
{
// no gradient for ordinary toolbars (not dockable)
@@ -653,7 +627,6 @@ void ToolBox::ImplDrawBorder( ToolBox* pWin )
}
}
-
if ( pWin->meAlign == WINDOWALIGN_BOTTOM || pWin->meAlign == WINDOWALIGN_TOP )
{
// draw right border
@@ -664,8 +637,6 @@ void ToolBox::ImplDrawBorder( ToolBox* pWin )
}
}
-
-
static bool ImplIsFixedControl( const ImplToolItem *pItem )
{
return ( pItem->mpWindow &&
@@ -674,8 +645,6 @@ static bool ImplIsFixedControl( const ImplToolItem *pItem )
pItem->mpWindow->GetType() == WINDOW_GROUPBOX) );
}
-
-
const ImplToolItem *ToolBox::ImplGetFirstClippedItem( const ToolBox* pThis )
{
std::vector< ImplToolItem >::const_iterator it;
@@ -689,8 +658,6 @@ const ImplToolItem *ToolBox::ImplGetFirstClippedItem( const ToolBox* pThis )
return NULL;
}
-
-
Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uInt16 nCalcMode )
{
long nMax;
@@ -807,8 +774,6 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn
return aSize;
}
-
-
void ToolBox::ImplCalcFloatSizes( ToolBox* pThis )
{
if ( !pThis->maFloatSizes.empty() )
@@ -874,8 +839,6 @@ void ToolBox::ImplCalcFloatSizes( ToolBox* pThis )
}
}
-
-
Size ToolBox::ImplCalcFloatSize( ToolBox* pThis, sal_uInt16& rLines )
{
ImplCalcFloatSizes( pThis );
@@ -901,8 +864,6 @@ Size ToolBox::ImplCalcFloatSize( ToolBox* pThis, sal_uInt16& rLines )
return aSize;
}
-
-
void ToolBox::ImplCalcMinMaxFloatSize( ToolBox* pThis, Size& rMinSize, Size& rMaxSize )
{
ImplCalcFloatSizes( pThis );
@@ -943,9 +904,6 @@ void ToolBox::ImplSetMinMaxFloatSize( ToolBox *pThis )
}
}
-
-
-
sal_uInt16 ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize )
{
long nLineHeight;
@@ -977,8 +935,6 @@ sal_uInt16 ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize )
return static_cast<sal_uInt16>(nLines);
}
-
-
sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos )
{
if ( !pThis->ImplIsFloatingMode() &&
@@ -1011,8 +967,6 @@ sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos )
return 0;
}
-
-
void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect,
sal_uInt16 nLineMode )
{
@@ -1107,8 +1061,6 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec
pThis->mnDockLines = i;
}
-
-
sal_uInt16 ToolBox::ImplFindItemPos( ToolBox* pBox, const Point& rPos )
{
sal_uInt16 nPos = 0;
@@ -1193,8 +1145,6 @@ ImplTBDragMgr::~ImplTBDragMgr()
delete mpBoxList;
}
-
-
ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect )
{
for ( size_t i = 0, n = mpBoxList->size(); i < n; ++i )
@@ -1224,8 +1174,6 @@ ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect )
return NULL;
}
-
-
void ImplTBDragMgr::StartDragging( ToolBox* pToolBox,
const Point& rPos, const Rectangle& rRect,
sal_uInt16 nDragLineMode, bool bResizeItem,
@@ -1269,8 +1217,6 @@ void ImplTBDragMgr::StartDragging( ToolBox* pToolBox,
pToolBox->ShowTracking( maRect );
}
-
-
void ImplTBDragMgr::Dragging( const Point& rPos )
{
if ( mnLineMode )
@@ -1303,8 +1249,6 @@ void ImplTBDragMgr::Dragging( const Point& rPos )
}
}
-
-
void ImplTBDragMgr::EndDragging( bool bOK )
{
mpDragBox->HideTracking();
@@ -1391,8 +1335,6 @@ void ImplTBDragMgr::EndDragging( bool bOK )
mpDragBox = NULL;
}
-
-
void ImplTBDragMgr::UpdateDragRect()
{
// Only update if we're already dragging
@@ -1402,8 +1344,6 @@ void ImplTBDragMgr::UpdateDragRect()
mpDragBox->ShowTracking( maRect );
}
-
-
IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel )
{
if ( pAccel->GetCurItemId() == KEY_ESCAPE )
@@ -1414,8 +1354,6 @@ IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel )
return (long) true;
}
-
-
void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
{
@@ -1483,7 +1421,6 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
DockingWindow::ImplInit( pParent, nStyle & ~(WB_BORDER) );
-
// always set WB_TABSTOP for ToolBars !!! if( mnWinStyle & WB_TABSTOP )
{
// dockingwindow's ImplInit removes some bits, so restore them here
@@ -1495,8 +1432,6 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
ImplInitSettings( true, true, true );
}
-
-
void ToolBox::ImplInitSettings( bool bFont,
bool bForeground, bool bBackground )
{
@@ -1562,8 +1497,6 @@ void ToolBox::ImplInitSettings( bool bFont,
}
}
-
-
void ToolBox::ImplLoadRes( const ResId& rResId )
{
ResMgr* pMgr = rResId.GetResMgr();
@@ -1619,16 +1552,12 @@ void ToolBox::ImplLoadRes( const ResId& rResId )
}
}
-
-
ToolBox::ToolBox( Window* pParent, WinBits nStyle ) :
DockingWindow( WINDOW_TOOLBOX )
{
ImplInit( pParent, nStyle );
}
-
-
ToolBox::ToolBox( Window* pParent, const ResId& rResId ) :
DockingWindow( WINDOW_TOOLBOX )
{
@@ -1650,8 +1579,6 @@ ToolBox::ToolBox( Window* pParent, const ResId& rResId ) :
Show();
}
-
-
ToolBox::~ToolBox()
{
// custom menu event still running?
@@ -1687,8 +1614,6 @@ ToolBox::~ToolBox()
}
}
-
-
ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const
{
std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin();
@@ -1702,7 +1627,6 @@ ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const
return NULL;
}
-
static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButtons )
{
rWidth += SMALLBUTTON_HSIZE;
@@ -1716,8 +1640,6 @@ static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButton
}
}
-
-
bool ToolBox::ImplCalcItem()
{
@@ -2004,8 +1926,6 @@ bool ToolBox::ImplCalcItem()
return false;
}
-
-
sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz )
{
sal_uLong nLineStart = 0;
@@ -2136,7 +2056,6 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalc
++it;
}
-
if ( pMaxLineWidth )
{
if ( nLineWidth > nMaxLineWidth )
@@ -2155,8 +2074,6 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalc
return nLines;
}
-
-
Size ToolBox::ImplGetOptimalFloatingSize()
{
if( !ImplIsFloatingMode() )
@@ -2290,7 +2207,6 @@ void ToolBox::ImplFormat( bool bResize )
else
bMustFullPaint = false;
-
// calculate new size during interactive resize or
// set computed size when formatting only
if ( ImplIsFloatingMode() )
@@ -2620,7 +2536,6 @@ void ToolBox::ImplFormat( bool bResize )
// we have no toolbox items
mnCurLines = 1;
-
if( IsMenuEnabled() && ImplIsFloatingMode() && !ImplHasExternalMenubutton() && !bIsInPopupMode )
{
// custom menu will be the last button in floating mode
@@ -2644,7 +2559,6 @@ void ToolBox::ImplFormat( bool bResize )
}
}
-
// if toolbox visible trigger paint for changed regions
if ( IsVisible() && !mbFullPaint )
{
@@ -2705,8 +2619,6 @@ void ToolBox::ImplFormat( bool bResize )
mbFormat = false;
}
-
-
IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl)
{
if( mnCurPos != TOOLBOX_ITEM_NOTFOUND &&
@@ -2736,8 +2648,6 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl)
return 0;
}
-
-
IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl)
{
@@ -2747,7 +2657,6 @@ IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl)
return 0;
}
-
static void ImplDrawMoreIndicator( ToolBox *pBox, const Rectangle& rRect, bool bSetColor, bool bRotate )
{
Color aOldFillColor = pBox->GetFillColor();
@@ -2875,8 +2784,6 @@ static void ImplDrawDropdownArrow( ToolBox *pBox, const Rectangle& rDropDownRect
pBox->SetLineColor( );
}
-
-
void ToolBox::ImplDrawMenubutton( ToolBox *pThis, bool bHighlight )
{
if( !pThis->mpData->maMenubuttonItem.maRect.IsEmpty() )
@@ -2917,8 +2824,6 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, bool bHighlight )
}
}
-
-
void ToolBox::ImplDrawSpin( bool bUpperIn, bool bLowerIn )
{
@@ -2948,8 +2853,6 @@ void ToolBox::ImplDrawSpin( bool bUpperIn, bool bLowerIn )
bUpperIn, bLowerIn, bTmpUpper, bTmpLower, !mbHorz );
}
-
-
void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect )
{
bool bNativeOk = false;
@@ -2997,8 +2900,6 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect )
}
}
-
-
static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow )
{
// draws toolbar button background either native or using a coloured selection
@@ -3016,7 +2917,6 @@ static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 h
aControlValue.setTristateVal( bChecked ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
-
bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON,
rRect, nState, aControlValue, OUString() );
}
@@ -3353,8 +3253,6 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
pMgr->UpdateDragRect();
}
-
-
void ToolBox::ImplDrawFloatwinBorder( ImplToolItem* pItem )
{
if ( !pItem->maRect.IsEmpty() )
@@ -3412,7 +3310,6 @@ void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow )
// draw current item with highlight and keep old state
bool bWasKeyboardActivate = mpData->mbDropDownByKeyboard;
-
if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND )
ImplDrawItem( mnCurPos, bWasKeyboardActivate ? 2 : 0 );
Deactivate();
@@ -3428,8 +3325,6 @@ void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow )
}
}
-
-
void ToolBox::ShowLine( bool bNext )
{
@@ -3463,8 +3358,6 @@ void ToolBox::ShowLine( bool bNext )
ImplFormat();
}
-
-
bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat )
{
Point aMousePos = rMEvt.GetPosPixel();
@@ -3525,8 +3418,6 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat )
return false;
}
-
-
bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel )
{
ImplDisableFlatButtons();
@@ -3643,8 +3534,6 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel )
return false;
}
-
-
void ToolBox::MouseMove( const MouseEvent& rMEvt )
{
// pressing a modifier generates synthetic mouse moves
@@ -3864,8 +3753,6 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt )
DockingWindow::MouseMove( rMEvt );
}
-
-
void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
{
// only trigger toolbox for left mouse button and when
@@ -3937,7 +3824,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
return;
}
-
// update actual data
sal_uInt16 nTrackFlags = 0;
mnCurPos = i;
@@ -3948,7 +3834,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
if ( it->mnBits & TIB_REPEAT )
nTrackFlags |= STARTTRACK_BUTTONREPEAT;
-
if ( mbSelection )
{
ImplDrawItem( mnCurPos, 1 );
@@ -3965,7 +3850,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
if ( rMEvt.GetClicks() == 2 )
DoubleClick();
-
if ( mbDrag )
{
ImplDrawItem( mnCurPos, 1 );
@@ -4004,7 +3888,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
mpData->maDropdownTimer.Start();
}
-
// call Click handler
if ( rMEvt.GetClicks() != 2 )
Click();
@@ -4090,8 +3973,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
DockingWindow::MouseButtonDown( rMEvt );
}
-
-
void ToolBox::MouseButtonUp( const MouseEvent& rMEvt )
{
if ( ImplHandleMouseButtonUp( rMEvt ) )
@@ -4108,8 +3989,6 @@ void ToolBox::MouseButtonUp( const MouseEvent& rMEvt )
DockingWindow::MouseButtonUp( rMEvt );
}
-
-
void ToolBox::Tracking( const TrackingEvent& rTEvt )
{
ImplDelData aDelData;
@@ -4127,8 +4006,6 @@ void ToolBox::Tracking( const TrackingEvent& rTEvt )
DockingWindow::Tracking( rTEvt );
}
-
-
void ToolBox::Paint( const Rectangle& rPaintRect )
{
if( mpData->mbIsPaintLocked )
@@ -4138,7 +4015,6 @@ void ToolBox::Paint( const Rectangle& rPaintRect )
ImplFormat();
mbFullPaint = false;
-
ImplDrawBackground( this, rPaintRect );
if ( (mnWinStyle & WB_BORDER) && !ImplIsFloatingMode() )
@@ -4182,15 +4058,11 @@ void ToolBox::Paint( const Rectangle& rPaintRect )
ImplShowFocus();
}
-
-
void ToolBox::Move()
{
DockingWindow::Move();
}
-
-
void ToolBox::Resize()
{
Size aSize = GetOutputSizePixel();
@@ -4299,7 +4171,6 @@ void ToolBox::Resize()
}
}
-
const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const
{
ImplToolItem* pItem = ImplGetItem( nItemId );
@@ -4321,8 +4192,6 @@ const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const
return pItem->maHelpText;
}
-
-
void ToolBox::RequestHelp( const HelpEvent& rHEvt )
{
sal_uInt16 nItemId;
@@ -4398,8 +4267,6 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt )
DockingWindow::RequestHelp( rHEvt );
}
-
-
bool ToolBox::Notify( NotifyEvent& rNEvt )
{
if ( rNEvt.GetType() == EVENT_KEYINPUT )
@@ -4483,8 +4350,6 @@ bool ToolBox::Notify( NotifyEvent& rNEvt )
return DockingWindow::Notify( rNEvt );
}
-
-
void ToolBox::Command( const CommandEvent& rCEvt )
{
if ( maCommandHandler.IsSet() )
@@ -4549,8 +4414,6 @@ void ToolBox::Command( const CommandEvent& rCEvt )
DockingWindow::Command( rCEvt );
}
-
-
void ToolBox::StateChanged( StateChangedType nType )
{
DockingWindow::StateChanged( nType );
@@ -4587,8 +4450,6 @@ void ToolBox::StateChanged( StateChangedType nType )
maStateChangedHandler.Call( &nType );
}
-
-
void ToolBox::DataChanged( const DataChangedEvent& rDCEvt )
{
DockingWindow::DataChanged( rDCEvt );
@@ -4609,15 +4470,11 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt )
maDataChangedHandler.Call( (void*)&rDCEvt );
}
-
-
bool ToolBox::PrepareToggleFloatingMode()
{
return DockingWindow::PrepareToggleFloatingMode();
}
-
-
void ToolBox::ToggleFloatingMode()
{
DockingWindow::ToggleFloatingMode();
@@ -4660,8 +4517,6 @@ void ToolBox::ToggleFloatingMode()
ImplFormat();
}
-
-
void ToolBox::StartDocking()
{
meDockAlign = meAlign;
@@ -4670,8 +4525,6 @@ void ToolBox::StartDocking()
DockingWindow::StartDocking();
}
-
-
bool ToolBox::Docking( const Point& rPos, Rectangle& rRect )
{
// do nothing during dragging, it was calculated before
@@ -4796,8 +4649,6 @@ bool ToolBox::Docking( const Point& rPos, Rectangle& rRect )
return bFloatMode;
}
-
-
void ToolBox::EndDocking( const Rectangle& rRect, bool bFloatMode )
{
if ( !IsDockingCanceled() )
@@ -4811,8 +4662,6 @@ void ToolBox::EndDocking( const Rectangle& rRect, bool bFloatMode )
DockingWindow::EndDocking( rRect, bFloatMode );
}
-
-
void ToolBox::Resizing( Size& rSize )
{
sal_uInt16 nCalcLines;
@@ -4957,8 +4806,6 @@ Size ToolBox::CalcFloatingWindowSizePixel( sal_uInt16 nCalcLines ) const
return aSize;
}
-
-
Size ToolBox::CalcMinimumWindowSizePixel() const
{
if( ImplIsFloatingMode() )
@@ -5000,8 +4847,6 @@ Size ToolBox::CalcMinimumWindowSizePixel() const
}
}
-
-
void ToolBox::EnableCustomize( bool bEnable )
{
if ( bEnable != mbCustomize )
@@ -5016,15 +4861,11 @@ void ToolBox::EnableCustomize( bool bEnable )
}
}
-
-
void ToolBox::GetFocus()
{
DockingWindow::GetFocus();
}
-
-
void ToolBox::LoseFocus()
{
ImplChangeHighlight( NULL, true );
@@ -5032,8 +4873,6 @@ void ToolBox::LoseFocus()
DockingWindow::LoseFocus();
}
-
-
// performs the action associated with an item, ie simulates clicking the item
void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl )
{
@@ -5047,8 +4886,6 @@ void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl )
ImplActivateItem( aKeyCode );
}
-
-
// calls the button's action handler
// returns true if action was called
bool ToolBox::ImplActivateItem( KeyCode aKeyCode )
@@ -5111,8 +4948,6 @@ bool ToolBox::ImplActivateItem( KeyCode aKeyCode )
return bRet;
}
-
-
bool ImplCloseLastPopup( Window *pParent )
{
// close last popup toolbox (see also:
@@ -5178,8 +5013,6 @@ bool ToolBox::ImplOpenItem( KeyCode aKeyCode )
return bRet;
}
-
-
void ToolBox::KeyInput( const KeyEvent& rKEvt )
{
KeyCode aKeyCode = rKEvt.GetKeyCode();
@@ -5368,8 +5201,6 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
DockingWindow::KeyInput( rKEvt );
}
-
-
// returns the current toolbox line of the item
sal_uInt16 ToolBox::ImplGetItemLine( ImplToolItem* pCurrentItem )
{
@@ -5418,8 +5249,6 @@ ImplToolItem* ToolBox::ImplGetFirstValidItem( sal_uInt16 nLine )
return (it == mpData->m_aItems.end()) ? NULL : &(*it);
}
-
-
sal_uInt16 ToolBox::ImplFindItemPos( const ImplToolItem* pItem, const std::vector< ImplToolItem >& rList )
{
if( pItem )
@@ -5516,8 +5345,6 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus )
mbChangingHighlight = false;
}
-
-
// check for keyboard accessible items
static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped )
{
@@ -5527,8 +5354,6 @@ static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped )
return bValid;
}
-
-
bool ToolBox::ImplChangeHighlightUpDn( bool bUp, bool bNoCycle )
{
ImplToolItem* pToolItem = ImplGetItem( mnHighItemId );
@@ -5690,8 +5515,6 @@ bool ToolBox::ImplChangeHighlightUpDn( bool bUp, bool bNoCycle )
return true;
}
-
-
void ToolBox::ImplShowFocus()
{
if( mnHighItemId && HasFocus() )
@@ -5706,8 +5529,6 @@ void ToolBox::ImplShowFocus()
}
}
-
-
void ToolBox::ImplHideFocus()
{
if( mnHighItemId )
@@ -5728,8 +5549,6 @@ void ToolBox::ImplHideFocus()
}
}
-
-
void ToolBox::ImplDisableFlatButtons()
{
#ifdef WNT // Check in the Windows registry if an AT tool wants no flat toolboxes
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index c62016ec728b..5f433848f65e 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -72,7 +72,6 @@ ImplToolBoxPrivateData::ImplToolBoxPrivateData() :
maMenubuttonItem.meState = TRISTATE_FALSE;
mnMenuButtonWidth = TB_MENUBUTTON_SIZE;
-
mbIsLocked = false;
mbNativeButtons = false;
mbIsPaintLocked = false;
@@ -93,7 +92,6 @@ ImplToolBoxPrivateData::~ImplToolBoxPrivateData()
delete mpMenu;
}
-
void ImplToolItem::init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits,
bool bEmptyBtn)
{
@@ -658,7 +656,6 @@ static OUString getCommandLabel(const OUString& rCommand, const uno::Reference<u
return OUString();
}
-
// Get label of the command (like of .uno:Save) from the description service
static Image getCommandImage(const OUString& rCommand, bool bLarge,
const uno::Reference<uno::XComponentContext>& rContext, const uno::Reference<frame::XFrame>& rFrame,
@@ -1114,7 +1111,6 @@ Point ToolBox::ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize )
return aPos;
}
-
Point ToolBox::GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const
{
return ImplGetPopupPosition( GetItemRect( nItemId ), rSize );
@@ -1166,7 +1162,6 @@ bool ToolBox::ImplHasExternalMenubutton()
return bRet;
}
-
void ToolBox::SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits )
{
sal_uInt16 nPos = GetItemPos( nItemId );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 5bed7e135b94..787d153ba266 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -138,7 +138,6 @@ ImplAccessibleInfos::~ImplAccessibleInfos()
delete pAccessibleDescription;
}
-
WindowImpl::WindowImpl( WindowType nType )
{
maZoom = Fraction( 1, 1 );
@@ -524,14 +523,11 @@ void Window::ImplInitAppFontData( Window* pWindow )
}
}
-
pSVData->maGDIData.mnRealAppFontX = pSVData->maGDIData.mnAppFontX;
if ( pSVData->maAppData.mnDialogScaleX )
pSVData->maGDIData.mnAppFontX += (pSVData->maGDIData.mnAppFontX*pSVData->maAppData.mnDialogScaleX)/100;
}
-
-
bool Window::ImplCheckUIFont( const Font& rFont )
{
if( ImplGetSVData()->maGDIData.mbNativeFontConfig )
@@ -573,8 +569,6 @@ bool Window::ImplCheckUIFont( const Font& rFont )
return bUIFontOk;
}
-
-
void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
{
StyleSettings aTmpSt( rSettings.GetStyleSettings() );
@@ -815,8 +809,6 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
GetpApp()->OverrideSystemSettings( rSettings );
}
-
-
MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, Window* pSource, Window* pDest )
{
Point aPos = pSource->OutputToScreenPixel( rE.GetPosPixel() );
@@ -824,8 +816,6 @@ MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, Window* pSource, Windo
return MouseEvent( aPos, rE.GetClicks(), rE.GetMode(), rE.GetButtons(), rE.GetModifier() );
}
-
-
CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, Window* pSource, Window* pDest )
{
if ( !rCEvt.IsMouseEvent() )
@@ -836,8 +826,6 @@ CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, Window* pSour
return CommandEvent( aPos, rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() );
}
-
-
void Window::ImplInitWindowData( WindowType nType )
{
// We will eventually being removing the inheritance of OutputDevice from Window.
@@ -845,17 +833,13 @@ void Window::ImplInitWindowData( WindowType nType )
// it will not *be* an OutputDevice
mpOutputDevice = (OutputDevice*)this;
-
mpWindowImpl = new WindowImpl( nType );
meOutDevType = OUTDEV_WINDOW;
-
mbEnableRTL = Application::GetSettings().GetLayoutRTL(); // true: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
}
-
-
static bool ImplDoTiledRendering()
{
#if !HAVE_FEATURE_DESKTOP
@@ -1157,8 +1141,6 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
GetAccessibleParentWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_CHILDCREATED, this );
}
-
-
void Window::ImplSetFrameParent( const Window* pParent )
{
Window* pFrameWindow = ImplGetSVData()->maWinData.mpFirstFrame;
@@ -1177,8 +1159,6 @@ void Window::ImplSetFrameParent( const Window* pParent )
}
}
-
-
void Window::ImplInsertWindow( Window* pParent )
{
mpWindowImpl->mpParent = pParent;
@@ -1228,8 +1208,6 @@ void Window::ImplInsertWindow( Window* pParent )
}
}
-
-
void Window::ImplRemoveWindow( bool bRemoveFrameData )
{
// remove window from the lists
@@ -1312,8 +1290,6 @@ void Window::reorderWithinParent(sal_uInt16 nNewPosition)
mpWindowImpl->mpParent->mpWindowImpl->mpFirstChild = this;
}
-
-
void Window::ImplCallResize()
{
mpWindowImpl->mbCallResize = false;
@@ -1328,8 +1304,6 @@ void Window::ImplCallResize()
ImplCallEventListeners( VCLEVENT_WINDOW_RESIZE );
}
-
-
void Window::ImplCallMove()
{
mpWindowImpl->mbCallMove = false;
@@ -1372,8 +1346,6 @@ void Window::ImplCallMove()
ImplCallEventListeners( VCLEVENT_WINDOW_MOVE );
}
-
-
static OString ImplAutoHelpID( ResMgr* pResMgr )
{
OString aRet;
@@ -1384,8 +1356,6 @@ static OString ImplAutoHelpID( ResMgr* pResMgr )
return aRet;
}
-
-
WinBits Window::ImplInitRes( const ResId& rResId )
{
GetRes( rResId );
@@ -1397,8 +1367,6 @@ WinBits Window::ImplInitRes( const ResId& rResId )
return nStyle;
}
-
-
WindowResHeader Window::ImplLoadResHeader( const ResId& rResId )
{
WindowResHeader aHeader;
@@ -1509,8 +1477,6 @@ void Window::ImplLoadRes( const ResId& rResId )
}
}
-
-
ImplWinData* Window::ImplGetWinData() const
{
if ( !mpWindowImpl->mpWinData )
@@ -1535,8 +1501,6 @@ ImplWinData* Window::ImplGetWinData() const
return mpWindowImpl->mpWinData;
}
-
-
SalGraphics* Window::ImplGetFrameGraphics() const
{
if ( mpWindowImpl->mpFrameWindow->mpGraphics )
@@ -1552,8 +1516,6 @@ SalGraphics* Window::ImplGetFrameGraphics() const
return mpWindowImpl->mpFrameWindow->mpGraphics;
}
-
-
Window* Window::ImplFindWindow( const Point& rFramePos )
{
Window* pTempWindow;
@@ -1595,8 +1557,6 @@ Window* Window::ImplFindWindow( const Point& rFramePos )
return NULL;
}
-
-
sal_uInt16 Window::ImplHitTest( const Point& rFramePos )
{
Point aFramePos( rFramePos );
@@ -1624,8 +1584,6 @@ sal_uInt16 Window::ImplHitTest( const Point& rFramePos )
return nHitTest;
}
-
-
bool Window::ImplIsRealParentPath( const Window* pWindow ) const
{
pWindow = pWindow->GetParent();
@@ -1639,8 +1597,6 @@ bool Window::ImplIsRealParentPath( const Window* pWindow ) const
return false;
}
-
-
bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const
{
do
@@ -1658,8 +1614,6 @@ bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const
return false;
}
-
-
bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const
{
if ( this == pWindow )
@@ -1667,8 +1621,6 @@ bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) co
return ImplIsChild( pWindow, bSystemWindow );
}
-
-
int Window::ImplTestMousePointerSet()
{
// as soon as mouse is captured, switch mouse-pointer
@@ -1683,8 +1635,6 @@ int Window::ImplTestMousePointerSet()
return sal_False;
}
-
-
PointerStyle Window::ImplGetMousePointer() const
{
PointerStyle ePointerStyle;
@@ -1727,8 +1677,6 @@ PointerStyle Window::ImplGetMousePointer() const
return ePointerStyle;
}
-
-
void Window::ImplResetReallyVisible()
{
bool bBecameReallyInvisible = mpWindowImpl->mbReallyVisible;
@@ -1762,8 +1710,6 @@ void Window::ImplResetReallyVisible()
}
}
-
-
void Window::ImplSetReallyVisible()
{
// #i43594# it is possible that INITSHOW was never send, because the visibility state changed between
@@ -1804,8 +1750,6 @@ void Window::ImplSetReallyVisible()
}
}
-
-
void Window::ImplCallInitShow()
{
mpWindowImpl->mbReallyShown = true;
@@ -1830,8 +1774,6 @@ void Window::ImplCallInitShow()
}
}
-
-
void Window::ImplAddDel( ImplDelData* pDel ) // TODO: make "const" when incompatiblity ok
{
DBG_ASSERT( !pDel->mpWindow, "Window::ImplAddDel(): cannot add ImplDelData twice !" );
@@ -1843,8 +1785,6 @@ void Window::ImplAddDel( ImplDelData* pDel ) // TODO: make "const" when incompat
}
}
-
-
void Window::ImplRemoveDel( ImplDelData* pDel ) // TODO: make "const" when incompatiblity ok
{
pDel->mpWindow = NULL; // #112873# pDel is not associated with a Window anymore
@@ -1859,8 +1799,6 @@ void Window::ImplRemoveDel( ImplDelData* pDel ) // TODO: make "const" when incom
}
}
-
-
void Window::ImplInitResolutionSettings()
{
// recalculate AppFont-resolution and DPI-resolution
@@ -1896,8 +1834,6 @@ void Window::ImplInitResolutionSettings()
}
}
-
-
void Window::ImplPointToLogic( Font& rFont ) const
{
Size aSize = rFont.GetSize();
@@ -1923,8 +1859,6 @@ void Window::ImplPointToLogic( Font& rFont ) const
rFont.SetSize( aSize );
}
-
-
void Window::ImplLogicToPoint( Font& rFont ) const
{
Size aSize = rFont.GetSize();
@@ -1950,8 +1884,6 @@ void Window::ImplLogicToPoint( Font& rFont ) const
rFont.SetSize( aSize );
}
-
-
bool Window::ImplSysObjClip( const Region* pOldRegion )
{
bool bUpdate = true;
@@ -2039,8 +1971,6 @@ bool Window::ImplSysObjClip( const Region* pOldRegion )
return bUpdate;
}
-
-
void Window::ImplUpdateSysObjChildrenClip()
{
if ( mpWindowImpl->mpSysObj && mpWindowImpl->mbInitWinClipRegion )
@@ -2054,8 +1984,6 @@ void Window::ImplUpdateSysObjChildrenClip()
}
}
-
-
void Window::ImplUpdateSysObjOverlapsClip()
{
ImplUpdateSysObjChildrenClip();
@@ -2068,8 +1996,6 @@ void Window::ImplUpdateSysObjOverlapsClip()
}
}
-
-
void Window::ImplUpdateSysObjClip()
{
if ( !ImplIsOverlapWindow() )
@@ -2091,8 +2017,6 @@ void Window::ImplUpdateSysObjClip()
mpWindowImpl->mpFrameWindow->ImplUpdateSysObjOverlapsClip();
}
-
-
bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller )
{
bool bUpdate = true;
@@ -2138,8 +2062,6 @@ bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller )
return bUpdate;
}
-
-
bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller )
{
bool bUpdate = ImplSetClipFlagChildren( bSysObjOnlySmaller );
@@ -2155,8 +2077,6 @@ bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller )
return bUpdate;
}
-
-
bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller )
{
if ( !ImplIsOverlapWindow() )
@@ -2189,8 +2109,6 @@ bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller )
return mpWindowImpl->mpFrameWindow->ImplSetClipFlagOverlapWindows( bSysObjOnlySmaller );
}
-
-
void Window::ImplIntersectWindowClipRegion( Region& rRegion )
{
if ( mpWindowImpl->mbInitWinClipRegion )
@@ -2199,8 +2117,6 @@ void Window::ImplIntersectWindowClipRegion( Region& rRegion )
rRegion.Intersect( mpWindowImpl->maWinClipRegion );
}
-
-
void Window::ImplIntersectWindowRegion( Region& rRegion )
{
rRegion.Intersect( Rectangle( Point( mnOutOffX, mnOutOffY ),
@@ -2209,8 +2125,6 @@ void Window::ImplIntersectWindowRegion( Region& rRegion )
rRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) );
}
-
-
void Window::ImplExcludeWindowRegion( Region& rRegion )
{
if ( mpWindowImpl->mbWinRegion )
@@ -2229,8 +2143,6 @@ void Window::ImplExcludeWindowRegion( Region& rRegion )
}
}
-
-
void Window::ImplExcludeOverlapWindows( Region& rRegion )
{
Window* pWindow = mpWindowImpl->mpFirstOverlap;
@@ -2246,8 +2158,6 @@ void Window::ImplExcludeOverlapWindows( Region& rRegion )
}
}
-
-
void Window::ImplExcludeOverlapWindows2( Region& rRegion )
{
if ( mpWindowImpl->mbReallyVisible )
@@ -2256,8 +2166,6 @@ void Window::ImplExcludeOverlapWindows2( Region& rRegion )
ImplExcludeOverlapWindows( rRegion );
}
-
-
void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps )
{
if ( bThis )
@@ -2291,8 +2199,6 @@ void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps )
ImplGetParent()->ImplIntersectWindowClipRegion( rRegion );
}
-
-
bool Window::ImplClipChildren( Region& rRegion )
{
bool bOtherClip = false;
@@ -2316,8 +2222,6 @@ bool Window::ImplClipChildren( Region& rRegion )
return bOtherClip;
}
-
-
void Window::ImplClipAllChildren( Region& rRegion )
{
Window* pWindow = mpWindowImpl->mpFirstChild;
@@ -2329,8 +2233,6 @@ void Window::ImplClipAllChildren( Region& rRegion )
}
}
-
-
void Window::ImplClipSiblings( Region& rRegion )
{
Window* pWindow = ImplGetParent()->mpWindowImpl->mpFirstChild;
@@ -2346,8 +2248,6 @@ void Window::ImplClipSiblings( Region& rRegion )
}
}
-
-
void Window::ImplInitWinClipRegion()
{
// Build Window Region
@@ -2370,8 +2270,6 @@ void Window::ImplInitWinClipRegion()
mpWindowImpl->mbInitWinClipRegion = false;
}
-
-
void Window::ImplInitWinChildClipRegion()
{
if ( !mpWindowImpl->mpFirstChild )
@@ -2395,8 +2293,6 @@ void Window::ImplInitWinChildClipRegion()
mpWindowImpl->mbInitChildRegion = false;
}
-
-
Region* Window::ImplGetWinChildClipRegion()
{
if ( mpWindowImpl->mbInitWinClipRegion )
@@ -2409,8 +2305,6 @@ Region* Window::ImplGetWinChildClipRegion()
return &mpWindowImpl->maWinClipRegion;
}
-
-
void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Region& rRegion )
{
Window* pWindow = mpWindowImpl->mpFirstOverlap;
@@ -2428,8 +2322,6 @@ void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Re
}
}
-
-
void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, Region& rRegion )
{
if ( mpWindowImpl->mbReallyVisible )
@@ -2442,8 +2334,6 @@ void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, R
ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion );
}
-
-
void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion )
{
// Clip Overlap Siblings
@@ -2470,8 +2360,6 @@ void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region&
ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion );
}
-
-
void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion,
bool bChildren, bool bParent, bool bSiblings )
{
@@ -2542,8 +2430,6 @@ void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegio
}
}
-
-
void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
{
Exception aException;
@@ -2702,8 +2588,6 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
}
}
-
-
void Window::ImplCallOverlapPaint()
{
// emit overlapping windows first
@@ -2724,16 +2608,12 @@ void Window::ImplCallOverlapPaint()
}
}
-
-
void Window::ImplPostPaint()
{
if ( !ImplDoTiledRendering() && !mpWindowImpl->mpFrameData->maPaintTimer.IsActive() )
mpWindowImpl->mpFrameData->maPaintTimer.Start();
}
-
-
IMPL_LINK_NOARG(Window, ImplHandlePaintHdl)
{
// save paint events until layout is done
@@ -2752,8 +2632,6 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl)
return 0;
}
-
-
IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl)
{
if( mpWindowImpl->mbReallyVisible )
@@ -2773,8 +2651,6 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl)
return 0;
}
-
-
void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags )
{
// set PAINTCHILDREN for all parent windows till the first OverlapWindow
@@ -2832,8 +2708,6 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags
ImplPostPaint();
}
-
-
void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion )
{
Region aRegion = rRegion;
@@ -2853,8 +2727,6 @@ void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion )
}
}
-
-
void Window::ImplInvalidateParentFrameRegion( Region& rRegion )
{
if ( mpWindowImpl->mbOverlapWin )
@@ -2866,8 +2738,6 @@ void Window::ImplInvalidateParentFrameRegion( Region& rRegion )
}
}
-
-
void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags )
{
@@ -2954,8 +2824,6 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags )
pOpaqueWindow->Update(); // start painting at the opaque parent
}
-
-
void Window::ImplMoveInvalidateRegion( const Rectangle& rRect,
long nHorzScroll, long nVertScroll,
bool bChildren )
@@ -2979,8 +2847,6 @@ void Window::ImplMoveInvalidateRegion( const Rectangle& rRect,
}
}
-
-
void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect,
long nHorzScroll, long nVertScroll,
bool bChildren )
@@ -3018,8 +2884,6 @@ void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect,
}
}
-
-
void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags )
{
if ( !pRegion )
@@ -3062,8 +2926,6 @@ void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags )
}
}
-
-
void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags )
{
// assemble region
@@ -3103,8 +2965,6 @@ void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags )
}
}
-
-
void Window::ImplScroll( const Rectangle& rRect,
long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
{
@@ -3284,8 +3144,6 @@ void Window::ImplScroll( const Rectangle& rRect,
mpWindowImpl->mpCursor->ImplResume();
}
-
-
void Window::ImplUpdateAll( bool bOverlapWindows )
{
if ( !mpWindowImpl->mbReallyVisible )
@@ -3316,8 +3174,6 @@ void Window::ImplUpdateAll( bool bOverlapWindows )
Flush();
}
-
-
void Window::ImplUpdateWindowPtr( Window* pWindow )
{
if ( mpWindowImpl->mpFrameWindow != pWindow->mpWindowImpl->mpFrameWindow )
@@ -3343,8 +3199,6 @@ void Window::ImplUpdateWindowPtr( Window* pWindow )
}
}
-
-
void Window::ImplUpdateWindowPtr()
{
Window* pChild = mpWindowImpl->mpFirstChild;
@@ -3355,8 +3209,6 @@ void Window::ImplUpdateWindowPtr()
}
}
-
-
void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame )
{
bool bVisible = IsVisible();
@@ -3384,8 +3236,6 @@ void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame )
Show( true );
}
-
-
bool Window::ImplUpdatePos()
{
bool bSysChild = false;
@@ -3417,8 +3267,6 @@ bool Window::ImplUpdatePos()
return bSysChild;
}
-
-
void Window::ImplUpdateSysObjPos()
{
if ( mpWindowImpl->mpSysObj )
@@ -3432,7 +3280,6 @@ void Window::ImplUpdateSysObjPos()
}
}
-
void Window::ImplPosSizeWindow( long nX, long nY,
long nWidth, long nHeight, sal_uInt16 nFlags )
{
@@ -3737,8 +3584,6 @@ void Window::ImplPosSizeWindow( long nX, long nY,
delete pOldRegion;
}
-
-
void Window::ImplToBottomChild()
{
if ( !ImplIsOverlapWindow() && !mpWindowImpl->mbReallyVisible && (mpWindowImpl->mpParent->mpWindowImpl->mpLastChild != this) )
@@ -3756,8 +3601,6 @@ void Window::ImplToBottomChild()
}
}
-
-
void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData )
{
DBG_ASSERT( ImplIsOverlapWindow(), "Window::ImplCalcToTop(): Is not a OverlapWindow" );
@@ -3785,8 +3628,6 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData )
}
}
-
-
void Window::ImplToTop( sal_uInt16 nFlags )
{
DBG_ASSERT( ImplIsOverlapWindow(), "Window::ImplToTop(): Is not a OverlapWindow" );
@@ -3877,8 +3718,6 @@ void Window::ImplToTop( sal_uInt16 nFlags )
}
}
-
-
void Window::ImplStartToTop( sal_uInt16 nFlags )
{
ImplCalcToTopData aStartData;
@@ -3932,8 +3771,6 @@ void Window::ImplStartToTop( sal_uInt16 nFlags )
}
}
-
-
void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible )
{
// do we need to fetch the focus?
@@ -3961,8 +3798,6 @@ void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible )
ImplGenerateMouseMove();
}
-
-
void Window::ImplShowAllOverlaps()
{
Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap;
@@ -3978,8 +3813,6 @@ void Window::ImplShowAllOverlaps()
}
}
-
-
void Window::ImplHideAllOverlaps()
{
Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap;
@@ -3995,8 +3828,6 @@ void Window::ImplHideAllOverlaps()
}
}
-
-
void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged )
{
if ( mpWindowImpl->mpFrameData->mbMouseIn && mpWindowImpl->mpFrameWindow->mpWindowImpl->mbReallyVisible )
@@ -4022,16 +3853,12 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged )
}
}
-
-
void Window::ImplGenerateMouseMove()
{
if ( !mpWindowImpl->mpFrameData->mnMouseMoveId )
Application::PostUserEvent( mpWindowImpl->mpFrameData->mnMouseMoveId, LINK( mpWindowImpl->mpFrameWindow, Window, ImplGenerateMouseMoveHdl ) );
}
-
-
IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl)
{
mpWindowImpl->mpFrameData->mnMouseMoveId = 0;
@@ -4045,15 +3872,11 @@ IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl)
return 0;
}
-
-
void Window::ImplInvertFocus( const Rectangle& rRect )
{
InvertTracking( rRect, SHOWTRACK_SMALL | SHOWTRACK_WINDOW );
}
-
-
void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
Window* pOldOverlapWindow )
{
@@ -4145,7 +3968,6 @@ static bool IsWindowFocused(const WindowImpl& rWinImpl)
return false;
}
-
void Window::ImplGrabFocus( sal_uInt16 nFlags )
{
// #143570# no focus for destructing windows
@@ -4234,7 +4056,6 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
pParent = pParent->mpWindowImpl->mpParent;
}
-
if ( ( pSVData->maWinData.mpFocusWin != this && ! mpWindowImpl->mbInDtor ) || ( bAsyncFocusWaiting && !bHasFocus && !bMustNotGrabFocus ) )
{
// EndExtTextInput if it is not the same window
@@ -4364,8 +4185,6 @@ void Window::ImplGrabFocusToDocument( sal_uInt16 nFlags )
}
}
-
-
void Window::ImplNewInputContext()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -4411,15 +4230,11 @@ void Window::ImplNewInputContext()
pFocusWin->mpFontCache->Release( pFontEntry );
}
-
-
Window::Window( WindowType nType )
{
ImplInitWindowData( nType );
}
-
-
Window::Window( Window* pParent, WinBits nStyle )
{
@@ -4427,8 +4242,6 @@ Window::Window( Window* pParent, WinBits nStyle )
ImplInit( pParent, nStyle, NULL );
}
-
-
Window::Window( Window* pParent, const ResId& rResId )
: mpWindowImpl(NULL)
{
@@ -4442,7 +4255,6 @@ Window::Window( Window* pParent, const ResId& rResId )
Show();
}
-
#if OSL_DEBUG_LEVEL > 0
namespace
{
@@ -4466,14 +4278,12 @@ namespace
}
#endif
-
Window::~Window()
{
vcl::LazyDeletor<Window>::Undelete( this );
DBG_ASSERT( !mpWindowImpl->mbInDtor, "~Window - already in DTOR!" );
-
// remove Key and Mouse events issued by Application::PostKey/MouseEvent
Application::RemoveMouseAndKeyEvents( this );
@@ -4500,7 +4310,6 @@ Window::~Window()
// remove associated data structures from dockingmanager
ImplGetDockingManager()->RemoveWindow( this );
-
// remove ownerdraw decorated windows from list in the top-most frame window
if( (GetStyle() & WB_OWNERDRAWDECORATION) && mpWindowImpl->mbFrame )
{
@@ -4797,7 +4606,6 @@ Window::~Window()
}
}
-
if ( pOverlapWindow != 0 &&
pOverlapWindow->mpWindowImpl->mpLastFocusWindow == this )
pOverlapWindow->mpWindowImpl->mpLastFocusWindow = NULL;
@@ -4907,7 +4715,6 @@ Window::~Window()
delete mpWindowImpl; mpWindowImpl = NULL;
}
-
void Window::doLazyDelete()
{
SystemWindow* pSysWin = dynamic_cast<SystemWindow*>(this);
@@ -4930,8 +4737,6 @@ void Window::SimulateKeyPress( sal_uInt16 nKeyCode ) const
mpWindowImpl->mpFrame->SimulateKeyPress(nKeyCode);
}
-
-
void Window::MouseMove( const MouseEvent& rMEvt )
{
NotifyEvent aNEvt( EVENT_MOUSEMOVE, this, &rMEvt );
@@ -4939,8 +4744,6 @@ void Window::MouseMove( const MouseEvent& rMEvt )
mpWindowImpl->mbMouseMove = true;
}
-
-
void Window::MouseButtonDown( const MouseEvent& rMEvt )
{
NotifyEvent aNEvt( EVENT_MOUSEBUTTONDOWN, this, &rMEvt );
@@ -4948,8 +4751,6 @@ void Window::MouseButtonDown( const MouseEvent& rMEvt )
mpWindowImpl->mbMouseButtonDown = true;
}
-
-
void Window::MouseButtonUp( const MouseEvent& rMEvt )
{
NotifyEvent aNEvt( EVENT_MOUSEBUTTONUP, this, &rMEvt );
@@ -4957,8 +4758,6 @@ void Window::MouseButtonUp( const MouseEvent& rMEvt )
mpWindowImpl->mbMouseButtonUp = true;
}
-
-
void Window::KeyInput( const KeyEvent& rKEvt )
{
NotifyEvent aNEvt( EVENT_KEYINPUT, this, &rKEvt );
@@ -4966,8 +4765,6 @@ void Window::KeyInput( const KeyEvent& rKEvt )
mpWindowImpl->mbKeyInput = true;
}
-
-
void Window::KeyUp( const KeyEvent& rKEvt )
{
NotifyEvent aNEvt( EVENT_KEYUP, this, &rKEvt );
@@ -4975,27 +4772,19 @@ void Window::KeyUp( const KeyEvent& rKEvt )
mpWindowImpl->mbKeyUp = true;
}
-
-
void Window::PrePaint()
{
}
-
-
void Window::Paint( const Rectangle& rRect )
{
ImplCallEventListeners( VCLEVENT_WINDOW_PAINT, (void*)&rRect );
}
-
-
void Window::PostPaint()
{
}
-
-
void Window::Draw( OutputDevice*, const Point&, const Size&, sal_uLong )
{
}
@@ -5022,16 +4811,12 @@ void Window::GetFocus()
Notify( aNEvt );
}
-
-
void Window::LoseFocus()
{
NotifyEvent aNEvt( EVENT_LOSEFOCUS, this );
Notify( aNEvt );
}
-
-
void Window::RequestHelp( const HelpEvent& rHEvt )
{
// if Balloon-Help is requested, show the balloon
@@ -5082,8 +4867,6 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
}
}
-
-
void Window::Command( const CommandEvent& rCEvt )
{
ImplCallEventListeners( VCLEVENT_WINDOW_COMMAND, (void*)&rCEvt );
@@ -5093,8 +4876,6 @@ void Window::Command( const CommandEvent& rCEvt )
mpWindowImpl->mbCommand = true;
}
-
-
void Window::Tracking( const TrackingEvent& rTEvt )
{
@@ -5103,14 +4884,10 @@ void Window::Tracking( const TrackingEvent& rTEvt )
pWrapper->Tracking( rTEvt );
}
-
-
void Window::UserEvent( sal_uLong, void* )
{
}
-
-
void Window::StateChanged( StateChangedType eType )
{
switch (eType)
@@ -5134,14 +4911,10 @@ void Window::StateChanged( StateChangedType eType )
}
}
-
-
void Window::DataChanged( const DataChangedEvent& )
{
}
-
-
void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == EVENT_COMMAND )
@@ -5241,8 +5014,6 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
}
}
-
-
bool Window::PreNotify( NotifyEvent& rNEvt )
{
bool bDone = false;
@@ -5284,8 +5055,6 @@ bool Window::PreNotify( NotifyEvent& rNEvt )
return bDone;
}
-
-
bool Window::Notify( NotifyEvent& rNEvt )
{
bool nRet = false;
@@ -5393,8 +5162,6 @@ bool Window::Notify( NotifyEvent& rNEvt )
return nRet;
}
-
-
void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData )
{
// The implementation was moved to CallEventListeners(),
@@ -5406,8 +5173,6 @@ void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData )
CallEventListeners( nEvent, pData );
}
-
-
void Window::CallEventListeners( sal_uLong nEvent, void* pData )
{
VclWindowEvent aEvent( this, nEvent, pData );
@@ -5448,36 +5213,26 @@ void Window::FireVclEvent( VclSimpleEvent* pEvent )
ImplGetSVData()->mpApp->ImplCallEventListeners(pEvent);
}
-
-
void Window::AddEventListener( const Link& rEventListener )
{
mpWindowImpl->maEventListeners.addListener( rEventListener );
}
-
-
void Window::RemoveEventListener( const Link& rEventListener )
{
mpWindowImpl->maEventListeners.removeListener( rEventListener );
}
-
-
void Window::AddChildEventListener( const Link& rEventListener )
{
mpWindowImpl->maChildEventListeners.addListener( rEventListener );
}
-
-
void Window::RemoveChildEventListener( const Link& rEventListener )
{
mpWindowImpl->maChildEventListeners.removeListener( rEventListener );
}
-
-
sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller )
{
sal_uLong nEventId;
@@ -5485,10 +5240,6 @@ sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller )
return nEventId;
}
-
-
-
-
bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller )
{
@@ -5511,8 +5262,6 @@ bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCalle
}
}
-
-
void Window::RemoveUserEvent( sal_uLong nUserEvent )
{
@@ -5532,8 +5281,6 @@ void Window::RemoveUserEvent( sal_uLong nUserEvent )
pSVEvent->mbCall = false;
}
-
-
bool Window::IsLocked( bool bChildren ) const
{
if ( mpWindowImpl->mnLockCount != 0 )
@@ -5553,8 +5300,6 @@ bool Window::IsLocked( bool bChildren ) const
return false;
}
-
-
void Window::SetStyle( WinBits nStyle )
{
@@ -5566,8 +5311,6 @@ void Window::SetStyle( WinBits nStyle )
}
}
-
-
void Window::SetExtendedStyle( WinBits nExtendedStyle )
{
@@ -5592,8 +5335,6 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle )
}
}
-
-
SystemWindow* Window::GetSystemWindow() const
{
@@ -5603,8 +5344,6 @@ SystemWindow* Window::GetSystemWindow() const
return (SystemWindow*)pWin;
}
-
-
void Window::SetBorderStyle( sal_uInt16 nBorderStyle )
{
@@ -5645,8 +5384,6 @@ void Window::SetBorderStyle( sal_uInt16 nBorderStyle )
}
}
-
-
sal_uInt16 Window::GetBorderStyle() const
{
@@ -5661,8 +5398,6 @@ sal_uInt16 Window::GetBorderStyle() const
return 0;
}
-
-
long Window::CalcTitleWidth() const
{
@@ -5691,8 +5426,6 @@ long Window::CalcTitleWidth() const
return 0;
}
-
-
void Window::EnableClipSiblings( bool bClipSiblings )
{
@@ -5702,8 +5435,6 @@ void Window::EnableClipSiblings( bool bClipSiblings )
mpWindowImpl->mbClipSiblings = bClipSiblings;
}
-
-
void Window::SetMouseTransparent( bool bTransparent )
{
@@ -5716,8 +5447,6 @@ void Window::SetMouseTransparent( bool bTransparent )
mpWindowImpl->mbMouseTransparent = bTransparent;
}
-
-
void Window::SetPaintTransparent( bool bTransparent )
{
@@ -5731,8 +5460,6 @@ void Window::SetPaintTransparent( bool bTransparent )
mpWindowImpl->mbPaintTransparent = bTransparent;
}
-
-
void Window::SetInputContext( const InputContext& rInputContext )
{
@@ -5741,8 +5468,6 @@ void Window::SetInputContext( const InputContext& rInputContext )
ImplNewInputContext();
}
-
-
void Window::EndExtTextInput( sal_uInt16 nFlags )
{
@@ -5750,8 +5475,6 @@ void Window::EndExtTextInput( sal_uInt16 nFlags )
ImplGetFrame()->EndExtTextInput( nFlags );
}
-
-
void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth )
{
@@ -5776,8 +5499,6 @@ void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth )
}
-
-
const Rectangle* Window::GetCursorRect() const
{
@@ -5785,8 +5506,6 @@ const Rectangle* Window::GetCursorRect() const
return pWinData->mpCursorRect;
}
-
-
long Window::GetCursorExtTextInputWidth() const
{
@@ -5794,8 +5513,6 @@ long Window::GetCursorExtTextInputWidth() const
return pWinData->mnCursorExtWidth;
}
-
-
void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical ) {
ImplWinData* pWinData = ImplGetWinData();
@@ -5811,7 +5528,6 @@ void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLe
}
}
-
void Window::SetSettings( const AllSettings& rSettings )
{
SetSettings( rSettings, sal_False );
@@ -5852,8 +5568,6 @@ void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild )
}
}
-
-
void Window::UpdateSettings( const AllSettings& rSettings, bool bChild )
{
@@ -5922,8 +5636,6 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild )
}
}
-
-
void Window::NotifyAllChildren( DataChangedEvent& rDCEvt )
{
@@ -5937,8 +5649,6 @@ void Window::NotifyAllChildren( DataChangedEvent& rDCEvt )
}
}
-
-
void Window::SetPointFont( const Font& rFont )
{
@@ -5947,8 +5657,6 @@ void Window::SetPointFont( const Font& rFont )
SetFont( aFont );
}
-
-
Font Window::GetPointFont() const
{
@@ -5957,8 +5665,6 @@ Font Window::GetPointFont() const
return aFont;
}
-
-
void Window::SetParentClipMode( sal_uInt16 nMode )
{
@@ -5975,8 +5681,6 @@ void Window::SetParentClipMode( sal_uInt16 nMode )
}
}
-
-
sal_uInt16 Window::GetParentClipMode() const
{
@@ -5986,8 +5690,6 @@ sal_uInt16 Window::GetParentClipMode() const
return mpWindowImpl->mnParentClipMode;
}
-
-
void Window::SetWindowRegionPixel()
{
@@ -6022,8 +5724,6 @@ void Window::SetWindowRegionPixel()
}
}
-
-
void Window::SetWindowRegionPixel( const Region& rRegion )
{
@@ -6110,8 +5810,6 @@ void Window::SetWindowRegionPixel( const Region& rRegion )
}
}
-
-
const Region& Window::GetWindowRegionPixel() const
{
@@ -6121,8 +5819,6 @@ const Region& Window::GetWindowRegionPixel() const
return mpWindowImpl->maWinRegion;
}
-
-
bool Window::IsWindowRegionPixel() const
{
@@ -6132,8 +5828,6 @@ bool Window::IsWindowRegionPixel() const
return mpWindowImpl->mbWinRegion;
}
-
-
Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const
{
@@ -6171,8 +5865,6 @@ Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const
return aWinClipRegion;
}
-
-
Region Window::GetPaintRegion() const
{
@@ -6189,8 +5881,6 @@ Region Window::GetPaintRegion() const
}
}
-
-
void Window::ExpandPaintClipRegion( const Region& rRegion )
{
if( mpWindowImpl->mpPaintRegion )
@@ -6215,8 +5905,6 @@ void Window::ExpandPaintClipRegion( const Region& rRegion )
}
}
-
-
static SystemWindow *ImplGetLastSystemWindow( Window *pWin )
{
// get the most top-level system window, the one that contains the taskpanelist
@@ -6399,8 +6087,6 @@ void Window::SetParent( Window* pNewParent )
Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
}
-
-
void Window::Show( bool bVisible, sal_uInt16 nFlags )
{
@@ -6651,8 +6337,6 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
*/
}
-
-
Size Window::GetSizePixel() const
{
if (!mpWindowImpl)
@@ -6684,9 +6368,6 @@ void Window::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
rBottomBorder = mpWindowImpl->mnBottomBorder;
}
-
-
-
void Window::Enable( bool bEnable, bool bChild )
{
@@ -6747,8 +6428,6 @@ void Window::Enable( bool bEnable, bool bChild )
ImplGenerateMouseMove();
}
-
-
void Window::SetCallHandlersOnInputDisabled( bool bCall )
{
mpWindowImpl->mbCallHandlersDuringInputDisabled = bCall ? sal_True : sal_False;
@@ -6761,15 +6440,11 @@ void Window::SetCallHandlersOnInputDisabled( bool bCall )
}
}
-
-
bool Window::IsCallHandlersOnInputDisabled() const
{
return mpWindowImpl->mbCallHandlersDuringInputDisabled ? true : false;
}
-
-
void Window::EnableInput( bool bEnable, bool bChild )
{
@@ -6833,8 +6508,6 @@ void Window::EnableInput( bool bEnable, bool bChild )
}
}
-
-
void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin,
const Window* pExcludeWindow )
{
@@ -6899,8 +6572,6 @@ void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin,
}
}
-
-
void Window::AlwaysEnableInput( bool bAlways, bool bChild )
{
@@ -6930,8 +6601,6 @@ void Window::AlwaysEnableInput( bool bAlways, bool bChild )
}
}
-
-
void Window::AlwaysDisableInput( bool bAlways, bool bChild )
{
@@ -6961,8 +6630,6 @@ void Window::AlwaysDisableInput( bool bAlways, bool bChild )
}
}
-
-
void Window::SetActivateMode( sal_uInt16 nMode )
{
@@ -6994,8 +6661,6 @@ void Window::SetActivateMode( sal_uInt16 nMode )
}
}
-
-
void Window::ToTop( sal_uInt16 nFlags )
{
@@ -7003,8 +6668,6 @@ void Window::ToTop( sal_uInt16 nFlags )
ImplFocusToTop( nFlags, IsReallyVisible() );
}
-
-
void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags )
{
@@ -7178,8 +6841,6 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags )
}
}
-
-
void Window::EnableAlwaysOnTop( bool bEnable )
{
@@ -7194,8 +6855,6 @@ void Window::EnableAlwaysOnTop( bool bEnable )
mpWindowImpl->mpFrame->SetAlwaysOnTop( bEnable );
}
-
-
void Window::setPosSizePixel( long nX, long nY,
long nWidth, long nHeight, sal_uInt16 nFlags )
{
@@ -7224,7 +6883,6 @@ void Window::setPosSizePixel( long nX, long nY,
if ( !(nFlags & WINDOW_POSSIZE_HEIGHT) )
nHeight = pWindow->mnOutHeight;
-
sal_uInt16 nSysFlags=0;
Window *pParent = GetParent();
@@ -7325,15 +6983,11 @@ void Window::setPosSizePixel( long nX, long nY,
}
}
-
-
Point Window::GetPosPixel() const
{
return mpWindowImpl->maPos;
}
-
-
Rectangle Window::GetDesktopRectPixel() const
{
Rectangle rRect;
@@ -7341,24 +6995,18 @@ Rectangle Window::GetDesktopRectPixel() const
return rRect;
}
-
-
Point Window::OutputToScreenPixel( const Point& rPos ) const
{
// relative to top level parent
return Point( rPos.X()+mnOutOffX, rPos.Y()+mnOutOffY );
}
-
-
Point Window::ScreenToOutputPixel( const Point& rPos ) const
{
// relative to top level parent
return Point( rPos.X()-mnOutOffX, rPos.Y()-mnOutOffY );
}
-
-
long Window::ImplGetUnmirroredOutOffX()
{
// revert mnOutOffX changes that were potentially made in ImplPosSizeWindow
@@ -7396,8 +7044,6 @@ Point Window::NormalizedScreenToOutputPixel( const Point& rPos ) const
return Point( rPos.X()-offx, rPos.Y()-mnOutOffY );
}
-
-
Point Window::OutputToAbsoluteScreenPixel( const Point& rPos ) const
{
// relative to the screen
@@ -7408,8 +7054,6 @@ Point Window::OutputToAbsoluteScreenPixel( const Point& rPos ) const
return p;
}
-
-
Point Window::AbsoluteScreenToOutputPixel( const Point& rPos ) const
{
// relative to the screen
@@ -7420,8 +7064,6 @@ Point Window::AbsoluteScreenToOutputPixel( const Point& rPos ) const
return p;
}
-
-
Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rRect ) const
{
// this method creates unmirrored screen coordinates to be compared with the desktop
@@ -7439,9 +7081,6 @@ Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rR
return Rectangle( p1, p2 );
}
-
-
-
Rectangle Window::GetWindowExtentsRelative( Window *pRelativeWindow ) const
{
// with decoration
@@ -7454,8 +7093,6 @@ Rectangle Window::GetClientWindowExtentsRelative( Window *pRelativeWindow ) cons
return ImplGetWindowExtentsRelative( pRelativeWindow, true );
}
-
-
Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bClientOnly ) const
{
SalFrameGeometry g = mpWindowImpl->mpFrame->GetGeometry();
@@ -7484,8 +7121,6 @@ Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bC
return Rectangle( aPos, aSize );
}
-
-
void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
{
@@ -7494,8 +7129,6 @@ void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
nHorzScroll, nVertScroll, nFlags & ~SCROLL_CLIP );
}
-
-
void Window::Scroll( long nHorzScroll, long nVertScroll,
const Rectangle& rRect, sal_uInt16 nFlags )
{
@@ -7507,8 +7140,6 @@ void Window::Scroll( long nHorzScroll, long nVertScroll,
ImplScroll( aRect, nHorzScroll, nVertScroll, nFlags );
}
-
-
void Window::Invalidate( sal_uInt16 nFlags )
{
@@ -7518,15 +7149,12 @@ void Window::Invalidate( sal_uInt16 nFlags )
ImplInvalidate( NULL, nFlags );
}
-
-
void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags )
{
if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
return;
-
OutputDevice *pOutDev = GetOutDev();
Rectangle aRect = pOutDev->ImplLogicToDevicePixel( rRect );
if ( !aRect.IsEmpty() )
@@ -7536,8 +7164,6 @@ void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags )
}
}
-
-
void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags )
{
@@ -7554,8 +7180,6 @@ void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags )
}
}
-
-
void Window::Validate( sal_uInt16 nFlags )
{
@@ -7565,8 +7189,6 @@ void Window::Validate( sal_uInt16 nFlags )
ImplValidate( NULL, nFlags );
}
-
-
bool Window::HasPaintEvent() const
{
@@ -7594,8 +7216,6 @@ bool Window::HasPaintEvent() const
return false;
}
-
-
void Window::Update()
{
@@ -7668,8 +7288,6 @@ void Window::Update()
Flush();
}
-
-
void Window::Flush()
{
@@ -7677,16 +7295,12 @@ void Window::Flush()
mpWindowImpl->mpFrame->Flush( aWinRect );
}
-
-
void Window::Sync()
{
mpWindowImpl->mpFrame->Sync();
}
-
-
void Window::SetUpdateMode( bool bUpdate )
{
@@ -7694,16 +7308,12 @@ void Window::SetUpdateMode( bool bUpdate )
StateChanged( STATE_CHANGE_UPDATEMODE );
}
-
-
void Window::GrabFocus()
{
ImplGrabFocus( 0 );
}
-
-
bool Window::HasFocus() const
{
@@ -7722,8 +7332,6 @@ bool Window::HasFocus() const
return (this == ImplGetSVData()->maWinData.mpFocusWin);
}
-
-
void Window::GrabFocusToDocument()
{
ImplGrabFocusToDocument(0);
@@ -7734,8 +7342,6 @@ void Window::SetFakeFocus( bool bFocus )
ImplGetWindowImpl()->mbFakeFocusSet = bFocus;
}
-
-
bool Window::HasChildPathFocus( bool bSystemWindow ) const
{
@@ -7754,8 +7360,6 @@ bool Window::HasChildPathFocus( bool bSystemWindow ) const
return false;
}
-
-
void Window::CaptureMouse()
{
@@ -7775,8 +7379,6 @@ void Window::CaptureMouse()
}
}
-
-
void Window::ReleaseMouse()
{
@@ -7793,16 +7395,12 @@ void Window::ReleaseMouse()
}
}
-
-
bool Window::IsMouseCaptured() const
{
return (this == ImplGetSVData()->maWinData.mpCaptureWin);
}
-
-
void Window::SetPointer( const Pointer& rPointer )
{
@@ -7816,8 +7414,6 @@ void Window::SetPointer( const Pointer& rPointer )
mpWindowImpl->mpFrame->SetPointer( ImplGetMousePointer() );
}
-
-
void Window::EnableChildPointerOverwrite( bool bOverwrite )
{
@@ -7831,8 +7427,6 @@ void Window::EnableChildPointerOverwrite( bool bOverwrite )
mpWindowImpl->mpFrame->SetPointer( ImplGetMousePointer() );
}
-
-
void Window::SetPointerPosPixel( const Point& rPos )
{
Point aPos = ImplOutputToFrame( rPos );
@@ -7854,8 +7448,6 @@ void Window::SetPointerPosPixel( const Point& rPos )
mpWindowImpl->mpFrame->SetPointerPos( aPos.X(), aPos.Y() );
}
-
-
Point Window::GetPointerPosPixel()
{
@@ -7869,8 +7461,6 @@ Point Window::GetPointerPosPixel()
return ImplFrameToOutput( aPos );
}
-
-
Point Window::GetLastPointerPosPixel()
{
@@ -7884,8 +7474,6 @@ Point Window::GetLastPointerPosPixel()
return ImplFrameToOutput( aPos );
}
-
-
void Window::ShowPointer( bool bVisible )
{
@@ -7899,8 +7487,6 @@ void Window::ShowPointer( bool bVisible )
}
}
-
-
Window::PointerState Window::GetPointerState()
{
PointerState aState;
@@ -7923,15 +7509,11 @@ Window::PointerState Window::GetPointerState()
return aState;
}
-
-
bool Window::IsMouseOver()
{
return ImplGetWinData()->mbMouseOver;
}
-
-
void Window::EnterWait()
{
@@ -7945,8 +7527,6 @@ void Window::EnterWait()
}
}
-
-
void Window::LeaveWait()
{
@@ -7963,8 +7543,6 @@ void Window::LeaveWait()
}
}
-
-
void Window::SetCursor( Cursor* pCursor )
{
@@ -7978,14 +7556,11 @@ void Window::SetCursor( Cursor* pCursor )
}
}
-
-
void Window::SetText( const OUString& rStr )
{
if (rStr == mpWindowImpl->maText)
return;
-
OUString oldTitle( mpWindowImpl->maText );
mpWindowImpl->maText = rStr;
@@ -8010,24 +7585,18 @@ void Window::SetText( const OUString& rStr )
StateChanged( STATE_CHANGE_TEXT );
}
-
-
OUString Window::GetText() const
{
return mpWindowImpl->maText;
}
-
-
OUString Window::GetDisplayText() const
{
return GetText();
}
-
-
const Wallpaper& Window::GetDisplayBackground() const
{
// FIXME: fix issue 52349, need to fix this really in
@@ -8054,8 +7623,6 @@ const Wallpaper& Window::GetDisplayBackground() const
return rBack;
}
-
-
const OUString& Window::GetHelpText() const
{
@@ -8091,8 +7658,6 @@ const OUString& Window::GetHelpText() const
return mpWindowImpl->maHelpText;
}
-
-
Window* Window::FindWindow( const Point& rPos ) const
{
@@ -8100,8 +7665,6 @@ Window* Window::FindWindow( const Point& rPos ) const
return ((Window*)this)->ImplFindWindow( aPos );
}
-
-
sal_uInt16 Window::GetChildCount() const
{
@@ -8116,8 +7679,6 @@ sal_uInt16 Window::GetChildCount() const
return nChildCount;
}
-
-
Window* Window::GetChild( sal_uInt16 nChild ) const
{
@@ -8134,8 +7695,6 @@ Window* Window::GetChild( sal_uInt16 nChild ) const
return NULL;
}
-
-
Window* Window::GetWindow( sal_uInt16 nType ) const
{
@@ -8225,8 +7784,6 @@ Window* Window::GetWindow( sal_uInt16 nType ) const
return NULL;
}
-
-
bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const
{
@@ -8245,8 +7802,6 @@ bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const
return false;
}
-
-
bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const
{
@@ -8255,8 +7810,6 @@ bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const
return ImplIsChild( pWindow, bSystemWindow );
}
-
-
const SystemEnvData* Window::GetSystemData() const
{
@@ -8275,8 +7828,6 @@ const SystemEnvData* Window::GetSystemData() const
return aRet;
}
-
-
void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow )
{
// be safe against re-entrance: first clear the old ref, then assign the new one
@@ -8287,8 +7838,6 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::
mpWindowImpl->mpVCLXWindow = pVCLXWindow;
}
-
-
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > Window::GetComponentInterface( sal_Bool bCreate )
{
if ( !mpWindowImpl->mxWindowPeer.is() && bCreate )
@@ -8300,8 +7849,6 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::
return mpWindowImpl->mxWindowPeer;
}
-
-
void Window::SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace )
{
UnoWrapperBase* pWrapper = Application::GetUnoWrapper();
@@ -8310,8 +7857,6 @@ void Window::SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun
pWrapper->SetWindowInterface( this, xIFace );
}
-
-
void Window::ImplCallDeactivateListeners( Window *pNew )
{
// no deactivation if the newly activated window is my child
@@ -8329,8 +7874,6 @@ void Window::ImplCallDeactivateListeners( Window *pNew )
}
}
-
-
void Window::ImplCallActivateListeners( Window *pOld )
{
// no activation if the old active window is my child
@@ -8361,8 +7904,6 @@ void Window::ImplCallActivateListeners( Window *pOld )
}
}
-
-
bool Window::ImplStopDnd()
{
bool bRet = false;
@@ -8377,15 +7918,11 @@ bool Window::ImplStopDnd()
return bRet;
}
-
-
void Window::ImplStartDnd()
{
GetDropTarget();
}
-
-
uno::Reference< XDropTarget > Window::GetDropTarget()
{
@@ -8444,8 +7981,6 @@ uno::Reference< XDropTarget > Window::GetDropTarget()
return uno::Reference< XDropTarget > ( mpWindowImpl->mxDNDListenerContainer, UNO_QUERY );
}
-
-
uno::Reference< XDragSource > Window::GetDragSource()
{
@@ -8511,15 +8046,11 @@ uno::Reference< XDragSource > Window::GetDragSource()
return uno::Reference< XDragSource > ();
}
-
-
uno::Reference< XDragGestureRecognizer > Window::GetDragGestureRecognizer()
{
return uno::Reference< XDragGestureRecognizer > ( GetDropTarget(), UNO_QUERY );
}
-
-
uno::Reference< XClipboard > Window::GetClipboard()
{
@@ -8547,8 +8078,6 @@ uno::Reference< XClipboard > Window::GetClipboard()
return static_cast < XClipboard * > (0);
}
-
-
uno::Reference< XClipboard > Window::GetPrimarySelection()
{
@@ -8592,10 +8121,8 @@ uno::Reference< XClipboard > Window::GetPrimarySelection()
return static_cast < XClipboard * > (0);
}
-
// Accessibility
-
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( bool bCreate )
{
// do not optimize hierarchy for the top level border win (ie, when there is no parent)
@@ -8831,7 +8358,6 @@ Window* Window::GetAccessibleChildWindow( sal_uInt16 n )
return pChild;
}
-
void Window::SetAccessibleRole( sal_uInt16 nRole )
{
if ( !mpWindowImpl->mpAccessibleInfos )
@@ -8943,7 +8469,6 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
case WINDOW_WORKWINDOW: nRole = accessibility::AccessibleRole::ROOT_PANE; break;
-
case WINDOW_SCROLLBARBOX: nRole = accessibility::AccessibleRole::FILLER; break;
case WINDOW_HELPTEXTWINDOW: nRole = accessibility::AccessibleRole::TOOL_TIP; break;
@@ -9213,8 +8738,6 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle&
mpOutDevData->mpRecordLayout = NULL;
}
-
-
void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly )
{
DrawSelectionBackground( rRect, highlight, bChecked, bDrawBorder, bDrawExtBorderOnly, 0, NULL, NULL );
@@ -9242,7 +8765,6 @@ void Window::DrawSelectionBackground( const Rectangle& rRect,
const StyleSettings& rStyles = GetSettings().GetStyleSettings();
-
// colors used for item highlighting
Color aSelectionBorderCol( pPaintColor ? *pPaintColor : rStyles.GetHighlightColor() );
Color aSelectionFillCol( aSelectionBorderCol );
@@ -9361,7 +8883,6 @@ void Window::DrawSelectionBackground( const Rectangle& rRect,
}
}
-
if( bDark )
{
DrawRect( aRect );
@@ -9393,7 +8914,6 @@ Window* Window::GetPreferredKeyInputWindow()
return this;
}
-
bool Window::IsScrollable() const
{
// check for scrollbars
@@ -9579,7 +9099,6 @@ uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr
// Feed any with operating system's window handle
-
// common: first any is VCL pointer to window (for VCL canvas)
aArg[ 0 ] = makeAny( reinterpret_cast<sal_Int64>(this) );
@@ -9769,7 +9288,6 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
// get rid of virtual device now so they don't pile up during recursive calls
delete pMaskedDevice, pMaskedDevice = NULL;
-
for( Window* pChild = mpWindowImpl->mpFirstChild; pChild; pChild = pChild->mpWindowImpl->mpNext )
{
if( pChild->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame && pChild->IsVisible() )
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 73fe6749c3a1..6b5b558a04b2 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <limits.h>
#include <tools/debug.hxx>
#include <tools/poly.hxx>
@@ -48,20 +47,14 @@
using namespace com::sun::star;
-
-
#define IMPL_MAXSAVEBACKSIZE (640*480)
#define IMPL_MAXALLSAVEBACKSIZE (800*600*2)
-
-
struct ImplFocusDelData : public ImplDelData
{
Window* mpFocusWin;
};
-
-
bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const
{
// check for overlapping window
@@ -148,8 +141,6 @@ bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const
return false;
}
-
-
void Window::ImplSaveOverlapBackground()
{
DBG_ASSERT( !mpWindowImpl->mpOverlapData->mpSaveBackDev, "Window::ImplSaveOverlapBackground() - Background already saved" );
@@ -191,8 +182,6 @@ void Window::ImplSaveOverlapBackground()
}
}
-
-
bool Window::ImplRestoreOverlapBackground( Region& rInvRegion )
{
if ( mpWindowImpl->mpOverlapData->mpSaveBackDev )
@@ -232,8 +221,6 @@ bool Window::ImplRestoreOverlapBackground( Region& rInvRegion )
return false;
}
-
-
void Window::ImplDeleteOverlapBackground()
{
if ( mpWindowImpl->mpOverlapData->mpSaveBackDev )
@@ -261,8 +248,6 @@ void Window::ImplDeleteOverlapBackground()
}
}
-
-
void Window::ImplInvalidateAllOverlapBackgrounds()
{
Window* pWindow = mpWindowImpl->mpFrameData->mpFirstBackWin;
@@ -294,8 +279,6 @@ void Window::ImplInvalidateAllOverlapBackgrounds()
}
}
-
-
void Window::ShowFocus( const Rectangle& rRect )
{
if( mpWindowImpl->mbInShowFocus )
@@ -341,8 +324,6 @@ void Window::ShowFocus( const Rectangle& rRect )
mpWindowImpl->mbInShowFocus = false;
}
-
-
void Window::HideFocus()
{
@@ -376,8 +357,6 @@ void Window::HideFocus()
mpWindowImpl->mbInHideFocus = false;
}
-
-
void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags )
{
if ( !IsDeviceOutputNecessary() )
@@ -411,8 +390,6 @@ void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags )
mpGraphics->Invert( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), nSalFlags, this );
}
-
-
void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags )
{
if ( !IsDeviceOutputNecessary() )
@@ -448,8 +425,6 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags )
mpGraphics->Invert( nPoints, pPtAry, nSalFlags, this );
}
-
-
void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags )
{
ImplWinData* pWinData = ImplGetWinData();
@@ -476,8 +451,6 @@ void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags )
mpWindowImpl->mbTrackVisible = true;
}
-
-
void Window::HideTracking()
{
if ( mpWindowImpl->mbTrackVisible )
@@ -489,8 +462,6 @@ void Window::HideTracking()
}
}
-
-
void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags )
{
OutputDevice *pOutDev = GetOutDev();
@@ -553,8 +524,6 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags )
}
}
-
-
void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags )
{
sal_uInt16 nPoints = rPoly.GetSize();
@@ -606,8 +575,6 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags )
pGraphics->Invert( nPoints, pPtAry, SAL_INVERT_TRACKFRAME, this );
}
-
-
IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -633,8 +600,6 @@ IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer )
return 0;
}
-
-
void Window::StartTracking( sal_uInt16 nFlags )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -662,8 +627,6 @@ void Window::StartTracking( sal_uInt16 nFlags )
CaptureMouse();
}
-
-
void Window::EndTracking( sal_uInt16 nFlags )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -705,15 +668,11 @@ void Window::EndTracking( sal_uInt16 nFlags )
}
}
-
-
bool Window::IsTracking() const
{
return (ImplGetSVData()->maWinData.mpTrackWin == this);
}
-
-
void Window::StartAutoScroll( sal_uInt16 nFlags )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -729,8 +688,6 @@ void Window::StartAutoScroll( sal_uInt16 nFlags )
pSVData->maAppData.mpWheelWindow = new ImplWheelWindow( this );
}
-
-
void Window::EndAutoScroll()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -745,8 +702,6 @@ void Window::EndAutoScroll()
}
}
-
-
void Window::SaveBackground( const Point& rPos, const Size& rSize,
const Point& rDestOff, VirtualDevice& rSaveDevice )
{
@@ -779,8 +734,6 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize,
rSaveDevice.DrawOutDev( rDestOff, rSize, rPos, rSize, *this );
}
-
-
sal_uIntPtr Window::SaveFocus()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -795,8 +748,6 @@ sal_uIntPtr Window::SaveFocus()
return 0;
}
-
-
bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore )
{
if ( !nSaveId )
@@ -818,8 +769,6 @@ bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore )
}
}
-
-
void Window::SetZoom( const Fraction& rZoom )
{
if ( mpWindowImpl->maZoom != rZoom )
@@ -829,15 +778,11 @@ void Window::SetZoom( const Fraction& rZoom )
}
}
-
-
inline long WinFloatRound( double fVal )
{
return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) );
}
-
-
void Window::SetZoomedPointFont( const Font& rFont )
{
const Fraction& rZoom = GetZoom();
@@ -876,8 +821,6 @@ void Window::SetZoomedPointFont( const Font& rFont )
SetPointFont( rFont );
}
-
-
long Window::CalcZoom( long nCalc ) const
{
@@ -892,8 +835,6 @@ long Window::CalcZoom( long nCalc ) const
return nCalc;
}
-
-
void Window::SetControlFont()
{
if ( mpWindowImpl->mpControlFont )
@@ -904,8 +845,6 @@ void Window::SetControlFont()
}
}
-
-
void Window::SetControlFont( const Font& rFont )
{
if ( rFont == Font() )
@@ -926,8 +865,6 @@ void Window::SetControlFont( const Font& rFont )
StateChanged( STATE_CHANGE_CONTROLFONT );
}
-
-
Font Window::GetControlFont() const
{
if ( mpWindowImpl->mpControlFont )
@@ -939,8 +876,6 @@ Font Window::GetControlFont() const
}
}
-
-
void Window::SetControlForeground()
{
if ( mpWindowImpl->mbControlForeground )
@@ -951,8 +886,6 @@ void Window::SetControlForeground()
}
}
-
-
void Window::SetControlForeground( const Color& rColor )
{
if ( rColor.GetTransparency() )
@@ -975,8 +908,6 @@ void Window::SetControlForeground( const Color& rColor )
}
}
-
-
void Window::SetControlBackground()
{
if ( mpWindowImpl->mbControlBackground )
@@ -987,8 +918,6 @@ void Window::SetControlBackground()
}
}
-
-
void Window::SetControlBackground( const Color& rColor )
{
if ( rColor.GetTransparency() )
@@ -1011,8 +940,6 @@ void Window::SetControlBackground( const Color& rColor )
}
}
-
-
Size Window::CalcWindowSize( const Size& rOutSz ) const
{
Size aSz = rOutSz;
@@ -1021,8 +948,6 @@ Size Window::CalcWindowSize( const Size& rOutSz ) const
return aSz;
}
-
-
Size Window::CalcOutputSize( const Size& rWinSz ) const
{
Size aSz = rWinSz;
@@ -1031,8 +956,6 @@ Size Window::CalcOutputSize( const Size& rWinSz ) const
return aSz;
}
-
-
Font Window::GetDrawPixelFont( OutputDevice* pDev ) const
{
Font aFont = GetPointFont();
@@ -1043,8 +966,6 @@ Font Window::GetDrawPixelFont( OutputDevice* pDev ) const
return aFont;
}
-
-
long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const
{
long nP = nPixels;
@@ -1059,8 +980,6 @@ long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const
return nP;
}
-
-
static void lcl_HandleScrollHelper( ScrollBar* pScrl, long nN, bool isMultiplyByLineSize )
{
if ( pScrl && nN && pScrl->IsEnabled() && pScrl->IsInputEnabled() && ! pScrl->IsInModalMode() )
@@ -1251,10 +1170,6 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd,
return bRet;
}
-
-
-
-
// Note that when called for COMMAND_WHEEL above, despite its name,
// pVScrl isn't necessarily the vertical scroll bar. Depending on
// whether the scroll is horizontal or vertical, it is either the
@@ -1282,7 +1197,6 @@ void Window::EnableDocking( bool bEnable )
ImplGetDockingManager()->RemoveWindow( this );
}
-
// retrieves the list of owner draw decorated windows for this window hiearchy
::std::vector<Window *>& Window::ImplGetOwnerDrawList()
{
@@ -1879,7 +1793,6 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
return true;
}
-
bool Window::set_property(const OString &rKey, const OString &rValue)
{
if ((rKey == "label") || (rKey == "title") || (rKey == "text") )
diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx
index 88430780f077..6774a022ad4f 100644
--- a/vcl/source/window/window3.cxx
+++ b/vcl/source/window/window3.cxx
@@ -17,28 +17,21 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "vcl/window.hxx"
#include "vcl/waitobj.hxx"
#include "vcl/button.hxx"
-
-
WaitObject::~WaitObject()
{
if ( mpWindow )
mpWindow->LeaveWait();
}
-
-
Size Window::GetOptimalSize() const
{
return Size();
}
-
-
void Window::ImplAdjustNWFSizes()
{
switch( GetType() )
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 17f745d291c0..8a061b5821e4 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -52,12 +52,8 @@
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
#include <com/sun/star/awt/MouseEvent.hpp>
-
-
#define IMPL_MIN_NEEDSYSWIN 49
-
-
bool ImplCallPreNotify( NotifyEvent& rEvt )
{
return Application::CallEventHooks( rEvt )
@@ -168,8 +164,6 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos,
return false;
}
-
-
static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -200,8 +194,6 @@ static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos )
}
}
-
-
static void ImplSetMousePointer( Window* pChild )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -211,8 +203,6 @@ static void ImplSetMousePointer( Window* pChild )
pChild->ImplGetFrame()->SetPointer( pChild->ImplGetMousePointer() );
}
-
-
static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL,
bool bMouse = false, Point* pPos = NULL )
{
@@ -254,8 +244,6 @@ static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL
return false;
}
-
-
/* #i34277# delayed context menu activation;
* necessary if there already was a popup menu running.
*/
@@ -767,7 +755,6 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
if ( aDelData.IsDead() )
return true;
-
if ( nSVEvent == EVENT_MOUSEMOVE )
pChild->ImplGetWindowImpl()->mpFrameData->mbInMouseMove = false;
@@ -850,8 +837,6 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
return bRet;
}
-
-
static Window* ImplGetKeyInputWindow( Window* pWindow )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -893,8 +878,6 @@ static Window* ImplGetKeyInputWindow( Window* pWindow )
return pChild;
}
-
-
static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
sal_uInt16 nKeyCode, sal_uInt16 nCharCode, sal_uInt16 nRepeat, bool bForward )
{
@@ -1183,8 +1166,6 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
return nRet;
}
-
-
static bool ImplHandleExtTextInput( Window* pWindow,
const OUString& rText,
const sal_uInt16* pTextAttr,
@@ -1278,8 +1259,6 @@ static bool ImplHandleExtTextInput( Window* pWindow,
return !ImplCallCommand( pChild, COMMAND_EXTTEXTINPUT, &aData );
}
-
-
static bool ImplHandleEndExtTextInput( Window* /* pWindow */ )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -1307,8 +1286,6 @@ static bool ImplHandleEndExtTextInput( Window* /* pWindow */ )
return nRet;
}
-
-
static void ImplHandleExtTextInputPos( Window* pWindow,
Rectangle& rRect, long& rInputWidth,
bool * pVertical )
@@ -1355,8 +1332,6 @@ static void ImplHandleExtTextInputPos( Window* pWindow,
= pChild != 0 && pChild->GetInputContext().GetFont().IsVertical();
}
-
-
static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang )
{
Window* pChild = ImplGetKeyInputWindow( pWindow );
@@ -1364,8 +1339,6 @@ static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang
return !ImplCallCommand( pChild, COMMAND_INPUTCONTEXTCHANGE, &aData );
}
-
-
static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos,
const CommandWheelData* pWheelData )
{
@@ -1388,8 +1361,6 @@ static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos,
return false;
}
-
-
static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEvt, bool scaleDirectly = false )
{
ImplDelData aDogTag( pWindow );
@@ -1495,7 +1466,6 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv
return !bRet;
}
-
#define IMPL_PAINT_CHECKRTL ((sal_uInt16)0x0020)
static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool bImmediateUpdate )
@@ -1528,8 +1498,6 @@ static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool
}
}
-
-
static void KillOwnPopups( Window* pWindow )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -1542,8 +1510,6 @@ static void KillOwnPopups( Window* pWindow )
}
}
-
-
void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight )
{
if( pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE) )
@@ -1611,8 +1577,6 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight )
pWindow->ImplGetWindowImpl()->mpFrameData->mbMinimized = bMinimized;
}
-
-
static void ImplHandleMove( Window* pWindow )
{
if( pWindow->ImplGetWindowImpl()->mbFrame && pWindow->ImplIsFloatingWindow() && pWindow->IsReallyVisible() )
@@ -1638,16 +1602,12 @@ static void ImplHandleMove( Window* pWindow )
}
-
-
static void ImplHandleMoveResize( Window* pWindow, long nNewWidth, long nNewHeight )
{
ImplHandleMove( pWindow );
ImplHandleResize( pWindow, nNewWidth, nNewHeight );
}
-
-
static void ImplActivateFloatingWindows( Window* pWindow, bool bActive )
{
// First check all overlapping windows
@@ -1666,9 +1626,6 @@ static void ImplActivateFloatingWindows( Window* pWindow, bool bActive )
}
}
-
-
-
IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl)
{
ImplGetWindowImpl()->mpFrameData->mnFocusId = 0;
@@ -1777,13 +1734,10 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl)
return 0;
}
-
-
static void ImplHandleGetFocus( Window* pWindow )
{
pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = true;
-
// execute Focus-Events after a delay, such that SystemChildWindows
// do not blink when they receive focus
if ( !pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId )
@@ -1796,8 +1750,6 @@ static void ImplHandleGetFocus( Window* pWindow )
}
}
-
-
static void ImplHandleLoseFocus( Window* pWindow )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -1836,7 +1788,6 @@ static void ImplHandleLoseFocus( Window* pWindow )
pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true );
}
-
struct DelayedCloseEvent
{
Window* pWindow;
@@ -1916,8 +1867,6 @@ void ImplHandleClose( Window* pWindow )
}
}
-
-
static void ImplHandleUserEvent( ImplSVEvent* pSVEvent )
{
if ( pSVEvent )
@@ -1946,8 +1895,6 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent )
}
}
-
-
static sal_uInt16 ImplGetMouseMoveMode( SalMouseEvent* pEvent )
{
sal_uInt16 nMode = 0;
@@ -1960,8 +1907,6 @@ static sal_uInt16 ImplGetMouseMoveMode( SalMouseEvent* pEvent )
return nMode;
}
-
-
static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent )
{
sal_uInt16 nMode = 0;
@@ -1978,8 +1923,6 @@ static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent )
return nMode;
}
-
-
inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent )
{
return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, true,
@@ -1988,8 +1931,6 @@ inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent )
ImplGetMouseMoveMode( pEvent ) );
}
-
-
inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent )
{
return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, false,
@@ -1998,8 +1939,6 @@ inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent )
ImplGetMouseMoveMode( pEvent ) );
}
-
-
inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent )
{
return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONDOWN, false,
@@ -2013,8 +1952,6 @@ inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent
ImplGetMouseButtonMode( pEvent ) );
}
-
-
inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent )
{
return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONUP, false,
@@ -2028,15 +1965,11 @@ inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent )
ImplGetMouseButtonMode( pEvent ) );
}
-
-
static bool ImplHandleSalMouseActivate( Window* /*pWindow*/, SalMouseActivateEvent* /*pEvent*/ )
{
return false;
}
-
-
static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt16 nEvent )
{
// Find SystemWindow and its Menubar and let it dispatch the command
@@ -2078,8 +2011,6 @@ static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt
return nRet;
}
-
-
static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -2117,8 +2048,6 @@ static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent )
}
}
-
-
static void ImplHandleInputLanguageChange( Window* pWindow )
{
// find window
@@ -2129,8 +2058,6 @@ static void ImplHandleInputLanguageChange( Window* pWindow )
ImplCallCommand( pChild, COMMAND_INPUTLANGUAGECHANGE );
}
-
-
static void ImplHandleSalSettings( sal_uInt16 nEvent )
{
Application* pApp = GetpApp();
@@ -2183,8 +2110,6 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent )
}
}
-
-
static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEvent* pEvt )
{
Rectangle aCursorRect;
@@ -2205,8 +2130,6 @@ static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEve
}
}
-
-
static bool ImplHandleShowDialog( Window* pWindow, int nDialogId )
{
if( ! pWindow )
@@ -2222,8 +2145,6 @@ static bool ImplHandleShowDialog( Window* pWindow, int nDialogId )
return ImplCallCommand( pWindow, COMMAND_SHOWDIALOG, &aCmdData );
}
-
-
static void ImplHandleSurroundingTextRequest( Window *pWindow,
OUString& rText,
Selection &rSelRange )
@@ -2245,8 +2166,6 @@ static void ImplHandleSurroundingTextRequest( Window *pWindow,
}
}
-
-
static void ImplHandleSalSurroundingTextRequest( Window *pWindow,
SalSurroundingTextRequestEvent *pEvt )
{
@@ -2270,8 +2189,6 @@ static void ImplHandleSalSurroundingTextRequest( Window *pWindow,
pEvt->mnEnd = aSelRange.Max();
}
-
-
static void ImplHandleSurroundingTextSelectionChange( Window *pWindow,
sal_uLong nStart,
sal_uLong nEnd )
@@ -2284,8 +2201,6 @@ static void ImplHandleSurroundingTextSelectionChange( Window *pWindow,
}
}
-
-
static void ImplHandleStartReconversion( Window *pWindow )
{
Window* pChild = ImplGetKeyInputWindow( pWindow );
@@ -2293,8 +2208,6 @@ static void ImplHandleStartReconversion( Window *pWindow )
ImplCallCommand( pChild, COMMAND_PREPARERECONVERSION );
}
-
-
static void ImplHandleSalQueryCharPosition( Window *pWindow,
SalQueryCharPositionEvent *pEvt )
{
@@ -2338,8 +2251,6 @@ static void ImplHandleSalQueryCharPosition( Window *pWindow,
}
}
-
-
bool ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/,
sal_uInt16 nEvent, const void* pEvent )
{
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 9c2060c77a50..d1cd7f35f6e9 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/debug.hxx>
#include <tools/rc.h>
@@ -34,8 +33,6 @@
#include <brdwin.hxx>
#include <window.h>
-
-
void WorkWindow::ImplInitWorkWindowData()
{
mnIcon = 0; // Should be removed in the next top level update - now in SystemWindow
@@ -47,8 +44,6 @@ void WorkWindow::ImplInitWorkWindowData()
mbFullScreenMode = false;
}
-
-
void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData )
{
sal_uInt16 nFrameStyle = BORDERWINDOW_STYLE_FRAME;
@@ -73,8 +68,6 @@ void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pS
SetActivateMode( ACTIVATE_MODE_GRABFOCUS );
}
-
-
void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken )
{
if( aSystemWorkWindowToken.hasValue() )
@@ -90,16 +83,12 @@ void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::st
ImplInit( pParent, nStyle, NULL );
}
-
-
WorkWindow::WorkWindow( WindowType nType ) :
SystemWindow( nType )
{
ImplInitWorkWindowData();
}
-
-
WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) :
SystemWindow( WINDOW_WORKWINDOW )
{
@@ -107,8 +96,6 @@ WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle, NULL );
}
-
-
WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) :
SystemWindow( WINDOW_WORKWINDOW )
{
@@ -117,8 +104,6 @@ WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSyst
ImplInit( pParent, nStyle, aSystemWorkWindowToken );
}
-
-
WorkWindow::WorkWindow( SystemParentData* pParent ) :
SystemWindow( WINDOW_WORKWINDOW )
{
@@ -127,8 +112,6 @@ WorkWindow::WorkWindow( SystemParentData* pParent ) :
ImplInit( NULL, 0, pParent );
}
-
-
WorkWindow::~WorkWindow()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -139,8 +122,6 @@ WorkWindow::~WorkWindow()
}
}
-
-
void WorkWindow::ShowFullScreenMode( bool bFullScreenMode )
{
return ShowFullScreenMode( bFullScreenMode, GetScreenNumber());
@@ -171,8 +152,6 @@ void WorkWindow::ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScr
}
}
-
-
void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags )
{
return StartPresentationMode( bPresentation, nFlags, GetScreenNumber());
@@ -222,8 +201,6 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s
}
}
-
-
bool WorkWindow::IsMinimized() const
{
//return mpWindowImpl->mpFrameData->mbMinimized;
@@ -232,8 +209,6 @@ bool WorkWindow::IsMinimized() const
return (( aState.mnState & WINDOWSTATE_STATE_MINIMIZED ) != 0);
}
-
-
bool WorkWindow::SetPluginParent( SystemParentData* pParent )
{
DBG_ASSERT( ! mbPresentationMode && ! mbFullScreenMode, "SetPluginParent in fullscreen or presentation mode !" );
@@ -259,7 +234,6 @@ void WorkWindow::ImplSetFrameState( sal_uLong aFrameState )
mpWindowImpl->mpFrame->SetWindowState( &aState );
}
-
void WorkWindow::Minimize()
{
ImplSetFrameState( WINDOWSTATE_STATE_MINIMIZED );