[Libreoffice-commits] .: 7 commits - i18npool/inc i18npool/source rsc/inc rsc/source sot/inc sot/source svl/inc svl/source tools/inc tools/source vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jul 11 08:41:42 PDT 2011
i18npool/inc/i18npool/mslangid.hxx | 2 --
i18npool/source/isolang/isolang.cxx | 20 --------------------
rsc/inc/rscdef.hxx | 2 --
rsc/inc/rscinst.hxx | 2 --
rsc/source/tools/rscdef.cxx | 24 ------------------------
sot/inc/sot/stg.hxx | 1 -
sot/inc/sot/storage.hxx | 3 ---
sot/source/sdstor/storage.cxx | 32 --------------------------------
sot/source/sdstor/ucbstorage.cxx | 9 ---------
svl/inc/svl/itempool.hxx | 1 -
svl/source/items/poolio.cxx | 34 ----------------------------------
tools/inc/tools/inetmime.hxx | 6 ------
tools/source/inet/inetmime.cxx | 13 -------------
vcl/inc/vcl/svapp.hxx | 1 -
vcl/source/app/svapp.cxx | 12 ------------
15 files changed, 162 deletions(-)
New commits:
commit b44ab4e80d60b3204ffb8c0ada30742fc49ddc5a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 14:42:36 2011 +0100
callcatcher: remove unused SfxItemPool::GetLoadingVersion
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx
index d6eec75..3c9dabe 100644
--- a/svl/inc/svl/itempool.hxx
+++ b/svl/inc/svl/itempool.hxx
@@ -266,7 +266,6 @@ public:
sal_uInt16 GetFileFormatVersion() const
{ return _nFileFormatVersion; }
void SetFileFormatVersion( sal_uInt16 nFileFormatVersion );
- sal_uInt16 GetLoadingVersion() const;
bool IsCurrentVersionLoading() const;
static int IsWhich(sal_uInt16 nId) {
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 97e3484..459bcfa 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -1324,7 +1324,6 @@ void SfxItemPool::SetVersionMap
<SfxItemPool::IsLoadingVersionCurrent()const>
<SfxItemPool::GetNewWhich(sal_uInt16)>
<SfxItemPool::GetVersion()const>
- <SfxItemPool::GetLoadingVersion()const>
*/
{
@@ -1381,7 +1380,6 @@ sal_uInt16 SfxItemPool::GetNewWhich
<SfxItemPool::IsLoadingVersionCurrent()const>
<SfxItemPool::SetVersionMap(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16*)>
<SfxItemPool::GetVersion()const>
- <SfxItemPool::GetLoadingVersion()const>
*/
{
@@ -1470,7 +1468,6 @@ bool SfxItemPool::IsCurrentVersionLoading() const
<SfxItemPool::SetVersionMap(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16*)>
<SfxItemPool::GetNewWhich(sal_uInt16)const>
<SfxItemPool::GetVersion()const>
- <SfxItemPool::GetLoadingVersion()const>
*/
{
@@ -1503,7 +1500,6 @@ sal_uInt16 SfxItemPool::GetVersion() const
<SfxItemPool::IsLoadingVersionCurrent()const>
<SfxItemPool::SetVersionMap(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16*)>
<SfxItemPool::GetNewWhich(sal_uInt16)const>
- <SfxItemPool::GetLoadingVersion()const>
*/
{
@@ -1512,36 +1508,6 @@ sal_uInt16 SfxItemPool::GetVersion() const
// -----------------------------------------------------------------------
-sal_uInt16 SfxItemPool::GetLoadingVersion() const
-
-/* [Beschreibung]
-
- Diese Methode liefert die Versionsnummer des SfxItemPool-Aufbaus
- (also des Which-Bereichs), die bei Laden vorgefunden wurde.
-
- Precondition: Pool mu\s geladen sein
- Postcondition: unver"andert
- Laufzeit: 2
-
-
- [Anmerkung]
-
- Achtung: Es mu\s ggf. die Versionsnummer von Sekund"arpools
- ber"ucksichtigt werden.
-
-
- [Querverweise]
-
- <SfxItemPool::IsLoadingVersionCurrent()const>
- <SfxItemPool::SetVersionMap(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16*)>
- <SfxItemPool::GetNewWhich(sal_uInt16)const>
- <SfxItemPool::GetVersion()const>
-*/
-
-{
- return pImp->nLoadingVersion;
-}
-
//-------------------------------------------------------------------------
bool SfxItemPool::IsVer2_Impl() const
commit 46296a62c0e4ef35bc9b816a7592d4ff7c97de8f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 14:40:24 2011 +0100
callcatcher: remove unused ChangeDefName
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index 0f5af47..5f0e1cb 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -270,8 +270,6 @@ public:
sal_Bool IsDefUsed( const ByteString & );
void DeleteDef( const ByteString & );
- sal_Bool ChangeDefName( const ByteString & rDefName,
- const ByteString & rNewName );
// Alle Defines die in dieser Datei Definiert sind loeschen
void DeleteFileContext( sal_uLong lKey );
diff --git a/rsc/inc/rscinst.hxx b/rsc/inc/rscinst.hxx
index 81f0d47..fe6b736 100644
--- a/rsc/inc/rscinst.hxx
+++ b/rsc/inc/rscinst.hxx
@@ -206,8 +206,6 @@ public:
const ByteString & rMacro );
sal_Bool IsDefUsed( const ByteString & );
void DeleteDef( const ByteString & rMacroName );
- ERRTYPE ChangeDefName( const ByteString & rMacroName,
- const ByteString & rNewName );
// Dateinamen-Instanz holen
RscFile * GetFileStruct();
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index 3b92996..91f5568 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -1046,30 +1046,6 @@ sal_Bool RscFileTab::ChangeDef( const ByteString & rDefName,
/*************************************************************************
|*
-|* RscFileTab::ChangeDefName()
-|*
-*************************************************************************/
-sal_Bool RscFileTab::ChangeDefName( const ByteString & rDefName,
- const ByteString & rNewName )
-{
- RscDefine * pDef = FindDef( rDefName );
-
- //Name gefunden ?
- if( pDef ){
- // und neuer Name noch nicht bekannt ?
- if( !FindDef( pDef->GetFileKey(), rNewName ) ){
- aDefTree.Remove( pDef );
- pDef->SetName( rNewName );
- aDefTree.Insert( pDef );
- return( sal_True );
- }
- };
-
- return( sal_False );
-}
-
-/*************************************************************************
-|*
|* RscFileTab::DeleteFileContext()
|*
*************************************************************************/
commit 6ad672ed1b7ba54e931abd971c13646b0da51d89
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 13:55:44 2011 +0100
callcatcher: remove unused UCBStorageStream ctor
diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx
index e04649c..3b2ecd2 100644
--- a/sot/inc/sot/stg.hxx
+++ b/sot/inc/sot/stg.hxx
@@ -262,7 +262,6 @@ protected:
~UCBStorageStream();
public:
TYPEINFO();
- UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const ByteString* pKey=0 );
UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const ByteString* pKey, sal_Bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress );
UCBStorageStream( UCBStorageStream_Impl* );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 198a657..67b033c 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1336,15 +1336,6 @@ void UCBStorageStream_Impl::PrepareCachedForReopen( StreamMode nMode )
}
}
-UCBStorageStream::UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const ByteString* pKey )
-{
- // pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized
- // to class UCBStorageStream !
- pImp = new UCBStorageStream_Impl( rName, nMode, this, bDirect, pKey );
- pImp->AddRef(); // use direct refcounting because in header file only a pointer should be used
- StorageBase::m_nMode = pImp->m_nMode;
-}
-
UCBStorageStream::UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const ByteString* pKey, sal_Bool bRepair, Reference< XProgressHandler > xProgress )
{
// pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized
commit c97ac41f5e513b75ce1112983b89830b9c2ad997
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 13:44:07 2011 +0100
callcatcher: remove unused SotStorage::OpenEncryptedSotStream
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index 32945d5..6c4cbdf 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -208,9 +208,6 @@ public:
SotStorageStream * OpenSotStream( const String & rEleName,
StreamMode = STREAM_STD_READWRITE,
StorageMode = 0 );
- SotStorageStream * OpenEncryptedSotStream( const String & rEleName, const ByteString& rKey,
- StreamMode = STREAM_STD_READWRITE,
- StorageMode = 0 );
SotStorage * OpenSotStorage( const String & rEleName,
StreamMode = STREAM_STD_READWRITE,
StorageMode = STORAGE_TRANSACTED );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 514faaf..b12af44 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -987,38 +987,6 @@ sal_Bool SotStorage::Revert()
return SVSTREAM_OK == GetError();
}
-/*************************************************************************
-|* SotStorage::OpenStream()
-|*
-|* Beschreibung
-*************************************************************************/
-SotStorageStream * SotStorage::OpenEncryptedSotStream( const String & rEleName, const ByteString& rKey,
- StreamMode nMode,
- StorageMode nStorageMode )
-{
- DBG_ASSERT( !nStorageMode, "StorageModes ignored" );
- SotStorageStream * pStm = NULL;
- DBG_ASSERT( Owner(), "must be owner" );
- if( m_pOwnStg )
- {
- // volle Ole-Patches einschalten
- // egal was kommt, nur exclusiv gestattet
- nMode |= STREAM_SHARE_DENYALL;
- ErrCode nE = m_pOwnStg->GetError();
- BaseStorageStream* p = m_pOwnStg->OpenStream( rEleName, nMode,
- (nStorageMode & STORAGE_TRANSACTED) ? sal_False : sal_True, &rKey );
- pStm = new SotStorageStream( p );
-
- if( !nE )
- m_pOwnStg->ResetError(); // kein Fehler setzen
- if( nMode & STREAM_TRUNC )
- pStm->SetSize( 0 );
- }
- else
- SetError( SVSTREAM_GENERALERROR );
- return pStm;
-}
-
SotStorageStream * SotStorage::OpenSotStream( const String & rEleName,
StreamMode nMode,
StorageMode nStorageMode )
commit 5e6dc7f9f7a74c2275433bbbd48c2fb8d1ac0d02
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 13:41:53 2011 +0100
callcatcher: remove unused MsLangId::convertIsoByteStringToLanguage
diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18npool/inc/i18npool/mslangid.hxx
index 342d01d..6e8384b 100644
--- a/i18npool/inc/i18npool/mslangid.hxx
+++ b/i18npool/inc/i18npool/mslangid.hxx
@@ -184,8 +184,6 @@ public:
const rtl::OString& rCountry );
static LanguageType convertIsoStringToLanguage(
const rtl::OUString& rString, sal_Unicode cSep = '-' );
- static LanguageType convertIsoByteStringToLanguage(
- const rtl::OString& rString, sal_Char cSep = '-' );
static LanguageType convertUnxByteStringToLanguage(
const rtl::OString& rString );
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index b04dab8..3dac780 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -1012,26 +1012,6 @@ LanguageType MsLangId::convertIsoStringToLanguage(
// -----------------------------------------------------------------------
-// static
-LanguageType MsLangId::convertIsoByteStringToLanguage(
- const rtl::OString& rString, sal_Char cSep )
-{
- rtl::OString aLang;
- rtl::OString aCountry;
- sal_Int32 nSepPos = rString.indexOf( cSep );
- if ( nSepPos >= 0 )
- {
- aLang = rString.copy( 0, nSepPos );
- aCountry = rString.copy( nSepPos+1 );
- }
- else
- aLang = rString;
-
- return convertIsoNamesToLanguage( aLang, aCountry );
-}
-
-// -----------------------------------------------------------------------
-
struct IsoLangGLIBCModifiersEntry
{
LanguageType mnLang;
commit 273a9b6cdf1fcd80c465fbdeead31c0c880f0c2b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 13:40:19 2011 +0100
callcatcher: remove unused ByteString writeHeaderFieldBody variant
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index d5b56b0..2c4c425 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -599,12 +599,6 @@ public:
static void writeHeaderFieldBody(INetMIMEOutputSink & rSink,
HeaderFieldType eType,
- const ByteString & rBody,
- rtl_TextEncoding ePreferredEncoding,
- bool bInitialSpace = true);
-
- static void writeHeaderFieldBody(INetMIMEOutputSink & rSink,
- HeaderFieldType eType,
const UniString & rBody,
rtl_TextEncoding ePreferredEncoding,
bool bInitialSpace = true);
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 082b8d2..855285a 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -2233,19 +2233,6 @@ void INetMIME::writeDateTime(INetMIMEOutputSink & rSink,
// static
void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink,
HeaderFieldType eType,
- const ByteString & rBody,
- rtl_TextEncoding ePreferredEncoding,
- bool bInitialSpace)
-{
- writeHeaderFieldBody(rSink, eType,
- UniString(rBody, RTL_TEXTENCODING_UTF8),
- ePreferredEncoding, bInitialSpace);
-}
-
-//============================================================================
-// static
-void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink,
- HeaderFieldType eType,
const UniString & rBody,
rtl_TextEncoding ePreferredEncoding,
bool bInitialSpace)
commit 03e963d9c186e2b1d9b0a468c76646703fd11e1c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 13:17:20 2011 +0100
callcatcher: remove unused Application::GetReservedKeyCodeDescription
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 5437210..37ebab7 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -379,7 +379,6 @@ public:
static sal_uLong GetReservedKeyCodeCount();
static const KeyCode* GetReservedKeyCode( sal_uLong i );
- static String GetReservedKeyCodeDescription( sal_uLong i );
static void SetDefDialogParent( Window* pWindow );
static Window* GetDefDialogParent();
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 3346fc9..0eb0a19 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -417,18 +417,6 @@ const KeyCode* Application::GetReservedKeyCode( sal_uLong i )
return &ImplReservedKeys::get()->first[i].mKeyCode;
}
-String Application::GetReservedKeyCodeDescription( sal_uLong i )
-{
- ResMgr* pResMgr = ImplGetResMgr();
- if( ! pResMgr )
- return String();
- ImplReservedKey *pImplReservedKeys = ImplReservedKeys::get()->first;
- if( i >= GetReservedKeyCodeCount() || ! pImplReservedKeys[i].mnResId )
- return String();
- else
- return String( ResId( pImplReservedKeys[i].mnResId, *pResMgr ) );
-}
-
// -----------------------------------------------------------------------
void Application::Execute()
More information about the Libreoffice-commits
mailing list