diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-12-12 09:37:21 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-12-12 13:27:12 +0000 |
commit | a705b8fe9d4f57fb51e2e4bf474dfde4bf58337e (patch) | |
tree | b1c83f5cf0422f5f83c967a309140414156ac91f /vcl | |
parent | 6f6056b62e2107b325624832d851b09711a11dd8 (diff) |
callcatcher: update unused code list
Change-Id: Iff29c1f0a795d920a071eadc64e6639ff7506fff
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/vcl/graphictools.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/menubtn.hxx | 11 | ||||
-rw-r--r-- | vcl/source/control/menubtn.cxx | 67 | ||||
-rw-r--r-- | vcl/source/gdi/graphictools.cxx | 138 |
4 files changed, 1 insertions, 217 deletions
diff --git a/vcl/inc/vcl/graphictools.hxx b/vcl/inc/vcl/graphictools.hxx index 5199bb96f21e..c8713fdc2f23 100644 --- a/vcl/inc/vcl/graphictools.hxx +++ b/vcl/inc/vcl/graphictools.hxx @@ -138,8 +138,6 @@ public: double getMiterLimit () const; /// Get an array of "on" and "off" lengths for stroke dashing void getDashArray ( DashArray& ) const; - /// Query a textual representation of the object's content - ::rtl::OString toString () const; // mutators /// Set path to stroke diff --git a/vcl/inc/vcl/menubtn.hxx b/vcl/inc/vcl/menubtn.hxx index 4eae53f87b6b..46ead53c22df 100644 --- a/vcl/inc/vcl/menubtn.hxx +++ b/vcl/inc/vcl/menubtn.hxx @@ -50,7 +50,6 @@ private: PopupMenu* mpMenu; sal_uInt16 mnCurItemId; sal_uInt16 mnMenuMode; - bool mbDisplaySelectedItem; Link maActivateHdl; Link maSelectHdl; @@ -58,14 +57,10 @@ private: SAL_DLLPRIVATE void ImplExecuteMenu(); DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* ); - SAL_DLLPRIVATE void updateText(); - // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE MenuButton( const MenuButton & ); SAL_DLLPRIVATE MenuButton& operator=( const MenuButton & ); - DECL_LINK(MenuEventListener, VclSimpleEvent*); - protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); @@ -83,7 +78,7 @@ public: virtual void Select(); void SetMenuMode( sal_uInt16 nMode ); - sal_uInt16 GetMenuMode() const { return mnMenuMode; } + sal_uInt16 GetMenuMode() const { return mnMenuMode; } void SetPopupMenu( PopupMenu* pNewMenu ); PopupMenu* GetPopupMenu() const { return mpMenu; } @@ -95,10 +90,6 @@ public: const Link& GetActivateHdl() const { return maActivateHdl; } void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } const Link& GetSelectHdl() const { return maSelectHdl; } - - void SetShowDisplaySelectedItem(bool bShow); - - virtual Size GetOptimalSize(WindowSizeType eType) const; }; #endif // _SV_MENUBTN_HXX diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 12685b12c1b6..f8fb86fcaf6b 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -77,7 +77,6 @@ void MenuButton::ImplExecuteMenu() MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) : PushButton( WINDOW_MENUBUTTON ) - , mbDisplaySelectedItem(false) { ImplInitMenuButtonData(); ImplInit( pParent, nWinBits ); @@ -87,7 +86,6 @@ MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) MenuButton::MenuButton( Window* pParent, const ResId& rResId ) : PushButton( WINDOW_MENUBUTTON ) - , mbDisplaySelectedItem(false) { ImplInitMenuButtonData(); rResId.SetRT( RSC_MENUBUTTON ); @@ -120,8 +118,6 @@ void MenuButton::ImplLoadRes( const ResId& rResId ) MenuButton::~MenuButton() { delete mpMenuTimer; - if (mbDisplaySelectedItem && mpMenu) - mpMenu->RemoveEventListener(LINK(this, MenuButton, MenuEventListener)); delete mpOwnMenu; } @@ -203,33 +199,9 @@ void MenuButton::Activate() void MenuButton::Select() { - updateText(); maSelectHdl.Call( this ); } -void MenuButton::updateText() -{ - if (mbDisplaySelectedItem) - { - if (mpMenu) - SetText(mpMenu->GetItemText(mpMenu->GetCurItemId())); - else - SetText(OUString()); - } -} - -Size MenuButton::GetOptimalSize(WindowSizeType eType) const -{ - Size aRet = PushButton::GetOptimalSize(eType); - if (mbDisplaySelectedItem && mpMenu) - { - Size aMenuSize(mpMenu->ImplCalcSize(const_cast<MenuButton*>(this))); - if (aMenuSize.Width() > aRet.Width()) - aRet.Width() = aMenuSize.Width(); - } - return aRet; -} - // ----------------------------------------------------------------------- void MenuButton::SetMenuMode( sal_uInt16 nMode ) @@ -239,52 +211,13 @@ void MenuButton::SetMenuMode( sal_uInt16 nMode ) mnMenuMode = nMode; } -void MenuButton::SetShowDisplaySelectedItem(bool bShow) -{ - if (mbDisplaySelectedItem == bShow) - return; - if (mbDisplaySelectedItem && mpMenu) - mpMenu->RemoveEventListener(LINK(this, MenuButton, MenuEventListener)); - mbDisplaySelectedItem = bShow; - if (mbDisplaySelectedItem && mpMenu) - mpMenu->AddEventListener(LINK(this, MenuButton, MenuEventListener)); -} - void MenuButton::SetPopupMenu( PopupMenu* pNewMenu ) { if (pNewMenu == mpMenu) return; - if (mbDisplaySelectedItem && mpMenu) - mpMenu->RemoveEventListener(LINK(this, MenuButton, MenuEventListener)); // Fuer die 5.1-Auslieferung besser noch nicht inline, ansonsten kann // diese Funktion zur 6.0 inline werden mpMenu = pNewMenu; - updateText(); - if (mbDisplaySelectedItem && mpMenu) - mpMenu->AddEventListener(LINK(this, MenuButton, MenuEventListener)); -} - -IMPL_LINK(MenuButton, MenuEventListener, VclSimpleEvent*, pEvent) -{ - if (pEvent && pEvent->ISA(VclMenuEvent)) - { - VclMenuEvent* pMenuEvent = (VclMenuEvent*)pEvent; - if (pMenuEvent->GetMenu() == mpMenu) - { - switch (pMenuEvent->GetId()) - { - case VCLEVENT_MENU_INSERTITEM: - case VCLEVENT_MENU_REMOVEITEM: - case VCLEVENT_MENU_ITEMTEXTCHANGED: - queue_resize(); - break; - case VCLEVENT_MENU_SELECT: - updateText(); - break; - } - } - } - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 4e35c44c17ee..496138926339 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -21,72 +21,6 @@ #include <vcl/graphictools.hxx> -static ::rtl::OString polyToString( const Polygon& rPoly ) -{ - ::rtl::OString aStr; - sal_uInt16 nVertex; - for(nVertex=0; nVertex<rPoly.GetSize(); ++nVertex) - { - aStr += "("; - switch( rPoly.GetFlags(nVertex) ) - { - case POLY_NORMAL: - case POLY_SMOOTH: - case POLY_SYMMTR: - aStr += "n: "; - break; - - case POLY_CONTROL: - aStr += "c: "; - break; - - default: - OSL_FAIL( "SvtGraphicStroke::polyToString invalid flag"); - break; - } - aStr += ::rtl::OString::valueOf( static_cast< double >( rPoly[nVertex].getX() ) ); - aStr += ","; - aStr += ::rtl::OString::valueOf( static_cast< double >( rPoly[nVertex].getY() ) ); - aStr += ") "; - } - - return aStr; -} - -static ::rtl::OString polyPolyToString( const PolyPolygon& rPolyPoly ) -{ - ::rtl::OString aStr; - sal_uInt16 nPoly; - for(nPoly=0; nPoly<rPolyPoly.Count(); ++nPoly) - { - const Polygon& rPoly = rPolyPoly[nPoly]; - - aStr += "{ "; - aStr += polyToString( rPoly ); - aStr += "} "; - } - - return aStr; -} - -static ::rtl::OString dashToString( const SvtGraphicStroke::DashArray& rDashArray ) -{ - ::rtl::OString aStr; - - aStr += "dash: [ "; - - int i, nDashes( rDashArray.size() ); - for(i=0; i<nDashes; ++i) - { - aStr += ::rtl::OString::valueOf( rDashArray[i] ); - aStr += " "; - } - - aStr += "] "; - - return aStr; -} - //////////////////////////////////////////////////////////////////////////// SvtGraphicFill::Transform::Transform() @@ -176,78 +110,6 @@ void SvtGraphicStroke::getDashArray( DashArray& rDashArray ) const rDashArray = maDashArray; } -::rtl::OString SvtGraphicStroke::toString() const -{ - ::rtl::OString aStr; - - aStr += polyToString( maPath ); - aStr += "trans: "; - aStr += ::rtl::OString::valueOf( static_cast< double >(getTransparency()) ); - aStr += " width: "; - aStr += ::rtl::OString::valueOf( static_cast< double >(getStrokeWidth()) ); - aStr += " cap: "; - switch( getCapType() ) - { - case capButt: - aStr += "butt"; - break; - - case capRound: - aStr += "round"; - break; - - case capSquare: - aStr += "square"; - break; - - default: - OSL_FAIL( "SvtGraphicStroke::toString missing cap type"); - break; - } - aStr += " join: "; - switch( getJoinType() ) - { - case joinMiter: - aStr += "miter"; - break; - - case joinRound: - aStr += "round"; - break; - - case joinBevel: - aStr += "bevel"; - break; - - case joinNone: - aStr += "none"; - break; - - default: - OSL_FAIL( "SvtGraphicStroke::toString missing join type"); - break; - } - aStr += " "; - - if( maStartArrow.Count() ) - { - aStr += "start: "; - aStr += polyPolyToString( maStartArrow ); - aStr += " "; - } - - if( maEndArrow.Count() ) - { - aStr += "end: "; - aStr += polyPolyToString( maEndArrow ); - aStr += " "; - } - - aStr += dashToString( maDashArray ); - - return aStr; -} - void SvtGraphicStroke::setPath( const Polygon& rPoly ) { maPath = rPoly; |