[Libreoffice-commits] .: svtools/inc svtools/source unusedcode.easy vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Feb 15 05:15:55 PST 2012
svtools/inc/svtools/imap.hxx | 3 ---
svtools/source/edit/svmedit.cxx | 6 ------
svtools/source/misc/imap.cxx | 18 ------------------
unusedcode.easy | 6 ------
vcl/inc/ilstbox.hxx | 1 -
vcl/inc/image.h | 1 -
vcl/inc/vcl/button.hxx | 3 ---
vcl/inc/vcl/settings.hxx | 6 ------
vcl/source/app/settings.cxx | 12 ------------
vcl/source/control/button.cxx | 8 --------
vcl/source/control/ilstbox.cxx | 7 -------
vcl/source/gdi/impimage.cxx | 5 -----
12 files changed, 76 deletions(-)
New commits:
commit 3626c2cef7c39bda96e2d3bc0d5a53ba1044aadc
Author: Alexander Bergmann <myaddons at gmx.de>
Date: Wed Feb 15 13:15:50 2012 +0000
unusedcode.easy: Removed unused code
diff --git a/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx
index 9418d98..8d81c00 100644
--- a/svtools/inc/svtools/imap.hxx
+++ b/svtools/inc/svtools/imap.hxx
@@ -132,9 +132,6 @@ public:
const String& GetName() const { return aName; }
void SetName( const String& rName ) { aName = rName; }
- // gibt das BoundRect aller IMap-Objekte in 1/100mm zurueck
- Rectangle GetBoundRect() const;
-
// skaliert alle Objekte der ImageMap entpr. dem uebergebenen Faktor
void Scale( const Fraction& rFractX, const Fraction& rFracY );
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 44ad0d1..267a203 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -139,7 +139,6 @@ public:
void SetMaxTextLen( xub_StrLen nLen );
xub_StrLen GetMaxTextLen() const;
- void SetInsertMode( sal_Bool bInsert );
sal_Bool IsInsertMode() const;
void InsertText( const String& rStr );
@@ -396,11 +395,6 @@ sal_Bool ImpSvMEdit::IsModified() const
return mpTextWindow->GetTextEngine()->IsModified();
}
-void ImpSvMEdit::SetInsertMode( sal_Bool bInsert )
-{
- mpTextWindow->GetTextView()->SetInsertMode( bInsert );
-}
-
void ImpSvMEdit::SetReadOnly( sal_Bool bRdOnly )
{
mpTextWindow->GetTextView()->SetReadOnly( bRdOnly );
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index d4199e2..dd15a4b 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -989,24 +989,6 @@ IMapObject* ImageMap::GetHitIMapObject( const Size& rTotalSize,
|*
\******************************************************************************/
-Rectangle ImageMap::GetBoundRect() const
-{
- Rectangle aBoundRect;
- size_t nCount = maList.size();
-
- for ( size_t i = 0; i < nCount; i++ )
- aBoundRect.Union( maList[ i ]->GetBoundRect() );
-
- return aBoundRect;
-}
-
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void ImageMap::Scale( const Fraction& rFracX, const Fraction& rFracY )
{
size_t nCount = maList.size();
diff --git a/unusedcode.easy b/unusedcode.easy
index af2cff9..b65437f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -28,19 +28,13 @@ HTMLControls::Insert(HTMLControl const**, unsigned short)
HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
HTMLControls::Remove(HTMLControl const*&, unsigned short)
HTMLControls::Remove(unsigned short, unsigned short)
-ImageButton::ImageButton(unsigned short)
-ImageMap::GetBoundRect() const
-ImpSvMEdit::SetInsertMode(unsigned char)
ImpSvtData::~ImpSvtData()
ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Locale&) const
-ImplEntryList::IsEntrySelected(String const&) const
-ImplImageList::GetImageCount() const
InsCapOptArr::Insert(InsCapOptArr const*, unsigned short, unsigned short)
InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&)
InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short)
InsCapOptArr::Remove(unsigned short, unsigned short)
-KeyboardSettings::CopyData()
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index c1355f0..cecf3b8 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -168,7 +168,6 @@ public:
sal_uInt16 GetSelectEntryCount() const;
XubString GetSelectEntry( sal_uInt16 nIndex ) const;
sal_uInt16 GetSelectEntryPos( sal_uInt16 nIndex ) const;
- sal_Bool IsEntrySelected( const XubString& rStr ) const;
sal_Bool IsEntryPosSelected( sal_uInt16 nIndex ) const;
void SetLastSelected( sal_uInt16 nPos ) { mnLastSelected = nPos; }
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 1497750..f8abc4e 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -114,7 +114,6 @@ struct ImplImageList
void AddImage( const ::rtl::OUString &aName,
sal_uInt16 nId, const BitmapEx &aBitmapEx );
void RemoveImage( sal_uInt16 nPos );
- sal_uInt16 GetImageCount() const;
};
// --------------------
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index b2b812c..85f3f54 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -509,9 +509,6 @@ private:
SAL_DLLPRIVATE ImageButton( const ImageButton & );
SAL_DLLPRIVATE ImageButton & operator= ( const ImageButton & );
-protected:
- ImageButton( WindowType nType );
-
public:
ImageButton( Window* pParent, WinBits nStyle = 0 );
ImageButton( Window* pParent, const ResId& rResId );
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index fb05379..e0110e0 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -297,8 +297,6 @@ private:
class VCL_DLLPUBLIC KeyboardSettings
{
- void CopyData();
-
private:
ImplKeyboardData* mpData;
@@ -307,13 +305,9 @@ public:
KeyboardSettings( const KeyboardSettings& rSet );
~KeyboardSettings();
- void SetStandardAccel( const Accelerator& rAccelerator )
- { CopyData(); mpData->maStandardAccel = rAccelerator; }
const Accelerator& GetStandardAccel() const
{ return mpData->maStandardAccel; }
- void SetOptions( sal_uLong nOptions )
- { CopyData(); mpData->mnOptions = nOptions; }
sal_uLong GetOptions() const
{ return mpData->mnOptions; }
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index c2cca2d..2f07424 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -376,18 +376,6 @@ const KeyboardSettings& KeyboardSettings::operator =( const KeyboardSettings& rS
// -----------------------------------------------------------------------
-void KeyboardSettings::CopyData()
-{
- // Falls noch andere Referenzen bestehen, dann kopieren
- if ( mpData->mnRefCount != 1 )
- {
- mpData->mnRefCount--;
- mpData = new ImplKeyboardData( *mpData );
- }
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool KeyboardSettings::operator ==( const KeyboardSettings& rSet ) const
{
return mpData == rSet.mpData
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index e49e0cb..9af4551 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3960,14 +3960,6 @@ Size CheckBox::GetOptimalSize(WindowSizeType eType) const
// =======================================================================
-ImageButton::ImageButton( WindowType nType ) :
- PushButton( nType )
-{
- ImplInitStyle();
-}
-
-// -----------------------------------------------------------------------
-
ImageButton::ImageButton( Window* pParent, WinBits nStyle ) :
PushButton( pParent, nStyle )
{
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index ec00069..786e28a 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -498,13 +498,6 @@ sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const
// -----------------------------------------------------------------------
-sal_Bool ImplEntryList::IsEntrySelected( const XubString& rStr ) const
-{
- return IsEntryPosSelected( FindEntry( rStr ) );
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool ImplEntryList::IsEntryPosSelected( sal_uInt16 nIndex ) const
{
ImplEntryType* pImplEntry = GetEntry( nIndex );
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 3517260..4e7ebed 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -123,11 +123,6 @@ void ImplImageList::RemoveImage( sal_uInt16 nPos )
maImages.erase( maImages.begin() + nPos );
}
-sal_uInt16 ImplImageList::GetImageCount() const
-{
- return sal::static_int_cast< sal_uInt16 >( maImages.size() );
-}
-
// -----------------
// - ImplImageData -
// -----------------
More information about the Libreoffice-commits
mailing list