summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-27 09:16:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-27 09:58:35 +0100
commitf00cd93a66a6cf236114e810b1470e562315b777 (patch)
tree7edff4a18f651eb90b000a661d25883410f784bd /vcl
parent93be66f98f3180cbbe358bb5b38f64852a0d30fc (diff)
callcatcher: update unused code, esp unused Resource based ctor
e.g. no ImageRadioButton is now loaded from any res/rsc file, so that ctor and associated code paths can be stripped out Change-Id: Ic4cf19d45adb7c734f150e0b89eef193157a74a7
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/app/dbggui.cxx9
-rw-r--r--vcl/source/control/button.cxx14
-rw-r--r--vcl/source/window/window.cxx1
3 files changed, 1 insertions, 23 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index a882bb762db2..6833a95cd7d7 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1271,7 +1271,6 @@ void DbgDialogTest( Window* pWindow )
}
if ( (pChild->GetType() == WINDOW_RADIOBUTTON) ||
- (pChild->GetType() == WINDOW_IMAGERADIOBUTTON) ||
(pChild->GetType() == WINDOW_CHECKBOX) ||
(pChild->GetType() == WINDOW_TRISTATEBOX) ||
(pChild->GetType() == WINDOW_PUSHBUTTON) )
@@ -1281,8 +1280,6 @@ void DbgDialogTest( Window* pWindow )
const char* pClass;
if ( pChild->GetType() == WINDOW_RADIOBUTTON )
pClass = "RadioButton";
- else if ( pChild->GetType() == WINDOW_IMAGERADIOBUTTON )
- pClass = "ImageRadioButton";
else if ( pChild->GetType() == WINDOW_CHECKBOX )
pClass = "CheckBox";
else if ( pChild->GetType() == WINDOW_TRISTATEBOX )
@@ -1302,7 +1299,6 @@ void DbgDialogTest( Window* pWindow )
switch( pChild->GetType() )
{
case WINDOW_RADIOBUTTON:
- case WINDOW_IMAGERADIOBUTTON:
aWidth = ((RadioButton*)pChild)->CalcMinimumSize(0).Width();
break;
case WINDOW_CHECKBOX:
@@ -1405,7 +1401,6 @@ void DbgDialogTest( Window* pWindow )
" WB_IGNORETAB"));
if ( (pChild->GetType() == WINDOW_RADIOBUTTON) ||
- (pChild->GetType() == WINDOW_IMAGERADIOBUTTON) ||
(pChild->GetType() == WINDOW_CHECKBOX) ||
(pChild->GetType() == WINDOW_TRISTATEBOX) ||
(pChild->GetType() == WINDOW_FIXEDTEXT) )
@@ -1484,7 +1479,6 @@ void DbgDialogTest( Window* pWindow )
}
if ( (pChild->GetType() == WINDOW_RADIOBUTTON) ||
- (pChild->GetType() == WINDOW_IMAGERADIOBUTTON) ||
(pChild->GetType() == WINDOW_CHECKBOX) ||
(pChild->GetType() == WINDOW_TRISTATEBOX) ||
(pChild->GetType() == WINDOW_PUSHBUTTON) ||
@@ -1516,8 +1510,7 @@ void DbgDialogTest( Window* pWindow )
Rectangle aChildRect( aNewPos, pChild->GetSizePixel() );
if ( cAccel || (pChild->GetStyle() & WB_TABSTOP) ||
- (pChild->GetType() == WINDOW_RADIOBUTTON) ||
- (pChild->GetType() == WINDOW_IMAGERADIOBUTTON) )
+ (pChild->GetType() == WINDOW_RADIOBUTTON) )
{
if ( (aNewPos.X() <= aTabPos.X()) && (aNewPos.Y() <= aTabPos.Y()) )
{
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index fb2e982537f4..32d70f37b055 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -4090,20 +4090,6 @@ ImageRadioButton::ImageRadioButton( Window* pParent, WinBits nStyle ) :
// -----------------------------------------------------------------------
-ImageRadioButton::ImageRadioButton( Window* pParent, const ResId& rResId ) :
- RadioButton( pParent, rResId.SetRT( RSC_IMAGERADIOBUTTON ) )
-{
- sal_uLong nObjMask = ReadLongRes();
-
- if ( RSC_IMAGERADIOBUTTON_IMAGE & nObjMask )
- {
- SetModeRadioImage( Image( ResId( (RSHEADER_TYPE*)GetClassRes(), *rResId.GetResMgr() ) ) );
- IncrementRes( GetObjSizeRes( (RSHEADER_TYPE*)GetClassRes() ) );
- }
-}
-
-// -----------------------------------------------------------------------
-
ImageRadioButton::~ImageRadioButton()
{
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index df1456d2b147..669e0eb62f43 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8824,7 +8824,6 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
case WINDOW_COLORDIALOG: nRole = accessibility::AccessibleRole::COLOR_CHOOSER; break;
case WINDOW_FONTDIALOG: nRole = accessibility::AccessibleRole::FONT_CHOOSER; break;
- case WINDOW_IMAGERADIOBUTTON:
case WINDOW_RADIOBUTTON: nRole = accessibility::AccessibleRole::RADIO_BUTTON; break;
case WINDOW_TRISTATEBOX:
case WINDOW_CHECKBOX: nRole = accessibility::AccessibleRole::CHECK_BOX; break;