summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui
diff options
context:
space:
mode:
authorRadu Ioan <ioan.radu.g@gmail.com>2013-06-29 17:38:04 +0300
committerBosdonnat Cedric <cedric.bosdonnat@free.fr>2013-07-03 07:59:33 +0000
commit61db96daa87754af24355d7ac94ee0305f22ff87 (patch)
tree6c15e7b896c62f42a1dfb02695418f9770fc3b46 /dbaccess/source/ui
parent54aac00e51652deec3d71524eec97f171c5cd40e (diff)
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
- replaced RTL_CONTEXT_ with SAL_INFO - replace OSL_* with SAL_* Change-Id: I26761cf1d4c1cfe21dec7d8ede6df6f177bf2c3e Reviewed-on: https://gerrit.libreoffice.org/4620 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Diffstat (limited to 'dbaccess/source/ui')
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx211
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx17
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx45
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx31
-rw-r--r--dbaccess/source/ui/misc/HtmlReader.cxx25
-rw-r--r--dbaccess/source/ui/misc/RowSetDrop.cxx13
-rw-r--r--dbaccess/source/ui/misc/RtfReader.cxx15
-rw-r--r--dbaccess/source/ui/misc/TableCopyHelper.cxx5
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx47
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx75
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx9
11 files changed, 241 insertions, 252 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index ea4c339b2763..e208d3e9b3bc 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -75,7 +75,6 @@
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <osl/mutex.hxx>
-#include <rtl/logfile.hxx>
#include <sfx2/app.hxx>
#include <sfx2/sfx.hrc>
#include <svx/fmsearch.hxx>
@@ -121,7 +120,7 @@ using namespace ::svt;
DBG_UNHANDLED_EXCEPTION(); \
} \
-#define DO_SAFE( action, message ) try { action; } catch(Exception&) { OSL_FAIL(message); } ;
+#define DO_SAFE( action, message ) try { action; } catch(Exception&) { SAL_WARN("dbaccess.ui",message); } ;
//..................................................................
namespace dbaui
@@ -270,7 +269,7 @@ SbaXDataBrowserController::FormControllerImpl::~FormControllerImpl()
//------------------------------------------------------------------
Reference< runtime::XFormOperations > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getFormOperations() throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::getFormOperations: not supported!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getFormOperations: not supported!" );
return NULL;
}
@@ -302,27 +301,27 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addChildController(
//------------------------------------------------------------------
Reference< runtime::XFormControllerContext > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContext() throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::getContext: no support!!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getContext: no support!!" );
return NULL;
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContext( const Reference< runtime::XFormControllerContext >& /*_context*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::setContext: no support!!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::setContext: no support!!" );
}
//------------------------------------------------------------------
Reference< XInteractionHandler > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getInteractionHandler() throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::getInteractionHandler: no support!!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getInteractionHandler: no support!!" );
return NULL;
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setInteractionHandler( const Reference< XInteractionHandler >& /*_interactionHandler*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::setInteractionHandler: no support!!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::setInteractionHandler: no support!!" );
}
//------------------------------------------------------------------
@@ -341,19 +340,19 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setParent( const Re
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::dispose( ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::dispose: no, you do *not* want to do this!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::dispose: no, you do *not* want to do this!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addEventListener( const Reference< XEventListener >& /*xListener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addEventListener: no support!!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addEventListener: no support!!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeEventListener( const Reference< XEventListener >& /*aListener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeEventListener: no support!!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeEventListener: no support!!" );
}
//------------------------------------------------------------------
@@ -392,73 +391,73 @@ Reference< XEnumeration > SAL_CALL SbaXDataBrowserController::FormControllerImpl
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addModifyListener( const Reference< XModifyListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addModifyListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addModifyListener: no support!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeModifyListener( const Reference< XModifyListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeModifyListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeModifyListener: no support!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener: no support!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener: no support!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener: no support!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener: no support!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener: no support!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener: no support!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener: no support!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener: no support!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addParameterListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addParameterListener: no support!" );
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
{
- OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeParameterListener: no support!" );
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeParameterListener: no support!" );
}
//------------------------------------------------------------------
@@ -491,7 +490,7 @@ Sequence< OUString > SAL_CALL SbaXDataBrowserController::FormControllerImpl::get
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setModel(const Reference< ::com::sun::star::awt::XTabControllerModel > & /*Model*/) throw( RuntimeException )
{
- OSL_FAIL("SbaXDataBrowserController::FormControllerImpl::setModel : invalid call, can't change my model !");
+ SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setModel : invalid call, can't change my model !");
}
//------------------------------------------------------------------
@@ -503,7 +502,7 @@ Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL SbaXDataBrowse
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContainer(const Reference< ::com::sun::star::awt::XControlContainer > & /*_Container*/) throw( RuntimeException )
{
- OSL_FAIL("SbaXDataBrowserController::FormControllerImpl::setContainer : invalid call, can't change my container !");
+ SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setContainer : invalid call, can't change my container !");
}
//------------------------------------------------------------------
@@ -528,13 +527,13 @@ Sequence< Reference< ::com::sun::star::awt::XControl > > SAL_CALL SbaXDataBrowse
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::autoTabOrder(void) throw( RuntimeException )
{
- OSL_FAIL("SbaXDataBrowserController::FormControllerImpl::autoTabOrder : nothing to do (always have only one control) !");
+ SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::autoTabOrder : nothing to do (always have only one control) !");
}
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateTabOrder(void) throw( RuntimeException )
{
- OSL_FAIL("SbaXDataBrowserController::FormControllerImpl::activateTabOrder : nothing to do (always have only one control) !");
+ SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::activateTabOrder : nothing to do (always have only one control) !");
}
//------------------------------------------------------------------
@@ -569,7 +568,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const ::c
//------------------------------------------------------------------
Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getTypes" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getTypes" );
return ::comphelper::concatSequences(
SbaXDataBrowserController_Base::getTypes(),
m_pFormControllerImpl->getTypes()
@@ -579,7 +578,7 @@ Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (Runtime
//------------------------------------------------------------------
Sequence< sal_Int8 > SAL_CALL SbaXDataBrowserController::getImplementationId( ) throw (RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getImplementationId" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getImplementationId" );
static ::cppu::OImplementationId * pId = 0;
if (! pId)
{
@@ -623,7 +622,7 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun
,m_bLoadCanceled( sal_False )
,m_bCannotSelectUnfiltered( true )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::SbaXDataBrowserController" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SbaXDataBrowserController" );
DBG_CTOR(SbaXDataBrowserController,NULL);
// create the form controller aggregate
@@ -642,7 +641,7 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun
//------------------------------------------------------------------------------
SbaXDataBrowserController::~SbaXDataBrowserController()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::~SbaXDataBrowserController" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::~SbaXDataBrowserController" );
// deleteView();
// release the aggregated form controller
if (m_xFormControllerImpl.is())
@@ -657,7 +656,7 @@ SbaXDataBrowserController::~SbaXDataBrowserController()
// -----------------------------------------------------------------------
void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >& _rxFrame )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::startFrameListening" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::startFrameListening" );
SbaXDataBrowserController_Base::startFrameListening( _rxFrame );
Reference< XFrameActionListener > xAggListener;
@@ -671,7 +670,7 @@ void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >&
// -----------------------------------------------------------------------
void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _rxFrame )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::stopFrameListening" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::stopFrameListening" );
SbaXDataBrowserController_Base::stopFrameListening( _rxFrame );
Reference< XFrameActionListener > xAggListener;
@@ -708,7 +707,7 @@ void SbaXDataBrowserController::impl_checkForCannotSelectUnfiltered( const SQLEx
// -----------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _rxLoadable )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::reloadForm" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloadForm" );
WaitObject aWO(getBrowserView());
onStartLoading( _rxLoadable );
@@ -769,7 +768,7 @@ sal_Bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _r
// -----------------------------------------------------------------------------
void SbaXDataBrowserController::initFormatter()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::initFormatter" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::initFormatter" );
// ---------------------------------------------------------------
// create a formatter working with the connections format supplier
Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), sal_True, getORB()));
@@ -787,7 +786,7 @@ void SbaXDataBrowserController::initFormatter()
// -----------------------------------------------------------------------------
void SbaXDataBrowserController::describeSupportedFeatures()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::describeSupportedFeatures" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::describeSupportedFeatures" );
SbaXDataBrowserController_Base::describeSupportedFeatures();
implDescribeSupportedFeature( ".uno:FormSlots/undoRecord", ID_BROWSER_UNDORECORD, CommandGroup::CONTROLS );
implDescribeSupportedFeature( ".uno:FormController/undoRecord", ID_BROWSER_UNDORECORD, CommandGroup::CONTROLS );
@@ -811,7 +810,7 @@ void SbaXDataBrowserController::describeSupportedFeatures()
//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::Construct" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::Construct" );
// ---------------------------------------------
// create/initialize the form and the grid model
m_xRowSet = CreateForm();
@@ -864,7 +863,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
}
catch(Exception&)
{
- OSL_FAIL("SbaXDataBrowserController::Construct : the construction of UnoDataBrowserView failed !");
+ SAL_WARN("dbaccess.ui","SbaXDataBrowserController::Construct : the construction of UnoDataBrowserView failed !");
}
if (!bSuccess)
@@ -929,26 +928,26 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::LoadForm()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::LoadForm" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::LoadForm" );
reloadForm( m_xLoadable );
return sal_True;
}
//------------------------------------------------------------------------------
void SbaXDataBrowserController::AddColumnListener(const Reference< XPropertySet > & /*xCol*/)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::AddColumnListener" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::AddColumnListener" );
// we're not interested in any column properties ...
}
//------------------------------------------------------------------------------
void SbaXDataBrowserController::RemoveColumnListener(const Reference< XPropertySet > & /*xCol*/)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::RemoveColumnListener" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::RemoveColumnListener" );
}
//------------------------------------------------------------------------------
Reference< XRowSet > SbaXDataBrowserController::CreateForm()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CreateForm" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CreateForm" );
return Reference< XRowSet > (
getORB()->getServiceManager()->createInstanceWithContext("com.sun.star.form.component.Form", getORB()),
UNO_QUERY);
@@ -957,7 +956,7 @@ Reference< XRowSet > SbaXDataBrowserController::CreateForm()
//------------------------------------------------------------------------------
Reference< ::com::sun::star::form::XFormComponent > SbaXDataBrowserController::CreateGridModel()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CreateGridModel" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CreateGridModel" );
return Reference< ::com::sun::star::form::XFormComponent > (
getORB()->getServiceManager()->createInstanceWithContext("com.sun.star.form.component.GridControl", getORB()),
UNO_QUERY);
@@ -966,7 +965,7 @@ Reference< ::com::sun::star::form::XFormComponent > SbaXDataBrowserController::
// -------------------------------------------------------------------------
void SbaXDataBrowserController::addModelListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::addModelListeners" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addModelListeners" );
// ... all the grid columns
addColumnListeners(_xGridControlModel);
@@ -983,7 +982,7 @@ void SbaXDataBrowserController::addModelListeners(const Reference< ::com::sun::s
// -------------------------------------------------------------------------
void SbaXDataBrowserController::removeModelListeners(const Reference< XControlModel > & _xGridControlModel)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::removeModelListeners" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::removeModelListeners" );
// every single column model
Reference< XIndexContainer > xColumns(_xGridControlModel, UNO_QUERY);
if (xColumns.is())
@@ -1008,7 +1007,7 @@ void SbaXDataBrowserController::removeModelListeners(const Reference< XControlMo
// -------------------------------------------------------------------------
void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun::star::awt::XControl > & _xGridControl)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::addControlListeners" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addControlListeners" );
// to ge the 'modified' for the current cell
Reference< XModifyBroadcaster > xBroadcaster(getBrowserView()->getGridControl(), UNO_QUERY);
if (xBroadcaster.is())
@@ -1028,7 +1027,7 @@ void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun:
// -------------------------------------------------------------------------
void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::sun::star::awt::XControl > & _xGridControl)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::removeControlListeners" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::removeControlListeners" );
Reference< XModifyBroadcaster > xBroadcaster(_xGridControl, UNO_QUERY);
if (xBroadcaster.is())
xBroadcaster->removeModifyListener(static_cast<XModifyListener*>(this));
@@ -1045,7 +1044,7 @@ void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::s
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::focusGained" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::focusGained" );
// notify our activate listeners (registered on the form controller aggregate)
EventObject aEvt(*this);
::cppu::OInterfaceIteratorHelper aIter(m_pFormControllerImpl->m_aActivateListeners);
@@ -1056,7 +1055,7 @@ void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/) th
//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::focusLost" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::focusLost" );
// some general checks
if (!getBrowserView() || !getBrowserView()->getGridControl().is())
return;
@@ -1085,27 +1084,27 @@ void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e) throw( R
if (xCommitable.is())
xCommitable->commit();
else
- OSL_FAIL("SbaXDataBrowserController::focusLost : why is my control not commitable ?");
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::focusLost : why is my control not commitable ?");
}
// -------------------------------------------------------------------------
void SbaXDataBrowserController::disposingGridControl(const ::com::sun::star::lang::EventObject& /*Source*/)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::disposingGridControl" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingGridControl" );
removeControlListeners(getBrowserView()->getGridControl());
}
// -------------------------------------------------------------------------
void SbaXDataBrowserController::disposingGridModel(const ::com::sun::star::lang::EventObject& /*Source*/)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::disposingGridModel" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingGridModel" );
removeModelListeners(getControlModel());
}
// -------------------------------------------------------------------------
void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang::EventObject& Source)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::disposingFormModel" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingFormModel" );
Reference< XPropertySet > xSourceSet(Source.Source, UNO_QUERY);
if (xSourceSet.is())
{
@@ -1134,14 +1133,14 @@ void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang:
// -------------------------------------------------------------------------
void SbaXDataBrowserController::disposingColumnModel(const ::com::sun::star::lang::EventObject& Source)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::disposingColumnModel" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingColumnModel" );
RemoveColumnListener(Reference< XPropertySet > (Source.Source, UNO_QUERY));
}
// -------------------------------------------------------------------------
void SbaXDataBrowserController::disposing(const EventObject& Source) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::disposing" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposing" );
// if it's a component other than our aggregate, forward it to the aggregate
if ( m_xFormControllerImpl != Source.Source )
{
@@ -1182,7 +1181,7 @@ void SbaXDataBrowserController::disposing(const EventObject& Source) throw( Runt
// -----------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::setIdentifier( const OUString& _Identifier ) throw (RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::setIdentifier" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setIdentifier" );
::osl::MutexGuard aGuard( getMutex() );
m_sModuleIdentifier = _Identifier;
}
@@ -1190,7 +1189,7 @@ void SAL_CALL SbaXDataBrowserController::setIdentifier( const OUString& _Identif
// -----------------------------------------------------------------------
OUString SAL_CALL SbaXDataBrowserController::getIdentifier( ) throw (RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getIdentifier" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getIdentifier" );
::osl::MutexGuard aGuard( getMutex() );
return m_sModuleIdentifier;
}
@@ -1198,7 +1197,7 @@ OUString SAL_CALL SbaXDataBrowserController::getIdentifier( ) throw (RuntimeExc
// -----------------------------------------------------------------------
void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) throw ( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::propertyChange" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::propertyChange" );
Reference< XPropertySet > xSource(evt.Source, UNO_QUERY);
if (!xSource.is())
return;
@@ -1251,14 +1250,14 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t
//------------------------------------------------------------------------
void SbaXDataBrowserController::modified(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::modified" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::modified" );
setCurrentModified( sal_True );
}
// -----------------------------------------------------------------------
void SbaXDataBrowserController::elementInserted(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::elementInserted" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementInserted" );
OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(),
"SbaXDataBrowserController::elementInserted: where did this come from (not from the grid model)?!");
Reference< XPropertySet > xNewColumn(evt.Element,UNO_QUERY);
@@ -1269,7 +1268,7 @@ void SbaXDataBrowserController::elementInserted(const ::com::sun::star::containe
// -----------------------------------------------------------------------
void SbaXDataBrowserController::elementRemoved(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::elementRemoved" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementRemoved" );
OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(),
"SbaXDataBrowserController::elementRemoved: where did this come from (not from the grid model)?!");
Reference< XPropertySet > xOldColumn(evt.Element,UNO_QUERY);
@@ -1280,7 +1279,7 @@ void SbaXDataBrowserController::elementRemoved(const ::com::sun::star::container
// -----------------------------------------------------------------------
void SbaXDataBrowserController::elementReplaced(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::elementReplaced" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementReplaced" );
OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(),
"SbaXDataBrowserController::elementReplaced: where did this come from (not from the grid model)?!");
Reference< XPropertySet > xOldColumn(evt.ReplacedElement,UNO_QUERY);
@@ -1295,7 +1294,7 @@ void SbaXDataBrowserController::elementReplaced(const ::com::sun::star::containe
// -----------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::suspend(sal_Bool /*bSuspend*/) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::suspend" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::suspend" );
m_aAsyncGetCellFocus.CancelCall();
m_aAsyncDisplayError.CancelCall();
@@ -1374,7 +1373,7 @@ void SbaXDataBrowserController::disposing()
//------------------------------------------------------------------------------
void SbaXDataBrowserController::frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::frameAction" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::frameAction" );
::osl::MutexGuard aGuard( getMutex() );
SbaXDataBrowserController_Base::frameAction( aEvent );
@@ -1423,7 +1422,7 @@ IMPL_LINK( SbaXDataBrowserController, OnAsyncDisplayError, void*, /* _pNotIntere
//------------------------------------------------------------------------------
void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::errorOccurred" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::errorOccurred" );
::osl::MutexGuard aGuard( getMutex() );
SQLExceptionInfo aInfo( aEvent.Reason );
@@ -1445,11 +1444,11 @@ void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErr
//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::approveParameter" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::approveParameter" );
if (aEvent.Source != getRowSet())
{
// not my data source -> allow anything
- OSL_FAIL("SbaXDataBrowserController::approveParameter : invalid event source !");
+ SAL_WARN("dbaccess.ui","SbaXDataBrowserController::approveParameter : invalid event source !");
return sal_True;
}
@@ -1486,7 +1485,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for
Sequence< PropertyValue > aFinalValues = pParamValues->getValues();
if (aFinalValues.getLength() != aRequest.Parameters->getCount())
{
- OSL_FAIL("SbaXDataBrowserController::approveParameter: the InteractionHandler returned nonsense!");
+ SAL_WARN("dbaccess.ui","SbaXDataBrowserController::approveParameter: the InteractionHandler returned nonsense!");
setLoadingCancelled();
return sal_False;
}
@@ -1506,7 +1505,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for
try { xParam->setPropertyValue(PROPERTY_VALUE, pFinalValues->Value); }
catch(Exception&)
{
- OSL_FAIL("SbaXDataBrowserController::approveParameter: setting one of the properties failed!");
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::approveParameter: setting one of the properties failed!");
}
}
}
@@ -1523,14 +1522,14 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for
//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::approveReset(const ::com::sun::star::lang::EventObject& /*rEvent*/) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::approveReset" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::approveReset" );
return sal_True;
}
//------------------------------------------------------------------------------
void SbaXDataBrowserController::resetted(const ::com::sun::star::lang::EventObject& rEvent) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::resetted" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::resetted" );
OSL_ENSURE(rEvent.Source == getControlModel(), "SbaXDataBrowserController::resetted : where did this come from ?");
(void)rEvent;
setCurrentModified( sal_False );
@@ -1539,7 +1538,7 @@ void SbaXDataBrowserController::resetted(const ::com::sun::star::lang::EventObje
//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& /*aEvent*/) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::confirmDelete" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::confirmDelete" );
if (QueryBox(getBrowserView(), ModuleRes(QUERY_BRW_DELETE_ROWS)).Execute() != RET_YES)
return sal_False;
@@ -1548,7 +1547,7 @@ sal_Bool SbaXDataBrowserController::confirmDelete(const ::com::sun::star::sdb::R
//------------------------------------------------------------------------------
FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::GetState" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::GetState" );
FeatureState aReturn;
// (disabled automatically)
@@ -1775,11 +1774,11 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
//------------------------------------------------------------------------------
void SbaXDataBrowserController::applyParserOrder(const OUString& _rOldOrder,const Reference< XSingleSelectQueryComposer >& _xParser)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::applyParserOrder" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::applyParserOrder" );
Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY);
if (!m_xLoadable.is())
{
- OSL_FAIL("SbaXDataBrowserController::applyParserOrder: invalid row set!");
+ SAL_WARN("dbaccess.ui","SbaXDataBrowserController::applyParserOrder: invalid row set!");
return;
}
@@ -1817,11 +1816,11 @@ void SbaXDataBrowserController::applyParserOrder(const OUString& _rOldOrder,cons
//------------------------------------------------------------------------------
void SbaXDataBrowserController::applyParserFilter(const OUString& _rOldFilter, sal_Bool _bOldFilterApplied,const ::OUString& _sOldHaving,const Reference< XSingleSelectQueryComposer >& _xParser)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::applyParserFilter" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::applyParserFilter" );
Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY);
if (!m_xLoadable.is())
{
- OSL_FAIL("SbaXDataBrowserController::applyParserFilter: invalid row set!");
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::applyParserFilter: invalid row set!");
return;
}
@@ -1910,7 +1909,7 @@ Reference< XSingleSelectQueryComposer > SbaXDataBrowserController::createParser_
//------------------------------------------------------------------------------
void SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::ExecuteFilterSortCrit" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ExecuteFilterSortCrit" );
if (!SaveModified())
return;
@@ -1974,7 +1973,7 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter)
//------------------------------------------------------------------------------
void SbaXDataBrowserController::ExecuteSearch()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::ExecuteSearch" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ExecuteSearch" );
// calculate the control source of the active field
Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
OSL_ENSURE(xGrid.is(), "SbaXDataBrowserController::ExecuteSearch : the control should have an ::com::sun::star::form::XGrid interface !");
@@ -2033,7 +2032,7 @@ void SbaXDataBrowserController::ExecuteSearch()
//------------------------------------------------------------------------------
void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< PropertyValue >& _rArgs)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::Execute" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::Execute" );
sal_Bool bSortUp = sal_True;
switch (nId)
@@ -2055,7 +2054,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
}
catch(Exception&)
{
- OSL_FAIL("Exception caught!");
+ SAL_WARN("dbaccess.ui", "Exception caught!");
}
break;
case SID_FM_DELETEROWS:
@@ -2334,7 +2333,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::SaveModified" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SaveModified" );
if ( bAskFor && GetState(ID_BROWSER_SAVERECORD).bEnabled )
{
getBrowserView()->getVclControl()->GrabFocus();
@@ -2373,7 +2372,7 @@ sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor)
}
catch(Exception&)
{
- OSL_FAIL("SbaXDataBrowserController::SaveModified : could not save the current record !");
+ SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::SaveModified : could not save the current record !");
bResult = sal_False;
}
@@ -2385,7 +2384,7 @@ sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor)
//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::CommitCurrent()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CommitCurrent" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CommitCurrent" );
if (!getBrowserView())
return sal_True;
@@ -2407,7 +2406,7 @@ sal_Bool SbaXDataBrowserController::CommitCurrent()
//------------------------------------------------------------------------------
void SbaXDataBrowserController::setCurrentModified( sal_Bool _bSet )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::setCurrentModified" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setCurrentModified" );
m_bCurrentlyModified = _bSet;
InvalidateFeature( ID_BROWSER_SAVERECORD );
InvalidateFeature( ID_BROWSER_UNDORECORD );
@@ -2416,14 +2415,14 @@ void SbaXDataBrowserController::setCurrentModified( sal_Bool _bSet )
//------------------------------------------------------------------------------
void SbaXDataBrowserController::RowChanged()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::RowChanged" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::RowChanged" );
setCurrentModified( sal_False );
}
//------------------------------------------------------------------------------
void SbaXDataBrowserController::ColumnChanged()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::ColumnChanged" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ColumnChanged" );
InvalidateFeature(ID_BROWSER_SORTUP);
InvalidateFeature(ID_BROWSER_SORTDOWN);
InvalidateFeature(ID_BROWSER_ORDERCRIT);
@@ -2437,14 +2436,14 @@ void SbaXDataBrowserController::ColumnChanged()
//------------------------------------------------------------------------------
void SbaXDataBrowserController::SelectionChanged()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::SelectionChanged" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SelectionChanged" );
// not interested in
}
//------------------------------------------------------------------------------
void SbaXDataBrowserController::CellActivated()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CellActivated" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CellActivated" );
m_aInvalidateClipboard.Start();
OnInvalidateClipboard( NULL );
}
@@ -2452,7 +2451,7 @@ void SbaXDataBrowserController::CellActivated()
//------------------------------------------------------------------------------
void SbaXDataBrowserController::CellDeactivated()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CellDeactivated" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CellDeactivated" );
m_aInvalidateClipboard.Stop();
OnInvalidateClipboard( NULL );
}
@@ -2484,7 +2483,7 @@ IMPL_LINK(SbaXDataBrowserController, OnInvalidateClipboard, AutoTimer*, _pTimer)
// -------------------------------------------------------------------------
Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 nViewPos) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::SaveData" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SaveData" );
Reference< XPropertySet > xEmptyReturn;
// get the current column from the grid
@@ -2647,7 +2646,7 @@ IMPL_LINK_NOARG(SbaXDataBrowserController, OnAsyncGetCellFocus)
//------------------------------------------------------------------------------
void SbaXDataBrowserController::criticalFail()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::criticalFail" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::criticalFail" );
InvalidateAll();
m_nRowSetPrivileges = 0;
}
@@ -2655,7 +2654,7 @@ void SbaXDataBrowserController::criticalFail()
//------------------------------------------------------------------------------
void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::LoadFinished" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::LoadFinished" );
m_nRowSetPrivileges = 0;
if (isValid() && !loadingCancelled())
@@ -2687,7 +2686,7 @@ void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/)
// -----------------------------------------------------------------------------
void SbaXDataBrowserController::initializeParser() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::initializeParser" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::initializeParser" );
if ( !m_xParser.is() )
{
// ----------------------------------------------
@@ -2712,7 +2711,7 @@ void SbaXDataBrowserController::initializeParser() const
//------------------------------------------------------------------------------
void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::loaded" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::loaded" );
// not interested in
// we're loading within an separate thread and have a handling for it's "finished event"
}
@@ -2720,14 +2719,14 @@ void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( Run
//------------------------------------------------------------------------------
void SbaXDataBrowserController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::unloading" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::unloading" );
// not interested in
}
//------------------------------------------------------------------------------
void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::unloaded" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::unloaded" );
m_xParser.clear();
InvalidateAll();
// do this asynchronously, there are other listeners reacting on this message ...
@@ -2740,14 +2739,14 @@ void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( R
//------------------------------------------------------------------------------
void SbaXDataBrowserController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::reloading" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloading" );
// not interested in
}
//------------------------------------------------------------------------------
void SbaXDataBrowserController::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::reloaded" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloaded" );
InvalidateAll();
// do this asynchronously, there are other listeners reacting on this message ...
// (it's a little hack : the grid columns are listening to this event, too, and their bound field may
@@ -2781,14 +2780,14 @@ void SbaXDataBrowserController::leaveFormAction()
// -------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::isLoaded() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::isLoaded" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::isLoaded" );
return m_xLoadable.is() && m_xLoadable->isLoaded();
}
// -------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::isValidCursor() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::isValidCursor" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::isValidCursor" );
if (!m_xColumnsSupplier.is())
return sal_False;
Reference< ::com::sun::star::container::XNameAccess > xCols = m_xColumnsSupplier->getColumns();
@@ -2811,7 +2810,7 @@ sal_Bool SbaXDataBrowserController::isValidCursor() const
// -----------------------------------------------------------------------------
sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getCurrentColumnPosition" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getCurrentColumnPosition" );
Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
sal_Int16 nViewPos = -1;
try
@@ -2825,7 +2824,7 @@ sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition()
// -----------------------------------------------------------------------------
void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::setCurrentColumnPosition" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setCurrentColumnPosition" );
Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
try
{
@@ -2837,7 +2836,7 @@ void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos )
// -----------------------------------------------------------------------------
void SbaXDataBrowserController::BeforeDrop()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::BeforeDrop" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::BeforeDrop" );
Reference< ::com::sun::star::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY);
if (xFormError.is())
xFormError->removeSQLErrorListener((::com::sun::star::sdb::XSQLErrorListener*)this);
@@ -2845,7 +2844,7 @@ void SbaXDataBrowserController::BeforeDrop()
// -----------------------------------------------------------------------------
void SbaXDataBrowserController::AfterDrop()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::AfterDrop" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::AfterDrop" );
Reference< ::com::sun::star::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY);
if (xFormError.is())
xFormError->addSQLErrorListener((::com::sun::star::sdb::XSQLErrorListener*)this);
@@ -2853,7 +2852,7 @@ void SbaXDataBrowserController::AfterDrop()
// -----------------------------------------------------------------------------
void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::addColumnListeners" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addColumnListeners" );
// ... all the grid columns
Reference< ::com::sun::star::container::XIndexContainer > xColumns(_xGridControlModel, UNO_QUERY);
if (xColumns.is())
@@ -2869,7 +2868,7 @@ void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun::
// -----------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::InitializeGridModel(const Reference< ::com::sun::star::form::XFormComponent > & /*xGrid*/)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::InitializeGridModel" );
+ SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::InitializeGridModel" );
return sal_True;
}
//..................................................................
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index d1f507d77d27..67bd3736b2e7 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -52,7 +52,6 @@
#include <com/sun/star/frame/status/Visibility.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <rtl/ustring.hxx>
-#include <rtl/logfile.hxx>
#include <algorithm>
#include <o3tl/compat_functional.hxx>
#include <boost/unordered_map.hpp>
@@ -141,7 +140,7 @@ void UserDefinedFeatures::execute( const URL& _rFeatureURL, const Sequence< Prop
if ( xDispatch == xController )
{
- OSL_FAIL( "UserDefinedFeatures::execute: the controller shouldn't be the dispatcher here!" );
+ SAL_WARN("dbaccess.ui", "UserDefinedFeatures::execute: the controller shouldn't be the dispatcher here!" );
xDispatch.clear();
}
@@ -225,7 +224,7 @@ OGenericUnoController::OGenericUnoController()
,m_bReadOnly(sal_False)
,m_bCurrentlyModified(sal_False)
{
- OSL_FAIL( "OGenericUnoController::OGenericUnoController: illegal call!" );
+ SAL_WARN("dbaccess.ui", "OGenericUnoController::OGenericUnoController: illegal call!" );
// This ctor only exists because the MSVC compiler complained about an unresolved external
// symbol. It should not be used at all. Since using it yields strange runtime problems,
// we simply abort here.
@@ -265,7 +264,7 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/)
}
catch(const Exception&)
{
- OSL_FAIL("OGenericUnoController::Construct: could not create (or start listening at) the database context!");
+ SAL_WARN("dbaccess.ui","OGenericUnoController::Construct: could not create (or start listening at) the database context!");
// at least notify the user. Though the whole component does not make any sense without the database context ...
ShowServiceNotAvailableError(getView(), OUString("com.sun.star.sdb.DatabaseContext"), sal_True);
}
@@ -605,7 +604,7 @@ void OGenericUnoController::InvalidateFeature_Impl()
OString sMessage( "OGenericUnoController::InvalidateFeature_Impl: feature id " );
sMessage += OString::valueOf( aNextFeature.nId );
sMessage += OString( " has been invalidated, but is not supported!" );
- OSL_FAIL( sMessage.getStr() );
+ SAL_WARN("dbaccess.ui", sMessage.getStr() );
}
#endif
if ( m_aSupportedFeatures.end() != aFeaturePos )
@@ -777,7 +776,7 @@ void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyV
OString sLog( "OGenericUnoController::dispatch( '" );
sLog += OString( _aURL.Main.getStr(), _aURL.Main.getLength(), osl_getThreadTextEncoding() );
sLog += OString( "' )" );
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", sLog.getStr() );
+ SAL_INFO("dbaccess.ui", "dbaccess frank.schoenheit@sun.com" << sLog.getStr() );
#endif
executeChecked(_aURL,aArgs);
@@ -1162,7 +1161,7 @@ Reference< XFrame > SAL_CALL OGenericUnoController::getFrame(void) throw( Runtim
// -----------------------------------------------------------------------------
sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > & /*xModel*/) throw( RuntimeException )
{
- OSL_FAIL( "OGenericUnoController::attachModel: not supported!" );
+ SAL_WARN("dbaccess.ui", "OGenericUnoController::attachModel: not supported!" );
return sal_False;
}
@@ -1293,7 +1292,7 @@ namespace
pReturn = "sbasic";
else
{
- OSL_FAIL( "lcl_getModuleHelpModuleName: no installed module found" );
+ SAL_WARN("dbaccess.ui", "lcl_getModuleHelpModuleName: no installed module found" );
}
}
}
@@ -1494,7 +1493,7 @@ sal_uInt16 OGenericUnoController::registerCommandURL( const OUString& _rComplete
++nFeatureId;
if ( nFeatureId == LAST_USER_DEFINED_FEATURE )
{
- OSL_FAIL( "OGenericUnoController::registerCommandURL: no more space for user defined features!" );
+ SAL_WARN("dbaccess.ui", "OGenericUnoController::registerCommandURL: no more space for user defined features!" );
return 0L;
}
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index fa33bcb7f03f..57634c90e89e 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -126,7 +126,6 @@
#include <vcl/toolbox.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/wrkwin.hxx>
-#include <rtl/logfile.hxx>
#include <memory>
@@ -241,7 +240,7 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser()
DBG_DTOR(SbaTableQueryBrowser,NULL);
if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
{
- OSL_FAIL("Please check who doesn't dispose this component!");
+ SAL_WARN("dbaccess.ui", "Please check who doesn't dispose this component!");
// increment ref count to prevent double call of Dtor
osl_atomic_increment( &m_refCount );
dispose();
@@ -367,7 +366,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
}
catch(const Exception&)
{
- OSL_FAIL("SbaTableQueryBrowser::Construct: could not create (or start listening at) the database context!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::Construct: could not create (or start listening at) the database context!");
}
// some help ids
if (getBrowserView() && getBrowserView()->getVclControl())
@@ -1288,7 +1287,7 @@ SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSour
}
catch(const Exception&)
{
- OSL_FAIL("SbaTableQueryBrowser::populateTree: could not fill the tree");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::populateTree: could not fill the tree");
}
}
}
@@ -1358,7 +1357,7 @@ void SbaTableQueryBrowser::connectExternalDispatches()
if ( feature->second.xDispatcher.get() == static_cast< XDispatch* >( this ) )
{
- OSL_FAIL( "SbaTableQueryBrowser::connectExternalDispatches: this should not happen anymore!" );
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::connectExternalDispatches: this should not happen anymore!" );
// (nowadays, the URLs aren't in our SupportedFeatures list anymore, so we should
// not supply a dispatcher for this)
feature->second.xDispatcher.clear();
@@ -1480,7 +1479,7 @@ void SbaTableQueryBrowser::implRemoveStatusListeners()
}
catch (Exception&)
{
- OSL_FAIL("SbaTableQueryBrowser::implRemoveStatusListeners: could not remove a status listener!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::implRemoveStatusListeners: could not remove a status listener!");
}
}
}
@@ -1505,7 +1504,7 @@ sal_Bool SAL_CALL SbaTableQueryBrowser::select( const Any& _rSelection ) throw (
}
catch(const Exception&)
{
- OSL_FAIL("SbaTableQueryBrowser::select: could not extract the descriptor!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::select: could not extract the descriptor!");
}
// check the precense of the props we need
@@ -1838,7 +1837,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
}
catch(DisposedException&)
{
- OSL_FAIL("SbaTableQueryBrowser::GetState: object already disposed!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::GetState: object already disposed!");
}
catch( const Exception& )
{
@@ -1861,7 +1860,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
case CommandType::COMMAND:
sTitle = OUString(ModuleRes(STR_QRY_TITLE)); break;
default:
- OSL_FAIL("SbaTableQueryBrowser::GetState: unknown command type!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::GetState: unknown command type!");
}
OUString aName;
xProp->getPropertyValue(PROPERTY_COMMAND) >>= aName;
@@ -2036,11 +2035,11 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
}
catch(DisposedException&)
{
- OSL_FAIL("Object already disposed!");
+ SAL_WARN("dbaccess.ui", "Object already disposed!");
}
catch(const Exception&)
{
- OSL_FAIL("SbaTableQueryBrowser::Execute(ID_BROWSER_?): could not clone the cursor!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::Execute(ID_BROWSER_?): could not clone the cursor!");
}
Reference<XPropertySet> xProp(getRowSet(),UNO_QUERY);
@@ -2207,7 +2206,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce
}
catch(const Exception&)
{
- OSL_FAIL("SbaTableQueryBrowser::populateTree: could not fill the tree");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::populateTree: could not fill the tree");
}
}
@@ -2313,7 +2312,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent)
if(e.TargetException >>= aSql)
aInfo = aSql;
else
- OSL_FAIL("SbaTableQueryBrowser::OnExpandEntry: something strange happended!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::OnExpandEntry: something strange happended!");
}
catch( const Exception& )
{
@@ -2403,7 +2402,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvTreeListEntry* _pEntry )
bSuccess = pEntryData->xContainer.is();
}
else {
- OSL_FAIL("SbaTableQueryBrowser::ensureEntryObject: no XQueryDefinitionsSupplier interface!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::ensureEntryObject: no XQueryDefinitionsSupplier interface!");
}
}
catch( const Exception& )
@@ -2415,7 +2414,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvTreeListEntry* _pEntry )
break;
default:
- OSL_FAIL("SbaTableQueryBrowser::ensureEntryObject: ooops ... missing some implementation here!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::ensureEntryObject: ooops ... missing some implementation here!");
// TODO ...
break;
}
@@ -2786,7 +2785,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry )
if(e.TargetException >>= aSql)
showError(SQLExceptionInfo(aSql));
else
- OSL_FAIL("SbaTableQueryBrowser::implSelect: something strange happended!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::implSelect: something strange happended!");
// reset the values
xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any());
xRowSetProps->setPropertyValue(PROPERTY_ACTIVE_CONNECTION,Any());
@@ -2987,7 +2986,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve
}
else if (xNames.get() == m_xDatabaseContext.get())
{ // a datasource has been replaced in the context
- OSL_FAIL("SbaTableQueryBrowser::elementReplaced: no support for replaced data sources!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::elementReplaced: no support for replaced data sources!");
// very suspicious: the database context should not allow to replace data source, only to register
// and revoke them
}
@@ -3125,11 +3124,11 @@ void SbaTableQueryBrowser::unloadAndCleanup( sal_Bool _bDisposeConnection )
if(e.TargetException >>= aSql)
showError(SQLExceptionInfo(aSql));
else
- OSL_FAIL("SbaTableQueryBrowser::unloadAndCleanup: something strange happended!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::unloadAndCleanup: something strange happended!");
}
catch(const Exception&)
{
- OSL_FAIL("SbaTableQueryBrowser::unloadAndCleanup: could not reset the form");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::unloadAndCleanup: could not reset the form");
}
}
@@ -3290,7 +3289,7 @@ void SbaTableQueryBrowser::impl_initialize()
}
catch( const Exception& )
{
- OSL_FAIL( "SbaTableQueryBrowser::impl_initialize: a connection parent which does not have a 'Name'!??" );
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::impl_initialize: a connection parent which does not have a 'Name'!??" );
}
}
}
@@ -3327,7 +3326,7 @@ void SbaTableQueryBrowser::impl_initialize()
}
catch(const Exception&)
{
- OSL_FAIL("SbaTableQueryBrowser::impl_initialize: could not set the update related names!");
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::impl_initialize: could not set the update related names!");
}
}
@@ -3488,7 +3487,7 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortDa
if ( ( eLeft == etQueryContainer ) && ( eRight == etTableContainer ) )
return COMPARE_LESS;
- OSL_FAIL( "SbaTableQueryBrowser::OnTreeEntryCompare: unexpected case!" );
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::OnTreeEntryCompare: unexpected case!" );
return COMPARE_EQUAL;
}
@@ -3638,7 +3637,7 @@ Any SbaTableQueryBrowser::getCurrentSelection( Control& _rControl ) const
break;
default:
- OSL_FAIL( "SbaTableQueryBrowser::getCurrentSelection: invalid (unexpected) object type!" );
+ SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::getCurrentSelection: invalid (unexpected) object type!" );
break;
}
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 12b1dde86309..8d2cd7defcc6 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -65,7 +65,6 @@
#include "UpdateHelperImpl.hxx"
#include <vcl/msgbox.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <rtl/logfile.hxx>
using namespace dbaui;
using namespace utl;
@@ -115,7 +114,7 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows,
,m_bCheckOnly(sal_False)
,m_bAppendFirstLine(false)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::ODatabaseExport" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::ODatabaseExport" );
DBG_CTOR(ODatabaseExport,NULL);
m_nRows += nRows;
@@ -172,7 +171,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
,m_bCheckOnly(sal_False)
,m_bAppendFirstLine(false)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::ODatabaseExport" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::ODatabaseExport" );
DBG_CTOR(ODatabaseExport,NULL);
try
{
@@ -302,7 +301,7 @@ ODatabaseExport::~ODatabaseExport()
// -----------------------------------------------------------------------------
void ODatabaseExport::insertValueIntoColumn()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::insertValueIntoColumn" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::insertValueIntoColumn" );
DBG_CHKTHIS(ODatabaseExport,NULL);
if(m_nColumnPos < sal_Int32(m_vDestVector.size()))
{
@@ -324,7 +323,7 @@ void ODatabaseExport::insertValueIntoColumn()
OSL_ENSURE((nNewPos) < static_cast<sal_Int32>(m_vColumnTypes.size()),"Illegal index for vector");
if (m_vColumnTypes[nNewPos] != DataType::VARCHAR && m_vColumnTypes[nNewPos] != DataType::CHAR && m_vColumnTypes[nNewPos] != DataType::LONGVARCHAR )
{
- RTL_LOGFILE_CONTEXT_TRACE( aLogger, "ODatabaseExport::insertValueIntoColumn != DataType::VARCHAR" );
+ SAL_INFO("dbaccess", "ODatabaseExport::insertValueIntoColumn != DataType::VARCHAR" );
ensureFormatter();
sal_Int32 nNumberFormat = 0;
double fOutNumber = 0.0;
@@ -417,7 +416,7 @@ void ODatabaseExport::insertValueIntoColumn()
// -----------------------------------------------------------------------------
sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOldNumberFormat)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::CheckString" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::CheckString" );
DBG_CHKTHIS(ODatabaseExport,NULL);
double fOutNumber = 0.0;
sal_Int16 nNumberFormat = 0;
@@ -551,7 +550,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl
}
break;
default:
- OSL_FAIL("ODatabaseExport: Unbekanntes Format");
+ SAL_WARN("dbaccess.ui", "ODatabaseExport: Unbekanntes Format");
}
}
}
@@ -565,7 +564,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl
// -----------------------------------------------------------------------------
void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfoMap* _pInfoMap)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::SetColumnTypes" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::SetColumnTypes" );
DBG_CHKTHIS(ODatabaseExport,NULL);
if(_pList && _pInfoMap)
{
@@ -638,7 +637,7 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo
// -----------------------------------------------------------------------------
void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::CreateDefaultColumn" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::CreateDefaultColumn" );
DBG_CHKTHIS(ODatabaseExport,NULL);
Reference< XDatabaseMetaData> xDestMetaData(m_xConnection->getMetaData());
sal_Int32 nMaxNameLen(xDestMetaData->getMaxColumnNameLength());
@@ -691,7 +690,7 @@ void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName)
// -----------------------------------------------------------------------------
sal_Bool ODatabaseExport::createRowSet()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::createRowSet" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::createRowSet" );
DBG_CHKTHIS(ODatabaseExport,NULL);
m_pUpdateHelper.reset(new OParameterUpdateHelper(createPreparedStatment(m_xConnection->getMetaData(),m_xTable,m_vColumns)));
@@ -700,7 +699,7 @@ sal_Bool ODatabaseExport::createRowSet()
// -----------------------------------------------------------------------------
sal_Bool ODatabaseExport::executeWizard(const OUString& _rTableName,const Any& _aTextColor,const FontDescriptor& _rFont)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::executeWizard" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::executeWizard" );
DBG_CHKTHIS(ODatabaseExport,NULL);
bool bHaveDefaultTable = !m_sDefaultTableName.isEmpty();
@@ -767,7 +766,7 @@ sal_Bool ODatabaseExport::executeWizard(const OUString& _rTableName,const Any& _
//---------------------------------------------------------------------------------
void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException& e)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::showErrorDialog" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::showErrorDialog" );
if(!m_bDontAskAgain)
{
String aMsg(e.Message);
@@ -784,7 +783,7 @@ void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException
// -----------------------------------------------------------------------------
void ODatabaseExport::adjustFormat()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::adjustFormat" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::adjustFormat" );
if ( m_sTextToken.Len() )
{
sal_Int32 nNewPos = m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos;
@@ -807,7 +806,7 @@ void ODatabaseExport::adjustFormat()
// -----------------------------------------------------------------------------
void ODatabaseExport::eraseTokens()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::eraseTokens" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::eraseTokens" );
m_sTextToken.Erase();
m_sNumToken.Erase();
m_sValToken.Erase();
@@ -815,7 +814,7 @@ void ODatabaseExport::eraseTokens()
// -----------------------------------------------------------------------------
void ODatabaseExport::ensureFormatter()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::ensureFormatter" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::ensureFormatter" );
if ( !m_pFormatter )
{
Reference< XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier();
@@ -831,7 +830,7 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
,const Reference<XPropertySet>& _xDestTable
,const TPositions& _rvColumns)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::createPreparedStatment" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::createPreparedStatment" );
OUString aSql(OUString("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 8ab0ed0a19b3..2938000d2063 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -55,7 +55,6 @@
#include <rtl/tencinfo.h>
#include "UITools.hxx"
#include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
using namespace dbaui;
using namespace ::com::sun::star::uno;
@@ -84,7 +83,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection,
,m_bMetaOptions(sal_False)
,m_bSDNum(sal_False)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::OHTMLReader" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" );
DBG_CTOR(OHTMLReader,NULL);
SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
// If the file starts with a BOM, switch to UCS2.
@@ -106,7 +105,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,
,m_bMetaOptions(sal_False)
,m_bSDNum(sal_False)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::OHTMLReader" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" );
DBG_CTOR(OHTMLReader,NULL);
SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
// If the file starts with a BOM, switch to UCS2.
@@ -120,7 +119,7 @@ OHTMLReader::~OHTMLReader()
// ---------------------------------------------------------------------------
SvParserState OHTMLReader::CallParser()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::CallParser" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::CallParser" );
DBG_CHKTHIS(OHTMLReader,NULL);
rInput.Seek(STREAM_SEEK_TO_BEGIN);
rInput.ResetError();
@@ -131,7 +130,7 @@ SvParserState OHTMLReader::CallParser()
// -----------------------------------------------------------------------------
void OHTMLReader::NextToken( int nToken )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::NextToken" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::NextToken" );
DBG_CHKTHIS(OHTMLReader,NULL);
if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly
return;
@@ -301,7 +300,7 @@ void OHTMLReader::NextToken( int nToken )
// -----------------------------------------------------------------------------
void OHTMLReader::fetchOptions()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::fetchOptions" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::fetchOptions" );
m_bInTbl = sal_True;
const HTMLOptions& options = GetOptions();
for (size_t i = 0, n = options.size(); i < n; ++i)
@@ -324,7 +323,7 @@ void OHTMLReader::fetchOptions()
//---------------------------------------------------------------------------------
void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::TableDataOn" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::TableDataOn" );
DBG_CHKTHIS(OHTMLReader,NULL);
const HTMLOptions& rHtmlOptions = GetOptions();
for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i)
@@ -355,7 +354,7 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
//---------------------------------------------------------------------------------
void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::TableFontOn" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::TableFontOn" );
DBG_CHKTHIS(OHTMLReader,NULL);
const HTMLOptions& rHtmlOptions = GetOptions();
for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i)
@@ -405,7 +404,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
// ---------------------------------------------------------------------------
sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::GetWidthPixel" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::GetWidthPixel" );
DBG_CHKTHIS(OHTMLReader,NULL);
const String& rOptVal = rOption.GetString();
if ( rOptVal.Search('%') != STRING_NOTFOUND )
@@ -427,7 +426,7 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
// ---------------------------------------------------------------------------
sal_Bool OHTMLReader::CreateTable(int nToken)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::CreateTable" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::CreateTable" );
DBG_CHKTHIS(OHTMLReader,NULL);
String aTempName(ModuleRes(STR_TBL_TITLE));
aTempName = aTempName.GetToken(0,' ');
@@ -538,7 +537,7 @@ sal_Bool OHTMLReader::CreateTable(int nToken)
// -----------------------------------------------------------------------------
void OHTMLReader::setTextEncoding()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::setTextEncoding" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::setTextEncoding" );
DBG_CHKTHIS(OHTMLReader,NULL);
m_bMetaOptions = sal_True;
ParseMetaOptions(NULL, NULL);
@@ -547,14 +546,14 @@ void OHTMLReader::setTextEncoding()
// -----------------------------------------------------------------------------
void OHTMLReader::release()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::release" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::release" );
DBG_CHKTHIS(OHTMLReader,NULL);
ReleaseRef();
}
// -----------------------------------------------------------------------------
TypeSelectionPageFactory OHTMLReader::getTypeSelectionPageFactory()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::getTypeSelectionPageFactory" );
+ SAL_INFO("dbaccess.ui", "OHTMLReader::getTypeSelectionPageFactory" );
DBG_CHKTHIS(OHTMLReader,NULL);
return &OWizHTMLExtend::Create;
}
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index e5ba2b86d499..4ae0b4561fc0 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -28,7 +28,6 @@
#include "dbustrings.hrc"
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <functional>
-#include <rtl/logfile.hxx>
using namespace dbaui;
using namespace ::com::sun::star::uno;
@@ -52,13 +51,13 @@ ORowSetImportExport::ORowSetImportExport( Window* _pParent,
,m_pParent(_pParent)
,m_bAlreadyAsked(sal_False)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::ORowSetImportExport" );
+ SAL_INFO("dbaccess.ui", "ORowSetImportExport::ORowSetImportExport" );
OSL_ENSURE(_pParent,"Window can't be null!");
}
// -----------------------------------------------------------------------------
void ORowSetImportExport::initialize()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::initialize" );
+ SAL_INFO("dbaccess.ui", "ORowSetImportExport::initialize" );
ODatabaseImportExport::initialize();
// do namemapping
Reference<XColumnLocate> xColumnLocate(m_xResultSet,UNO_QUERY);
@@ -98,13 +97,13 @@ void ORowSetImportExport::initialize()
// -----------------------------------------------------------------------------
sal_Bool ORowSetImportExport::Write()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::Write" );
+ SAL_INFO("dbaccess.ui", "ORowSetImportExport::Write" );
return sal_True;
}
// -----------------------------------------------------------------------------
sal_Bool ORowSetImportExport::Read()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "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())
@@ -159,7 +158,7 @@ sal_Bool ORowSetImportExport::Read()
// -----------------------------------------------------------------------------
sal_Bool ORowSetImportExport::insertNewRow()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::insertNewRow" );
+ SAL_INFO("dbaccess.ui", "ORowSetImportExport::insertNewRow" );
try
{
m_xTargetResultSetUpdate->moveToInsertRow();
@@ -231,7 +230,7 @@ sal_Bool ORowSetImportExport::insertNewRow()
aValue <<= m_xRow->getClob(*aIter);
break;
default:
- OSL_FAIL("Unknown type");
+ SAL_WARN("dbaccess.ui", "Unknown type");
}
if(m_xRow->wasNull())
m_xTargetRowUpdate->updateNull(i);
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index 8e85fbe993ba..bd3690aed679 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -46,7 +46,6 @@
#include "QEnumTypes.hxx"
#include "UITools.hxx"
#include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
using namespace dbaui;
using namespace ::com::sun::star::uno;
@@ -69,7 +68,7 @@ ORTFReader::ORTFReader( SvStream& rIn,
:SvRTFParser(rIn)
,ODatabaseExport( _rxConnection, _rxNumberF, _rxContext, pList, _pInfoMap, rIn )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::ORTFReader" );
+ SAL_INFO("dbaccess.ui", "ORTFReader::ORTFReader" );
DBG_CTOR(ORTFReader,NULL);
m_bAppendFirstLine = false;
}
@@ -85,7 +84,7 @@ ORTFReader::ORTFReader(SvStream& rIn,
:SvRTFParser(rIn)
,ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rxContext, pList, _pInfoMap, _bAutoIncrementEnabled, rIn )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::ORTFReader" );
+ SAL_INFO("dbaccess.ui", "ORTFReader::ORTFReader" );
DBG_CTOR(ORTFReader,NULL);
m_bAppendFirstLine = false;
}
@@ -97,7 +96,7 @@ ORTFReader::~ORTFReader()
// ---------------------------------------------------------------------------
SvParserState ORTFReader::CallParser()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::CallParser" );
+ SAL_INFO("dbaccess.ui", "ORTFReader::CallParser" );
DBG_CHKTHIS(ORTFReader,NULL);
rInput.Seek(STREAM_SEEK_TO_BEGIN);
rInput.ResetError();
@@ -108,7 +107,7 @@ SvParserState ORTFReader::CallParser()
// ---------------------------------------------------------------------------
void ORTFReader::NextToken( int nToken )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::NextToken" );
+ SAL_INFO("dbaccess.ui", "ORTFReader::NextToken" );
DBG_CHKTHIS(ORTFReader,NULL);
if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly
return;
@@ -262,7 +261,7 @@ void ORTFReader::NextToken( int nToken )
// ---------------------------------------------------------------------------
sal_Bool ORTFReader::CreateTable(int nToken)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::CreateTable" );
+ SAL_INFO("dbaccess.ui", "ORTFReader::CreateTable" );
DBG_CHKTHIS(ORTFReader,NULL);
String aTableName(ModuleRes(STR_TBL_TITLE));
aTableName = aTableName.GetToken(0,' ');
@@ -346,7 +345,7 @@ sal_Bool ORTFReader::CreateTable(int nToken)
// -----------------------------------------------------------------------------
void ORTFReader::release()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::release" );
+ SAL_INFO("dbaccess.ui", "ORTFReader::release" );
DBG_CHKTHIS(ORTFReader,NULL);
ReleaseRef();
}
@@ -354,7 +353,7 @@ void ORTFReader::release()
// -----------------------------------------------------------------------------
TypeSelectionPageFactory ORTFReader::getTypeSelectionPageFactory()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::getTypeSelectionPageFactory" );
+ SAL_INFO("dbaccess.ui", "ORTFReader::getTypeSelectionPageFactory" );
DBG_CHKTHIS(ORTFReader,NULL);
return &OWizRTFExtend::Create;
}
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 1d950a83519d..df5ccdd49c62 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -55,7 +55,6 @@
#include <cppuhelper/exc_hlp.hxx>
#include "dbexchange.hxx"
-#include <rtl/logfile.hxx>
//........................................................................
namespace dbaui
{
@@ -88,7 +87,7 @@ void OTableCopyHelper::insertTable( const OUString& i_rSourceDataSource, const R
{
if ( CommandType::QUERY != i_nCommandType && CommandType::TABLE != i_nCommandType )
{
- OSL_FAIL( "OTableCopyHelper::insertTable: invalid call (no supported format found)!" );
+ SAL_WARN("dbaccess.ui", "OTableCopyHelper::insertTable: invalid call (no supported format found)!" );
return;
}
@@ -100,7 +99,7 @@ void OTableCopyHelper::insertTable( const OUString& i_rSourceDataSource, const R
if ( !xSrcConnection.is() || !i_rDestConnection.is() )
{
- OSL_FAIL( "OTableCopyHelper::insertTable: no connection/s!" );
+ SAL_WARN("dbaccess.ui", "OTableCopyHelper::insertTable: no connection/s!" );
return;
}
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 1fe8ebdf3073..b3d88ae23915 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -55,7 +55,6 @@
#include <svtools/htmlcfg.hxx>
#include <connectivity/formattedcolumnvalue.hxx>
#include <unotools/syslocale.hxx>
-#include <rtl/logfile.hxx>
using namespace dbaui;
using namespace dbtools;
@@ -103,7 +102,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor&
,m_bInInitialize(sal_False)
,m_bCheckOnly(sal_False)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::ODatabaseImportExport" );
+ SAL_INFO("dbaccess.ui", "ODatabaseImportExport::ODatabaseImportExport" );
DBG_CTOR(ODatabaseImportExport,NULL);
m_eDestEnc = osl_getThreadTextEncoding();
@@ -135,7 +134,7 @@ ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection&
,m_bInInitialize(sal_False)
,m_bCheckOnly(sal_False)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::ODatabaseImportExport" );
+ SAL_INFO("dbaccess.ui", "ODatabaseImportExport::ODatabaseImportExport" );
DBG_CTOR(ODatabaseImportExport,NULL);
m_eDestEnc = osl_getThreadTextEncoding();
try
@@ -162,7 +161,7 @@ ODatabaseImportExport::~ODatabaseImportExport()
// -----------------------------------------------------------------------------
void ODatabaseImportExport::dispose()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::disposing" );
+ SAL_INFO("dbaccess.ui", "ODatabaseImportExport::disposing" );
DBG_CHKTHIS(ODatabaseImportExport,NULL);
// remove me as listener
Reference< XComponent > xComponent(m_xConnection, UNO_QUERY);
@@ -185,7 +184,7 @@ void ODatabaseImportExport::dispose()
// -----------------------------------------------------------------------------
void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) throw(::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::disposing" );
+ SAL_INFO("dbaccess.ui", "ODatabaseImportExport::disposing" );
DBG_CHKTHIS(ODatabaseImportExport,NULL);
Reference<XConnection> xCon(Source.Source,UNO_QUERY);
if(m_xConnection.is() && m_xConnection == xCon)
@@ -198,14 +197,14 @@ void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) thro
// -----------------------------------------------------------------------------
void ODatabaseImportExport::initialize( const ODataAccessDescriptor& _aDataDescriptor )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::initialize" );
+ SAL_INFO("dbaccess.ui", "ODatabaseImportExport::initialize" );
impl_initFromDescriptor( _aDataDescriptor, true );
}
// -----------------------------------------------------------------------------
void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::impl_initFromDescriptor" );
+ SAL_INFO("dbaccess.ui", "ODatabaseImportExport::impl_initFromDescriptor" );
DBG_CHKTHIS(ODatabaseImportExport,NULL);
if ( !_bPlusDefaultInit )
{
@@ -239,7 +238,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor
{
if ( !m_xResultSet.is() )
{
- OSL_FAIL( "ODatabaseImportExport::impl_initFromDescriptor: selection without result set is nonsense!" );
+ SAL_WARN("dbaccess.ui", "ODatabaseImportExport::impl_initFromDescriptor: selection without result set is nonsense!" );
m_aSelection.realloc( 0 );
}
}
@@ -248,7 +247,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor
{
if ( m_bBookmarkSelection && !m_xRowLocate.is() )
{
- OSL_FAIL( "ODatabaseImportExport::impl_initFromDescriptor: no XRowLocate -> no bookmars!" );
+ SAL_WARN("dbaccess.ui", "ODatabaseImportExport::impl_initFromDescriptor: no XRowLocate -> no bookmars!" );
m_aSelection.realloc( 0 );
}
}
@@ -268,7 +267,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor
// -----------------------------------------------------------------------------
void ODatabaseImportExport::initialize()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::initialize" );
+ SAL_INFO("dbaccess.ui", "ODatabaseImportExport::initialize" );
DBG_CHKTHIS(ODatabaseImportExport,NULL);
m_bInInitialize = sal_True;
m_bNeedToReInitialize = false;
@@ -375,7 +374,7 @@ sal_Bool ODatabaseImportExport::Read()
// -----------------------------------------------------------------------------
void ODatabaseImportExport::impl_initializeRowMember_throw()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "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 );
@@ -388,7 +387,7 @@ void ODatabaseImportExport::impl_initializeRowMember_throw()
//======================================================================
sal_Bool ORTFImportExport::Write()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFImportExport::Write" );
+ SAL_INFO("dbaccess.ui", "ORTFImportExport::Write" );
ODatabaseImportExport::Write();
(*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_RTF;
(*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << ODatabaseImportExport::sNewLine;
@@ -612,7 +611,7 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_
}
catch (Exception&)
{
- OSL_FAIL("RTF WRITE!");
+ SAL_WARN("dbaccess.ui","RTF WRITE!");
}
(*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL;
@@ -628,7 +627,7 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_
//-------------------------------------------------------------------
sal_Bool ORTFImportExport::Read()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFImportExport::Read" );
+ SAL_INFO("dbaccess.ui", "ORTFImportExport::Read" );
ODatabaseImportExport::Read();
SvParserState eState = SVPAR_ERROR;
if ( m_pStream )
@@ -677,7 +676,7 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD
,m_bCheckFont(sal_False)
#endif
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::OHTMLImportExport" );
+ SAL_INFO("dbaccess.ui", "OHTMLImportExport::OHTMLImportExport" );
// set HTML configuration
SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
m_eDestEnc = rHtmlOptions.GetTextEncoding();
@@ -687,7 +686,7 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD
//-------------------------------------------------------------------
sal_Bool OHTMLImportExport::Write()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::Write" );
+ SAL_INFO("dbaccess.ui", "OHTMLImportExport::Write" );
ODatabaseImportExport::Write();
if(m_xObject.is())
{
@@ -706,7 +705,7 @@ sal_Bool OHTMLImportExport::Write()
//-------------------------------------------------------------------
sal_Bool OHTMLImportExport::Read()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::Read" );
+ SAL_INFO("dbaccess.ui", "OHTMLImportExport::Read" );
ODatabaseImportExport::Read();
SvParserState eState = SVPAR_ERROR;
if ( m_pStream )
@@ -726,7 +725,7 @@ sal_Bool OHTMLImportExport::Read()
//-------------------------------------------------------------------
void OHTMLImportExport::WriteHeader()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteHeader" );
+ SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteHeader" );
uno::Reference<document::XDocumentProperties> xDocProps(
document::DocumentProperties::create( m_xContext ) );
if (xDocProps.is()) {
@@ -743,7 +742,7 @@ void OHTMLImportExport::WriteHeader()
//-----------------------------------------------------------------------
void OHTMLImportExport::WriteBody()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteBody" );
+ SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteBody" );
IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_style );
@@ -779,7 +778,7 @@ void OHTMLImportExport::WriteBody()
//-----------------------------------------------------------------------
void OHTMLImportExport::WriteTables()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteTables" );
+ SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteTables" );
OString aStrOut = OOO_STRING_SVTOOLS_HTML_table;
aStrOut = aStrOut + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_frame;
@@ -953,7 +952,7 @@ void OHTMLImportExport::WriteTables()
void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_Int32 nHeightPixel,const char* pChar,
const String& rValue,const char* pHtmlTag)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteCell" );
+ SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteCell" );
OString aStrTD = pHtmlTag;
nWidthPixel = nWidthPixel ? nWidthPixel : 86;
@@ -1027,7 +1026,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
//-----------------------------------------------------------------------
void OHTMLImportExport::FontOn()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::FontOn" );
+ SAL_INFO("dbaccess.ui", "OHTMLImportExport::FontOn" );
#if OSL_DEBUG_LEVEL > 0
m_bCheckFont = sal_True;
#endif
@@ -1058,7 +1057,7 @@ void OHTMLImportExport::FontOn()
//-----------------------------------------------------------------------
inline void OHTMLImportExport::FontOff()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "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
@@ -1068,7 +1067,7 @@ inline void OHTMLImportExport::FontOff()
//-----------------------------------------------------------------------
void OHTMLImportExport::IncIndent( sal_Int16 nVal )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::IncIndent" );
+ 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 63473f238ea3..f8e86dd470ec 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -55,7 +55,6 @@
#include <connectivity/dbmetadata.hxx>
#include <connectivity/dbexception.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/ustrbuf.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
@@ -469,14 +468,14 @@ const DummyCopySource& DummyCopySource::Instance()
//------------------------------------------------------------------------
OUString DummyCopySource::getQualifiedObjectName() const
{
- OSL_FAIL( "DummyCopySource::getQualifiedObjectName: not to be called!" );
+ SAL_WARN("dbaccess.ui", "DummyCopySource::getQualifiedObjectName: not to be called!" );
return OUString();
}
//------------------------------------------------------------------------
bool DummyCopySource::isView() const
{
- OSL_FAIL( "DummyCopySource::isView: not to be called!" );
+ SAL_WARN("dbaccess.ui", "DummyCopySource::isView: not to be called!" );
return false;
}
@@ -498,27 +497,27 @@ Sequence< OUString > DummyCopySource::getColumnNames() const
//------------------------------------------------------------------------
Sequence< OUString > DummyCopySource::getPrimaryKeyColumnNames() const
{
- OSL_FAIL( "DummyCopySource::getPrimaryKeyColumnNames: not to be called!" );
+ SAL_WARN("dbaccess.ui", "DummyCopySource::getPrimaryKeyColumnNames: not to be called!" );
return Sequence< OUString >();
}
//------------------------------------------------------------------------
OFieldDescription* DummyCopySource::createFieldDescription( const OUString& /*_rColumnName*/ ) const
{
- OSL_FAIL( "DummyCopySource::createFieldDescription: not to be called!" );
+ SAL_WARN("dbaccess.ui", "DummyCopySource::createFieldDescription: not to be called!" );
return NULL;
}
//------------------------------------------------------------------------
OUString DummyCopySource::getSelectStatement() const
{
- OSL_FAIL( "DummyCopySource::getSelectStatement: not to be called!" );
+ SAL_WARN("dbaccess.ui", "DummyCopySource::getSelectStatement: not to be called!" );
return OUString();
}
//------------------------------------------------------------------------
::utl::SharedUNOComponent< XPreparedStatement > DummyCopySource::getPreparedSelectStatement() const
{
- OSL_FAIL( "DummyCopySource::getPreparedSelectStatement: not to be called!" );
+ SAL_WARN("dbaccess.ui", "DummyCopySource::getPreparedSelectStatement: not to be called!" );
return ::utl::SharedUNOComponent< XPreparedStatement >();
}
@@ -571,7 +570,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultN
,m_ePressed( WIZARD_NONE )
,m_bCreatePrimaryKeyColumn(sal_False)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::OCopyTableWizard" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::OCopyTableWizard" );
DBG_CTOR(OCopyTableWizard,NULL);
construct();
@@ -671,7 +670,7 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultNa
,m_ePressed( WIZARD_NONE )
,m_bCreatePrimaryKeyColumn(sal_False)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::OCopyTableWizard" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::OCopyTableWizard" );
DBG_CTOR(OCopyTableWizard,NULL);
construct();
ODatabaseExport::TColumnVector::const_iterator aIter = _rSourceColVec.begin();
@@ -701,7 +700,7 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultNa
// -----------------------------------------------------------------------------
void OCopyTableWizard::construct()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "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 );
@@ -797,7 +796,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl)
// -----------------------------------------------------------------------
sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::CheckColumns" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::CheckColumns" );
sal_Bool bRet = sal_True;
m_vColumnPos.clear();
m_vColumnTypes.clear();
@@ -962,7 +961,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
break;
default:
{
- OSL_FAIL("OCopyTableWizard::ImplOKHdl: invalid creation style!");
+ SAL_WARN("dbaccess.ui", "OCopyTableWizard::ImplOKHdl: invalid creation style!");
}
}
@@ -973,14 +972,14 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
//------------------------------------------------------------------------
sal_Bool OCopyTableWizard::shouldCreatePrimaryKey() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::shouldCreatePrimaryKey" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::shouldCreatePrimaryKey" );
return m_bCreatePrimaryKeyColumn;
}
// -----------------------------------------------------------------------
void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::setCreatePrimaryKey" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::setCreatePrimaryKey" );
m_bCreatePrimaryKeyColumn = _bDoCreate;
if ( !_rSuggestedName.isEmpty() )
m_aKeyName = _rSuggestedName;
@@ -1012,7 +1011,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplActivateHdl)
// -----------------------------------------------------------------------
void OCopyTableWizard::CheckButtons()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::CheckButtons" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::CheckButtons" );
if(GetCurLevel() == 0) // the first page has no back button
{
if(m_nPageCount > 1)
@@ -1036,7 +1035,7 @@ void OCopyTableWizard::CheckButtons()
// -----------------------------------------------------------------------
void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::EnableButton" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::EnableButton" );
Button* pButton;
if(eStyle == WIZARD_NEXT)
pButton = &m_pbNext;
@@ -1050,21 +1049,21 @@ void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable)
// -----------------------------------------------------------------------
long OCopyTableWizard::DeactivatePage()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::DeactivatePage" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::DeactivatePage" );
OWizardPage* pPage = (OWizardPage*)GetPage(GetCurLevel());
return pPage ? pPage->LeavePage() : sal_False;
}
// -----------------------------------------------------------------------
void OCopyTableWizard::AddWizardPage(OWizardPage* pPage)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::AddWizardPage" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::AddWizardPage" );
AddPage(pPage);
++m_nPageCount;
}
// -----------------------------------------------------------------------------
void OCopyTableWizard::insertColumn(sal_Int32 _nPos,OFieldDescription* _pField)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::insertColumn" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::insertColumn" );
OSL_ENSURE(_pField,"FieldDescrioption is null!");
if ( _pField )
{
@@ -1083,7 +1082,7 @@ void OCopyTableWizard::insertColumn(sal_Int32 _nPos,OFieldDescription* _pField)
// -----------------------------------------------------------------------------
void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const OUString& _sOldName)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::replaceColumn" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::replaceColumn" );
OSL_ENSURE(_pField,"FieldDescrioption is null!");
if ( _pField )
{
@@ -1097,14 +1096,14 @@ void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,
// -----------------------------------------------------------------------------
void OCopyTableWizard::impl_loadSourceData()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "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 )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::loadData" );
+ 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;
@@ -1165,7 +1164,7 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject,
// -----------------------------------------------------------------------------
void OCopyTableWizard::clearDestColumns()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::clearDestColumns" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::clearDestColumns" );
clearColumns(m_vDestColumns,m_aDestVec);
m_bAddPKFirstTime = sal_True;
m_mNameMapping.clear();
@@ -1174,7 +1173,7 @@ void OCopyTableWizard::clearDestColumns()
// -----------------------------------------------------------------------------
void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, const ODatabaseExport::TColumnVector* _pVec, sal_Bool _bKeyColumns) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::appendColumns" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::appendColumns" );
// now append the columns
OSL_ENSURE(_rxColSup.is(),"No columns supplier");
if(!_rxColSup.is())
@@ -1216,7 +1215,7 @@ void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, co
}
else
{
- OSL_FAIL("OCopyTableWizard::appendColumns: invalid field name!");
+ SAL_WARN("dbaccess.ui", "OCopyTableWizard::appendColumns: invalid field name!");
}
}
@@ -1225,7 +1224,7 @@ void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, co
// -----------------------------------------------------------------------------
void OCopyTableWizard::appendKey( Reference<XKeysSupplier>& _rxSup, const ODatabaseExport::TColumnVector* _pVec) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::appendKey" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::appendKey" );
if(!_rxSup.is())
return; // the database doesn't support keys
OSL_ENSURE(_rxSup.is(),"No XKeysSupplier!");
@@ -1253,7 +1252,7 @@ void OCopyTableWizard::appendKey( Reference<XKeysSupplier>& _rxSup, const ODatab
// -----------------------------------------------------------------------------
Reference< XPropertySet > OCopyTableWizard::createView() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::createView" );
+ 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,
@@ -1263,7 +1262,7 @@ Reference< XPropertySet > OCopyTableWizard::createView() const
// -----------------------------------------------------------------------------
Reference< XPropertySet > OCopyTableWizard::createTable()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::createTable" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::createTable" );
Reference< XPropertySet > xTable;
Reference<XTablesSupplier> xSup( m_xDestConnection, UNO_QUERY );
@@ -1397,7 +1396,7 @@ bool OCopyTableWizard::supportsPrimaryKey( const Reference< XConnection >& _rxCo
// -----------------------------------------------------------------------------
bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnection )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::supportsViews" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::supportsViews" );
OSL_PRECOND( _rxConnection.is(), "OCopyTableWizard::supportsViews: invalid connection!" );
if ( !_rxConnection.is() )
return false;
@@ -1440,7 +1439,7 @@ bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnect
// -----------------------------------------------------------------------------
sal_Int32 OCopyTableWizard::getMaxColumnNameLength() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::getMaxColumnNameLength" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::getMaxColumnNameLength" );
sal_Int32 nLen = 0;
if ( m_xDestConnection.is() )
{
@@ -1459,13 +1458,13 @@ sal_Int32 OCopyTableWizard::getMaxColumnNameLength() const
// -----------------------------------------------------------------------------
void OCopyTableWizard::setOperation( const sal_Int16 _nOperation )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::setOperation" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::setOperation" );
m_nOperation = _nOperation;
}
// -----------------------------------------------------------------------------
sal_Int16 OCopyTableWizard::getOperation() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::getOperation" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::getOperation" );
return m_nOperation;
}
// -----------------------------------------------------------------------------
@@ -1474,7 +1473,7 @@ OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFu
const OUString& _sExtraChars,
sal_Int32 _nMaxNameLen)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::convertColumnName" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::convertColumnName" );
OUString sAlias = _sColumnName;
if ( isSQL92CheckEnabled( m_xDestConnection ) )
sAlias = ::dbtools::convertName2SQLName(_sColumnName,_sExtraChars);
@@ -1509,14 +1508,14 @@ OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFu
// -----------------------------------------------------------------------------
void OCopyTableWizard::removeColumnNameFromNameMap(const OUString& _sName)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::removeColumnNameFromNameMap" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::removeColumnNameFromNameMap" );
m_mNameMapping.erase(_sName);
}
// -----------------------------------------------------------------------------
sal_Bool OCopyTableWizard::supportsType(sal_Int32 _nDataType,sal_Int32& _rNewDataType)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::supportsType" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::supportsType" );
sal_Bool bRet = m_aDestTypeInfo.find(_nDataType) != m_aDestTypeInfo.end();
if ( bRet )
_rNewDataType = _nDataType;
@@ -1526,7 +1525,7 @@ sal_Bool OCopyTableWizard::supportsType(sal_Int32 _nDataType,sal_Int32& _rNewDat
// -----------------------------------------------------------------------------
TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& _bNotConvert)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::convertType" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::convertType" );
if ( !m_bInterConnectionCopy )
// no need to convert if the source and destination connection are the same
return _pType;
@@ -1625,7 +1624,7 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool&
// -----------------------------------------------------------------------------
OUString OCopyTableWizard::createUniqueName(const OUString& _sName)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::createUniqueName" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::createUniqueName" );
OUString sName = _sName;
Sequence< OUString > aColumnNames( m_rSourceObject.getColumnNames() );
if ( aColumnNames.getLength() )
@@ -1647,7 +1646,7 @@ OUString OCopyTableWizard::createUniqueName(const OUString& _sName)
// -----------------------------------------------------------------------------
void OCopyTableWizard::showColumnTypeNotSupported(const OUString& _rColumnName)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::showColumnTypeNotSupported" );
+ SAL_INFO("dbaccess.ui", "OCopyTableWizard::showColumnTypeNotSupported" );
String sMessage( ModuleRes( STR_UNKNOWN_TYPE_FOUND ) );
sMessage.SearchAndReplaceAscii("#1",_rColumnName);
showError(sMessage);
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 9bb4591f68f8..cf71cbd28647 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -64,7 +64,6 @@
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase1.hxx>
#include <rtl/ustrbuf.hxx>
-#include <rtl/logfile.hxx>
#include <svtools/genericunodialog.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/sharedunocomponent.hxx>
@@ -1092,7 +1091,7 @@ bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _r
case CopyTableContinuation::AskUser: break; // stop asking the listeners, ask the user
default:
- OSL_FAIL( "CopyTableWizard::impl_processCopyError_nothrow: invalid listener response!" );
+ SAL_WARN("dbaccess.ui", "CopyTableWizard::impl_processCopyError_nothrow: invalid listener response!" );
// ask next listener
continue;
}
@@ -1391,7 +1390,7 @@ void CopyTableWizard::impl_doCopy_nothrow()
if( !xTable.is() )
{
- OSL_FAIL( "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" );
+ SAL_WARN("dbaccess.ui", "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" );
break;
}
@@ -1408,7 +1407,7 @@ void CopyTableWizard::impl_doCopy_nothrow()
xTable = rWizard.createTable();
if ( !xTable.is() )
{
- OSL_FAIL( "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" );
+ SAL_WARN("dbaccess.ui", "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" );
break;
}
}
@@ -1456,7 +1455,7 @@ void CopyTableWizard::impl_doCopy_nothrow()
break;
default:
- OSL_FAIL( "CopyTableWizard::impl_doCopy_nothrow: What operation, please?" );
+ SAL_WARN("dbaccess.ui", "CopyTableWizard::impl_doCopy_nothrow: What operation, please?" );
break;
}
}
generated by cgit (git 2.34.1) at 2025-01-25 12:04:36 +0000