More Cleanup of bf_svx

I ran through the .hxx list and found a lot of them there where never
#included. so naturally I just deleted them.

I also cleanup up class SdrObject a little.

45 files changed, 63 insertions, 3614 deletions

diff --git a/binfilter/bf_forms/source/component/Filter.hxx b/binfilter/bf_forms/source/component/Filter.hxx
index a3de3c475..8cd0085bc 100644
--- a/binfilter/bf_forms/source/component/Filter.hxx
+++ b/binfilter/bf_forms/source/component/Filter.hxx
@@ -42,7 +42,6 @@
 #include <comphelper/uno3.hxx>
 #include <connectivity/sqlparse.hxx>
 
-#include <bf_svx/ParseContext.hxx>
 class Window;
 namespace binfilter {
 
@@ -64,7 +63,6 @@ namespace frm
 
     class OFilterControl    :public UnoControl
                             ,public OFilterControl_BASE
-                            ,public ::binfilter::svxform::OParseContextClient
     {
         TextListenerMultiplexer     m_aTextListeners;
 
diff --git a/binfilter/bf_svx/source/dialog/imapdlg.hrc b/binfilter/bf_svx/source/dialog/imapdlg.hrc
deleted file mode 100644
index 7db591c82..000000000
--- a/binfilter/bf_svx/source/dialog/imapdlg.hrc
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include <dialogs.hrc>
-
-// ImapDlg-Dialoge
-#define RID_SVX_IMAPDLG_START   RID_SVX_IMAP_START
-
-/******************************************************************************/
-
-#define RID_SVXCTL_IMAP         (RID_SVX_IMAPDLG_START + 7)
-
-#define TBX_IMAPDLG1            1
-#define TBI_APPLY               1
-#define TBI_OPEN                2
-#define TBI_SAVEAS              3
-
-#define TBI_SELECT              4
-#define TBI_RECT                5
-#define TBI_CIRCLE              6
-#define TBI_POLY                7
-#define TBI_FREEPOLY            8
-
-#define TBI_ACTIVE              16
-#define TBI_COLOR               17
-#define TBI_MACRO               18
-#define TBI_PROPERTY            19
-
-#define TBI_POLYEDIT            30
-#define TBI_POLYMOVE            31
-#define TBI_POLYINSERT          32
-#define TBI_POLYDELETE          33
-
-#define TBI_UNDO                40
-#define TBI_REDO                41
-
-#define FT_URL                  1
-#define FT_TEXT                 2
-#define FT_TARG                 3
-#define CBB_URL                 1
-#define EDT_TEXT                1
-#define LB_TARG                 1
-
-#define STB_STATUS              1
-
-#define IL_IMAPDLG              1
-#define ILH_IMAPDLG             2
-
-/******************************************************************************/
-
-#define RID_SVXMN_IMAP          (RID_SVX_IMAPDLG_START + 1)
-
-#define MN_URL                  1
-#define MN_POSITION             2
-#define MN_FRAME_TO_TOP         3
-#define MN_MOREFRONT            4
-#define MN_MOREBACK             5
-#define MN_FRAME_TO_BOTTOM      6
-#define MN_MARK_ALL             7
-#define MN_DELETE               8
-#define MN_ACTIVATE             9
-#define MN_MACRO                10
-
-/******************************************************************************/
-
-#define FT_URLDESCRIPTION       1
-#define FT_URL1                 2
-#define FT_TARGET               3
-#define FT_NAME                 4
-#define EDT_URLDESCRIPTION      1
-#define EDT_URL                 2
-#define EDT_NAME                3
-#define BTN_OK                  1
-#define BTN_CANCEL              2
-#define FL_URL                  1
-#define CBB_TARGETS             1
-
-/******************************************************************************/
-
-#define RID_SVXCTL_FT_TARGET    (RID_SVX_IMAPDLG_START + 3)
-#define RID_SVXCTL_CBB_TARGET   (RID_SVX_IMAPDLG_START + 4)
diff --git a/binfilter/bf_svx/source/dialog/rlrcitem.hxx b/binfilter/bf_svx/source/dialog/rlrcitem.hxx
deleted file mode 100644
index 31e1c0767..000000000
--- a/binfilter/bf_svx/source/dialog/rlrcitem.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_RLRCITEM_HXX
-#define _SVX_RLRCITEM_HXX
-
-#include <bf_sfx2/ctrlitem.hxx>
-namespace binfilter {
-
-class SvxRuler;
-
-// class SvxRulerItem ----------------------------------------------------
-
-class SvxRulerItem : public SfxControllerItem
-{
-private:
-    SvxRuler& rRuler;
-
-protected:
-    virtual void StateChanged( USHORT,
-                               SfxItemState, const SfxPoolItem* pState );
-
-public:
-    SvxRulerItem( USHORT nId, SvxRuler&, SfxBindings& );
-};
-
-
-}//end of namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/editeng/editundo.hxx b/binfilter/bf_svx/source/editeng/editundo.hxx
index e74816262..93cf61b37 100644
--- a/binfilter/bf_svx/source/editeng/editundo.hxx
+++ b/binfilter/bf_svx/source/editeng/editundo.hxx
@@ -32,13 +32,8 @@
 #include <editdoc.hxx>
 #include <editund2.hxx>
 #include <editdata.hxx>
-namespace binfilter {
 
-#define UNDO_NOACTION           0
-#define UNDO_NEWUNDO            1
-#define UNDO_UNDOSDELETED       2
-#define UNDO_EMPTYGROUPDELETED  3
-#define UNDO_INVALIDEND         4
+namespace binfilter {
 
 class ImpEditEngine;
 class EditView;
@@ -56,10 +51,6 @@ public:
                     TYPEINFO();
                     EditUndoInsertChars( ImpEditEngine* pImpEE, const EPaM& rEPaM, const String& rStr );
 
-    virtual void    Undo();
-    virtual void    Redo();
-    virtual void    Repeat();
-
     using SfxUndoAction::Repeat;
 
     virtual BOOL    Merge( SfxUndoAction *pNextAction );
@@ -79,10 +70,6 @@ public:
                                             const SfxPoolItem& rFeature);
                     ~EditUndoInsertFeature();
 
-    virtual void    Undo();
-    virtual void    Redo();
-    virtual void    Repeat();
-
     using SfxUndoAction::Repeat;
 };
 
@@ -106,10 +93,6 @@ public:
                         const XubString& rNewName, SfxStyleFamily eNewFamily,
                         const SfxItemSet& rPrevParaAttribs );
 
-    virtual void    Undo();
-    virtual void    Redo();
-    virtual void    Repeat();
-
     using SfxUndoAction::Repeat;
 };
 
@@ -126,10 +109,6 @@ private:
 public:
                     EditUndoSetParaAttribs( ImpEditEngine* pImpEE, USHORT nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems );
 
-    virtual void    Undo();
-    virtual void    Redo();
-    virtual void    Repeat();
-
     using SfxUndoAction::Repeat;
 };
 
diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.cxx b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
index 3df46420a..851298b07 100644
--- a/binfilter/bf_svx/source/editeng/svx_editeng.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
@@ -996,50 +996,6 @@ using namespace ::com::sun::star::linguistic2;
 // =====================================================================
 // ======================   Virtuelle Methoden   =======================
 // =====================================================================
-void EditEngine::DrawingText( const Point&, const XubString&, USHORT, USHORT, const sal_Int32*, const SvxFont&, sal_uInt16, sal_uInt16, BYTE )
-{
-    DBG_CHKTHIS( EditEngine, 0 );
-    DBG_BF_ASSERT(0, "STRIP");      // VIRTUAL
-}
-
-void EditEngine::PaintingFirstLine( sal_uInt16, const Point&, long, const Point&, short, OutputDevice* )
-{
-    DBG_CHKTHIS( EditEngine, 0 );
-    DBG_BF_ASSERT(0, "STRIP");      // VIRTUAL
-}
-
-void EditEngine::ParagraphInserted( sal_uInt16 )
-{
-    DBG_CHKTHIS( EditEngine, 0 );
-    DBG_BF_ASSERT(0, "STRIP");      // VIRTUAL
-}
-
-void EditEngine::ParagraphDeleted( sal_uInt16 )
-{
-    DBG_CHKTHIS( EditEngine, 0 );
-    DBG_BF_ASSERT(0, "STRIP");      // VIRTUAL
-}
-
-sal_Bool EditEngine::FormattingParagraph( sal_uInt16 )
-{
-    DBG_CHKTHIS( EditEngine, 0 );
-    DBG_BF_ASSERT(0, "STRIP");      // VIRTUAL
-    return sal_False;
-}
-
-void EditEngine::ParaAttribsChanged( sal_uInt16 /* nParagraph */ )
-{
-    DBG_CHKTHIS( EditEngine, 0 );
-    DBG_BF_ASSERT(0, "STRIP");      // VIRTUAL
-}
-
-
-void EditEngine::ParagraphHeightChanged( sal_uInt16 )
-{
-    DBG_CHKTHIS( EditEngine, 0 );
-    DBG_BF_ASSERT(0, "STRIP");      // VIRTUAL
-}
-
 /*N*/ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
 /*N*/ {
 /*N*/   DBG_CHKTHIS( EditEngine, 0 );
diff --git a/binfilter/bf_svx/source/editeng/svx_editundo.cxx b/binfilter/bf_svx/source/editeng/svx_editundo.cxx
index fe6077c7d..90a2c9ab0 100644
--- a/binfilter/bf_svx/source/editeng/svx_editundo.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editundo.cxx
@@ -40,12 +40,6 @@ namespace binfilter {
 
 DBG_NAME( EditUndo )
 
-#define MAX_UNDOS   100     // ab dieser Menge darf geloescht werden....
-#define MIN_UNDOS   50      // soviel muss stehen bleiben...
-
-#define NO_UNDO         0xFFFF
-#define GROUP_NOTFOUND  0xFFFF
-
 /*N*/ TYPEINIT1( EditUndoInsertChars, EditUndo );
 
 
@@ -57,8 +51,6 @@ DBG_NAME( EditUndo )
 /*N*/   pImpEE = p;
 /*N*/ }
 
-
-
 // -----------------------------------------------------------------------
 // EditUndo
 // ------------------------------------------------------------------------
@@ -101,16 +93,6 @@ DBG_NAME( EditUndo )
 /*N*/ {
 /*N*/ }
 
-void EditUndoInsertChars::Undo()
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
-void EditUndoInsertChars::Redo()
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
 /*N*/ BOOL EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
 /*N*/ {
 /*N*/   if ( !pNextAction->ISA( EditUndoInsertChars ) )
@@ -129,12 +111,6 @@ void EditUndoInsertChars::Redo()
 /*N*/   return FALSE;
 /*N*/ }
 
-void EditUndoInsertChars::Repeat()
-{
-    OSL_FAIL( "EditUndoInsertChars::Repeat nicht implementiert!" );
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
 // -----------------------------------------------------------------------
 // EditUndoInsertFeature
 // ------------------------------------------------------------------------
@@ -150,22 +126,6 @@ void EditUndoInsertChars::Repeat()
 /*N*/   delete pFeature;
 /*N*/ }
 
-void EditUndoInsertFeature::Undo()
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
-void EditUndoInsertFeature::Redo()
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
-void EditUndoInsertFeature::Repeat()
-{
-    OSL_FAIL( "EditUndoInsertFeature::Repeat nicht implementiert!" );
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
 // -----------------------------------------------------------------------
 // EditUndoSetStyleSheet
 // ------------------------------------------------------------------------
@@ -181,22 +141,6 @@ void EditUndoInsertFeature::Repeat()
 /*N*/   nPara = nP;
 /*N*/ }
 
-void EditUndoSetStyleSheet::Undo()
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
-void EditUndoSetStyleSheet::Redo()
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
-void EditUndoSetStyleSheet::Repeat()
-{
-    OSL_FAIL( "EditUndoSetStyleSheet::Repeat nicht implementiert!" );
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
 // -----------------------------------------------------------------------
 // EditUndoSetParaAttribs
 // ------------------------------------------------------------------------
@@ -208,22 +152,6 @@ void EditUndoSetStyleSheet::Repeat()
 /*N*/   nPara = nP;
 /*N*/ }
 
-void EditUndoSetParaAttribs::Undo()
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
-void EditUndoSetParaAttribs::Redo()
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
-void EditUndoSetParaAttribs::Repeat()
-{
-    OSL_FAIL( "EditUndoSetParaAttribs::Repeat nicht implementiert!" );
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
index 45e41ea79..d57d15c89 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
@@ -237,12 +237,6 @@ using namespace ::com::sun::star;
 /*N*/   GetParaPortions().Insert( pIniPortion, 0 );
 /*N*/
 /*N*/   bFormatted = FALSE;
-/*N*/
-/*N*/   if ( IsCallParaInsertedOrDeleted() )
-/*N*/   {
-/*N*/       GetEditEnginePtr()->ParagraphDeleted( EE_PARA_ALL );
-/*N*/       GetEditEnginePtr()->ParagraphInserted( 0 );
-/*N*/   }
 /*N*/ }
 
 
@@ -858,9 +852,6 @@ using namespace ::com::sun::star;
 /*N*/   DBG_ASSERT( pRightPortion, "Blinde Portion in ImpConnectParagraphs(2)" );
 /*N*/   DBG_ASSERT( nParagraphTobeDeleted == GetParaPortions().GetPos( pRightPortion ), "NodePos != PortionPos?" );
 /*N*/
-/*N*/   if ( IsCallParaInsertedOrDeleted() )
-/*N*/       GetEditEnginePtr()->ParagraphDeleted( nParagraphTobeDeleted );
-/*N*/
 /*N*/   EditPaM aPaM = aEditDoc.ConnectParagraphs( pLeft, pRight );
 /*N*/   GetParaPortions().Remove( nParagraphTobeDeleted );
 /*N*/   delete pRightPortion;
@@ -1073,8 +1064,6 @@ using namespace ::com::sun::star;
 /*N*/   ParaPortion* pNewPortion = new ParaPortion( aPaM.GetNode() );
 /*N*/   GetParaPortions().Insert( pNewPortion, nPos + 1 );
 /*N*/   ParaAttribsChanged( pNewPortion->GetNode() );
-/*N*/   if ( IsCallParaInsertedOrDeleted() )
-/*N*/       GetEditEnginePtr()->ParagraphInserted( nPos+1 );
 /*N*/
 /*N*/   TextModified();
 /*N*/   return aPaM;
@@ -1090,8 +1079,6 @@ using namespace ::com::sun::star;
 /*N*/
 /*N*/   ParaPortion* pNewPortion = new ParaPortion( pNode );
 /*N*/   GetParaPortions().Insert( pNewPortion, nPara );
-/*N*/   if ( IsCallParaInsertedOrDeleted() )
-/*N*/       GetEditEnginePtr()->ParagraphInserted( nPara );
 /*N*/
 /*N*/   return EditPaM( pNode, 0 );
 /*N*/ }
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
index ccba68ef2..a169b2f79 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
@@ -199,19 +199,9 @@ struct TabInfo
 /*N*/       ParaPortion* pParaPortion = GetParaPortions().GetObject( nPara );
 /*N*/       if ( pParaPortion->MustRepaint() || ( pParaPortion->IsInvalid() && pParaPortion->IsVisible() ) )
 /*N*/       {
-/*N*/           if ( pParaPortion->IsInvalid() )
-/*N*/           {
-/*N*/               sal_Bool bChangedByDerivedClass = GetEditEnginePtr()->FormattingParagraph( nPara );
-/*N*/               if ( bChangedByDerivedClass )
-/*N*/               {
-/*?*/                   pParaPortion->GetTextPortions().Reset();
-/*?*/                   pParaPortion->MarkSelectionInvalid( 0, pParaPortion->GetNode()->Len() );
-/*N*/               }
-/*N*/           }
 /*N*/           // bei MustRepaint() sollte keine Formatierung noetig sein!
 /*N*/           // 23.1.95: Evtl. ist sie durch eine andere Aktion aber doch
 /*N*/           // ungueltig geworden!
-/*N*/ //            if ( pParaPortion->MustRepaint() || CreateLines( nPara ) )
 /*N*/           if ( ( pParaPortion->MustRepaint() && !pParaPortion->IsInvalid() )
 /*N*/                   || CreateLines( nPara, nY ) )
 /*N*/           {
@@ -416,9 +406,6 @@ struct TabInfo
 /*N*/   const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&) pNode->GetContentAttribs().GetItem( EE_PARA_SBL );
 /*N*/   const BOOL bScriptSpace = ((const SvxScriptSpaceItem&) pNode->GetContentAttribs().GetItem( EE_PARA_ASIANCJKSPACING )).GetValue();
 /*N*/
-/*N*/ //    const sal_uInt16 nInvalidEnd = ( pParaPortion->GetInvalidDiff() > 0 )
-/*N*/ //        ? pParaPortion->GetInvalidPosStart() + pParaPortion->GetInvalidDiff()
-/*N*/ //        : pNode->Len();
 /*N*/   const short nInvalidDiff = pParaPortion->GetInvalidDiff();
 /*N*/   const sal_uInt16 nInvalidStart = pParaPortion->GetInvalidPosStart();
 /*N*/   const sal_uInt16 nInvalidEnd =  nInvalidStart + Abs( nInvalidDiff );
@@ -633,7 +620,6 @@ struct TabInfo
 /*N*/
 /*N*/                       // Tab-Pos suchen...
 /*N*/                       long nCurPos = nTmpWidth+nStartX;
-/*N*/ //                        nCurPos -= rLRItem.GetTxtLeft();    // Tabs relativ zu LI
 /*N*/                       // Skalierung rausrechnen
 /*N*/                       if ( aStatus.DoStretch() && ( nStretchX != 100 ) )
 /*?*/                           nCurPos = nCurPos*100/nStretchX;
@@ -1004,20 +990,6 @@ struct TabInfo
 /*N*/           }
 /*N*/       }
 /*N*/
-/*N*/
-/*N*/       // #80582# - Bullet should not influence line height
-/*N*/ //        if ( !nLine )
-/*N*/ //        {
-/*N*/ //            long nBulletHeight = aBulletArea.GetHeight();
-/*N*/ //            if ( nBulletHeight > (long)pLine->GetHeight() )
-/*N*/ //            {
-/*N*/ //                long nDiff =  nBulletHeight - (long)pLine->GetHeight();
-/*N*/ //                // nDiff auf oben und unten verteilen.
-/*N*/ //                pLine->SetMaxAscent( (sal_uInt16)(pLine->GetMaxAscent() + nDiff/2) );
-/*N*/ //                pLine->SetHeight( (sal_uInt16)nBulletHeight );
-/*N*/ //            }
-/*N*/ //        }
-/*N*/
 /*N*/       if ( ( !IsVertical() && aStatus.AutoPageWidth() ) ||
 /*N*/            ( IsVertical() && aStatus.AutoPageHeight() ) )
 /*N*/       {
@@ -1364,9 +1336,6 @@ struct TabInfo
 /*N*/ //    CalcCharPositions( pParaPortion );
 /*N*/   pParaPortion->SetValid();
 /*N*/   long nOldHeight = pParaPortion->GetHeight();
-/*N*/ //    sal_uInt16 nPos = GetParaPortions().GetPos( pParaPortion );
-/*N*/ //    DBG_ASSERT( nPos != USHRT_MAX, "FinishCreateLines: Portion nicht in Liste!" );
-/*N*/ //    ParaPortion* pPrev = nPos ? GetParaPortions().GetObject( nPos-1 ) : 0;
 /*N*/   CalcHeight( pParaPortion );
 /*N*/
 /*N*/   DBG_ASSERT( pParaPortion->GetTextPortions().Count(), "FinishCreateLines: Keine Text-Portion?" );
@@ -1708,10 +1677,6 @@ struct TabInfo
 /*N*/       {
 /*N*/           if ( nTmpPos == nPos )  // dann braucht nichts geteilt werden
 /*N*/           {
-/*N*/               // Skip Portions with ExtraSpace
-/*N*/ //                while ( ( (nSplitPortion+1) < nPortions ) && (pPortion->GetTextPortions().GetObject(nSplitPortion+1)->GetKind() == PORTIONKIND_EXTRASPACE ) )
-/*N*/ //                    nSplitPortion++;
-/*N*/
 /*N*/               return nSplitPortion;
 /*N*/           }
 /*N*/           pTextPortion = pTP;
@@ -2212,13 +2177,8 @@ struct TabInfo
 /*N*/       // Damit sich die Leading nicht wieder rausrechnet,
 /*N*/       // wenn die ganze Zeile den Font hat, nTmpLeading.
 /*N*/
-/*N*/       // 4/96: Kommt bei HP Laserjet 4V auch nicht hin
-/*N*/       // => Werte komplett vom Bildschirm holen.
-/*N*/ //        sal_uInt16 nTmpLeading = (sal_uInt16)aMetric.GetIntLeading();
-/*N*/ //        nAscent += nTmpLeading;
 /*N*/       nAscent = (sal_uInt16)aMetric.GetAscent();
 /*N*/       nDescent = (sal_uInt16)aMetric.GetDescent();
-/*N*/ //        nLeading = (sal_uInt16)aMetric.GetIntLeading();
 /*N*/   }
 /*N*/   if ( nAscent > rCurMetrics.nMaxAscent )
 /*N*/       rCurMetrics.nMaxAscent = nAscent;
@@ -2324,11 +2284,6 @@ struct TabInfo
 /*N*/               if ( ( !IsVertical() && ( aStartPos.Y() > aClipRec.Top() ) )
 /*N*/                   || ( IsVertical() && aStartPos.X() < aClipRec.Right() ) )
 /*N*/               {
-/*N*/                   if ( ( nLine == 0 ) && !bStripOnly )    // erste Zeile
-/*N*/                   {
-/*N*/                       // VERT???
-/*N*/                       GetEditEnginePtr()->PaintingFirstLine( n, aParaStart, aTmpPos.Y(), aOrigin, nOrientation, pOutDev );
-/*N*/                   }
 /*N*/                   // --------------------------------------------------
 /*N*/                   // Ueber die Portions der Zeile...
 /*N*/                   // --------------------------------------------------
@@ -2353,18 +2308,6 @@ struct TabInfo
 /*?*/                                 break;    // Keine weitere Ausgabe in Zeile noetig
 /*N*/                         }
 /*N*/
-/*N*/                         // R2L replaces with obove...
-/*N*/                         // New position after processing R2L text...
-/*N*/ // R2L                        if ( nR2LWidth && !pTextPortion->GetRightToLeft() )
-/*N*/ // R2L                        {
-/*N*/ // R2L                            if ( !IsVertical() )
-/*N*/ // R2L                                aTmpPos.X() += nR2LWidth;
-/*N*/ // R2L                            else
-/*N*/ // R2L                                aTmpPos.Y() += nR2LWidth;
-/*N*/ // R2L
-/*N*/ // R2L                            nR2LWidth = 0;
-/*N*/ // R2L                        }
-/*N*/
 /*N*/                       switch ( pTextPortion->GetKind() )
 /*N*/                       {
 /*N*/                           case PORTIONKIND_TEXT:
@@ -2451,24 +2394,6 @@ struct TabInfo
 /*N*/
 /*N*/                               Point aOutPos( aTmpPos );
 /*N*/                                 aRedLineTmpPos = aTmpPos;
-/*N*/ //L2R                                if ( pTextPortion->GetRightToLeft() )
-/*N*/ //L2R                                {
-/*N*/ //L2R                                    sal_uInt16 nNextPortion = y+1;
-/*N*/ //L2R                                    while ( nNextPortion <= pLine->GetEndPortion() )
-/*N*/ //L2R                                    {
-/*N*/ //L2R                                     TextPortion* pNextTextPortion = pPortion->GetTextPortions().GetObject( nNextPortion );
-/*N*/ //L2R                                        if ( pNextTextPortion->GetRightToLeft() )
-/*N*/ //L2R                                        {
-/*N*/ //L2R                                         if ( !IsVertical() )
-/*N*/ //L2R                                                aOutPos.X() += pNextTextPortion->GetSize().Width();
-/*N*/ //L2R                                         else
-/*N*/ //L2R                                                aOutPos.Y() += pNextTextPortion->GetSize().Width();
-/*N*/ //L2R                                        }
-/*N*/ //L2R                                        else
-/*N*/ //L2R                                            break;
-/*N*/ //L2R                                        nNextPortion++;
-/*N*/ //L2R                                    }
-/*N*/ //L2R                                }
 /*N*/                               if ( bStripOnly )
 /*N*/                               {
 /*N*/                                   // VERT???
@@ -2531,19 +2456,6 @@ struct TabInfo
 /*N*/
 /*N*/                                 if ( pTmpDXArray )
 /*?*/                                   delete[] pTmpDXArray;
-/*N*/
-/*N*/ // R2L                                if ( !pTextPortion->GetRightToLeft() )
-/*N*/ // R2L                                {
-/*N*/ // R2L                                    if ( !IsVertical() )
-/*N*/ // R2L                                        aTmpPos.X() += nTxtWidth;
-/*N*/ // R2L                                    else
-/*N*/ // R2L                                        aTmpPos.Y() += nTxtWidth;
-/*N*/ // R2L                                }
-/*N*/ // R2L                                else
-/*N*/ // R2L                                {
-/*N*/ // R2L                                    nR2LWidth += nTxtWidth;
-/*N*/ // R2L                                }
-/*N*/
 /*N*/                           }
 /*N*/                           break;
 /*N*/ //                        case PORTIONKIND_EXTRASPACE:
@@ -2566,17 +2478,9 @@ struct TabInfo
 /*?*/                                   aText.Fill( (USHORT)nChars, pTextPortion->GetExtraValue() );
 /*?*/                                   pOutDev->DrawStretchText( aTmpPos, pTextPortion->GetSize().Width(), aText );
 /*?*/                               }
-/*?*/ // R2L                                if ( !IsVertical() )
-/*?*/ // R2L                                    aTmpPos.X() += pTextPortion->GetSize().Width();
-/*?*/ // R2L                                else
-/*?*/ // R2L                                    aTmpPos.Y() += pTextPortion->GetSize().Width();
 /*N*/                           }
 /*N*/                           break;
 /*N*/                       }
-/*N*/ // R2L                        if ( !IsVertical() && ( aTmpPos.X() > aClipRec.Right() ) )
-/*N*/ // R2L                            break;  // Keine weitere Ausgabe in Zeile noetig
-/*N*/ // R2L                        else if ( IsVertical() && ( aTmpPos.Y() > aClipRec.Bottom() ) )
-/*N*/ // R2L                            break;  // Keine weitere Ausgabe in Zeile noetig
 /*N*/                       nIndex += pTextPortion->GetLen();
 /*N*/                   }
 /*N*/               }
@@ -2717,7 +2621,6 @@ struct TabInfo
 /*N*/       if ( GetTextRanger() )
 /*N*/       {
 /*?*/           // Some problems here with push/pop, why?!
-/*?*/ //            pOutWin->Push( PUSH_CLIPREGION|PUSH_MAPMODE );
 /*?*/           bClipRegion = pOutWin->IsClipRegion();
 /*?*/           aOldRegion = pOutWin->GetClipRegion();
 /*?*/           // Wie bekomme ich das Polygon an die richtige Stelle????
@@ -2739,7 +2642,6 @@ struct TabInfo
 /*N*/
 /*N*/       if ( GetTextRanger() )
 /*N*/       {
-/*?*/ //            pOutWin->Pop();
 /*?*/           if ( bClipRegion )
 /*?*/               pOutWin->SetClipRegion( aOldRegion );
 /*?*/           else
@@ -2801,19 +2703,6 @@ struct TabInfo
 /*N*/ {
 /*N*/   sal_Bool bChanged = ( GetUpdateMode() != bUp );
 /*N*/
-/*N*/   // Beim Umschalten von sal_True auf sal_False waren alle Selektionen sichtbar,
-/*N*/   // => Wegmalen
-/*N*/   // Umgekehrt waren alle unsichtbar => malen
-/*N*/
-/*N*/ //    DrawAllSelections();    sieht im Outliner schlecht aus !
-/*N*/ //    EditView* pView = aEditViewList.First();
-/*N*/ //    while ( pView )
-/*N*/ //    {
-/*N*/ //        DBG_CHKOBJ( pView, EditView, 0 );
-/*N*/ //        pView->pImpEditView->DrawSelection();
-/*N*/ //        pView = aEditViewList.Next();
-/*N*/ //    }
-/*N*/
 /*N*/   // Wenn !bFormatted, also z.B. nach SetText, braucht bei UpdateMode sal_True
 /*N*/   // nicht sofort formatiert werden, weil warscheinlich noch Text kommt.
 /*N*/   // Spaetestens bei einem Paint / CalcTextWidth wird formatiert.
diff --git a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
index 4ee7e4623..88f976075 100644
--- a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
@@ -1040,11 +1040,8 @@ namespace binfilter {
 /*N*/   for( a=0; a < nCount; a++)
 /*N*/   {
 /*N*/       SdrObject* pObj = pSub->GetObj(a);
-/*N*/       if(pObj->AllowItemChange(nWhich, pNewItem))
-/*N*/       {
-/*N*/           pObj->ItemChange(nWhich, pNewItem);
-/*N*/           aPostItemChangeList.Insert((void*)pObj, LIST_APPEND);
-/*N*/       }
+/*N*/       pObj->ItemChange(nWhich, pNewItem);
+/*N*/       aPostItemChangeList.Insert((void*)pObj, LIST_APPEND);
 /*N*/   }
 /*N*/
 /*N*/   for(a = 0; a < aPostItemChangeList.Count(); a++)
diff --git a/binfilter/bf_svx/source/form/makefile.mk b/binfilter/bf_svx/source/form/makefile.mk
index 886f1c8b2..49a6e3698 100644
--- a/binfilter/bf_svx/source/form/makefile.mk
+++ b/binfilter/bf_svx/source/form/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -60,12 +60,11 @@ SLOFILES = \
     $(SLO)$/svx_fmobjfac.obj \
     $(SLO)$/svx_fmimplids.obj \
     $(SLO)$/svx_fmdmod.obj \
-    $(SLO)$/svx_ParseContext.obj \
     $(SLO)$/svx_siimport.obj \
     $(SLO)$/svx_fmtools.obj \
     $(SLO)$/svx_fmpgeimp.obj
 
-.IF "$(OS)$(CPU)"=="SOLARISI" 
+.IF "$(OS)$(CPU)"=="SOLARISI"
 NOOPTFILES=$(SLO)$/svx_fmprop.obj
 .ENDIF
 
diff --git a/binfilter/bf_svx/source/form/svx_ParseContext.cxx b/binfilter/bf_svx/source/form/svx_ParseContext.cxx
deleted file mode 100644
index f3f715667..000000000
--- a/binfilter/bf_svx/source/form/svx_ParseContext.cxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "ParseContext.hxx"
-#include <tools/debug.hxx>
-#include "fmresids.hrc"
-#include "dialmgr.hxx"
-#include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
-
-#include <tools/shl.hxx>
-
-namespace binfilter {
-
-
-using namespace svxform;
-using namespace ::connectivity;
-//==========================================================================
-//= OSystemParseContext
-//==========================================================================
-/*N*/ DBG_NAME(OSystemParseContext)
-//-----------------------------------------------------------------------------
-/*N*/ OSystemParseContext::OSystemParseContext() : IParseContext()
-/*N*/ {
-/*N*/   DBG_CTOR(OSystemParseContext,NULL);
-/*N*/   SolarMutexGuard aGuard;
-/*N*/   m_aSQLInternationals = ByteString(SVX_RES(RID_STR_SVT_SQL_INTERNATIONAL),RTL_TEXTENCODING_ASCII_US);
-/*N*/ }
-
-//-----------------------------------------------------------------------------
-/*?*/ OSystemParseContext::~OSystemParseContext()
-/*?*/ {
-/*?*/   DBG_DTOR(OSystemParseContext,NULL);
-/*?*/ }
-
-//-----------------------------------------------------------------------------
-::com::sun::star::lang::Locale OSystemParseContext::getPreferredLocale( ) const
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-    ::com::sun::star::lang::Locale alocal;
-    return alocal;
-}
-
-//-----------------------------------------------------------------------------
-::rtl::OUString OSystemParseContext::getErrorMessage(ErrorCode) const
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-    String astring;
-    return astring;
-}
-
-//-----------------------------------------------------------------------------
-::rtl::OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode) const
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-    ByteString aKeyword;
-    return aKeyword;
-}
-
-// -----------------------------------------------------------------------------
-IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::rtl::OString&) const
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-    return KEY_NONE;
-}
-
-
-// =============================================================================
-namespace
-{
-    // -----------------------------------------------------------------------------
-/*N*/   ::osl::Mutex& getSafteyMutex()
-/*N*/   {
-/*N*/       static ::osl::Mutex s_aSafety;
-/*N*/       return s_aSafety;
-/*N*/   }
-    // -----------------------------------------------------------------------------
-/*N*/   oslInterlockedCount& getCounter()
-/*N*/   {
-/*N*/       static oslInterlockedCount s_nCounter;
-/*N*/       return s_nCounter;
-/*N*/   }
-    // -----------------------------------------------------------------------------
-/*N*/   OSystemParseContext* getSharedContext(OSystemParseContext* _pContext = NULL,sal_Bool _bSet = sal_False)
-/*N*/   {
-/*N*/       static OSystemParseContext* s_pSharedContext = NULL;
-/*N*/       if ( _pContext && !s_pSharedContext )
-/*N*/       {
-/*N*/           s_pSharedContext = _pContext;
-/*N*/           return s_pSharedContext;
-/*N*/       }
-/*N*/       if ( _bSet )
-/*N*/       {
-/*N*/               OSystemParseContext* pReturn = _pContext ? _pContext : s_pSharedContext;
-/*N*/           s_pSharedContext = _pContext;
-/*N*/           return pReturn;
-/*N*/       }
-/*N*/       return s_pSharedContext;
-    }
-    // -----------------------------------------------------------------------------
-}
-// -----------------------------------------------------------------------------
-/*N*/ OParseContextClient::OParseContextClient()
-/*N*/ {
-/*N*/   ::osl::MutexGuard aGuard( getSafteyMutex() );
-/*N*/   if ( 1 == osl_incrementInterlockedCount( &getCounter() ) )
-/*N*/   {   // first instance
-/*N*/       getSharedContext( new OSystemParseContext );
-/*N*/   }
-/*N*/ }
-
-// -----------------------------------------------------------------------------
-/*N*/ OParseContextClient::~OParseContextClient()
-/*N*/ {
-/*N*/   {
-/*N*/       ::osl::MutexGuard aGuard( getSafteyMutex() );
-/*N*/       if ( 0 == osl_decrementInterlockedCount( &getCounter() ) )
-/*N*/           delete getSharedContext(NULL,sal_True);
-/*N*/   }
-/*N*/ }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
index c5e06790d..0a86c4c0a 100644
--- a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
@@ -61,7 +61,6 @@
 
 
 #include <unotools/streamwrap.hxx>
-#include "dbtoolsclient.hxx"
 #include <legacysmgr/legacy_binfilters_smgr.hxx>
 
 namespace binfilter {
@@ -69,7 +68,6 @@ namespace binfilter {
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::form;
diff --git a/binfilter/bf_svx/source/inc/dbtoolsclient.hxx b/binfilter/bf_svx/source/inc/dbtoolsclient.hxx
deleted file mode 100644
index 9e727bb09..000000000
--- a/binfilter/bf_svx/source/inc/dbtoolsclient.hxx
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVX_DBTOOLSCLIENT_HXX
-#define SVX_DBTOOLSCLIENT_HXX
-
-#include <connectivity/virtualdbtools.hxx>
-#include <osl/module.h>
-#include <bf_svtools/bf_solar.h>
-namespace binfilter {
-//........................................................................
-namespace svxform
-{
-//........................................................................
-
-    //====================================================================
-    //= ODbtoolsClient
-    //====================================================================
-    /** base class for classes which want to use dbtools features with load-on-call
-        of the dbtools lib.
-    */
-    class ODbtoolsClient
-    {
-    private:
-        static  ::osl::Mutex    s_aMutex;
-        static  sal_Int32       s_nClients;
-        static oslModule        s_hDbtoolsModule;
-        static ::connectivity::simple::createDataAccessToolsFactoryFunction
-                                s_pFactoryCreationFunc;
-        mutable BOOL            m_bCreateAlready;
-
-    private:
-        mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory;
-
-    protected:
-        const ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory >&
-            getFactory() const { return m_xDataAccessFactory; }
-
-    protected:
-        ODbtoolsClient();
-        ~ODbtoolsClient();
-
-    private:
-    };
-
-    //====================================================================
-    //= OStaticDataAccessTools
-    //====================================================================
-    class OStaticDataAccessTools : public ODbtoolsClient
-    {
-    protected:
-        mutable ::rtl::Reference< ::connectivity::simple::IDataAccessTools >    m_xDataAccessTools;
-        void create() const;
-
-        void checkIfLoaded() const;
-
-    public:
-        OStaticDataAccessTools();
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet)
-                const SAL_THROW ( (::com::sun::star::uno::RuntimeException) );
-
-        // ------------------------------------------------
-
-        // ------------------------------------------------
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource(
-                const ::rtl::OUString& _rsRegisteredName,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
-            ) const;
-
-        // ------------------------------------------------
-        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
-            @param      _rxCursorSet    the property set
-        */
-        sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
-
-        // ------------------------------------------------
-        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE
-            @param      _rxCursorSet    the property set
-        */
-        sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
-
-        // ------------------------------------------------
-        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE
-            @param      _rxCursorSet    the property set
-        */
-        sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
-
-        // ------------------------------------------------
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
-            getFieldsByCommandDescriptor(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
-                const sal_Int32 _nCommandType,
-                const ::rtl::OUString& _rCommand,
-                ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive,
-                ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
-            )   SAL_THROW( ( ) );
-
-        // ------------------------------------------------
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
-            getFieldNamesByCommandDescriptor(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
-                const sal_Int32 _nCommandType,
-                const ::rtl::OUString& _rCommand,
-                ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
-            )   SAL_THROW( ( ) );
-    };
-//........................................................................
-}   // namespace svxform
-//........................................................................
-
-}//end of namespace binfilter
-#endif // SVX_DBTOOLSCLIENT_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/filtnav.hxx b/binfilter/bf_svx/source/inc/filtnav.hxx
deleted file mode 100644
index cc4d0b9d0..000000000
--- a/binfilter/bf_svx/source/inc/filtnav.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_FILTNAV_HXX
-#define _SVX_FILTNAV_HXX
-
-
-
-
-
-
-
-
-#include <bf_sfx2/dockwin.hxx>
-
-
-
-
-
-
-
-namespace binfilter {
-
-class FmFormShell;
-
-//........................................................................
-namespace svxform
-{
-//........................................................................
-
-class FmFilterItem;
-class FmFilterItems;
-class FmFilterAdapter;
-
-//========================================================================
-// data structure for the filter model
-//========================================================================
-
-//========================================================================
-
-//========================================================================
-// Item representing the forms and subforms
-
-//========================================================================
-
-//========================================================================
-
-//========================================================================
-
-//========================================================================
-//========================================================================
-
-
-//====================================================================
-//= OFilterExchangeHelper
-//====================================================================
-
-//========================================================================
-
-//========================================================================
-
-//========================================================================
-class FmFilterNavigatorWinMgr : public SfxChildWindow
-{
-public:
-    FmFilterNavigatorWinMgr( Window *pParent, sal_uInt16 nId, SfxBindings *pBindings,
-                      SfxChildWinInfo *pInfo );
-    SFX_DECL_CHILDWINDOW( FmFilterNavigatorWinMgr );
-};
-
-//........................................................................
-}   // namespace svxform
-//........................................................................
-
-}//end of namespace binfilter
-#endif // _SVX_FILTNAV_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/fmPropBrw.hxx b/binfilter/bf_svx/source/inc/fmPropBrw.hxx
deleted file mode 100644
index 283f58ca3..000000000
--- a/binfilter/bf_svx/source/inc/fmPropBrw.hxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef SVX_FMPROPBRW_HXX
-#define SVX_FMPROPBRW_HXX
-
-#include <com/sun/star/awt/XControlContainer.hpp>
-#include <bf_sfx2/childwin.hxx>
-namespace binfilter {
-
-//========================================================================
-class FmPropBrwMgr : public SfxChildWindow
-{
-protected:
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
-                    m_xUnoRepresentation;
-public:
-    FmPropBrwMgr(Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo);
-    SFX_DECL_CHILDWINDOW(FmPropBrwMgr);
-};
-
-class FmPropControl;
-class SfxBindings;
-//========================================================================
-}//end of namespace binfilter
-#endif //SVX_FMPROPBRW_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/fmcontr.hxx b/binfilter/bf_svx/source/inc/fmcontr.hxx
deleted file mode 100644
index 44684cf53..000000000
--- a/binfilter/bf_svx/source/inc/fmcontr.hxx
+++ /dev/null
@@ -1,254 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_FMCONTR_HXX
-#define _SVX_FMCONTR_HXX
-
-#include <comphelper/stl_types.hxx>
-
-#include <com/sun/star/form/XFormComponent.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/script/XEventAttacherManager.hpp>
-#include <com/sun/star/script/ScriptEvent.hpp>
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
-#include <com/sun/star/container/XContainer.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/container/XIndexReplace.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/lang/EventObject.hpp>
-namespace binfilter {
-
-typedef ::boost::unordered_multimap< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > , ::rtl::OUStringHash, ::comphelper::UStringEqual> OInterfaceMap;
-
-DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > ,InterfaceArray);
-
-class ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream > ;
-class ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream > ;
-
-//==================================================================
-// FmForms
-// Implementiert den UNO-::com::sun::star::sdbcx::Container fuer Formulare
-// enthaelt alle zugeordneten ::com::sun::star::form::Forms
-// dieses ::com::sun::star::sdbcx::Container kann selbst den Context fuer Formulare darstellen
-// oder außen einen Context uebergeben bekommen
-//==================================================================
-class FmXInterfaceContainer : public ::com::sun::star::container::XNameContainer,
-                              public ::com::sun::star::container::XIndexContainer,
-                              public ::com::sun::star::container::XContainer,
-                              public ::com::sun::star::container::XEnumerationAccess,
-                              public ::com::sun::star::script::XEventAttacherManager,
-                              public ::com::sun::star::beans::XPropertyChangeListener
-{
-protected:
-    OInterfaceMap               m_aMap;
-    OInterfaceArray             m_aItems;
-    ::usr::OInterfaceContainerHelper
-                                m_aContainerListeners;
-
-    InterfaceReflection*        m_pElementReflection;
-    ::VOS::IMutex&      m_rMutex;
-    ::com::sun::star::uno::Uik                          m_aElementUik;
-
-
-    // EventManager
-    ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager >     m_xEventAttacher;
-
-public:
-    FmXInterfaceContainer(::VOS::IMutex& _rMutex, InterfaceReflection* pElementReflection, const ::com::sun::star::uno::Uik& rUik );
-
-public:
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual sal_Bool queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  & rOut );
-
-
-// ::com::sun::star::io::XPersistObject
-    void write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream);
-    void read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream > & InStream);
-
-// ::com::sun::star::lang::XEventListener
-    virtual void disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::beans::XPropertyChangeListener
-    virtual void propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt);
-
-// ::com::sun::star::container::XElementAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >  getElementType(void) const throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool hasElements(void) const throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XEnumerationAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >  createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XNameAccess
-    virtual ::com::sun::star::uno::Any getByName(const ::rtl::OUString& Name) const throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getElementNames(void) const throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool hasByName(const ::rtl::OUString& Name) const throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XNameReplace
-    virtual void replaceByName(const ::rtl::OUString& Name, const ::com::sun::star::uno::Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XNameContainer
-    virtual void insertByName(const ::rtl::OUString& Name, const ::com::sun::star::uno::Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual void removeByName(const ::rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XIndexAccess
-    virtual sal_Int32 getCount(void) const throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Any getByIndex(sal_Int32 ::com::sun::star::sdbcx::Index) const throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XIndexReplace
-    virtual void replaceByIndex(sal_Int32 ::com::sun::star::sdbcx::Index, const ::com::sun::star::uno::Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XIndexContainer
-    virtual void insertByIndex(sal_Int32 ::com::sun::star::sdbcx::Index, const ::com::sun::star::uno::Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual void removeByIndex(sal_Int32 ::com::sun::star::sdbcx::Index) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XContainer
-    virtual void addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > & l) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > & l) throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::script::XEventAttacherManager
-    virtual void registerScriptEvent(sal_Int32 nIndex, const ::com::sun::star::script::ScriptEventDescriptor& ::com::sun::star::script::ScriptEvent);
-    virtual void registerScriptEvents(sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& ScriptEvents);
-    virtual void revokeScriptEvent(sal_Int32 nIndex, const ::rtl::OUString& ListenerType, const ::rtl::OUString& EventMethod, const ::rtl::OUString& rRemoveListenerParam);
-    virtual void revokeScriptEvents(sal_Int32 nIndex);
-    virtual void insertEntry(sal_Int32 nIndex);
-    virtual void removeEntry(sal_Int32 nIndex);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > getScriptEvents(sal_Int32 nIndex);
-    virtual void attach(sal_Int32 nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Object, const ::com::sun::star::uno::Any& Helper);
-    virtual void detach(sal_Int32 nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xObject);
-    virtual void addScriptListener(const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > & aListener);
-    virtual void removeScriptListener(const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > & aListener);
-
-    static ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >  getStaticIdlClass();
-
-protected:
-    // helper
-    virtual void disposing();
-    virtual void insert(sal_Int32 ::com::sun::star::sdbcx::Index, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & _Object, sal_Bool bEvents = sal_True)
-                    throw( ::com::sun::star::lang::IllegalArgumentException );
-    virtual void removeElementsNoEvents(sal_Int32 nIndex);
-
-    // called after the object is inserted, but before the "real listeners" are notified
-    virtual void implInserted(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & _rxObject) { }
-    // called after the object is removed, but before the "real listeners" are notified
-    virtual void implRemoved(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & _rxObject) { }
-
-    void writeEvents(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream);
-    void readEvents(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream > & InStream, sal_Int32 nCount);
-};
-
-//==================================================================
-// FmForms
-// Implementiert den UNO-::com::sun::star::sdbcx::Container fuer Formulare
-// enthaelt alle zugeordneten ::com::sun::star::form::Forms
-// dieses ::com::sun::star::sdbcx::Container kann selbst den Context fuer Formulare darstellen
-// oder außen einen Context uebergeben bekommen
-//==================================================================
-class FmXForms : public ::usr::OComponentHelper,
-                 public FmXInterfaceContainer,
-                 public ::com::sun::star::container::XChild
-
-{
-    friend Reflection* ::getCppuType((const FmXForms*)0);
-    ::osl::Mutex        m_aMutex;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >               m_xParent;          // Parent
-
-public:
-    FmXForms();
-    virtual ~FmXForms();
-
-public:
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual sal_Bool queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  & rOut )
-
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//          { return OComponentHelper::queryInterface( aUik, rOut ); }
-
-    virtual sal_Bool queryAggregation(::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rOut);
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > >  getIdlClasses(void);
-
-// automatisch auskommentiert - [getImplementation] - Wird von OWeakObject nicht weiter unterstützt!
-//  virtual void* getImplementation(Reflection * pRef);
-
-    virtual void acquire() { OComponentHelper::acquire(); }
-    virtual void release() { OComponentHelper::release(); }
-
-// OComponentHelper
-    virtual void disposing();
-
-// ::com::sun::star::container::XChild
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  getParent(void) const throw( ::com::sun::star::uno::RuntimeException );
-    virtual void setParent(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Parent) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException );
-};
-
-//==================================================================
-// FmForm
-// Implementiert den UNO-::com::sun::star::sdbcx::Container fuer FormularControls
-//==================================================================
-class FmXFormComponents : public ::usr::OComponentHelper,
-                          public FmXInterfaceContainer,
-                          public ::com::sun::star::form::XFormComponent
-{
-protected:
-    ::osl::Mutex        m_aMutex;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >               m_xParent;          // Parent
-
-public:
-    FmXFormComponents();
-    virtual ~FmXFormComponents();
-
-    SMART_UNO_DECLARATION(FmXFormComponents, OComponentHelper);
-
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual sal_Bool queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  & rOut )
-
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//          { return OComponentHelper::queryInterface( aUik, rOut ); }
-
-    virtual sal_Bool queryAggregation(::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rOut);
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > >  getIdlClasses(void);
-
-
-// OComponentHelper
-    virtual void disposing();
-
-// ::com::sun::star::form::XFormComponent
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  getParent(void) const throw( ::com::sun::star::uno::RuntimeException );
-    virtual void setParent(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Parent) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException );
-
-    static ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >  getStaticIdlClass();
-};
-
-
-}//end of namespace binfilter
-#endif          // _SVX_FMCONTR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/fmctrler.hxx b/binfilter/bf_svx/source/inc/fmctrler.hxx
deleted file mode 100644
index 5f0d0cfe2..000000000
--- a/binfilter/bf_svx/source/inc/fmctrler.hxx
+++ /dev/null
@@ -1,405 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_FMCTRLER_HXX
-#define _SVX_FMCTRLER_HXX
-
-#include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp>
-#include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp>
-#include <com/sun/star/form/XResetListener.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XContainerListener.hpp>
-#include <com/sun/star/form/XConfirmDeleteBroadcaster.hpp>
-#include <com/sun/star/form/XLoadListener.hpp>
-#include <com/sun/star/form/XDatabaseParameterBroadcaster.hpp>
-#include <com/sun/star/form/XFormController.hpp>
-#include <com/sun/star/util/XModeSelector.hpp>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <com/sun/star/script/XEventAttacherManager.hpp>
-#include <com/sun/star/awt/XItemListener.hpp>
-#include <com/sun/star/awt/XTextComponent.hpp>
-
-#include <vcl/timer.hxx>
-
-#include "fmtools.hxx"
-#include "sqlparserclient.hxx"
-
-#include <cppuhelper/compbase12.hxx>
-#include <comphelper/proparrhlp.hxx>
-#include <comphelper/broadcasthelper.hxx>
-class Window;
-namespace binfilter {
-
-struct FmXTextComponentLess : public binary_function< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent> , sal_Bool>
-{
-    sal_Bool operator() (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& x, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& y) const
-    {
-        return reinterpret_cast<sal_Int64>(x.get()) < reinterpret_cast<sal_Int64>(y.get());
-    }
-};
-
-typedef map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, FmXTextComponentLess> FmFilterControls;
-typedef map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::rtl::OUString, FmXTextComponentLess> FmFilterRow;
-typedef vector< FmFilterRow > FmFilterRows;
-typedef vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > > FmFormControllers;
-
-struct FmFieldInfo;
-class FmXFormController;
-class FmFormView;
-
-typedef ::cppu::WeakAggComponentImplHelper12<   ::com::sun::star::form::XFormController
-                                            ,::com::sun::star::container::XChild
-                                            ,::com::sun::star::container::XIndexAccess      //  access of child contoller
-                                            ,::com::sun::star::container::XEnumerationAccess
-                                            ,::com::sun::star::awt::XFocusListener
-                                            ,::com::sun::star::form::XLoadListener
-                                            ,::com::sun::star::beans::XPropertyChangeListener
-                                            ,::com::sun::star::awt::XTextListener
-                                            ,::com::sun::star::awt::XItemListener
-                                            ,::com::sun::star::container::XContainerListener
-                                            ,::com::sun::star::util::XModifyListener
-                                            ,::com::sun::star::util::XModifyBroadcaster> FmXFormController_BASE1;
-
-typedef ::cppu::ImplHelper12<               ::com::sun::star::util::XModeSelector
-                                            ,::com::sun::star::form::XConfirmDeleteListener
-                                            ,::com::sun::star::form::XConfirmDeleteBroadcaster
-                                            ,::com::sun::star::sdb::XSQLErrorListener
-                                            ,::com::sun::star::sdb::XSQLErrorBroadcaster
-                                            ,::com::sun::star::sdbc::XRowSetListener
-                                            ,::com::sun::star::sdb::XRowSetApproveListener
-                                            ,::com::sun::star::sdb::XRowSetApproveBroadcaster
-                                            ,::com::sun::star::form::XDatabaseParameterListener
-                                            ,::com::sun::star::form::XDatabaseParameterBroadcaster
-                                            ,::com::sun::star::lang::XServiceInfo
-                                            ,::com::sun::star::form::XResetListener> FmXFormController_BASE2;
-typedef ::cppu::ImplHelper2                 <   ::com::sun::star::lang::XUnoTunnel
-                                            ,   ::com::sun::star::frame::XDispatch
-                                            >   FmXFormController_BASE3;
-
-//==================================================================
-// FmXFormController
-//==================================================================
-class FmXFormController     : public ::comphelper::OBaseMutex
-                            ,public FmXFormController_BASE1
-                            ,public FmXFormController_BASE2
-                            ,public FmXFormController_BASE3
-                            ,public ::cppu::OPropertySetHelper
-                            ,public FmDispatchInterceptor
-                            ,public ::comphelper::OAggregationArrayUsageHelper< FmXFormController>
-                            ,public ::binfilter::svxform::OSQLParserClient
-{
-    friend class FmXPageViewWinRec;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>              m_xAggregate;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController>            m_xTabController, m_xNavigationController;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>                  m_xActiveControl, m_xCurrentControl;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>        m_xModelAsIndex;
-    ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager>  m_xModelAsManager;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>                m_xParent;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
-    // Composer used for checking filter conditions
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer> m_xComposer;
-
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >   m_aControls;
-    ::cppu::OInterfaceContainerHelper
-                                m_aActivateListeners,
-                                m_aModifyListeners,
-                                m_aErrorListeners,
-                                m_aDeleteListeners,
-                                m_aRowSetApproveListeners,
-                                m_aParameterListeners;
-
-    FmFormControllers           m_aChilds;
-    FmFilterControls            m_aFilterControls;
-    FmFilterRows                m_aFilters;
-    ::binfilter::form::OImplementationIdsRef    m_aHoldImplIdHelper;
-
-    Timer                       m_aInsertTimer;
-
-    FmFormView*                 m_pView;
-    Window*                     m_pWindow;
-
-    ::rtl::OUString             m_aMode;
-
-    sal_uInt32                  m_nLoadEvent;
-    sal_uInt32                  m_nUpdateDispatcherEvent;
-    sal_uInt32                  m_nToggleEvent;
-
-    sal_Int32                   m_nCurrentFilterPosition;   // current level for filtering (or-criteria)
-    ::rtl::OUString                 m_sDispatchPrefix;
-
-    sal_Bool                    m_bCurrentRecordModified : 1;
-    sal_Bool                    m_bCurrentRecordNew : 1;
-    sal_Bool                    m_bLocked           : 1;
-    sal_Bool                    m_bDBConnection  : 1;   // Focuslistener nur fuer Datenbankformulare
-    sal_Bool                    m_bCycle             : 1;
-    sal_Bool                    m_bCanInsert         : 1;
-    sal_Bool                    m_bCanUpdate         : 1;
-    sal_Bool                    m_bCommitLock    : 1;   // lock the committing of controls see focusGained
-    sal_Bool                    m_bModified      : 1;   // ist der Inhalt eines Controls modifiziert ?
-    sal_Bool                    m_bControlsSorted : 1;
-    sal_Bool                    m_bFiltering : 1;
-    sal_Bool                    m_bAttachEvents : 1;
-    sal_Bool                    m_bDetachEvents : 1;
-
-    // as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing
-    // the ::com::sun::star::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class
-    DECLARE_STL_VECTOR(FmXDispatchInterceptorImpl*, Interceptors);
-    Interceptors    m_aControlDispatchInterceptors;
-
-public:
-    FmXFormController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB,
-                      FmFormView* _pView = NULL, Window* _pWindow = NULL, const UniString& _sDispatchPrefix = UniString());
-    ~FmXFormController();
-
-    // UNO Anbindung
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException )
-            { return FmXFormController_BASE1::queryInterface( type ); }
-    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire() throw ();
-    virtual void SAL_CALL release() throw ();
-
-// XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException)
-    {
-        return ::binfilter::form::OImplementationIds::getImplementationId(getTypes());
-    }
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-
-// XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
-    static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
-
-// XDispatch
-    virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& _rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgs ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::container::XChild
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL getParent(void) throw( ::com::sun::star::uno::RuntimeException ) {return m_xParent;}
-    virtual void SAL_CALL setParent(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Parent) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException )
-    {m_xParent = Parent;}
-
-// ::com::sun::star::lang::XEventListener
-    virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException );
-
-// OComponentHelper
-    virtual void SAL_CALL disposing();
-
-// OPropertySetHelper
-    virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue,
-                                            sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
-                throw( ::com::sun::star::lang::IllegalArgumentException );
-
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw( ::com::sun::star::uno::Exception );
-    virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const;
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
-// XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XEnumerationAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XContainerListener
-    virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XLoadListener
-    virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XModeSelector
-    virtual void SAL_CALL setMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-// XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener>& l) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener>& l) throw( ::com::sun::star::uno::RuntimeException );
-
-// XFocusListener
-    virtual void SAL_CALL focusGained(const  ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL focusLost(const  ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::beans::XPropertyChangeListener -> aenderung der stati
-    virtual void SAL_CALL propertyChange(const  ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException );
-
-// XTextListener           -> modify setzen
-    virtual void SAL_CALL textChanged(const  ::com::sun::star::awt::TextEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XItemListener            -> modify setzen
-    virtual void SAL_CALL itemStateChanged(const  ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XModifyListener   -> modify setzen
-    virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XFormController
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> SAL_CALL getCurrentControl(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException );
-
-// XTabController
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> > SAL_CALL getControls(void) throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel>& Model) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel> SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL setContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer>& Container) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> SAL_CALL getContainer() throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL autoTabOrder() throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL activateTabOrder() throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL activateFirst() throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL activateLast() throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::sdbc::XRowSetListener
-    virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
-
-// XRowSetApproveListener
-    virtual sal_Bool SAL_CALL approveCursorMove(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL approveRowChange(const  ::com::sun::star::sdb::RowChangeEvent& event) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL approveRowSetChange(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
-
-// XRowSetApproveBroadcaster
-    virtual void SAL_CALL addRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& listener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& listener) throw( ::com::sun::star::uno::RuntimeException );
-
-// XSQLErrorBroadcaster
-    virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XSQLErrorListener
-    virtual void SAL_CALL addSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rListener) throw( ::com::sun::star::uno::RuntimeException );
-
-// XDatabaseParameterBroadcaster
-    virtual void SAL_CALL addParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
-
-// XDatabaseParameterListener
-    virtual sal_Bool SAL_CALL approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XConfirmDeleteBroadcaster
-    virtual void SAL_CALL addConfirmDeleteListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XConfirmDeleteListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeConfirmDeleteListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XConfirmDeleteListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
-
-// XConfirmDeleteListener
-    virtual sal_Bool SAL_CALL confirmDelete(const  ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XServiceInfo
-    virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >  SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException);
-
-// XResetListener
-    virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL resetted(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// method for registration
-    static  ::com::sun::star::uno::Sequence< ::rtl::OUString >  static_getSupportedServiceNames(void);
-
-    // comphelper::OPropertyArrayUsageHelper
-    virtual void fillProperties(
-        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps,
-        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps
-        ) const;
-
-// access to the controls for filtering
-    const FmFilterControls& getFilterControls() const {return m_aFilterControls;}
-
-// access to the current filter rows
-    const FmFilterRows& getFilterRows() const {return m_aFilters;}
-    FmFilterRows& getFilterRows() {return m_aFilters;}
-
-    // just decr. the positions no notifications for the view
-    void decrementCurrentFilterPosition()
-    {
-        DBG_ASSERT(m_nCurrentFilterPosition, "Invalid Position");
-        --m_nCurrentFilterPosition;
-    }
-
-    sal_Int32 getCurrentFilterPosition() const {return m_nCurrentFilterPosition;}
-
-protected:
-    // FmDispatchInterceptor
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch>
-    interceptedQueryDispatch(sal_uInt16 _nId,const ::com::sun::star::util::URL& aURL,
-                            const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags)
-                            throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual ::osl::Mutex* getInterceptorMutex() { return &m_aMutex; }
-
-    void stopFiltering();
-    void addToEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
-    void removeFromEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
-    void removeBoundFieldListener();
-
-    void startFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly  );
-    void stopFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly );
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> findControl(::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& rxCtrlModel ,sal_Bool _bRemove = sal_True,sal_Bool _bOverWrite=sal_True) const;
-
-
-
-    sal_Bool isLocked() const {return m_bLocked;}
-
-        // returns m_pWindow or - if m_pWindow is NULL - the window of the currently set container
-
-        // create a new interceptor, register it on the given object
-        // if createInterceptor was called for the given object the according interceptor will be removed
-        // from the objects interceptor chain and released
-
-    // in filter mode we do not listen for changes
-    sal_Bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();}
-
-    DECL_LINK( OnTimeout, void* );
-    DECL_LINK( OnLoad, void* );
-    DECL_LINK( OnToggleAutoFields, void* );
-    DECL_LINK( OnUpdateDispatchers, void* );
-};
-
-
-}//end of namespace binfilter
-#endif  // _SVX_FMCTRLER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/fmexpl.hrc b/binfilter/bf_svx/source/inc/fmexpl.hrc
deleted file mode 100644
index be8db7b71..000000000
--- a/binfilter/bf_svx/source/inc/fmexpl.hrc
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_FMEXPL_HRC
-#define _SVX_FMEXPL_HRC
-
-#define FT_PATH         1
-
-#define GB_PATH         1
-
-#define PB_OK           1
-#define PB_CANCEL       2
-#define PB_HELP         3
-
-#endif //_SVX_FMEXPL_HRC
-
diff --git a/binfilter/bf_svx/source/inc/fmexpl.hxx b/binfilter/bf_svx/source/inc/fmexpl.hxx
deleted file mode 100644
index 39abdd701..000000000
--- a/binfilter/bf_svx/source/inc/fmexpl.hxx
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_FMEXPL_HXX
-#define _SVX_FMEXPL_HXX
-
-
-
-
-
-
-
-#include <bf_sfx2/dockwin.hxx>
-
-
-
-
-
-
-
-
-
-
-
-
-#include "fmview.hxx"
-
-
-class SdrObjListIter;
-namespace binfilter {
-
-class FmFormShell;
-class SdrObject;
-class FmFormModel;
-
-//========================================================================
-
-//========================================================================
-
-//========================================================================
-
-//========================================================================
-
-//========================================================================
-
-//========================================================================
-class FmNavViewMarksChanged : public SfxHint
-{
-    FmFormView* pView;
-public:
-    FmNavViewMarksChanged(FmFormView* pWhichView) { pView = pWhichView; }
-    virtual ~FmNavViewMarksChanged() {}
-
-};
-
-//========================================================================
-
-//========================================================================
-
-
-//========================================================================
-// FmNavRequestSelectHint - jemand teilt dem NavigatorTree mit, dass er bestimmte Eintraege selektieren soll
-
-
-
-//========================================================================
-
-
-//========================================================================
-
-
-//========================================================================
-//............................................................................
-namespace svxform
-{
-//............................................................................
-
-    //========================================================================
-    // class OFormComponentObserver
-    //========================================================================
-
-    //========================================================================
-    //= NavigatorTreeModel
-    //========================================================================
-
-    //========================================================================
-
-
-    //========================================================================
-
-    //========================================================================
-    class NavigatorFrameManager : public SfxChildWindow
-    {
-    public:
-        NavigatorFrameManager( Window *pParent, sal_uInt16 nId, SfxBindings *pBindings,
-                          SfxChildWinInfo *pInfo );
-        SFX_DECL_CHILDWINDOW( NavigatorFrameManager );
-    };
-
-//............................................................................
-}   // namespace svxform
-//............................................................................
-
-}//end of namespace binfilter
-#endif // _SVX_FMEXPL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/fmshimp.hxx b/binfilter/bf_svx/source/inc/fmshimp.hxx
index aea92eaa4..8f6932e66 100644
--- a/binfilter/bf_svx/source/inc/fmshimp.hxx
+++ b/binfilter/bf_svx/source/inc/fmshimp.hxx
@@ -52,7 +52,6 @@
 #include "fmsearch.hxx"
 #include <cppuhelper/compbase6.hxx>
 #include <unotools/configitem.hxx>
-#include "dbtoolsclient.hxx"
 
 #include <queue>
 namespace binfilter {
diff --git a/binfilter/bf_svx/source/inc/fmundo.hxx b/binfilter/bf_svx/source/inc/fmundo.hxx
deleted file mode 100644
index ae4669a3f..000000000
--- a/binfilter/bf_svx/source/inc/fmundo.hxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_FMUNDO_HXX
-#define _SVX_FMUNDO_HXX
-
-
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/script/XScriptListener.hpp>
-#include <com/sun/star/container/XContainerListener.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-
-#include <cppuhelper/implbase3.hxx>
-
-#include "svdouno.hxx"
-
-namespace com { namespace sun { namespace star {
-    namespace awt {
-        class XControl;
-        class XControlContainer;
-    }
-}}}
-
-namespace binfilter {
-
-class FmFormModel;
-class FmFormObj;
-class SdrObject;
-class FmXFormView;
-
-//FORWARD_DECLARE_INTERFACE(uno,Reference)
-
-//==================================================================
-// FmUndoPropertyAction
-//==================================================================
-
-//==================================================================
-// FmUndoContainerAction
-//==================================================================
-
-//==================================================================
-// FmUndoModelReplaceAction
-//==================================================================
-
-//========================================================================
-class FmXUndoEnvironment
-    : public ::cppu::WeakImplHelper3<   ::com::sun::star::beans::XPropertyChangeListener
-                                    ,   ::com::sun::star::container::XContainerListener
-                                    ,   ::com::sun::star::script::XScriptListener
-                                    >
-    , public SfxListener
-                           //   public ::cppu::OWeakObject
-{
-    friend class FmFormModel;
-    friend class FmXFormView;
-    FmFormModel& rModel;
-
-    void*       m_pPropertySetCache;
-    sal_uInt32  nLocks;
-    sal_Bool    bReadOnly;
-
-
-
-public:
-    FmXUndoEnvironment(FmFormModel& _rModel);
-    ~FmXUndoEnvironment();
-
-    // UNO Anbindung
-    //  SMART_UNO_DECLARATION(FmXUndoEnvironment, ::cppu::OWeakObject);
-    //  virtual sal_Bool queryInterface(UsrUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>&);
-    //  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass>>    getIdlClasses(void);
-
-    void Lock() {nLocks++;}
-    void UnLock() {nLocks--;}
-    sal_Bool IsLocked() const {return nLocks != 0;}
-
-protected:
-// ::com::sun::star::lang::XEventListener
-    virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::beans::XPropertyChangeListener
-    virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::container::XContainerListener
-    virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException);
-
-// XScriptListener
-    virtual void SAL_CALL firing(const  ::com::sun::star::script::ScriptEvent& evt) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL approveFiring(const  ::com::sun::star::script::ScriptEvent& evt) throw(::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
-
-    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
-// Einfuegen von Objekten
-    void AddForms(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& rForms);
-    void RemoveForms(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& rForms);
-
-    void SetReadOnly(sal_Bool bRead) {bReadOnly = bRead;}
-    sal_Bool IsReadOnly() const {return bReadOnly;}
-
-    void ModeChanged();
-
-private:
-    void AddElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
-    void RemoveElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
-    void AlterPropertyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
-
-public:
-    // Methoden zur Zuordnung von Controls zu Forms,
-    // werden von der Seite und der UndoUmgebung genutzt
-    void Inserted(SdrObject* pObj);
-    void Removed(SdrObject* pObj);
-
-    void Inserted(FmFormObj* pObj);
-    void Removed(FmFormObj* pObj);
-};
-
-
-}//end of namespace binfilter
-#endif  //_SVX_FMUNDO_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/fmurl.hxx b/binfilter/bf_svx/source/inc/fmurl.hxx
deleted file mode 100644
index b9e2bf5a0..000000000
--- a/binfilter/bf_svx/source/inc/fmurl.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_FMURL_HXX
-#define _SVX_FMURL_HXX
-
-#include "fmstatic.hxx"
-namespace binfilter {
-
-namespace svxform
-{
-
-    DECLARE_CONSTASCII_USTRING(FMURL_FORMSLOTS_PREFIX);
-
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_MOVEFIRST);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_MOVEPREV);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_MOVENEXT);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_MOVELAST);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_MOVETONEW);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_UNDO);
-
-    DECLARE_CONSTASCII_USTRING(FMURL_CONFIRM_DELETION);
-
-    DECLARE_CONSTASCII_USTRING(FMURL_COMPONENT_FORMGRIDVIEW);
-    DECLARE_CONSTASCII_USTRING(FMURL_GRIDVIEW_CLEARVIEW);
-    DECLARE_CONSTASCII_USTRING(FMURL_GRIDVIEW_ADDCOLUMN);
-    DECLARE_CONSTASCII_USTRING(FMURL_GRIDVIEW_ATTACHTOFORM);
-
-    DECLARE_CONSTASCII_USTRING(FMARG_ATTACHTO_MASTERFORM);
-    DECLARE_CONSTASCII_USTRING(FMARG_ADDCOL_COLUMNTYPE);
-    DECLARE_CONSTASCII_USTRING(FMARG_ADDCOL_COLUMNPOS);
-
-}   // namespace svxform
-
-}//end of namespace binfilter
-#endif // _SVX_FMURL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/fmvwimp.hxx b/binfilter/bf_svx/source/inc/fmvwimp.hxx
deleted file mode 100644
index bf3346d9b..000000000
--- a/binfilter/bf_svx/source/inc/fmvwimp.hxx
+++ /dev/null
@@ -1,239 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_FMVWIMP_HXX
-#define _SVX_FMVWIMP_HXX
-
-#include <comphelper/stl_types.hxx>
-
-
-#include <com/sun/star/form/XForm.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/form/XFormController.hpp>
-#include <com/sun/star/container/XContainerListener.hpp>
-#include <com/sun/star/awt/XFocusListener.hpp>
-#include <com/sun/star/sdb/SQLErrorEvent.hpp>
-#include <tools/link.hxx>
-
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
-
-#include "svdmark.hxx"
-
-namespace com { namespace sun { namespace star {
-    namespace awt {
-        class XControl;
-        class XWindow;
-    }
-    namespace beans {
-        class XPropertySet;
-    }
-    namespace util {
-        class XNumberFormats;
-    }
-}}}
-
-class Window;
-class OutputDevice;
-namespace binfilter {
-
-class SdrPageViewWinRec;
-class SdrPageView;
-class SdrObject;
-class FmFormObj;
-class FmFormModel;
-class FmFormShell;
-class FmFormView;
-
-
-class FmXFormController;
-class FmXFormView;
-
-namespace svx {
-    class ODataAccessDescriptor;
-}
-
-//==================================================================
-// FmXPageViewWinRec
-//==================================================================
-class FmXPageViewWinRec : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexAccess>
-{
-    friend class FmXFormView;
-
-    ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > >    m_aControllerList;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >                m_xORB;
-    FmXFormView*                m_pViewImpl;
-    Window*                     m_pWindow;
-
-public:
-    FmXPageViewWinRec(  const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB,
-                        const SdrPageViewWinRec*, FmXFormView* pView);
-    ~FmXPageViewWinRec();
-
-// UNO Anbindung
-
-// ::com::sun::star::container::XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::container::XEnumerationAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >  SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::container::XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 _Index) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
-    const vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > >& GetList() {return m_aControllerList;}
-
-protected:
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >  getController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm );
-    void setController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm,
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC,
-                        FmXFormController* pParent = NULL);
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >  getControlContainer() const;
-    void updateTabOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xControl,
-                         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC );
-    void dispose();
-    Window* getWindow() const {return m_pWindow;}
-};
-
-typedef vector<FmXPageViewWinRec*> FmWinRecList;
-//==================================================================
-// FmXFormView
-//==================================================================
-class FmXFormView : public ::cppu::WeakImplHelper3<
-                            ::com::sun::star::form::XFormControllerListener,
-                            ::com::sun::star::awt::XFocusListener,
-                            ::com::sun::star::container::XContainerListener>
-{
-    friend class FmFormView;
-    friend class FmFormShell;
-    friend class FmXFormShell;
-    friend class FmXPageViewWinRec;
-    class ObjectRemoveListener;
-    friend class ObjectRemoveListener;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>                   m_xWindow;
-
-    FmFormObj*      m_pMarkedGrid;
-    FmFormView*     m_pView;
-    sal_uInt32      m_nActivationEvent;
-    sal_uInt32      m_nErrorMessageEvent;   // event for an asynchronous error message. See also m_aAsyncError
-    sal_uInt32      m_nAutoFocusEvent;      // event for asynchronously setting the focus to a control
-
-    ::com::sun::star::sdb::SQLErrorEvent
-                    m_aAsyncError;          // error event which is to be displayed asyn. See m_nErrorMessageEvent.
-
-    FmWinRecList    m_aWinList;             // to be filled in alive mode only
-
-    // Liste der markierten Object, dient zur Restauration beim Umschalten von Alive in DesignMode
-    SdrMarkList             m_aMark;
-    ObjectRemoveListener*   m_pWatchStoredList;
-
-    sal_Bool        m_bFirstActivation  : 1;
-
-
-
-    FmFormShell* GetFormShell() const;
-
-    void removeGridWindowListening();
-
-protected:
-    FmXFormView(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB,
-                FmFormView* _pView);
-    ~FmXFormView();
-
-    void    saveMarkList( sal_Bool _bSmartUnmark = sal_True );
-    void    restoreMarkList( SdrMarkList& _rRestoredMarkList );
-    void    stopMarkListWatching();
-    void    startMarkListWatching();
-
-    void    notifyViewDying( );
-        // notifies this impl class that the anti-impl instance (m_pView) is going to die
-
-public:
-    // UNO Anbindung
-
-// ::com::sun::star::lang::XEventListener
-    virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::container::XContainerListener
-    virtual void SAL_CALL elementInserted(const  ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL elementReplaced(const  ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL elementRemoved(const  ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::form::XFormControllerListener
-    virtual void SAL_CALL formActivated(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL formDeactivated(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException);
-
-    // XFocusListener
-    virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException);
-
-    FmFormView* getView() const {return m_pView;}
-    const FmWinRecList& getWindowList() const {return m_aWinList;}
-
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() { return m_xORB; }
-
-    // activation handling
-    inline  sal_Bool    hasEverBeenActivated( ) const { return !m_bFirstActivation; }
-    inline  void        setHasBeenActivated( ) { m_bFirstActivation = sal_False; }
-
-            void        onFirstViewActivation( const FmFormModel* _pDocModel );
-
-private:
-    FmWinRecList::iterator findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& rCC );
-    void addWindow(const SdrPageViewWinRec*);
-    void removeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& rCC );
-    void Activate(sal_Bool bSync = sal_False);
-    void Deactivate(BOOL bDeactivateController = TRUE);
-
-
-
-    void ObjectRemovedInAliveMode(const SdrObject* pObject);
-
-    // asynchronously displays an error message. See also OnDelayedErrorMessage.
-    void    displayAsyncErrorMessage( const ::com::sun::star::sdb::SQLErrorEvent& _rEvent );
-
-    // cancels all pending async events
-    void cancelEvents();
-
-    /// the the auto focus to the first (in terms of the tab order) control
-    DECL_LINK( OnActivate, void* );
-    DECL_LINK( OnAutoFocus, void* );
-    DECL_LINK( OnDelayedErrorMessage, void* );
-};
-
-
-
-}//end of namespace binfilter
-#endif // _SVX_FMVWIMP_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/gridcols.hxx b/binfilter/bf_svx/source/inc/gridcols.hxx
deleted file mode 100644
index 912a17880..000000000
--- a/binfilter/bf_svx/source/inc/gridcols.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_GRIDCOLS_HXX
-#define _SVX_GRIDCOLS_HXX
-
-#include "fmstatic.hxx"
-namespace binfilter {
-
-namespace svxform
-{
-
-    // list of possible controls
-    DECLARE_CONSTASCII_USTRING(FM_COL_TEXTFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_CHECKBOX);
-    DECLARE_CONSTASCII_USTRING(FM_COL_COMBOBOX);
-    DECLARE_CONSTASCII_USTRING(FM_COL_LISTBOX);
-    DECLARE_CONSTASCII_USTRING(FM_COL_NUMERICFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_DATEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_TIMEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_CURRENCYFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_PATTERNFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_FORMATTEDFIELD);
-
-}   // namespace svxform
-
-
-// column type ids
-#define TYPE_CHECKBOX       0
-#define TYPE_COMBOBOX       1
-#define TYPE_CURRENCYFIELD  2
-#define TYPE_DATEFIELD      3
-#define TYPE_FORMATTEDFIELD 4
-#define TYPE_LISTBOX        5
-#define TYPE_NUMERICFIELD   6
-#define TYPE_PATTERNFIELD   7
-#define TYPE_TEXTFIELD      8
-#define TYPE_TIMEFIELD      9
-
-//------------------------------------------------------------------------------
-sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName);
-
-
-}//end of namespace binfilter
-#endif // _SVX_GRIDCOLS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/multipro.hxx b/binfilter/bf_svx/source/inc/multipro.hxx
deleted file mode 100644
index be2db3170..000000000
--- a/binfilter/bf_svx/source/inc/multipro.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _MULTIPRO_HXX
-#define _MULTIPRO_HXX
-
-#include <com/sun/star/form/XFormComponent.hpp>
-#include <comphelper/composedprops.hxx>
-#include <svdmark.hxx>
-namespace binfilter {
-
-//.........................................................................
-namespace svxform
-{
-//.........................................................................
-
-    //==================================================================
-    // FmXMultiSet
-    //==================================================================
-    typedef ::comphelper::OComposedPropertySet  FmXMultiSet_Base;
-    class FmXMultiSet
-        :public FmXMultiSet_Base
-        ,public ::com::sun::star::form::XFormComponent
-    {
-    protected:
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   m_xParent;
-
-    public:
-        FmXMultiSet(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> > & _rPropertySets);
-
-        // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL acquire(  ) throw();
-        virtual void SAL_CALL release(  ) throw();
-
-        // XChild
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent(  ) throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
-
-        static FmXMultiSet* Create(const SdrMarkList& rMarkList);
-    };
-
-//.........................................................................
-}   // namespace svxform
-//.........................................................................
-
-}//end of namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/sdbdatacolumn.hxx b/binfilter/bf_svx/source/inc/sdbdatacolumn.hxx
deleted file mode 100644
index dfdf803df..000000000
--- a/binfilter/bf_svx/source/inc/sdbdatacolumn.hxx
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVX_FORM_SDBDATACOLUMN_HXX
-#define SVX_FORM_SDBDATACOLUMN_HXX
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sdb/XColumn.hpp>
-#include <com/sun/star/sdb/XColumnUpdate.hpp>
-#include <osl/diagnose.h>
-namespace binfilter {
-
-//..............................................................................
-namespace svxform
-{
-//..............................................................................
-
-    //==========================================================================
-    //= DataColumn - a class wrapping an object implementing a sdb::DataColumn service
-    //==========================================================================
-    class DataColumn
-    {
-        // interfaces needed for sddb::Column
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>    m_xPropertySet;
-        // interfaces needed for sdb::DataColumn
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>           m_xColumn;
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>     m_xColumnUpdate;
-
-    public:
-        DataColumn() { };
-        DataColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxIFace);
-        // if the object behind _rxIFace doesn't fully support the DataColumn service,
-        // (which is checked via the supported interfaces) _all_ members will be set to
-        // void !, even if the object has some of the needed interfaces.
-
-        sal_Bool is() const { return m_xColumn.is(); }
-        sal_Bool Is() const { return m_xColumn.is(); }
-        sal_Bool supportsUpdate() const { return m_xColumnUpdate.is(); }
-
-        DataColumn* operator ->() { return this; }
-        operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> () const{ return m_xColumn.get(); }
-
-        // 'conversions'
-        inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& getPropertySet() const
-        {
-            return m_xPropertySet;
-        }
-        inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& getColumn() const
-        {
-            return m_xColumn;
-        }
-        inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>& getColumnUpdate() const
-        {
-            OSL_ENSURE(m_xColumnUpdate.is() , "DataColumn::getColumnUpdate: NULL!");
-            return m_xColumnUpdate;
-        }
-
-        // das normale queryInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException )
-        { return m_xColumn->queryInterface(type); }
-
-        // ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> getPropertySetInfo() const throw( ::com::sun::star::uno::RuntimeException );
-        inline void setPropertyValue(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::uno::Any getPropertyValue(const ::rtl::OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-        inline void addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-        inline void removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-        inline void addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-        inline void removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-        // ::com::sun::star::sdb::XColumn
-        inline sal_Bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::rtl::OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline sal_Bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline sal_Int8 getByte() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline sal_Int16 getShort() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline sal_Int32 getInt() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline sal_Int64 getLong() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline float getFloat() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline double getDouble() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::uno::Sequence< sal_Int8 > getBytes() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::util::Date getDate() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::util::Time getTime() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::util::DateTime  getTimestamp() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getBinaryStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getCharacterStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::uno::Any getObject(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& typeMap) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef> getRef() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob> getBlob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob> getClob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray> getArray() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-
-        // XColumnUpdate
-        inline void updateNull(void) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateBoolean(sal_Bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateByte(sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateShort(sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateInt(sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateLong(sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateFloat(float x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateDouble(double x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateString(const ::rtl::OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateBytes(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateDate(const ::com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateTime(const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateTimestamp(const ::com::sun::star::util::DateTime& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateBinaryStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateCharacterStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateObject(const ::com::sun::star::uno::Any& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-        inline void updateNumericObject(const ::com::sun::star::uno::Any& x, sal_Int32 scale) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    };
-
-}
-#endif // SVX_FORM_SDBDATACOLUMN_HXX
-
-//..............................................................................
-}//end of namespace binfilter   // namespace svxform
-//..............................................................................
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/showcols.hxx b/binfilter/bf_svx/source/inc/showcols.hxx
deleted file mode 100644
index 493b2d72d..000000000
--- a/binfilter/bf_svx/source/inc/showcols.hxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_SHOWCOLS_HXX
-#define _SVX_SHOWCOLS_HXX
-
-#include <vcl/dialog.hxx>
-
-#include <vcl/lstbox.hxx>
-
-#include <vcl/fixed.hxx>
-
-#include <vcl/button.hxx>
-
-#include <com/sun/star/container/XIndexContainer.hpp>
-namespace binfilter {
-
-//==========================================================================
-//  FmShowColsDialog
-//==========================================================================
-
-class FmShowColsDialog : public ModalDialog
-{
-    ListBox         m_aList;
-    FixedText       m_aLabel;
-    OKButton        m_aOK;
-    CancelButton    m_aCancel;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >   m_xColumns;
-
-public:
-    FmShowColsDialog( Window* pParent );
-    virtual ~FmShowColsDialog();
-
-    void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols);
-
-protected:
-    DECL_LINK( OnClickedOk, Button* );
-};
-
-}//end of namespace binfilter
-#endif // _SVX_SHOWCOLS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/sqlparserclient.hxx b/binfilter/bf_svx/source/inc/sqlparserclient.hxx
deleted file mode 100644
index c581c08e6..000000000
--- a/binfilter/bf_svx/source/inc/sqlparserclient.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVX_SQLPARSERCLIENT_HXX
-#define SVX_SQLPARSERCLIENT_HXX
-
-#include "dbtoolsclient.hxx"
-#include "ParseContext.hxx"
-namespace binfilter {
-
-//........................................................................
-namespace svxform
-{
-//........................................................................
-
-    //====================================================================
-    //= OSQLParserClient
-    //====================================================================
-    class OSQLParserClient : public ODbtoolsClient
-        ,public ::binfilter::svxform::OParseContextClient
-    {
-    private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
-
-    protected:
-        mutable ::rtl::Reference< ::connectivity::simple::ISQLParser >  m_xParser;
-
-    protected:
-        OSQLParserClient(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
-    };
-
-//........................................................................
-}   // namespace svxform
-//........................................................................
-
-}//end of namespace binfilter
-#endif // SVX_SQLPARSERCLIENT_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/taborder.hrc b/binfilter/bf_svx/source/inc/taborder.hrc
deleted file mode 100644
index a834b62fc..000000000
--- a/binfilter/bf_svx/source/inc/taborder.hrc
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define FT_CONTROLS             1
-
-#define LB_CONTROLS     1
-
-#define PB_MOVE_UP      1
-#define PB_MOVE_DOWN    2
-#define PB_AUTO_ORDER   3
-
-#define PB_OK           4
-#define PB_CANCEL       5
-#define PB_HELP         6
-
-#define CTRL_TREE       1
-
diff --git a/binfilter/bf_svx/source/inc/taborder.hxx b/binfilter/bf_svx/source/inc/taborder.hxx
deleted file mode 100644
index 3b63b2131..000000000
--- a/binfilter/bf_svx/source/inc/taborder.hxx
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_TABORDER_HXX
-#define _SVX_TABORDER_HXX
-
-#include <bf_svtools/svtreebx.hxx>
-
-#include <com/sun/star/awt/XTabControllerModel.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
-
-#include <vcl/dialog.hxx>
-
-#include <vcl/button.hxx>
-
-
-#include <vcl/fixed.hxx>
-
-
-#include "fmexch.hxx"
-
-class SdrModel;
-class ImageList;
-
-namespace com { namespace sun { namespace star {
-    namespace beans {
-        class XPropertySet;
-    }
-}}}
-
-namespace binfilter {
-
-//========================================================================
-class FmOrderTreeListBox : public SvTreeListBox
-{
-protected:
-    ::binfilter::svxform::OControlExchangeHelper    m_aFieldExchange;
-
-public:
-    FmOrderTreeListBox( Window* pParent );
-    FmOrderTreeListBox( Window* pParent, const ResId& rResId  );
-    virtual ~FmOrderTreeListBox();
-
-
-protected:
-    virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
-    virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
-    virtual void        StartDrag( sal_Int8 nAction, const Point& rPosPixel );
-};
-
-
-//========================================================================
-class FmFormShell;
-class FmTabOrderDlg : public ModalDialog
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >      xTempModel, // Model zum Bearbeiten der TabReihenfolge
-                                xModel;     // Model mit der zu veraendernden TabReihenfolge
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >        xControlContainer;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
-    SdrModel*                   pDrawModel;
-
-    FixedText                   aFT_Controls;
-    FmOrderTreeListBox          aLB_Controls;
-
-    OKButton                    aPB_OK;
-    CancelButton                aPB_CANCEL;
-    HelpButton                  aPB_HELP;
-
-    PushButton                  aPB_MoveUp;
-    PushButton                  aPB_MoveDown;
-    PushButton                  aPB_AutoOrder;
-
-    ImageList*                  pImageList;
-
-    DECL_LINK( MoveUpClickHdl, Button* );
-    DECL_LINK( MoveDownClickHdl, Button* );
-    DECL_LINK( AutoOrderClickHdl, Button* );
-    DECL_LINK( OKClickHdl, Button* );
-
-
-public:
-    FmTabOrderDlg(  const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB,
-                    Window* pParent, FmFormShell* pShell );
-    virtual ~FmTabOrderDlg();
-
-};
-
-}//end of namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/tabwin.hxx b/binfilter/bf_svx/source/inc/tabwin.hxx
deleted file mode 100644
index eba2fe015..000000000
--- a/binfilter/bf_svx/source/inc/tabwin.hxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_TABWIN_HXX
-#define _SVX_TABWIN_HXX
-
-#include <bf_sfx2/childwin.hxx>
-
-namespace binfilter {
-
-class FmFieldWin;
-
-class FmFormShell;
-
-class FmFieldWinMgr : public SfxChildWindow
-{
-public:
-    FmFieldWinMgr(Window *pParent, sal_uInt16 nId,
-        SfxBindings *pBindings, SfxChildWinInfo *pInfo);
-    SFX_DECL_CHILDWINDOW(FmFieldWinMgr);
-};
-
-
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/tbxform.hxx b/binfilter/bf_svx/source/inc/tbxform.hxx
deleted file mode 100644
index a4d56673f..000000000
--- a/binfilter/bf_svx/source/inc/tbxform.hxx
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_TBXFORM_HXX
-#define _SVX_TBXFORM_HXX
-
-#include <bf_sfx2/tbxctrl.hxx>
-
-
-
-
-class FixedText;
-namespace binfilter {
-
-//========================================================================
-
-
-//========================================================================
-
-
-//========================================================================
-
-
-//========================================================================
-class SvxFmTbxCtlConfig : public SfxToolBoxControl
-{
-private:
-    UINT16 nLastSlot;
-
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-
-    SvxFmTbxCtlConfig( USHORT nId, ToolBox& rTbx, SfxBindings& );
-    ~SvxFmTbxCtlConfig() {}
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-};
-
-//========================================================================
-class SvxFmTbxCtlAbsRec : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-
-    SvxFmTbxCtlAbsRec( USHORT nId, ToolBox& rTbx, SfxBindings& rBindings );
-
-
-};
-
-//========================================================================
-class SvxFmTbxCtlRecText : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-
-    SvxFmTbxCtlRecText( USHORT nId, ToolBox& rTbx, SfxBindings& rBindings );
-};
-
-//========================================================================
-class SvxFmTbxCtlRecFromText : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-
-    SvxFmTbxCtlRecFromText( USHORT nId, ToolBox& rTbx, SfxBindings& rBindings );
-};
-
-//========================================================================
-class SvxFmTbxCtlRecTotal : public SfxToolBoxControl
-{
-    FixedText* pFixedText;
-
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-
-    SvxFmTbxCtlRecTotal( USHORT nId, ToolBox& rTbx, SfxBindings& rBindings );
-};
-
-/*
-//========================================================================
-class SvxFmTbxCtlFilterText : public SfxToolBoxControl
-{
-    FixedText* pFixedText;
-    XubString aText;
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-
-    SvxFmTbxCtlFilterText( USHORT nId, ToolBox& rTbx, SfxBindings& rBindings );
-    ~SvxFmTbxCtlFilterText();
-
-    virtual Window* CreateItemWindow( Window* pParent );
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState );
-};
-*/
-
-//========================================================================
-class SvxFmTbxNextRec : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    SvxFmTbxNextRec( USHORT nId, ToolBox& rTbx, SfxBindings& rBindings );
-};
-
-//========================================================================
-class SvxFmTbxPrevRec : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    SvxFmTbxPrevRec( USHORT nId, ToolBox& rTbx, SfxBindings& rBindings );
-};
-
-
-}//end of namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/trace.hxx b/binfilter/bf_svx/source/inc/trace.hxx
deleted file mode 100644
index 48f5156c6..000000000
--- a/binfilter/bf_svx/source/inc/trace.hxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _TRACE_HXX_
-#define _TRACE_HXX_
-
-#if defined(DBG_UTIL) && defined(ENABLE_RANGE_TRACING)
-
-namespace binfilter {
-
-
-class Tracer
-{
-    ByteString m_sBlockDescription;
-
-    DECLARE_STL_STDKEY_MAP( ::oslThreadIdentifier, sal_Int32, MapThreadId2Int );
-    static MapThreadId2Int s_aThreadIndents;
-
-    static ::osl::Mutex s_aMapSafety;
-
-public:
-    Tracer(const char* _pBlockDescription);
-    ~Tracer();
-
-    void TraceString(const char* _pMessage);
-    void TraceString1StringParam(const char* _pMessage, const char* _pParam);
-};
-
-
-#define TRACE_RANGE(range_description)          Tracer aTrace(range_description);
-#define TRACE_RANGE_MESSAGE(message)            { aTrace.TraceString(message); }
-#define TRACE_RANGE_MESSAGE1(message, param)    { aTrace.TraceString1StringParam(message, param); }
-
-}//end of namespace binfilter
-#else
-
-#define TRACE_RANGE(range_description)          ;
-#define TRACE_RANGE_MESSAGE(message)            ;
-#define TRACE_RANGE_MESSAGE1(message, param)    ;
-
-#endif
-
-#endif // _TRACE_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/items/svx_drawitem.cxx b/binfilter/bf_svx/source/items/svx_drawitem.cxx
index e06fe94f0..854ae5089 100644
--- a/binfilter/bf_svx/source/items/svx_drawitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_drawitem.cxx
@@ -84,17 +84,6 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-
-// -----------------------------------------------------------------------
-
-int SvxColorTableItem::operator==( const SfxPoolItem& /*rItem*/ ) const
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
 /*N*/ SfxPoolItem* SvxColorTableItem::Clone( SfxItemPool * ) const
 /*N*/ {
 /*N*/   return new SvxColorTableItem( *this );
@@ -128,17 +117,6 @@ int SvxColorTableItem::operator==( const SfxPoolItem& /*rItem*/ ) const
 
 //------------------------------------------------------------------------
 
-
-// -----------------------------------------------------------------------
-
-int SvxGradientListItem::operator==( const SfxPoolItem& /*rItem*/ ) const
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
 /*N*/ SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const
 /*N*/ {
 /*N*/   return new SvxGradientListItem( *this );
@@ -172,17 +150,6 @@ int SvxGradientListItem::operator==( const SfxPoolItem& /*rItem*/ ) const
 
 //------------------------------------------------------------------------
 
-
-// -----------------------------------------------------------------------
-
-int SvxHatchListItem::operator==( const SfxPoolItem& /*rItem*/ ) const
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
 /*N*/ SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const
 /*N*/ {
 /*N*/   return new SvxHatchListItem( *this );
@@ -216,23 +183,11 @@ int SvxHatchListItem::operator==( const SfxPoolItem& /*rItem*/ ) const
 
 //------------------------------------------------------------------------
 
-
-// -----------------------------------------------------------------------
-
-int SvxBitmapListItem::operator==( const SfxPoolItem& /*rItem*/ ) const
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
 /*N*/ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const
 /*N*/ {
 /*N*/   return new SvxBitmapListItem( *this );
 /*N*/ }
 
-
 //==================================================================
 //
 //  SvxDashListItem
@@ -261,17 +216,6 @@ int SvxBitmapListItem::operator==( const SfxPoolItem& /*rItem*/ ) const
 
 //------------------------------------------------------------------------
 
-
-// -----------------------------------------------------------------------
-
-int SvxDashListItem::operator==( const SfxPoolItem& /*rItem*/ ) const
-{
-    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
 /*N*/ SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const
 /*N*/ {
 /*N*/   return new SvxDashListItem( *this );
@@ -303,9 +247,6 @@ int SvxDashListItem::operator==( const SfxPoolItem& /*rItem*/ ) const
 /*N*/ {
 /*N*/ }
 
-//------------------------------------------------------------------------
-
-
 // -----------------------------------------------------------------------
 
 /*N*/ int SvxLineEndListItem::operator==( const SfxPoolItem& rItem ) const
@@ -321,7 +262,6 @@ int SvxDashListItem::operator==( const SfxPoolItem& /*rItem*/ ) const
 /*N*/   return new SvxLineEndListItem( *this );
 /*N*/ }
 
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/outliner/svx_outleeng.cxx b/binfilter/bf_svx/source/outliner/svx_outleeng.cxx
index 4340f6a61..75c82207b 100644
--- a/binfilter/bf_svx/source/outliner/svx_outleeng.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outleeng.cxx
@@ -67,15 +67,11 @@ namespace binfilter {
 /*N*/ void OutlinerEditEng::ParagraphInserted( USHORT nNewParagraph )
 /*N*/ {
 /*N*/   pOwner->ParagraphInserted( nNewParagraph );
-/*N*/
-/*N*/     EditEngine::ParagraphInserted( nNewParagraph );
 /*N*/ }
 
 /*N*/ void OutlinerEditEng::ParagraphDeleted( USHORT nDeletedParagraph )
 /*N*/ {
 /*N*/   pOwner->ParagraphDeleted( nDeletedParagraph );
-/*N*/
-/*N*/     EditEngine::ParagraphDeleted( nDeletedParagraph );
 /*N*/ }
 
 
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index 3c414e7af..84ff471cb 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -1109,7 +1109,6 @@ static double SMALLEST_DASH_WIDTH(26.95);
 /*N*/   bSnapRectDirty   =TRUE;
 /*N*/   bNetLock         =FALSE;
 /*N*/   bInserted        =FALSE;
-/*N*/   bGrouped         =FALSE;
 /*N*/   bMovProt         =FALSE;
 /*N*/   bSizProt         =FALSE;
 /*N*/   bNoPrint         =FALSE;
@@ -1278,15 +1277,6 @@ static double SMALLEST_DASH_WIDTH(26.95);
 /*N*/ }
 
 
-
-
-
-
-/*N*/ SdrObjList* SdrObject::GetSubList() const
-/*N*/ {
-/*N*/   return NULL;
-/*N*/ }
-
 /*N*/ SdrObject* SdrObject::GetUpGroup() const
 /*N*/ {
 /*N*/   return pObjList!=NULL ? pObjList->GetOwnerObj() : NULL;
@@ -1341,10 +1331,6 @@ static double SMALLEST_DASH_WIDTH(26.95);
 /*N*/   return aOutRect;
 /*N*/ }
 
-/*N*/ void SdrObject::RecalcBoundRect()
-/*N*/ {
-/*N*/ }
-
 /*N*/ void SdrObject::SendRepaintBroadcast(const Rectangle& rRect) const
 /*N*/ {
 /*N*/   if( pModel && pModel->isLocked() )
@@ -1448,35 +1434,15 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-//#define TEST_SKELETON
+
 #ifdef TEST_SKELETON
 
 static OutputDevice* pImpTestOut = 0L;
 
 class ImpSkeleton;
 
-
-///////////////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-
 #endif
+
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -1873,10 +1839,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 ///////////////////////////////////////////////////////////////////////////////
 
 
-/*N*/ SdrObject* SdrObject::CheckHit(const Point& /*rPnt*/, USHORT /*nTol*/, const SetOfByte* /*pVisiLayer*/) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");  return NULL;
-/*N*/ }
-
 /*N*/ SdrObject* SdrObject::Clone() const
 /*N*/ {
 /*N*/   SdrObject* pObj=SdrObjFactory::MakeNewObject(GetObjInventor(),GetObjIdentifier(),NULL);
@@ -1919,10 +1881,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   bSnapRectDirty=TRUE; //rObj.bSnapRectDirty;
 /*N*/   bNotMasterCachable=rObj.bNotMasterCachable;
 /*N*/   if (pPlusData!=NULL) { delete pPlusData; pPlusData=NULL; }
-/*N*/   if (rObj.pPlusData!=NULL) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
-/*N*/   if (pPlusData!=NULL && pPlusData->pBroadcast!=NULL) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
 /*N*/ }
 
 
@@ -2022,8 +1980,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/           break;
 /*N*/
 /*?*/           case META_POLYPOLYGON_ACTION:
-/*?*/           {DBG_BF_ASSERT(0, "STRIP");
-/*?*/           }
 /*?*/           break;
 /*?*/
 /*N*/           case META_POLYLINE_ACTION:
@@ -2060,10 +2016,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/       rPoly.Clear();
 /*N*/ }
 
-/*?*/ void SdrObject::TakeContour(XPolyPolygon& /*rXPoly*/, SdrContourType /*eType*/) const
-/*?*/ {
-/*?*/ }
-
 /*N*/ Pointer SdrObject::GetCreatePointer() const
 /*N*/ {
 /*N*/   return Pointer(POINTER_CROSS);
@@ -2078,28 +2030,12 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 
 /*N*/ void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 /*N*/ {
-/*N*/   bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
-/*N*/   bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
-/*N*/   if (bXMirr || bYMirr) {
-/*N*/       Point aRef1(GetSnapRect().Center());
-/*N*/       if (bXMirr) {
-/*N*/           Point aRef2(aRef1);
-/*N*/           aRef2.Y()++;
-/*N*/           NbcMirrorGluePoints(aRef1,aRef2);
-/*N*/       }
-/*N*/       if (bYMirr) {
-/*N*/           Point aRef2(aRef1);
-/*N*/           aRef2.X()++;
-/*N*/           NbcMirrorGluePoints(aRef1,aRef2);
-/*N*/       }
-/*N*/   }
 /*N*/   ResizeRect(aOutRect,rRef,xFact,yFact);
 /*N*/   SetRectsDirty();
 /*N*/ }
 
 /*N*/ void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
 /*N*/ {
-/*N*/   SetGlueReallyAbsolute(TRUE);
 /*N*/   aOutRect.Move(-rRef.X(),-rRef.Y());
 /*N*/   Rectangle R(aOutRect);
 /*N*/   if (sn==1.0 && cs==0.0) { // 90?
@@ -2121,13 +2057,10 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   aOutRect.Move(rRef.X(),rRef.Y());
 /*N*/   aOutRect.Justify(); // Sicherheitshalber
 /*N*/   SetRectsDirty();
-/*N*/   NbcRotateGluePoints(rRef,nWink,sn,cs);
-/*N*/   SetGlueReallyAbsolute(FALSE);
 /*N*/ }
 
 /*N*/ void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
 /*N*/ {
-/*N*/   SetGlueReallyAbsolute(TRUE);
 /*N*/   aOutRect.Move(-rRef1.X(),-rRef1.Y());
 /*N*/   Rectangle R(aOutRect);
 /*N*/   long dx=rRef2.X()-rRef1.X();
@@ -2152,15 +2085,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   aOutRect.Move(rRef1.X(),rRef1.Y());
 /*N*/   aOutRect.Justify(); // Sicherheitshalber
 /*N*/   SetRectsDirty();
-/*N*/   NbcMirrorGluePoints(rRef1,rRef2);
-/*N*/   SetGlueReallyAbsolute(FALSE);
-/*N*/ }
-
-/*N*/ void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
-/*N*/ {
-/*N*/   SetGlueReallyAbsolute(TRUE);
-/*N*/   NbcShearGluePoints(rRef,nWink,tn,bVShear);
-/*N*/   SetGlueReallyAbsolute(FALSE);
 /*N*/ }
 
 /*N*/ void SdrObject::Move(const Size& rSiz)
@@ -2304,33 +2228,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
 /*N*/ }
 
-/*N*/ long SdrObject::GetRotateAngle() const
-/*N*/ {
-/*N*/   return 0;
-/*N*/ }
-
-/*N*/ long SdrObject::GetShearAngle(bool /*bVertical*/) const
-/*N*/ {
-/*N*/   return 0;
-/*N*/ }
-
-
-
-/*N*/ bool SdrObject::IsPolyObj() const
-/*N*/ {
-/*N*/   return FALSE;
-/*N*/ }
-
-/*?*/ USHORT SdrObject::GetPointCount() const
-/*?*/ {
-/*?*/   return 0;
-/*?*/ }
-
-/*?*/ const Point& SdrObject::GetPoint(USHORT /*i*/) const
-/*?*/ {
-/*?*/   return *((Point*)NULL);
-/*?*/ }
-
 /*N*/ void SdrObject::SetPoint(const Point& rPnt, USHORT i)
 /*N*/ {
 /*N*/   Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetBoundRect();
@@ -2341,29 +2238,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
 /*N*/ }
 
-/*N*/ void SdrObject::NbcSetPoint(const Point& /*rPnt*/, USHORT /*i*/)
-/*N*/ {
-/*N*/ }
-
-/*N*/ bool SdrObject::HasTextEdit() const
-/*N*/ {
-/*N*/   return FALSE;
-/*N*/ }
-
-/*N*/ SdrObject* SdrObject::CheckTextEditHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const
-/*N*/ {
-/*N*/   return CheckHit(rPnt,nTol,pVisiLayer);
-/*N*/ }
-
-/*N*/ bool SdrObject::BegTextEdit(SdrOutliner& /*rOutl*/)
-/*N*/ {
-/*N*/   return FALSE;
-/*N*/ }
-
-/*N*/ void SdrObject::EndTextEdit(SdrOutliner& /*rOutl*/)
-/*N*/ {
-/*N*/ }
-
 /*N*/ void SdrObject::SetOutlinerParaObject(OutlinerParaObject* pTextObject)
 /*N*/ {
 /*N*/   Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetBoundRect();
@@ -2376,19 +2250,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   }
 /*N*/ }
 
-/*N*/ void SdrObject::NbcSetOutlinerParaObject(OutlinerParaObject* /*pTextObject*/)
-/*N*/ {
-/*N*/ }
-
-/*N*/ OutlinerParaObject* SdrObject::GetOutlinerParaObject() const
-/*N*/ {
-/*N*/   return NULL;
-/*N*/ }
-
-/*N*/ void SdrObject::NbcReformatText()
-/*N*/ {
-/*N*/ }
-
 /*N*/ void SdrObject::ReformatText()
 /*N*/ {
 /*N*/   Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetBoundRect();
@@ -2402,10 +2263,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/ }
 
 
-/*N*/ void SdrObject::RestartAnimation(SdrPageView* /*pPageView*/) const
-/*N*/ {
-/*N*/ }
-
 /*N*/ #define Imp2ndKennung (0x434F4D43)
 /*N*/ SdrObjUserData* SdrObject::ImpGetMacroUserData() const
 /*N*/ {
@@ -2432,10 +2289,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/*N*/ SdrObjGeoData* SdrObject::NewGeoData() const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
 /*N*/ void SdrObject::SaveGeoData(SdrObjGeoData& rGeo) const
 /*N*/ {
 /*N*/   rGeo.aBoundRect    =GetBoundRect();
@@ -2461,10 +2314,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   }
 /*N*/ }
 /*N*/
-/*N*/ void SdrObject::RestGeoData(const SdrObjGeoData& /*rGeo*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
 /*N*/ SdrObjGeoData* SdrObject::GetGeoData() const
 /*N*/ {
 /*N*/   SdrObjGeoData* pGeo=NewGeoData();
@@ -2497,27 +2346,21 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/ {
 /*N*/   sal_uInt16 nWhichID(rItem.Which());
 /*N*/
-/*N*/   if(AllowItemChange(nWhichID, &rItem))
-/*N*/   {
-/*N*/       ItemChange(nWhichID, &rItem);
-/*N*/       PostItemChange(nWhichID);
+/*N*/   ItemChange(nWhichID, &rItem);
+/*N*/   PostItemChange(nWhichID);
 /*N*/
-/*N*/       SfxItemSet aSet( *GetItemPool(), nWhichID, nWhichID, 0 );
-/*N*/       aSet.Put( rItem );
-/*N*/       ItemSetChanged( aSet );
-/*N*/   }
+/*N*/   SfxItemSet aSet( *GetItemPool(), nWhichID, nWhichID, 0 );
+/*N*/   aSet.Put( rItem );
+/*N*/   ItemSetChanged( aSet );
 /*N*/ }
 
 /*N*/ void SdrObject::ClearItem( const sal_uInt16 nWhich )
 /*N*/ {
-/*N*/   if(AllowItemChange(nWhich))
-/*N*/   {
-/*N*/       ItemChange(nWhich);
-/*N*/       PostItemChange(nWhich);
+/*N*/   ItemChange(nWhich);
+/*N*/   PostItemChange(nWhich);
 /*N*/
-/*N*/       SfxItemSet aSet( *GetItemPool(), nWhich, nWhich, 0 );
-/*N*/       ItemSetChanged( aSet );
-/*N*/   }
+/*N*/   SfxItemSet aSet( *GetItemPool(), nWhich, nWhich, 0 );
+/*N*/   ItemSetChanged( aSet );
 /*N*/ }
 /*N*/
 /*N*/ void SdrObject::SetItemSet( const SfxItemSet& rSet )
@@ -2533,13 +2376,10 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   {
 /*N*/       if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE, &pPoolItem))
 /*N*/       {
-/*N*/           if(AllowItemChange(nWhich, pPoolItem))
-/*N*/           {
-/*N*/               bDidChange = TRUE;
-/*N*/               ItemChange(nWhich, pPoolItem);
-/*N*/               aPostItemChangeList.push_back( nWhich );
-/*N*/               aSet.Put( *pPoolItem );
-/*N*/           }
+/*N*/           bDidChange = TRUE;
+/*N*/           ItemChange(nWhich, pPoolItem);
+/*N*/           aPostItemChangeList.push_back( nWhich );
+/*N*/           aSet.Put( *pPoolItem );
 /*N*/       }
 /*N*/       nWhich = aWhichIter.NextWhich();
 /*N*/   }
@@ -2558,13 +2398,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   }
 /*N*/ }
 /*N*/
-/*N*/ ////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ // ItemSet was changed, maybe user wants to react
-/*N*/
-/*N*/ void SdrObject::ItemSetChanged(const SfxItemSet& /*rSet*/)
-/*N*/ {
-/*N*/ }
-/*N*/
 /*N*/ void SdrObject::BroadcastItemChange(const SdrBroadcastItemChange& rChange)
 /*N*/ {
 /*N*/   sal_uInt32 nCount(rChange.GetRectangleCount());
@@ -2605,55 +2438,9 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   return GetItemSet().Get(nWhich);
 /*N*/ }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// private support routines for ItemSet access
-
-/*N*/ BOOL SdrObject::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
-/*N*/ {
-/*N*/   return TRUE;
-/*N*/ }
-
-/*N*/ void SdrObject::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
-/*N*/ {
-/*N*/   DBG_ASSERT(FALSE,"SdrObject::ItemChange() should never be called, SdrObject has no Items");
-/*N*/ }
-
-/*N*/ void SdrObject::PostItemChange(const sal_uInt16 /*nWhich*/)
-/*N*/ {
-/*N*/ }
-
-/*N*/ void SdrObject::ApplyNotPersistAttr(const SfxItemSet& /*rAttr*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
-
-/*N*/ void SdrObject::TakeNotPersistAttr(SfxItemSet& /*rAttr*/, bool /*bMerge*/) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ SfxStyleSheet* SdrObject::GetStyleSheet() const
-/*N*/ {
-/*N*/   // Das hier ist ein Hack:
-/*N*/   return NULL;
-/*N*/ }
-
-/*N*/ void SdrObject::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
-/*N*/ {
-/*N*/ }
-
-/*N*/ void SdrObject::NbcSetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
-/*N*/ {
-/*N*/ }
-
 // Das Broadcasting beim Setzen der Attribute wird vom AttrObj gemanagt
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/*N*/ bool SdrObject::IsNode() const
-/*N*/ {
-/*N*/   return TRUE;
-/*N*/ }
-
 /*N*/ SdrGluePoint SdrObject::GetVertexGluePoint(USHORT nPosNum) const
 /*N*/ {
 /*N*/   Rectangle aR(GetBoundRect());
@@ -2687,76 +2474,19 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   return pPlusData->pGluePoints;
 /*N*/ }
 
-/*N*/ void SdrObject::SetGlueReallyAbsolute(bool /*bOn*/)
-/*N*/ {
-/*N*/   // erst Const-Aufruf um zu sehen, ob
-/*N*/   // ueberhaupt Klebepunkte da sind
-/*N*/   // const-Aufruf erzwingen!
-/*N*/   if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
-/*N*/ }
-
-/*N*/ void SdrObject::NbcRotateGluePoints(const Point& /*rRef*/, long /*nWink*/, double /*sn*/, double /*cs*/)
-/*N*/ {
-/*N*/   // erst Const-Aufruf um zu sehen, ob
-/*N*/   // ueberhaupt Klebepunkte da sind
-/*N*/   // const-Aufruf erzwingen!
-/*N*/   if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
-/*N*/ }
-
-/*N*/ void SdrObject::NbcMirrorGluePoints(const Point& /*rRef1*/, const Point& /*rRef2*/)
-/*N*/ {
-/*N*/   // erst Const-Aufruf um zu sehen, ob
-/*N*/   // ueberhaupt Klebepunkte da sind
-/*N*/   // const-Aufruf erzwingen!
-/*N*/   if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
-/*N*/ }
-
-/*N*/ void SdrObject::NbcShearGluePoints(const Point& /*rRef*/, long /*nWink*/, double /*tn*/, bool /*bVShear*/)
-/*N*/ {
-/*N*/   // erst Const-Aufruf um zu sehen, ob
-/*N*/   // ueberhaupt Klebepunkte da sind
-/*N*/   // const-Aufruf erzwingen!
-/*N*/   if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
-/*N*/ }
-
-/*N*/ void SdrObject::ConnectToNode(bool /*bTail1*/, SdrObject* /*pObj*/)
-/*N*/ {
-/*N*/ }
-
-/*N*/ void SdrObject::DisconnectFromNode(bool /*bTail1*/)
-/*N*/ {
-/*N*/ }
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
 // convert this path object to contour object, even when it is a group
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/*N*/ SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const
+/*N*/ SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL /* bLineToArea */) const
 /*N*/ {
 /*N*/   SdrObject* pRet = DoConvertToPolyObj(bBezier);
-/*N*/
-/*N*/   if(pRet && bLineToArea)
-/*N*/   {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
-/*N*/
 /*N*/   return pRet;
 /*N*/ }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*N*/ SdrObject* SdrObject::DoConvertToPolyObj(BOOL /*bBezier*/) const
-/*N*/ {
-/*N*/   return NULL;
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
 // Streams
 
 /*N*/ void SdrObject::AfterRead()
@@ -2957,10 +2687,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   }
 /*N*/ }
 
-/*N*/ void SdrObject::SetPrintable(bool /*bPrn*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /*N*/ USHORT SdrObject::GetUserDataCount() const
@@ -3264,11 +2990,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/       delete pFact;
 /*N*/   }
 /*N*/
-/*N*/   if(pObj == NULL)
-/*N*/   {
-/*N*/       // Na wenn's denn keiner will ...
-/*N*/   }
-/*N*/
 /*N*/   if(pObj != NULL)
 /*N*/   {
 /*N*/       if(pPage != NULL)
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
index 8dfe10a61..0fdf47695 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
@@ -491,21 +491,6 @@ namespace binfilter {
 
 /*N*/ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 /*N*/ {
-/*N*/   bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
-/*N*/   bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
-/*N*/   if (bXMirr || bYMirr) {
-/*N*/       Point aRef1(GetSnapRect().Center());
-/*N*/       if (bXMirr) {
-/*N*/           Point aRef2(aRef1);
-/*N*/           aRef2.Y()++;
-/*N*/           NbcMirrorGluePoints(aRef1,aRef2);
-/*N*/       }
-/*N*/       if (bYMirr) {
-/*N*/           Point aRef2(aRef1);
-/*N*/           aRef2.X()++;
-/*N*/           NbcMirrorGluePoints(aRef1,aRef2);
-/*N*/       }
-/*N*/   }
 /*N*/   ResizePoint(aRefPoint,rRef,xFact,yFact);
 /*N*/   if (pSub->GetObjCount()!=0) {
 /*N*/       SdrObjList* pOL=pSub;
@@ -601,21 +586,6 @@ namespace binfilter {
 /*N*/ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 /*N*/ {
 /*N*/   if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) {
-/*N*/       bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
-/*N*/       bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
-/*N*/       if (bXMirr || bYMirr) {
-/*N*/           Point aRef1(GetSnapRect().Center());
-/*N*/           if (bXMirr) {
-/*N*/               Point aRef2(aRef1);
-/*N*/               aRef2.Y()++;
-/*N*/               NbcMirrorGluePoints(aRef1,aRef2);
-/*N*/           }
-/*N*/           if (bYMirr) {
-/*N*/               Point aRef2(aRef1);
-/*N*/               aRef2.X()++;
-/*N*/               NbcMirrorGluePoints(aRef1,aRef2);
-/*N*/           }
-/*N*/       }
 /*N*/       Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetBoundRect();
 /*N*/       ResizePoint(aRefPoint,rRef,xFact,yFact);
 /*N*/       if (pSub->GetObjCount()!=0) {
@@ -745,11 +715,8 @@ namespace binfilter {
 /*N*/       sal_uInt32 a; for(a = 0; a < nCount; a++)
 /*N*/       {
 /*N*/           SdrObject* pObj = pSub->GetObj(a);
-/*N*/           if(pObj->AllowItemChange(nWhich, pNewItem))
-/*N*/           {
-/*N*/               pObj->ItemChange(nWhich, pNewItem);
-/*N*/               aPostItemChangeList.Insert((void*)pObj, LIST_APPEND);
-/*N*/           }
+/*N*/           pObj->ItemChange(nWhich, pNewItem);
+/*N*/           aPostItemChangeList.Insert((void*)pObj, LIST_APPEND);
 /*N*/       }
 /*N*/
 /*N*/       for(a = 0; a < aPostItemChangeList.Count(); a++)
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx
index 0fc72df75..0453b940b 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx
@@ -131,19 +131,6 @@ namespace binfilter {
 /*N*/   long nTHgt0=aRect.GetHeight()-1-nVDist; if (nTHgt0<0) nTHgt0=0;
 /*N*/   bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
 /*N*/   bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
-/*N*/   if (bXMirr || bYMirr) {
-/*N*/       Point aRef1(GetSnapRect().Center());
-/*N*/       if (bXMirr) {
-/*N*/           Point aRef2(aRef1);
-/*N*/           aRef2.Y()++;
-/*N*/           NbcMirrorGluePoints(aRef1,aRef2);
-/*N*/       }
-/*N*/       if (bYMirr) {
-/*N*/           Point aRef2(aRef1);
-/*N*/           aRef2.X()++;
-/*N*/           NbcMirrorGluePoints(aRef1,aRef2);
-/*N*/       }
-/*N*/   }
 /*N*/
 /*N*/   if (aGeo.nDrehWink==0 && aGeo.nShearWink==0) {
 /*N*/       ResizeRect(aRect,rRef,xFact,yFact);
@@ -211,9 +198,6 @@ namespace binfilter {
 /*N*/   if (bTextFrame && (pModel==NULL || !pModel->IsPasteResize())) { // #51139#
 /*N*/       if (nTWdt0!=nTWdt1 && IsAutoGrowWidth() ) NbcSetMinTextFrameWidth(nTWdt1);
 /*N*/       if (nTHgt0!=nTHgt1 && IsAutoGrowHeight()) NbcSetMinTextFrameHeight(nTHgt1);
-/*N*/       if (GetFitToSize()==SDRTEXTFIT_RESIZEATTR) {
-/*?*/           DBG_BF_ASSERT(0, "STRIP");
-/*N*/       }
 /*?*/       NbcAdjustTextFrameWidthAndHeight();
 /*N*/   }
 /*N*/   ImpCheckShear();
@@ -222,7 +206,6 @@ namespace binfilter {
 
 /*N*/ void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
 /*N*/ {
-/*N*/   SetGlueReallyAbsolute(TRUE);
 /*N*/   long dx=aRect.Right()-aRect.Left();
 /*N*/   long dy=aRect.Bottom()-aRect.Top();
 /*N*/   Point aP(aRect.TopLeft());
@@ -240,14 +223,10 @@ namespace binfilter {
 /*N*/       aGeo.RecalcSinCos();
 /*N*/   }
 /*N*/   SetRectsDirty();
-/*N*/   NbcRotateGluePoints(rRef,nWink,sn,cs);
-/*N*/   SetGlueReallyAbsolute(FALSE);
 /*N*/ }
 
 /*N*/ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
 /*N*/ {
-/*N*/   SetGlueReallyAbsolute(TRUE);
-/*N*/
 /*N*/   // #75889# when this is a SdrPathObj aRect maybe not initialized
 /*N*/   Polygon aPol(Rect2Poly(aRect.IsEmpty() ? GetSnapRect() : aRect, aGeo));
 /*N*/
@@ -262,8 +241,6 @@ namespace binfilter {
 /*N*/   }
 /*N*/   ImpCheckShear();
 /*N*/   SetRectsDirty();
-/*N*/   NbcShearGluePoints(rRef,nWink,tn,bVShear);
-/*N*/   SetGlueReallyAbsolute(FALSE);
 /*N*/ }
 
 
@@ -292,19 +269,6 @@ namespace binfilter {
 /*N*/ {
 /*N*/   SdrObjKind ePathKind=bClosed?OBJ_PATHFILL:OBJ_PATHLINE;
 /*N*/   XPolyPolygon aXPP(rXPP);
-/*N*/   if (bClosed) {
-/*N*/       // Alle XPolygone des XPolyPolygons schliessen, sonst kommt das PathObj durcheinander!
-/*N*/       for (USHORT i=0; i<aXPP.Count(); i++) {
-/*N*/           const XPolygon& rXP=aXPP[i];
-/*N*/           USHORT nAnz=rXP.GetPointCount();
-/*N*/           if (nAnz>0) {
-/*N*/               USHORT nMax=USHORT(nAnz-1);
-/*N*/               Point aPnt(rXP[0]);
-/*N*/               if (aPnt!=rXP[nMax]) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/               }
-/*N*/           }
-/*N*/       }
-/*N*/   }
 /*N*/   if (!bBezier && pModel!=NULL) {
 /*N*/       // Polygon aus Bezierkurve interpolieren
 /*N*/       VirtualDevice   aVDev;
@@ -322,8 +286,6 @@ namespace binfilter {
 /*N*/       ePathKind=bClosed?OBJ_POLY:OBJ_PLIN;
 /*N*/   }
 /*N*/   SdrPathObj* pPathObj=new SdrPathObj(ePathKind,aXPP);
-/*N*/   if (bBezier) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
 /*N*/   ImpConvertSetAttrAndLayer(pPathObj,bNoSetAttr);
 /*N*/   return pPathObj;
 /*N*/ }
@@ -331,7 +293,7 @@ namespace binfilter {
 /*N*/ SdrObject* SdrTextObj::ImpConvertAddText(SdrObject* pObj, bool /*bBezier*/) const
 /*N*/ {
 /*N*/   if (!ImpCanConvTextToCurve()) return pObj;
-/*?*/   DBG_BF_ASSERT(0, "STRIP"); return pObj;
+/*?*/   return pObj;
 /*N*/ }
 
 }
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
index c6ae9c53d..105c86822 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
@@ -448,7 +448,6 @@ void SvxShape::ObtainSettingsFromPropertySet(SvxItemPropertySet& rPropSet) throw
         Reference< beans::XPropertySet > xShape( (OWeakObject*)this, UNO_QUERY );
         aPropSet.ObtainSettingsFromPropertySet(rPropSet, aSet, xShape);
         pObj->SetItemSetAndBroadcast(aSet);
-        pObj->ApplyNotPersistAttr( aSet );
     }
 }
 
@@ -1741,7 +1740,6 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
             sal_Bool bPrintable(sal_False);
             if( rVal >>= bPrintable )
             {
-                pObj->SetPrintable(bPrintable);
                 return;
             }
             break;
@@ -1864,15 +1862,6 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
             {
                 if( pSet->GetItemState( pMap->nWID ) != SFX_ITEM_SET )
                 {
-                    if(bIsNotPersist)
-                    {
-                        // Not-Persistant Attribute, hole diese extra
-                        pObj->TakeNotPersistAttr(*pSet, sal_False);
-                    }
-                }
-
-                if( pSet->GetItemState( pMap->nWID ) != SFX_ITEM_SET )
-                {
                     // Default aus ItemPool holen
                     if(pModel->GetItemPool().IsWhich(pMap->nWID))
                         pSet->Put(pModel->GetItemPool().GetDefaultItem(pMap->nWID));
@@ -1887,8 +1876,6 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
 
             if(bIsNotPersist)
             {
-                // Not-Persist Attribute extra setzen
-                pObj->ApplyNotPersistAttr( *pSet );
                 delete pSet;
             }
             else
@@ -2330,15 +2317,6 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
 
                 if(!aSet.Count())
                 {
-                    if(pMap->nWID >= SDRATTR_NOTPERSIST_FIRST && pMap->nWID <= SDRATTR_NOTPERSIST_LAST)
-                    {
-                        // Not-Persistant Attribute, hole diese extra
-                        pObj->TakeNotPersistAttr(aSet, sal_False);
-                    }
-                }
-
-                if(!aSet.Count())
-                {
                     // Default aus ItemPool holen
                     if(pModel->GetItemPool().IsWhich(pMap->nWID))
                         aSet.Put(pModel->GetItemPool().GetDefaultItem(pMap->nWID));
diff --git a/binfilter/inc/bf_svx/ParseContext.hxx b/binfilter/inc/bf_svx/ParseContext.hxx
deleted file mode 100644
index f56eefb4e..000000000
--- a/binfilter/inc/bf_svx/ParseContext.hxx
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef SVX_QUERYDESIGNCONTEXT_HXX
-#define SVX_QUERYDESIGNCONTEXT_HXX
-
-#include <connectivity/IParseContext.hxx>
-
-#include <unotools/localedatawrapper.hxx>
-namespace binfilter {
-
-namespace svxform
-{
-    //==========================================================================
-    //= OSystemParseContext
-    //==========================================================================
-    class OSystemParseContext : public ::connectivity::IParseContext
-    {
-    private:
-        ByteString m_aSQLInternationals;
-
-    public:
-        OSystemParseContext();
-
-        virtual ~OSystemParseContext();
-        // retrieves language specific error messages
-        virtual ::rtl::OUString getErrorMessage(ErrorCode _eCodes) const;
-
-        // retrieves language specific keyword strings (only ASCII allowed)
-        virtual ::rtl::OString getIntlKeywordAscii(InternationalKeyCode _eKey) const;
-
-        // finds out, if we have an international keyword (only ASCII allowed)
-        virtual InternationalKeyCode getIntlKeyCode(const ::rtl::OString& rToken) const;
-
-        /** get's a locale instance which should be used when parsing in the context specified by this instance
-            <p>if this is not overridden by derived classes, it returns the static default locale.</p>
-        */
-        virtual ::com::sun::star::lang::Locale getPreferredLocale( ) const;
-
-    };
-
-    //==========================================================================
-    //= OParseContextClient
-    //==========================================================================
-    /** helper class which needs access to a (shared and ref-counted) OSystemParseContext
-        instance.
-    */
-    class OParseContextClient
-    {
-    protected:
-        OParseContextClient();
-        virtual ~OParseContextClient();
-    };
-}
-}//end of namespace binfilter
-#endif // SVX_QUERYDESIGNCONTEXT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svx/drawitem.hxx b/binfilter/inc/bf_svx/drawitem.hxx
index 0f963f851..f358d4276 100644
--- a/binfilter/inc/bf_svx/drawitem.hxx
+++ b/binfilter/inc/bf_svx/drawitem.hxx
@@ -51,7 +51,7 @@ public:
                             SvxColorTableItem( const SvxColorTableItem& );
 
 
-    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual int             operator==( const SfxPoolItem& ) const { return 0; } // DBG_BF_ASSERT
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
     XColorTable*            GetColorTable() const { return pColorTable; }
@@ -80,7 +80,7 @@ public:
                             SvxGradientListItem( const SvxGradientListItem& );
 
 
-    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual int             operator==( const SfxPoolItem& ) const { return 0; } // DBG_BF_ASSERT
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
     XGradientList*          GetGradientList() const { return pGradientList; }
@@ -109,7 +109,7 @@ public:
                             SvxHatchListItem( const SvxHatchListItem& );
 
 
-    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual int             operator==( const SfxPoolItem& ) const { return 0; } // DBG_BF_ASSERT
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
     XHatchList*             GetHatchList() const { return pHatchList; }
@@ -138,7 +138,7 @@ public:
                             SvxBitmapListItem( const SvxBitmapListItem& );
 
 
-    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual int             operator==( const SfxPoolItem& ) const { return 0; } // DBG_BF_ASSERT
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
     XBitmapList*            GetBitmapList() const { return pBitmapList; }
@@ -167,7 +167,7 @@ public:
                             SvxDashListItem( const SvxDashListItem& );
 
 
-    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual int             operator==( const SfxPoolItem& ) const { return 0; } // DBG_BF_ASSERT
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
     XDashList*              GetDashList() const { return pDashList; }
diff --git a/binfilter/inc/bf_svx/editeng.hxx b/binfilter/inc/bf_svx/editeng.hxx
index 87d6e407a..d1e936f33 100644
--- a/binfilter/inc/bf_svx/editeng.hxx
+++ b/binfilter/inc/bf_svx/editeng.hxx
@@ -292,17 +292,12 @@ public:
     void            SetBeginPasteOrDropHdl( const Link& rLink );
     void            SetEndPasteOrDropHdl( const Link& rLink );
 
-    virtual void    PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
-    virtual void    ParagraphInserted( USHORT nNewParagraph );
-    virtual void    ParagraphDeleted( USHORT nDeletedParagraph );
-    virtual void    ParaAttribsChanged( USHORT nParagraph );
-    virtual void    ParagraphHeightChanged( USHORT nPara );
+    virtual void    ParaAttribsChanged( USHORT ) {} // DBG_BF_ASSERT
+    virtual void    ParagraphHeightChanged( USHORT ) {} // DBG_BF_ASSERT
 
-    // #101498#
-    virtual void    DrawingText( const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft);
+    virtual void    DrawingText( const Point&, const String&, USHORT, USHORT, const sal_Int32*, const SvxFont&, USHORT, xub_StrLen, BYTE) {} // DBG_BF_ASSERT
 
     virtual String  GetUndoComment( USHORT nUndoId ) const;
-    virtual BOOL    FormattingParagraph( USHORT nPara );
     virtual String  CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor );
     virtual Rectangle GetBulletArea( USHORT nPara );
 
diff --git a/binfilter/inc/bf_svx/editund2.hxx b/binfilter/inc/bf_svx/editund2.hxx
index eb8211194..bf175282a 100644
--- a/binfilter/inc/bf_svx/editund2.hxx
+++ b/binfilter/inc/bf_svx/editund2.hxx
@@ -58,9 +58,6 @@ public:
 
     ImpEditEngine*  GetImpEditEngine() const    { return pImpEE; }
 
-    virtual void    Undo()      = 0;
-    virtual void    Redo()      = 0;
-    virtual void    Repeat()    = 0;
     using SfxUndoAction::Repeat;
 
     virtual String  GetComment() const;
diff --git a/binfilter/inc/bf_svx/fmview.hxx b/binfilter/inc/bf_svx/fmview.hxx
index 84a3fa096..85fe87683 100644
--- a/binfilter/inc/bf_svx/fmview.hxx
+++ b/binfilter/inc/bf_svx/fmview.hxx
@@ -63,7 +63,6 @@ namespace svx {
 
 class FmFormView : public E3dView
 {
-    friend class FmXFormController;
     friend class FmFormShell;
     friend class FmXFormShell;
     friend class FmXFormView;
diff --git a/binfilter/inc/bf_svx/svdobj.hxx b/binfilter/inc/bf_svx/svdobj.hxx
index 9ffe8a35e..315e0179a 100644
--- a/binfilter/inc/bf_svx/svdobj.hxx
+++ b/binfilter/inc/bf_svx/svdobj.hxx
@@ -447,7 +447,6 @@ protected:
     BOOL                        bSnapRectDirty : 1;
     BOOL                        bNetLock : 1;   // ni
     BOOL                        bInserted : 1;  // nur wenn TRUE gibt's RepaintBroadcast & SetModify
-    BOOL                        bGrouped : 1;   // Member eines GroupObjektes?
 
     // Die folgende Flags werden gestreamt
     BOOL                        bMovProt : 1; // Position geschuetzt
@@ -484,7 +483,6 @@ public:
 private:
 
 protected:
-    void ImpDeleteUserData();
     SdrObjUserData* ImpGetMacroUserData() const;
 
     // Fuer GetDragComment
@@ -506,9 +504,9 @@ protected:
     // geometrische Daten besitzt, die fuer den Undo-Fall gesichert werden
     // sollen. NewGeoData() erzeugt lediglich eine leere Instanz auf eine von
     // SdrObjGeoData abgeleitete Klasse.
-    virtual SdrObjGeoData* NewGeoData() const;
+    virtual SdrObjGeoData* NewGeoData() const { return NULL; } // DBG_BF_ASSERT
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
-    virtual void RestGeoData(const SdrObjGeoData& rGeo);
+    virtual void RestGeoData(const SdrObjGeoData& /*rGeo*/) {} // DBG_BF_ASSERT
 
 public:
     TYPEINFO();
@@ -556,7 +554,7 @@ public:
 
     // Fuer Gruppenobjekte
     bool IsGroupObject() const { return GetSubList()!=NULL; }
-    virtual SdrObjList* GetSubList() const;
+    virtual SdrObjList* GetSubList() const { return NULL; } // DBG_BF_ASSERT
     SdrObject* GetUpGroup() const;
 
     // Ueber die Objekt-Ordnungsnummer kann man feststellen, ob ein Objekt vor
@@ -584,7 +582,7 @@ public:
     //    Selektion (HitTest), 1. Stufe
     //    Obj nach vorn/hinten: Nur Objs im gleichen Bereich werden beruecksichtigt.
     virtual const Rectangle& GetBoundRect() const;
-    virtual void RecalcBoundRect();
+    virtual void RecalcBoundRect() {} // DBG_BF_ASSERT
     void SendRepaintBroadcast(BOOL bNoPaintNeeded = FALSE) const;
     void SendRepaintBroadcast(const Rectangle& rRect) const;
 
@@ -660,10 +658,8 @@ public:
     // HitTest, 2. Stufe. nTol ist die zulaessige Toleranz in logischen Einheiten.
     // rVisiLayer ist hauptsaechlich fuer Gruppenobjekte gedacht, die ja Objekte
     // mit unterschiedlichen Layerzuordnungen beinhalten koennen.
-    virtual SdrObject* CheckHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const;
+    virtual SdrObject* CheckHit(const Point&, USHORT, const SetOfByte*) const { return NULL; } // DBG_BF_ASSERT
     SdrObject* CheckHit(const Point& rPnt, USHORT nTol) const { return CheckHit(rPnt,nTol,NULL); }
-    bool IsHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const { return CheckHit(rPnt,nTol,pVisiLayer)!=NULL; }
-    bool IsHit(const Point& rPnt, USHORT nTol) const { return CheckHit(rPnt,nTol,NULL)!=NULL; }
 
     // Clone() soll eine komplette Kopie des Objektes erzeugen.
     virtual SdrObject* Clone() const;
@@ -679,7 +675,7 @@ public:
 
     // Die Kontur fuer TextToContour
     virtual void TakeContour(XPolyPolygon& rPoly) const;
-    virtual void TakeContour(XPolyPolygon& rXPoly, SdrContourType eType) const;
+    virtual void TakeContour(XPolyPolygon&, SdrContourType) const {} // DBG_BF_ASSERT
 
     // Ueber GetHdlCount gibt ein Objekt die Anzahl seiner Handles preis.
     // Im Normalfall werden dies 8 sein, bei einer Strecke 2. Bei Polygonobjekten
@@ -732,7 +728,7 @@ public:
 /*N*/   virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
 /*N*/   virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
 /*N*/   virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
-/*N*/   virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear);
+/*N*/   virtual void NbcShear (const Point&, long, double, bool) {} // DBG_BF_ASSERT
 
     virtual void Move  (const Size& rSiz);
     virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
@@ -765,8 +761,8 @@ public:
     virtual void NbcSetLogicRect(const Rectangle& rRect);
 
     // Drehwinkel und Shear
-    virtual long GetRotateAngle() const;
-    virtual long GetShearAngle(bool bVertical=FALSE) const;
+    virtual long GetRotateAngle() const { return 0; } // DBG_BF_ASSERT
+    virtual long GetShearAngle(bool=FALSE) const { return 0; } // DBG_BF_ASSERT
 
     // Zum Fangen von/auf ausgezeichneten Punkten eines Obj (Polygonpunkte,
     // Kreismittelpunkt, ...)
@@ -777,11 +773,11 @@ public:
     // als Mehrfachselektion verschoben und gedreht, ...
     // Nur solche Objekte koennen PlusHandles haben (z.B. die Gewichte an den
     // Bezierkurven.
-    virtual bool IsPolyObj() const;
-    virtual USHORT GetPointCount() const;
-    virtual const Point& GetPoint(USHORT i) const;
+    virtual bool IsPolyObj() const { return false; } // DBG_BF_ASSERT
+    virtual USHORT GetPointCount() const { return 0; } // DBG_BF_ASSERT
+    virtual const Point& GetPoint(USHORT) const { return *((Point*)NULL); } // DBG_BF_ASSERT
     virtual void SetPoint(const Point& rPnt, USHORT i);
-    virtual void NbcSetPoint(const Point& rPnt, USHORT i);
+    virtual void NbcSetPoint(const Point&, USHORT) {} // DBG_BF_ASSERT
 
     // Einfuegen eines neuen Polygonpunktes. Ret muss die Nummer des passenden
     // Hdl sein. 0xFFFF= einfuegen nicht moeglich.
@@ -831,53 +827,44 @@ public:
     virtual void ClearItem(const sal_uInt16 nWhich = 0);
     virtual void SetItemSet(const SfxItemSet& rSet);
     virtual void BroadcastItemChange(const SdrBroadcastItemChange& rChange);
-    virtual void ItemSetChanged(const SfxItemSet& rSet);
+    virtual void ItemSetChanged(const SfxItemSet&) {} // DBG_BF_ASSERT
 
     // syntactical sugar for ItemSet accesses
     void SetItemSetAndBroadcast(const SfxItemSet& rSet);
     const SfxPoolItem& GetItem(const sal_uInt16 nWhich) const;
 
     // private support routines for ItemSet access. NULL pointer means clear item.
-    virtual BOOL AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const;
-    virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
-    virtual void PostItemChange(const sal_uInt16 nWhich);
+    virtual void ItemChange(const sal_uInt16, const SfxPoolItem* = 0) {} // DBG_BF_ASSERT
+    virtual void PostItemChange(const sal_uInt16) {} // DBG_BF_ASSERT
 
     // pre- and postprocessing for objects for saving
     virtual void PreSave() {}
     virtual void PostSave() {}
 
-    // NotPersistAttr fuer Layer, ObjName, geometrische Transformationen, ...
-    void TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const;
-    void ApplyNotPersistAttr(const SfxItemSet& rAttr);
-
     // bDontRemoveHardAttr=FALSE: alle in der Vorlage gesetzten Attribute werden am
     // Zeichenobjekt auf Default gesetzt; TRUE: alle harten Attribute bleiben erhalten.
-    virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
-    virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
-    virtual SfxStyleSheet* GetStyleSheet() const;
+    virtual void SetStyleSheet(SfxStyleSheet*, bool) {} // DBG_BF_ASSERT
+    virtual void NbcSetStyleSheet(SfxStyleSheet*, bool) {} // DBG_BF_ASSERT
+    virtual SfxStyleSheet* GetStyleSheet() const { return NULL; } // DBG_BF_ASSERT
 
     // TextEdit
-    virtual bool HasTextEdit() const;
-    virtual SdrObject* CheckTextEditHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const;
-    SdrObject* CheckTextEditHit(const Point& rPnt, USHORT nTol) const { return CheckTextEditHit(rPnt,nTol,NULL); }
-    bool IsTextEditHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const { return CheckTextEditHit(rPnt,nTol,pVisiLayer)!=NULL; }
-    bool IsTextEditHit(const Point& rPnt, USHORT nTol) const { return CheckTextEditHit(rPnt,nTol,NULL)!=NULL; }
+    virtual bool HasTextEdit() const { return false; } // DBG_BF_ASSERT
 
     // Return==TRUE: TextEditMode gestartet
-    virtual bool BegTextEdit(SdrOutliner& rOutl);
-    virtual void EndTextEdit(SdrOutliner& rOutl);
+    virtual bool BegTextEdit(SdrOutliner& /*rOutl*/) { return false; } // DBG_BF_ASSERT
+    virtual void EndTextEdit(SdrOutliner& /*rOutl*/) {} // DBG_BF_ASSERT
 
     // Text wird im Format des Outliners gehalten
     // SetOutlinerParaObject: Eigentumsuebereignung von *pTextObject!
     virtual void SetOutlinerParaObject(OutlinerParaObject* pTextObject);
-    virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
-    virtual OutlinerParaObject* GetOutlinerParaObject() const;
-    virtual void NbcReformatText();
+    virtual void NbcSetOutlinerParaObject(OutlinerParaObject*) {} // DBG_BF_ASSERT
+    virtual OutlinerParaObject* GetOutlinerParaObject() const { return NULL; } // DBG_BF_ASSERT
+    virtual void NbcReformatText() {} // DBG_BF_ASSERT
     virtual void ReformatText();
 
     // Animations-Iterationscounter Resetten. Neustart der Animation
     // beim naechsten Paint. pPageView=NULL: Alle PageViews.
-    virtual void RestartAnimation(SdrPageView* pPageView) const;
+    virtual void RestartAnimation(SdrPageView*) const {} // DBG_BF_ASSERT
 
     // Macrofaehigkeit, z.B. ein Rechteck als PushButton.
     virtual bool HasMacro() const;
@@ -899,7 +886,7 @@ public:
     // Beim Verschieben/Resizen der Kante wird dagegen die Verbindung
     // geloesst.
     // Objekt ist ein Knoten?
-    virtual bool IsNode() const;
+    virtual bool IsNode() const { return true; } // DBG_BF_ASSERT
 
     // Automatische Klebepunkte:
     // je 4 Scheitelpunkt- und Eckpositionen muss ein Knotenobjekt liefern
@@ -914,20 +901,14 @@ public:
     // Nach veraendern der GluePointList muss man am Obj SendRepaintBroadcast rufen!
     virtual SdrGluePointList* ForceGluePointList();
 
-    // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
-    void SetGlueReallyAbsolute(bool bOn);
-    void NbcRotateGluePoints(const Point& rRef, long nWink, double sn, double cs);
-    void NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2);
-    void NbcShearGluePoints (const Point& rRef, long nWink, double tn, bool bVShear);
-
     // Objekt ist eine Kante?
 
     // Xor-Darstellung der Kante beim Draggen einer der beiden Knoten
 
     // bTail1=TRUE: Linienanfang, sonst LinienEnde
     // pObj=NULL: Disconnect
-    virtual void ConnectToNode(bool bTail1, SdrObject* pObj);
-    virtual void DisconnectFromNode(bool bTail1);
+    virtual void ConnectToNode(bool /*bTail1*/, SdrObject* /*pObj*/) {} // DBG_BF_ASSERT
+    virtual void DisconnectFromNode(bool /*bTail1*/) {} // DBG_BF_ASSERT
 
     // Wenn ein Objekt in der Lage ist, sich in ein Polygon oder in eine
     // Bezierkurve (oder beides) zu verwandeln, dann sollten die folgenden
@@ -949,7 +930,7 @@ public:
     // Bei der Konvertierung von TextObj nach PathObj wird es wohl so sein,
     // dass beide Modi (bLineToArea=TRUE/FALSE) identisch sind.
     // Defaulted sind diese Methoden auf "Ich kann das nicht" (FALSE/NULL).
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(BOOL /*bBezier*/) const { return NULL; } // DBG_BF_ASSERT
     SdrObject* ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const;
 
     // convert this path object to contour object; bForceLineDash converts even
@@ -961,7 +942,7 @@ public:
     //   WriteData() auf. Zum Schluss wird noch das vorerst auf 0 initiallisierte
     //   Feld nByteAnz des SdrObjIOHeader gefuellt. Die geerbte Methode WriteData
     //   ist in ueberlagerten Methoden stets am Anfang zu rufen.
-    virtual void WriteData(SvStream& ) const {}
+    virtual void WriteData(SvStream& ) const {} // DBG_BF_ASSERT
 
     // Lesen aus einem Stream: Zunaest wird der SdrIOHeader von einem Reader am
     //   SdrModel gelesen (Read und SeekBack). Der Reader versucht dann eine
@@ -981,9 +962,6 @@ public:
     friend SvStream& operator<<(SvStream& rOut, const SdrObject& rObj);
     friend SvStream& operator>>(SvStream& rIn, SdrObject& rObj);
 
-    // TRUE: Referenz auf ein Obj
-    bool IsVirtualObj() const { return bVirtObj; }
-
     // TRUE=Obj kann warsch. gefuellt werden; FALSE=Obj kann warsch. Linienenden haben.
     // ungueltig, wenn es sich um ein GroupObj handelt.
     bool IsClosedObj() const { return bClosedObj; }
@@ -992,20 +970,14 @@ public:
     bool Is3DObj() const { return bIs3DObj; }
     bool IsUnoObj() const { return bIsUnoObj; }
     bool IsMasterCachable() const { return !bNotMasterCachable; }
-    bool ShareLock() { bool r=!bNetLock; bNetLock=TRUE; return r; }
-    void ShareUnlock() { bNetLock=FALSE; }
-    bool IsShareLock() const { return bNetLock; }
     void SetMarkProtect(bool bProt) { bMarkProt=bProt; }
     bool IsMarkProtect() const { return bMarkProt; }
     void SetInserted(bool bIns);
     bool IsInserted() const { return bInserted; }
-    void SetGrouped(bool bGrp) { bGrouped=bGrp; }
-    bool IsGrouped() const { return bGrouped; }
     void SetMoveProtect(bool bProt);
     bool IsMoveProtect() const { return bMovProt; }
     void SetResizeProtect(bool bProt);
     bool IsResizeProtect() const { return bSizProt; }
-    void SetPrintable(bool bPrn);
     bool IsPrintable() const { return !bNoPrint; }
     void SetEmptyPresObj(bool bEpt) { bEmptyPresObj=bEpt; }
     bool IsEmptyPresObj() const { return bEmptyPresObj; }