summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-04 22:41:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-05 10:03:17 +0100
commitc6da7c43e10924597b6566fa5394684299c0a573 (patch)
tree83449de1af08f9013c89f497d9f8425d12e7d819 /vcl
parentaf3a393700f77b039e88efc2cf2e6eef450677ff (diff)
callcatcher: unused methods
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/unx/saldisp.hxx1
-rw-r--r--vcl/inc/vcl/menu.hxx6
-rw-r--r--vcl/source/gdi/textlayout.cxx12
-rw-r--r--vcl/source/window/menu.cxx9
-rw-r--r--vcl/unx/generic/app/saldisp.cxx44
5 files changed, 4 insertions, 68 deletions
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 122a9f535eac..78ba62994238 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -141,7 +141,6 @@ public:
Pixel GetTCPixel( SalColor nColor ) const;
SalColor GetTCColor( Pixel nPixel ) const;
- sal_Bool Convert( int &n0, int &n1, int &n2 ); // 24bit
};
// -=-= SalColormap =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index daf57639e18f..413779412b24 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -212,9 +212,10 @@ public:
Menu();
Menu( sal_Bool bMenuBar );
SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; }
+#if defined(QUARTZ)
// ImplSelectWithStart() is used in vcl/aqua/source/window/salnsmenu.mm
SAL_DLLPRIVATE void ImplSelectWithStart( Menu* pStartMenu = NULL );
-
+#endif
public:
virtual ~Menu();
@@ -351,9 +352,6 @@ public:
// -1 is returned if no character is at that point
// if an index is found the corresponding item id is filled in (else 0)
long GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const;
- // returns the interval [start,end] of line nLine
- // returns [-1,-1] for an invalid line
- Pair GetLineStartEnd( long nLine ) const;
// returns the bounding rectangle for an item at pos nItemPos
Rectangle GetBoundingRectangle( sal_uInt16 nItemPos ) const;
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index c599a51972cc..9250bb14c70a 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -295,18 +295,6 @@ namespace vcl
}
//--------------------------------------------------------------------
- namespace
- {
- long zoomBy( long _value, const Fraction& _zoom )
- {
- double n = (double)_value;
- n *= (double)_zoom.GetNumerator();
- n /= (double)_zoom.GetDenominator();
- return (long)::rtl::math::round( n );
- }
- }
-
- //--------------------------------------------------------------------
Rectangle ReferenceDeviceTextLayout::DrawText( const Rectangle& _rRect, const XubString& _rText, sal_uInt16 _nStyle, MetricVector* _pVector, String* _pDisplayText )
{
if ( !_rText.Len() )
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index aeff08276ae1..8e64814db8ac 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1154,6 +1154,7 @@ void Menu::Select()
}
}
+#if defined(QUARTZ)
void Menu::ImplSelectWithStart( Menu* pSMenu )
{
Menu* pOldStartedFrom = pStartedFrom;
@@ -1164,6 +1165,7 @@ void Menu::ImplSelectWithStart( Menu* pSMenu )
pOldStartedFrom->pStartedFrom = pOldStartedStarted;
pStartedFrom = pOldStartedFrom;
}
+#endif
void Menu::RequestHelp( const HelpEvent& )
{
@@ -3191,13 +3193,6 @@ long Menu::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const
return nIndex;
}
-Pair Menu::GetLineStartEnd( long nLine ) const
-{
- if( ! mpLayoutData )
- ImplFillLayoutData();
- return mpLayoutData ? mpLayoutData->GetLineStartEnd( nLine ) : Pair( -1, -1 );
-}
-
Rectangle Menu::GetBoundingRectangle( sal_uInt16 nPos ) const
{
Rectangle aRet;
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 2f6752a71033..9ef360114e44 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2765,50 +2765,6 @@ SalVisual::~SalVisual()
#define SALCOLOR RGB
#define SALCOLORREVERSE BGR
-sal_Bool SalVisual::Convert( int &n0, int &n1, int &n2 )
-{
- int n;
-
- switch( GetMode() )
- {
- case otherSalRGB:
- return sal_False;
- case SALCOLOR:
- break;
- case RBG:
- n = n0;
- n0 = n1;
- n1 = n;
- break;
- case GRB:
- n = n1;
- n1 = n2;
- n2 = n;
- break;
- case SALCOLORREVERSE:
- n = n0;
- n0 = n2;
- n2 = n;
- break;
- case BRG:
- n = n0;
- n0 = n1;
- n1 = n2;
- n2 = n;
- break;
- case GBR:
- n = n2;
- n2 = n1;
- n1 = n0;
- n0 = n;
- break;
- default:
- fprintf( stderr, "SalVisual::Convert %d\n", GetMode() );
- abort();
- }
- return sal_True;
-}
-
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
SalColor SalVisual::GetTCColor( Pixel nPixel ) const
{