summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-22 09:00:02 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-22 11:07:03 +0000
commit6c415f735bbf9201a18288e2ea16eacad4d635cd (patch)
tree8e4f15bb62d7082537e04b85e0f57268ec0cd428 /vcl
parent29c38bab7a69127c69f17c9a62b35faf68deb843 (diff)
callcatcher: update unused code
Change-Id: I62e49fbf27364bd244099a9bb247452d5a691119
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/impbmp.hxx6
-rw-r--r--vcl/source/control/button.cxx12
-rw-r--r--vcl/source/gdi/impbmp.cxx15
-rw-r--r--vcl/source/window/window.cxx41
4 files changed, 0 insertions, 74 deletions
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index 5e4586d97113..aebc89f00338 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -41,14 +41,10 @@ public:
ImpBitmap();
/**
* takes ownership
- * same as Sequence:
- * pBmp = new ImpBitmap;
- * pBmp->ImplSetSalBitmap(pBitmap);
*/
ImpBitmap(SalBitmap* pBitmap);
~ImpBitmap();
- void ImplSetSalBitmap( SalBitmap* pSalBitmap );
SalBitmap* ImplGetSalBitmap() const { return mpSalBitmap; }
bool ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal );
@@ -69,8 +65,6 @@ public:
inline void ImplSetChecksum( sal_uLong nChecksum ) { mnChecksum = nChecksum; }
inline sal_uLong ImplGetChecksum() const { return mnChecksum; }
- bool ImplCrop( const Rectangle& rRectPixel );
- bool ImplErase( const Color& rFillColor );
bool ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag );
bool ImplReplace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol );
};
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index afef44381368..f8f3da8cb48f 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1794,18 +1794,6 @@ HelpButton::HelpButton( vcl::Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-HelpButton::HelpButton( vcl::Window* pParent, const ResId& rResId ) :
- PushButton( WINDOW_HELPBUTTON )
-{
- rResId.SetRT( RSC_HELPBUTTON );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
-
- if ( !(nStyle & WB_HIDE) )
- Show();
-}
-
void HelpButton::Click()
{
// trigger help if no link set
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 4f4684d98e57..696ede09345c 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -43,11 +43,6 @@ ImpBitmap::~ImpBitmap()
delete mpSalBitmap;
}
-void ImpBitmap::ImplSetSalBitmap( SalBitmap* pBitmap )
-{
- delete mpSalBitmap, mpSalBitmap = pBitmap;
-}
-
bool ImpBitmap::ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal )
{
return mpSalBitmap->Create( rSize, nBitCount, rPal );
@@ -93,16 +88,6 @@ void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode
mnChecksum = 0;
}
-bool ImpBitmap::ImplCrop( const Rectangle& rRectPixel )
-{
- return mpSalBitmap->Crop( rRectPixel );
-}
-
-bool ImpBitmap::ImplErase( const ::Color& rFillColor )
-{
- return mpSalBitmap->Erase( rFillColor );
-}
-
bool ImpBitmap::ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag )
{
return mpSalBitmap->Scale( rScaleX, rScaleY, nScaleFlag );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 3f66965e7849..53291b557040 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1294,47 +1294,6 @@ void Window::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags )
OutputDevice::CopyDeviceArea(aPosAry, nFlags);
}
-bool Window::ImplCheckUIFont( const vcl::Font& rFont )
-{
- if( ImplGetSVData()->maGDIData.mbNativeFontConfig )
- return true;
-
- // create a text string using the localized text of important buttons
- OUString aTestText;
- static const StandardButtonType aTestButtons[] =
- {
- BUTTON_OK, BUTTON_CANCEL, BUTTON_CLOSE, BUTTON_ABORT,
- BUTTON_YES, BUTTON_NO, BUTTON_MORE, BUTTON_IGNORE,
- BUTTON_RETRY, BUTTON_HELP
- };
-
- const int nTestButtonCount = SAL_N_ELEMENTS(aTestButtons);
- for( int n = 0; n < nTestButtonCount; ++n )
- {
- OUString aButtonStr = Button::GetStandardText( aTestButtons[n] );
- // #i115432# ignore mnemonic+accelerator part of each string
- // TODO: use a string filtering method when it becomes available
- const sal_Int32 nLen = aButtonStr.getLength();
- bool bInside = false;
- for( int i = 0; i < nLen; ++i ) {
- const sal_Unicode c = aButtonStr[ i ];
- if( (c == '('))
- bInside = true;
- if( (c == ')'))
- bInside = false;
- if( (c == '~')
- || (c == '(') || (c == ')')
- || ((c >= 'A') && (c <= 'Z') && bInside) )
- aButtonStr = aButtonStr.replaceAt( i, 1, " " );
- }
- // append sanitized button text to test string
- aTestText += aButtonStr;
- }
-
- const bool bUIFontOk = ( HasGlyphs( rFont, aTestText ) == -1 );
- return bUIFontOk;
-}
-
SalGraphics* Window::ImplGetFrameGraphics() const
{
if ( mpWindowImpl->mpFrameWindow->mpGraphics )