diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-08-13 07:54:47 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-08-13 07:56:32 +0200 |
commit | fd3ec89f4a34e851fd74ea7d1942547ea0cafb0a (patch) | |
tree | 07654b8ae40dc2abf657559ad8b88e97d4ad40ea | |
parent | 1fc2490f0da61adc616ac2c4670c9189afd557a8 (diff) |
callcatcher: Remove unused ImplDockingWindowWrapper's methods.
-rw-r--r-- | unusedcode.easy | 14 | ||||
-rw-r--r-- | vcl/inc/vcl/dockwin.hxx | 18 | ||||
-rw-r--r-- | vcl/source/window/dockmgr.cxx | 156 |
3 files changed, 2 insertions, 186 deletions
diff --git a/unusedcode.easy b/unusedcode.easy index c6873a8020b4..d495e0e77cd7 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -344,20 +344,6 @@ ImpSvtData::~ImpSvtData() ImplBorderWindow::ImplBorderWindow(Window*, long, unsigned short, com::sun::star::uno::Any const&) ImplBorderWindow::SetHelpButton(unsigned char) ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Locale&) const -ImplDockingWindowWrapper::GetFloatingPos() const -ImplDockingWindowWrapper::GetMaxOutputSizePixel() const -ImplDockingWindowWrapper::GetMinOutputSizePixel() const -ImplDockingWindowWrapper::GetOutputSizePixel() const -ImplDockingWindowWrapper::GetRollUpOutputSizePixel() const -ImplDockingWindowWrapper::IsPined() const -ImplDockingWindowWrapper::IsRollUp() const -ImplDockingWindowWrapper::IsTitleButtonVisible(unsigned short) const -ImplDockingWindowWrapper::RollDown() -ImplDockingWindowWrapper::RollUp() -ImplDockingWindowWrapper::SetFloatingPos(Point const&) -ImplDockingWindowWrapper::SetOutputSizePixel(Size const&) -ImplDockingWindowWrapper::SetPin(unsigned char) -ImplDockingWindowWrapper::SetRollUpOutputSizePixel(Size const&) ImplEntryList::IsEntrySelected(String const&) const ImplFontSelectData::ImplFontSelectData(ImplFontData const&, Size const&, float, int, bool) ImplImageList::GetImageCount() const diff --git a/vcl/inc/vcl/dockwin.hxx b/vcl/inc/vcl/dockwin.hxx index beeac2e51b59..bd6f9a761834 100644 --- a/vcl/inc/vcl/dockwin.hxx +++ b/vcl/inc/vcl/dockwin.hxx @@ -166,23 +166,10 @@ public: long Notify( NotifyEvent& rNEvt ); void ShowTitleButton( sal_uInt16 nButton, sal_Bool bVisible = sal_True ); - sal_Bool IsTitleButtonVisible( sal_uInt16 nButton ) const; - - void SetPin( sal_Bool bPin ); - sal_Bool IsPined() const; - - void RollUp(); - void RollDown(); - sal_Bool IsRollUp() const; - - void SetRollUpOutputSizePixel( const Size& rSize ); - Size GetRollUpOutputSizePixel() const; void SetMinOutputSizePixel( const Size& rSize ); - const Size& GetMinOutputSizePixel() const; void SetMaxOutputSizePixel( const Size& rSize ); - const Size& GetMaxOutputSizePixel() const; sal_Bool IsDocking() const { return mbDocking; } sal_Bool IsDockable() const { return mbDockable; } @@ -193,9 +180,6 @@ public: sal_Bool IsFloatingMode() const; FloatingWindow* GetFloatingWindow() const { return mpFloatWin; } - void SetFloatingPos( const Point& rNewPos ); - Point GetFloatingPos() const; - void SetFloatStyle( WinBits nWinStyle ); WinBits GetFloatStyle() const; @@ -207,8 +191,6 @@ public: { mpDockingWindow->SetPosSizePixel( rNewPos, rNewSize ); } Point GetPosPixel() const; Size GetSizePixel() const; - void SetOutputSizePixel( const Size& rNewSize ); - Size GetOutputSizePixel() const; }; class VCL_DLLPUBLIC DockingManager diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 576c94a800ef..aaad59fc3411 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -1026,14 +1026,8 @@ void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt ) nTrackStyle = SHOWTRACK_BIG; Rectangle aShowTrackRect = aTrackRect; aShowTrackRect.SetPos( GetWindow()->ImplFrameToOutput( aShowTrackRect.TopLeft() ) ); - //if( bFloatMode ) - GetWindow()->ShowTracking( aShowTrackRect, nTrackStyle ); - /*else - { - GetWindow()->HideTracking(); - Point aPt( GetWindow()->GetParent()->ScreenToOutputPixel( aTrackRect.TopLeft() ) ); - GetWindow()->SetPosPixel( aPt ); - }*/ + + GetWindow()->ShowTracking( aShowTrackRect, nTrackStyle ); // Maus-Offset neu berechnen, da Rechteck veraendert werden // konnte @@ -1125,19 +1119,6 @@ sal_Bool ImplDockingWindowWrapper::PrepareToggleFloatingMode() sal_Bool ImplDockingWindowWrapper::Close() { // TODO: send event -/* - ImplDelData aDelData; - ImplAddDel( &aDelData ); - GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE ); - if ( aDelData.IsDelete() ) - return sal_False; - ImplRemoveDel( &aDelData ); - - if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() ) - return sal_False; - - GetWindow()->Show( sal_False, SHOW_NOFOCUSCHANGE ); - */ return sal_True; } @@ -1224,21 +1205,6 @@ void ImplDockingWindowWrapper::ShowTitleButton( sal_uInt16 nButton, sal_Bool bVi // ----------------------------------------------------------------------- -sal_Bool ImplDockingWindowWrapper::IsTitleButtonVisible( sal_uInt16 nButton ) const -{ - if ( mpFloatWin ) - return mpFloatWin->IsTitleButtonVisible( nButton ); - else - { - if ( nButton == TITLE_BUTTON_DOCKING ) - return mbDockBtn; - else // if ( nButton == TITLE_BUTTON_HIDE ) - return mbHideBtn; - } -} - -// ----------------------------------------------------------------------- - void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLong nFlags ) { // do nothing if window is floating @@ -1377,17 +1343,6 @@ void ImplDockingWindowWrapper::SetFloatingMode( sal_Bool bFloatMode ) : mnFloatBits, this ); - // reduce the border width for seamless NWF painting - // (especially for the toolbar gradient on Windows XP) - /*AllSettings aSettings( pWin->GetSettings() ); - StyleSettings aStyleSettings( aSettings.GetStyleSettings() ); - aStyleSettings.SetBorderSize( 0 ); - aSettings.SetStyleSettings( aStyleSettings ); - pWin->SetSettings( aSettings );*/ - -// mpFloatWin = pWin; - - GetWindow()->mpWindowImpl->mpBorderWindow = NULL; GetWindow()->mpWindowImpl->mnLeftBorder = 0; GetWindow()->mpWindowImpl->mnTopBorder = 0; @@ -1516,94 +1471,9 @@ Size ImplDockingWindowWrapper::GetSizePixel() const } // ----------------------------------------------------------------------- - -void ImplDockingWindowWrapper::SetOutputSizePixel( const Size& rNewSize ) -{ - if ( mpFloatWin ) - mpFloatWin->SetOutputSizePixel( rNewSize ); - else - GetWindow()->SetOutputSizePixel( rNewSize ); -} - -// ----------------------------------------------------------------------- - -Size ImplDockingWindowWrapper::GetOutputSizePixel() const -{ - if ( mpFloatWin ) - return mpFloatWin->GetOutputSizePixel(); - else - return mpDockingWindow->GetOutputSizePixel(); -} - -Point ImplDockingWindowWrapper::GetFloatingPos() const -{ - if ( mpFloatWin ) - { - //Rectangle aRect = mpFloatWin->GetWindow( WINDOW_CLIENT)->GetWindowExtentsRelative( mpFloatWin->GetParent() ); - WindowStateData aData; - aData.SetMask( WINDOWSTATE_MASK_POS ); - mpFloatWin->GetWindowStateData( aData ); - Point aPos( aData.GetX(), aData.GetY() ); - aPos = mpFloatWin->GetParent()->ImplGetFrameWindow()->AbsoluteScreenToOutputPixel( aPos ); - return aPos; - } - else - return maFloatPos; -} - -// ----------------------------------------------------------------------- // old inlines from DockingWindow // ----------------------------------------------------------------------- -void ImplDockingWindowWrapper::SetPin( sal_Bool bPin ) -{ - if ( mpFloatWin ) - mpFloatWin->SetPin( bPin ); - mbPined = bPin; -} - -sal_Bool ImplDockingWindowWrapper::IsPined() const -{ - if ( mpFloatWin ) - return mpFloatWin->IsPined(); - return mbPined; -} - -void ImplDockingWindowWrapper::RollUp() -{ - if ( mpFloatWin ) - mpFloatWin->RollUp(); - mbRollUp = sal_True; -} - -void ImplDockingWindowWrapper::RollDown() -{ - if ( mpFloatWin ) - mpFloatWin->RollDown(); - mbRollUp = sal_False; -} - -sal_Bool ImplDockingWindowWrapper::IsRollUp() const -{ - if ( mpFloatWin ) - return mpFloatWin->IsRollUp(); - return mbRollUp; -} - -void ImplDockingWindowWrapper::SetRollUpOutputSizePixel( const Size& rSize ) -{ - if ( mpFloatWin ) - mpFloatWin->SetRollUpOutputSizePixel( rSize ); - maRollUpOutSize = rSize; -} - -Size ImplDockingWindowWrapper::GetRollUpOutputSizePixel() const -{ - if ( mpFloatWin ) - return mpFloatWin->GetRollUpOutputSizePixel(); - return maRollUpOutSize; -} - void ImplDockingWindowWrapper::SetMinOutputSizePixel( const Size& rSize ) { if ( mpFloatWin ) @@ -1618,28 +1488,6 @@ void ImplDockingWindowWrapper::SetMaxOutputSizePixel( const Size& rSize ) maMaxOutSize = rSize; } -const Size& ImplDockingWindowWrapper::GetMinOutputSizePixel() const -{ - if ( mpFloatWin ) - return mpFloatWin->GetMinOutputSizePixel(); - return maMinOutSize; -} - -const Size& ImplDockingWindowWrapper::GetMaxOutputSizePixel() const -{ - if ( mpFloatWin ) - return mpFloatWin->GetMaxOutputSizePixel(); - return maMaxOutSize; -} - -void ImplDockingWindowWrapper::SetFloatingPos( const Point& rNewPos ) -{ - if ( mpFloatWin ) - mpFloatWin->SetPosPixel( rNewPos ); - else - maFloatPos = rNewPos; -} - sal_Bool ImplDockingWindowWrapper::IsFloatingMode() const { return (mpFloatWin != NULL); |