[Libreoffice-commits] .: 2 commits - l10ntools/source sc/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Dec 20 01:40:11 PST 2011
l10ntools/source/helpex.cxx | 80 +++++++++++++++++-----------------------
sc/source/ui/docshell/docsh.cxx | 4 --
sc/source/ui/inc/docsh.hxx | 2 -
sc/source/ui/view/printfun.cxx | 21 ----------
unusedcode.easy | 1
5 files changed, 35 insertions(+), 73 deletions(-)
New commits:
commit b0604113bc35c17f84f952ec882c24d61eef30e3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 19 22:39:38 2011 +0000
ByteString->rtl::OString
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index b9c6874..1925285 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -48,17 +48,17 @@
#define STATE_OUTPUTY 0xff
// set of global variables
-ByteString sInputFile;
+rtl::OString sInputFile;
sal_Bool bEnableExport;
sal_Bool bMergeMode;
sal_Bool bErrorLog;
sal_Bool bUTF8;
-ByteString sPrj;
-ByteString sPrjRoot;
-ByteString sOutputFile;
-ByteString sOutputFileX;
-ByteString sOutputFileY;
-ByteString sSDFFile;
+rtl::OString sPrj;
+rtl::OString sPrjRoot;
+rtl::OString sOutputFile;
+rtl::OString sOutputFileX;
+rtl::OString sOutputFileY;
+rtl::OString sSDFFile;
/*****************************************************************************/
sal_Bool ParseCommandLine( int argc, char* argv[])
@@ -77,41 +77,36 @@ sal_Bool ParseCommandLine( int argc, char* argv[])
sal_Bool bInput = sal_False;
// parse command line
- for( int i = 1; i < argc; i++ ) {
- if ( ByteString( argv[ i ]).ToUpperAscii() == "-I" ) {
+ for( int i = 1; i < argc; i++ )
+ {
+ rtl::OString aArg(rtl::OString(argv[i]).toAsciiUpperCase());
+ if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-I")))
nState = STATE_INPUT; // next tokens specifies source files
- }
- else if ( ByteString( argv[ i ]).ToUpperAscii() == "-O" ) {
+ else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-O")))
nState = STATE_OUTPUT; // next token specifies the dest file
- }
- else if ( ByteString( argv[ i ]).ToUpperAscii() == "-X" ) {
+ else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-X")))
nState = STATE_OUTPUTX; // next token specifies the dest file
- }
- else if ( ByteString( argv[ i ]).ToUpperAscii() == "-Y" ) {
+ else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-Y" )))
nState = STATE_OUTPUTY; // next token specifies the dest file
- }
- else if ( ByteString( argv[ i ]).ToUpperAscii() == "-P" ) {
+ else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-P" )))
nState = STATE_PRJ; // next token specifies the cur. project
- }
- else if ( ByteString( argv[ i ]).ToUpperAscii() == "-LF" ) {
+ else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-LF")))
nState = STATE_FORCE_LANGUAGES;
- }
-
- else if ( ByteString( argv[ i ]).ToUpperAscii() == "-R" ) {
+ else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-R" )))
nState = STATE_ROOT; // next token specifies path to project root
- }
- else if ( ByteString( argv[ i ]).ToUpperAscii() == "-M" ) {
+ else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-M" )))
nState = STATE_SDFFILE; // next token specifies the merge database
- }
- else if ( ByteString( argv[ i ]).ToUpperAscii() == "-E" ) {
+ else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-E" )))
+ {
nState = STATE_ERRORLOG;
bErrorLog = sal_False;
}
- else if ( ByteString( argv[ i ]).ToUpperAscii() == "-L" ) {
+ else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-L" )))
nState = STATE_LANGUAGES;
- }
- else {
- switch ( nState ) {
+ else
+ {
+ switch ( nState )
+ {
case STATE_NON: {
return sal_False; // no valid command line
}
@@ -200,57 +195,53 @@ int _cdecl main( int argc, char *argv[] )
}
//sal_uInt32 startfull = Export::startMessure();
- bool hasInputList = sInputFile.GetBuffer()[0]=='@';
-// printf("x = %s , y = %s , o = %s\n", sOutputFileX.GetBuffer(), sOutputFileY.GetBuffer() , sOutputFile.GetBuffer() );
+ bool hasInputList = sInputFile[0]=='@';
bool hasNoError = true;
- if ( sOutputFile.Len() ){ // Merge single file ?
- //printf("DBG: Inputfile = %s\n",sInputFile.GetBuffer());
+ if ( sOutputFile.getLength() ){ // Merge single file ?
HelpParser aParser( sInputFile, bUTF8 , false );
if ( bMergeMode )
{
//sal_uInt64 startreadloc = Export::startMessure();
MergeDataFile aMergeDataFile(sSDFFile, sInputFile, sal_False);
- //Export::stopMessure( ByteString("read localize.sdf") , startreadloc );
hasNoError = aParser.Merge( sSDFFile, sOutputFile , Export::sLanguages , aMergeDataFile );
}
else
hasNoError = aParser.CreateSDF( sOutputFile, sPrj, sPrjRoot, sInputFile, new XMLFile( '0' ), "help" );
- }else if ( sOutputFileX.Len() && sOutputFileY.Len() && hasInputList ) { // Merge multiple files ?
+ }else if ( sOutputFileX.getLength() && sOutputFileY.getLength() && hasInputList ) { // Merge multiple files ?
if ( bMergeMode ){
- ifstream aFStream( sInputFile.Copy( 1 , sInputFile.Len() ).GetBuffer() , ios::in );
+ ifstream aFStream( sInputFile.copy( 1 , sInputFile.getLength() ).getStr() , ios::in );
if( !aFStream ){
- cerr << "ERROR: - helpex - Can't open the file " << sInputFile.Copy( 1 , sInputFile.Len() ).GetBuffer() << "\n";
+ cerr << "ERROR: - helpex - Can't open the file " << sInputFile.copy( 1 , sInputFile.getLength() ).getStr() << "\n";
exit(-1);
}
- vector<ByteString> filelist;
+ vector<rtl::OString> filelist;
rtl::OStringBuffer filename;
sal_Char aChar;
while( aFStream.get( aChar ) )
{
if( aChar == ' ' || aChar == '\n')
- filelist.push_back( ByteString( filename.makeStringAndClear().getStr() ) );
+ filelist.push_back(filename.makeStringAndClear());
else
filename.append( aChar );
}
if( filename.getLength() > 0 )
- filelist.push_back( ByteString ( filename.makeStringAndClear().getStr() ) );
+ filelist.push_back(filename.makeStringAndClear());
aFStream.close();
- ByteString sHelpFile(""); // dummy
+ rtl::OString sHelpFile; // dummy
MergeDataFile aMergeDataFile( sSDFFile, sHelpFile, sal_False );
- //aMergeDataFile.Dump();
std::vector<ByteString> aLanguages;
HelpParser::parse_languages( aLanguages , aMergeDataFile );
bool bCreateDir = true;
- for( vector<ByteString>::iterator pos = filelist.begin() ; pos != filelist.end() ; ++pos )
+ for( vector<rtl::OString>::iterator pos = filelist.begin() ; pos != filelist.end() ; ++pos )
{
sHelpFile = *pos;
cout << ".";cout.flush();
@@ -263,7 +254,6 @@ int _cdecl main( int argc, char *argv[] )
} else
cerr << "helpex ERROR: Wrong input parameters!\n";
- //Export::stopMessure( ByteString("full cycle") , startfull );
if( hasNoError )
return 0;
else
commit 865aba9fa7d330f8ef8e9605dcd7e301184d2a2a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 19 22:18:34 2011 +0000
callcatcher: ScJobSetup never constructed
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 8f4f3fc..908446f 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2514,7 +2514,6 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) :
pDocHelper ( NULL ),
pAutoStyleList ( NULL ),
pPaintLockData ( NULL ),
- pOldJobSetup ( NULL ),
pSolverSaveData ( NULL ),
pSheetSaveData ( NULL ),
pModificator ( NULL )
@@ -2561,7 +2560,6 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
pDocHelper ( NULL ),
pAutoStyleList ( NULL ),
pPaintLockData ( NULL ),
- pOldJobSetup ( NULL ),
pSolverSaveData ( NULL ),
pSheetSaveData ( NULL ),
pModificator ( NULL )
@@ -2614,8 +2612,6 @@ ScDocShell::~ScDocShell()
delete pPaintLockData;
- delete pOldJobSetup; // gesetzt nur bei Fehler in StartJob()
-
delete pSolverSaveData;
delete pSheetSaveData;
delete pOldAutoDBRange;
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index fb23c04..e52f2f1 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -65,7 +65,6 @@ class ScAutoStyleList;
class ScRange;
class ScMarkData;
class ScPaintLockData;
-class ScJobSetup;
class ScChangeAction;
class VirtualDevice;
class ScImportOptions;
@@ -118,7 +117,6 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
ScAutoStyleList* pAutoStyleList;
ScPaintLockData* pPaintLockData;
- ScJobSetup* pOldJobSetup;
ScOptSolverSave* pSolverSaveData;
ScSheetSaveData* pSheetSaveData;
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 476bc52..1a02189 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -3051,25 +3051,4 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten au
}
}
-//------------------------------------------------------------------------
-// class ScJobSetup
-//------------------------------------------------------------------------
-
-ScJobSetup::ScJobSetup( SfxPrinter* pPrinter )
-{
- eOrientation = pPrinter->GetOrientation();
- nPaperBin = pPrinter->GetPaperBin();
- ePaper = pPrinter->GetPaper();
-
- if ( PAPER_USER == ePaper )
- {
- aUserSize = pPrinter->GetPaperSize();
- aUserMapMode = pPrinter->GetMapMode();
- }
-};
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 7b36792..5c73cc0 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -349,7 +349,6 @@ ScHTMLColOffset_SAR::Replace(unsigned long const&, unsigned short)
ScHTMLColOffset_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
ScHorizontalValueIterator::GetCurNumFmtInfo(short&, unsigned long&)
-ScJobSetup::ScJobSetup(SfxPrinter*)
ScLeftFooterEditPage::GetRanges()
ScLeftHeaderEditPage::GetRanges()
ScMatrix::CalcOffset(unsigned long, unsigned long) const
More information about the Libreoffice-commits
mailing list