[Libreoffice-commits] .: 3 commits - sot/inc sot/source svl/inc svl/source svtools/inc svtools/source tools/inc tools/source unotools/inc unotools/source vcl/inc vcl/source vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Aug 4 01:37:51 PDT 2011
sot/inc/sot/storage.hxx | 1
sot/source/sdstor/storage.cxx | 10 ------
svl/inc/svl/cintitem.hxx | 2 -
svl/inc/svl/flagitem.hxx | 1
svl/inc/svl/intitem.hxx | 3 -
svl/inc/svl/ptitem.hxx | 1
svl/source/items/cintitem.cxx | 8 -----
svl/source/items/flagitem.cxx | 9 -----
svl/source/items/ptitem.cxx | 9 -----
svtools/inc/svtools/ctrltool.hxx | 1
svtools/inc/svtools/fileview.hxx | 1
svtools/inc/svtools/helpopt.hxx | 2 -
svtools/inc/svtools/inettbc.hxx | 1
svtools/source/config/helpopt.cxx | 14 ---------
svtools/source/contnr/fileview.cxx | 6 ---
svtools/source/control/ctrltool.cxx | 11 -------
svtools/source/control/inettbc.cxx | 5 ---
tools/inc/tools/cachestr.hxx | 7 ----
tools/inc/tools/stream.hxx | 1
tools/inc/tools/unqid.hxx | 2 -
tools/inc/tools/zcodec.hxx | 1
tools/source/memtools/unqidx.cxx | 37 ------------------------
tools/source/stream/cachestr.cxx | 55 +-----------------------------------
tools/source/stream/strmunx.cxx | 12 -------
tools/source/stream/strmwnt.cxx | 12 -------
tools/source/zcodec/zcodec.cxx | 11 -------
unotools/inc/unotools/accelcfg.hxx | 1
unotools/source/config/accelcfg.cxx | 25 ----------------
vcl/inc/unx/i18n_xkb.hxx | 14 ---------
vcl/inc/vcl/metric.hxx | 4 --
vcl/source/gdi/metric.cxx | 30 -------------------
vcl/source/gdi/textlayout.cxx | 4 --
vcl/unx/generic/app/i18n_xkb.cxx | 16 ----------
33 files changed, 2 insertions(+), 315 deletions(-)
New commits:
commit cb678082a93422c46d2978fc29e24f0aad4424c6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 4 09:34:18 2011 +0100
callcatcher: remove unused methods
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index 6c4cbdf..1806340 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -231,7 +231,6 @@ public:
virtual sal_Bool MoveTo( const String & rEleName, SotStorage * pDest,
const String & rNewName );
- SvStream* GetTargetSvStream() const;
sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
sal_Bool GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index b12af44..6756552 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -1209,16 +1209,6 @@ const SvStream* SotStorage::GetSvStream()
return pResult;
}
-SvStream* SotStorage::GetTargetSvStream() const
-{
- SvStream* pResult = 0;
- DBG_ASSERT( Owner(), "must be owner" );
- if( m_pOwnStg )
- pResult = (SvStream*)(m_pOwnStg->GetSvStream());
- return pResult;
-}
-
-
sal_Bool SotStorage::Validate()
{
DBG_ASSERT( m_bIsRoot, "Validate nur an Rootstorage" );
diff --git a/svl/inc/svl/cintitem.hxx b/svl/inc/svl/cintitem.hxx
index 3e20735..c87d737 100644
--- a/svl/inc/svl/cintitem.hxx
+++ b/svl/inc/svl/cintitem.hxx
@@ -46,8 +46,6 @@ public:
CntByteItem(sal_uInt16 which = 0, sal_uInt8 nTheValue = 0):
SfxPoolItem(which), m_nValue(nTheValue) { DBG_CTOR(CntByteItem, 0); }
- CntByteItem(sal_uInt16 which, SvStream & rStream);
-
CntByteItem(const CntByteItem & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{ DBG_CTOR(CntByteItem, 0); }
diff --git a/svl/inc/svl/flagitem.hxx b/svl/inc/svl/flagitem.hxx
index c44d5e9..2512b52 100644
--- a/svl/inc/svl/flagitem.hxx
+++ b/svl/inc/svl/flagitem.hxx
@@ -49,7 +49,6 @@ public:
TYPEINFO();
SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0 );
- SfxFlagItem( sal_uInt16 nWhich, SvStream & );
SfxFlagItem( const SfxFlagItem& );
~SfxFlagItem() {
diff --git a/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx
index d5c0f07..3c87a1b 100644
--- a/svl/inc/svl/intitem.hxx
+++ b/svl/inc/svl/intitem.hxx
@@ -41,9 +41,6 @@ public:
SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0):
CntByteItem(which, nValue) {}
- SfxByteItem(sal_uInt16 which, SvStream & rStream):
- CntByteItem(which, rStream) {}
-
virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const;
virtual SfxPoolItem * Clone(SfxItemPool * = 0) const
diff --git a/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx
index ab8b918..c0d50f8 100644
--- a/svl/inc/svl/ptitem.hxx
+++ b/svl/inc/svl/ptitem.hxx
@@ -46,7 +46,6 @@ public:
TYPEINFO();
SfxPointItem();
SfxPointItem( sal_uInt16 nWhich, const Point& rVal );
- SfxPointItem( sal_uInt16 nWhich, SvStream & );
SfxPointItem( const SfxPointItem& );
~SfxPointItem() {
DBG_DTOR(SfxPointItem, 0); }
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index 5ba987e..a9d11a6 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -44,14 +44,6 @@ DBG_NAME(CntByteItem)
TYPEINIT1_AUTOFACTORY(CntByteItem, SfxPoolItem);
//============================================================================
-CntByteItem::CntByteItem(sal_uInt16 which, SvStream & rStream):
- SfxPoolItem(which)
-{
- DBG_CTOR(CntByteItem, 0);
- rStream >> m_nValue;
-}
-
-//============================================================================
// virtual
int CntByteItem::operator ==(const SfxPoolItem & rItem) const
{
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index 2c1a6e7..218dab3 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -61,15 +61,6 @@ SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) :
// -----------------------------------------------------------------------
-SfxFlagItem::SfxFlagItem( sal_uInt16 nW, SvStream &rStream) :
- SfxPoolItem( nW )
-{
- DBG_CTOR(SfxFlagItem, 0);
- rStream >> nVal;
-}
-
-// -----------------------------------------------------------------------
-
SfxFlagItem::SfxFlagItem( const SfxFlagItem& rItem ) :
SfxPoolItem( rItem ),
nVal( rItem.nVal )
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index bd163c6..14db870 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -67,15 +67,6 @@ SfxPointItem::SfxPointItem( sal_uInt16 nW, const Point& rVal ) :
// -----------------------------------------------------------------------
-SfxPointItem::SfxPointItem( sal_uInt16 nW, SvStream &rStream ) :
- SfxPoolItem( nW )
-{
- DBG_CTOR(SfxPointItem, 0);
- rStream >> aVal;
-}
-
-// -----------------------------------------------------------------------
-
SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) :
SfxPoolItem( rItem ),
aVal( rItem.aVal )
diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx
index 6aa4953..959619e 100644
--- a/unotools/inc/unotools/accelcfg.hxx
+++ b/unotools/inc/unotools/accelcfg.hxx
@@ -60,7 +60,6 @@ public:
SvtAcceleratorConfiguration();
// get special accelerators
- static SvtAcceleratorConfiguration* CreateFromStream( SvStream& rStream );
static String GetStreamName();
static SvStream* GetDefaultStream( StreamMode );
diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index 9c55d37..9525703 100644
--- a/unotools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.cxx
@@ -173,31 +173,6 @@ SvtAcceleratorConfiguration::SvtAcceleratorConfiguration()
pImp = pOptions;
}
-SvtAcceleratorConfiguration* SvtAcceleratorConfiguration::CreateFromStream( SvStream& rStream )
-{
- SvtAcceleratorConfiguration* pRet = new SvtAcceleratorConfiguration;
- ::utl::OInputStreamWrapper aHelper( rStream );
- com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xOut( &aHelper );
- try
- {
- pRet->pImp = new SvtAcceleratorConfig_Impl( xOut );
- }
- catch ( RuntimeException& )
- {
- DELETEZ( pRet );
- }
- catch( SAXException& )
- {
- DELETEZ( pRet );
- }
- catch( ::com::sun::star::io::IOException& )
- {
- DELETEZ( pRet );
- }
-
- return pRet;
-}
-
// -----------------------------------------------------------------------
SvtAcceleratorConfiguration::~SvtAcceleratorConfiguration()
commit c2359da8bb2b1cf78726b130cadfd86b490b8cfb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 3 22:25:06 2011 +0100
callcatcher: remove unused methods
diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx
index 5375d75..1261f63 100644
--- a/svtools/inc/svtools/ctrltool.hxx
+++ b/svtools/inc/svtools/ctrltool.hxx
@@ -190,7 +190,6 @@ public:
OutputDevice* GetDevice() const { return mpDev; }
OutputDevice* GetDevice2() const { return mpDev2; }
XubString GetFontMapText( const FontInfo& rInfo ) const;
- sal_uInt16 GetFontNameType( const XubString& rFontName ) const;
const XubString& GetNormalStr() const { return maNormal; }
const XubString& GetItalicStr() const { return maNormalItalic; }
diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index b3678d7..fb83e0a 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
@@ -209,7 +209,6 @@ public:
void SetConfigString( const String& rCfgStr );
void SetUrlFilter( const IUrlFilter* _pFilter );
- const IUrlFilter* GetUrlFilter( ) const;
void EndInplaceEditing( bool _bCancel );
diff --git a/svtools/inc/svtools/helpopt.hxx b/svtools/inc/svtools/helpopt.hxx
index bd265fa..c0f7565 100644
--- a/svtools/inc/svtools/helpopt.hxx
+++ b/svtools/inc/svtools/helpopt.hxx
@@ -58,8 +58,6 @@ public:
sal_Bool IsHelpAgentAutoStartMode() const;
void SetHelpAgentTimeoutPeriod( sal_Int32 _nSeconds );
sal_Int32 GetHelpAgentTimeoutPeriod( ) const;
- void SetHelpAgentRetryLimit( sal_Int32 _nTrials );
- sal_Int32 GetHelpAgentRetryLimit( ) const;
const String& GetHelpStyleSheet()const;
void SetHelpStyleSheet(const String& rStyleSheet);
diff --git a/svtools/inc/svtools/inettbc.hxx b/svtools/inc/svtools/inettbc.hxx
index dc08730..597fc49 100644
--- a/svtools/inc/svtools/inettbc.hxx
+++ b/svtools/inc/svtools/inettbc.hxx
@@ -97,7 +97,6 @@ public:
void SetFilter(const String& _sFilter);
void SetUrlFilter( const IUrlFilter* _pFilter );
- const IUrlFilter* GetUrlFilter( ) const;
inline void EnableAutocompletion( sal_Bool _bEnable = sal_True )
{ bIsAutoCompleteEnabled = _bEnable; }
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 6badfff..fd30552 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -648,20 +648,6 @@ sal_Bool SvtHelpOptions::IsHelpTips() const
// -----------------------------------------------------------------------
-void SvtHelpOptions::SetHelpAgentRetryLimit( sal_Int32 _nTrials )
-{
- pImp->SetHelpAgentRetryLimit( _nTrials );
-}
-
-// -----------------------------------------------------------------------
-
-sal_Int32 SvtHelpOptions::GetHelpAgentRetryLimit( ) const
-{
- return pImp->GetHelpAgentRetryLimit( );
-}
-
-// -----------------------------------------------------------------------
-
void SvtHelpOptions::SetHelpAgentTimeoutPeriod( sal_Int32 _nSeconds )
{
pImp->SetHelpAgentTimeoutPeriod( _nSeconds );
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index e8f6f9c..f9267de 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1790,12 +1790,6 @@ void SvtFileView::SetUrlFilter( const IUrlFilter* _pFilter )
}
// -----------------------------------------------------------------------
-const IUrlFilter* SvtFileView::GetUrlFilter( ) const
-{
- return mpImp->mpUrlFilter;
-}
-
-// -----------------------------------------------------------------------
void SvtFileView::StateChanged( StateChangedType nStateChange )
{
if ( nStateChange == STATE_CHANGE_ENABLE )
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index b5cfc98..768ddd6 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -598,17 +598,6 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const
// -----------------------------------------------------------------------
-sal_uInt16 FontList::GetFontNameType( const XubString& rFontName ) const
-{
- ImplFontListNameInfo* pData = ImplFindByName( rFontName );
- if ( pData )
- return pData->mnType;
- else
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
FontInfo FontList::Get( const XubString& rName, const XubString& rStyleName ) const
{
ImplFontListNameInfo* pData = ImplFindByName( rName );
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 0dcb4fb..50739d8 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -1352,11 +1352,6 @@ void SvtURLBox::SetUrlFilter( const IUrlFilter* _pFilter )
pImp->pUrlFilter = _pFilter;
}
-//-------------------------------------------------------------------------
-const IUrlFilter* SvtURLBox::GetUrlFilter( ) const
-{
- return pImp->pUrlFilter;
-}
// -----------------------------------------------------------------------------
void SvtURLBox::SetFilter(const String& _sFilter)
{
diff --git a/tools/inc/tools/cachestr.hxx b/tools/inc/tools/cachestr.hxx
index 4126ab3..0c00e34 100644
--- a/tools/inc/tools/cachestr.hxx
+++ b/tools/inc/tools/cachestr.hxx
@@ -50,8 +50,6 @@ private:
SvStream* pCurrentStream;
TempFile* pTempFile;
- Link aFilenameLinkHdl;
-
TOOLS_DLLPRIVATE virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize );
TOOLS_DLLPRIVATE virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize );
TOOLS_DLLPRIVATE virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos );
@@ -60,13 +58,8 @@ private:
public:
SvCacheStream( sal_uIntPtr nMaxMemSize = 0 );
- SvCacheStream( const String &rFileName,
- sal_uIntPtr nExpectedSize = 0,
- sal_uIntPtr nMaxMemSize = 0 );
~SvCacheStream();
- void SetFilenameHdl( const Link& rLink);
- const Link& GetFilenameHdl() const;
void SetFilename( const String& rFN )
{ aFileName = rFN; } // darf nur vom FilenameHdl gerufen werden!
const String& GetFilename() const { return aFileName; }
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 7defdef..78a19a1 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -608,7 +608,6 @@ public:
void Open( const String& rFileName, StreamMode eOpenMode );
void Close();
- void ReOpen(); // Aufruf nach Close, FilePointer == 0
sal_Bool IsOpen() const { return bIsOpen; }
sal_Bool IsLocked() const { return ( nLockCounter!=0 ); }
virtual sal_uInt16 IsA() const;
diff --git a/tools/inc/tools/unqid.hxx b/tools/inc/tools/unqid.hxx
index d9c304f..59b352b 100644
--- a/tools/inc/tools/unqid.hxx
+++ b/tools/inc/tools/unqid.hxx
@@ -85,7 +85,6 @@ class TOOLS_DLLPUBLIC UniqueIdContainer : private UniqueIndex
public: // Irgend etwas mit protected falsch
void Clear( sal_Bool bAll );
- UniqueItemId CreateIdProt( sal_uIntPtr nId );
public:
UniqueIdContainer( sal_uIntPtr _nStartIndex,
@@ -104,7 +103,6 @@ public:
{ return UniqueIndex::IsIndexValid( nIndex ); }
UniqueItemId CreateId();
- static UniqueItemId CreateFreeId( sal_uIntPtr nId ); // freies Id
};
#endif // _UNQID_HXX
diff --git a/tools/inc/tools/zcodec.hxx b/tools/inc/tools/zcodec.hxx
index 10b4645..280d748 100644
--- a/tools/inc/tools/zcodec.hxx
+++ b/tools/inc/tools/zcodec.hxx
@@ -112,7 +112,6 @@ public:
void SetBreak( sal_uIntPtr );
sal_uIntPtr GetBreak( void );
void SetCRC( sal_uIntPtr nCurrentCRC );
- sal_uIntPtr UpdateCRC( sal_uIntPtr nLatestCRC, sal_uIntPtr nSource );
sal_uIntPtr UpdateCRC( sal_uIntPtr nLatestCRC, sal_uInt8* pSource, long nDatSize );
sal_uIntPtr GetCRC();
};
diff --git a/tools/source/memtools/unqidx.cxx b/tools/source/memtools/unqidx.cxx
index dfce665..4433ba2 100644
--- a/tools/source/memtools/unqidx.cxx
+++ b/tools/source/memtools/unqidx.cxx
@@ -468,41 +468,4 @@ UniqueItemId UniqueIdContainer::CreateId()
return UniqueItemId( pId );
}
-/*************************************************************************
-|*
-|* UniqueIdContainer::CreateIdProt()
-|*
-*************************************************************************/
-
-UniqueItemId UniqueIdContainer::CreateFreeId( sal_uIntPtr nId )
-{
- // Einfach erzeugen, fuer abgeleitete Klasse
- ImpUniqueId * pId = new ImpUniqueId;
- pId->nRefCount = 0;
- pId->nId = nId;
- return UniqueItemId( pId );
-}
-
-/*************************************************************************
-|*
-|* UniqueIdContainer::CreateIdProt()
-|*
-*************************************************************************/
-
-UniqueItemId UniqueIdContainer::CreateIdProt( sal_uIntPtr nId )
-{
- if ( IsIndexValid( nId ) )
- return UniqueItemId( (ImpUniqueId *)Get( nId ) );
-
- ImpUniqueId * pId;
- do
- {
- pId = new ImpUniqueId;
- pId->nRefCount = 1;
- pId->nId = Insert( pId );
- }
- while( pId->nId != nId );
- return UniqueItemId( pId );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/stream/cachestr.cxx b/tools/source/stream/cachestr.cxx
index 95d3dda..331628d 100644
--- a/tools/source/stream/cachestr.cxx
+++ b/tools/source/stream/cachestr.cxx
@@ -54,33 +54,6 @@ SvCacheStream::SvCacheStream( sal_uIntPtr nMaxMemSize )
/*************************************************************************
|*
-|* SvCacheStream::SvCacheStream()
-|*
-*************************************************************************/
-
-SvCacheStream::SvCacheStream( const String &rFileName,
- sal_uIntPtr nExpectedSize,
- sal_uIntPtr nMaxMemSize )
-{
- if( !nMaxMemSize )
- nMaxMemSize = 20480;
-
- if( nExpectedSize > nMaxMemSize )
- nExpectedSize = nMaxMemSize; // oder gleich in File schreiben
- else if( !nExpectedSize )
- nExpectedSize = 4096;
-
- SvStream::bIsWritable = sal_True;
- nMaxSize = nMaxMemSize;
- bPersistent = sal_True;
- aFileName = rFileName;
- pSwapStream = 0;
- pCurrentStream = new SvMemoryStream( nExpectedSize );
- pTempFile = 0;
-}
-
-/*************************************************************************
-|*
|* SvCacheStream::~SvCacheStream()
|*
*************************************************************************/
@@ -112,22 +85,8 @@ void SvCacheStream::SwapOut()
{
if( !pSwapStream && !aFileName.Len() )
{
- if (aFilenameLinkHdl.IsSet())
- {
- // pSwapStream wird zum Schutz gegen Reentranz genutzt
- pSwapStream = pCurrentStream;
- Link aLink( aFilenameLinkHdl );
- aFilenameLinkHdl = Link();
- aLink.Call(this);
- // pSwapStream nur zuruecksetzen, wenn nicht ueber
- // SetSwapStream geaendert
- if( pSwapStream == pCurrentStream ) pSwapStream = 0;
- }
- else
- {
- pTempFile = new TempFile;
- aFileName = pTempFile->GetName();
- }
+ pTempFile = new TempFile;
+ aFileName = pTempFile->GetName();
}
sal_uIntPtr nPos = pCurrentStream->Tell();
@@ -236,14 +195,4 @@ sal_uIntPtr SvCacheStream::GetSize()
return nLength;
}
-void SvCacheStream::SetFilenameHdl( const Link& rLink)
-{
- aFilenameLinkHdl = rLink;
-}
-
-const Link& SvCacheStream::GetFilenameHdl() const
-{
- return aFilenameLinkHdl;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 1a136aa..6c34ba7 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -728,18 +728,6 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
/*************************************************************************
|*
-|* SvFileStream::ReOpen()
-|*
-*************************************************************************/
-
-void SvFileStream::ReOpen()
-{
- if ( !bIsOpen && aFilename.Len() )
- Open( aFilename, eStreamMode );
-}
-
-/*************************************************************************
-|*
|* SvFileStream::Close()
|*
*************************************************************************/
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index ba3c691..2dd3b11 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -508,18 +508,6 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode )
/*************************************************************************
|*
-|* SvFileStream::ReOpen()
-|*
-*************************************************************************/
-
-void SvFileStream::ReOpen()
-{
- if( !bIsOpen && aFilename.Len() )
- Open( aFilename, eStreamMode );
-}
-
-/*************************************************************************
-|*
|* SvFileStream::Close()
|*
*************************************************************************/
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index e609c3a..aed9a6f 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -463,17 +463,6 @@ void ZCodec::ImplInitBuf ( sal_Bool nIOFlag )
// ------------------------------------------------------------------------
-sal_uIntPtr ZCodec::UpdateCRC ( sal_uIntPtr nLatestCRC, sal_uIntPtr nNumber )
-{
-
-#ifdef OSL_LITENDIAN
- nNumber = SWAPLONG( nNumber );
-#endif
- return rtl_crc32( nLatestCRC, &nNumber, 4 );
-}
-
-// ------------------------------------------------------------------------
-
sal_uIntPtr ZCodec::UpdateCRC ( sal_uIntPtr nLatestCRC, sal_uInt8* pSource, long nDatSize)
{
return rtl_crc32( nLatestCRC, pSource, nDatSize );
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index 210b323..dc0bf87 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -54,10 +54,6 @@ public:
void Dispatch( XEvent *pEvent ); // keep track of group changes
- sal_uInt32 LookupKeysymInGroup( sal_uInt32 nKeyCode,
- sal_uInt32 nShiftState,
- sal_uInt32 nGroup ) const ;
-
inline sal_uInt32 GetGroup() const ; // the current keyboard group
inline sal_uInt32 GetDefaultGroup() const ; // base group, usually group 1
inline int GetEventBase() const ;
diff --git a/vcl/inc/vcl/metric.hxx b/vcl/inc/vcl/metric.hxx
index 8061d98..32fd7be 100644
--- a/vcl/inc/vcl/metric.hxx
+++ b/vcl/inc/vcl/metric.hxx
@@ -54,10 +54,6 @@ public:
~FontInfo();
FontType GetType() const;
- sal_Bool IsDeviceFont() const;
- sal_Bool SupportsLatin() const;
- sal_Bool SupportsCJK() const;
- sal_Bool SupportsCTL() const;
FontInfo& operator=( const FontInfo& );
sal_Bool operator==( const FontInfo& ) const;
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index 09d9bb2..c3b0f68 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.cxx
@@ -145,36 +145,6 @@ FontType FontInfo::GetType() const
return (mpImplMetric->IsScalable() ? TYPE_SCALABLE : TYPE_RASTER);
}
-// -----------------------------------------------------------------------
-
-sal_Bool FontInfo::IsDeviceFont() const
-{
- return mpImplMetric->IsDeviceFont();
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool FontInfo::SupportsLatin() const
-{
- return mpImplMetric->SupportsLatin();
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool FontInfo::SupportsCJK() const
-{
- return mpImplMetric->SupportsCJK();
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool FontInfo::SupportsCTL() const
-{
- return mpImplMetric->SupportsCTL();
-}
-
-// =======================================================================
-
FontMetric::FontMetric( const FontMetric& rMetric )
: FontInfo( rMetric )
{}
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 2b6d458..39c13ff 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -304,10 +304,6 @@ namespace vcl
n /= (double)_zoom.GetDenominator();
return (long)::rtl::math::round( n );
}
- long unzoomBy( long _value, const Fraction& _zoom )
- {
- return zoomBy( _value, Fraction( _zoom.GetDenominator(), _zoom.GetNumerator() ) );
- }
}
//--------------------------------------------------------------------
diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx
index d7650cc..30799a1 100644
--- a/vcl/unx/generic/app/i18n_xkb.cxx
+++ b/vcl/unx/generic/app/i18n_xkb.cxx
@@ -118,20 +118,4 @@ SalI18N_KeyboardExtension::Dispatch( XEvent* pEvent )
}
}
-sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode,
- sal_uInt32 nShiftState,
- sal_uInt32 nGroup ) const
-{
- if ( !mbUseExtension )
- return NoSymbol;
-
- nShiftState &= ShiftMask;
-
- KeySym nKeySymbol;
- nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup, nShiftState );
- return nKeySymbol;
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6891707ddffeb647adb18c4f0d869d59106a7a4e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 3 21:23:25 2011 +0100
LookupKeysymInDefaultGroup unused
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index 41833ba..210b323 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -58,9 +58,6 @@ public:
sal_uInt32 nShiftState,
sal_uInt32 nGroup ) const ;
- inline sal_uInt32 LookupKeysymInDefaultGroup(
- sal_uInt32 nKeyCode,
- sal_uInt32 nShiftState ) const ;
inline sal_uInt32 GetGroup() const ; // the current keyboard group
inline sal_uInt32 GetDefaultGroup() const ; // base group, usually group 1
inline int GetEventBase() const ;
@@ -88,13 +85,6 @@ SalI18N_KeyboardExtension::UseExtension( sal_Bool bState )
}
inline sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInDefaultGroup( sal_uInt32 nKeyCode,
- sal_uInt32 nShiftState ) const
-{
- return LookupKeysymInGroup( nKeyCode, nShiftState, mnDefaultGroup );
-}
-
-inline sal_uInt32
SalI18N_KeyboardExtension::GetGroup() const
{
return mnGroup;
More information about the Libreoffice-commits
mailing list