[Libreoffice-commits] core.git: include/sal svx/inc svx/source
Jelle van der Waa
jelle at vdwaa.nl
Fri Jul 26 09:24:57 PDT 2013
include/sal/log-areas.dox | 1
svx/inc/pch/precompiled_svxcore.hxx | 1
svx/source/form/datanavi.cxx | 1
svx/source/form/filtnav.cxx | 1
svx/source/form/fmexpl.cxx | 10 ------
svx/source/form/fmpage.cxx | 9 ------
svx/source/form/fmpgeimp.cxx | 8 -----
svx/source/form/fmshimp.cxx | 1
svx/source/form/fmtools.cxx | 5 ---
svx/source/form/fmundo.cxx | 35 -----------------------
svx/source/form/fmvwimp.cxx | 1
svx/source/form/formcontroller.cxx | 1
svx/source/form/navigatortree.cxx | 44 ------------------------------
svx/source/form/navigatortreemodel.cxx | 34 -----------------------
svx/source/svdraw/svdmodel.cxx | 13 ++++----
svx/source/unodraw/UnoGraphicExporter.cxx | 5 ---
16 files changed, 7 insertions(+), 163 deletions(-)
New commits:
commit e42737a213373af18d1e68cea7b16b1679b4c3fe
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date: Fri Jul 26 16:51:07 2013 +0200
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: I8fe1cdccfef61c3cac88a24d057615b0ceda682a
Reviewed-on: https://gerrit.libreoffice.org/5126
Reviewed-by: Luboš Luňák <l.lunak at suse.cz>
Tested-by: Luboš Luňák <l.lunak at suse.cz>
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 6ff5372..6471349 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -253,6 +253,7 @@ certain functionality.
@li @c svx.tbxcrtls - ToolboxControl
@li @c svx.sdr
@li @c svx.uno
+ at li @c svx.svdraw
@section toolkit
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 6b73d98..3774b41 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -440,7 +440,6 @@
#include <osl/time.h>
#include <rtl/crc.h>
#include <rtl/instance.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <rtl/ref.hxx>
#include <rtl/strbuf.hxx>
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 5f05502..eb3d7d0 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -56,7 +56,6 @@
#include <com/sun/star/form/binding/XValueBinding.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
-#include <rtl/logfile.hxx>
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index ccee794..7576660 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -41,7 +41,6 @@
#include <cppuhelper/implbase1.hxx>
#include <fmservs.hxx>
#include <fmshimp.hxx>
-#include <rtl/logfile.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/objitem.hxx>
#include <sfx2/objsh.hxx>
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 717b874..5549351 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -62,7 +62,6 @@
#include <comphelper/property.hxx>
#include <comphelper/processfactory.hxx>
#include <osl/diagnose.h>
-#include <rtl/logfile.hxx>
using namespace ::svxform;
using namespace ::com::sun::star::uno;
@@ -240,7 +239,6 @@ DBG_NAME(FmEntryData);
FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface >& _rxIFace )
:pParent( pParentData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmEntryData::FmEntryData" );
DBG_CTOR(FmEntryData,NULL);
pChildList = new FmEntryDataList();
@@ -258,7 +256,6 @@ FmEntryData::~FmEntryData()
//------------------------------------------------------------------------
void FmEntryData::newObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIFace )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmEntryData::newObject" );
// do not just copy, normalize it
m_xNormalizedIFace = Reference< XInterface >( _rxIFace, UNO_QUERY );
m_xProperties = m_xProperties.query( m_xNormalizedIFace );
@@ -268,7 +265,6 @@ void FmEntryData::newObject( const ::com::sun::star::uno::Reference< ::com::sun:
//------------------------------------------------------------------------
FmEntryData::FmEntryData( const FmEntryData& rEntryData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmEntryData::FmEntryData" );
pChildList = new FmEntryDataList();
aText = rEntryData.GetText();
m_aNormalImage = rEntryData.GetNormalImage();
@@ -291,14 +287,12 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData )
//------------------------------------------------------------------------
void FmEntryData::Clear()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmEntryData::Clear" );
GetChildList()->clear();
}
//------------------------------------------------------------------------
sal_Bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmEntryData::IsEqualWithoutChildren" );
if(this == pEntryData)
return sal_True;
@@ -408,7 +402,6 @@ FmControlData::FmControlData(
: FmEntryData( _pParent, _rxComponent ),
m_xFormComponent( _rxComponent )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmControlData::FmControlData" );
DBG_CTOR(FmControlData,NULL);
//////////////////////////////////////////////////////////////////////
// Images setzen
@@ -446,7 +439,6 @@ FmEntryData* FmControlData::Clone()
//------------------------------------------------------------------------
Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmControlData::FmControlData" );
//////////////////////////////////////////////////////////////////////
// Default-Image
Image aImage = ilNavigatorImages.GetImage( RID_SVXIMG_CONTROL );
@@ -555,7 +547,6 @@ Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const
//------------------------------------------------------------------------
sal_Bool FmControlData::IsEqualWithoutChildren( FmEntryData* pEntryData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmControlData::IsEqualWithoutChildren" );
if(this == pEntryData)
return sal_True;
@@ -575,7 +566,6 @@ void FmControlData::ModelReplaced(
const ImageList& _rNormalImages
)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmControlData::ModelReplaced" );
m_xFormComponent = _rxNew;
newObject( m_xFormComponent );
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 507e229..ce44c69 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -47,7 +47,6 @@
#include "svx/fmtools.hxx"
using namespace ::svxform;
#include <comphelper/property.hxx>
-#include <rtl/logfile.hxx>
using com::sun::star::uno::Reference;
using com::sun::star::uno::UNO_QUERY;
@@ -62,7 +61,6 @@ FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, bool bMasterPage
,m_pImpl( new FmFormPageImpl( *this ) )
,m_pBasic(_pBasic)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::FmFormPage" );
}
//------------------------------------------------------------------
@@ -72,7 +70,6 @@ FmFormPage::FmFormPage(const FmFormPage& rPage)
,m_pBasic(0)
{
m_pImpl->initFrom( rPage.GetImpl() );
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::FmFormPage" );
m_sPageName = rPage.m_sPageName;
}
@@ -85,7 +82,6 @@ FmFormPage::~FmFormPage()
//------------------------------------------------------------------
void FmFormPage::SetModel(SdrModel* pNewModel)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::SetModel" );
/* #35055# */
// we want to call the super's "SetModel" method even if the model is the
// same, in case code somewhere in the system depends on it. But our code
@@ -120,7 +116,6 @@ void FmFormPage::SetModel(SdrModel* pNewModel)
//------------------------------------------------------------------
SdrPage* FmFormPage::Clone() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::Clone" );
return new FmFormPage(*this);
// hier fehlt noch ein kopieren der Objekte
}
@@ -129,7 +124,6 @@ SdrPage* FmFormPage::Clone() const
void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos,
const SdrInsertReason* pReason)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::InsertObject" );
SdrPage::InsertObject( pObj, nPos, pReason );
if (GetModel() && (!pReason || pReason->GetReason() != SDRREASON_STREAMING))
((FmFormModel*)GetModel())->GetUndoEnv().Inserted(pObj);
@@ -138,7 +132,6 @@ void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos,
//------------------------------------------------------------------
const Reference< css::form::XForms > & FmFormPage::GetForms( bool _bForceCreate ) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::GetForms" );
const SdrPage& rMasterPage( *this );
const FmFormPage* pFormPage = dynamic_cast< const FmFormPage* >( &rMasterPage );
OSL_ENSURE( pFormPage, "FmFormPage::GetForms: referenced page is no FmFormPage - is this allowed?!" );
@@ -152,7 +145,6 @@ const Reference< css::form::XForms > & FmFormPage::GetForms( bool _bForceCreate
sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
const HelpEvent& rEvt )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::RequestHelp" );
if( pView->IsAction() )
return sal_False;
@@ -218,7 +210,6 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
//------------------------------------------------------------------
SdrObject* FmFormPage::RemoveObject(sal_uLong nObjNum)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::RemoveObject" );
SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
if (pObj && GetModel())
((FmFormModel*)GetModel())->GetUndoEnv().Removed(pObj);
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index de8b2b2..f938a1a 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -50,7 +50,6 @@
#include <comphelper/uno3.hxx>
#include <comphelper/types.hxx>
#include <unotools/streamwrap.hxx>
-#include <rtl/logfile.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -74,7 +73,6 @@ FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage )
,m_bAttemptedFormCreation( false )
,m_bInFind( false )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPageImpl::FmFormPageImpl" );
DBG_CTOR(FmFormPageImpl,NULL);
}
@@ -317,7 +315,6 @@ Reference< XMap > FmFormPageImpl::impl_createControlShapeMap_nothrow()
//------------------------------------------------------------------------------
const Reference< css::form::XForms >& FmFormPageImpl::getForms( bool _bForceCreate )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPageImpl::getForms" );
if ( m_xForms.is() || !_bForceCreate )
return m_xForms;
@@ -359,7 +356,6 @@ FmFormPageImpl::~FmFormPageImpl()
//------------------------------------------------------------------------------
bool FmFormPageImpl::validateCurForm()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPageImpl::validateCurForm" );
if ( !xCurrentForm.is() )
return false;
@@ -374,14 +370,12 @@ bool FmFormPageImpl::validateCurForm()
//------------------------------------------------------------------------------
void FmFormPageImpl::setCurForm(Reference< ::com::sun::star::form::XForm > xForm)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPageImpl::setCurForm" );
xCurrentForm = xForm;
}
//------------------------------------------------------------------------------
Reference< XForm > FmFormPageImpl::getDefaultForm()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPageImpl::getDefaultForm" );
Reference< XForm > xForm;
Reference< XForms > xForms( getForms() );
@@ -469,7 +463,6 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo
const Reference< XFormComponent > & rContent, const Reference< XDataSource > & rDatabase,
const OUString& rDBTitle, const OUString& rCursorSource, sal_Int32 nCommandType )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPageImpl::findPlaceInFormComponentHierarchy" );
// if the control already is child of a form, don't do anything
if (!rContent.is() || rContent->getParent().is())
return NULL;
@@ -564,7 +557,6 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
const Reference< XForm > & rForm, const Reference< XDataSource > & _rxDatabase,
const OUString& _rCursorSource, sal_Int32 nCommandType)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPageImpl::findFormForDataSource" );
Reference< XForm > xResultForm;
Reference< XRowSet > xDBForm(rForm, UNO_QUERY);
Reference< XPropertySet > xFormProps(rForm, UNO_QUERY);
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 46a7d6e..52c9eff 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -85,7 +85,6 @@
#include <comphelper/solarmutex.hxx>
#include <comphelper/string.hxx>
#include <connectivity/dbtools.hxx>
-#include <rtl/logfile.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/frame.hxx>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index b7e3c65..3cbc674 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -73,7 +73,6 @@
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <sfx2/bindings.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -125,7 +124,6 @@ namespace
// ------------------------------------------------------------------------------
void displayException(const Any& _rExcept, Window* _pParent)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "fmtools::displayException" );
// check whether we need to display it
if ( !lcl_shouldDisplayError( _rExcept ) )
return;
@@ -206,7 +204,6 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce
//------------------------------------------------------------------
OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "fmtools::getLabelName" );
if (!xControlModel.is())
return OUString();
@@ -364,7 +361,6 @@ void FmXDisposeMultiplexer::dispose()
//------------------------------------------------------------------------------
sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "fmtools::getControlTypeByObject" );
// ask for the persistent service name
Reference< ::com::sun::star::io::XPersistObject> xPersistence(_rxObject, UNO_QUERY);
DBG_ASSERT(xPersistence.is(), "::getControlTypeByObject : argument shold be an ::com::sun::star::io::XPersistObject !");
@@ -439,7 +435,6 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi
//------------------------------------------------------------------------------
sal_Bool isRowSetAlive(const Reference< XInterface >& _rxRowSet)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "fmtools::isRowSetAlive" );
sal_Bool bIsAlive = sal_False;
Reference< ::com::sun::star::sdbcx::XColumnsSupplier> xSupplyCols(_rxRowSet, UNO_QUERY);
Reference< ::com::sun::star::container::XIndexAccess> xCols;
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index db3f1f2..6a50966 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -41,7 +41,6 @@
#include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp>
#include "svx/fmtools.hxx"
-#include <rtl/logfile.hxx>
#include <svl/macitem.hxx>
#include <tools/shl.hxx>
#include <tools/diagnose_ex.h>
@@ -178,7 +177,6 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
,bReadOnly( sal_False )
,m_bDisposed( false )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::FmXUndoEnvironment" );
DBG_CTOR(FmXUndoEnvironment,NULL);
try
{
@@ -203,7 +201,6 @@ FmXUndoEnvironment::~FmXUndoEnvironment()
//------------------------------------------------------------------------------
void FmXUndoEnvironment::dispose()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::dispose" );
OSL_ENSURE( !m_bDisposed, "FmXUndoEnvironment::dispose: disposed twice?" );
if ( !m_bDisposed )
return;
@@ -252,7 +249,6 @@ void FmXUndoEnvironment::dispose()
//------------------------------------------------------------------------------
void FmXUndoEnvironment::ModeChanged()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::ModeChanged" );
OSL_PRECOND( rModel.GetObjectShell(), "FmXUndoEnvironment::ModeChanged: no object shell anymore!" );
if ( !rModel.GetObjectShell() )
return;
@@ -296,7 +292,6 @@ void FmXUndoEnvironment::ModeChanged()
//------------------------------------------------------------------------------
void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::Notify" );
if (rHint.ISA(SdrHint))
{
SdrHint* pSdrHint = (SdrHint*)&rHint;
@@ -346,7 +341,6 @@ void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
//------------------------------------------------------------------
void FmXUndoEnvironment::Inserted(SdrObject* pObj)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::Inserted" );
if (pObj->GetObjInventor() == FmFormInventor)
{
FmFormObj* pFormObj = PTR_CAST(FmFormObj, pObj);
@@ -399,7 +393,6 @@ namespace
//------------------------------------------------------------------------------
void FmXUndoEnvironment::Inserted(FmFormObj* pObj)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::Inserted" );
DBG_ASSERT( pObj, "FmXUndoEnvironment::Inserted: invalid object!" );
if ( !pObj )
return;
@@ -457,7 +450,6 @@ void FmXUndoEnvironment::Inserted(FmFormObj* pObj)
//------------------------------------------------------------------
void FmXUndoEnvironment::Removed(SdrObject* pObj)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::Removed" );
if ( pObj->IsVirtualObj() )
// for virtual objects, we've already been notified of the removal of the master
// object, which is sufficient here
@@ -479,7 +471,6 @@ void FmXUndoEnvironment::Removed(SdrObject* pObj)
//------------------------------------------------------------------------------
void FmXUndoEnvironment::Removed(FmFormObj* pObj)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::Removed" );
DBG_ASSERT( pObj, "FmXUndoEnvironment::Removed: invalid object!" );
if ( !pObj )
return;
@@ -526,7 +517,6 @@ void FmXUndoEnvironment::Removed(FmFormObj* pObj)
//------------------------------------------------------------------------------
void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::disposing" );
// check if it's an object we have cached information about
if (m_pPropertySetCache)
{
@@ -545,7 +535,6 @@ void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( Runtime
//------------------------------------------------------------------------------
void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::propertyChange" );
::osl::ClearableMutexGuard aGuard( m_aMutex );
if (!IsLocked())
@@ -741,7 +730,6 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
//------------------------------------------------------------------------------
void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::elementInserted" );
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
@@ -757,7 +745,6 @@ void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) thr
//------------------------------------------------------------------------------
void FmXUndoEnvironment::implSetModified()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::implSetModified" );
if ( !IsLocked() && rModel.GetObjectShell() )
{
rModel.GetObjectShell()->SetModified( sal_True );
@@ -767,7 +754,6 @@ void FmXUndoEnvironment::implSetModified()
//------------------------------------------------------------------------------
void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::elementReplaced" );
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
@@ -785,7 +771,6 @@ void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thr
//------------------------------------------------------------------------------
void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::elementRemoved" );
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
@@ -799,14 +784,12 @@ void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) thro
//------------------------------------------------------------------------------
void SAL_CALL FmXUndoEnvironment::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::modified" );
implSetModified();
}
//------------------------------------------------------------------------------
void FmXUndoEnvironment::AddForms(const Reference< XNameContainer > & rForms)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::AddForms" );
Lock();
AddElement(rForms);
UnLock();
@@ -815,7 +798,6 @@ void FmXUndoEnvironment::AddForms(const Reference< XNameContainer > & rForms)
//------------------------------------------------------------------------------
void FmXUndoEnvironment::RemoveForms(const Reference< XNameContainer > & rForms)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::RemoveForms" );
Lock();
RemoveElement(rForms);
UnLock();
@@ -824,7 +806,6 @@ void FmXUndoEnvironment::RemoveForms(const Reference< XNameContainer > & rForms)
//------------------------------------------------------------------------------
void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & Element)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::TogglePropertyListening" );
// am Container horchen
Reference< XIndexContainer > xContainer(Element, UNO_QUERY);
if (xContainer.is())
@@ -852,7 +833,6 @@ void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > &
//------------------------------------------------------------------------------
void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _rxContainer, bool _bStartListening ) SAL_THROW(())
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::switchListening" );
OSL_PRECOND( _rxContainer.is(), "FmXUndoEnvironment::switchListening: invalid container!" );
if ( !_rxContainer.is() )
return;
@@ -910,7 +890,6 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r
//------------------------------------------------------------------------------
void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(())
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::switchListening" );
OSL_PRECOND( _rxObject.is(), "FmXUndoEnvironment::switchListening: how should I listen at a NULL object?" );
try
@@ -945,7 +924,6 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje
//------------------------------------------------------------------------------
void FmXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::AddElement" );
OSL_ENSURE( !m_bDisposed, "FmXUndoEnvironment::AddElement: not when I'm already disposed!" );
// am Container horchen
@@ -959,7 +937,6 @@ void FmXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement )
//------------------------------------------------------------------------------
void FmXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXUndoEnvironment::RemoveElement" );
if ( m_bDisposed )
return;
@@ -994,7 +971,6 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC
,aNewValue(evt.NewValue)
,aOldValue(evt.OldValue)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoPropertyAction::FmUndoPropertyAction" );
if (rNewMod.GetObjectShell())
rNewMod.GetObjectShell()->SetModified(sal_True);
if(static_STR_UNDO_PROPERTY.Len() == 0)
@@ -1005,7 +981,6 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC
//------------------------------------------------------------------------------
void FmUndoPropertyAction::Undo()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoPropertyAction::Undo" );
FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv();
if (xObj.is() && !rEnv.IsLocked())
@@ -1026,7 +1001,6 @@ void FmUndoPropertyAction::Undo()
//------------------------------------------------------------------------------
void FmUndoPropertyAction::Redo()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoPropertyAction::Redo" );
FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv();
if (xObj.is() && !rEnv.IsLocked())
@@ -1047,7 +1021,6 @@ void FmUndoPropertyAction::Redo()
//------------------------------------------------------------------------------
OUString FmUndoPropertyAction::GetComment() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoPropertyAction::GetComment" );
String aStr(static_STR_UNDO_PROPERTY);
aStr.SearchAndReplace( OUString('#'), aPropertyName );
@@ -1067,7 +1040,6 @@ FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod,
,m_nIndex( nIdx )
,m_eAction( _eAction )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoContainerAction::FmUndoContainerAction" );
OSL_ENSURE( nIdx >= 0, "FmUndoContainerAction::FmUndoContainerAction: invalid index!" );
// some old code suggested this could be a valid argument. However, this code was
// buggy, and it *seemed* that nobody used it - so it was removed.
@@ -1120,7 +1092,6 @@ void FmUndoContainerAction::DisposeElement( const Reference< XInterface > & xEle
//------------------------------------------------------------------------------
void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoContainerAction::implReInsert" );
if ( m_xContainer->getCount() >= m_nIndex )
{
// insert the element
@@ -1150,7 +1121,6 @@ void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
//------------------------------------------------------------------------------
void FmUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoContainerAction::implReRemove" );
Reference< XInterface > xElement;
if ( ( m_nIndex >= 0 ) && ( m_nIndex < m_xContainer->getCount() ) )
m_xContainer->getByIndex( m_nIndex ) >>= xElement;
@@ -1179,7 +1149,6 @@ void FmUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) )
//------------------------------------------------------------------------------
void FmUndoContainerAction::Undo()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoContainerAction::Undo" );
FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( rMod ).GetUndoEnv();
if ( m_xContainer.is() && !rEnv.IsLocked() && m_xElement.is() )
@@ -1209,7 +1178,6 @@ void FmUndoContainerAction::Undo()
//------------------------------------------------------------------------------
void FmUndoContainerAction::Redo()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoContainerAction::Redo" );
FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( rMod ).GetUndoEnv();
if ( m_xContainer.is() && !rEnv.IsLocked() && m_xElement.is() )
{
@@ -1241,7 +1209,6 @@ FmUndoModelReplaceAction::FmUndoModelReplaceAction(FmFormModel& _rMod, SdrUnoObj
,m_xReplaced(_xReplaced)
,m_pObject(_pObject)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoModelReplaceAction::FmUndoModelReplaceAction" );
}
//------------------------------------------------------------------------------
@@ -1267,7 +1234,6 @@ void FmUndoModelReplaceAction::DisposeElement( const ::com::sun::star::uno::Refe
//------------------------------------------------------------------------------
void FmUndoModelReplaceAction::Undo()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoModelReplaceAction::Undo" );
try
{
Reference< XControlModel > xCurrentModel( m_pObject->GetUnoControlModel() );
@@ -1307,7 +1273,6 @@ void FmUndoModelReplaceAction::Undo()
//------------------------------------------------------------------------------
OUString FmUndoModelReplaceAction::GetComment() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmUndoModelReplaceAction::GetComment" );
return SVX_RESSTR(RID_STR_UNDO_MODEL_REPLACE);
}
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 7e6e52e..27b08a7 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -84,7 +84,6 @@
#include <vcl/msgbox.hxx>
#include <vcl/stdtext.hxx>
#include <osl/mutex.hxx>
-#include <rtl/logfile.hxx>
#include <algorithm>
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index d2280fa..3a7bcee 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -85,7 +85,6 @@
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
-#include <rtl/logfile.hxx>
#include <algorithm>
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 2d445a7..7eb6fb2 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -52,7 +52,6 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include "svtools/treelistentry.hxx"
-#include <rtl/logfile.hxx>
//............................................................................
namespace svxform
{
@@ -141,7 +140,6 @@ namespace svxform
,m_bInitialUpdate(sal_True)
,m_bKeyboardCut( sal_False )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::NavigatorTree" );
SetHelpId( HID_FORM_NAVIGATOR );
m_aNavigatorImages = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
@@ -185,14 +183,12 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::Clear()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::Clear" );
m_pNavModel->Clear();
}
//------------------------------------------------------------------------
void NavigatorTree::UpdateContent( FmFormShell* pFormShell )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::UpdateContent" );
if (m_bInitialUpdate)
{
GrabFocus();
@@ -228,7 +224,6 @@ namespace svxform
//------------------------------------------------------------------------------
sal_Bool NavigatorTree::implAllowExchange( sal_Int8 _nAction, sal_Bool* _pHasNonHidden )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::implAllowExchange" );
SvTreeListEntry* pCurEntry = GetCurEntry();
if (!pCurEntry)
return sal_False;
@@ -265,8 +260,6 @@ namespace svxform
//------------------------------------------------------------------------------
sal_Bool NavigatorTree::implPrepareExchange( sal_Int8 _nAction )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::implPrepareExchange" );
-
EndSelection();
sal_Bool bHasNonHidden = sal_False;
@@ -303,7 +296,6 @@ namespace svxform
//------------------------------------------------------------------------------
void NavigatorTree::StartDrag( sal_Int8 /*nAction*/, const ::Point& /*rPosPixel*/ )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::StartDrag" );
EndSelection();
if ( !implPrepareExchange( DND_ACTION_COPYMOVE ) )
@@ -317,7 +309,6 @@ namespace svxform
//------------------------------------------------------------------------------
void NavigatorTree::Command( const CommandEvent& rEvt )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::Command" );
sal_Bool bHandled = sal_False;
switch( rEvt.GetCommand() )
{
@@ -546,7 +537,6 @@ namespace svxform
//------------------------------------------------------------------------
SvTreeListEntry* NavigatorTree::FindEntry( FmEntryData* pEntryData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::FindEntry" );
if( !pEntryData ) return NULL;
SvTreeListEntry* pCurEntry = First();
FmEntryData* pCurEntryData;
@@ -565,7 +555,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::Notify" );
if( rHint.ISA(FmNavRemovedHint) )
{
FmNavRemovedHint* pRemovedHint = (FmNavRemovedHint*)&rHint;
@@ -626,7 +615,6 @@ namespace svxform
//------------------------------------------------------------------------
SvTreeListEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::Insert" );
//////////////////////////////////////////////////////////////////////
// Aktuellen Eintrag einfuegen
SvTreeListEntry* pParentEntry = FindEntry( pEntryData->GetParent() );
@@ -664,7 +652,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::Remove( FmEntryData* pEntryData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::Remove" );
if( !pEntryData )
return;
@@ -701,7 +688,6 @@ namespace svxform
//------------------------------------------------------------------------
sal_Bool NavigatorTree::IsFormEntry( SvTreeListEntry* pEntry )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::IsFormEntry" );
FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData();
return !pEntryData || pEntryData->ISA(FmFormData);
}
@@ -709,7 +695,6 @@ namespace svxform
//------------------------------------------------------------------------
sal_Bool NavigatorTree::IsFormComponentEntry( SvTreeListEntry* pEntry )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::IsFormComponentEntry" );
FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData();
return pEntryData && pEntryData->ISA(FmControlData);
}
@@ -717,7 +702,6 @@ namespace svxform
//------------------------------------------------------------------------
sal_Bool NavigatorTree::implAcceptPaste( )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::implAcceptPaste" );
SvTreeListEntry* pFirstSelected = FirstSelected();
if ( !pFirstSelected || NextSelected( pFirstSelected ) )
// no selected entry, or at least two selected entries
@@ -733,14 +717,12 @@ namespace svxform
//------------------------------------------------------------------------
sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const ::Point& _rDropPos, sal_Bool _bDnD )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::implAcceptDataTransfer" );
return implAcceptDataTransfer( _rFlavors, _nAction, GetEntry( _rDropPos ), _bDnD );
}
//------------------------------------------------------------------------
sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::implAcceptDataTransfer" );
// no target -> no drop
if (!_pTargetEntry)
return DND_ACTION_NONE;
@@ -879,7 +861,6 @@ namespace svxform
//------------------------------------------------------------------------
sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& rEvt )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::AcceptDrop" );
::Point aDropPos = rEvt.maPosPixel;
// kuemmern wir uns erst mal um moeglich DropActions (Scrollen und Aufklappen)
@@ -935,14 +916,12 @@ namespace svxform
//------------------------------------------------------------------------
sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const ::Point& _rDropPos, sal_Bool _bDnD )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::implExecuteDataTransfer" );
return implExecuteDataTransfer( _rData, _nAction, GetEntry( _rDropPos ), _bDnD );
}
//------------------------------------------------------------------------
sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::implExecuteDataTransfer" );
const DataFlavorExVector& rDataFlavors = _rData.GetDataFlavorExVector();
if ( DND_ACTION_NONE == implAcceptDataTransfer( rDataFlavors, _nAction, _pTargetEntry, _bDnD ) )
@@ -1205,7 +1184,6 @@ namespace svxform
//------------------------------------------------------------------------
sal_Int8 NavigatorTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::ExecuteDrop" );
sal_Int8 nResult( DND_ACTION_NONE );
if ( m_aControlExchange.isDragSource() )
@@ -1222,7 +1200,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::doPaste()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::doPaste" );
try
{
if ( m_aControlExchange.isClipboardOwner() )
@@ -1250,7 +1227,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::doCopy()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::doCopy" );
if ( implPrepareExchange( DND_ACTION_COPY ) )
{
m_aControlExchange.setClipboardListener( LINK( this, NavigatorTree, OnClipboardAction ) );
@@ -1261,7 +1237,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::ModelHasRemoved( SvTreeListEntry* _pEntry )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::ModelHasRemoved" );
SvTreeListEntry* pTypedEntry = static_cast< SvTreeListEntry* >( _pEntry );
if ( doingKeyboardCut() )
m_aCutEntries.erase( pTypedEntry );
@@ -1280,7 +1255,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::doCut()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::doCut" );
if ( implPrepareExchange( DND_ACTION_MOVE ) )
{
m_aControlExchange.setClipboardListener( LINK( this, NavigatorTree, OnClipboardAction ) );
@@ -1305,7 +1279,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::KeyInput(const ::KeyEvent& rKEvt)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::KeyInput" );
const KeyCode& rCode = rKEvt.GetKeyCode();
// delete?
@@ -1341,7 +1314,6 @@ namespace svxform
//------------------------------------------------------------------------
sal_Bool NavigatorTree::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::EditingEntry" );
if (!SvTreeListBox::EditingEntry( pEntry, rSelection ))
return sal_False;
@@ -1352,7 +1324,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::NewForm( SvTreeListEntry* pParentEntry )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::NewForm" );
//////////////////////////////////////////////////////////////////////
// ParentFormData holen
if( !IsFormEntry(pParentEntry) )
@@ -1415,7 +1386,6 @@ namespace svxform
//------------------------------------------------------------------------
FmControlData* NavigatorTree::NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::NewControl" );
//////////////////////////////////////////////////////////////////////
// ParentForm holen
if (!GetNavModel()->GetFormShell())
@@ -1465,7 +1435,6 @@ namespace svxform
//------------------------------------------------------------------------
OUString NavigatorTree::GenerateName( FmEntryData* pEntryData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::GenerateName" );
const sal_uInt16 nMaxCount = 99;
OUString aNewName;
@@ -1500,7 +1469,6 @@ namespace svxform
//------------------------------------------------------------------------
sal_Bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::EditedEntry" );
if (EditingCanceled())
return sal_True;
@@ -1620,7 +1588,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::ShowSelectionProperties(sal_Bool bForce)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::ShowSelectionProperties" );
// zuerst brauche ich die FormShell
FmFormShell* pFormShell = GetNavModel()->GetFormShell();
if (!pFormShell)
@@ -1709,7 +1676,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::DeleteSelection()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::DeleteSelection" );
// die Root darf ich natuerlich nicht mitloeschen
sal_Bool bRootSelected = IsSelected(m_pRootEntry);
sal_uIntPtr nSelectedEntries = GetSelectionCount();
@@ -1851,7 +1817,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::CollectSelectionData(SELDATA_ITEMS sdiHow)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::CollectSelectionData" );
DBG_ASSERT(sdiHow != SDI_DIRTY, "NavigatorTree::CollectSelectionData : ever thought about your parameter ? DIRTY ?");
if (sdiHow == m_sdiState)
return;
@@ -1926,7 +1891,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::SynchronizeSelection(FmEntryDataArray& arredToSelect)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::SynchronizeSelection" );
LockSelectionHandling();
if (arredToSelect.empty())
{
@@ -1990,7 +1954,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::SynchronizeSelection()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::SynchronizeSelection" );
// Shell und View
FmFormShell* pFormShell = GetNavModel()->GetFormShell();
if(!pFormShell) return;
@@ -2004,7 +1967,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::SynchronizeMarkList()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::SynchronizeMarkList" );
// die Shell werde ich brauchen ...
FmFormShell* pFormShell = GetNavModel()->GetFormShell();
if (!pFormShell) return;
@@ -2074,7 +2036,6 @@ namespace svxform
//------------------------------------------------------------------------
sal_Bool NavigatorTree::IsHiddenControl(FmEntryData* pEntryData)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::IsHiddenControl" );
if (pEntryData == NULL) return sal_False;
Reference< XPropertySet > xProperties( pEntryData->GetPropertySet() );
@@ -2089,7 +2050,6 @@ namespace svxform
//------------------------------------------------------------------------
sal_Bool NavigatorTree::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::Select" );
if (bSelect == IsSelected(pEntry)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;)
return sal_True;
@@ -2099,7 +2059,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::UnmarkAllViewObj()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::UnmarkAllViewObj" );
FmFormShell* pFormShell = GetNavModel()->GetFormShell();
if( !pFormShell )
return;
@@ -2109,7 +2068,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::MarkViewObj(FmFormData* pFormData, sal_Bool bMark, sal_Bool bDeep )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::MarkViewObjects" );
FmFormShell* pFormShell = GetNavModel()->GetFormShell();
if( !pFormShell )
return;
@@ -2158,7 +2116,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::CollectObjects(FmFormData* pFormData, sal_Bool bDeep, ::std::set< Reference< XFormComponent > >& _rObjects)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::MarkViewObjects" );
FmEntryDataList* pChildList = pFormData->GetChildList();
FmEntryData* pEntryData;
FmControlData* pControlData;
@@ -2177,7 +2134,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTree::MarkViewObj( FmControlData* pControlData, sal_Bool bMarkHandles, sal_Bool bMark)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTree::MarkViewObj" );
if( !pControlData )
return;
FmFormShell* pFormShell = GetNavModel()->GetFormShell();
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index c2de01b..867b9c6 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -37,7 +37,6 @@
#include "fmobj.hxx"
#include <sfx2/objsh.hxx>
#include <tools/diagnose_ex.h>
-#include <rtl/logfile.hxx>
#include <com/sun/star/container/XContainer.hpp>
//............................................................................
@@ -63,21 +62,18 @@ namespace svxform
,m_nLocks(0)
,m_bCanUndo(sal_True)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "OFormComponentObserver::OFormComponentObserver" );
}
// XPropertyChangeListener
//------------------------------------------------------------------------
void SAL_CALL OFormComponentObserver::disposing(const EventObject& Source) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "OFormComponentObserver::disposing" );
Remove( Source.Source );
}
//------------------------------------------------------------------------
void SAL_CALL OFormComponentObserver::propertyChange(const PropertyChangeEvent& evt) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "OFormComponentObserver::propertyChange" );
if( !m_pNavModel ) return;
if( evt.PropertyName != FM_PROP_NAME ) return;
@@ -103,7 +99,6 @@ namespace svxform
//------------------------------------------------------------------------------
void SAL_CALL OFormComponentObserver::elementInserted(const ContainerEvent& evt) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "OFormComponentObserver::elementInserted" );
if (IsLocked() || !m_pNavModel)
return;
@@ -120,7 +115,6 @@ namespace svxform
//------------------------------------------------------------------------------
void OFormComponentObserver::Insert(const Reference< XInterface > & xIface, sal_Int32 nIndex)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "OFormComponentObserver::Insert" );
Reference< XForm > xForm(xIface, UNO_QUERY);
if (xForm.is())
{
@@ -144,7 +138,6 @@ namespace svxform
//------------------------------------------------------------------------------
void SAL_CALL OFormComponentObserver::elementReplaced(const ContainerEvent& evt) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "OFormComponentObserver::elementReplaced" );
if (IsLocked() || !m_pNavModel)
return;
@@ -176,7 +169,6 @@ namespace svxform
//------------------------------------------------------------------------------
void OFormComponentObserver::Remove( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "OFormComponentObserver::Remove" );
if (IsLocked() || !m_pNavModel)
return;
@@ -194,7 +186,6 @@ namespace svxform
//------------------------------------------------------------------------------
void SAL_CALL OFormComponentObserver::elementRemoved(const ContainerEvent& evt) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "OFormComponentObserver::elementRemoved" );
Reference< XInterface > xElement;
evt.Element >>= xElement;
Remove( xElement );
@@ -211,7 +202,6 @@ namespace svxform
,m_pFormModel(NULL)
,m_aNormalImages( _rNormalImages )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::NavigatorTreeModel" );
m_pPropChangeList = new OFormComponentObserver(this);
m_pPropChangeList->acquire();
m_pRootList = new FmEntryDataList();
@@ -242,7 +232,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::SetModified( sal_Bool bMod )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::SetModified" );
if( !m_pFormShell ) return;
SfxObjectShell* pObjShell = m_pFormShell->GetFormModel()->GetObjectShell();
if( !pObjShell ) return;
@@ -252,7 +241,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::Clear()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::Clear" );
Reference< css::form::XForms > xForms( GetForms());
if(xForms.is())
xForms->removeContainerListener((XContainerListener*)m_pPropChangeList);
@@ -270,7 +258,6 @@ namespace svxform
//------------------------------------------------------------------------
Reference< css::form::XForms > NavigatorTreeModel::GetForms() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::GetForms" );
if( !m_pFormShell || !m_pFormShell->GetCurPage())
return NULL;
else
@@ -280,7 +267,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos, sal_Bool bAlterModel)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::Insert" );
if (IsListening(*m_pFormModel))
EndListening(*m_pFormModel);
@@ -380,7 +366,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::Remove(FmEntryData* pEntry, sal_Bool bAlterModel)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::Remove" );
//////////////////////////////////////////////////////////////////////
// Form und Parent holen
if (!pEntry || !m_pFormModel)
@@ -471,7 +456,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::RemoveForm(FmFormData* pFormData)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::RemoveForm" );
//////////////////////////////////////////////////////////////////////
// Form und Parent holen
if (!pFormData || !m_pFormModel)
@@ -504,7 +488,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::RemoveFormComponent(FmControlData* pControlData)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::RemoveFormComponent" );
//////////////////////////////////////////////////////////////////////
// Control und Parent holen
if (!pControlData)
@@ -520,7 +503,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::ClearBranch( FmFormData* pParentData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::ClearBranch" );
//////////////////////////////////////////////////////////////////////
// Alle Eintraege dieses Zweiges loeschen
FmEntryDataList* pChildList = pParentData->GetChildList();
@@ -538,7 +520,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::FillBranch( FmFormData* pFormData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::FillBranch" );
//////////////////////////////////////////////////////////////
// Forms aus der Root einfuegen
if( pFormData == NULL )
@@ -603,7 +584,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::InsertForm(const Reference< XForm > & xForm, sal_uInt32 nRelPos)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::InsertForm" );
FmFormData* pFormData = (FmFormData*)FindData( xForm, GetRootList() );
if (pFormData)
return;
@@ -623,7 +603,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::InsertFormComponent(const Reference< XFormComponent > & xComp, sal_uInt32 nRelPos)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::InsertFormComponent" );
//////////////////////////////////////////////////////////
// ParentData setzen
Reference< XInterface > xIFace( xComp->getParent());
@@ -656,7 +635,6 @@ namespace svxform
const Reference< XFormComponent > & xNew
)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::ReplaceFormComponent" );
FmEntryData* pData = FindData(xOld, GetRootList(), sal_True);
DBG_ASSERT(pData && pData->ISA(FmControlData), "NavigatorTreeModel::ReplaceFormComponent : invalid argument !");
((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages );
@@ -668,7 +646,6 @@ namespace svxform
//------------------------------------------------------------------------
FmEntryData* NavigatorTreeModel::FindData(const Reference< XInterface > & xElement, FmEntryDataList* pDataList, sal_Bool bRecurs)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::FindData" );
// normalize
Reference< XInterface > xIFace( xElement, UNO_QUERY );
@@ -690,7 +667,6 @@ namespace svxform
//------------------------------------------------------------------------
FmEntryData* NavigatorTreeModel::FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::FindData" );
FmEntryDataList* pDataList;
if( !pParentData )
pDataList = GetRootList();
@@ -723,7 +699,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::Notify" );
if( rHint.ISA(SdrHint) )
{
SdrHint* pSdrHint = (SdrHint*)&rHint;
@@ -754,7 +729,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::InsertSdrObj( const SdrObject* pObj )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::InsertSdrObj" );
const FmFormObj* pFormObject = FmFormObj::GetFormObject( pObj );
if ( pFormObject )
{
@@ -782,7 +756,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::RemoveSdrObj( const SdrObject* pObj )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::RemoveSdrObj" );
const FmFormObj* pFormObject = FmFormObj::GetFormObject( pObj );
if ( pFormObject )
{
@@ -808,7 +781,6 @@ namespace svxform
sal_Bool NavigatorTreeModel::InsertFormComponent(FmNavRequestSelectHint& rHint, SdrObject* pObject)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::InsertFormComponent" );
if ( pObject->ISA(SdrObjGroup) )
{ // rekursiv absteigen
const SdrObjList *pChildren = ((SdrObjGroup*)pObject)->GetSubList();
@@ -847,7 +819,6 @@ namespace svxform
void NavigatorTreeModel::BroadcastMarkedObjects(const SdrMarkList& mlMarked)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::BroadcastMarkedObjects" );
// gehen wir durch alle markierten Objekte und suchen wir die raus, mit denen ich was anfangen kann
FmNavRequestSelectHint rshRequestSelection;
sal_Bool bIsMixedSelection = sal_False;
@@ -870,7 +841,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::UpdateContent( const Reference< css::form::XForms > & xForms )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::UpdateContent" );
//////////////////////////////////////////////////////////////////////
// Model von der Root aufwaerts neu fuellen
Clear();
@@ -893,7 +863,6 @@ namespace svxform
//------------------------------------------------------------------------
void NavigatorTreeModel::UpdateContent( FmFormShell* pShell )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::UpdateContent" );
//////////////////////////////////////////////////////////////////////
// Wenn Shell sich nicht veraendert hat, nichts machen
FmFormPage* pNewPage = pShell ? pShell->GetCurPage() : NULL;
@@ -935,7 +904,6 @@ namespace svxform
//------------------------------------------------------------------------
Reference< XIndexContainer > NavigatorTreeModel::GetFormComponents( FmFormData* pFormData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::GetFormComponents" );
//////////////////////////////////////////////////////////////////////
// Von der Form Components holen
if (pFormData)
@@ -947,7 +915,6 @@ namespace svxform
//------------------------------------------------------------------------
sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const OUString& rNewText )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::Rename" );
//////////////////////////////////////////////////////////////////////
// Wenn Name schon vorhanden, Fehlermeldung
pEntryData->SetText( rNewText );
@@ -983,7 +950,6 @@ namespace svxform
//------------------------------------------------------------------
SdrObject* NavigatorTreeModel::Search(SdrObjListIter& rIter, const Reference< XFormComponent > & xComp)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "NavigatorTreeModel::Search" );
while (rIter.IsMore())
{
SdrObject* pObj = rIter.Next();
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index e29c94a..91106da 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -23,7 +23,6 @@
#include <math.h>
#include <osl/endian.h>
-#include <rtl/logfile.hxx>
#include <rtl/strbuf.hxx>
#include <com/sun/star/lang/XComponent.hpp>
@@ -221,7 +220,7 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal
maPages()
{
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "svx", "aw93748", "SdrModel::SdrModel(...)" );
+ SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
#endif
DBG_CTOR(SdrModel,NULL);
@@ -235,7 +234,7 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed
aTablePath(rPath)
{
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "svx", "aw93748", "SdrModel::SdrModel(...)" );
+ SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
#endif
DBG_CTOR(SdrModel,NULL);
@@ -248,7 +247,7 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, boo
maPages()
{
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "svx", "aw93748", "SdrModel::SdrModel(...)" );
+ SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
#endif
DBG_CTOR(SdrModel,NULL);
@@ -262,7 +261,7 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed
aTablePath(rPath)
{
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "svx", "aw93748", "SdrModel::SdrModel(...)" );
+ SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
#endif
DBG_CTOR(SdrModel,NULL);
@@ -277,7 +276,7 @@ SdrModel::SdrModel(const SdrModel& /*rSrcModel*/):
maPages()
{
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "svx", "aw93748", "SdrModel::SdrModel(...)" );
+ SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
#endif
// not yet implemented
@@ -287,7 +286,7 @@ SdrModel::SdrModel(const SdrModel& /*rSrcModel*/):
SdrModel::~SdrModel()
{
#ifdef TIMELOG
- RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "svx", "aw93748", "SdrModel::~SdrModel(...)" );
+ SAL_INFO( "svx.svdraw", "SdrModel::~SdrModel(...)" );
#endif
DBG_DTOR(SdrModel,NULL);
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 69ac409..6516929 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionContinuation.hpp>
-#include <rtl/logfile.hxx>
#include <comphelper/interaction.hxx>
#include <framework/interaction.hxx>
#include <com/sun/star/drawing/GraphicFilterRequest.hpp>
@@ -594,8 +593,6 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto
bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, sal_Bool bVectorType )
{
- RTL_LOGFILE_CONTEXT( aLog, "UnoGraphicExporter::GetGraphic (thb)" );
-
if( !mpDoc || !mpUnoPage )
return false;
@@ -983,8 +980,6 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDescriptor )
throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT( aLog, "UnoGraphicExporter::export (thb)" );
-
::SolarMutexGuard aGuard;
if( NULL == mpUnoPage )
More information about the Libreoffice-commits
mailing list