[Libreoffice-commits] .: 6 commits - basegfx/source l10ntools/inc l10ntools/source rsc/inc rsc/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jul 12 01:17:45 PDT 2011
basegfx/source/polygon/b2dpolypolygon.cxx | 19 ---
l10ntools/inc/export.hxx | 2
l10ntools/inc/l10ntools/directory.hxx | 1
l10ntools/source/directory.cxx | 6 -
l10ntools/source/localize.cxx | 19 ---
l10ntools/source/merge.cxx | 12 --
rsc/inc/rscclass.hxx | 9 -
rsc/inc/rscdb.hxx | 4
rsc/inc/rscdef.hxx | 11 --
rsc/inc/rsckey.hxx | 2
rsc/inc/rscpar.hxx | 2
rsc/inc/rscrsc.hxx | 10 -
rsc/source/misc/rscdbl.cxx | 9 -
rsc/source/parser/rscdb.cxx | 50 ---------
rsc/source/parser/rsckey.cxx | 10 -
rsc/source/parser/rscpar.cxx | 17 ---
rsc/source/res/rscclass.cxx | 27 -----
rsc/source/rsc/rsc.cxx | 45 --------
rsc/source/tools/rscdef.cxx | 159 ------------------------------
19 files changed, 7 insertions(+), 407 deletions(-)
New commits:
commit 2f580a32ad5dbb46cd3897316a12aea032b9e10e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 12 08:54:16 2011 +0100
4 minutes 27 seconds -> 11 seconds
diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx
index 998c348..b64246c 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.cxx
@@ -93,21 +93,10 @@ public:
void insert(sal_uInt32 nIndex, const basegfx::B2DPolyPolygon& rPolyPolygon)
{
- const sal_uInt32 nCount = rPolyPolygon.count();
-
- if(nCount)
- {
- // add nCount polygons from rPolyPolygon
- maPolygons.reserve(maPolygons.size() + nCount);
- PolygonVector::iterator aIndex(maPolygons.begin());
- aIndex += nIndex;
-
- for(sal_uInt32 a(0L); a < nCount; a++)
- {
- aIndex = maPolygons.insert(aIndex, rPolyPolygon.getB2DPolygon(a));
- ++aIndex;
- }
- }
+ // add all polygons from rPolyPolygon
+ PolygonVector::iterator aIndex(maPolygons.begin());
+ aIndex += nIndex;
+ maPolygons.insert(aIndex, rPolyPolygon.begin(), rPolyPolygon.end());
}
void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
commit 5236df0b4d01b9a6bc413b7ceb34fb14a44c7902
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 12 01:30:16 2011 +0100
callcatcher: unused code
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 9fb559a..89a8a56 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -118,15 +118,6 @@ public:
RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
};
-class RscFirstSysDepend : public RscSysDepend
-{
-public:
- RscFirstSysDepend( Atom nId, sal_uInt32 nTypId,
- RscTop * pSuper );
- ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
-};
-
class RscTupel : public RscClass
{
public:
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index c2eff2a..be73763 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -337,8 +337,6 @@ public:
}
RscTop * SearchType( Atom nTypId );
RscTop * Search( Atom typ );
- CLASS_DATA Search( Atom typ, const RscId & rId );
- void Delete( Atom typ, const RscId & rId );
// loescht alle Resourceobjekte diese Datei
void Delete( sal_uLong lFileKey );
RscTop * GetRoot() { return( pRoot ); };
@@ -353,8 +351,6 @@ public:
const ByteString & rHxxName );
void WriteSyntax( FILE * fOutput );
void WriteRcCtor( FILE * fOutput );
- void FillNameIdList( REResourceList * pList, sal_uLong lFileKey );
- sal_Bool MakeConsistent();
sal_uInt32 PutTranslatorKey( sal_uInt64 nKey );
void IncFilePos( sal_uLong nOffset ){ nFilePos += nOffset; }
};
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index 5f0e1cb..92f0a1d 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -103,11 +103,9 @@ public:
RscId& operator = ( const RscId& rRscId );
- static sal_Bool IsSetNames();
static void SetNames( sal_Bool bSet = sal_True );
operator sal_Int32() const; // Gibt Nummer zurueck
ByteString GetName() const; // Gibt den Namen des Defines zurueck
- ByteString GetMacro() const; // Gibt das Macro zurueck
sal_Bool operator < ( const RscId& rRscId ) const;
sal_Bool operator > ( const RscId& rRscId ) const;
sal_Bool operator == ( const RscId& rRscId ) const;
@@ -166,9 +164,7 @@ private:
sal_Int32 lDefId, size_t lPos );
RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName,
RscExpression * pExpression, size_t lPos );
- sal_Bool Befor( const RscDefine * pFree, const RscDefine * pDepend );
sal_Bool Remove( RscDefine * pDef );
- sal_Bool Remove( size_t nIndex );
sal_Bool Remove();
size_t GetPos( RscDefine* item ) {
for ( size_t i = 0, n = maList.size(); i < n; ++i )
@@ -265,15 +261,8 @@ public:
RscDefine * NewDef( sal_uLong lKey, const ByteString & rDefName,
RscExpression *, sal_uLong lPos );
- sal_Bool ChangeDef( const ByteString & rDefName, sal_Int32 lId );
- sal_Bool ChangeDef( const ByteString & rDefName, RscExpression * );
-
- sal_Bool IsDefUsed( const ByteString & );
- void DeleteDef( const ByteString & );
-
// Alle Defines die in dieser Datei Definiert sind loeschen
void DeleteFileContext( sal_uLong lKey );
- void DeleteFile( sal_uLong lKey );
sal_uLong NewCodeFile( const ByteString & rName );
sal_uLong NewIncFile( const ByteString & rName, const ByteString & rPath );
RscFile * GetFile( sal_uLong lFileKey ){ return Get( lFileKey ); }
diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx
index 969cad6..4b7f3ff 100644
--- a/rsc/inc/rsckey.hxx
+++ b/rsc/inc/rsckey.hxx
@@ -48,11 +48,9 @@ public:
~RscNameTable();
void SetSort( sal_Bool bSorted = sal_True );
Atom Put( Atom nName, sal_uInt32 nTyp, long nValue );
- Atom Put( Atom nName, sal_uInt32 nTyp );
Atom Put( const char * pName, sal_uInt32 nTyp, long nValue );
Atom Put( const char * pName, sal_uInt32 nTyp );
Atom Put( Atom nName, sal_uInt32 nTyp, RscTop * pClass );
- Atom Put( const char * pName, sal_uInt32 nTyp, RscTop * pClass );
// sal_True, wurde gefunden
sal_Bool Get( Atom nName, KEY_STRUCT * pEle );
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index c43fd15..0da8d40 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -76,12 +76,10 @@ public:
std::list<OutputFile> m_aOutputFiles;
std::list< std::pair< rtl::OString, rtl::OString > > m_aReplacements;
- RscCmdLine( int argc, char ** argv, RscError * pEH );
- RscCmdLine();
+ RscCmdLine( int argc, char ** argv, RscError * pEH );
+ ~RscCmdLine();
- ~RscCmdLine();
-
- ::rtl::OString substitutePaths( const ::rtl::OString& rIn );
+ ::rtl::OString substitutePaths( const ::rtl::OString& rIn );
};
/****************** R s c ************************************************/
@@ -97,7 +95,6 @@ private:
void CreateResFile( const char * pRc );
void Append( const ByteString& rOutputSrs, const ByteString& rTmpFile );
- void OpenInput( const ByteString& rInput );
bool GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
const WriteRcContext& rContext,
@@ -119,7 +116,6 @@ public:
~RscCompiler();
ERRTYPE Start();
- ByteString GetTmpFileName(); // Die Dateien werden geloescht
// Include Statements lesen
ERRTYPE IncludeParser( sal_uLong lFileKey );
diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx
index 401164a..80bd241 100644
--- a/rsc/source/misc/rscdbl.cxx
+++ b/rsc/source/misc/rscdbl.cxx
@@ -37,11 +37,6 @@
#include <rsctop.hxx>
#include "rsclst.hxx"
-/*************************************************************************
-|*
-|* RscTypCont::FillNameIdList()
-|*
-*************************************************************************/
REResourceList * InsertList( Atom nClassName, const RscId& rId,
REResourceList * pList ) {
REResourceList * pSubList;
@@ -110,8 +105,4 @@ void FillList( RscTop * pRscTop, REResourceList * pList, sal_uLong lFileKey ){
};
}
-void RscTypCont::FillNameIdList( REResourceList * pList, sal_uLong lFileKey ){
- FillList( pRoot, pList, lFileKey );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 5209f7f..1e91fa3 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -322,47 +322,6 @@ RscTop * RscTypCont :: Search( Atom nRT ){
return( (RscTop *)pRoot->Search( nRT ) );
}
-CLASS_DATA RscTypCont :: Search( Atom nRT, const RscId & rId ){
- ObjNode *pObjNode;
- RscTop *pRscTop;
-
- if( NULL != (pRscTop = Search( nRT )) ){
- if( NULL != (pObjNode = pRscTop->GetObjNode( rId )) ){
- return( pObjNode->GetRscObj() );
- }
- }
- return( (CLASS_DATA)0 );
-}
-
-/*************************************************************************
-|*
-|* RscTypCont :: Delete()
-|*
-*************************************************************************/
-void RscTypCont :: Delete( Atom nRT, const RscId & rId ){
- ObjNode * pObjNode;
- RscTop * pRscTop;
-
- if( NULL != (pRscTop = Search( nRT )) ){
- if( NULL != (pObjNode = pRscTop->GetObjNode()) ){
- pObjNode = pObjNode->Search( rId );
-
- if( pObjNode ){
- //Objekt aus Baum entfernen
- pRscTop->pObjBiTree =
- (ObjNode *)pRscTop->pObjBiTree->Remove( pObjNode );
-
- if( pObjNode->GetRscObj() ){
- pRscTop->Destroy( RSCINST( pRscTop,
- pObjNode->GetRscObj() ) );
- rtl_freeMemory( pObjNode->GetRscObj() );
- }
- delete pObjNode;
- }
- }
- }
-}
-
/*************************************************************************
|*
|* RscTypCont :: PutSysName()
@@ -969,11 +928,6 @@ void RscTypCont :: Delete( sal_uLong lFileKey ){
aFileTab.DeleteFileContext( lFileKey );
}
-/*************************************************************************
-|*
-|* RscTypCont :: MakeConsistent()
-|*
-*************************************************************************/
sal_Bool IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop )
{
sal_Bool bRet = sal_True;
@@ -1021,10 +975,6 @@ sal_Bool MakeConsistent( RscTop * pRscTop )
return bRet;
}
-sal_Bool RscTypCont :: MakeConsistent(){
- return( ::MakeConsistent( pRoot ) );
-}
-
sal_uInt32 RscTypCont::PutTranslatorKey( sal_uInt64 nKey )
{
aIdTranslator[ nKey ] = nFilePos;
diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx
index 4e8e57a..a3b88a1 100644
--- a/rsc/source/parser/rsckey.cxx
+++ b/rsc/source/parser/rsckey.cxx
@@ -122,11 +122,6 @@ Atom RscNameTable::Put( const char * pName, sal_uInt32 nTyp, long nValue )
return( Put( pHS->getID( pName ), nTyp, nValue ) );
};
-Atom RscNameTable::Put( Atom nName, sal_uInt32 nTyp )
-{
- return( Put( nName, nTyp, (long)nName ) );
-};
-
Atom RscNameTable::Put( const char * pName, sal_uInt32 nTyp )
{
Atom nId;
@@ -140,11 +135,6 @@ Atom RscNameTable::Put( Atom nName, sal_uInt32 nTyp, RscTop * pClass )
return( Put( nName, nTyp, (long)pClass ) );
};
-Atom RscNameTable::Put( const char * pName, sal_uInt32 nTyp, RscTop * pClass )
-{
- return( Put( pHS->getID( pName ), nTyp, (long)pClass ) );
-};
-
/*************************************************************************
|*
|* RscNameTable::Get()
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 1e41feb..63e6fed 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -1124,33 +1124,6 @@ ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
/*************************************************************************
|*
-|* RscFirstSysDepend::RscFirstSysDepend()
-|*
-|* Beschreibung
-|*
-*************************************************************************/
-RscFirstSysDepend::RscFirstSysDepend( Atom nId, sal_uInt32 nTypeId,
- RscTop * pSuper )
- : RscSysDepend( nId, nTypeId, pSuper )
-{}
-
-/*************************************************************************
-|*
-|* RscFirstSysDepend::WriteRc()
-|*
-|* Beschreibung
-|*
-*************************************************************************/
-ERRTYPE RscFirstSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
-{
- ERRTYPE aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
- aError = WriteSysDependRc( rInst, rMem, pTC, nDeep, bExtra, sal_True );
- return aError;
-}
-
-/*************************************************************************
-|*
|* RscTupel::RscTupel()
|*
|* Beschreibung
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 40717c4..8b1c047 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -113,18 +113,6 @@ void RscCmdLine::Init()
|* Beschreibung Kommandozeile interpretierten
|*
*************************************************************************/
-RscCmdLine::RscCmdLine()
-{
- Init();
-}
-
-/*************************************************************************
-|*
-|* RscCmdLine::RscCmdLine()
-|*
-|* Beschreibung Kommandozeile interpretierten
-|*
-*************************************************************************/
RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
{
char * pStr;
@@ -1048,39 +1036,6 @@ void RscCompiler::Append( const ByteString& rOutputSrs,
}
}
-/********************************************************************/
-/* */
-/* Function : GetTmpFileName() */
-/* */
-/* Description : Packt einen Dateinamen in Tmp-Dateiliste. */
-/* */
-/********************************************************************/
-ByteString RscCompiler::GetTmpFileName()
-{
- ByteString aFileName;
-
- aFileName = ::GetTmpFileName();
- return( aFileName );
-}
-
-/********************************************************************/
-/* */
-/* Function : sal_Bool openinput() */
-/* */
-/* Description : Check to see if the input file exists and can */
-/* be opened for reading. */
-/********************************************************************/
-
-void RscCompiler::OpenInput( const ByteString& rInput )
-{
- FILE *fp;
- /* try to open the input file */
- if( NULL == (fp = fopen( rInput.GetBuffer(), "r")))
- pTC->pEH->FatalError( ERR_OPENFILE, RscId(), rInput.GetBuffer() );
-
- fclose( fp );
-}
-
/*************************************************************************
|*
|* GetImageFilePath()
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index 91f5568..2bd41ed 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -44,7 +44,6 @@ sal_Bool RscId::bNames = sal_True;
|*
*************************************************************************/
void RscId::SetNames( sal_Bool bSet ) { bNames = bSet; }
-sal_Bool RscId::IsSetNames() { return bNames; }
/*************************************************************************
|*
@@ -183,23 +182,6 @@ ByteString RscId::GetName() const
return aStr.makeStringAndClear();
}
-/*************************************************************************
-|*
-|* RscId::GetMacro()
-|*
-*************************************************************************/
-ByteString RscId::GetMacro() const
-{
- rtl::OStringBuffer aStr;
-
- if ( aExp.IsDefinition() )
- aStr.append(aExp.aExp.pDef->GetMacro());
- else
- aExp.AppendMacro(aStr);
-
- return aStr.makeStringAndClear();
-}
-
/****************** R s c D e f i n e ************************************/
/*************************************************************************
|*
@@ -376,18 +358,6 @@ sal_Bool RscDefineList::Remove( RscDefine * pDef ) {
return sal_False;
}
-sal_Bool RscDefineList::Remove( size_t lIndex ) {
- if ( lIndex < maList.size() ) {
- RscSubDefList::iterator it = maList.begin();
- ::std::advance( it, lIndex );
- (*it)->DefineToNumber();
- (*it)->DecRef();
- maList.erase( it );
- return sal_True;
- }
- return sal_False;
-}
-
sal_Bool RscDefineList::Remove() {
if ( maList.empty() )
return sal_False;
@@ -400,29 +370,6 @@ sal_Bool RscDefineList::Remove() {
/*************************************************************************
|*
-|* RscDefineList::Befor()
-|*
-*************************************************************************/
-sal_Bool RscDefineList::Befor( const RscDefine * pFree,
- const RscDefine * pDepend )
-{
- size_t i = 0;
- size_t n = maList.size();
- while ( i < n ) {
- if ( maList[ i ] == pFree ) {
- for ( ++i ; i < n ; ++i ) {
- if ( maList[ i ] == pDepend ) {
- return sal_True;
- }
- }
- }
- ++i;
- }
- return sal_False;
-}
-
-/*************************************************************************
-|*
|* RscDefineList::WriteAll()
|*
*************************************************************************/
@@ -963,89 +910,6 @@ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const ByteString & rDefName,
/*************************************************************************
|*
-|* RscFileTab::IsDefUsed()
-|*
-*************************************************************************/
-sal_Bool RscFileTab::IsDefUsed( const ByteString & rDefName )
-{
- RscDefine * pDef = FindDef( rDefName );
-
- if( pDef )
- return( pDef->GetRefCount() != 2 );
-
- return sal_False;
-}
-
-/*************************************************************************
-|*
-|* RscFileTab::DeleteDef()
-|*
-*************************************************************************/
-void RscFileTab::DeleteDef( const ByteString & rDefName )
-{
- RscDefine * pDef = FindDef( rDefName );
- RscFile * pFile;
-
- if( pDef ){
- pFile = GetFile( pDef->GetFileKey() );
- if( pFile ){
- aDefTree.Remove( pDef );
- pFile->aDefLst.Remove( pDef );
- }
- };
-}
-
-/*************************************************************************
-|*
-|* RscFileTab::ChangeDef()
-|*
-*************************************************************************/
-sal_Bool RscFileTab::ChangeDef( const ByteString & rDefName, sal_Int32 lId )
-{
- RscDefine * pDef = FindDef( rDefName );
-
- if( pDef ){
- pDef->ChangeMacro( lId );
- //alle Macros neu bewerten
- return aDefTree.Evaluate();
- };
- return( sal_False );
-}
-
-/*************************************************************************
-|*
-|* RscFileTab::ChangeDef()
-|*
-*************************************************************************/
-sal_Bool RscFileTab::ChangeDef( const ByteString & rDefName,
- RscExpression * pExp )
-{
- RscDefine * pDef = FindDef( rDefName );
- RscFile * pFile;
-
- if( pDef )
- {
- pFile = GetFile( pDef->GetFileKey() );
- sal_uLong lPos = 0;
- if( pFile )
- lPos = pFile->aDefLst.GetPos( pDef );
- //Macros in den Expressions sind definiert ?
- if( TestDef( pDef->GetFileKey(), lPos, pExp ) ){
- pDef->ChangeMacro( pExp );
- //alle Macros neu bewerten
- return aDefTree.Evaluate();
- }
- };
-
- // pExp wird immer Eigentum und muss, wenn es nicht benoetigt wird
- // geloescht werden
- delete pExp;
-
- return( sal_False );
-}
-
-/*************************************************************************
-|*
|* RscFileTab::DeleteFileContext()
|*
*************************************************************************/
@@ -1066,29 +930,6 @@ void RscFileTab :: DeleteFileContext( sal_uLong lFileKey ){
/*************************************************************************
|*
-|* RscFileTab::DeleteFile()
-|*
-*************************************************************************/
-void RscFileTab :: DeleteFile( sal_uLong lFileKey ){
- RscFile * pFName;
-
- //Defines freigeben
- DeleteFileContext( lFileKey );
-
- //Schleife ueber alle Abhaengigkeiten
- pFName = First();
- while( pFName ){
- pFName->RemoveDependFile( lFileKey );
- pFName = Next();
- };
-
- pFName = Remove( lFileKey );
- if( pFName )
- delete pFName;
-}
-
-/*************************************************************************
-|*
|* RscFileTab::NewCodeFile()
|*
*************************************************************************/
commit 8c12f5af11622965a30f3b5bd952e71da8fc4efd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 21:17:43 2011 +0100
callcatcher: remove unused MergeDataFile::WriteError ByteString
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index d8a70af..9d3b895 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -515,8 +515,6 @@ class MergeDataFile
const ByteString &sFilename, bool bCaseSensitive
);
ByteString Dump();
- void WriteError( const ByteString &rLine );
-
public:
MergeDataFile( const ByteString &rFileName, const ByteString& rFile , sal_Bool bErrLog, CharSet aCharSet, bool bCaseSensitive = false );
~MergeDataFile();
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 243ac4b..e057b68 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -269,18 +269,6 @@ ByteString MergeDataFile::Dump(){
return sRet;
}
-void MergeDataFile::WriteError( const ByteString &rLine )
-{
- if ( bErrorLog )
- {
- if ( !aErrLog.IsOpen())
- aErrLog.Open( String( sErrorLog, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_WRITE | STREAM_TRUNC );
- aErrLog.WriteLine( rLine );
- }
- else
- fprintf( stderr, "%s\n", rLine.GetBuffer());
-}
-
std::vector<ByteString> MergeDataFile::GetLanguages(){
return std::vector<ByteString>(aLanguageSet.begin(),aLanguageSet.end());
}
commit bae87b9ca68579b6ea29ed5596ad1e53953c9b25
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 21:15:10 2011 +0100
callcatcher: remove unused RscFileInst ByteString ctor
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index d619c26..f2262c7 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.hxx
@@ -62,8 +62,6 @@ public:
void Init(); // ctor initialisieren
RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
sal_uLong lFileIndex, FILE * fFile );
- RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
- sal_uLong lFileIndex, const ByteString & );
~RscFileInst();
sal_Bool IsEof() const { return bEof; }
void SetFileIndex( sal_uLong lFIndex ) { lFileIndex = lFIndex; }
diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx
index 34a033a..09fc415 100644
--- a/rsc/source/parser/rscpar.cxx
+++ b/rsc/source/parser/rscpar.cxx
@@ -72,23 +72,6 @@ RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
pInput = (char *)rtl_allocateMemory( nInputBufLen );
}
-RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
- sal_uLong lFIndex, const ByteString& rBuf )
-{
- pTypCont = pTC;
- Init();
- lFileIndex = lFIndex;
- lSrcIndex = lIndexSrc;
- fInputFile = NULL;
- nInputPos = 0;
- nInputEndPos = rBuf.Len();
-
- // Muss groesser sein wegen Eingabeende bei nInputBufLen < nInputEndPos
- nInputBufLen = nInputEndPos +1;
- pInput = (char *)rtl_allocateMemory( nInputBufLen +100 );
- memcpy( pInput, rBuf.GetBuffer(), nInputEndPos );
-}
-
/*************************************************************************
|*
|* RscFileInst::~RscFileInst()
commit 73ab1f91dc749128db43d2c3eb2531c74de05315
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 21:12:51 2011 +0100
callcatcher: remove unused Merge ByteString
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index edc9877..66edfcd 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -221,7 +221,6 @@ public:
{ sLanguageRestriction = rRestrictions; }
int getFileCnt();
sal_Bool Extract( const ByteString &rDestinationFile );
- sal_Bool Merge( const ByteString &rSourceFile , const ByteString &rOutput );
int GetFileCnt();
virtual void OnExecuteDirectory( const rtl::OUString &rDirectory );
};
@@ -796,24 +795,6 @@ sal_Bool SourceTreeLocalizer::ExecuteMerge( )
}
-/*****************************************************************************/
-sal_Bool SourceTreeLocalizer::Merge( const ByteString &rSourceFile , const ByteString &rOutput )
-/*****************************************************************************/
-{
- sOutputFile = rOutput;
- nMode = LOCALIZE_MERGE;
- aSDF.Open( String( rSourceFile, RTL_TEXTENCODING_ASCII_US ),
- STREAM_STD_READ );
-
- sal_Bool bReturn = aSDF.IsOpen();
- if ( bReturn ) {
- bReturn = ExecuteMerge();
- }
- aSDF.Close();
- nMode = LOCALIZE_NONE;
- return bReturn;
-}
-
}
using namespace transex3;
commit 152b3f4ce0ed1cc7b143b4c0f9a13a8fead41ffa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 21:10:48 2011 +0100
callcatcher: remove Directory ByteString ctor
diff --git a/l10ntools/inc/l10ntools/directory.hxx b/l10ntools/inc/l10ntools/directory.hxx
index 2178d98..e65b36f 100644
--- a/l10ntools/inc/l10ntools/directory.hxx
+++ b/l10ntools/inc/l10ntools/directory.hxx
@@ -47,7 +47,6 @@ class Directory
Directory( const rtl::OUString sFullPath );
Directory( const rtl::OUString sFullPath , const rtl::OUString sEntry ) ;
- Directory( const ByteString sFullPath );
static bool lessDir ( const Directory& rKey1, const Directory& rKey2 ) ;
};
diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index d18e577..dcec248 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -54,12 +54,6 @@ Directory::Directory( const rtl::OUString sFullPath , const rtl::OUString sEntry
sDirectoryName = sEntry;
}
-
-Directory::Directory( const ByteString sFullPath ) : bSkipLinks( false )
-{
- sDirectoryName = rtl::OUString( sFullPath.GetBuffer() , RTL_TEXTENCODING_UTF8 , sFullPath.Len() );
-}
-
bool Directory::lessDir ( const Directory& rKey1, const Directory& rKey2 )
{
rtl::OUString sName1( ( static_cast< Directory >( rKey1 ) ).getDirectoryName() );
More information about the Libreoffice-commits
mailing list