CWS-TOOLING: integrate CWS dbaperf1

2009-04-02 09:12:25 +0200 oj r270372 : CWS-TOOLING: rebase CWS dbaperf1 to trunk@270033 (milestone: DEV300:m45) 2009-03-17 10:20:34 +0100 oj r269577 : add parameter 2009-03-17 10:20:05 +0100 oj r269576 : add parameter 2009-03-12 12:32:24 +0100 oj r269387 : add missing ++ 2009-03-11 12:53:35 +0100 oj r269315 : compile error 2009-03-06 08:52:11 +0100 oj r268968 : #i99264# remove duplicate code 2009-03-06 08:20:08 +0100 oj r268966 : add missingheader 2009-03-06 08:17:41 +0100 oj r268965 : add header 2009-03-06 08:15:07 +0100 oj r268964 : #i99708# remove duplicate code 2009-03-06 07:24:11 +0100 oj r268963 : #i99708# remove duplicate code 2009-03-06 07:22:24 +0100 oj r268962 : #i99708# use tenary operator 2009-03-06 07:19:21 +0100 oj r268961 : remove unused rtl_logs 2009-03-06 07:15:55 +0100 oj r268960 : #i99708# extract getLength from for loop 2009-03-06 07:15:35 +0100 oj r268959 : #i99708# extract getLength from for loop 2009-03-06 07:14:57 +0100 oj r268958 : remove unused rtl_logs 2009-03-06 07:13:01 +0100 oj r268957 : insert DBG_ helper 2009-03-06 07:12:17 +0100 oj r268956 : remove unused rtl_logs 2009-03-06 07:10:26 +0100 oj r268955 : remove unused rtl_logs 2009-03-06 07:04:51 +0100 oj r268954 : #i99708# use tenary operator 2009-03-05 12:04:46 +0100 oj r268895 : comment RTL_LOG out 2009-03-05 09:05:07 +0100 oj r268874 : add rtl logfile 2009-03-04 14:21:18 +0100 oj r268828 : #i99708# make static inplace and some method calls in for loop removed 2009-03-04 14:20:34 +0100 oj r268827 : #i99708# impl double check pattern for getInfohelper 2009-03-02 09:31:42 +0100 oj r268636 : add rtl logfile 2009-03-02 08:18:37 +0100 oj r268633 : add rtl logfile 2009-02-27 11:22:16 +0100 oj r268570 : #i99709# change algorithm for marking objects 2009-02-27 11:17:04 +0100 oj r268568 : #i99708# some improvements to load forms, controls faster and replacement of size() call with !empty() which is much faster 2009-02-24 10:09:35 +0100 sb r268383 : #i99290# no longer care to set a sensible context class loader for native threads attached to the VM 2009-02-23 13:44:04 +0100 oj r268354 : #i76606# seekrow changes 2009-02-23 12:27:30 +0100 oj r268349 : deleted 2009-02-20 15:14:23 +0100 oj r268325 : #i76606# some code changes 2009-02-19 14:15:25 +0100 oj r268284 : #i76606# use of simple prep stmt instead of full blown rowset, when source and dest connection are the same use insert into ... ( select ... ) 2009-02-19 11:27:55 +0100 oj r268265 : #i76606# insert some RTL_LOG and setObject impl 2009-02-18 14:45:37 +0100 oj r268222 : #i99363# insert RTL_LOG 2009-02-18 14:45:18 +0100 oj r268221 : #i99363# insert RTL_LOG 2009-02-18 11:14:54 +0100 oj r268207 : #i99363# call some impl_ methods to avoid duplicate cechCache calls 2009-02-18 11:10:47 +0100 oj r268206 : #i99363# make isCount inline 2009-02-18 10:33:22 +0100 oj r268203 : #i99363# use bookmarkable if available and inserted some RTL_LOG 2009-02-18 10:32:57 +0100 oj r268202 : #i99363# use bookmarkable if available and inserted some RTL_LOG 2009-02-17 07:29:05 +0100 oj r267843 : #i96897# remove some dll public 2009-02-16 15:01:04 +0100 oj r267816 : #i96897# remove some dll public 2009-02-16 14:25:53 +0100 oj r267810 : #i99264# remove duplicate code 2009-02-16 14:25:33 +0100 oj r267809 : #i99264# remove duplicate code 2009-02-16 14:24:59 +0100 oj r267808 : #i99264# remove duplicate code 2009-02-13 10:56:17 +0100 oj r267703 : #i99191# comment the contextclassloader 2009-02-13 10:32:40 +0100 oj r267700 : reduce call to resultset meta data 2009-02-13 10:27:31 +0100 oj r267699 : reduce call to resultset meta data 2009-02-13 10:27:08 +0100 oj r267698 : reduce call to resultset meta data
author: Ivo Hinkelmann <ihi@openoffice.org> 2009-04-23 10:42:05 +0000
committer: Ivo Hinkelmann <ihi@openoffice.org> 2009-04-23 10:42:05 +0000
commit: b9392a36645d8632b97ad79240f483b3a1683b61 (patch)
tree: a7596b538b33f0eb9a47d83a0a19972e72a54da4 /svx
parent: caae90c2a21d3ed30250ebb79dbcc06737f7356b (diff)
17 files changed, 635 insertions, 66 deletions
diff --git a/svx/inc/ParseContext.hxx b/svx/inc/ParseContext.hxx
index 16ed7168b704..135919ab7993 100644
--- a/svx/inc/ParseContext.hxx
+++ b/svx/inc/ParseContext.hxx
@@ -30,11 +30,11 @@
 #ifndef SVX_QUERYDESIGNCONTEXT_HXX
 #define SVX_QUERYDESIGNCONTEXT_HXX
 
-
+#include "svx/svxdllapi.h"
 #include <connectivity/IParseContext.hxx>
 #include <tools/string.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include "svx/svxdllapi.h"
+
 
 #include <vector>
 
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 36746fd633fd..01e65ff891a3 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -66,6 +66,7 @@
 #include <com/sun/star/xml/dom/DOMException.hpp>
 #include <com/sun/star/form/binding/XValueBinding.hpp>
 #include <comphelper/processfactory.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 26588db87a61..7ac8f8afbe29 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -73,6 +73,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/sequence.hxx>
 #include "gridcell.hxx"
+#include <rtl/logfile.hxx>
 
 #include <functional>
 
@@ -169,6 +170,7 @@ TYPEINIT1(FmFilterItems, FmParentData);
 //------------------------------------------------------------------------
 FmFilterItem* FmFilterItems::Find(const Reference< ::com::sun::star::awt::XTextComponent > & _xText) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterItems::Find" );
     for (::std::vector<FmFilterData*>::const_iterator i = m_aChilds.begin();
          i != m_aChilds.end(); ++i)
     {
@@ -183,6 +185,7 @@ FmFilterItem* FmFilterItems::Find(const Reference< ::com::sun::star::awt::XTextC
 //------------------------------------------------------------------------
 Image FmFilterItems::GetImage( BmpColorMode _eMode ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterItems::GetImage" );
     static Image aImage;
     static Image aImage_HC;
 
@@ -209,6 +212,7 @@ FmFilterItem::FmFilterItem(const Reference< ::com::sun::star::lang::XMultiServic
           ,m_aFieldName(aFieldName)
           ,m_xText(_xText)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterItems::FmFilterItem" );
 }
 
 //------------------------------------------------------------------------
@@ -343,6 +347,7 @@ public:
 FmFilterAdapter::FmFilterAdapter(FmFilterModel* pModel, const Reference< ::com::sun::star::container::XIndexAccess >& xControllers)
                  :m_pModel(pModel)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::FmFilterAdapter" );
     InsertElements(xControllers);
 
     // listen on all controls as text listener
@@ -354,6 +359,7 @@ FmFilterAdapter::FmFilterAdapter(FmFilterModel* pModel, const Reference< ::com::
 //------------------------------------------------------------------------
 void FmFilterAdapter::dispose() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::dispose" );
     // clear the filter control map
     for (FmFilterControls::const_iterator iter = m_aFilterControls.begin();
          iter != m_aFilterControls.end(); iter++)
@@ -367,6 +373,7 @@ void FmFilterAdapter::dispose() throw( RuntimeException )
 void FmFilterAdapter::DeleteItemsByText(::std::vector<FmFilterData*>& _rItems,
                                         const Reference< ::com::sun::star::awt::XTextComponent > & xText)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::DeleteItemsByText" );
     for (::std::vector<FmFilterData*>::reverse_iterator i = _rItems.rbegin();
         // link problems with operator ==
         i.base() != _rItems.rend().base(); i++)
@@ -394,6 +401,7 @@ void FmFilterAdapter::DeleteItemsByText(::std::vector<FmFilterData*>& _rItems,
 //------------------------------------------------------------------------
 void FmFilterAdapter::InsertElements(const Reference< ::com::sun::star::container::XIndexAccess >& xControllers)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::InsertElements" );
     for (sal_Int32 i = 0, nLen = xControllers->getCount(); i < nLen; ++i)
     {
         Reference< ::com::sun::star::container::XIndexAccess > xElement;
@@ -415,6 +423,7 @@ void FmFilterAdapter::InsertElements(const Reference< ::com::sun::star::containe
 //------------------------------------------------------------------------------
 void FmFilterAdapter::RemoveElement(const Reference< ::com::sun::star::awt::XTextComponent > & xText)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::RemoveElement" );
     if (xText.is())
     {
         // alle Level durchlaufen und eintraege entfernen
@@ -430,6 +439,7 @@ void FmFilterAdapter::RemoveElement(const Reference< ::com::sun::star::awt::XTex
 //------------------------------------------------------------------------
 Reference< ::com::sun::star::beans::XPropertySet >  FmFilterAdapter::getField(const Reference< ::com::sun::star::awt::XTextComponent > & xText) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::getField" );
     Reference< ::com::sun::star::beans::XPropertySet >  xField;
     FmFilterControls::const_iterator i = m_aFilterControls.find(xText);
     if (i != m_aFilterControls.end())
@@ -443,6 +453,7 @@ void FmFilterAdapter::setText(sal_Int32 nRowPos,
                               const FmFilterItem* pFilterItem,
                               const ::rtl::OUString& rText)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::setText" );
     // set the text for the text component
     Reference< ::com::sun::star::awt::XTextComponent > xText(pFilterItem->GetTextComponent());
     xText->setText(rText);
@@ -475,6 +486,7 @@ void FmFilterAdapter::setText(sal_Int32 nRowPos,
 //------------------------------------------------------------------------
 void SAL_CALL FmFilterAdapter::disposing(const ::com::sun::star::lang::EventObject& e) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::disposing" );
     Reference< ::com::sun::star::awt::XTextComponent >  xText(e.Source,UNO_QUERY);
     if (xText.is())
         RemoveElement(xText);
@@ -484,6 +496,7 @@ void SAL_CALL FmFilterAdapter::disposing(const ::com::sun::star::lang::EventObje
 //------------------------------------------------------------------------
 Reference< ::com::sun::star::form::XForm > FmFilterAdapter::findForm(const Reference< ::com::sun::star::container::XChild >& xChild)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::findForm" );
     Reference< ::com::sun::star::form::XForm > xForm;
     if (xChild.is())
     {
@@ -498,6 +511,7 @@ Reference< ::com::sun::star::form::XForm > FmFilterAdapter::findForm(const Refer
 //------------------------------------------------------------------------
 void FmFilterAdapter::textChanged(const ::com::sun::star::awt::TextEvent& e) throw( ::com::sun::star::uno::RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::textChanged" );
     // Find the according formitem in the
     Reference< ::com::sun::star::awt::XControl > xControl(e.Source, UNO_QUERY);
     if (!m_pModel || !xControl.is())
@@ -552,6 +566,7 @@ FmFilterModel::FmFilterModel(const Reference< ::com::sun::star::lang::XMultiServ
               ,m_pAdapter(NULL)
               ,m_pCurrentItems(NULL)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::FmFilterModel" );
 }
 
 //------------------------------------------------------------------------
@@ -563,6 +578,7 @@ FmFilterModel::~FmFilterModel()
 //------------------------------------------------------------------------
 void FmFilterModel::Clear()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Clear" );
     // notify
     FilterClearingHint aClearedHint;
     Broadcast( aClearedHint );
@@ -589,6 +605,7 @@ void FmFilterModel::Clear()
 //------------------------------------------------------------------------
 void FmFilterModel::Update(const Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const Reference< ::com::sun::star::form::XFormController > & xCurrent)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Update" );
     if ((::com::sun::star::form::XFormController*) xCurrent.get() == (::com::sun::star::form::XFormController*) m_xController.get())
         return;
 
@@ -622,6 +639,7 @@ void FmFilterModel::Update(const Reference< ::com::sun::star::container::XIndexA
 //------------------------------------------------------------------------
 void FmFilterModel::Update(const Reference< ::com::sun::star::container::XIndexAccess > & xControllers, FmParentData* pParent)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Update" );
     sal_Int32 nCount = xControllers->getCount();
     for (sal_Int32 i = 0; i < nCount; i++)
     {
@@ -671,6 +689,7 @@ void FmFilterModel::Update(const Reference< ::com::sun::star::container::XIndexA
 //------------------------------------------------------------------------
 FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< ::com::sun::star::form::XFormController > & xController) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Find" );
     for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin();
          i != rItems.end(); i++)
     {
@@ -693,6 +712,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons
 //------------------------------------------------------------------------
 FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< ::com::sun::star::form::XForm >& xForm) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Find" );
     for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin();
          i != rItems.end(); i++)
     {
@@ -715,6 +735,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons
 //------------------------------------------------------------------------
 void FmFilterModel::SetCurrentController(const Reference< ::com::sun::star::form::XFormController > & xCurrent)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::SetCurrentController" );
     if ((::com::sun::star::form::XFormController*) xCurrent.get() == (::com::sun::star::form::XFormController*) m_xController.get())
         return;
 
@@ -731,6 +752,7 @@ void FmFilterModel::SetCurrentController(const Reference< ::com::sun::star::form
 //------------------------------------------------------------------------
 void FmFilterModel::AppendFilterItems(FmFormItem* pFormItem)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::AppendFilterItems" );
     DBG_ASSERT(pFormItem, "AppendFilterItems(): no form item present");
 
     FmFilterItems* pFilterItems = new FmFilterItems(m_xORB,pFormItem, ::rtl::OUString(String(SVX_RES(RID_STR_FILTER_FILTER_OR))));
@@ -761,6 +783,7 @@ void FmFilterModel::AppendFilterItems(FmFormItem* pFormItem)
 //------------------------------------------------------------------------
 void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, FmFilterData* pData)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Insert" );
     ::std::vector<FmFilterData*>& rItems = pData->GetParent()->GetChilds();
     sal_Int32 nPos = rPos == rItems.end() ? LIST_APPEND : rPos - rItems.begin();
     rItems.insert(rPos, pData);
@@ -773,6 +796,7 @@ void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, F
 //------------------------------------------------------------------------
 void FmFilterModel::Remove(FmFilterData* pData)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Remove" );
     FmParentData* pParent = pData->GetParent();
     ::std::vector<FmFilterData*>& rItems = pParent->GetChilds();
 
@@ -885,6 +909,7 @@ void FmFilterModel::Remove(FmFilterData* pData)
 //------------------------------------------------------------------------
 void FmFilterModel::Remove(const ::std::vector<FmFilterData*>::iterator& rPos, FmFilterData* pData)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Remove" );
     ::std::vector<FmFilterData*>& rItems = pData->GetParent()->GetChilds();
     rItems.erase(rPos);
 
@@ -898,6 +923,7 @@ void FmFilterModel::Remove(const ::std::vector<FmFilterData*>::iterator& rPos, F
 //------------------------------------------------------------------------
 sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, UniString& rText, UniString& rErrorMsg) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::ValidateText" );
     // check the input
     Reference< XPropertySet >   xField(m_pAdapter->getField(pItem->GetTextComponent()));
 
@@ -928,12 +954,14 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, UniString& rText, UniS
 //------------------------------------------------------------------------
 void FmFilterModel::Append(FmFilterItems* pItems, FmFilterItem* pFilterItem)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Append" );
     Insert(pItems->GetChilds().end(), pFilterItem);
 }
 
 //------------------------------------------------------------------------
 void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const ::rtl::OUString& rText)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::SetTextForItem" );
     ::std::vector<FmFilterData*>& rItems = pItem->GetParent()->GetParent()->GetChilds();
     ::std::vector<FmFilterData*>::iterator i = ::std::find(rItems.begin(), rItems.end(), pItem->GetParent());
     sal_Int32 nParentPos = i - rItems.begin();
@@ -954,6 +982,7 @@ void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const ::rtl::OUString& r
 //------------------------------------------------------------------------
 void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::SetCurrentItems" );
     if (m_pCurrentItems == pCurrent)
         return;
 
@@ -994,6 +1023,7 @@ void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent)
 //------------------------------------------------------------------------
 void FmFilterModel::CheckIntegrity(FmParentData* pItem)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::CheckIntegrity" );
     // checks whether for each form there's one free level for input
 
     ::std::vector<FmFilterData*>& rItems = pItem->GetChilds();
@@ -1138,6 +1168,7 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent )
                   ,m_aTimerCounter( 0 )
                   ,m_aDropActionType( DA_SCROLLUP )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::FmFilterNavigator" );
     SetHelpId( HID_FILTER_NAVIGATOR );
 
     {
@@ -1180,12 +1211,14 @@ FmFilterNavigator::~FmFilterNavigator()
 //------------------------------------------------------------------------
 void FmFilterNavigator::Clear()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Clear" );
     m_pModel->Clear();
 }
 
 //------------------------------------------------------------------------
 void FmFilterNavigator::UpdateContent(const Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const Reference< ::com::sun::star::form::XFormController > & xCurrent)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::UpdateContent" );
     if (xCurrent == m_pModel->GetCurrentController())
         return;
 
@@ -1213,6 +1246,7 @@ void FmFilterNavigator::UpdateContent(const Reference< ::com::sun::star::contain
 //------------------------------------------------------------------------
 sal_Bool FmFilterNavigator::EditingEntry( SvLBoxEntry* pEntry, Selection& rSelection )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::EditingEntry" );
     m_pEditingCurrently = pEntry;
     if (!SvTreeListBox::EditingEntry( pEntry, rSelection ))
         return sal_False;
@@ -1223,6 +1257,7 @@ sal_Bool FmFilterNavigator::EditingEntry( SvLBoxEntry* pEntry, Selection& rSelec
 //------------------------------------------------------------------------
 sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::EditedEntry" );
     DBG_ASSERT(pEntry == m_pEditingCurrently, "FmFilterNavigator::EditedEntry: suspicious entry!");
     m_pEditingCurrently = NULL;
 
@@ -1315,6 +1350,7 @@ IMPL_LINK( FmFilterNavigator, OnDropActionTimer, void*, EMPTYARG )
 //------------------------------------------------------------------------
 sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::AcceptDrop" );
     Point aDropPos = rEvt.maPosPixel;
 
     // kuemmern wir uns erst mal um moeglich DropActions (Scrollen und Aufklappen)
@@ -1421,6 +1457,7 @@ namespace
 //------------------------------------------------------------------------
 sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::ExecuteDrop" );
     // ware schlecht, wenn nach dem Droppen noch gescrollt wird ...
     if (m_aDropActionTimer.IsActive())
         m_aDropActionTimer.Stop();
@@ -1454,6 +1491,7 @@ void FmFilterNavigator::InitEntry(SvLBoxEntry* pEntry,
                                   const Image& rImg2,
                                                                   SvLBoxButtonKind eButtonKind)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::InitEntry" );
     SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
     SvLBoxString* pString = NULL;
 
@@ -1469,6 +1507,7 @@ void FmFilterNavigator::InitEntry(SvLBoxEntry* pEntry,
 //------------------------------------------------------------------------
 sal_Bool FmFilterNavigator::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Select" );
     if (bSelect == IsSelected(pEntry))  // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;)
         return sal_True;
 
@@ -1504,6 +1543,7 @@ sal_Bool FmFilterNavigator::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
 //------------------------------------------------------------------------
 void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Notify" );
     if (rHint.ISA(FmFilterInsertedHint))
     {
         FmFilterInsertedHint* pHint = (FmFilterInsertedHint*)&rHint;
@@ -1537,6 +1577,7 @@ void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 //------------------------------------------------------------------------
 SvLBoxEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::FindEntry" );
     SvLBoxEntry* pEntry = NULL;
     if (pItem)
     {
@@ -1553,6 +1594,7 @@ SvLBoxEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const
 //------------------------------------------------------------------------
 void FmFilterNavigator::Insert(FmFilterData* pItem, sal_Int32 nPos)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Insert" );
     const FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : GetFilterModel();
 
     // insert the item
@@ -1568,6 +1610,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_Int32 nPos)
 //------------------------------------------------------------------------
 void FmFilterNavigator::Remove(FmFilterData* pItem)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Remove" );
     // der Entry zu den Daten
     SvLBoxEntry* pEntry = FindEntry(pItem);
 
@@ -1581,6 +1624,7 @@ void FmFilterNavigator::Remove(FmFilterData* pItem)
 // -----------------------------------------------------------------------------
 FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem*>& _rItemList)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::getSelectedFilterItems" );
     // be sure that the data is only used within only one form!
     FmFormItem* pFirstItem = NULL;
 
@@ -1615,6 +1659,7 @@ FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem
 // -----------------------------------------------------------------------------
 void FmFilterNavigator::insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::insertFilterItem" );
     ::std::vector<FmFilterItem*>::const_iterator aEnd = _rFilterList.end();
     for (::std::vector<FmFilterItem*>::const_iterator i = _rFilterList.begin(); i != aEnd; ++i)
     {
@@ -1642,6 +1687,7 @@ void FmFilterNavigator::insertFilterItem(const ::std::vector<FmFilterItem*>& _rF
 //------------------------------------------------------------------------------
 void FmFilterNavigator::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::StartDrag" );
     EndSelection();
 
     // be sure that the data is only used within a only one form!
@@ -1659,6 +1705,7 @@ void FmFilterNavigator::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi
 //------------------------------------------------------------------------------
 void FmFilterNavigator::Command( const CommandEvent& rEvt )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Command" );
     sal_Bool bHandled = sal_False;
     switch (rEvt.GetCommand())
     {
@@ -1761,6 +1808,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
 // -----------------------------------------------------------------------------
 SvLBoxEntry* FmFilterNavigator::getNextEntry(SvLBoxEntry* _pStartWith)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::getNextEntry" );
     SvLBoxEntry* pEntry = _pStartWith ? _pStartWith : LastSelected();
     pEntry = Next(pEntry);
     // we need the next filter entry
@@ -1771,6 +1819,7 @@ SvLBoxEntry* FmFilterNavigator::getNextEntry(SvLBoxEntry* _pStartWith)
 // -----------------------------------------------------------------------------
 SvLBoxEntry* FmFilterNavigator::getPrevEntry(SvLBoxEntry* _pStartWith)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::getPrevEntry" );
     SvLBoxEntry* pEntry = _pStartWith ? _pStartWith : FirstSelected();
     pEntry = Prev(pEntry);
     // check if the previous entry is a filter, if so get the next prev
@@ -1786,6 +1835,7 @@ SvLBoxEntry* FmFilterNavigator::getPrevEntry(SvLBoxEntry* _pStartWith)
 //------------------------------------------------------------------------
 void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::KeyInput" );
     const KeyCode&  rKeyCode = rKEvt.GetKeyCode();
     if (    rKeyCode.IsMod1()
         &&  rKeyCode.IsMod2()
@@ -1859,6 +1909,7 @@ void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt)
 //------------------------------------------------------------------------------
 void FmFilterNavigator::DeleteSelection()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::DeleteSelection" );
     // to avoid the deletion of an entry twice (e.g. deletion of a parent and afterward
     // the deletion of it's child, i have to shrink the selecton list
     ::std::vector<SvLBoxEntry*> aEntryList;
@@ -1898,6 +1949,7 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin
                      :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) )
                      ,SfxControllerItem( SID_FM_FILTER_NAVIGATOR_CONTROL, *_pBindings )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::FmFilterNavigatorWin" );
     SetHelpId( HID_FILTER_NAVIGATOR_WIN );
 
     m_pNavigator = new FmFilterNavigator( this );
@@ -1915,6 +1967,7 @@ FmFilterNavigatorWin::~FmFilterNavigatorWin()
 //-----------------------------------------------------------------------
 void FmFilterNavigatorWin::UpdateContent(FmFormShell* pFormShell)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::UpdateContent" );
     if (!pFormShell)
         m_pNavigator->UpdateContent( NULL, NULL );
     else
@@ -1939,6 +1992,7 @@ void FmFilterNavigatorWin::UpdateContent(FmFormShell* pFormShell)
 //-----------------------------------------------------------------------
 void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::StateChanged" );
     if( !pState  || SID_FM_FILTER_NAVIGATOR_CONTROL != nSID )
         return;
 
@@ -1954,6 +2008,7 @@ void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, c
 //-----------------------------------------------------------------------
 sal_Bool FmFilterNavigatorWin::Close()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::Close" );
     if ( m_pNavigator && m_pNavigator->IsEditingActive() )
         m_pNavigator->EndEditing();
 
@@ -1968,6 +2023,7 @@ sal_Bool FmFilterNavigatorWin::Close()
 //-----------------------------------------------------------------------
 void FmFilterNavigatorWin::FillInfo( SfxChildWinInfo& rInfo ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::FillInfo" );
     SfxDockingWindow::FillInfo( rInfo );
     rInfo.bVisible = sal_False;
 }
@@ -1975,6 +2031,7 @@ void FmFilterNavigatorWin::FillInfo( SfxChildWinInfo& rInfo ) const
 //-----------------------------------------------------------------------
 Size FmFilterNavigatorWin::CalcDockingSize( SfxChildAlignment eAlign )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::CalcDockingSize" );
     if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) )
         return Size();
 
@@ -1984,6 +2041,7 @@ Size FmFilterNavigatorWin::CalcDockingSize( SfxChildAlignment eAlign )
 //-----------------------------------------------------------------------
 SfxChildAlignment FmFilterNavigatorWin::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::CheckAlignment" );
     switch (eAlign)
     {
         case SFX_ALIGN_LEFT:
@@ -2000,6 +2058,7 @@ SfxChildAlignment FmFilterNavigatorWin::CheckAlignment( SfxChildAlignment eActAl
 //------------------------------------------------------------------------
 void FmFilterNavigatorWin::Resize()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::Resize" );
     SfxDockingWindow::Resize();
 
     Size aLogOutputSize = PixelToLogic( GetOutputSizePixel(), MAP_APPFONT );
@@ -2015,6 +2074,7 @@ void FmFilterNavigatorWin::Resize()
 // -----------------------------------------------------------------------------
 void FmFilterNavigatorWin::GetFocus()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::GetFocus" );
     // oj #97405#
     if ( m_pNavigator )
         m_pNavigator->GrabFocus();
diff --git a/svx/source/form/fmctrler.cxx b/svx/source/form/fmctrler.cxx
index 927b0a75a5ce..935bdbc74fe8 100644
--- a/svx/source/form/fmctrler.cxx
+++ b/svx/source/form/fmctrler.cxx
@@ -94,6 +94,7 @@
 #include <tools/shl.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
+#include <rtl/logfile.hxx>
 
 #include <algorithm>
 #include <functional>
@@ -181,6 +182,7 @@ ColumnInfoCache::ColumnInfoCache( const Reference< XColumnsSupplier >& _rxColSup
     :m_aColumns()
     ,m_bControlsInitialized( false )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ColumnInfoCache::ColumnInfoCache" );
     try
     {
         m_aColumns.clear();
@@ -236,6 +238,7 @@ namespace
 //------------------------------------------------------------------------------
 void ColumnInfoCache::deinitializeControls()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ColumnInfoCache::deinitializeControls" );
     for (   ColumnInfos::iterator col = m_aColumns.begin();
             col != m_aColumns.end();
             ++col
@@ -248,6 +251,7 @@ void ColumnInfoCache::deinitializeControls()
 //------------------------------------------------------------------------------
 void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl > >& _rControls )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ColumnInfoCache::initializeControls" );
     try
     {
         // for every of our known columns, find the controls which are bound to this column
@@ -330,6 +334,7 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl >
 //------------------------------------------------------------------------------
 const ColumnInfo& ColumnInfoCache::getColumnInfo( size_t _pos )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ColumnInfoCache::getColumnInfo" );
     if ( _pos >= m_aColumns.size() )
         throw IndexOutOfBoundsException();
 
@@ -510,6 +515,7 @@ FmXFormController::FmXFormController(const Reference< XMultiServiceFactory > & _
                   ,m_bDetachEvents(sal_True)
                   ,m_bAttemptedHandlerCreation( false )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::FmXFormController" );
     DBG_CTOR( FmXFormController, NULL );
 
     ::comphelper::increment(m_refCount);
@@ -570,18 +576,21 @@ FmXFormController::~FmXFormController()
 // -----------------------------------------------------------------------------
 void SAL_CALL FmXFormController::acquire() throw ()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::acquire" );
     FmXFormController_BASE::acquire();
 }
 
 // -----------------------------------------------------------------------------
 void SAL_CALL FmXFormController::release() throw ()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::release" );
     FmXFormController_BASE::release();
 }
 
 //------------------------------------------------------------------
 Any SAL_CALL FmXFormController::queryInterface( const Type& _rType ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::queryInterface" );
     Any aRet = FmXFormController_BASE::queryInterface( _rType );
     if ( !aRet.hasValue() )
         aRet = OPropertySetHelper::queryInterface( _rType );
@@ -593,6 +602,7 @@ Any SAL_CALL FmXFormController::queryInterface( const Type& _rType ) throw(Runti
 //------------------------------------------------------------------------------
 Sequence< sal_Int8 > SAL_CALL FmXFormController::getImplementationId() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getImplementationId" );
     static ::cppu::OImplementationId* pId = NULL;
     if  ( !pId )
     {
@@ -609,6 +619,7 @@ Sequence< sal_Int8 > SAL_CALL FmXFormController::getImplementationId() throw( Ru
 //------------------------------------------------------------------------------
 Sequence< Type > SAL_CALL FmXFormController::getTypes(  ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getTypes" );
     return comphelper::concatSequences(
         FmXFormController_BASE::getTypes(),
         ::cppu::OPropertySetHelper::getTypes()
@@ -619,6 +630,7 @@ Sequence< Type > SAL_CALL FmXFormController::getTypes(  ) throw(RuntimeException
 // XUnoTunnel
 Sequence< sal_Int8 > FmXFormController::getUnoTunnelImplementationId()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getUnoTunnelImplementationId" );
     static ::cppu::OImplementationId * pId = NULL;
     if ( !pId )
     {
@@ -634,6 +646,7 @@ Sequence< sal_Int8 > FmXFormController::getUnoTunnelImplementationId()
 //------------------------------------------------------------------------------
 FmXFormController* FmXFormController::getImplementation( const Reference< XInterface >& _rxComponent )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getImplementation" );
     Reference< XUnoTunnel > xTunnel( _rxComponent, UNO_QUERY );
     if ( xTunnel.is() )
         return reinterpret_cast< FmXFormController* >( xTunnel->getSomething( getUnoTunnelImplementationId() ) );
@@ -642,6 +655,7 @@ FmXFormController* FmXFormController::getImplementation( const Reference< XInter
 //------------------------------------------------------------------------------
 sal_Int64 SAL_CALL FmXFormController::getSomething(Sequence<sal_Int8> const& rId)throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getSomething" );
     if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast< sal_Int64 >( this );
 
@@ -652,6 +666,7 @@ sal_Int64 SAL_CALL FmXFormController::getSomething(Sequence<sal_Int8> const& rId
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXFormController::supportsService(const ::rtl::OUString& ServiceName) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::supportsService" );
     Sequence< ::rtl::OUString> aSNL(getSupportedServiceNames());
     const ::rtl::OUString * pArray = aSNL.getConstArray();
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
@@ -663,12 +678,14 @@ sal_Bool SAL_CALL FmXFormController::supportsService(const ::rtl::OUString& Serv
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL FmXFormController::getImplementationName() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getImplementationName" );
     return ::rtl::OUString::createFromAscii("com.sun.star.form.FmXFormController");
 }
 
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString> SAL_CALL FmXFormController::getSupportedServiceNames(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getSupportedServiceNames" );
     // service names which are supported only, but cannot be used to created an
     // instance at a service factory
     Sequence< ::rtl::OUString > aNonCreatableServiceNames( 1 );
@@ -682,12 +699,14 @@ Sequence< ::rtl::OUString> SAL_CALL FmXFormController::getSupportedServiceNames(
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXFormController::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::approveReset" );
     return sal_True;
 }
 
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::resetted(const EventObject& rEvent) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::resetted" );
     ::osl::MutexGuard aGuard(m_aMutex);
     if (getCurrentControl().is() &&  (getCurrentControl()->getModel() == rEvent.Source))
         m_bModified = sal_False;
@@ -696,6 +715,7 @@ void SAL_CALL FmXFormController::resetted(const EventObject& rEvent) throw( Runt
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString> FmXFormController::getSupportedServiceNames_Static(void)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getSupportedServiceNames_Static" );
     static Sequence< ::rtl::OUString> aServices;
     if (!aServices.getLength())
     {
@@ -709,6 +729,7 @@ Sequence< ::rtl::OUString> FmXFormController::getSupportedServiceNames_Static(vo
 //------------------------------------------------------------------------------
 void FmXFormController::setCurrentFilterPosition( sal_Int32 nPos )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setCurrentFilterPosition" );
     DBG_ASSERT(nPos < (sal_Int32)m_aFilters.size(), "Invalid Position");
 
     if (nPos != m_nCurrentFilterPosition)
@@ -722,29 +743,34 @@ void FmXFormController::setCurrentFilterPosition( sal_Int32 nPos )
 
         if ( nPos != -1 )
         {
-            // set the text for all filters
-            OSL_ENSURE( ( m_aFilters.size() > (size_t)m_nCurrentFilterPosition ) && ( m_nCurrentFilterPosition >= 0 ),
-                "FmXFormController::setCurrentFilterPosition: m_nCurrentFilterPosition too big" );
-
-            if ( ( m_nCurrentFilterPosition >= 0 ) && ( (size_t)m_nCurrentFilterPosition < m_aFilters.size() ) )
-            {
-                FmFilterRow& rRow = m_aFilters[m_nCurrentFilterPosition];
-                for (FmFilterRow::const_iterator iter2 = rRow.begin();
-                    iter2 != rRow.end(); iter2++)
-                {
-                    (*iter2).first->setText((*iter2).second);
-                }
-            }
+            impl_setTextOnAllFilter_throw();
         }
     }
 }
+// -----------------------------------------------------------------------------
+void FmXFormController::impl_setTextOnAllFilter_throw()
+{
+    // set the text for all filters
+    OSL_ENSURE( ( m_aFilters.size() > (size_t)m_nCurrentFilterPosition ) && ( m_nCurrentFilterPosition >= 0 ),
+        "FmXFormController::setCurrentFilterPosition: m_nCurrentFilterPosition too big" );
 
+    if ( ( m_nCurrentFilterPosition >= 0 ) && ( (size_t)m_nCurrentFilterPosition < m_aFilters.size() ) )
+    {
+        FmFilterRow& rRow = m_aFilters[m_nCurrentFilterPosition];
+        for (FmFilterRow::const_iterator iter2 = rRow.begin();
+            iter2 != rRow.end(); iter2++)
+        {
+            (*iter2).first->setText((*iter2).second);
+        }
+    } // if ( ( m_nCurrentFilterPosition >= 0 ) && ( (size_t)m_nCurrentFilterPosition < m_aFilters.size() ) )
+}
 // OPropertySetHelper
 //------------------------------------------------------------------------------
 sal_Bool FmXFormController::convertFastPropertyValue( Any & /*rConvertedValue*/, Any & /*rOldValue*/,
                                             sal_Int32 /*nHandle*/, const Any& /*rValue*/ )
                 throw( IllegalArgumentException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::convertFastPropertyValue" );
     return sal_False;
 }
 
@@ -752,11 +778,13 @@ sal_Bool FmXFormController::convertFastPropertyValue( Any & /*rConvertedValue*/,
 void FmXFormController::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const Any& /*rValue*/ )
                          throw( Exception )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setFastPropertyValue_NoBroadcast" );
 }
 
 //------------------------------------------------------------------------------
 void FmXFormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getFastPropertyValue" );
     switch (nHandle)
     {
         case FM_ATTR_FILTER:
@@ -826,6 +854,7 @@ void FmXFormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) c
 //------------------------------------------------------------------------------
 Reference< XPropertySetInfo >  FmXFormController::getPropertySetInfo() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getPropertySetInfo" );
     static Reference< XPropertySetInfo >  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
@@ -844,6 +873,7 @@ void FmXFormController::fillProperties(
         Sequence< Property >& /* [out] */ /*_rAggregateProps*/
         ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::fillProperties" );
     _rProps.realloc(2);
     sal_Int32 nPos = 0;
     Property* pDesc = _rProps.getArray();
@@ -854,6 +884,7 @@ void FmXFormController::fillProperties(
 //------------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper& FmXFormController::getInfoHelper()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getInfoHelper" );
     return *getArrayHelper();
 }
 
@@ -861,6 +892,7 @@ void FmXFormController::fillProperties(
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXFormController::hasElements(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::hasElements" );
 ::osl::MutexGuard aGuard( m_aMutex );
     return !m_aChilds.empty();
 }
@@ -868,6 +900,7 @@ sal_Bool SAL_CALL FmXFormController::hasElements(void) throw( RuntimeException )
 //------------------------------------------------------------------------------
 Type SAL_CALL  FmXFormController::getElementType(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getElementType" );
     return ::getCppuType((const Reference< XFormController>*)0);
 
 }
@@ -876,6 +909,7 @@ Type SAL_CALL  FmXFormController::getElementType(void) throw( RuntimeException )
 //------------------------------------------------------------------------------
 Reference< XEnumeration > SAL_CALL  FmXFormController::createEnumeration(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::createEnumeration" );
     ::osl::MutexGuard aGuard( m_aMutex );
     return new ::comphelper::OEnumerationByIndex(this);
 }
@@ -884,6 +918,7 @@ Reference< XEnumeration > SAL_CALL  FmXFormController::createEnumeration(void) t
 //------------------------------------------------------------------------------
 sal_Int32 SAL_CALL FmXFormController::getCount(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getCount" );
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_aChilds.size();
 }
@@ -891,6 +926,7 @@ sal_Int32 SAL_CALL FmXFormController::getCount(void) throw( RuntimeException )
 //------------------------------------------------------------------------------
 Any SAL_CALL FmXFormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getByIndex" );
     ::osl::MutexGuard aGuard( m_aMutex );
     if (Index < 0 ||
         Index >= (sal_Int32)m_aChilds.size())
@@ -903,6 +939,7 @@ Any SAL_CALL FmXFormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBou
 //-----------------------------------------------------------------------------
 void FmXFormController::addChild(FmXFormController* pChild)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addChild" );
     Reference< XFormController >  xController(pChild);
     m_aChilds.push_back(xController);
     pChild->setParent(static_cast< XFormController* >(this));
@@ -928,6 +965,7 @@ void FmXFormController::addChild(FmXFormController* pChild)
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::disposing(const EventObject& e) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::disposing" );
     // Ist der Container disposed worden
     ::osl::MutexGuard aGuard( m_aMutex );
     Reference< XControlContainer >  xContainer(e.Source, UNO_QUERY);
@@ -951,6 +989,7 @@ void SAL_CALL FmXFormController::disposing(const EventObject& e) throw( RuntimeE
 //-----------------------------------------------------------------------------
 void FmXFormController::disposeAllFeaturesAndDispatchers() SAL_THROW(())
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::disposeAllFeaturesAndDispatchers" );
     for ( DispatcherContainer::iterator aDispatcher = m_aFeatureDispatchers.begin();
           aDispatcher != m_aFeatureDispatchers.end();
           ++aDispatcher
@@ -972,6 +1011,7 @@ void FmXFormController::disposeAllFeaturesAndDispatchers() SAL_THROW(())
 //-----------------------------------------------------------------------------
 void FmXFormController::disposing(void)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::disposing" );
     EventObject aEvt(static_cast< XFormController* >(this));
 
     // if we're still active, simulate a "deactivated" event
@@ -1054,6 +1094,7 @@ namespace
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::propertyChange" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     if ( evt.PropertyName == FM_PROP_BOUNDFIELD )
     {
@@ -1121,6 +1162,7 @@ void SAL_CALL FmXFormController::propertyChange(const PropertyChangeEvent& evt)
 //------------------------------------------------------------------------------
 bool FmXFormController::replaceControl( const Reference< XControl >& _rxExistentControl, const Reference< XControl >& _rxNewControl )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::replaceControl" );
     bool bSuccess = false;
     try
     {
@@ -1182,6 +1224,7 @@ bool FmXFormController::replaceControl( const Reference< XControl >& _rxExistent
 //------------------------------------------------------------------------------
 void FmXFormController::toggleAutoFields(sal_Bool bAutoFields)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::toggleAutoFields" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
 
 
@@ -1265,6 +1308,7 @@ IMPL_LINK(FmXFormController, OnToggleAutoFields, void*, EMPTYARG)
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::textChanged(const TextEvent& e) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::textChanged" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     if (m_bFiltering)
     {
@@ -1300,6 +1344,7 @@ void SAL_CALL FmXFormController::textChanged(const TextEvent& e) throw( RuntimeE
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::itemStateChanged(const ItemEvent& /*rEvent*/) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::itemStateChanged" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     impl_onModify();
 }
@@ -1308,6 +1353,7 @@ void SAL_CALL FmXFormController::itemStateChanged(const ItemEvent& /*rEvent*/) t
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::addModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addModifyListener" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aModifyListeners.addInterface( l );
 }
@@ -1315,6 +1361,7 @@ void SAL_CALL FmXFormController::addModifyListener(const Reference< XModifyListe
 //------------------------------------------------------------------------------
 void FmXFormController::removeModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeModifyListener" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aModifyListeners.removeInterface( l );
 }
@@ -1323,6 +1370,7 @@ void FmXFormController::removeModifyListener(const Reference< XModifyListener >
 //------------------------------------------------------------------------------
 void FmXFormController::modified( const EventObject& _rEvent ) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::modified" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
 
     try
@@ -1350,6 +1398,7 @@ void FmXFormController::modified( const EventObject& _rEvent ) throw( RuntimeExc
 //------------------------------------------------------------------------------
 void FmXFormController::impl_onModify()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::onModify" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
 
     {
@@ -1365,6 +1414,7 @@ void FmXFormController::impl_onModify()
 //------------------------------------------------------------------------------
 sal_Bool FmXFormController::determineLockState() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::determineLockState" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     // a.) in filter mode we are always locked
     // b.) if we have no valid model or our model (a result set) is not alive -> we're locked
@@ -1382,6 +1432,7 @@ sal_Bool FmXFormController::determineLockState() const
 //------------------------------------------------------------------------------
 void FmXFormController::focusGained(const FocusEvent& e) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::focusGained" );
     TRACE_RANGE( "FmXFormController::focusGained" );
 
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
@@ -1530,6 +1581,7 @@ IMPL_LINK( FmXFormController, OnDeactivated, void*, /**/ )
 //------------------------------------------------------------------------------
 void FmXFormController::focusLost(const FocusEvent& e) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::focusLost" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
 
     m_pControlBorderManager->focusLost( e.Source );
@@ -1547,30 +1599,35 @@ void FmXFormController::focusLost(const FocusEvent& e) throw( RuntimeException )
 //--------------------------------------------------------------------
 void SAL_CALL FmXFormController::mousePressed( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::mousePressed" );
     // not interested in
 }
 
 //--------------------------------------------------------------------
 void SAL_CALL FmXFormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::mouseReleased" );
     // not interested in
 }
 
 //--------------------------------------------------------------------
 void SAL_CALL FmXFormController::mouseEntered( const awt::MouseEvent& _rEvent ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::mouseEntered" );
     m_pControlBorderManager->mouseEntered( _rEvent.Source );
 }
 
 //--------------------------------------------------------------------
 void SAL_CALL FmXFormController::mouseExited( const awt::MouseEvent& _rEvent ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::mouseExited" );
     m_pControlBorderManager->mouseExited( _rEvent.Source );
 }
 
 //--------------------------------------------------------------------
 void SAL_CALL FmXFormController::componentValidityChanged( const EventObject& _rSource ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::componentValidityChanged" );
     Reference< XControl > xControl( findControl( m_aControls, Reference< XControlModel >( _rSource.Source, UNO_QUERY ), sal_False, sal_False ) );
     Reference< XValidatableFormComponent > xValidatable( _rSource.Source, UNO_QUERY );
 
@@ -1583,6 +1640,7 @@ void SAL_CALL FmXFormController::componentValidityChanged( const EventObject& _r
 //--------------------------------------------------------------------
 void FmXFormController::setModel(const Reference< XTabControllerModel > & Model) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setModel" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
     DBG_ASSERT(m_xTabController.is(), "FmXFormController::setModel : invalid aggregate !");
@@ -1688,6 +1746,7 @@ void FmXFormController::setModel(const Reference< XTabControllerModel > & Model)
 //------------------------------------------------------------------------------
 Reference< XTabControllerModel >  FmXFormController::getModel() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getModel" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     DBG_ASSERT(m_xTabController.is(), "FmXFormController::getModel : invalid aggregate !");
     if (!m_xTabController.is())
@@ -1698,6 +1757,7 @@ Reference< XTabControllerModel >  FmXFormController::getModel() throw( RuntimeEx
 //------------------------------------------------------------------------------
 void FmXFormController::addToEventAttacher(const Reference< XControl > & xControl)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addToEventAttacher" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     OSL_ENSURE( xControl.is(), "FmXFormController::addToEventAttacher: invalid control - how did you reach this?" );
     if ( !xControl.is() )
@@ -1726,6 +1786,7 @@ void FmXFormController::addToEventAttacher(const Reference< XControl > & xContro
 //------------------------------------------------------------------------------
 void FmXFormController::removeFromEventAttacher(const Reference< XControl > & xControl)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeFromEventAttacher" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     OSL_ENSURE( xControl.is(), "FmXFormController::removeFromEventAttacher: invalid control - how did you reach this?" );
     if ( !xControl.is() )
@@ -1754,6 +1815,7 @@ void FmXFormController::removeFromEventAttacher(const Reference< XControl > & xC
 //------------------------------------------------------------------------------
 void FmXFormController::setContainer(const Reference< XControlContainer > & xContainer) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setContainer" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     Reference< XTabControllerModel >  xTabModel(getModel());
     DBG_ASSERT(xTabModel.is() || !xContainer.is(), "No Model defined");
@@ -1842,6 +1904,7 @@ void FmXFormController::setContainer(const Reference< XControlContainer > & xCon
 //------------------------------------------------------------------------------
 Reference< XControlContainer >  FmXFormController::getContainer() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getContainer" );
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     DBG_ASSERT(m_xTabController.is(), "FmXFormController::getContainer : invalid aggregate !");
@@ -1853,6 +1916,7 @@ Reference< XControlContainer >  FmXFormController::getContainer() throw( Runtime
 //------------------------------------------------------------------------------
 Sequence< Reference< XControl > > FmXFormController::getControls(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getControls" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_bControlsSorted)
@@ -1892,6 +1956,7 @@ Sequence< Reference< XControl > > FmXFormController::getControls(void) throw( Ru
 //------------------------------------------------------------------------------
 void FmXFormController::autoTabOrder() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::autoTabOrder" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
     DBG_ASSERT(m_xTabController.is(), "FmXFormController::autoTabOrder : invalid aggregate !");
@@ -1902,6 +1967,7 @@ void FmXFormController::autoTabOrder() throw( RuntimeException )
 //------------------------------------------------------------------------------
 void FmXFormController::activateTabOrder() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::activateTabOrder" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
     DBG_ASSERT(m_xTabController.is(), "FmXFormController::activateTabOrder : invalid aggregate !");
@@ -1912,6 +1978,7 @@ void FmXFormController::activateTabOrder() throw( RuntimeException )
 //------------------------------------------------------------------------------
 void FmXFormController::setControlLock(const Reference< XControl > & xControl)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setControlLock" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     sal_Bool bLocked = isLocked();
 
@@ -1965,6 +2032,7 @@ void FmXFormController::setControlLock(const Reference< XControl > & xControl)
 //------------------------------------------------------------------------------
 void FmXFormController::setLocks()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setLocks" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     // alle Controls, die mit einer Datenquelle verbunden sind locken/unlocken
     const Reference< XControl >* pControls = m_aControls.getConstArray();
@@ -2006,6 +2074,7 @@ namespace
 //------------------------------------------------------------------------------
 void FmXFormController::startControlModifyListening(const Reference< XControl > & xControl)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::startControlModifyListening" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
 
     bool bModifyListening = lcl_shouldListenForModifications( xControl, this );
@@ -2055,6 +2124,7 @@ void FmXFormController::startControlModifyListening(const Reference< XControl >
 //------------------------------------------------------------------------------
 void FmXFormController::stopControlModifyListening(const Reference< XControl > & xControl)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::stopControlModifyListening" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
 
     bool bModifyListening = lcl_shouldListenForModifications( xControl, NULL );
@@ -2103,6 +2173,7 @@ void FmXFormController::stopControlModifyListening(const Reference< XControl > &
 //------------------------------------------------------------------------------
 void FmXFormController::startListening()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::startListening" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_bModified  = sal_False;
 
@@ -2116,6 +2187,7 @@ void FmXFormController::startListening()
 //------------------------------------------------------------------------------
 void FmXFormController::stopListening()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::stopListening" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_bModified  = sal_False;
 
@@ -2130,6 +2202,7 @@ void FmXFormController::stopListening()
 //------------------------------------------------------------------------------
 Reference< XControl >  FmXFormController::findControl(Sequence< Reference< XControl > >& _rControls, const Reference< XControlModel > & xCtrlModel ,sal_Bool _bRemove,sal_Bool _bOverWrite) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::findControl" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     DBG_ASSERT( xCtrlModel.is(), "findControl - welches ?!" );
 
@@ -2157,6 +2230,7 @@ Reference< XControl >  FmXFormController::findControl(Sequence< Reference< XCont
 //------------------------------------------------------------------------------
 void FmXFormController::implControlInserted( const Reference< XControl>& _rxControl, bool _bAddToEventAttacher )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::implControlInserted" );
     Reference< XWindow > xWindow( _rxControl, UNO_QUERY );
     if ( xWindow.is() )
     {
@@ -2196,6 +2270,7 @@ void FmXFormController::implControlInserted( const Reference< XControl>& _rxCont
 //------------------------------------------------------------------------------
 void FmXFormController::implControlRemoved( const Reference< XControl>& _rxControl, bool _bRemoveFromEventAttacher )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::implControlRemoved" );
     Reference< XWindow > xWindow( _rxControl, UNO_QUERY );
     if ( xWindow.is() )
     {
@@ -2227,6 +2302,7 @@ void FmXFormController::implControlRemoved( const Reference< XControl>& _rxContr
 //------------------------------------------------------------------------------
 void FmXFormController::implSetCurrentControl( const Reference< XControl >& _rxControl )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::implSetCurrentControl" );
     if ( m_xCurrentControl.get() == _rxControl.get() )
         return;
 
@@ -2244,6 +2320,7 @@ void FmXFormController::implSetCurrentControl( const Reference< XControl >& _rxC
 //------------------------------------------------------------------------------
 void FmXFormController::insertControl(const Reference< XControl > & xControl)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::insertControl" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_bControlsSorted = sal_False;
     m_aControls.realloc(m_aControls.getLength() + 1);
@@ -2264,6 +2341,7 @@ void FmXFormController::insertControl(const Reference< XControl > & xControl)
 //------------------------------------------------------------------------------
 void FmXFormController::removeControl(const Reference< XControl > & xControl)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeControl" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     const Reference< XControl >* pControls = m_aControls.getConstArray();
     const Reference< XControl >* pControlsEnd = pControls + m_aControls.getLength();
@@ -2294,6 +2372,7 @@ void FmXFormController::removeControl(const Reference< XControl > & xControl)
 //------------------------------------------------------------------------------
 void FmXFormController::loaded(const EventObject& rEvent) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::loaded" );
     OSL_ENSURE( rEvent.Source == m_xModelAsIndex, "FmXFormController::loaded: where did this come from?" );
 
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
@@ -2350,6 +2429,7 @@ void FmXFormController::loaded(const EventObject& rEvent) throw( RuntimeExceptio
 //------------------------------------------------------------------------------
 void FmXFormController::updateAllDispatchers() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::updateAllDispatchers" );
     ::std::for_each(
         m_aFeatureDispatchers.begin(),
         m_aFeatureDispatchers.end(),
@@ -2381,6 +2461,7 @@ IMPL_LINK(FmXFormController, OnLoad, void*, EMPTYARG)
 //------------------------------------------------------------------------------
 void FmXFormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::unloaded" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     updateAllDispatchers();
 }
@@ -2388,6 +2469,7 @@ void FmXFormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeEx
 //------------------------------------------------------------------------------
 void FmXFormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::reloading" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
     // do the same like in unloading
@@ -2399,6 +2481,7 @@ void FmXFormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeE
 //------------------------------------------------------------------------------
 void FmXFormController::reloaded(const EventObject& aEvent) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::reloaded" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     loaded(aEvent);
 }
@@ -2406,6 +2489,7 @@ void FmXFormController::reloaded(const EventObject& aEvent) throw( RuntimeExcept
 //------------------------------------------------------------------------------
 void FmXFormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::unloading" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     unload();
 }
@@ -2413,6 +2497,7 @@ void FmXFormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeE
 //------------------------------------------------------------------------------
 void FmXFormController::unload() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::unload" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -2442,6 +2527,7 @@ void FmXFormController::unload() throw( RuntimeException )
 // -----------------------------------------------------------------------------
 void FmXFormController::removeBoundFieldListener()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeBoundFieldListener" );
     const Reference< XControl >* pControls = m_aControls.getConstArray();
     const Reference< XControl >* pControlsEnd = pControls + m_aControls.getLength();
     while ( pControls != pControlsEnd )
@@ -2455,6 +2541,7 @@ void FmXFormController::removeBoundFieldListener()
 //------------------------------------------------------------------------------
 void FmXFormController::startFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::startFormListening" );
     try
     {
         if ( m_bCanInsert || m_bCanUpdate )   // form can be modified
@@ -2489,6 +2576,7 @@ void FmXFormController::startFormListening( const Reference< XPropertySet >& _rx
 //------------------------------------------------------------------------------
 void FmXFormController::stopFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::stopFormListening" );
     try
     {
         if ( m_bCanInsert || m_bCanUpdate )
@@ -2522,6 +2610,7 @@ void FmXFormController::stopFormListening( const Reference< XPropertySet >& _rxF
 //------------------------------------------------------------------------------
 void FmXFormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::cursorMoved" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     // toggle the locking ?
     if (m_bLocked != determineLockState())
@@ -2542,11 +2631,13 @@ void FmXFormController::cursorMoved(const EventObject& /*event*/) throw( Runtime
 //------------------------------------------------------------------------------
 void FmXFormController::rowChanged(const EventObject& /*event*/) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::rowChanged" );
     // not interested in ...
 }
 //------------------------------------------------------------------------------
 void FmXFormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::rowSetChanged" );
     // not interested in ...
 }
 
@@ -2555,6 +2646,7 @@ void FmXFormController::rowSetChanged(const EventObject& /*event*/) throw( Runti
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::elementInserted(const ContainerEvent& evt) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::elementInserted" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     Reference< XControl >  xControl;
     evt.Element >>= xControl;
@@ -2601,6 +2693,7 @@ void SAL_CALL FmXFormController::elementInserted(const ContainerEvent& evt) thro
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::elementReplaced(const ContainerEvent& evt) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::elementReplaced" );
     // simulate an elementRemoved
     ContainerEvent aRemoveEvent( evt );
     aRemoveEvent.Element = evt.ReplacedElement;
@@ -2616,6 +2709,7 @@ void SAL_CALL FmXFormController::elementReplaced(const ContainerEvent& evt) thro
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::elementRemoved(const ContainerEvent& evt) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::elementRemoved" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -2643,6 +2737,7 @@ void SAL_CALL FmXFormController::elementRemoved(const ContainerEvent& evt) throw
 //------------------------------------------------------------------------------
 Reference< XControl >  FmXFormController::isInList(const Reference< XWindowPeer > & xPeer) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::isInList" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     const Reference< XControl >* pControls = m_aControls.getConstArray();
 
@@ -2662,6 +2757,7 @@ Reference< XControl >  FmXFormController::isInList(const Reference< XWindowPeer
 //------------------------------------------------------------------------------
 void FmXFormController::activateFirst() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::activateFirst" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
     DBG_ASSERT(m_xTabController.is(), "FmXFormController::activateFirst : invalid aggregate !");
@@ -2672,6 +2768,7 @@ void FmXFormController::activateFirst() throw( RuntimeException )
 //------------------------------------------------------------------------------
 void FmXFormController::activateLast() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::activateLast" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
     DBG_ASSERT(m_xTabController.is(), "FmXFormController::activateLast : invalid aggregate !");
@@ -2683,6 +2780,7 @@ void FmXFormController::activateLast() throw( RuntimeException )
 //------------------------------------------------------------------------------
 Reference< XControl> SAL_CALL FmXFormController::getCurrentControl(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getCurrentControl" );
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_xCurrentControl;
 }
@@ -2690,6 +2788,7 @@ Reference< XControl> SAL_CALL FmXFormController::getCurrentControl(void) throw(
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::addActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addActivateListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aActivateListeners.addInterface(l);
@@ -2697,6 +2796,7 @@ void SAL_CALL FmXFormController::addActivateListener(const Reference< XFormContr
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::removeActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeActivateListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aActivateListeners.removeInterface(l);
@@ -2705,6 +2805,7 @@ void SAL_CALL FmXFormController::removeActivateListener(const Reference< XFormCo
 //------------------------------------------------------------------------------
 void FmXFormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setFilter" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     // create the composer
     Reference< XRowSet > xForm(m_xModelAsIndex, UNO_QUERY);
@@ -2881,6 +2982,7 @@ void FmXFormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
 //------------------------------------------------------------------------------
 void FmXFormController::startFiltering()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::startFiltering" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
 
     OStaticDataAccessTools aStaticTools;
@@ -3018,18 +3120,7 @@ void FmXFormController::startFiltering()
     if ( xSet.is() )
         stopFormListening( xSet, sal_True );
 
-    // set the text for all filters
-    OSL_ENSURE( ( m_aFilters.size() > (size_t)m_nCurrentFilterPosition ) && ( m_nCurrentFilterPosition >= 0 ),
-        "FmXFormController::startFiltering: m_nCurrentFilterPosition too big" );
-    if ( ( m_nCurrentFilterPosition >= 0 ) && ( (size_t)m_nCurrentFilterPosition < m_aFilters.size() ) )
-    {
-        FmFilterRow& rRow = m_aFilters[m_nCurrentFilterPosition];
-        for (FmFilterRow::const_iterator iter2 = rRow.begin();
-            iter2 != rRow.end(); iter2++)
-        {
-            (*iter2).first->setText((*iter2).second);
-        }
-    }
+    impl_setTextOnAllFilter_throw();
 
     // lock all controls which are not used for filtering
     m_bLocked = determineLockState();
@@ -3040,6 +3131,7 @@ void FmXFormController::startFiltering()
 //------------------------------------------------------------------------------
 void FmXFormController::stopFiltering()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::stopFiltering" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     if ( !m_bFiltering ) // #104693# OJ
     {   // nothing to do
@@ -3132,6 +3224,7 @@ void FmXFormController::stopFiltering()
 //------------------------------------------------------------------------------
 void FmXFormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setMode" );
     ::osl::MutexGuard aGuard( m_aMutex );
 
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
@@ -3160,6 +3253,7 @@ void FmXFormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExc
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL FmXFormController::getMode(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getMode" );
 ::osl::MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     return m_aMode;
@@ -3168,6 +3262,7 @@ void FmXFormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExc
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString > SAL_CALL FmXFormController::getSupportedModes(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getSupportedModes" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     static Sequence< ::rtl::OUString > aModes;
     if (!aModes.getLength())
@@ -3183,6 +3278,7 @@ Sequence< ::rtl::OUString > SAL_CALL FmXFormController::getSupportedModes(void)
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXFormController::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::supportsMode" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     Sequence< ::rtl::OUString > aModes(getSupportedModes());
     const ::rtl::OUString* pModes = aModes.getConstArray();
@@ -3197,6 +3293,7 @@ sal_Bool SAL_CALL FmXFormController::supportsMode(const ::rtl::OUString& Mode) t
 //------------------------------------------------------------------------------
 Window* FmXFormController::getDialogParentWindow()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getDialogParentWindow" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     Window* pParent = m_pWindow;
     if ( !pParent )
@@ -3217,6 +3314,7 @@ Window* FmXFormController::getDialogParentWindow()
 //------------------------------------------------------------------------------
 bool FmXFormController::checkFormComponentValidity( ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(())
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::checkFormComponentValidity" );
     try
     {
         Reference< XEnumerationAccess > xControlEnumAcc( getModel(), UNO_QUERY );
@@ -3259,6 +3357,7 @@ bool FmXFormController::checkFormComponentValidity( ::rtl::OUString& /* [out] */
 //------------------------------------------------------------------------------
 Reference< XControl > FmXFormController::locateControl( const Reference< XControlModel >& _rxModel ) SAL_THROW(())
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::locateControl" );
     try
     {
         Sequence< Reference< XControl > > aControls( getControls() );
@@ -3348,6 +3447,7 @@ namespace
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXFormController::approveRowChange(const RowChangeEvent& _rEvent) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::approveRowChange" );
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
@@ -3433,6 +3533,7 @@ sal_Bool SAL_CALL FmXFormController::approveRowChange(const RowChangeEvent& _rEv
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXFormController::approveCursorMove(const EventObject& event) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::approveCursorMove" );
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::cppu::OInterfaceIteratorHelper aIter(m_aRowSetApproveListeners);
@@ -3449,6 +3550,7 @@ sal_Bool SAL_CALL FmXFormController::approveCursorMove(const EventObject& event)
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXFormController::approveRowSetChange(const EventObject& event) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::approveRowSetChange" );
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::cppu::OInterfaceIteratorHelper aIter(m_aRowSetApproveListeners);
@@ -3466,6 +3568,7 @@ sal_Bool SAL_CALL FmXFormController::approveRowSetChange(const EventObject& even
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::addRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addRowSetApproveListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aRowSetApproveListeners.addInterface(_rxListener);
@@ -3474,6 +3577,7 @@ void SAL_CALL FmXFormController::addRowSetApproveListener(const Reference< XRowS
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::removeRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeRowSetApproveListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aRowSetApproveListeners.removeInterface(_rxListener);
@@ -3483,6 +3587,7 @@ void SAL_CALL FmXFormController::removeRowSetApproveListener(const Reference< XR
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::errorOccured(const SQLErrorEvent& aEvent) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::errorOccured" );
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
 
@@ -3504,6 +3609,7 @@ void SAL_CALL FmXFormController::errorOccured(const SQLErrorEvent& aEvent) throw
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::addSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addSQLErrorListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aErrorListeners.addInterface(aListener);
@@ -3512,6 +3618,7 @@ void SAL_CALL FmXFormController::addSQLErrorListener(const Reference< XSQLErrorL
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::removeSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeSQLErrorListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aErrorListeners.removeInterface(aListener);
@@ -3521,6 +3628,7 @@ void SAL_CALL FmXFormController::removeSQLErrorListener(const Reference< XSQLErr
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::addDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addDatabaseParameterListener" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aParameterListeners.addInterface(aListener);
 }
@@ -3528,6 +3636,7 @@ void SAL_CALL FmXFormController::addDatabaseParameterListener(const Reference< X
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::removeDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeDatabaseParameterListener" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aParameterListeners.removeInterface(aListener);
 }
@@ -3536,12 +3645,14 @@ void SAL_CALL FmXFormController::removeDatabaseParameterListener(const Reference
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::addParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addParameterListener" );
     FmXFormController::addDatabaseParameterListener( aListener );
 }
 
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::removeParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeParameterListener" );
     FmXFormController::removeDatabaseParameterListener( aListener );
 }
 
@@ -3549,6 +3660,7 @@ void SAL_CALL FmXFormController::removeParameterListener(const Reference< XDatab
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXFormController::approveParameter(const DatabaseParameterEvent& aEvent) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::approveParameter" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
 
     ::cppu::OInterfaceIteratorHelper aIter(m_aParameterListeners);
@@ -3628,6 +3740,7 @@ sal_Bool SAL_CALL FmXFormController::approveParameter(const DatabaseParameterEve
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::addConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addConfirmDeleteListener" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aDeleteListeners.addInterface(aListener);
 }
@@ -3635,6 +3748,7 @@ void SAL_CALL FmXFormController::addConfirmDeleteListener(const Reference< XConf
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::removeConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeConfirmDeleteListener" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     m_aDeleteListeners.removeInterface(aListener);
 }
@@ -3643,6 +3757,7 @@ void SAL_CALL FmXFormController::removeConfirmDeleteListener(const Reference< XC
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXFormController::confirmDelete(const RowChangeEvent& aEvent) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::confirmDelete" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
 
     ::cppu::OInterfaceIteratorHelper aIter(m_aDeleteListeners);
@@ -3673,6 +3788,7 @@ sal_Bool SAL_CALL FmXFormController::confirmDelete(const RowChangeEvent& aEvent)
 //------------------------------------------------------------------------------
 void FmXFormController::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::invalidateFeatures" );
     ::osl::MutexGuard aGuard( m_aMutex );
     // for now, just copy the ids of the features, because ....
     ::std::copy( _rFeatures.begin(), _rFeatures.end(),
@@ -3690,6 +3806,7 @@ FmXFormController::interceptedQueryDispatch(sal_uInt16 /*_nId*/, const URL& aURL
                                             const ::rtl::OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/)
                                             throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::interceptedQueryDispatch" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     Reference< XDispatch >  xReturn;
     // dispatches handled by ourself
@@ -3728,6 +3845,7 @@ FmXFormController::interceptedQueryDispatch(sal_uInt16 /*_nId*/, const URL& aURL
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArgs ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::dispatch" );
     if ( _rArgs.getLength() != 1 )
     {
         DBG_ERROR( "FmXFormController::dispatch: no arguments -> no dispatch!" );
@@ -3756,6 +3874,7 @@ void SAL_CALL FmXFormController::dispatch( const URL& _rURL, const Sequence< Pro
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::addStatusListener( const Reference< XStatusListener >& _rxListener, const URL& _rURL ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addStatusListener" );
     if (_rURL.Complete == FMURL_CONFIRM_DELETION)
     {
         if (_rxListener.is())
@@ -3774,6 +3893,7 @@ void SAL_CALL FmXFormController::addStatusListener( const Reference< XStatusList
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeStatusListener" );
     (void)_rURL;
     OSL_ENSURE(_rURL.Complete == FMURL_CONFIRM_DELETION, "FmXFormController::removeStatusListener: invalid (unsupported) URL!");
     // we never really added the listener, so we don't need to remove it
@@ -3782,6 +3902,7 @@ void SAL_CALL FmXFormController::removeStatusListener( const Reference< XStatusL
 //------------------------------------------------------------------------------
 Reference< XDispatchProviderInterceptor >  FmXFormController::createInterceptor(const Reference< XDispatchProviderInterception > & _xInterception)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::createInterceptor" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
 #ifdef DBG_UTIL
     // check if we already have a interceptor for the given object
@@ -3806,6 +3927,7 @@ Reference< XDispatchProviderInterceptor >  FmXFormController::createInterceptor(
 //------------------------------------------------------------------------------
 bool FmXFormController::ensureInteractionHandler()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::ensureInteractionHandler" );
     if ( m_xInteractionHandler.is() )
         return true;
     if ( m_bAttemptedHandlerCreation )
@@ -3822,6 +3944,7 @@ bool FmXFormController::ensureInteractionHandler()
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormController::handle( const Reference< XInteractionRequest >& _rRequest ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::handle" );
     if ( !ensureInteractionHandler() )
         return;
     m_xInteractionHandler->handle( _rRequest );
@@ -3830,6 +3953,7 @@ void SAL_CALL FmXFormController::handle( const Reference< XInteractionRequest >&
 //------------------------------------------------------------------------------
 void FmXFormController::deleteInterceptor(const Reference< XDispatchProviderInterception > & _xInterception)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::deleteInterceptor" );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     // search the interceptor responsible for the given object
     InterceptorsIterator aIter;
@@ -3858,6 +3982,7 @@ void FmXFormController::deleteInterceptor(const Reference< XDispatchProviderInte
 //--------------------------------------------------------------------
 void SAL_CALL FmXFormController::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::initialize" );
     DBG_ASSERT( !m_xInteractionHandler.is(), "FmXFormController::initialize: already initialized!" );
         // currently, we only initialize our interaction handler here, so it's sufficient to assert this
 
@@ -3868,6 +3993,7 @@ void SAL_CALL FmXFormController::initialize( const Sequence< Any >& aArguments )
 //--------------------------------------------------------------------
 void FmXFormController::implInvalidateCurrentControlDependentFeatures()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::implInvalidateCurrentControlDependentFeatures" );
     ::std::vector< sal_Int32 > aCurrentControlDependentFeatures;
 
     aCurrentControlDependentFeatures.push_back( SID_FM_SORTUP );
@@ -3883,5 +4009,6 @@ void FmXFormController::implInvalidateCurrentControlDependentFeatures()
 //--------------------------------------------------------------------
 void SAL_CALL FmXFormController::columnChanged( const EventObject& /*_event*/ ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::columnChanged" );
     implInvalidateCurrentControlDependentFeatures();
 }
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 733581521ea4..5ea5c451c253 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -88,6 +88,7 @@
 #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;
@@ -233,6 +234,7 @@ DBG_NAME(FmEntryData);
 FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface >& _rxIFace )
     :pParent( pParentData )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmEntryData::FmEntryData" );
     DBG_CTOR(FmEntryData,NULL);
     pChildList = new FmEntryDataList();
 
@@ -250,6 +252,7 @@ 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@sun.com", "FmEntryData::newObject" );
     // do not just copy, normalize it
     m_xNormalizedIFace = Reference< XInterface >( _rxIFace, UNO_QUERY );
     m_xProperties = m_xProperties.query( m_xNormalizedIFace );
@@ -259,6 +262,7 @@ void FmEntryData::newObject( const ::com::sun::star::uno::Reference< ::com::sun:
 //------------------------------------------------------------------------
 FmEntryData::FmEntryData( const FmEntryData& rEntryData )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmEntryData::FmEntryData" );
     pChildList = new FmEntryDataList();
     aText = rEntryData.GetText();
     m_aNormalImage = rEntryData.GetNormalImage();
@@ -282,6 +286,7 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData )
 //------------------------------------------------------------------------
 void FmEntryData::Clear()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmEntryData::Clear" );
     for (;;)
     {
         FmEntryData* pEntryData = GetChildList()->Remove(ULONG(0));
@@ -294,6 +299,7 @@ void FmEntryData::Clear()
 //------------------------------------------------------------------------
 sal_Bool FmEntryData::IsEqualWithoutChilds( FmEntryData* pEntryData )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmEntryData::IsEqualWithoutChilds" );
     if(this == pEntryData)
         return sal_True;
 
@@ -396,6 +402,7 @@ FmControlData::FmControlData( const Reference< XFormComponent >& _rxComponent, c
     :FmEntryData( _pParent, _rxComponent )
     ,m_xFormComponent( _rxComponent )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmControlData::FmControlData" );
     DBG_CTOR(FmControlData,NULL);
     //////////////////////////////////////////////////////////////////////
     // Images setzen
@@ -437,6 +444,7 @@ FmEntryData* FmControlData::Clone()
 //------------------------------------------------------------------------
 Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmControlData::FmControlData" );
     //////////////////////////////////////////////////////////////////////
     // Default-Image
     Image aImage = ilNavigatorImages.GetImage( RID_SVXIMG_CONTROL );
@@ -545,6 +553,7 @@ Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const
 //------------------------------------------------------------------------
 sal_Bool FmControlData::IsEqualWithoutChilds( FmEntryData* pEntryData )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmControlData::IsEqualWithoutChilds" );
     if(this == pEntryData)
         return sal_True;
 
@@ -561,6 +570,7 @@ sal_Bool FmControlData::IsEqualWithoutChilds( FmEntryData* pEntryData )
 //------------------------------------------------------------------------
 void FmControlData::ModelReplaced( const Reference< XFormComponent >& _rxNew, const ImageList& _rNormalImages, const ImageList& _rHCImages )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@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 892894d23cb4..fc87ebc37454 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -82,6 +82,7 @@
 using namespace ::svxform;
 #endif
 #include <comphelper/property.hxx>
+#include <rtl/logfile.hxx>
 
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::UNO_QUERY;
@@ -100,6 +101,7 @@ FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, FASTBOOL bMaster
 #endif
            ,m_pBasic(_pBasic)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::FmFormPage" );
 }
 
 //------------------------------------------------------------------
@@ -112,6 +114,7 @@ FmFormPage::FmFormPage(const FmFormPage& rPage)
 #endif
            ,m_pBasic(0)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::FmFormPage" );
     m_sPageName = rPage.m_sPageName;
 }
 
@@ -126,6 +129,7 @@ FmFormPage::~FmFormPage()
 //------------------------------------------------------------------
 void FmFormPage::SetModel(SdrModel* pNewModel)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@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
@@ -164,6 +168,7 @@ void FmFormPage::SetModel(SdrModel* pNewModel)
 //------------------------------------------------------------------
 SdrPage* FmFormPage::Clone() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::Clone" );
     return new FmFormPage(*this);
     // hier fehlt noch ein kopieren der Objekte
 }
@@ -172,6 +177,7 @@ SdrPage* FmFormPage::Clone() const
 void FmFormPage::InsertObject(SdrObject* pObj, ULONG nPos,
                               const SdrInsertReason* pReason)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::InsertObject" );
     SdrPage::InsertObject( pObj, nPos, pReason );
 #ifndef SVX_LIGHT
     if (GetModel() && (!pReason || pReason->GetReason() != SDRREASON_STREAMING))
@@ -182,6 +188,7 @@ void FmFormPage::InsertObject(SdrObject* pObj, ULONG nPos,
 //------------------------------------------------------------------
 const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & FmFormPage::GetForms( bool _bForceCreate ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::GetForms" );
 #ifndef SVX_LIGHT
     const SdrPage& rMasterPage( *this );
     const FmFormPage* pFormPage = dynamic_cast< const FmFormPage* >( &rMasterPage );
@@ -200,6 +207,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContai
 sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
                               const HelpEvent& rEvt )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::RequestHelp" );
 #ifndef SVX_LIGHT
     if( pView->IsAction() )
         return sal_False;
@@ -267,6 +275,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
 //------------------------------------------------------------------
 SdrObject* FmFormPage::RemoveObject(ULONG nObjNum)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::RemoveObject" );
     SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
 #ifndef SVX_LIGHT
     if (pObj && GetModel())
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index b50c72fd261c..ae9e5a349532 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -58,6 +58,7 @@
 #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;
@@ -76,7 +77,9 @@ FmFormPageImpl::FmFormPageImpl(FmFormPage* _pPage)
                :pPage(_pPage)
                ,m_bFirstActivation( sal_True )
                ,m_bAttemptedFormCreation( false )
+               ,m_bInFind( false )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::FmFormPageImpl" );
     DBG_CTOR(FmFormPageImpl,NULL);
 }
 
@@ -163,7 +166,9 @@ FmFormPageImpl::FmFormPageImpl(FmFormPage* _pPage, const FmFormPageImpl& rImpl)
     :pPage(_pPage)
     ,m_bFirstActivation( sal_True )
     ,m_bAttemptedFormCreation( false )
+               ,m_bInFind( false )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::FmFormPageImpl" );
     DBG_CTOR(FmFormPageImpl,NULL);
 
     // clone the Forms collection
@@ -239,6 +244,7 @@ FmFormPageImpl::FmFormPageImpl(FmFormPage* _pPage, const FmFormPageImpl& rImpl)
 //------------------------------------------------------------------------------
 const Reference< XNameContainer >& FmFormPageImpl::getForms( bool _bForceCreate )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::getForms" );
     if ( m_xForms.is() || !_bForceCreate )
         return m_xForms;
 
@@ -288,6 +294,7 @@ FmFormPageImpl::~FmFormPageImpl()
 //------------------------------------------------------------------------------
 bool FmFormPageImpl::validateCurForm()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::validateCurForm" );
     if ( !xCurrentForm.is() )
         return false;
 
@@ -302,12 +309,14 @@ bool FmFormPageImpl::validateCurForm()
 //------------------------------------------------------------------------------
 void FmFormPageImpl::setCurForm(Reference< ::com::sun::star::form::XForm >  xForm)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::setCurForm" );
     xCurrentForm = xForm;
 }
 
 //------------------------------------------------------------------------------
 Reference< XForm >  FmFormPageImpl::getDefaultForm()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::getDefaultForm" );
     Reference< XForm > xForm;
 
     Reference< XNameContainer > xForms( getForms() );
@@ -389,6 +398,7 @@ Reference< ::com::sun::star::form::XForm >  FmFormPageImpl::findPlaceInFormCompo
     const Reference< XFormComponent > & rContent, const Reference< XDataSource > & rDatabase,
     const ::rtl::OUString& rDBTitle, const ::rtl::OUString& rCursorSource, sal_Int32 nCommandType )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@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;
@@ -478,6 +488,7 @@ Reference< XForm >  FmFormPageImpl::findFormForDataSource(
         const Reference< XForm > & rForm, const Reference< XDataSource > & _rxDatabase,
         const ::rtl::OUString& _rCursorSource, sal_Int32 nCommandType)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::findFormForDataSource" );
     Reference< XForm >          xResultForm;
     Reference< XRowSet >        xDBForm(rForm, UNO_QUERY);
     Reference< XPropertySet >   xFormProps(rForm, UNO_QUERY);
@@ -558,6 +569,7 @@ Reference< XForm >  FmFormPageImpl::findFormForDataSource(
 //------------------------------------------------------------------------------
 ::rtl::OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xFormComponent, const Reference< XForm > & xControls)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::setUniqueName" );
 #if OSL_DEBUG_LEVEL > 0
     try
     {
@@ -599,6 +611,7 @@ Reference< XForm >  FmFormPageImpl::findFormForDataSource(
 
 UniString FmFormPageImpl::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::getDefaultName" );
     sal_uInt16 nResId;
 
     switch (_nClassId)
@@ -641,6 +654,7 @@ UniString FmFormPageImpl::getDefaultName( sal_Int16 _nClassId, const Reference<
 ::rtl::OUString FmFormPageImpl::getDefaultName(
     sal_Int16 _nClassId, const Reference< XForm >& _rxControls, const Reference< XServiceInfo >& _rxObject ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::getDefaultName" );
     ::rtl::OUString aClassName=getDefaultName( _nClassId, _rxObject );
 
     Reference< ::com::sun::star::container::XNameAccess >  xNamedSet( _rxControls, UNO_QUERY );
@@ -650,6 +664,7 @@ UniString FmFormPageImpl::getDefaultName( sal_Int16 _nClassId, const Reference<
 //------------------------------------------------------------------
 ::rtl::OUString FmFormPageImpl::getUniqueName(const ::rtl::OUString& rName, const Reference< ::com::sun::star::container::XNameAccess > & xNamedSet) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::getUniqueName" );
     Reference< ::com::sun::star::container::XIndexAccess >  xIndexSet(xNamedSet, UNO_QUERY);
     ::rtl::OUString sName( rName );
 
@@ -664,4 +679,3 @@ UniString FmFormPageImpl::getDefaultName( sal_Int16 _nClassId, const Reference<
 
     return sName;
 }
-
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index c7094fb9562e..00dca9dfe7ad 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -112,6 +112,7 @@
 #include <comphelper/extract.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svx/sdrpagewindow.hxx>
+#include <rtl/logfile.hxx>
 
 #include <algorithm>
 #include <functional>
@@ -373,6 +374,7 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun
 //------------------------------------------------------------------------------
 sal_Bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& _rContainer) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXBoundFormFieldIterator::ShouldStepInto" );
     if (_rContainer == m_xStartingPoint)
         // would be quite stupid to step over the root ....
         return sal_True;
@@ -383,6 +385,7 @@ sal_Bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>&
 //------------------------------------------------------------------------------
 sal_Bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface>& _rElement)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXBoundFormFieldIterator::ShouldHandleElement" );
     if (!_rElement.is())
         // NULL element
         return sal_False;
@@ -514,6 +517,7 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
         ,m_bPreparedClose( sal_False )
         ,m_bFirstActivation( sal_True )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::FmXFormShell" );
     DBG_CTOR(FmXFormShell,NULL);
     m_aMarkTimer.SetTimeout(100);
     m_aMarkTimer.SetTimeoutHdl(LINK(this,FmXFormShell,OnTimeOut));
@@ -546,6 +550,7 @@ FmXFormShell::~FmXFormShell()
 //------------------------------------------------------------------
 Reference< XModel > FmXFormShell::getContextDocument() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getContextDocument" );
     Reference< XModel > xModel;
 
     // determine the type of document we live in
@@ -567,12 +572,14 @@ Reference< XModel > FmXFormShell::getContextDocument() const
 //------------------------------------------------------------------
 bool FmXFormShell::isEnhancedForm() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isEnhancedForm" );
     return getDocumentType() == eEnhancedForm;
 }
 
 //------------------------------------------------------------------
 bool FmXFormShell::impl_checkDisposed() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_checkDisposed" );
     if ( !m_pShell )
     {
         OSL_ENSURE( false, "FmXFormShell::impl_checkDisposed: already disposed!" );
@@ -584,6 +591,7 @@ bool FmXFormShell::impl_checkDisposed() const
 //------------------------------------------------------------------
 ::svxform::DocumentType FmXFormShell::getDocumentType() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getDocumentType" );
     if ( m_eDocumentType != eUnknownDocumentType )
         return m_eDocumentType;
 
@@ -604,6 +612,7 @@ bool FmXFormShell::impl_checkDisposed() const
 //------------------------------------------------------------------
 bool FmXFormShell::IsReadonlyDoc() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsReadonlyDoc" );
     if ( impl_checkDisposed() )
         return true;
 
@@ -616,16 +625,19 @@ bool FmXFormShell::IsReadonlyDoc() const
 //------------------------------------------------------------------
 Any SAL_CALL FmXFormShell::queryInterface( const Type& type) throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::queryInterface" );
     return FmXFormShell_BASE::queryInterface(type);
 }
 //------------------------------------------------------------------------------
 Sequence< Type > SAL_CALL FmXFormShell::getTypes(  ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getTypes" );
     return FmXFormShell_BASE::getTypes();
 }
 //------------------------------------------------------------------------------
 Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getImplementationId" );
     static ::cppu::OImplementationId* pId = 0;
     if (! pId)
     {
@@ -642,6 +654,7 @@ Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeE
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::disposing" );
     impl_checkDisposed();
 
     if (m_xActiveController == e.Source)
@@ -680,6 +693,7 @@ void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeExcept
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::propertyChange" );
     if ( impl_checkDisposed() )
         return;
 
@@ -716,6 +730,7 @@ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw
 //------------------------------------------------------------------------------
 void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::invalidateFeatures" );
     if ( impl_checkDisposed() )
         return;
 
@@ -745,6 +760,7 @@ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatu
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::formActivated" );
     if ( impl_checkDisposed() )
         return;
 
@@ -756,6 +772,7 @@ void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( Runt
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::formDeactivated" );
     if ( impl_checkDisposed() )
         return;
 
@@ -766,6 +783,7 @@ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( Ru
 //------------------------------------------------------------------------------
 void FmXFormShell::disposing()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::disposing" );
     OSL_TRACE( "--- FmXFormShell::disposing      : %p, ........, ........\n", this );
     impl_checkDisposed();
 
@@ -854,6 +872,7 @@ void FmXFormShell::disposing()
 //------------------------------------------------------------------------------
 void FmXFormShell::UpdateSlot( sal_Int16 _nId )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::UpdateSlot" );
     if ( impl_checkDisposed() )
         return;
 
@@ -875,6 +894,7 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId )
 //------------------------------------------------------------------------------
 void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::InvalidateSlot" );
     if ( impl_checkDisposed() )
         return;
 
@@ -895,6 +915,7 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
 //------------------------------------------------------------------------------
 void FmXFormShell::LockSlotInvalidation(sal_Bool bLock)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::LockSlotInvalidation" );
     if ( impl_checkDisposed() )
         return;
 
@@ -941,6 +962,7 @@ IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG)
 //------------------------------------------------------------------------------
 void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ForceUpdateSelection" );
     if ( impl_checkDisposed() )
         return;
 
@@ -962,6 +984,7 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
 //------------------------------------------------------------------------------
 PopupMenu* FmXFormShell::GetConversionMenu()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetConversionMenu" );
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     BOOL bIsHiContrastMode  = rSettings.GetMenuColor().IsDark();
 
@@ -980,6 +1003,7 @@ PopupMenu* FmXFormShell::GetConversionMenu()
 //------------------------------------------------------------------------------
 bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isControlConversionSlot" );
     for ( size_t i = 0; i < sizeof( nConvertSlots ) / sizeof( nConvertSlots[0] ); ++i )
         if (nConvertSlots[i] == nSlotId)
             return true;
@@ -989,6 +1013,7 @@ bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId )
 //------------------------------------------------------------------------------
 bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::executeControlConversionSlot" );
     OSL_PRECOND( canConvertCurrentSelectionToControl( _nSlotId ), "FmXFormShell::executeControlConversionSlot: illegal call!" );
     InterfaceBag::const_iterator aSelectedElement = m_aCurrentSelection.begin();
     if ( aSelectedElement == m_aCurrentSelection.end() )
@@ -1000,6 +1025,7 @@ bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId )
 //------------------------------------------------------------------------------
 bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent >& _rxObject, sal_uInt16 _nSlotId )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::executeControlConversionSlot" );
     if ( impl_checkDisposed() )
         return false;
 
@@ -1200,6 +1226,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent
 //------------------------------------------------------------------------------
 bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlot )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::canConvertCurrentSelectionToControl" );
     if ( m_aCurrentSelection.empty() )
         return false;
 
@@ -1238,6 +1265,7 @@ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlo
 //------------------------------------------------------------------------------
 void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::checkControlConversionSlotsForCurrentSelection" );
     for (sal_Int16 i=0; i<rMenu.GetItemCount(); ++i)
         // der Context ist schon von einem Typ, der dem Eitnrag entspricht -> disable
         rMenu.EnableItem( rMenu.GetItemId(i), canConvertCurrentSelectionToControl( rMenu.GetItemId( i ) ) );
@@ -1246,6 +1274,7 @@ void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu )
 //------------------------------------------------------------------------------
 void FmXFormShell::LoopGrids(sal_Int16 nWhat)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::LoopGrids" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1315,6 +1344,7 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat)
 //------------------------------------------------------------------------------
 Reference< XControlContainer > FmXFormShell::getControlContainerForView()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getControlContainerForView" );
     if ( impl_checkDisposed() )
         return NULL;
 
@@ -1332,6 +1362,7 @@ Reference< XControlContainer > FmXFormShell::getControlContainerForView()
 //------------------------------------------------------------------------------
 void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >& _rxForForm )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteTabOrderDialog" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1380,6 +1411,7 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >
 //------------------------------------------------------------------------------
 void FmXFormShell::ExecuteSearch()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteSearch" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1523,6 +1555,7 @@ void FmXFormShell::ExecuteSearch()
 //------------------------------------------------------------------------------
 sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetY2KState" );
     if ( impl_checkDisposed() )
         return sal_False;
 
@@ -1562,6 +1595,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
 //------------------------------------------------------------------------------
 void FmXFormShell::SetY2KState(sal_uInt16 n)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetY2KState" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1636,6 +1670,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
 //------------------------------------------------------------------------------
 void FmXFormShell::CloseExternalFormViewer()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::CloseExternalFormViewer" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1657,6 +1692,7 @@ void FmXFormShell::CloseExternalFormViewer()
 //------------------------------------------------------------------------------
 Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet>& _xForm) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getInternalForm" );
     if ( impl_checkDisposed() )
         return NULL;
 
@@ -1672,6 +1708,7 @@ Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet
 //------------------------------------------------------------------------------
 Reference< XForm> FmXFormShell::getInternalForm(const Reference< XForm>& _xForm) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getInternalForm" );
     if ( impl_checkDisposed() )
         return NULL;
 
@@ -1700,6 +1737,7 @@ namespace
 //------------------------------------------------------------------------------
 bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pCompleteState )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsFormSlotEnabled" );
     const ::svx::ControllerFeatures& rController =
             lcl_isNavigationRelevant( _nSlot )
         ?   getNavControllerFeatures()
@@ -1715,6 +1753,7 @@ bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pComplete
 //------------------------------------------------------------------------------
 void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteFormSlot" );
     const ::svx::ControllerFeatures& rController =
             lcl_isNavigationRelevant( _nSlot )
         ?   getNavControllerFeatures()
@@ -1750,6 +1789,7 @@ void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot )
 //------------------------------------------------------------------------------
 void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_switchActiveControllerListening" );
     Reference< XComponent> xComp( m_xActiveController, UNO_QUERY );
     if ( !xComp.is() )
         return;
@@ -1763,6 +1803,7 @@ void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen )
 //------------------------------------------------------------------------------
 void FmXFormShell::setActiveController( const Reference< XFormController>& xController, sal_Bool _bNoSaveOldContent )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setActiveController" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1879,12 +1920,14 @@ void FmXFormShell::setActiveController( const Reference< XFormController>& xCont
 //------------------------------------------------------------------------------
 void FmXFormShell::getCurrentSelection( InterfaceBag& /* [out] */ _rSelection ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getCurrentSelection" );
     _rSelection = m_aCurrentSelection;
 }
 
 //------------------------------------------------------------------------------
 bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setCurrentSelectionFromMark" );
     m_aLastKnownMarkedControls.clear();
 
     if ( ( _rMarkList.GetMarkCount() > 0 ) && isControlList( _rMarkList ) )
@@ -1896,12 +1939,14 @@ bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList )
 //------------------------------------------------------------------------------
 bool FmXFormShell::selectLastMarkedControls()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::selectLastMarkedControls" );
     return setCurrentSelection( m_aLastKnownMarkedControls );
 }
 
 //------------------------------------------------------------------------------
 bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setCurrentSelection" );
     if ( impl_checkDisposed() )
         return false;
 
@@ -1983,12 +2028,14 @@ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection )
 //------------------------------------------------------------------------------
 bool FmXFormShell::isSolelySelected( const Reference< XInterface >& _rxObject )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isSolelySelected" );
     return ( m_aCurrentSelection.size() == 1 ) && ( *m_aCurrentSelection.begin() == _rxObject );
 }
 
 //------------------------------------------------------------------------------
 void FmXFormShell::forgetCurrentForm()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::forgetCurrentForm" );
     if ( !m_xCurrentForm.is() )
         return;
 
@@ -2003,6 +2050,7 @@ void FmXFormShell::forgetCurrentForm()
 //------------------------------------------------------------------------------
 void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurForm )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_updateCurrentForm" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2021,6 +2069,7 @@ void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurFo
 //------------------------------------------------------------------------------
 void FmXFormShell::startListening()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::startListening" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2100,6 +2149,7 @@ void FmXFormShell::startListening()
 //------------------------------------------------------------------------------
 void FmXFormShell::stopListening()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::stopListening" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2123,6 +2173,7 @@ void FmXFormShell::stopListening()
 //------------------------------------------------------------------------------
 void FmXFormShell::ShowSelectionProperties( sal_Bool bShow )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ShowSelectionProperties" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2448,6 +2499,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
 //------------------------------------------------------------------------------
 void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementInserted" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2461,6 +2513,7 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::
 //------------------------------------------------------------------------------
 void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementReplaced" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2474,6 +2527,7 @@ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun::
 //------------------------------------------------------------------------------
 void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementRemoved" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2486,6 +2540,7 @@ void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::s
 //------------------------------------------------------------------------------
 void FmXFormShell::UpdateForms( sal_Bool _bInvalidate )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::UpdateForms" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2509,29 +2564,34 @@ void FmXFormShell::UpdateForms( sal_Bool _bInvalidate )
 }
 
 //------------------------------------------------------------------------------
-void FmXFormShell::AddElement(const Reference< XInterface>& Element)
+void FmXFormShell::AddElement(const Reference< XInterface>& _xElement)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::AddElement" );
     if ( impl_checkDisposed() )
         return;
-
+    impl_AddElement_nothrow(_xElement);
+}
+// -----------------------------------------------------------------------------
+void FmXFormShell::impl_AddElement_nothrow(const Reference< XInterface>& Element)
+{
     // am Container horchen
-    Reference< XIndexContainer> xContainer(Element, UNO_QUERY);
+    const Reference< XIndexContainer> xContainer(Element, UNO_QUERY);
     if (xContainer.is())
     {
-        sal_uInt32 nCount = xContainer->getCount();
+        const sal_uInt32 nCount = xContainer->getCount();
         Reference< XInterface> xElement;
-        for (sal_uInt32 i = 0; i < nCount; i++)
+        for (sal_uInt32 i = 0; i < nCount; ++i)
         {
-            xContainer->getByIndex(i) >>= xElement;
-            AddElement(xElement);
+            xElement.set(xContainer->getByIndex(i),UNO_QUERY);
+            impl_AddElement_nothrow(xElement);
         }
 
-        Reference< XContainer> xCont(Element, UNO_QUERY);
+        const Reference< XContainer> xCont(Element, UNO_QUERY);
         if (xCont.is())
             xCont->addContainerListener(this);
     }
 
-    Reference< ::com::sun::star::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY);
+    const Reference< ::com::sun::star::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY);
     if (xSelSupplier.is())
         xSelSupplier->addSelectionChangeListener(this);
 }
@@ -2539,27 +2599,32 @@ void FmXFormShell::AddElement(const Reference< XInterface>& Element)
 //------------------------------------------------------------------------------
 void FmXFormShell::RemoveElement(const Reference< XInterface>& Element)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::RemoveElement" );
     if ( impl_checkDisposed() )
         return;
-
-    Reference< ::com::sun::star::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY);
+    impl_RemoveElement_nothrow(Element);
+}
+//------------------------------------------------------------------------------
+void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Element)
+{
+    const Reference< ::com::sun::star::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY);
     if (xSelSupplier.is())
         xSelSupplier->removeSelectionChangeListener(this);
 
     // Verbindung zu Kindern aufheben
-    Reference< XIndexContainer> xContainer(Element, UNO_QUERY);
+    const Reference< XIndexContainer> xContainer(Element, UNO_QUERY);
     if (xContainer.is())
     {
-        Reference< XContainer> xCont(Element, UNO_QUERY);
+        const Reference< XContainer> xCont(Element, UNO_QUERY);
         if (xCont.is())
             xCont->removeContainerListener(this);
 
-        sal_uInt32 nCount = xContainer->getCount();
+        const sal_uInt32 nCount = xContainer->getCount();
         Reference< XInterface> xElement;
         for (sal_uInt32 i = 0; i < nCount; i++)
         {
-            xContainer->getByIndex(i) >>= xElement;
-            RemoveElement(xElement);
+            xElement.set(xContainer->getByIndex(i),UNO_QUERY);
+            impl_RemoveElement_nothrow(xElement);
         }
     }
 
@@ -2571,6 +2636,7 @@ void FmXFormShell::RemoveElement(const Reference< XInterface>& Element)
 //------------------------------------------------------------------------------
 void FmXFormShell::selectionChanged(const EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::selectionChanged" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2612,6 +2678,7 @@ IMPL_LINK(FmXFormShell, OnTimeOut, void*, /*EMPTYTAG*/)
 //------------------------------------------------------------------------
 void FmXFormShell::SetSelectionDelayed()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetSelectionDelayed" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2622,6 +2689,7 @@ void FmXFormShell::SetSelectionDelayed()
 //------------------------------------------------------------------------
 void FmXFormShell::SetSelection(const SdrMarkList& rMarkList)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetSelection" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2632,6 +2700,7 @@ void FmXFormShell::SetSelection(const SdrMarkList& rMarkList)
 //------------------------------------------------------------------------
 void FmXFormShell::DetermineSelection(const SdrMarkList& rMarkList)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::DetermineSelection" );
     if ( setCurrentSelectionFromMark( rMarkList ) && IsPropBrwOpen() )
         ShowSelectionProperties( sal_True );
 }
@@ -2639,6 +2708,7 @@ void FmXFormShell::DetermineSelection(const SdrMarkList& rMarkList)
 //------------------------------------------------------------------------------
 sal_Bool FmXFormShell::IsPropBrwOpen() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsPropBrwOpen" );
     if ( impl_checkDisposed() )
         return sal_False;
 
@@ -2675,6 +2745,7 @@ public:
 //------------------------------------------------------------------------------
 void FmXFormShell::SetDesignMode(sal_Bool bDesign)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetDesignMode" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2761,6 +2832,7 @@ void FmXFormShell::SetDesignMode(sal_Bool bDesign)
 //------------------------------------------------------------------------------
 Reference< XControl> FmXFormShell::GetControlFromModel(const Reference< XControlModel>& xModel)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetControlFromModel" );
     if ( impl_checkDisposed() )
         return NULL;
 
@@ -2782,6 +2854,7 @@ Reference< XControl> FmXFormShell::GetControlFromModel(const Reference< XControl
 void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInterface>& _rxStartingPoint,
     const ::rtl::OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< String >& _out_rNames )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_collectFormSearchContexts_nothrow" );
     try
     {
         Reference< XIndexAccess> xContainer( _rxStartingPoint, UNO_QUERY );
@@ -2836,6 +2909,7 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt
 //------------------------------------------------------------------------------
 void FmXFormShell::startFiltering()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::startFiltering" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2902,6 +2976,7 @@ void saveFilter(const Reference< XFormController>& _rxController)
 //------------------------------------------------------------------------------
 void FmXFormShell::stopFiltering(sal_Bool bSave)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::stopFiltering" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3040,6 +3115,7 @@ void clearFilter(const Reference< XFormController>& _rxController)
 //------------------------------------------------------------------------------
 void FmXFormShell::clearFilter()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::clearFilter" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3070,6 +3146,7 @@ void FmXFormShell::clearFilter()
 //------------------------------------------------------------------------------
 void FmXFormShell::setControlLocks()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setControlLocks" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3117,6 +3194,7 @@ void FmXFormShell::setControlLocks()
 //------------------------------------------------------------------------------
 void FmXFormShell::restoreControlLocks()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::restoreControlLocks" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3170,6 +3248,7 @@ void FmXFormShell::restoreControlLocks()
 //------------------------------------------------------------------------------
 void FmXFormShell::DoAsyncCursorAction(const Reference< XFormController>& _xController, CURSOR_ACTION _eWhat)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::DoAsyncCursorAction" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3180,6 +3259,7 @@ void FmXFormShell::DoAsyncCursorAction(const Reference< XFormController>& _xCont
 //------------------------------------------------------------------------------
 void FmXFormShell::DoAsyncCursorAction(const Reference< XResultSet>& _xForm, CURSOR_ACTION _eWhat)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::DoAsyncCursorAction" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3227,6 +3307,7 @@ void FmXFormShell::DoAsyncCursorAction(const Reference< XResultSet>& _xForm, CUR
 //------------------------------------------------------------------------------
 sal_Bool FmXFormShell::HasPendingCursorAction(const Reference< XResultSet>& _xForm) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::HasPendingCursorAction" );
     if ( impl_checkDisposed() )
         return sal_False;
 
@@ -3243,6 +3324,7 @@ sal_Bool FmXFormShell::HasPendingCursorAction(const Reference< XResultSet>& _xFo
 //------------------------------------------------------------------------------
 sal_Bool FmXFormShell::HasPendingCursorAction(const Reference< XFormController>& xController) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::HasPendingCursorAction" );
     if ( impl_checkDisposed() )
         return sal_False;
 
@@ -3255,6 +3337,7 @@ sal_Bool FmXFormShell::HasPendingCursorAction(const Reference< XFormController>&
 //------------------------------------------------------------------------------
 sal_Bool FmXFormShell::HasAnyPendingCursorAction() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::HasAnyPendingCursorAction" );
     ::osl::MutexGuard aGuard( const_cast< FmXFormShell* >( this )->m_aAsyncSafety );
 
     for ( CursorActions::const_iterator aIter = m_aCursorActions.begin(); aIter != m_aCursorActions.end(); ++aIter )
@@ -3268,6 +3351,7 @@ sal_Bool FmXFormShell::HasAnyPendingCursorAction() const
 //------------------------------------------------------------------------------
 void FmXFormShell::CancelAnyPendingCursorAction()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::CancelAnyPendingCursorAction" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3368,6 +3452,7 @@ IMPL_LINK(FmXFormShell, OnCursorActionDoneMainThread, FmCursorActionThread*, pTh
 //------------------------------------------------------------------------------
 void FmXFormShell::CreateExternalView()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::CreateExternalView" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3801,6 +3886,7 @@ void FmXFormShell::CreateExternalView()
 //------------------------------------------------------------------------
 void FmXFormShell::implAdjustConfigCache()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::implAdjustConfigCache" );
     // get (cache) the wizard usage flag
     Sequence< ::rtl::OUString > aNames(1);
     aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled");
@@ -3812,6 +3898,7 @@ void FmXFormShell::implAdjustConfigCache()
 //------------------------------------------------------------------------
 void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::Notify" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3828,6 +3915,7 @@ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >&
 //------------------------------------------------------------------------
 void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetWizardUsing" );
     m_bUseWizards = _bUseThem;
 
     Sequence< ::rtl::OUString > aNames(1);
@@ -3840,6 +3928,7 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
 //------------------------------------------------------------------------
 void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController /* = sal_True */ )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewDeactivated" );
     OSL_TRACE( "--- FmXFormShell::viewDeactivated: %p, %p, ........\n", this, &_rCurrentView );
 
     if ( _rCurrentView.GetImpl() && !_rCurrentView.IsDesignMode() )
@@ -3913,6 +4002,7 @@ IMPL_LINK( FmXFormShell, OnFormsCreated, FmFormPage*, /*_pPage*/ )
 //------------------------------------------------------------------------
 void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction /* = sal_False */ )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewActivated" );
     OSL_TRACE( "--- FmXFormShell::viewActivated  : %p, %p, ........\n", this, &_rCurrentView );
 
     FmFormPage* pPage = _rCurrentView.GetCurPage();
@@ -3963,6 +4053,7 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncActi
 //------------------------------------------------------------------------------
 void FmXFormShell::impl_defaultCurrentForm_nothrow()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_defaultCurrentForm_nothrow" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3993,6 +4084,7 @@ void FmXFormShell::impl_defaultCurrentForm_nothrow()
 //------------------------------------------------------------------------------
 void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::smartControlReset" );
     if (!_rxModels.is())
     {
         DBG_ERROR("FmXFormShell::smartControlReset: invalid container!");
@@ -4062,6 +4154,7 @@ IMPL_LINK( FmXFormShell, OnLoadForms, FmFormPage*, /*_pPage*/ )
 //------------------------------------------------------------------------
 void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /* FORMS_LOAD | FORMS_SYNC */ )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::loadForms" );
     DBG_ASSERT( ( _nBehaviour & ( FORMS_ASYNC | FORMS_UNLOAD ) )  != ( FORMS_ASYNC | FORMS_UNLOAD ),
         "FmXFormShell::loadForms: async loading not supported - this will heavily fail!" );
 
@@ -4139,35 +4232,41 @@ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /
 //------------------------------------------------------------------------
 void FmXFormShell::ExecuteTextAttribute( SfxRequest& _rReq )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteTextAttribute" );
     m_pTextShell->ExecuteTextAttribute( _rReq );
 }
 
 //------------------------------------------------------------------------
 void FmXFormShell::GetTextAttributeState( SfxItemSet& _rSet )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetTextAttributeState" );
     m_pTextShell->GetTextAttributeState( _rSet );
 }
 
 //------------------------------------------------------------------------
 bool FmXFormShell::IsActiveControl( bool _bCountRichTextOnly ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsActiveControl" );
     return m_pTextShell->IsActiveControl( _bCountRichTextOnly );
 }
 
 //------------------------------------------------------------------------
 void FmXFormShell::ForgetActiveControl()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ForgetActiveControl" );
     m_pTextShell->ForgetActiveControl();
 }
 
 //------------------------------------------------------------------------
 void FmXFormShell::SetControlActivationHandler( const Link& _rHdl )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetControlActivationHandler" );
     m_pTextShell->SetControlActivationHandler( _rHdl );
 }
 //------------------------------------------------------------------------
 void FmXFormShell::handleShowPropertiesRequest()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::handleShowPropertiesRequest" );
     if ( onlyControlsAreMarked() )
         ShowSelectionProperties( sal_True );
 }
@@ -4175,6 +4274,7 @@ void FmXFormShell::handleShowPropertiesRequest()
 //------------------------------------------------------------------------
 void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::handleMouseButtonDown" );
     // catch simple double clicks
     if ( ( _rViewEvent.nMouseClicks == 2 ) && ( _rViewEvent.nMouseCode == MOUSE_LEFT ) )
     {
@@ -4261,6 +4361,7 @@ ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI
 //------------------------------------------------------------------------------
 ControlConversionMenuController::~ControlConversionMenuController()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ControlConversionMenuController::~ControlConversionMenuController" );
     m_pMainMenu->SetPopupMenu(SID_FM_CHANGECONTROLTYPE, NULL);
     delete m_pConversionMenu;
 }
@@ -4322,6 +4423,7 @@ FmCursorActionThread::FmCursorActionThread(const Reference< XResultSet>& _xDataS
     ,m_bTerminated(sal_False)
     ,m_bRunFailed(sal_False)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmCursorActionThread::FmCursorActionThread" );
     DBG_ASSERT(m_xDataSource.is() && Reference< XCancellable>(m_xDataSource, UNO_QUERY).is(),
         "FmCursorActionThread::FmCursorActionThread : invalid cursor !");
 }
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 159efb1331a1..95f1ae30f41c 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -107,6 +107,7 @@
 #include <comphelper/extract.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <algorithm>
+#include <rtl/logfile.hxx>
 
 namespace svxform
 {
@@ -158,6 +159,7 @@ namespace
 //  ------------------------------------------------------------------------------
 void displayException(const Any& _rExcept, Window* _pParent)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::displayException" );
     // check whether we need to display it
     if ( !lcl_shouldDisplayError( _rExcept ) )
         return;
@@ -213,6 +215,7 @@ void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, Windo
 //------------------------------------------------------------------------------
 Reference< XInterface > cloneUsingProperties(const Reference< ::com::sun::star::io::XPersistObject>& _xObj)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::cloneUsingProperties" );
     if (!_xObj.is())
         return Reference< XInterface >();
 
@@ -276,6 +279,7 @@ Reference< XInterface > cloneUsingProperties(const Reference< ::com::sun::star::
 //------------------------------------------------------------------------------
 sal_Bool searchElement(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::searchElement" );
     if (!xCont.is() || !xElement.is())
         return sal_False;
 
@@ -308,6 +312,7 @@ sal_Bool searchElement(const Reference< ::com::sun::star::container::XIndexAcces
 //------------------------------------------------------------------------------
 sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getElementPos" );
     sal_Int32 nIndex = -1;
     if (!xCont.is())
         return nIndex;
@@ -323,8 +328,7 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce
         {
             try
             {
-                Reference< XInterface > xCurrent;
-                xCont->getByIndex( nIndex ) >>= xCurrent;
+                Reference< XInterface > xCurrent(xCont->getByIndex( nIndex ),UNO_QUERY);
                 DBG_ASSERT( xCurrent.get() == Reference< XInterface >( xCurrent, UNO_QUERY ).get(),
                     "getElementPos: container element not normalized!" );
                 if ( xNormalized.get() == xCurrent.get() )
@@ -343,6 +347,7 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce
 //------------------------------------------------------------------
 String getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getFormComponentAccessPath" );
     Reference< ::com::sun::star::form::XFormComponent> xChild(_xElement, UNO_QUERY);
     Reference< ::com::sun::star::container::XIndexAccess> xParent;
     if (xChild.is())
@@ -385,6 +390,7 @@ String getFormComponentAccessPath(const Reference< XInterface >& _xElement)
 //------------------------------------------------------------------------------
 Reference< XInterface > getElementFromAccessPath(const Reference< ::com::sun::star::container::XIndexAccess>& _xParent, const String& _rRelativePath)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getElementFromAccessPath" );
     if (!_xParent.is())
         return Reference< XInterface >();
     Reference< ::com::sun::star::container::XIndexAccess> xContainer(_xParent);
@@ -428,6 +434,7 @@ _Optlink
 //------------------------------------------------------------------------------
 sal_Int32 findPos(const ::rtl::OUString& aStr, const Sequence< ::rtl::OUString>& rList)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::findPos" );
     const ::rtl::OUString* pStrList = rList.getConstArray();
     ::rtl::OUString* pResult = (::rtl::OUString*) bsearch(&aStr, (void*)pStrList, rList.getLength(), sizeof(::rtl::OUString),
         &NameCompare);
@@ -441,6 +448,7 @@ sal_Int32 findPos(const ::rtl::OUString& aStr, const Sequence< ::rtl::OUString>&
 //------------------------------------------------------------------
 Reference< ::com::sun::star::frame::XModel> getXModel(const Reference< XInterface >& xIface)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getXModel" );
     Reference< ::com::sun::star::frame::XModel> xModel(xIface, UNO_QUERY);
     if (xModel.is())
         return xModel;
@@ -460,6 +468,7 @@ Reference< ::com::sun::star::frame::XModel> getXModel(const Reference< XInterfac
 //------------------------------------------------------------------
 ::rtl::OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getLabelName" );
     if (!xControlModel.is())
         return ::rtl::OUString();
 
@@ -617,6 +626,7 @@ void FmXDisposeMultiplexer::dispose()
 //------------------------------------------------------------------------------
 sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@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 !");
@@ -721,6 +731,7 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString> getEventMethods(const Type& type)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getEventMethods" );
     typelib_InterfaceTypeDescription *pType=0;
     type.getDescription( (typelib_TypeDescription**)&pType);
 
@@ -752,6 +763,7 @@ Sequence< ::rtl::OUString> getEventMethods(const Type& type)
 void TransferEventScripts(const Reference< ::com::sun::star::awt::XControlModel>& xModel, const Reference< ::com::sun::star::awt::XControl>& xControl,
     const Sequence< ::com::sun::star::script::ScriptEventDescriptor>& rTransferIfAvailable)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::TransferEventScripts" );
     // first check if we have a XEventAttacherManager for the model
     Reference< ::com::sun::star::container::XChild> xModelChild(xModel, UNO_QUERY);
     if (!xModelChild.is())
@@ -849,6 +861,7 @@ void TransferEventScripts(const Reference< ::com::sun::star::awt::XControlModel>
 //------------------------------------------------------------------------------
 sal_Int16   GridView2ModelPos(const Reference< ::com::sun::star::container::XIndexAccess>& rColumns, sal_Int16 nViewPos)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::GridView2ModelPos" );
     try
     {
         if (rColumns.is())
@@ -1056,6 +1069,7 @@ void FmXDispatchInterceptorImpl::disposing()
 //------------------------------------------------------------------------------
 sal_Bool isLoadable( const Reference< XInterface >& _rxLoadable )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::isLoadable" );
     // determines whether a form should be loaded or not
     // if there is no datasource or connection there is no reason to load a form
     Reference< XPropertySet > xSet( _rxLoadable, UNO_QUERY );
@@ -1093,6 +1107,7 @@ sal_Bool isLoadable( const Reference< XInterface >& _rxLoadable )
 //------------------------------------------------------------------------------
 void setConnection(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const Reference< ::com::sun::star::sdbc::XConnection>& _rxConn)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::setConnection" );
     Reference< ::com::sun::star::beans::XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY);
     if (xRowSetProps.is())
     {
@@ -1111,6 +1126,7 @@ void setConnection(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
 //------------------------------------------------------------------------------
 sal_Bool isRowSetAlive(const Reference< XInterface >& _rxRowSet)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@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 878b94af1189..ea70f1f6c9e8 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -52,6 +52,7 @@
 #ifndef _SVX_FMRESIDS_HRC
 #include "fmresids.hrc"
 #endif
+#include <rtl/logfile.hxx>
 #include <svx/dialmgr.hxx>
 #include "fmpgeimp.hxx"
 #include "dbtoolsclient.hxx"
@@ -127,6 +128,7 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
                    ,bReadOnly( sal_False )
                    ,m_bDisposed( false )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::FmXUndoEnvironment" );
     DBG_CTOR(FmXUndoEnvironment,NULL);
 }
 
@@ -141,6 +143,7 @@ FmXUndoEnvironment::~FmXUndoEnvironment()
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::dispose()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::dispose" );
     OSL_ENSURE( !m_bDisposed, "FmXUndoEnvironment::dispose: disposed twice?" );
     if ( !m_bDisposed )
         return;
@@ -189,6 +192,7 @@ void FmXUndoEnvironment::dispose()
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::ModeChanged()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::ModeChanged" );
     OSL_PRECOND( rModel.GetObjectShell(), "FmXUndoEnvironment::ModeChanged: no object shell anymore!" );
     if ( !rModel.GetObjectShell() )
         return;
@@ -232,6 +236,7 @@ void FmXUndoEnvironment::ModeChanged()
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::Notify" );
     if (rHint.ISA(SdrHint))
     {
         SdrHint* pSdrHint = (SdrHint*)&rHint;
@@ -281,6 +286,7 @@ void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 //------------------------------------------------------------------
 void FmXUndoEnvironment::Inserted(SdrObject* pObj)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::Inserted" );
     if (pObj->GetObjInventor() == FmFormInventor)
     {
         FmFormObj* pFormObj = PTR_CAST(FmFormObj, pObj);
@@ -297,6 +303,7 @@ void FmXUndoEnvironment::Inserted(SdrObject* pObj)
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::Inserted(FmFormObj* pObj)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::Inserted" );
     DBG_ASSERT( pObj, "FmXUndoEnvironment::Inserted: invalid object!" );
     if ( !pObj )
         return;
@@ -354,6 +361,7 @@ void FmXUndoEnvironment::Inserted(FmFormObj* pObj)
 //------------------------------------------------------------------
 void FmXUndoEnvironment::Removed(SdrObject* pObj)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@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
@@ -375,13 +383,13 @@ void FmXUndoEnvironment::Removed(SdrObject* pObj)
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::Removed(FmFormObj* pObj)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::Removed" );
     DBG_ASSERT( pObj, "FmXUndoEnvironment::Removed: invalid object!" );
     if ( !pObj )
         return;
 
     // ist das Control noch einer Form zugeordnet
-    Reference< XInterface >  xModel(pObj->GetUnoControlModel(), UNO_QUERY);
-    Reference< XFormComponent >  xContent(xModel, UNO_QUERY);
+    Reference< XFormComponent >  xContent(pObj->GetUnoControlModel(), UNO_QUERY);
     if (xContent.is())
     {
         // das Object wird aus einer Liste herausgenommen
@@ -395,7 +403,7 @@ void FmXUndoEnvironment::Removed(FmFormObj* pObj)
         {
             Reference< XIndexAccess >  xIndexAccess((XIndexContainer*)xForm.get());
             // Feststellen an welcher Position sich das Kind befunden hat
-            sal_Int32 nPos = getElementPos(xIndexAccess, xContent);
+            const sal_Int32 nPos = getElementPos(xIndexAccess, xContent);
             if (nPos >= 0)
             {
                 Sequence< ScriptEventDescriptor > aEvts;
@@ -422,6 +430,7 @@ void FmXUndoEnvironment::Removed(FmFormObj* pObj)
 //------------------------------------------------------------------------------
 void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::disposing" );
     // check if it's an object we have cached informations about
     if (m_pPropertySetCache)
     {
@@ -440,6 +449,7 @@ 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@sun.com", "FmXUndoEnvironment::propertyChange" );
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
     if (!IsLocked())
@@ -635,6 +645,7 @@ 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@sun.com", "FmXUndoEnvironment::elementInserted" );
     ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() );
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -650,6 +661,7 @@ void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) thr
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::implSetModified()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::implSetModified" );
     if ( !IsLocked() && rModel.GetObjectShell() )
     {
         rModel.GetObjectShell()->SetModified( sal_True );
@@ -659,6 +671,7 @@ 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@sun.com", "FmXUndoEnvironment::elementReplaced" );
     ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() );
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -676,6 +689,7 @@ 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@sun.com", "FmXUndoEnvironment::elementRemoved" );
     ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() );
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -689,12 +703,14 @@ 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@sun.com", "FmXUndoEnvironment::modified" );
     implSetModified();
 }
 
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::AddForms(const Reference< XNameContainer > & rForms)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::AddForms" );
     Lock();
     Reference< XInterface >  xInt(rForms, UNO_QUERY);
     AddElement(xInt);
@@ -704,6 +720,7 @@ void FmXUndoEnvironment::AddForms(const Reference< XNameContainer > & rForms)
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::RemoveForms(const Reference< XNameContainer > & rForms)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::RemoveForms" );
     Lock();
     Reference< XInterface >  xInt(rForms, UNO_QUERY);
     RemoveElement(xInt);
@@ -713,6 +730,7 @@ void FmXUndoEnvironment::RemoveForms(const Reference< XNameContainer > & rForms)
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & Element)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::TogglePropertyListening" );
     // am Container horchen
     Reference< XIndexContainer >  xContainer(Element, UNO_QUERY);
     if (xContainer.is())
@@ -740,6 +758,7 @@ 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@sun.com", "FmXUndoEnvironment::switchListening" );
     OSL_PRECOND( _rxContainer.is(), "FmXUndoEnvironment::switchListening: invalid container!" );
     if ( !_rxContainer.is() )
         return;
@@ -789,6 +808,7 @@ 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@sun.com", "FmXUndoEnvironment::switchListening" );
     OSL_PRECOND( _rxObject.is(), "FmXUndoEnvironment::switchListening: how should I listen at a NULL object?" );
 
     try
@@ -823,6 +843,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::AddElement" );
     OSL_ENSURE( !m_bDisposed, "FmXUndoEnvironment::AddElement: not when I'm already disposed!" );
 
     // am Container horchen
@@ -836,6 +857,7 @@ void FmXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement )
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::RemoveElement" );
     if ( m_bDisposed )
         return;
 
@@ -870,6 +892,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC
                      ,aNewValue(evt.NewValue)
                      ,aOldValue(evt.OldValue)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoPropertyAction::FmUndoPropertyAction" );
     if (rNewMod.GetObjectShell())
         rNewMod.GetObjectShell()->SetModified(sal_True);
     if(static_STR_UNDO_PROPERTY.Len() == 0)
@@ -880,6 +903,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC
 //------------------------------------------------------------------------------
 void FmUndoPropertyAction::Undo()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoPropertyAction::Undo" );
     FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv();
 
     if (xObj.is() && !rEnv.IsLocked())
@@ -900,6 +924,7 @@ void FmUndoPropertyAction::Undo()
 //------------------------------------------------------------------------------
 void FmUndoPropertyAction::Redo()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoPropertyAction::Redo" );
     FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv();
 
     if (xObj.is() && !rEnv.IsLocked())
@@ -920,6 +945,7 @@ void FmUndoPropertyAction::Redo()
 //------------------------------------------------------------------------------
 String FmUndoPropertyAction::GetComment() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoPropertyAction::GetComment" );
     String aStr(static_STR_UNDO_PROPERTY);
 
     aStr.SearchAndReplace( '#', aPropertyName );
@@ -939,6 +965,7 @@ FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod,
                       ,m_nIndex( nIdx )
                       ,m_eAction( _eAction )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@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.
@@ -984,6 +1011,7 @@ FmUndoContainerAction::~FmUndoContainerAction()
 //------------------------------------------------------------------------------
 void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoContainerAction::implReInsert" );
     if ( m_xContainer->getCount() >= m_nIndex )
     {
         // insert the element
@@ -1013,6 +1041,7 @@ void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
 //------------------------------------------------------------------------------
 void FmUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoContainerAction::implReRemove" );
     Reference< XInterface > xElement;
     if ( ( m_nIndex >= 0 ) && ( m_nIndex < m_xContainer->getCount() ) )
         m_xContainer->getByIndex( m_nIndex ) >>= xElement;
@@ -1041,6 +1070,7 @@ void FmUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) )
 //------------------------------------------------------------------------------
 void FmUndoContainerAction::Undo()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoContainerAction::Undo" );
     FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( rMod ).GetUndoEnv();
 
     if ( m_xContainer.is() && !rEnv.IsLocked() && m_xElement.is() )
@@ -1070,6 +1100,7 @@ void FmUndoContainerAction::Undo()
 //------------------------------------------------------------------------------
 void FmUndoContainerAction::Redo()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoContainerAction::Redo" );
     FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( rMod ).GetUndoEnv();
     if ( m_xContainer.is() && !rEnv.IsLocked() && m_xElement.is() )
     {
@@ -1101,6 +1132,7 @@ FmUndoModelReplaceAction::FmUndoModelReplaceAction(FmFormModel& _rMod, SdrUnoObj
     ,m_xReplaced(_xReplaced)
     ,m_pObject(_pObject)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoModelReplaceAction::FmUndoModelReplaceAction" );
 }
 
 //------------------------------------------------------------------------------
@@ -1119,6 +1151,7 @@ FmUndoModelReplaceAction::~FmUndoModelReplaceAction()
 //------------------------------------------------------------------------------
 void FmUndoModelReplaceAction::Undo()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoModelReplaceAction::Undo" );
     try
     {
         Reference< XControlModel > xCurrentModel( m_pObject->GetUnoControlModel() );
@@ -1158,5 +1191,6 @@ void FmUndoModelReplaceAction::Undo()
 //------------------------------------------------------------------------------
 String FmUndoModelReplaceAction::GetComment() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoModelReplaceAction::GetComment" );
     return SVX_RES(RID_STR_UNDO_MODEL_REPLACE);
 }
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 2c3858824ffb..db4c7d678dd9 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -94,6 +94,7 @@
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
 #include <vcl/stdtext.hxx>
+#include <rtl/logfile.hxx>
 
 #include <algorithm>
 
@@ -164,6 +165,7 @@ FmXPageViewWinRec::FmXPageViewWinRec( const ::comphelper::ComponentContext& _rCo
     m_pViewImpl( _pViewImpl ),
     m_pWindow( dynamic_cast< Window* >( &_rWindow.GetPaintWindow().GetOutputDevice() ) )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::FmXPageViewWinRec" );
     DBG_CTOR(FmXPageViewWinRec,NULL);
 
     // create an XFormController for every form
@@ -197,6 +199,7 @@ FmXPageViewWinRec::~FmXPageViewWinRec()
 //------------------------------------------------------------------
 void FmXPageViewWinRec::dispose()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::dispose" );
     for (   ::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin();
             i != m_aControllerList.end();
             ++i
@@ -232,12 +235,14 @@ void FmXPageViewWinRec::dispose()
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXPageViewWinRec::hasElements(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::hasElements" );
     return getCount() != 0;
 }
 
 //------------------------------------------------------------------------------
 Type SAL_CALL  FmXPageViewWinRec::getElementType(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getElementType" );
     return ::getCppuType((const Reference< XFormController>*)0);
 }
 
@@ -245,6 +250,7 @@ Type SAL_CALL  FmXPageViewWinRec::getElementType(void) throw( RuntimeException )
 //------------------------------------------------------------------------------
 Reference< XEnumeration >  SAL_CALL FmXPageViewWinRec::createEnumeration(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::createEnumeration" );
     return new ::comphelper::OEnumerationByIndex(this);
 }
 
@@ -252,12 +258,14 @@ Reference< XEnumeration >  SAL_CALL FmXPageViewWinRec::createEnumeration(void) t
 //------------------------------------------------------------------------------
 sal_Int32 SAL_CALL FmXPageViewWinRec::getCount(void) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getCount" );
     return m_aControllerList.size();
 }
 
 //------------------------------------------------------------------------------
 Any SAL_CALL FmXPageViewWinRec::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getByIndex" );
     if (nIndex < 0 ||
         nIndex >= getCount())
         throw IndexOutOfBoundsException();
@@ -294,6 +302,7 @@ Reference< XFormController >  getControllerSearchChilds( const Reference< XIndex
 //------------------------------------------------------------------------
 Reference< XFormController >  FmXPageViewWinRec::getController( const Reference< XForm > & xForm ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getController" );
     Reference< XTabControllerModel >  xModel(xForm, UNO_QUERY);
     for (::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin();
          i != m_aControllerList.end(); i++)
@@ -312,6 +321,7 @@ Reference< XFormController >  FmXPageViewWinRec::getController( const Reference<
 //------------------------------------------------------------------------
 void FmXPageViewWinRec::setController(const Reference< XForm > & xForm,  FmXFormController* _pParent )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::setController" );
     DBG_ASSERT( xForm.is(), "FmXPageViewWinRec::setController: there should be a form!" );
     Reference< XIndexAccess >  xFormCps(xForm, UNO_QUERY);
     if (!xFormCps.is())
@@ -378,6 +388,7 @@ void FmXPageViewWinRec::setController(const Reference< XForm > & xForm,  FmXForm
 //------------------------------------------------------------------------
 void FmXPageViewWinRec::updateTabOrder( const Reference< XForm >& _rxForm )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::updateTabOrder" );
     OSL_PRECOND( _rxForm.is(), "FmXPageViewWinRec::updateTabOrder: illegal argument!" );
     if ( !_rxForm.is() )
         return;
@@ -428,11 +439,13 @@ FmXFormView::FmXFormView(const ::comphelper::ComponentContext& _rContext, FmForm
     ,m_bFirstActivation( true )
     ,m_isTabOrderUpdateSuspended( false )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::FmXFormView" );
 }
 
 //------------------------------------------------------------------------
 void FmXFormView::cancelEvents()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::cancelEvents" );
     if ( m_nActivationEvent )
     {
         Application::RemoveUserEvent( m_nActivationEvent );
@@ -461,6 +474,7 @@ void FmXFormView::cancelEvents()
 //------------------------------------------------------------------------
 void FmXFormView::notifyViewDying( )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::notifyViewDying" );
     DBG_ASSERT( m_pView, "FmXFormView::notifyViewDying: my view already died!" );
     m_pView = NULL;
     cancelEvents();
@@ -481,6 +495,7 @@ FmXFormView::~FmXFormView()
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::disposing" );
     if ( m_xWindow.is() && Source.Source == m_xWindow )
         removeGridWindowListening();
 }
@@ -489,6 +504,7 @@ void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeEx
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::formActivated" );
     if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() )
         m_pView->GetFormShell()->GetImpl()->formActivated( rEvent );
 }
@@ -496,6 +512,7 @@ void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( Runti
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::formDeactivated" );
     if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() )
         m_pView->GetFormShell()->GetImpl()->formDeactivated( rEvent );
 }
@@ -504,6 +521,7 @@ void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( Run
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementInserted" );
     try
     {
         Reference< XControlContainer > xControlContainer( evt.Source, UNO_QUERY_THROW );
@@ -534,17 +552,20 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementReplaced" );
     elementInserted(evt);
 }
 
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementRemoved" );
 }
 
 //------------------------------------------------------------------------------
 FmWinRecList::const_iterator FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC )  const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::findWindow" );
     for (FmWinRecList::const_iterator i = m_aWinList.begin();
             i != m_aWinList.end(); i++)
     {
@@ -557,6 +578,7 @@ FmWinRecList::const_iterator FmXFormView::findWindow( const Reference< XControlC
 //------------------------------------------------------------------------------
 FmWinRecList::iterator FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::findWindow" );
     for (FmWinRecList::iterator i = m_aWinList.begin();
             i != m_aWinList.end(); i++)
     {
@@ -569,6 +591,7 @@ FmWinRecList::iterator FmXFormView::findWindow( const Reference< XControlContain
 //------------------------------------------------------------------------------
 void FmXFormView::addWindow(const SdrPageWindow& rWindow)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::addWindow" );
     FmFormPage* pFormPage = PTR_CAST( FmFormPage, rWindow.GetPageView().GetPage() );
     if ( !pFormPage )
         return;
@@ -591,6 +614,7 @@ void FmXFormView::addWindow(const SdrPageWindow& rWindow)
 //------------------------------------------------------------------------------
 void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::removeWindow" );
     // Wird gerufen, wenn
     // - in den Design-Modus geschaltet wird
     // - ein Window geloescht wird, waehrend man im Design-Modus ist
@@ -613,6 +637,7 @@ void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC )
 //------------------------------------------------------------------------------
 void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::displayAsyncErrorMessage" );
     DBG_ASSERT( 0 == m_nErrorMessageEvent, "FmXFormView::displayAsyncErrorMessage: not too fast, please!" );
         // This should not happen - usually, the PostUserEvent is faster than any possible user
         // interaction which could trigger a new error. If it happens, we need a queue for the events.
@@ -631,6 +656,7 @@ IMPL_LINK(FmXFormView, OnDelayedErrorMessage, void*, /*EMPTYTAG*/)
 //------------------------------------------------------------------------------
 void FmXFormView::onFirstViewActivation( const FmFormModel* _pDocModel )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::onFirstViewActivation" );
     if ( _pDocModel && _pDocModel->GetAutoControlFocus() )
         m_nAutoFocusEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnAutoFocus ) );
 }
@@ -638,6 +664,7 @@ void FmXFormView::onFirstViewActivation( const FmFormModel* _pDocModel )
 //------------------------------------------------------------------------------
 void FmXFormView::suspendTabOrderUpdate()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::suspendTabOrderUpdate" );
     OSL_ENSURE( !m_isTabOrderUpdateSuspended, "FmXFormView::suspendTabOrderUpdate: nesting not allowed!" );
     m_isTabOrderUpdateSuspended = true;
 }
@@ -645,6 +672,7 @@ void FmXFormView::suspendTabOrderUpdate()
 //------------------------------------------------------------------------------
 void FmXFormView::resumeTabOrderUpdate()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::resumeTabOrderUpdate" );
     OSL_ENSURE( m_isTabOrderUpdateSuspended, "FmXFormView::resumeTabOrderUpdate: not suspended!" );
     m_isTabOrderUpdateSuspended = false;
 
@@ -729,6 +757,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/)
 //------------------------------------------------------------------------------
 void FmXFormView::Activate(sal_Bool bSync)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::Activate" );
     if (m_nActivationEvent)
     {
         Application::RemoveUserEvent(m_nActivationEvent);
@@ -746,6 +775,7 @@ void FmXFormView::Activate(sal_Bool bSync)
 //------------------------------------------------------------------------------
 void FmXFormView::Deactivate(BOOL bDeactivateController)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::Deactivate" );
     if (m_nActivationEvent)
     {
         Application::RemoveUserEvent(m_nActivationEvent);
@@ -760,11 +790,13 @@ void FmXFormView::Deactivate(BOOL bDeactivateController)
 //------------------------------------------------------------------------------
 FmFormShell* FmXFormView::GetFormShell() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::GetFormShell" );
     return m_pView ? m_pView->GetFormShell() : NULL;
 }
 // -----------------------------------------------------------------------------
 void FmXFormView::AutoFocus( sal_Bool _bSync )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::AutoFocus" );
     if (m_nAutoFocusEvent)
         Application::RemoveUserEvent(m_nAutoFocusEvent);
 
@@ -857,6 +889,7 @@ namespace
 // -----------------------------------------------------------------------------
 Reference< XFormController > FmXFormView::getFormController( const Reference< XForm >& _rxForm, const OutputDevice& _rDevice ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::getFormController" );
     Reference< XFormController > xController;
 
     for ( FmWinRecList::const_iterator rec = m_aWinList.begin(); rec != m_aWinList.end(); ++rec )
@@ -958,6 +991,7 @@ namespace
 // -----------------------------------------------------------------------------
 void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::onCreatedFormObject" );
     FmFormShell* pShell = m_pView ? m_pView->GetFormShell() : NULL;
     FmXFormShell* pShellImpl = pShell ? pShell->GetImpl() : NULL;
     OSL_ENSURE( pShellImpl, "FmXFormView::onCreatedFormObject: no form shell!" );
@@ -1094,6 +1128,7 @@ namespace
 // -----------------------------------------------------------------------------
 SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::implCreateFieldControl" );
     // not if we're in design mode
     if ( !m_pView->IsDesignMode() )
         return NULL;
@@ -1325,6 +1360,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
 // -----------------------------------------------------------------------------
 SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::implCreateXFormsControl" );
     // not if we're in design mode
     if ( !m_pView->IsDesignMode() )
         return NULL;
@@ -1460,6 +1496,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
         const Reference< XDataSource >& _rxDataSource, const ::rtl::OUString& _rDataSourceName,
         const ::rtl::OUString& _rCommand, const sal_Int32 _nCommandType )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::createControlLabelPair" );
     if  (   !createControlLabelPair( m_aContext, _rOutDev, _nXOffsetMM, _nYOffsetMM,
                 _rxField, _rxNumberFormats, _nControlObjectID, _rFieldPostfix, FmFormInventor, OBJ_FM_FIXEDTEXT,
                 NULL, NULL, NULL, _rpLabel, _rpControl )
@@ -1487,6 +1524,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
     const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID,
     SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::createControlLabelPair" );
     sal_Int32 nDataType = 0;
     ::rtl::OUString sFieldName;
     Any aFieldName;
@@ -1644,6 +1682,7 @@ void FmXFormView::ObjectRemoveListener::Notify( SfxBroadcaster& /*rBC*/, const S
 //------------------------------------------------------------------------------
 void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::ObjectRemovedInAliveMode" );
     // wenn das entfernte Objekt in meiner MarkList, die ich mir beim Umschalten in den Alive-Mode gemerkt habe, steht,
     // muss ich es jetzt da rausnehmen, da ich sonst beim Zurueckschalten versuche, die Markierung wieder zu setzen
     // (interesanterweise geht das nur bei gruppierten Objekten schief (beim Zugriff auf deren ObjList GPF), nicht bei einzelnen)
@@ -1666,6 +1705,7 @@ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject )
 //------------------------------------------------------------------------------
 void FmXFormView::stopMarkListWatching()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::stopMarkListWatching" );
     if ( m_pWatchStoredList )
     {
         m_pWatchStoredList->EndListeningAll();
@@ -1677,6 +1717,7 @@ void FmXFormView::stopMarkListWatching()
 //------------------------------------------------------------------------------
 void FmXFormView::startMarkListWatching()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::startMarkListWatching" );
     if ( !m_pWatchStoredList )
     {
         m_pWatchStoredList = new ObjectRemoveListener( this );
@@ -1693,6 +1734,7 @@ void FmXFormView::startMarkListWatching()
 //------------------------------------------------------------------------------
 void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::saveMarkList" );
     if ( m_pView )
     {
         m_aMark = m_pView->GetMarkedObjectList();
@@ -1751,6 +1793,7 @@ static sal_Bool lcl_hasObject( SdrObjListIter& rIter, SdrObject* pObj )
 //------------------------------------------------------------------------------
 void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::restoreMarkList" );
     if ( !m_pView )
         return;
 
@@ -1838,6 +1881,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
 // -----------------------------------------------------------------------------
 void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::focusGained" );
     if ( m_xWindow.is() && m_pView )
     {
         m_pView->SetMoveOutside( TRUE, FmFormView::ImplAccess() );
@@ -1846,6 +1890,7 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime
 // -----------------------------------------------------------------------------
 void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::focusLost" );
     // when switch the focus outside the office the mark didn't change
     // so we can not remove us as focus listener
     if ( m_xWindow.is() && m_pView )
@@ -1856,6 +1901,7 @@ void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeEx
 // -----------------------------------------------------------------------------
 void FmXFormView::removeGridWindowListening()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::removeGridWindowListening" );
     if ( m_xWindow.is() )
     {
         m_xWindow->removeFocusListener(this);
@@ -1870,6 +1916,7 @@ void FmXFormView::removeGridWindowListening()
 // -----------------------------------------------------------------------------
 DocumentType FmXFormView::impl_getDocumentType() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::impl_getDocumentType" );
     if ( GetFormShell() && GetFormShell()->GetImpl() )
         return GetFormShell()->GetImpl()->getDocumentType();
     return eUnknownDocumentType;
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index d565cd0eb65b..6ad696bf062f 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -63,6 +63,7 @@
 
 #include <svx/svxdlg.hxx> //CHINA001
 #include <svx/dialogs.hrc> //CHINA001
+#include <rtl/logfile.hxx>
 //............................................................................
 namespace svxform
 {
@@ -200,6 +201,7 @@ namespace svxform
         ,m_bInitialUpdate(sal_True)
         ,m_bKeyboardCut( sal_False )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NavigatorTree" );
         SetHelpId( HID_FORM_NAVIGATOR );
 
         m_aNavigatorImages = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
@@ -250,12 +252,14 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::Clear()
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Clear" );
         m_pNavModel->Clear();
     }
 
     //------------------------------------------------------------------------
     void NavigatorTree::UpdateContent( FmFormShell* pFormShell )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::UpdateContent" );
         if (m_bInitialUpdate)
         {
             GrabFocus();
@@ -291,6 +295,7 @@ namespace svxform
     //------------------------------------------------------------------------------
     sal_Bool NavigatorTree::implAllowExchange( sal_Int8 _nAction, sal_Bool* _pHasNonHidden )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::implAllowExchange" );
         SvLBoxEntry* pCurEntry = GetCurEntry();
         if (!pCurEntry)
             return sal_False;
@@ -326,6 +331,7 @@ namespace svxform
     //------------------------------------------------------------------------------
     sal_Bool NavigatorTree::implPrepareExchange( sal_Int8 _nAction )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::implPrepareExchange" );
         sal_Int32 i;
 
         EndSelection();
@@ -362,6 +368,7 @@ namespace svxform
     //------------------------------------------------------------------------------
     void NavigatorTree::StartDrag( sal_Int8 /*nAction*/, const ::Point& /*rPosPixel*/ )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::StartDrag" );
         EndSelection();
 
         if ( !implPrepareExchange( DND_ACTION_COPYMOVE ) )
@@ -375,6 +382,7 @@ namespace svxform
     //------------------------------------------------------------------------------
     void NavigatorTree::Command( const CommandEvent& rEvt )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Command" );
         sal_Bool bHandled = sal_False;
         switch( rEvt.GetCommand() )
         {
@@ -419,7 +427,7 @@ namespace svxform
                 sal_Bool bSingleSelection = (m_arrCurrentSelection.Count() == 1);
 
 
-                DBG_ASSERT( (m_arrCurrentSelection.Count() > 0) | m_bRootSelected, "keine Eintraege selektiert" );
+                DBG_ASSERT( (m_arrCurrentSelection.Count() > 0) || m_bRootSelected, "keine Eintraege selektiert" );
                     // solte nicht passieren, da ich oben bei der IsSelected-Abfrage auf jeden Fall einen selektiert haette,
                     // wenn das vorher nicht der Fall gewesen waere
 
@@ -605,6 +613,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Bool NavigatorTree::IsDeleteAllowed()
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::IsDeleteAllowed" );
         //////////////////////////////////////////////////////////////////////
         // Haben wir eine Form...
         SvLBoxEntry* pCurEntry = GetCurEntry();
@@ -619,6 +628,7 @@ namespace svxform
     //------------------------------------------------------------------------
     SvLBoxEntry* NavigatorTree::FindEntry( FmEntryData* pEntryData )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::FindEntry" );
         if( !pEntryData ) return NULL;
         SvLBoxEntry* pCurEntry = First();
         FmEntryData* pCurEntryData;
@@ -637,6 +647,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Notify" );
         if( rHint.ISA(FmNavRemovedHint) )
         {
             FmNavRemovedHint* pRemovedHint = (FmNavRemovedHint*)&rHint;
@@ -707,6 +718,7 @@ namespace svxform
     //------------------------------------------------------------------------
     SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, ULONG nRelPos )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Insert" );
         //////////////////////////////////////////////////////////////////////
         // Aktuellen Eintrag einfuegen
         SvLBoxEntry* pParentEntry = FindEntry( pEntryData->GetParent() );
@@ -750,6 +762,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::Remove( FmEntryData* pEntryData )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Remove" );
         if( !pEntryData )
             return;
 
@@ -786,6 +799,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Bool NavigatorTree::IsFormEntry( SvLBoxEntry* pEntry )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::IsFormEntry" );
         FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData();
         return !pEntryData || pEntryData->ISA(FmFormData);
     }
@@ -793,6 +807,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Bool NavigatorTree::IsFormComponentEntry( SvLBoxEntry* pEntry )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::IsFormComponentEntry" );
         FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData();
         return pEntryData && pEntryData->ISA(FmControlData);
     }
@@ -800,6 +815,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Bool NavigatorTree::implAcceptPaste( )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::implAcceptPaste" );
         SvLBoxEntry* pFirstSelected = FirstSelected();
         if ( !pFirstSelected || NextSelected( pFirstSelected ) )
             // no selected entry, or at least two selected entries
@@ -815,12 +831,14 @@ 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@sun.com", "NavigatorTree::implAcceptDataTransfer" );
         return implAcceptDataTransfer( _rFlavors, _nAction, GetEntry( _rDropPos ), _bDnD );
     }
 
     //------------------------------------------------------------------------
     sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvLBoxEntry* _pTargetEntry, sal_Bool _bDnD )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::implAcceptDataTransfer" );
         // no target -> no drop
         if (!_pTargetEntry)
             return DND_ACTION_NONE;
@@ -960,6 +978,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& rEvt )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::AcceptDrop" );
         ::Point aDropPos = rEvt.maPosPixel;
 
         // kuemmern wir uns erst mal um moeglich DropActions (Scrollen und Aufklappen)
@@ -1015,12 +1034,14 @@ 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@sun.com", "NavigatorTree::implExecuteDataTransfer" );
         return implExecuteDataTransfer( _rData, _nAction, GetEntry( _rDropPos ), _bDnD );
     }
 
     //------------------------------------------------------------------------
     sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvLBoxEntry* _pTargetEntry, sal_Bool _bDnD )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::implExecuteDataTransfer" );
         const DataFlavorExVector& rDataFlavors = _rData.GetDataFlavorExVector();
 
         if ( DND_ACTION_NONE == implAcceptDataTransfer( rDataFlavors, _nAction, _pTargetEntry, _bDnD ) )
@@ -1272,6 +1293,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Int8 NavigatorTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::ExecuteDrop" );
         sal_Int8 nResult( DND_ACTION_NONE );
 
         if ( m_aControlExchange.isDragSource() )
@@ -1288,6 +1310,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::doPaste()
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::doPaste" );
            try
         {
             if ( m_aControlExchange.isClipboardOwner() )
@@ -1315,6 +1338,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::doCopy()
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::doCopy" );
         if ( implPrepareExchange( DND_ACTION_COPY ) )
         {
             m_aControlExchange.setClipboardListener( LINK( this, NavigatorTree, OnClipboardAction ) );
@@ -1325,6 +1349,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::ModelHasRemoved( SvListEntry* _pEntry )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::ModelHasRemoved" );
         SvLBoxEntry* pTypedEntry = static_cast< SvLBoxEntry* >( _pEntry );
         if ( doingKeyboardCut() )
             m_aCutEntries.erase( pTypedEntry );
@@ -1343,6 +1368,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::doCut()
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::doCut" );
         if ( implPrepareExchange( DND_ACTION_MOVE ) )
         {
             m_aControlExchange.setClipboardListener( LINK( this, NavigatorTree, OnClipboardAction ) );
@@ -1366,6 +1392,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::KeyInput(const ::KeyEvent& rKEvt)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::KeyInput" );
         const KeyCode& rCode = rKEvt.GetKeyCode();
 
         // delete?
@@ -1401,6 +1428,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Bool NavigatorTree::EditingEntry( SvLBoxEntry* pEntry, Selection& rSelection )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::EditingEntry" );
         if (!SvTreeListBox::EditingEntry( pEntry, rSelection ))
             return sal_False;
 
@@ -1411,6 +1439,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::NewForm( SvLBoxEntry* pParentEntry )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NewForm" );
         //////////////////////////////////////////////////////////////////////
         // ParentFormData holen
         if( !IsFormEntry(pParentEntry) )
@@ -1472,6 +1501,7 @@ namespace svxform
     //------------------------------------------------------------------------
     FmControlData* NavigatorTree::NewControl( const ::rtl::OUString& rServiceName, SvLBoxEntry* pParentEntry, sal_Bool bEditName )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NewControl" );
         //////////////////////////////////////////////////////////////////////
         // ParentForm holen
         if (!GetNavModel()->GetFormShell())
@@ -1520,6 +1550,7 @@ namespace svxform
     //------------------------------------------------------------------------
     ::rtl::OUString NavigatorTree::GenerateName( FmEntryData* pEntryData )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::GenerateName" );
         const sal_uInt16 nMaxCount = 99;
         ::rtl::OUString aNewName;
 
@@ -1555,6 +1586,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Bool NavigatorTree::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::EditedEntry" );
         if (EditingCanceled())
             return sal_True;
 
@@ -1674,6 +1706,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::ShowSelectionProperties(sal_Bool bForce)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::ShowSelectionProperties" );
         // zuerst brauche ich die FormShell
         FmFormShell* pFormShell = GetNavModel()->GetFormShell();
         if (!pFormShell)
@@ -1718,7 +1751,7 @@ namespace svxform
                     for ( sal_Int32 i = 0; i < m_nFormsSelected; ++i )
                     {
                         FmFormData* pFormData = (FmFormData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData();
-                        aSelection.insert( Reference< XInterface >( pFormData->GetPropertySet(), UNO_QUERY ) );
+                        aSelection.insert( pFormData->GetPropertySet().get() );
                     }
                 }
                 else
@@ -1728,7 +1761,7 @@ namespace svxform
                         for ( sal_Int32 i = 0; i < m_nHiddenControls; ++i )
                         {
                             FmEntryData* pEntryData = (FmEntryData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData();
-                            aSelection.insert( Reference< XInterface >( pEntryData->GetPropertySet(), UNO_QUERY ) );
+                            aSelection.insert( pEntryData->GetPropertySet().get() );
                         }
                     }
                     else if (m_nHiddenControls == 0)
@@ -1756,6 +1789,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::DeleteSelection()
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::DeleteSelection" );
         // die Root darf ich natuerlich nicht mitloeschen
         sal_Bool bRootSelected = IsSelected(m_pRootEntry);
         ULONG nSelectedEntries = GetSelectionCount();
@@ -1892,6 +1926,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::CollectSelectionData(SELDATA_ITEMS sdiHow)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::CollectSelectionData" );
         DBG_ASSERT(sdiHow != SDI_DIRTY, "NavigatorTree::CollectSelectionData : ever thought about your parameter ? DIRTY ?");
         if (sdiHow == m_sdiState)
             return;
@@ -1966,6 +2001,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::SynchronizeSelection(FmEntryDataArray& arredToSelect)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::SynchronizeSelection" );
         LockSelectionHandling();
         if (arredToSelect.Count() == 0)
         {
@@ -2029,6 +2065,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::SynchronizeSelection()
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::SynchronizeSelection" );
         // Shell und View
         FmFormShell* pFormShell = GetNavModel()->GetFormShell();
         if(!pFormShell) return;
@@ -2042,6 +2079,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::SynchronizeMarkList()
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::SynchronizeMarkList" );
         // die Shell werde ich brauchen ...
         FmFormShell* pFormShell = GetNavModel()->GetFormShell();
         if (!pFormShell) return;
@@ -2110,6 +2148,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Bool NavigatorTree::IsHiddenControl(FmEntryData* pEntryData)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::IsHiddenControl" );
         if (pEntryData == NULL) return sal_False;
 
         Reference< XPropertySet > xProperties( pEntryData->GetPropertySet() );
@@ -2124,6 +2163,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Bool NavigatorTree::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Select" );
         if (bSelect == IsSelected(pEntry))  // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;)
             return sal_True;
 
@@ -2133,48 +2173,99 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTree::UnmarkAllViewObj()
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::UnmarkAllViewObj" );
         FmFormShell* pFormShell = GetNavModel()->GetFormShell();
         if( !pFormShell )
             return;
         FmFormView* pFormView = pFormShell->GetFormView();
         pFormView->UnMarkAll();
     }
-
     //------------------------------------------------------------------------
-    void NavigatorTree::MarkViewObj( FmFormData* pFormData, sal_Bool bMark, sal_Bool bDeep )
+    void NavigatorTree::MarkViewObj(FmFormData* pFormData, sal_Bool bMark, sal_Bool bDeep )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::MarkViewObjects" );
+        FmFormShell* pFormShell = GetNavModel()->GetFormShell();
+        if( !pFormShell )
+            return;
+
+        // first collect all sdrobjects
+        ::std::set< Reference< XFormComponent > > aObjects;
+        CollectObjects(pFormData,bDeep,aObjects);
+
         //////////////////////////////////////////////////////////////////////
-        // Alle Controls der Form markieren
+        // In der Page das entsprechende SdrObj finden und selektieren
+        FmFormView*     pFormView       = pFormShell->GetFormView();
+        SdrPageView*    pPageView       = pFormView->GetSdrPageView();
+        SdrPage*        pPage           = pPageView->GetPage();
+        //FmFormPage*     pFormPage       = dynamic_cast< FmFormPage* >( pPage );
+
+        SdrObjListIter aIter( *pPage );
+        while ( aIter.IsMore() )
+        {
+            SdrObject* pSdrObject = aIter.Next();
+            FmFormObj* pFormObject = FmFormObj::GetFormObject( pSdrObject );
+            if ( !pFormObject )
+                continue;
+
+            Reference< XFormComponent > xControlModel( pFormObject->GetUnoControlModel(),UNO_QUERY );
+            if ( xControlModel.is() && aObjects.find(xControlModel) != aObjects.end() && bMark != pFormView->IsObjMarked( pSdrObject ) )
+            {
+                // unfortunately, the writer doesn't like marking an already-marked object, again, so reset the mark first
+                pFormView->MarkObj( pSdrObject, pPageView, !bMark, sal_False );
+            }
+        } // while ( aIter.IsMore() )
+        if ( bMark )
+        {
+            // make the mark visible
+            ::Rectangle aMarkRect( pFormView->GetAllMarkedRect());
+            for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i )
+            {
+                SdrPaintWindow* pPaintWindow = pFormView->GetPaintWindow( i );
+                OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
+                if ( OUTDEV_WINDOW == rOutDev.GetOutDevType() )
+                {
+                    pFormView->MakeVisible( aMarkRect, (Window&)rOutDev );
+                }
+            } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i )
+        }
+    }
+    //------------------------------------------------------------------------
+    void NavigatorTree::CollectObjects(FmFormData* pFormData, sal_Bool bDeep, ::std::set< Reference< XFormComponent > >& _rObjects)
+    {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::MarkViewObjects" );
         FmEntryDataList* pChildList = pFormData->GetChildList();
         FmEntryData* pEntryData;
         FmControlData* pControlData;
-
-        for( sal_uInt32 i=0; i<pChildList->Count(); i++ )
+        for( sal_uInt32 i=0; i < pChildList->Count(); ++i )
         {
             pEntryData = pChildList->GetObject(i);
             if( pEntryData->ISA(FmControlData) )
             {
                 pControlData = (FmControlData*)pEntryData;
-                MarkViewObj( pControlData, (i==pChildList->Count()-1), bMark );
-            } else if (bDeep && (pEntryData->ISA(FmFormData)))
-                MarkViewObj((FmFormData*)pEntryData, bMark, bDeep);
-        }
+                _rObjects.insert(pControlData->GetFormComponent());
+            } // if( pEntryData->ISA(FmControlData) )
+            else if (bDeep && (pEntryData->ISA(FmFormData)))
+                CollectObjects((FmFormData*)pEntryData,bDeep,_rObjects);
+        } // for( sal_uInt32 i=0; i<pChildList->Count(); i++ )
     }
-
     //------------------------------------------------------------------------
     void NavigatorTree::MarkViewObj( FmControlData* pControlData, sal_Bool bMarkHandles, sal_Bool bMark)
     {
-        if( !pControlData ) return;
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::MarkViewObj" );
+        if( !pControlData )
+            return;
         FmFormShell* pFormShell = GetNavModel()->GetFormShell();
-        if( !pFormShell ) return;
+        if( !pFormShell )
+            return;
 
         //////////////////////////////////////////////////////////////////////
         // In der Page das entsprechende SdrObj finden und selektieren
-        Reference< XFormComponent >  xFormComponent( pControlData->GetFormComponent());
         FmFormView*     pFormView       = pFormShell->GetFormView();
+        Reference< XFormComponent >  xFormComponent( pControlData->GetFormComponent());
         SdrPageView*    pPageView       = pFormView->GetSdrPageView();
         SdrPage*        pPage           = pPageView->GetPage();
 
+        bool bPaint = false;
         SdrObjListIter aIter( *pPage );
         while ( aIter.IsMore() )
         {
@@ -2195,6 +2286,11 @@ namespace svxform
             if ( !bMarkHandles || !bMark )
                 continue;
 
+            bPaint = true;
+
+        } // while ( aIter.IsMore() )
+        if ( bPaint )
+        {
             // make the mark visible
             ::Rectangle aMarkRect( pFormView->GetAllMarkedRect());
             for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i )
@@ -2205,7 +2301,7 @@ namespace svxform
                 {
                     pFormView->MakeVisible( aMarkRect, (Window&)rOutDev );
                 }
-            }
+            } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i )
         }
     }
 
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 27958709550d..5b041c6d9373 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -49,6 +49,7 @@
 #include "fmobj.hxx"
 #include <sfx2/objsh.hxx>
 #include <tools/diagnose_ex.h>
+#include <rtl/logfile.hxx>
 #include <com/sun/star/container/XContainer.hpp>
 
 //............................................................................
@@ -74,18 +75,21 @@ namespace svxform
         ,m_nLocks(0)
         ,m_bCanUndo(sal_True)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "OFormComponentObserver::OFormComponentObserver" );
     }
 
     // XPropertyChangeListener
     //------------------------------------------------------------------------
     void SAL_CALL OFormComponentObserver::disposing(const EventObject& Source) throw( RuntimeException )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@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@sun.com", "OFormComponentObserver::propertyChange" );
         if( !m_pNavModel ) return;
         if( evt.PropertyName != FM_PROP_NAME ) return;
 
@@ -111,6 +115,7 @@ namespace svxform
     //------------------------------------------------------------------------------
     void SAL_CALL OFormComponentObserver::elementInserted(const ContainerEvent& evt) throw(RuntimeException)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "OFormComponentObserver::elementInserted" );
         if (IsLocked() || !m_pNavModel)
             return;
 
@@ -127,6 +132,7 @@ namespace svxform
     //------------------------------------------------------------------------------
     void OFormComponentObserver::Insert(const Reference< XInterface > & xIface, sal_Int32 nIndex)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "OFormComponentObserver::Insert" );
         Reference< XForm >  xForm(xIface, UNO_QUERY);
         if (xForm.is())
         {
@@ -150,6 +156,7 @@ namespace svxform
     //------------------------------------------------------------------------------
     void SAL_CALL OFormComponentObserver::elementReplaced(const ContainerEvent& evt) throw(RuntimeException)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "OFormComponentObserver::elementReplaced" );
         if (IsLocked() || !m_pNavModel)
             return;
 
@@ -181,6 +188,7 @@ 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@sun.com", "OFormComponentObserver::Remove" );
         if (IsLocked() || !m_pNavModel)
             return;
 
@@ -198,6 +206,7 @@ namespace svxform
     //------------------------------------------------------------------------------
     void SAL_CALL OFormComponentObserver::elementRemoved(const ContainerEvent& evt) throw(RuntimeException)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "OFormComponentObserver::elementRemoved" );
         Reference< XInterface > xElement;
         evt.Element >>= xElement;
         Remove( xElement );
@@ -215,6 +224,7 @@ namespace svxform
                     ,m_aNormalImages( _rNormalImages )
                     ,m_aHCImages( _rHCImages )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::NavigatorTreeModel" );
         m_pPropChangeList = new OFormComponentObserver(this);
         m_pPropChangeList->acquire();
         m_pRootList = new FmEntryDataList();
@@ -245,6 +255,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::SetModified( sal_Bool bMod )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::SetModified" );
         if( !m_pFormShell ) return;
         SfxObjectShell* pObjShell = m_pFormShell->GetFormModel()->GetObjectShell();
         if( !pObjShell ) return;
@@ -254,6 +265,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::Clear()
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Clear" );
         Reference< XNameContainer >  xForms( GetForms());
         Reference< XContainer >  xContainer(xForms, UNO_QUERY);
         if (xContainer.is())
@@ -280,6 +292,7 @@ namespace svxform
     //------------------------------------------------------------------------
     Reference< XNameContainer >  NavigatorTreeModel::GetForms() const
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::GetForms" );
         if( !m_pFormShell || !m_pFormShell->GetCurPage())
             return NULL;
         else
@@ -289,6 +302,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::Insert(FmEntryData* pEntry, ULONG nRelPos, sal_Bool bAlterModel)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Insert" );
         if (IsListening(*m_pFormModel))
             EndListening(*m_pFormModel);
 
@@ -380,6 +394,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::Remove(FmEntryData* pEntry, sal_Bool bAlterModel)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Remove" );
         //////////////////////////////////////////////////////////////////////
         // Form und Parent holen
         if (!pEntry || !m_pFormModel)
@@ -456,6 +471,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::RemoveForm(FmFormData* pFormData)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::RemoveForm" );
         //////////////////////////////////////////////////////////////////////
         // Form und Parent holen
         if (!pFormData || !m_pFormModel)
@@ -489,6 +505,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::RemoveFormComponent(FmControlData* pControlData)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::RemoveFormComponent" );
         //////////////////////////////////////////////////////////////////////
         // Control und Parent holen
         if (!pControlData)
@@ -504,6 +521,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::ClearBranch( FmFormData* pParentData )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::ClearBranch" );
         //////////////////////////////////////////////////////////////////////
         // Alle Eintraege dieses Zweiges loeschen
         FmEntryDataList* pChildList = pParentData->GetChildList();
@@ -522,6 +540,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::FillBranch( FmFormData* pFormData )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::FillBranch" );
         //////////////////////////////////////////////////////////////
         // Forms aus der Root einfuegen
         if( pFormData == NULL )
@@ -587,6 +606,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::InsertForm(const Reference< XForm > & xForm, sal_uInt32 nRelPos)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::InsertForm" );
         FmFormData* pFormData = (FmFormData*)FindData( xForm, GetRootList() );
         if (pFormData)
             return;
@@ -606,6 +626,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::InsertFormComponent(const Reference< XFormComponent > & xComp, sal_uInt32 nRelPos)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::InsertFormComponent" );
         //////////////////////////////////////////////////////////
         // ParentData setzen
         Reference< XInterface >  xIFace( xComp->getParent());
@@ -635,6 +656,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::ReplaceFormComponent(const Reference< XFormComponent > & xOld, const Reference< XFormComponent > & xNew)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@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, m_aHCImages );
@@ -646,6 +668,7 @@ namespace svxform
     //------------------------------------------------------------------------
     FmEntryData* NavigatorTreeModel::FindData(const Reference< XInterface > & xElement, FmEntryDataList* pDataList, sal_Bool bRecurs)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::FindData" );
         // normalize
         Reference< XInterface > xIFace( xElement, UNO_QUERY );
 
@@ -667,6 +690,7 @@ namespace svxform
     //------------------------------------------------------------------------
     FmEntryData* NavigatorTreeModel::FindData( const ::rtl::OUString& rText, FmFormData* pParentData, sal_Bool bRecurs )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::FindData" );
         FmEntryDataList* pDataList;
         if( !pParentData )
             pDataList = GetRootList();
@@ -699,6 +723,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Notify" );
         if( rHint.ISA(SdrHint) )
         {
             SdrHint* pSdrHint = (SdrHint*)&rHint;
@@ -729,6 +754,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::InsertSdrObj( const SdrObject* pObj )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::InsertSdrObj" );
         const FmFormObj* pFormObject = FmFormObj::GetFormObject( pObj );
         if ( pFormObject )
         {
@@ -756,6 +782,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::RemoveSdrObj( const SdrObject* pObj )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::RemoveSdrObj" );
         const FmFormObj* pFormObject = FmFormObj::GetFormObject( pObj );
         if ( pFormObject )
         {
@@ -781,6 +808,7 @@ namespace svxform
 
     sal_Bool NavigatorTreeModel::InsertFormComponent(FmNavRequestSelectHint& rHint, SdrObject* pObject)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::InsertFormComponent" );
         if ( pObject->ISA(SdrObjGroup) )
         {   // rekursiv absteigen
             const SdrObjList *pChilds = ((SdrObjGroup*)pObject)->GetSubList();
@@ -819,6 +847,7 @@ namespace svxform
 
     void NavigatorTreeModel::BroadcastMarkedObjects(const SdrMarkList& mlMarked)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@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;
@@ -841,6 +870,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::UpdateContent( const Reference< XNameContainer > & xForms )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::UpdateContent" );
         //////////////////////////////////////////////////////////////////////
         // Model von der Root aufwaerts neu fuellen
         Clear();
@@ -865,6 +895,7 @@ namespace svxform
     //------------------------------------------------------------------------
     void NavigatorTreeModel::UpdateContent( FmFormShell* pShell )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::UpdateContent" );
         //////////////////////////////////////////////////////////////////////
         // Wenn Shell sich nicht veraendert hat, nichts machen
         FmFormPage* pNewPage = pShell ? pShell->GetCurPage() : NULL;
@@ -906,6 +937,7 @@ namespace svxform
     //------------------------------------------------------------------------
     Reference< XIndexContainer >  NavigatorTreeModel::GetFormComponents( FmFormData* pFormData )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::GetFormComponents" );
         //////////////////////////////////////////////////////////////////////
         // Von der Form Components holen
         if (pFormData)
@@ -917,6 +949,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Bool NavigatorTreeModel::CheckEntry( FmEntryData* pEntryData )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::CheckEntry" );
         //////////////////////////////////////////////////////////////////////
         // Nur Forms duerfen auf Doppeldeutigkeit untersucht werden
         if( !pEntryData->ISA(FmFormData) ) return sal_True;
@@ -963,6 +996,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const ::rtl::OUString& rNewText )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Rename" );
         //////////////////////////////////////////////////////////////////////
         // Wenn Name schon vorhanden, Fehlermeldung
         pEntryData->SetText( rNewText );
@@ -998,6 +1032,7 @@ namespace svxform
     //------------------------------------------------------------------------
     sal_Bool NavigatorTreeModel::IsNameAlreadyDefined( const ::rtl::OUString& rName, FmFormData* pParentData )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::IsNameAlreadyDefined" );
         //////////////////////////////////////////////////////////////////////
         // Form in der Root
         if( !pParentData )
@@ -1021,6 +1056,7 @@ namespace svxform
     //------------------------------------------------------------------------
     SdrObject* NavigatorTreeModel::GetSdrObj( FmControlData* pControlData )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::GetSdrObj" );
         if (!pControlData || !m_pFormShell)
             return NULL;
 
@@ -1041,6 +1077,7 @@ namespace svxform
     //------------------------------------------------------------------
     SdrObject* NavigatorTreeModel::Search(SdrObjListIter& rIter, const Reference< XFormComponent > & xComp)
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Search" );
         while (rIter.IsMore())
         {
             SdrObject* pObj = rIter.Next();
diff --git a/svx/source/inc/fmctrler.hxx b/svx/source/inc/fmctrler.hxx
index bc1e83003021..5684a4c0bd55 100644
--- a/svx/source/inc/fmctrler.hxx
+++ b/svx/source/inc/fmctrler.hxx
@@ -596,6 +596,9 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
             locateControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ) SAL_THROW(());
 
+    // set the text for all filters
+    void impl_setTextOnAllFilter_throw();
+
     // in filter mode we do not listen for changes
     sal_Bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();}
     void addChild(FmXFormController* pChild);
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 1991c68e0424..7b66a9968f13 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -491,6 +491,8 @@ namespace svxform
         void SynchronizeMarkList();
             // umgekehrte Richtung von SynchronizeMarkList : markiert in der ::com::sun::star::sdbcx::View alle der aktuellen Selektion entsprechenden Controls
 
+        void CollectObjects(FmFormData* pFormData, sal_Bool bDeep, ::std::set< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >& _rObjects);
+
         // im Select aktualisiere ich normalerweise die Marklist der zugehoerigen ::com::sun::star::sdbcx::View, mit folgenden Funktionen
         // kann ich das Locking dieses Verhaltens steuern
         void LockSelectionHandling() { ++m_nSelectLock; }
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index a364117ab649..ac2c573565dc 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -43,6 +43,7 @@
 #include <comphelper/uno3.hxx>
 
 #include "svx/svxdllapi.h"
+#include <map>
 
 class SvStream;
 class FmFormObj;
@@ -66,6 +67,7 @@ DECLARE_LIST(FmObjectList, FmFormObj*)
 
 class SVX_DLLPRIVATE FmFormPageImpl
 {
+    ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >,SdrObject* > m_aComponentMap;
     ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>                xCurrentForm;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>  m_xForms;
     FmFormPage*     pPage;
@@ -73,6 +75,7 @@ class SVX_DLLPRIVATE FmFormPageImpl
 
     sal_Bool        m_bFirstActivation;
     bool            m_bAttemptedFormCreation;
+    bool            m_bInFind;
 
 protected:
     void Init();
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 008e8c3b7f8a..9cc316ae575c 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -551,6 +551,14 @@ private:
     */
     void    impl_switchActiveControllerListening( const bool _bListen );
 
+    /** add an element
+    */
+    void    impl_AddElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
+
+    /** remove an element
+    */
+    void    impl_RemoveElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
+
     // ---------------------------------------------------
     // asyncronous cursor actions/navigation slot handling
author	Ivo Hinkelmann <ihi@openoffice.org>	2009-04-23 10:42:05 +0000
committer	Ivo Hinkelmann <ihi@openoffice.org>	2009-04-23 10:42:05 +0000
commit	b9392a36645d8632b97ad79240f483b3a1683b61 (patch)
tree	a7596b538b33f0eb9a47d83a0a19972e72a54da4 /svx
parent	caae90c2a21d3ed30250ebb79dbcc06737f7356b (diff)