[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Oct 11 20:05:20 PDT 2011
binfilter/bf_forms/source/component/Filter.hxx | 2
binfilter/bf_svx/source/dialog/imapdlg.hrc | 104 -----
binfilter/bf_svx/source/dialog/rlrcitem.hxx | 55 --
binfilter/bf_svx/source/editeng/editundo.hxx | 23 -
binfilter/bf_svx/source/editeng/svx_editeng.cxx | 44 --
binfilter/bf_svx/source/editeng/svx_editundo.cxx | 72 ---
binfilter/bf_svx/source/editeng/svx_impedit2.cxx | 13
binfilter/bf_svx/source/editeng/svx_impedit3.cxx | 111 ------
binfilter/bf_svx/source/engine3d/svx_scene3d.cxx | 7
binfilter/bf_svx/source/form/makefile.mk | 5
binfilter/bf_svx/source/form/svx_ParseContext.cxx | 147 -------
binfilter/bf_svx/source/form/svx_fmpgeimp.cxx | 2
binfilter/bf_svx/source/inc/dbtoolsclient.hxx | 142 -------
binfilter/bf_svx/source/inc/filtnav.hxx | 102 -----
binfilter/bf_svx/source/inc/fmPropBrw.hxx | 52 --
binfilter/bf_svx/source/inc/fmcontr.hxx | 254 -------------
binfilter/bf_svx/source/inc/fmctrler.hxx | 405 ----------------------
binfilter/bf_svx/source/inc/fmexpl.hrc | 40 --
binfilter/bf_svx/source/inc/fmexpl.hxx | 131 -------
binfilter/bf_svx/source/inc/fmshimp.hxx | 1
binfilter/bf_svx/source/inc/fmundo.hxx | 147 -------
binfilter/bf_svx/source/inc/fmurl.hxx | 63 ---
binfilter/bf_svx/source/inc/fmvwimp.hxx | 239 ------------
binfilter/bf_svx/source/inc/gridcols.hxx | 71 ---
binfilter/bf_svx/source/inc/multipro.hxx | 74 ----
binfilter/bf_svx/source/inc/sdbdatacolumn.hxx | 145 -------
binfilter/bf_svx/source/inc/showcols.hxx | 69 ---
binfilter/bf_svx/source/inc/sqlparserclient.hxx | 66 ---
binfilter/bf_svx/source/inc/taborder.hrc | 41 --
binfilter/bf_svx/source/inc/taborder.hxx | 116 ------
binfilter/bf_svx/source/inc/tabwin.hxx | 52 --
binfilter/bf_svx/source/inc/tbxform.hxx | 142 -------
binfilter/bf_svx/source/inc/trace.hxx | 69 ---
binfilter/bf_svx/source/items/svx_drawitem.cxx | 60 ---
binfilter/bf_svx/source/outliner/svx_outleeng.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdobj.cxx | 311 ----------------
binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx | 37 --
binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx | 40 --
binfilter/bf_svx/source/unodraw/svx_unoshape.cxx | 22 -
binfilter/inc/bf_svx/ParseContext.hxx | 82 ----
binfilter/inc/bf_svx/drawitem.hxx | 10
binfilter/inc/bf_svx/editeng.hxx | 11
binfilter/inc/bf_svx/editund2.hxx | 3
binfilter/inc/bf_svx/fmview.hxx | 1
binfilter/inc/bf_svx/svdobj.hxx | 90 +---
45 files changed, 63 insertions(+), 3614 deletions(-)
New commits:
commit d9a0c7be2e98f011554f88107a1867a9a8e60acf
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Oct 11 20:05:03 2011 -0700
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.
diff --git a/binfilter/bf_forms/source/component/Filter.hxx b/binfilter/bf_forms/source/component/Filter.hxx
index a3de3c4..8cd0085 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 7db591c..0000000
--- 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 31e1c07..0000000
--- 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 e748162..93cf61b 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 3df4642..851298b 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 fe6077c..90a2c9a 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 45e41ea..d57d15c 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 ccba68e..a169b2f 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 4ee7e46..88f9760 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 886f1c8..49a6e36 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 f3f7156..0000000
--- 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 c5e0679..0a86c4c 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 9e727bb..0000000
--- 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 cc4d0b9..0000000
--- 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 283f58c..0000000
--- 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 44684cf..0000000
--- 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 5f0d0cf..0000000
--- 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 be8db7b..0000000
--- 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 39abdd7..0000000
--- 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 aea92ea..8f6932e 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 ae4669a..0000000
--- 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>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list