summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/misc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-05-13 13:46:07 +0200
committerNoel Grandin <noel@peralex.com>2014-05-14 10:00:03 +0200
commitca86511a6eaa4de43cc9b498d5d8f140967224b3 (patch)
treec9753d0db3d2949aa6915d6f4c7cbea21bd21a35 /dbaccess/source/ui/misc
parent613b9fa442e26d21f512016108ed921eb9964fbb (diff)
dbaccess: remove SAL_INFO's that only make function entry
Change-Id: Ibdf92698446d0a7aed7c474ec7d3ea720cd2c2a6
Diffstat (limited to 'dbaccess/source/ui/misc')
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx15
-rw-r--r--dbaccess/source/ui/misc/HtmlReader.cxx12
-rw-r--r--dbaccess/source/ui/misc/RowSetDrop.cxx5
-rw-r--r--dbaccess/source/ui/misc/RtfReader.cxx7
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx22
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx29
6 files changed, 0 insertions, 90 deletions
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index cadd83d753b6..fa757a0dd97f 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -111,8 +111,6 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows,
,m_bCheckOnly(false)
,m_bAppendFirstLine(false)
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::ODatabaseExport" );
-
m_nRows += nRows;
sal_Int32 nCount = 0;
for(sal_Int32 j=0;j < (sal_Int32)m_vColumns.size();++j)
@@ -167,7 +165,6 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
,m_bCheckOnly(false)
,m_bAppendFirstLine(false)
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::ODatabaseExport" );
try
{
SvtSysLocale aSysLocale;
@@ -300,7 +297,6 @@ ODatabaseExport::~ODatabaseExport()
void ODatabaseExport::insertValueIntoColumn()
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::insertValueIntoColumn" );
if(m_nColumnPos < sal_Int32(m_vDestVector.size()))
{
OFieldDescription* pField = m_vDestVector[m_nColumnPos]->second;
@@ -414,7 +410,6 @@ void ODatabaseExport::insertValueIntoColumn()
sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _nOldNumberFormat)
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::CheckString" );
double fOutNumber = 0.0;
sal_Int16 nNumberFormat = 0;
@@ -561,7 +556,6 @@ sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _n
void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfoMap* _pInfoMap)
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::SetColumnTypes" );
if(_pList && _pInfoMap)
{
OSL_ENSURE(m_vNumberFormat.size() == m_vColumnSize.size() && m_vColumnSize.size() == _pList->size(),"Illegal columns in list");
@@ -633,7 +627,6 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo
void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName)
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::CreateDefaultColumn" );
Reference< XDatabaseMetaData> xDestMetaData(m_xConnection->getMetaData());
sal_Int32 nMaxNameLen(xDestMetaData->getMaxColumnNameLength());
OUString aAlias = _rColumnName;
@@ -685,7 +678,6 @@ void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName)
bool ODatabaseExport::createRowSet()
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::createRowSet" );
m_pUpdateHelper.reset(new OParameterUpdateHelper(createPreparedStatment(m_xConnection->getMetaData(),m_xTable,m_vColumns)));
return m_pUpdateHelper.get() != NULL;
@@ -693,8 +685,6 @@ bool ODatabaseExport::createRowSet()
bool ODatabaseExport::executeWizard(const OUString& _rTableName, const Any& _aTextColor, const FontDescriptor& _rFont)
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::executeWizard" );
-
bool bHaveDefaultTable = !m_sDefaultTableName.isEmpty();
OUString sTableName( bHaveDefaultTable ? m_sDefaultTableName : _rTableName );
OCopyTableWizard aWizard(
@@ -759,7 +749,6 @@ bool ODatabaseExport::executeWizard(const OUString& _rTableName, const Any& _aTe
void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException& e)
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::showErrorDialog" );
if(!m_bDontAskAgain)
{
OUString aMsg(e.Message);
@@ -776,7 +765,6 @@ void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException
void ODatabaseExport::adjustFormat()
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::adjustFormat" );
if ( !m_sTextToken.isEmpty() )
{
sal_Int32 nNewPos = m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos;
@@ -799,7 +787,6 @@ void ODatabaseExport::adjustFormat()
void ODatabaseExport::eraseTokens()
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::eraseTokens" );
m_sTextToken = "";
m_sNumToken = "";
m_sValToken = "";
@@ -807,7 +794,6 @@ void ODatabaseExport::eraseTokens()
void ODatabaseExport::ensureFormatter()
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::ensureFormatter" );
if ( !m_pFormatter )
{
Reference< XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier();
@@ -823,7 +809,6 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
,const Reference<XPropertySet>& _xDestTable
,const TPositions& _rvColumns)
{
- SAL_INFO("dbaccess.ui", "ODatabaseExport::createPreparedStatment" );
OUString aSql("INSERT INTO ");
OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true );
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 67391db8641d..c57a85250314 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -81,7 +81,6 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection,
, m_bMetaOptions(false)
, m_bSDNum(false)
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" );
SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
// If the file starts with a BOM, switch to UCS2.
SetSwitchToUCS2( true );
@@ -103,7 +102,6 @@ OHTMLReader::OHTMLReader(SvStream& rIn,
, m_bMetaOptions(false)
, m_bSDNum(false)
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" );
SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
// If the file starts with a BOM, switch to UCS2.
SetSwitchToUCS2( true );
@@ -115,7 +113,6 @@ OHTMLReader::~OHTMLReader()
SvParserState OHTMLReader::CallParser()
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::CallParser" );
rInput.Seek(STREAM_SEEK_TO_BEGIN);
rInput.ResetError();
SvParserState eParseState = HTMLParser::CallParser();
@@ -125,7 +122,6 @@ SvParserState OHTMLReader::CallParser()
void OHTMLReader::NextToken( int nToken )
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::NextToken" );
if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly
return;
if ( nToken == HTML_META )
@@ -293,7 +289,6 @@ void OHTMLReader::NextToken( int nToken )
void OHTMLReader::fetchOptions()
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::fetchOptions" );
m_bInTbl = true;
const HTMLOptions& options = GetOptions();
for (size_t i = 0, n = options.size(); i < n; ++i)
@@ -316,7 +311,6 @@ void OHTMLReader::fetchOptions()
void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::TableDataOn" );
const HTMLOptions& rHtmlOptions = GetOptions();
for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i)
{
@@ -345,7 +339,6 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::TableFontOn" );
const HTMLOptions& rHtmlOptions = GetOptions();
for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i)
{
@@ -394,7 +387,6 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::GetWidthPixel" );
const OUString& rOptVal = rOption.GetString();
if ( rOptVal.indexOf('%') != -1 )
{ // percentage
@@ -415,7 +407,6 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
bool OHTMLReader::CreateTable(int nToken)
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::CreateTable" );
OUString aTempName(ModuleRes(STR_TBL_TITLE));
aTempName = aTempName.getToken(0,' ');
aTempName = ::dbtools::createUniqueName(m_xTables, aTempName);
@@ -525,20 +516,17 @@ bool OHTMLReader::CreateTable(int nToken)
void OHTMLReader::setTextEncoding()
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::setTextEncoding" );
m_bMetaOptions = true;
ParseMetaOptions(NULL, NULL);
}
void OHTMLReader::release()
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::release" );
ReleaseRef();
}
TypeSelectionPageFactory OHTMLReader::getTypeSelectionPageFactory()
{
- SAL_INFO("dbaccess.ui", "OHTMLReader::getTypeSelectionPageFactory" );
return &OWizHTMLExtend::Create;
}
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index b7c0be6e525a..6f374f003933 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -50,13 +50,11 @@ ORowSetImportExport::ORowSetImportExport( Window* _pParent,
,m_pParent(_pParent)
,m_bAlreadyAsked(false)
{
- SAL_INFO("dbaccess.ui", "ORowSetImportExport::ORowSetImportExport" );
OSL_ENSURE(_pParent,"Window can't be null!");
}
void ORowSetImportExport::initialize()
{
- SAL_INFO("dbaccess.ui", "ORowSetImportExport::initialize" );
ODatabaseImportExport::initialize();
// do namemapping
Reference<XColumnLocate> xColumnLocate(m_xResultSet,UNO_QUERY);
@@ -96,13 +94,11 @@ void ORowSetImportExport::initialize()
bool ORowSetImportExport::Write()
{
- SAL_INFO("dbaccess.ui", "ORowSetImportExport::Write" );
return true;
}
bool ORowSetImportExport::Read()
{
- SAL_INFO("dbaccess.ui", "ORowSetImportExport::Read" );
// check if there is any column to copy
if(::std::find_if(m_aColumnMapping.begin(),m_aColumnMapping.end(),
::std::bind2nd(::std::greater<sal_Int32>(),0)) == m_aColumnMapping.end())
@@ -157,7 +153,6 @@ bool ORowSetImportExport::Read()
bool ORowSetImportExport::insertNewRow()
{
- SAL_INFO("dbaccess.ui", "ORowSetImportExport::insertNewRow" );
try
{
m_xTargetResultSetUpdate->moveToInsertRow();
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index 30366adf803c..8bdce574b878 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -66,7 +66,6 @@ ORTFReader::ORTFReader( SvStream& rIn,
:SvRTFParser(rIn)
,ODatabaseExport( _rxConnection, _rxNumberF, _rxContext, pList, _pInfoMap, rIn )
{
- SAL_INFO("dbaccess.ui", "ORTFReader::ORTFReader" );
m_bAppendFirstLine = false;
}
@@ -81,7 +80,6 @@ ORTFReader::ORTFReader(SvStream& rIn,
:SvRTFParser(rIn)
,ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rxContext, pList, _pInfoMap, _bAutoIncrementEnabled, rIn )
{
- SAL_INFO("dbaccess.ui", "ORTFReader::ORTFReader" );
m_bAppendFirstLine = false;
}
@@ -91,7 +89,6 @@ ORTFReader::~ORTFReader()
SvParserState ORTFReader::CallParser()
{
- SAL_INFO("dbaccess.ui", "ORTFReader::CallParser" );
rInput.Seek(STREAM_SEEK_TO_BEGIN);
rInput.ResetError();
SvParserState eParseState = SvRTFParser::CallParser();
@@ -101,7 +98,6 @@ SvParserState ORTFReader::CallParser()
void ORTFReader::NextToken( int nToken )
{
- SAL_INFO("dbaccess.ui", "ORTFReader::NextToken" );
if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly
return;
@@ -253,7 +249,6 @@ void ORTFReader::NextToken( int nToken )
bool ORTFReader::CreateTable(int nToken)
{
- SAL_INFO("dbaccess.ui", "ORTFReader::CreateTable" );
OUString aTableName(ModuleRes(STR_TBL_TITLE));
aTableName = aTableName.getToken(0,' ');
aTableName = ::dbtools::createUniqueName(m_xTables, aTableName);
@@ -336,13 +331,11 @@ bool ORTFReader::CreateTable(int nToken)
void ORTFReader::release()
{
- SAL_INFO("dbaccess.ui", "ORTFReader::release" );
ReleaseRef();
}
TypeSelectionPageFactory ORTFReader::getTypeSelectionPageFactory()
{
- SAL_INFO("dbaccess.ui", "ORTFReader::getTypeSelectionPageFactory" );
return &OWizRTFExtend::Create;
}
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index e6a3a9628fbd..601ef11b7930 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -96,8 +96,6 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor&
,m_bInInitialize(false)
,m_bCheckOnly(false)
{
- SAL_INFO("dbaccess.ui", "ODatabaseImportExport::ODatabaseImportExport" );
-
m_eDestEnc = osl_getThreadTextEncoding();
osl_atomic_increment( &m_refCount );
@@ -128,7 +126,6 @@ ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection&
,m_bInInitialize(false)
,m_bCheckOnly(false)
{
- SAL_INFO("dbaccess.ui", "ODatabaseImportExport::ODatabaseImportExport" );
m_eDestEnc = osl_getThreadTextEncoding();
try
{
@@ -153,7 +150,6 @@ ODatabaseImportExport::~ODatabaseImportExport()
void ODatabaseImportExport::dispose()
{
- SAL_INFO("dbaccess.ui", "ODatabaseImportExport::disposing" );
// remove me as listener
Reference< XComponent > xComponent(m_xConnection, UNO_QUERY);
if (xComponent.is())
@@ -175,7 +171,6 @@ void ODatabaseImportExport::dispose()
void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO("dbaccess.ui", "ODatabaseImportExport::disposing" );
Reference<XConnection> xCon(Source.Source,UNO_QUERY);
if(m_xConnection.is() && m_xConnection == xCon)
{
@@ -187,13 +182,11 @@ void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) thro
void ODatabaseImportExport::initialize( const ODataAccessDescriptor& _aDataDescriptor )
{
- SAL_INFO("dbaccess.ui", "ODatabaseImportExport::initialize" );
impl_initFromDescriptor( _aDataDescriptor, true );
}
void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit)
{
- SAL_INFO("dbaccess.ui", "ODatabaseImportExport::impl_initFromDescriptor" );
if ( !_bPlusDefaultInit )
{
m_sDataSourceName = _aDataDescriptor.getDataSource();
@@ -255,7 +248,6 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor
void ODatabaseImportExport::initialize()
{
- SAL_INFO("dbaccess.ui", "ODatabaseImportExport::initialize" );
m_bInInitialize = true;
m_bNeedToReInitialize = false;
@@ -361,7 +353,6 @@ bool ODatabaseImportExport::Read()
void ODatabaseImportExport::impl_initializeRowMember_throw()
{
- SAL_INFO("dbaccess.ui", "ODatabaseImportExport::impl_initializeRowMember_throw" );
if ( !m_xRow.is() && m_xResultSet.is() )
{
m_xRow.set( m_xResultSet, UNO_QUERY );
@@ -374,7 +365,6 @@ void ODatabaseImportExport::impl_initializeRowMember_throw()
bool ORTFImportExport::Write()
{
- SAL_INFO("dbaccess.ui", "ORTFImportExport::Write" );
ODatabaseImportExport::Write();
m_pStream->WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF );
m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING );
@@ -612,7 +602,6 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_
bool ORTFImportExport::Read()
{
- SAL_INFO("dbaccess.ui", "ORTFImportExport::Read" );
ODatabaseImportExport::Read();
SvParserState eState = SVPAR_ERROR;
if ( m_pStream )
@@ -657,7 +646,6 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD
,m_bCheckFont(false)
#endif
{
- SAL_INFO("dbaccess.ui", "OHTMLImportExport::OHTMLImportExport" );
// set HTML configuration
SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
m_eDestEnc = rHtmlOptions.GetTextEncoding();
@@ -667,7 +655,6 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD
bool OHTMLImportExport::Write()
{
- SAL_INFO("dbaccess.ui", "OHTMLImportExport::Write" );
ODatabaseImportExport::Write();
if(m_xObject.is())
{
@@ -686,7 +673,6 @@ bool OHTMLImportExport::Write()
bool OHTMLImportExport::Read()
{
- SAL_INFO("dbaccess.ui", "OHTMLImportExport::Read" );
ODatabaseImportExport::Read();
SvParserState eState = SVPAR_ERROR;
if ( m_pStream )
@@ -706,7 +692,6 @@ bool OHTMLImportExport::Read()
void OHTMLImportExport::WriteHeader()
{
- SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteHeader" );
uno::Reference<document::XDocumentProperties> xDocProps(
document::DocumentProperties::create( m_xContext ) );
if (xDocProps.is()) {
@@ -723,8 +708,6 @@ void OHTMLImportExport::WriteHeader()
void OHTMLImportExport::WriteBody()
{
- SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteBody" );
-
IncIndent(1);
m_pStream->WriteCharPtr( "<" ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_style ).WriteCharPtr( " " ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_type ).WriteCharPtr( "=\"text/css\">" );
@@ -760,7 +743,6 @@ void OHTMLImportExport::WriteBody()
void OHTMLImportExport::WriteTables()
{
- SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteTables" );
OString aStrOut = OOO_STRING_SVTOOLS_HTML_table;
aStrOut = aStrOut + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_frame;
@@ -929,7 +911,6 @@ void OHTMLImportExport::WriteTables()
void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal_Int32 nHeightPixel, const char* pChar,
const OUString& rValue, const char* pHtmlTag)
{
- SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteCell" );
OString aStrTD = pHtmlTag;
nWidthPixel = nWidthPixel ? nWidthPixel : 86;
@@ -1002,7 +983,6 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal
void OHTMLImportExport::FontOn()
{
- SAL_INFO("dbaccess.ui", "OHTMLImportExport::FontOn" );
#if OSL_DEBUG_LEVEL > 0
m_bCheckFont = true;
#endif
@@ -1033,7 +1013,6 @@ void OHTMLImportExport::FontOn()
inline void OHTMLImportExport::FontOff()
{
- SAL_INFO("dbaccess.ui", "OHTMLImportExport::FontOff" );
OSL_ENSURE(m_bCheckFont,"Kein FontOn() gerufen");
TAG_OFF( OOO_STRING_SVTOOLS_HTML_font );
#if OSL_DEBUG_LEVEL > 0
@@ -1043,7 +1022,6 @@ inline void OHTMLImportExport::FontOff()
void OHTMLImportExport::IncIndent( sal_Int16 nVal )
{
- SAL_INFO("dbaccess.ui", "OHTMLImportExport::IncIndent" );
sIndent[m_nIndent] = '\t';
m_nIndent = m_nIndent + nVal;
if ( m_nIndent < 0 )
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index f6fee11f30b9..3d6ad196522c 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -525,7 +525,6 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultN
,m_ePressed( WIZARD_NONE )
,m_bCreatePrimaryKeyColumn(false)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::OCopyTableWizard" );
construct();
// extract table name
@@ -623,7 +622,6 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultNa
,m_ePressed( WIZARD_NONE )
,m_bCreatePrimaryKeyColumn(false)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::OCopyTableWizard" );
construct();
ODatabaseExport::TColumnVector::const_iterator aIter = _rSourceColVec.begin();
ODatabaseExport::TColumnVector::const_iterator aEnd = _rSourceColVec.end();
@@ -651,7 +649,6 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultNa
void OCopyTableWizard::construct()
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::construct" );
AddButton( &m_pbHelp, WIZARDDIALOG_BUTTON_STDOFFSET_X );
AddButton( &m_pbCancel, WIZARDDIALOG_BUTTON_STDOFFSET_X );
AddButton( &m_pbPrev );
@@ -744,7 +741,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl)
bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::CheckColumns" );
bool bRet = true;
m_vColumnPos.clear();
m_vColumnTypes.clear();
@@ -919,13 +915,11 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
bool OCopyTableWizard::shouldCreatePrimaryKey() const
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::shouldCreatePrimaryKey" );
return m_bCreatePrimaryKeyColumn;
}
void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName )
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::setCreatePrimaryKey" );
m_bCreatePrimaryKeyColumn = _bDoCreate;
if ( !_rSuggestedName.isEmpty() )
m_aKeyName = _rSuggestedName;
@@ -956,7 +950,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplActivateHdl)
void OCopyTableWizard::CheckButtons()
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::CheckButtons" );
if(GetCurLevel() == 0) // the first page has no back button
{
if(m_nPageCount > 1)
@@ -980,7 +973,6 @@ void OCopyTableWizard::CheckButtons()
void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle, bool bEnable)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::EnableButton" );
Button* pButton;
if(eStyle == WIZARD_NEXT)
pButton = &m_pbNext;
@@ -994,21 +986,18 @@ void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle, bool bEnable)
long OCopyTableWizard::DeactivatePage()
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::DeactivatePage" );
OWizardPage* pPage = (OWizardPage*)GetPage(GetCurLevel());
return pPage ? pPage->LeavePage() : sal_False;
}
void OCopyTableWizard::AddWizardPage(OWizardPage* pPage)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::AddWizardPage" );
AddPage(pPage);
++m_nPageCount;
}
void OCopyTableWizard::insertColumn(sal_Int32 _nPos,OFieldDescription* _pField)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::insertColumn" );
OSL_ENSURE(_pField,"FieldDescrioption is null!");
if ( _pField )
{
@@ -1027,7 +1016,6 @@ void OCopyTableWizard::insertColumn(sal_Int32 _nPos,OFieldDescription* _pField)
void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const OUString& _sOldName)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::replaceColumn" );
OSL_ENSURE(_pField,"FieldDescrioption is null!");
if ( _pField )
{
@@ -1041,13 +1029,11 @@ void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,
void OCopyTableWizard::impl_loadSourceData()
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::impl_loadSourceData" );
loadData( m_rSourceObject, m_vSourceColumns, m_vSourceVec );
}
void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, ODatabaseExport::TColumns& _rColumns, ODatabaseExport::TColumnVector& _rColVector )
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::loadData" );
ODatabaseExport::TColumns::iterator colEnd = _rColumns.end();
for ( ODatabaseExport::TColumns::iterator col = _rColumns.begin(); col != colEnd; ++col )
delete col->second;
@@ -1107,7 +1093,6 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject,
void OCopyTableWizard::clearDestColumns()
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::clearDestColumns" );
clearColumns(m_vDestColumns,m_aDestVec);
m_bAddPKFirstTime = true;
m_mNameMapping.clear();
@@ -1115,7 +1100,6 @@ void OCopyTableWizard::clearDestColumns()
void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, const ODatabaseExport::TColumnVector* _pVec, bool _bKeyColumns) const
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::appendColumns" );
// now append the columns
OSL_ENSURE(_rxColSup.is(),"No columns supplier");
if(!_rxColSup.is())
@@ -1166,7 +1150,6 @@ void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, co
void OCopyTableWizard::appendKey( Reference<XKeysSupplier>& _rxSup, const ODatabaseExport::TColumnVector* _pVec) const
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::appendKey" );
if(!_rxSup.is())
return; // the database doesn't support keys
OSL_ENSURE(_rxSup.is(),"No XKeysSupplier!");
@@ -1194,7 +1177,6 @@ void OCopyTableWizard::appendKey( Reference<XKeysSupplier>& _rxSup, const ODatab
Reference< XPropertySet > OCopyTableWizard::createView() const
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::createView" );
OUString sCommand( m_rSourceObject.getSelectStatement() );
OSL_ENSURE( !sCommand.isEmpty(), "OCopyTableWizard::createView: no statement in the source object!" );
// there are legitimate cases in which getSelectStatement does not provide a statement,
@@ -1204,7 +1186,6 @@ Reference< XPropertySet > OCopyTableWizard::createView() const
Reference< XPropertySet > OCopyTableWizard::createTable()
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::createTable" );
Reference< XPropertySet > xTable;
Reference<XTablesSupplier> xSup( m_xDestConnection, UNO_QUERY );
@@ -1336,7 +1317,6 @@ bool OCopyTableWizard::supportsPrimaryKey( const Reference< XConnection >& _rxCo
bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnection )
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::supportsViews" );
OSL_PRECOND( _rxConnection.is(), "OCopyTableWizard::supportsViews: invalid connection!" );
if ( !_rxConnection.is() )
return false;
@@ -1378,7 +1358,6 @@ bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnect
sal_Int32 OCopyTableWizard::getMaxColumnNameLength() const
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::getMaxColumnNameLength" );
sal_Int32 nLen = 0;
if ( m_xDestConnection.is() )
{
@@ -1397,13 +1376,11 @@ sal_Int32 OCopyTableWizard::getMaxColumnNameLength() const
void OCopyTableWizard::setOperation( const sal_Int16 _nOperation )
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::setOperation" );
m_nOperation = _nOperation;
}
sal_Int16 OCopyTableWizard::getOperation() const
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::getOperation" );
return m_nOperation;
}
@@ -1412,7 +1389,6 @@ OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFu
const OUString& _sExtraChars,
sal_Int32 _nMaxNameLen)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::convertColumnName" );
OUString sAlias = _sColumnName;
if ( isSQL92CheckEnabled( m_xDestConnection ) )
sAlias = ::dbtools::convertName2SQLName(_sColumnName,_sExtraChars);
@@ -1446,13 +1422,11 @@ OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFu
void OCopyTableWizard::removeColumnNameFromNameMap(const OUString& _sName)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::removeColumnNameFromNameMap" );
m_mNameMapping.erase(_sName);
}
bool OCopyTableWizard::supportsType(sal_Int32 _nDataType, sal_Int32& _rNewDataType)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::supportsType" );
bool bRet = m_aDestTypeInfo.find(_nDataType) != m_aDestTypeInfo.end();
if ( bRet )
_rNewDataType = _nDataType;
@@ -1461,7 +1435,6 @@ bool OCopyTableWizard::supportsType(sal_Int32 _nDataType, sal_Int32& _rNewData
TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType, bool& _bNotConvert)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::convertType" );
if ( !m_bInterConnectionCopy )
// no need to convert if the source and destination connection are the same
return _pType;
@@ -1560,7 +1533,6 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType, bool& _bN
OUString OCopyTableWizard::createUniqueName(const OUString& _sName)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::createUniqueName" );
OUString sName = _sName;
Sequence< OUString > aColumnNames( m_rSourceObject.getColumnNames() );
if ( aColumnNames.getLength() )
@@ -1582,7 +1554,6 @@ OUString OCopyTableWizard::createUniqueName(const OUString& _sName)
void OCopyTableWizard::showColumnTypeNotSupported(const OUString& _rColumnName)
{
- SAL_INFO("dbaccess.ui", "OCopyTableWizard::showColumnTypeNotSupported" );
OUString sMessage( ModuleRes( STR_UNKNOWN_TYPE_FOUND ) );
sMessage = sMessage.replaceFirst("#1",_rColumnName);
showError(sMessage);