[Libreoffice-commits] .: 2 commits - binfilter/bf_sc binfilter/bf_svx binfilter/bf_sw binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Sep 18 06:00:50 PDT 2011
binfilter/bf_sc/source/ui/inc/chartsh.hxx | 56 ---
binfilter/bf_sc/source/ui/inc/drawsh.hxx | 81 -----
binfilter/bf_sc/source/ui/inc/drformsh.hxx | 59 ---
binfilter/bf_sc/source/ui/inc/graphsh.hxx | 60 ----
binfilter/bf_sc/source/ui/inc/oleobjsh.hxx | 56 ---
binfilter/bf_svx/source/items/makefile.mk | 3
binfilter/bf_svx/source/items/svx_drawitem.cxx | 45 +--
binfilter/bf_svx/source/items/svx_e3ditem.cxx | 7
binfilter/bf_svx/source/items/svx_flditem.cxx | 32 --
binfilter/bf_svx/source/items/svx_frmitems.cxx | 130 +-------
binfilter/bf_svx/source/items/svx_hlnkitem.cxx | 67 ----
binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx | 1
binfilter/bf_sw/source/core/inc/frame.hxx | 4
binfilter/bf_sw/source/core/inc/frmsh.hxx | 51 ---
binfilter/bf_sw/source/core/layout/sw_calcmove.cxx | 311 ++++++---------------
binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx | 15 -
binfilter/bf_sw/source/core/layout/sw_fly.cxx | 79 -----
binfilter/bf_sw/source/core/layout/sw_flylay.cxx | 4
binfilter/bf_sw/source/core/layout/sw_frmtool.cxx | 90 ------
binfilter/bf_sw/source/core/layout/sw_hffrm.cxx | 5
binfilter/bf_sw/source/core/layout/sw_pagechg.cxx | 39 --
binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx | 1
binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx | 1
binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 19 -
binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx | 2
binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 41 --
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 8
binfilter/bf_sw/source/core/text/sw_inftxt.cxx | 34 --
binfilter/bf_sw/source/core/text/sw_porrst.cxx | 42 --
binfilter/bf_sw/source/core/text/sw_redlnitr.cxx | 1
binfilter/bf_sw/source/core/text/sw_txtfrm.cxx | 92 ------
binfilter/bf_sw/source/core/text/sw_txtftn.cxx | 6
binfilter/bf_sw/source/core/text/sw_txtio.cxx | 1
binfilter/bf_sw/source/ui/inc/basesh.hxx | 140 ---------
binfilter/bf_sw/source/ui/inc/beziersh.hxx | 45 ---
binfilter/bf_sw/source/ui/inc/drawsh.hxx | 57 ---
binfilter/bf_sw/source/ui/inc/drformsh.hxx | 50 ---
binfilter/bf_sw/source/ui/inc/drwbassh.hxx | 58 ---
binfilter/bf_sw/source/ui/inc/frmsh.hxx | 50 ---
binfilter/bf_sw/source/ui/inc/grfsh.hxx | 48 ---
binfilter/bf_sw/source/ui/inc/listsh.hxx | 47 ---
binfilter/bf_sw/source/ui/inc/olesh.hxx | 52 ---
binfilter/bf_sw/source/ui/inc/tabsh.hxx | 53 ---
binfilter/bf_sw/source/ui/inc/textsh.hxx | 81 -----
binfilter/bf_sw/source/ui/inc/wdrwbase.hxx | 51 ---
binfilter/bf_sw/source/ui/inc/wformsh.hxx | 49 ---
binfilter/bf_sw/source/ui/inc/wfrmsh.hxx | 52 ---
binfilter/bf_sw/source/ui/inc/wgrfsh.hxx | 49 ---
binfilter/bf_sw/source/ui/inc/wlistsh.hxx | 47 ---
binfilter/bf_sw/source/ui/inc/wolesh.hxx | 52 ---
binfilter/bf_sw/source/ui/inc/wtabsh.hxx | 47 ---
binfilter/bf_sw/source/ui/inc/wtextsh.hxx | 52 ---
binfilter/inc/bf_svx/brkitem.hxx | 2
binfilter/inc/bf_svx/e3ditem.hxx | 8
binfilter/inc/bf_svx/flditem.hxx | 18 -
binfilter/inc/bf_svx/hlnkitem.hxx | 61 ----
binfilter/inc/bf_svx/shaditem.hxx | 6
57 files changed, 209 insertions(+), 2409 deletions(-)
New commits:
commit 2af0a0f5c916bec19f9ef2273e7e0a9fb0fa99a9
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Sep 18 05:57:23 2011 -0700
SwFrm::GetShell() is always NULL; also deleted some unused classes
diff --git a/binfilter/bf_sc/source/ui/inc/chartsh.hxx b/binfilter/bf_sc/source/ui/inc/chartsh.hxx
deleted file mode 100644
index c1b50cd..0000000
--- a/binfilter/bf_sc/source/ui/inc/chartsh.hxx
+++ /dev/null
@@ -1,56 +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 CHARTSH_HXX
-#define CHARTSH_HXX
-
-#include <bf_sfx2/shell.hxx>
-#include "shellids.hxx"
-#include <bf_sfx2/module.hxx>
-
-#include <bf_svx/svdmark.hxx>
-
-class ScViewData;
-
-#include "drawsh.hxx"
-namespace binfilter {
-
-class ScChartShell: public ScDrawShell
-{
-public:
-
- SFX_DECL_INTERFACE(SCID_CHART_SHELL);
-
- ScChartShell(ScViewData* pData):ScDrawShell(pData){DBG_BF_ASSERT(0, "STRIP");}
-
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/inc/drawsh.hxx b/binfilter/bf_sc/source/ui/inc/drawsh.hxx
deleted file mode 100644
index feb41a4..0000000
--- a/binfilter/bf_sc/source/ui/inc/drawsh.hxx
+++ /dev/null
@@ -1,81 +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 SC_DRAWSH_HXX
-#define SC_DRAWSH_HXX
-
-#include <bf_sfx2/shell.hxx>
-#include "shellids.hxx"
-#include <bf_sfx2/module.hxx>
-
-#include <bf_svx/svdmark.hxx>
-
-#include <tools/link.hxx>
-namespace binfilter {
-
-class SvxNameDialog;
-class ScViewData;
-
-
-class ScDrawShell : public SfxShell
-{
-
-
-
-public:
- TYPEINFO();
- SFX_DECL_INTERFACE(SCID_DRAW_SHELL);
-
- ScDrawShell(ScViewData* pData){DBG_BF_ASSERT(0, "STRIP");}
-
- void StateDisableItems( SfxItemSet &rSet ){DBG_BF_ASSERT(0, "STRIP");}
-
- void ExecDrawAttr(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}
- void GetDrawAttrState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}
- void GetAttrFuncState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}
-
- void ExecDrawFunc(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}
- void GetDrawFuncState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}
- void GetState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}
-
- void ExecFormText(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}
- void GetFormTextState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");}
-
- void ExecuteHLink(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}
- void GetHLinkState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");}
-
-
-};
-
-
-
-} //namespace binfilter
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/inc/drformsh.hxx b/binfilter/bf_sc/source/ui/inc/drformsh.hxx
deleted file mode 100644
index 8113e25..0000000
--- a/binfilter/bf_sc/source/ui/inc/drformsh.hxx
+++ /dev/null
@@ -1,59 +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 DRFORMSH_HXX
-#define DRFORMSH_HXX
-
-#include <bf_sfx2/shell.hxx>
-#include "shellids.hxx"
-#include <bf_sfx2/module.hxx>
-
-#include <bf_svx/svdmark.hxx>
-
-class ScViewData;
-
-
-#include "drawsh.hxx"
-namespace binfilter {
-
-class ScDrawFormShell: public ScDrawShell
-{
-public:
-
- SFX_DECL_INTERFACE(SCID_FORM_SHELL);
-
- ScDrawFormShell(ScViewData* pData):ScDrawShell(pData){DBG_BF_ASSERT(0, "STRIP");}
-
-// void Execute(SfxRequest &);
-// void GetState(SfxItemSet &);
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/inc/graphsh.hxx b/binfilter/bf_sc/source/ui/inc/graphsh.hxx
deleted file mode 100644
index 2619431..0000000
--- a/binfilter/bf_sc/source/ui/inc/graphsh.hxx
+++ /dev/null
@@ -1,60 +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 GRAPHSH_HXX
-#define GRAPHSH_HXX
-
-#include <bf_sfx2/shell.hxx>
-#include "shellids.hxx"
-#include <bf_sfx2/module.hxx>
-
-#include <bf_svx/svdmark.hxx>
-
-class ScViewData;
-
-#include "drawsh.hxx"
-namespace binfilter {
-
-class ScGraphicShell: public ScDrawShell
-{
-public:
-
- SFX_DECL_INTERFACE(SCID_GRAPHIC_SHELL);
-
- ScGraphicShell(ScViewData* pData):ScDrawShell(pData){DBG_BF_ASSERT(0, "STRIP");}
- void Execute(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}
- void GetAttrState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}
-
- void ExecuteFilter(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}
- void GetFilterState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/inc/oleobjsh.hxx b/binfilter/bf_sc/source/ui/inc/oleobjsh.hxx
deleted file mode 100644
index d81c211..0000000
--- a/binfilter/bf_sc/source/ui/inc/oleobjsh.hxx
+++ /dev/null
@@ -1,56 +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 OLEOBJSH_HXX
-#define OLEOBJSH_HXX
-
-#include <bf_sfx2/shell.hxx>
-#include "shellids.hxx"
-#include <bf_sfx2/module.hxx>
-
-#include <bf_svx/svdmark.hxx>
-
-class ScViewData;
-
-#include "drawsh.hxx"
-namespace binfilter {
-
-class ScOleObjectShell: public ScDrawShell
-{
-public:
-
- SFX_DECL_INTERFACE(SCID_OLEOBJECT_SHELL);
-
- ScOleObjectShell(ScViewData* pData):ScDrawShell(pData){DBG_BF_ASSERT(0, "STRIP"); }
-
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
index f84a970..1f84bf8 100644
--- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
@@ -46,7 +46,6 @@
#include <dflyobj.hxx>
#include <notxtfrm.hxx>
#include <ndgrf.hxx>
-#include <frmsh.hxx>
#include <mdiexp.hxx>
#include <comcore.hrc>
diff --git a/binfilter/bf_sw/source/core/inc/frame.hxx b/binfilter/bf_sw/source/core/inc/frame.hxx
index 0f90644..b84cd19 100644
--- a/binfilter/bf_sw/source/core/inc/frame.hxx
+++ b/binfilter/bf_sw/source/core/inc/frame.hxx
@@ -538,10 +538,6 @@ public:
inline BOOL HasFixSize() const { return bFixSize; }
- //Kann 0 liefern, pruefen auch ob die Shell zum richtigen Dokument
- //gehoert. Impl in frmsh.hxx
- inline ViewShell *GetShell() const;
-
//Prueft alle Seiten ab der Uebergebenen und korrigiert ggf.
static void CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields = TRUE );
diff --git a/binfilter/bf_sw/source/core/inc/frmsh.hxx b/binfilter/bf_sw/source/core/inc/frmsh.hxx
deleted file mode 100644
index 249c740..0000000
--- a/binfilter/bf_sw/source/core/inc/frmsh.hxx
+++ /dev/null
@@ -1,51 +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 _FRMSH_HXX
-#define _FRMSH_HXX
-
-#include "rootfrm.hxx"
-namespace binfilter {
-
-/*************************************************************************
-|*
-|* SwFrm::GetShell()
-|*
-|* Beschreibung Liefert die aktuelle Shell, ggf. auch NULL.
-|*
-|*************************************************************************/
-
-inline ViewShell * SwFrm::GetShell() const
-{
- return 0;
-}
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
index caaf036..644d285 100644
--- a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
@@ -55,7 +55,6 @@
#include "tabfrm.hxx"
#include "ftnfrm.hxx"
#include "txtfrm.hxx"
-#include "frmsh.hxx"
#include "pagedesc.hxx"
#include "sectfrm.hxx"
#include "dbg_lay.hxx"
@@ -551,97 +550,10 @@ namespace binfilter {
/*N*/ pAccess = new SwBorderAttrAccess( SwFrm::GetCache(), this );
/*N*/ pAttrs = pAccess->Get();
/*N*/ }
-/*N*/ //Bei der BrowseView gelten feste Einstellungen.
-/*N*/ ViewShell *pSh = GetShell();
-/*N*/ if ( pSh && GetFmt()->GetDoc()->IsBrowseMode() )
-/*N*/ {
-/*N*/ const Size aBorder = pSh->GetOut()->PixelToLogic( pSh->GetBrowseBorder() );
-/*N*/ const long nTop = pAttrs->CalcTopLine() + aBorder.Height();
-/*N*/ const long nBottom = pAttrs->CalcBottomLine()+ aBorder.Height();
-/*N*/
-/*N*/ long nWidth = 0;
-/*N*/ if ( nWidth < pSh->VisArea().Width() )
-/*N*/ nWidth = pSh->VisArea().Width();
-/*N*/ nWidth = Max( nWidth, 2L * aBorder.Width() + 4L*MM50 );
-/*N*/ Frm().Width( nWidth );
-/*N*/
-/*N*/ SwLayoutFrm *pBody = FindBodyCont();
-/*N*/ if ( pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm() )
-/*N*/ {
-/*N*/ //Fuer Spalten gilt eine feste Hoehe
-/*N*/ Frm().Height( pAttrs->GetSize().Height() );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ //Fuer Seiten ohne Spalten bestimmt der Inhalt die
-/*N*/ //Groesse.
-/*N*/ long nBot = Frm().Top() + nTop;
-/*N*/ SwFrm *pFrm = Lower();
-/*N*/ while ( pFrm )
-/*N*/ {
-/*N*/ long nTmp = 0;
-/*N*/ SwFrm *pCnt = ((SwLayoutFrm*)pFrm)->ContainsAny();
-/*N*/ while ( pCnt && (pCnt->GetUpper() == pFrm ||
-/*N*/ ((SwLayoutFrm*)pFrm)->IsAnLower( pCnt )))
-/*N*/ {
-/*N*/ nTmp += pCnt->Frm().Height();
-/*N*/ if( pCnt->IsTxtFrm() &&
-/*N*/ ((SwTxtFrm*)pCnt)->IsUndersized() )
-/*N*/ nTmp += ((SwTxtFrm*)pCnt)->GetParHeight()
-/*N*/ - pCnt->Prt().Height();
-/*N*/ else if( pCnt->IsSctFrm() &&
-/*N*/ ((SwSectionFrm*)pCnt)->IsUndersized() )
-/*N*/ nTmp += ((SwSectionFrm*)pCnt)->Undersize();
-/*N*/ pCnt = pCnt->FindNext();
-/*N*/ }
-/*N*/ // consider invalid body frame properties
-/*N*/ if ( pFrm->IsBodyFrm() &&
-/*N*/ ( !pFrm->GetValidSizeFlag() ||
-/*N*/ !pFrm->GetValidPrtAreaFlag() ) &&
-/*N*/ ( pFrm->Frm().Height() < pFrm->Prt().Height() )
-/*N*/ )
-/*N*/ {
-/*N*/ nTmp = Min( nTmp, pFrm->Frm().Height() );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // assert invalid lower property
-/*N*/ OSL_ENSURE( !(pFrm->Frm().Height() < pFrm->Prt().Height()),
-/*N*/ "SwPageFrm::MakeAll(): Lower with frame height < printing height" );
-/*N*/ nTmp += pFrm->Frm().Height() - pFrm->Prt().Height();
-/*N*/ }
-/*N*/ if ( !pFrm->IsBodyFrm() )
-/*N*/ nTmp = Min( nTmp, pFrm->Frm().Height() );
-/*N*/ nBot += nTmp;
-/*N*/ // Hier werden die absatzgebundenen Objekte ueberprueft,
-/*N*/ // ob sie ueber den Body/FtnCont hinausragen.
-/*N*/ if( pSortedObjs && !pFrm->IsHeaderFrm() &&
-/*N*/ !pFrm->IsFooterFrm() )
-/*N*/ lcl_CheckObjects( pSortedObjs, pFrm, nBot );
-/*N*/ pFrm = pFrm->GetNext();
-/*N*/ }
-/*N*/ nBot += nBottom;
-/*N*/ //Und die Seitengebundenen
-/*N*/ if ( pSortedObjs )
-/*N*/ lcl_CheckObjects( pSortedObjs, this, nBot );
-/*N*/ nBot -= Frm().Top();
-/*N*/ if ( !GetPrev() )
-/*N*/ nBot = Max( nBot, pSh->VisArea().Height() );
-/*N*/ Frm().Height( nBot );
-/*N*/ }
-/*N*/ Prt().Left ( pAttrs->CalcLeftLine() + aBorder.Width() );
-/*N*/ Prt().Top ( nTop );
-/*N*/ Prt().Width( Frm().Width() - ( Prt().Left()
-/*N*/ + pAttrs->CalcRightLine() + aBorder.Width() ) );
-/*N*/ Prt().Height( Frm().Height() - (nTop + nBottom) );
-/*N*/ bValidSize = bValidPrtArea = TRUE;
-/*N*/ }
-/*N*/ else
-/*N*/ { //FixSize einstellen, bei Seiten nicht vom Upper sondern vom
-/*N*/ //Attribut vorgegeben.
-/*N*/ Frm().SSize( pAttrs->GetSize() );
-/*N*/ Format( pAttrs );
-/*N*/ }
+/*N*/ //FixSize einstellen, bei Seiten nicht vom Upper sondern vom
+/*N*/ //Attribut vorgegeben.
+/*N*/ Frm().SSize( pAttrs->GetSize() );
+/*N*/ Format( pAttrs );
/*N*/ }
/*N*/ }
/*N*/ } //while ( !bValidPos || !bValidSize || !bValidPrtArea )
@@ -737,134 +649,93 @@ namespace binfilter {
|*
|*************************************************************************/
-/*N*/ BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
-/*N*/ {
-/*N*/ BOOL bSizeChgd = FALSE;
-/*N*/
-/*N*/ if ( !bValidPrtArea )
-/*N*/ {
-/*N*/ bValidPrtArea = TRUE;
-/*N*/
-/*N*/ SWRECTFN( this )
-/*N*/ const bool bTxtFrm = IsTxtFrm();
-/*N*/ SwTwips nUpper = 0;
-/*N*/ if ( bTxtFrm && ((SwTxtFrm*)this)->IsHiddenNow() )
-/*N*/ {
-/*N*/ if ( ((SwTxtFrm*)this)->HasFollow() )
-/*N*/ ((SwTxtFrm*)this)->JoinFrm();
-/*N*/
-/*N*/ if( (Prt().*fnRect->fnGetHeight)() )
-/*N*/ ((SwTxtFrm*)this)->HideHidden();
-/*N*/ Prt().Pos().X() = Prt().Pos().Y() = 0;
-/*N*/ (Prt().*fnRect->fnSetWidth)( (Frm().*fnRect->fnGetWidth)() );
-/*N*/ (Prt().*fnRect->fnSetHeight)( 0 );
-/*N*/ nUpper = -( (Frm().*fnRect->fnGetHeight)() );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ //Vereinfachung: CntntFrms sind immer in der Hoehe Variabel!
-/*N*/
-/*N*/ //An der FixSize gibt der umgebende Frame die Groesse vor, die
-/*N*/ //Raender werden einfach abgezogen.
-/*N*/ const long nLeft = rAttrs.CalcLeft( this );
-/*N*/ #ifdef BIDI
-/*N*/ const long nRight = ((SwBorderAttrs&)rAttrs).CalcRight( this );
-/*N*/ (this->*fnRect->fnSetXMargins)( nLeft, nRight );
-/*N*/ #else
-/*N*/ (this->*fnRect->fnSetXMargins)( nLeft, rAttrs.CalcRight() );
-/*N*/ #endif
-/*N*/
-/*N*/ ViewShell *pSh = GetShell();
-/*N*/ SwTwips nWidthArea;
-/*N*/ if( pSh && 0!=(nWidthArea=(pSh->VisArea().*fnRect->fnGetWidth)()) &&
-/*N*/ GetUpper()->IsPageBodyFrm() && // nicht dagegen bei BodyFrms in Columns
-/*N*/ pSh->GetDoc()->IsBrowseMode() )
-/*N*/ {
-/*N*/ //Nicht ueber die Kante des sichbaren Bereiches hinausragen.
-/*N*/ //Die Seite kann breiter sein, weil es Objekte mit "ueberbreite"
-/*N*/ //geben kann (RootFrm::ImplCalcBrowseWidth())
-/*N*/ long nMinWidth = 0;
-/*N*/
-/*N*/ for (USHORT i = 0; GetDrawObjs() && i < GetDrawObjs()->Count();++i)
-/*N*/ {
-/*N*/ SdrObject *pObj = (*GetDrawObjs())[i];
-/*N*/ SwFrmFmt *pFmt = ::binfilter::FindFrmFmt( pObj );
-/*N*/ const bool bFly = pObj->IsWriterFlyFrame();
-/*N*/ if ( ( bFly &&
-/*N*/ WEIT_WECH == ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->Frm().Width() ) || (
-/*N*/ pFmt->GetFrmSize().GetWidthPercent() ) )
-/*N*/ continue;
-/*N*/
-/*N*/ if ( FLY_IN_CNTNT == pFmt->GetAnchor().GetAnchorId() )
-/*N*/ nMinWidth = Max( nMinWidth,
-/*N*/ bFly ? pFmt->GetFrmSize().GetWidth()
-/*N*/ : pObj->GetBoundRect().GetWidth() );
-/*N*/ }
-/*N*/
-/*N*/ const Size aBorder = pSh->GetOut()->PixelToLogic( pSh->GetBrowseBorder() );
-/*N*/ long nWidth = nWidthArea - 2 * ( IsVertical() ?
-/*N*/ aBorder.Width() : aBorder.Height() );
-/*N*/ nWidth -= (Prt().*fnRect->fnGetLeft)();
-/*N*/ nWidth -= rAttrs.CalcRightLine();
-/*N*/ nWidth = Max( nMinWidth, nWidth );
-/*N*/ (Prt().*fnRect->fnSetWidth)( Min( nWidth,
-/*N*/ (Prt().*fnRect->fnGetWidth)() ) );
-/*N*/ }
-/*N*/
-/*N*/ if ( (Prt().*fnRect->fnGetWidth)() <= MINLAY )
-/*N*/ {
-/*N*/ //Die PrtArea sollte schon wenigstens MINLAY breit sein, passend
-/*N*/ //zu den Minimalwerten des UI
-/*N*/ (Prt().*fnRect->fnSetWidth)( Min( long(MINLAY),
-/*N*/ (Frm().*fnRect->fnGetWidth)() ) );
-/*N*/ SwTwips nTmp = (Frm().*fnRect->fnGetWidth)() -
-/*N*/ (Prt().*fnRect->fnGetWidth)();
-/*N*/ if( (Prt().*fnRect->fnGetLeft)() > nTmp )
-/*N*/ (Prt().*fnRect->fnSetLeft)( nTmp );
-/*N*/ }
-/*N*/
-/*N*/ //Fuer die VarSize gelten folgende Regeln:
-/*N*/ //1. Der erste einer Kette hat keinen Rand nach oben
-/*N*/ //2. Nach unten gibt es nie einen Rand
-/*N*/ //3. Der Rand nach oben ist das Maximum aus dem Abstand des
-/*N*/ // Prev nach unten und dem eigenen Abstand nach oben.
-/*N*/ //Die drei Regeln werden auf die Berechnung der Freiraeume, die von
-/*N*/ //UL- bzw. LRSpace vorgegeben werden, angewand. Es gibt in alle
-/*N*/ //Richtungen jedoch ggf. trotzdem einen Abstand; dieser wird durch
-/*N*/ //Umrandung und/oder Schatten vorgegeben.
-/*N*/ //4. Der Abstand fuer TextFrms entspricht mindestens dem Durchschuss
-/*N*/
-/*N*/ nUpper = CalcUpperSpace( &rAttrs, NULL );
-/*N*/ // in balanced columned section frames we do not want the
-/*N*/ // common border
-/*N*/ sal_Bool bCommonBorder = sal_True;
-/*N*/ if ( IsInSct() && GetUpper()->IsColBodyFrm() )
-/*N*/ {
-/*N*/ const SwSectionFrm* pSct = FindSctFrm();
-/*N*/ bCommonBorder = pSct->GetFmt()->GetBalancedColumns().GetValue();
-/*N*/ }
-/*N*/ SwTwips nLower = bCommonBorder ?
-/*N*/ rAttrs.GetBottomLine( this ) :
-/*N*/ rAttrs.CalcBottomLine();
-/*N*/
-/*N*/ (Prt().*fnRect->fnSetPosY)( (!bVert || bReverse) ? nUpper : nLower);
-/*N*/ nUpper += nLower;
-/*N*/ nUpper -= (Frm().*fnRect->fnGetHeight)() -
-/*N*/ (Prt().*fnRect->fnGetHeight)();
-/*N*/ }
-/*N*/ //Wenn Unterschiede zwischen Alter und neuer Groesse,
-/*N*/ //Grow() oder Shrink() rufen
-/*N*/ if ( nUpper )
-/*N*/ {
-/*N*/ if ( nUpper > 0 )
-/*N*/ GrowFrm( nUpper );
-/*N*/ else
-/*N*/ ShrinkFrm( -nUpper );
-/*N*/ bSizeChgd = TRUE;
-/*N*/ }
-/*N*/ }
-/*N*/ return bSizeChgd;
-/*N*/ }
+BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
+{
+ BOOL bSizeChgd = FALSE;
+
+ if ( !bValidPrtArea )
+ {
+ bValidPrtArea = TRUE;
+
+ SWRECTFN( this )
+ const bool bTxtFrm = IsTxtFrm();
+ SwTwips nUpper = 0;
+ if ( bTxtFrm && ((SwTxtFrm*)this)->IsHiddenNow() )
+ {
+ if ( ((SwTxtFrm*)this)->HasFollow() )
+ ((SwTxtFrm*)this)->JoinFrm();
+
+ if( (Prt().*fnRect->fnGetHeight)() )
+ ((SwTxtFrm*)this)->HideHidden();
+
+ Prt().Pos().X() = Prt().Pos().Y() = 0;
+ (Prt().*fnRect->fnSetWidth)( (Frm().*fnRect->fnGetWidth)() );
+ (Prt().*fnRect->fnSetHeight)( 0 );
+ nUpper = -( (Frm().*fnRect->fnGetHeight)() );
+ }
+ else
+ {
+ //Vereinfachung: CntntFrms sind immer in der Hoehe Variabel!
+
+ //An der FixSize gibt der umgebende Frame die Groesse vor, die
+ //Raender werden einfach abgezogen.
+ const long nLeft = rAttrs.CalcLeft( this );
+#ifdef BIDI
+ const long nRight = ((SwBorderAttrs&)rAttrs).CalcRight( this );
+ (this->*fnRect->fnSetXMargins)( nLeft, nRight );
+#else
+ (this->*fnRect->fnSetXMargins)( nLeft, rAttrs.CalcRight() );
+#endif
+
+ if ( (Prt().*fnRect->fnGetWidth)() <= MINLAY )
+ {
+ //Die PrtArea sollte schon wenigstens MINLAY breit sein, passend
+ //zu den Minimalwerten des UI
+ (Prt().*fnRect->fnSetWidth)( Min( long(MINLAY), (Frm().*fnRect->fnGetWidth)() ) );
+ SwTwips nTmp = (Frm().*fnRect->fnGetWidth)() - (Prt().*fnRect->fnGetWidth)();
+ if( (Prt().*fnRect->fnGetLeft)() > nTmp )
+ (Prt().*fnRect->fnSetLeft)( nTmp );
+ }
+
+ //Fuer die VarSize gelten folgende Regeln:
+ //1. Der erste einer Kette hat keinen Rand nach oben
+ //2. Nach unten gibt es nie einen Rand
+ //3. Der Rand nach oben ist das Maximum aus dem Abstand des
+ // Prev nach unten und dem eigenen Abstand nach oben.
+ //Die drei Regeln werden auf die Berechnung der Freiraeume, die von
+ //UL- bzw. LRSpace vorgegeben werden, angewand. Es gibt in alle
+ //Richtungen jedoch ggf. trotzdem einen Abstand; dieser wird durch
+ //Umrandung und/oder Schatten vorgegeben.
+ //4. Der Abstand fuer TextFrms entspricht mindestens dem Durchschuss
+
+ nUpper = CalcUpperSpace( &rAttrs, NULL );
+ // in balanced columned section frames we do not want the
+ // common border
+ sal_Bool bCommonBorder = sal_True;
+ if ( IsInSct() && GetUpper()->IsColBodyFrm() )
+ {
+ const SwSectionFrm* pSct = FindSctFrm();
+ bCommonBorder = pSct->GetFmt()->GetBalancedColumns().GetValue();
+ }
+ SwTwips nLower = bCommonBorder ? rAttrs.GetBottomLine( this ) : rAttrs.CalcBottomLine();
+
+ (Prt().*fnRect->fnSetPosY)( (!bVert || bReverse) ? nUpper : nLower);
+ nUpper += nLower;
+ nUpper -= (Frm().*fnRect->fnGetHeight)() - (Prt().*fnRect->fnGetHeight)();
+ }
+ //Wenn Unterschiede zwischen Alter und neuer Groesse,
+ //Grow() oder Shrink() rufen
+ if ( nUpper )
+ {
+ if ( nUpper > 0 )
+ GrowFrm( nUpper );
+ else
+ ShrinkFrm( -nUpper );
+ bSizeChgd = TRUE;
+ }
+ }
+ return bSizeChgd;
+}
/*************************************************************************
|*
diff --git a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
index 0d5a084..10e97d1 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
@@ -63,7 +63,6 @@
#include "txtfrm.hxx"
#include "tabfrm.hxx"
#include "pagedesc.hxx"
-#include "frmsh.hxx"
#include "fmtornt.hxx"
#include "flyfrms.hxx"
#include "sectfrm.hxx"
@@ -512,9 +511,6 @@ namespace binfilter {
/*N*/ OSL_ENSURE( pParent, "Kein Parent uebergeben." );
/*N*/ OSL_ENSURE( rThis.GetUpper(), "Wo kommen wir denn her?" );
/*N*/
-/*N*/ //Sparsamer benachrichtigen wenn eine Action laeuft.
-/*N*/ ViewShell *pSh = rThis.GetShell();
-/*N*/
/*N*/ SwFrm *pPre = rThis.GetIndPrev();
/*N*/ if ( pPre )
/*N*/ {
@@ -561,11 +557,6 @@ namespace binfilter {
/*N*/ if ( pCnt )
/*N*/ pCnt->InvalidatePage( pPage );
/*N*/ }
-/*N*/ else if ( pSh && pSh->GetDoc()->GetLineNumberInfo().IsRestartEachPage()
-/*N*/ && pPage->FindFirstBodyCntnt() == &rThis )
-/*N*/ {
-/*?*/ rThis._InvalidateLineNum();
-/*N*/ }
/*N*/ }
/*N*/ if ( bInvaLay || (pSibling && pSibling->IsLayoutFrm()) )
/*N*/ rThis.GetUpper()->InvalidatePage( pPage );
@@ -1491,9 +1482,6 @@ namespace binfilter {
/*N*/ rThis.Prepare( PREP_BOSS_CHGD, 0, FALSE );
/*N*/ if( !bSamePage )
/*N*/ {
-/*N*/ ViewShell *pSh = rThis.GetShell();
-/*N*/ if ( pSh )
-/*N*/ pSh->GetDoc()->SetNewFldLst(); //Wird von CalcLayout() hinterher erledigt!
/*N*/ pNewPage->InvalidateSpelling();
/*N*/ pNewPage->InvalidateAutoCompleteWords();
/*N*/ }
@@ -1790,9 +1778,6 @@ namespace binfilter {
/*N*/ if( pNewPage != pOldPage )
/*N*/ {
/*N*/ rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, FALSE );
-/*N*/ ViewShell *pSh = rThis.GetShell();
-/*N*/ if ( pSh )
-/*N*/ pSh->GetDoc()->SetNewFldLst(); //Wird von CalcLayout() hinterher eledigt!
/*N*/ pNewPage->InvalidateSpelling();
/*N*/ pNewPage->InvalidateAutoCompleteWords();
/*N*/ // no <CheckPageDesc(..)> in online layout
diff --git a/binfilter/bf_sw/source/core/layout/sw_fly.cxx b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
index 43e69d6..0135dab 100644
--- a/binfilter/bf_sw/source/core/layout/sw_fly.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
@@ -63,7 +63,6 @@
#include "frmtool.hxx"
#include "frmfmt.hxx"
#include "hints.hxx"
-#include "frmsh.hxx"
#include "tabfrm.hxx"
#include "txtfrm.hxx"
#include "ndnotxt.hxx"
@@ -296,24 +295,6 @@ namespace binfilter {
/*N*/ if ( !pDrawObj )
/*?*/ return;
/*N*/
-/*N*/ //Bei den SdrPageViews abmelden falls das Objekt dort noch selektiert ist.
-/*N*/ if ( !GetFmt()->GetDoc()->IsInDtor() )
-/*N*/ {
-/*N*/ ViewShell *p1St = GetShell();
-/*N*/ if ( p1St )
-/*N*/ {
-/*N*/ ViewShell *pSh = p1St;
-/*N*/ do
-/*N*/ { //z.Zt. kann das Drawing nur ein Unmark auf alles, weil das
-/*N*/ //Objekt bereits Removed wurde.
-/*N*/ if( pSh->HasDrawView() )
-/*N*/ pSh->Imp()->GetDrawView()->UnmarkAll();
-/*N*/ pSh = (ViewShell*)pSh->GetNext();
-/*N*/
-/*N*/ } while ( pSh != p1St );
-/*N*/ }
-/*N*/ }
-/*N*/
/*N*/ //VirtObject mit in das Grab nehmen. Wenn das letzte VirObject
/*N*/ //zerstoert wird, mussen das DrawObject und DrawContact ebenfalls
/*N*/ //zerstoert werden.
@@ -342,30 +323,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* SwFlyFrm::ChainFrames()
-|*
-|*************************************************************************/
-
-
-
-/*************************************************************************
-|*
-|* SwFlyFrm::FindChainNeighbour()
-|*
-|*************************************************************************/
-
-
-
-/*************************************************************************
-|*
-|* SwFlyFrm::FindLastLower()
-|*
-|*************************************************************************/
-
-
-
-/*************************************************************************
-|*
|* SwFlyFrm::FrmSizeChg()
|*
|*************************************************************************/
@@ -472,7 +429,6 @@ namespace binfilter {
/*M*/ {
/*M*/ BOOL bClear = TRUE;
/*M*/ const USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
-/*M*/ GetShell();
/*M*/ switch( nWhich )
/*M*/ {
/*M*/ case RES_VERT_ORIENT:
@@ -1820,34 +1776,17 @@ void SwFrm::CalcFlys( BOOL bPosOnly )
/*N*/ if( pRel ) // LAYER_IMPL
/*N*/ {
/*N*/ long nRelWidth = LONG_MAX, nRelHeight = LONG_MAX;
-/*N*/ const ViewShell *pSh = GetShell();
-/*N*/ if ( ( pRel->IsBodyFrm() || pRel->IsPageFrm() ) &&
-/*N*/ GetFmt()->GetDoc()->IsBrowseMode() &&
-/*N*/ pSh && pSh->VisArea().HasArea() )
-/*N*/ {
-/*?*/ nRelWidth = pSh->VisArea().Width();
-/*?*/ nRelHeight = pSh->VisArea().Height();
-/*?*/ const Size aBorder = pSh->GetOut()->PixelToLogic( pSh->GetBrowseBorder() );
-/*?*/ nRelWidth -= 2*aBorder.Width();
-/*?*/ long nDiff = nRelWidth - pRel->Prt().Width();
-/*?*/ if ( nDiff > 0 )
-/*?*/ nRelWidth -= nDiff;
-/*?*/ nRelHeight -= 2*aBorder.Height();
-/*?*/ nDiff = nRelHeight - pRel->Prt().Height();
-/*?*/ if ( nDiff > 0 )
-/*?*/ nRelHeight -= nDiff;
-/*N*/ }
/*N*/ nRelWidth = Min( nRelWidth, pRel->Prt().Width() );
/*N*/ nRelHeight = Min( nRelHeight, pRel->Prt().Height() );
-/*N*/ if( !pRel->IsPageFrm() )
-/*N*/ {
-/*N*/ const SwPageFrm* pPage = FindPageFrm();
-/*N*/ if( pPage )
-/*N*/ {
-/*N*/ nRelWidth = Min( nRelWidth, pPage->Prt().Width() );
-/*N*/ nRelHeight = Min( nRelHeight, pPage->Prt().Height() );
-/*N*/ }
-/*N*/ }
+/*N*/ if( !pRel->IsPageFrm() )
+/*N*/ {
+/*N*/ const SwPageFrm* pPage = FindPageFrm();
+/*N*/ if( pPage )
+/*N*/ {
+/*N*/ nRelWidth = Min( nRelWidth, pPage->Prt().Width() );
+/*N*/ nRelHeight = Min( nRelHeight, pPage->Prt().Height() );
+/*N*/ }
+/*N*/ }
/*N*/
/*N*/ if ( rSz.GetWidthPercent() && rSz.GetWidthPercent() != 0xFF )
/*N*/ aRet.Width() = nRelWidth * rSz.GetWidthPercent() / 100;
diff --git a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
index 50dc54c..091b17a 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
@@ -53,12 +53,10 @@
#include <fmtanchr.hxx>
#include <fmtornt.hxx>
#include <fmtfsize.hxx>
+#include "rootfrm.hxx"
#include "tabfrm.hxx"
#include "flyfrms.hxx"
-#ifdef ACCESSIBLE_LAYOUT
-#include <frmsh.hxx>
-#endif
namespace binfilter {
/*************************************************************************
diff --git a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
index 3eea01d..600b621 100644
--- a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
@@ -73,7 +73,6 @@
#include "txtfrm.hxx"
#include "notxtfrm.hxx"
#include "flyfrms.hxx"
-#include "frmsh.hxx"
#include "pagedesc.hxx"
#include "section.hxx"
#include "sectfrm.hxx"
@@ -683,19 +682,6 @@ namespace binfilter {
/*N*/ pCnt->SetCompletePaint();
/*N*/
/*N*/
-/*N*/ //Wenn sich meine PrtArea in der Fix-Size geaendert hat, so muss mein
-/*N*/ //Nachfolger dazu angeregt werden sich auch neu zu Formatieren.
-/*N*/
-/*N*/ //MA: Ist das wirklich noetig? Auf keinen Fall sollte das doch notwendig sein,
-/*N*/ //wenn der Frm das erste Mal formatiert wurde (alte PrtArea == 0).
-/* if ( pCnt->GetNext() &&
- pCnt->Prt().Width() != aPrt.Width() )
- {
- pCnt->GetNext()->Prepare( PREP_FIXSIZE_CHG );
- pCnt->GetNext()->_InvalidatePrt();
- pCnt->GetNext()->InvalidateSize();
- }
-*/
/*N*/ SWRECTFN( pCnt )
/*N*/ if ( pCnt->IsInTab() && ( POS_DIFF( pCnt->Frm(), aFrm ) ||
/*N*/ pCnt->Frm().SSize() != aFrm.SSize()))
@@ -708,67 +694,7 @@ namespace binfilter {
/*N*/ pCell->InvalidatePrt(); //fuer vertikale Ausrichtung.
/*N*/ }
/*N*/
-/*N*/ bool bFirst = (aFrm.*fnRect->fnGetWidth)() == 0;
-/*N*/
-/*N*/ if ( pCnt->IsNoTxtFrm() )
-/*N*/ {
-/*N*/ //Aktive PlugIn's oder OLE-Objekte sollten etwas von der Veraenderung
-/*N*/ //mitbekommen, damit sie Ihr Window entsprechend verschieben.
-/*N*/ ViewShell *pSh = pCnt->GetShell();
-/*N*/ if ( pSh )
-/*N*/ {
-/*N*/ SwOLENode *pNd;
-/*N*/ if ( 0 != (pNd = pCnt->GetNode()->GetOLENode()) &&
-/*N*/ (pNd->GetOLEObj().IsOleRef() ||
-/*N*/ pNd->IsOLESizeInvalid()) )
-/*N*/ {
-/*N*/ OSL_ENSURE( pCnt->IsInFly(), "OLE not in FlyFrm" );
-/*N*/ SwFlyFrm *pFly = pCnt->FindFlyFrm();
-/*N*/ SvEmbeddedObjectRef xObj( (SvInPlaceObject*) pNd->GetOLEObj().GetOleRef() );
-/*N*/ SwFEShell *pFESh = 0;
-/*N*/ ViewShell *pTmp = pSh;
-/*N*/ do
-/*N*/ { if ( pTmp->ISA( SwCrsrShell ) )
-/*N*/ {
-/*N*/ pFESh = (SwFEShell*)pTmp;
- // #108369#: Here used to be the condition if (!bFirst).
- // I think this should mean "do not call CalcAndSetScale"
- // if the frame is formatted for the first time.
- // Unfortunately this is not valid anymore since the
- // SwNoTxtFrm already gets a width during CalcLowerPreps.
- // Nevertheless, the indention of !bFirst seemed to be
- // to assure that the OLE objects have already been notified
- // if necessary before calling CalcAndSetScale.
- // So I replaced !bFirst by !IsOLESizeInvalid. There is
- // one additional problem specific to the word import:
- // The layout is calculated _before_ calling PrtOLENotify,
- // and the OLE objects are not invalidated during import.
- // Therefore I added the condition !IsUpdateExpFld,
- // have a look at the occurrence of CalcLayout in
- // uiview/view.cxx.
-/*N*/ if ( !pNd->IsOLESizeInvalid() &&
-/*N*/ !pSh->GetDoc()->IsUpdateExpFld() )
-/*N*/ pFESh->CalcAndSetScale( xObj, &pFly->Prt(), &pFly->Frm());
-/*N*/ }
-/*N*/ pTmp = (ViewShell*)pTmp->GetNext();
-/*N*/ } while ( pTmp != pSh );
-/*N*/
-/*N*/ if ( pFESh && pNd->IsOLESizeInvalid() )
-/*N*/ {
-/*N*/ pNd->SetOLESizeInvalid( FALSE );
-/*N*/ xObj->OnDocumentPrinterChanged( pNd->GetDoc()->GetPrt() );
-/*N*/ pFESh->CalcAndSetScale( xObj );//Client erzeugen lassen.
-/*N*/ }
-/*N*/ }
-/*N*/ //dito Animierte Grafiken
-/*N*/ if ( Frm().HasArea() && ((SwNoTxtFrm*)pCnt)->HasAnimation() )
-/*N*/ {
-/*?*/ ((SwNoTxtFrm*)pCnt)->StopAnimation();
-/*?*/ pSh->InvalidateWindows( Frm() );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
+/*N*/ bool bFirst = (aFrm.*fnRect->fnGetWidth)() == 0;
/*N*/ if ( bFirst )
/*N*/ {
/*N*/ pCnt->SetRetouche(); //fix(13870)
@@ -2302,15 +2228,7 @@ void SwBorderAttrs::_GetBottomLine( const SwFrm *pFrm )
/*N*/ pFly->NotifyBackground( pFly->FindPageFrm(), aFrm, PREP_FLY_ARRIVE );
/*N*/ }
/*N*/ else if ( rOld.SSize() != aFrm.SSize() )
-/*N*/ { //Groessenaenderung, den Bereich der Verlassen wurde bzw. jetzt
-/*N*/ //ueberdeckt wird invalidieren.
-/*N*/ //Der Einfachheit halber wird hier bewusst jeweils ein Twip
-/*N*/ //unnoetig invalidiert.
-/*N*/
-/*N*/ ViewShell *pSh = pFly->GetShell();
-/*N*/ if( pSh && rOld.HasArea() )
-/*N*/ pSh->InvalidateWindows( rOld );
-/*N*/
+/*N*/ {
/*N*/ if ( rOld.Left() != aFrm.Left() )
/*?*/ { SwRect aTmp( rOld );
/*?*/ aTmp.Union( aFrm );
@@ -2568,10 +2486,6 @@ void SwBorderAttrs::_GetBottomLine( const SwFrm *pFrm )
/*N*/ }
/*N*/ if ( pFlyFrm && pAnchor->GetUpper() && pAnchor->IsInTab() )//MA_FLY_HEIGHT
/*N*/ pAnchor->GetUpper()->InvalidateSize();
-/*N*/
-/*N*/ ViewShell *pSh;
-/*N*/ if( bInva && 0 != (pSh = pPage->GetShell()) )
-/*N*/ pSh->InvalidateWindows( rRect );
/*N*/ }
/*N*/ #ifdef _MSC_VER
diff --git a/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx b/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx
index ea29579..a911acf 100644
--- a/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx
@@ -48,7 +48,6 @@
#include "frmtool.hxx"
#include "dflyobj.hxx"
#include "frmfmt.hxx"
-#include "frmsh.hxx"
#include "ndindex.hxx"
#include "hfspacingitem.hxx"
namespace binfilter {
@@ -758,10 +757,6 @@ namespace binfilter {
/*N*/ else if ( pLay && pLay->IsFooterFrm() )
/*N*/ { //Footer entfernen falls vorhanden.
/*N*/ ::binfilter::DelFlys( pLay, this );
-/*N*/ ViewShell *pSh;
-/*N*/ if ( pLay->GetPrev() && 0 != (pSh = GetShell()) &&
-/*N*/ pSh->VisArea().HasArea() )
-/*?*/ pSh->InvalidateWindows( pSh->VisArea() );
/*N*/ pLay->Cut();
/*N*/ delete pLay;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
index 85453d5..0c528bb 100644
--- a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
@@ -57,12 +57,12 @@
#include "hints.hxx"
#include "ftnidx.hxx"
+#include "rootfrm.hxx"
#include "bodyfrm.hxx"
#include "ftnfrm.hxx"
#include "tabfrm.hxx"
#include "txtfrm.hxx"
#include "flyfrms.hxx"
-#include "frmsh.hxx"
#include "pagedesc.hxx"
#include <bf_svx/frmdiritem.hxx>
namespace binfilter {
@@ -188,10 +188,7 @@ namespace binfilter {
/*N*/ if ( pDoc->IsBrowseMode() )
/*N*/ {
/*N*/ Frm().Height( 0 );
-/*N*/ ViewShell *pSh = GetShell();
-/*N*/ long nWidth = pSh ? pSh->VisArea().Width():0;
-/*N*/ if ( !nWidth )
-/*N*/ nWidth = 5000L; //aendert sich sowieso
+/*N*/ long nWidth = 5000L; //aendert sich sowieso
/*N*/ Frm().Width ( nWidth );
/*N*/ }
/*N*/ else
@@ -264,21 +261,6 @@ namespace binfilter {
/*N*/ delete pSortedObjs;
/*N*/ pSortedObjs = 0; //Auf 0 setzen, sonst rauchts beim Abmdelden von Flys!
/*N*/ }
-/*N*/
-/*N*/ //Damit der Zugriff auf zerstoerte Seiten verhindert werden kann.
-/*N*/ if ( !IsEmptyPage() ) //#59184# sollte fuer Leerseiten unnoetig sein.
-/*N*/ {
-/*N*/ SwDoc *pDoc = GetFmt()->GetDoc();
-/*N*/ if( pDoc && !pDoc->IsInDtor() )
-/*N*/ {
-/*N*/ ViewShell *pSh = GetShell();
-/*N*/ if ( pSh )
-/*N*/ {
-/*N*/ SwViewImp *pImp = pSh->Imp();
-/*N*/ pImp->SetFirstVisPageInvalid();
-/*N*/ }
-/*N*/ }
-/*N*/ }
/*N*/ }
@@ -493,9 +475,6 @@ namespace binfilter {
|*************************************************************************/
/*N*/ void SwPageFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew )
/*N*/ {
-/*N*/ ViewShell *pSh = GetShell();
-/*N*/ if ( pSh )
-/*N*/ pSh->SetFirstVisPageInvalid();
/*N*/ BYTE nInvFlags = 0;
/*N*/
/*N*/ if( pNew && RES_ATTRSET_CHG == pNew->Which() )
@@ -872,9 +851,8 @@ namespace binfilter {
/*N*/ void SwPageFrm::Cut()
/*N*/ {
-/*N*/ AdjustRootSize( CHG_CUTPAGE, 0 );
+/*N*/ AdjustRootSize( CHG_CUTPAGE, 0 );
/*N*/
-/*N*/ ViewShell *pSh = GetShell();
/*N*/ if ( !IsEmptyPage() )
/*N*/ {
/*N*/ if ( GetNext() )
@@ -904,9 +882,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/ //Window aufraeumen
-/*N*/ if ( pSh && pSh->GetWin() )
-/*N*/ pSh->InvalidateWindows( Frm() );
/*N*/ }
/*N*/
/*N*/ // die Seitennummer der Root runterzaehlen.
@@ -922,8 +897,6 @@ namespace binfilter {
/*N*/
/*N*/ // Alle Verbindungen kappen.
/*N*/ Remove();
-/*N*/ if ( pSh )
-/*N*/ pSh->SetFirstVisPageInvalid();
/*N*/ }
/*************************************************************************
@@ -964,11 +937,7 @@ namespace binfilter {
/*N*/ _InvalidateSize();
/*N*/ InvalidatePos();
/*N*/
-/*N*/ AdjustRootSize( CHG_NEWPAGE, 0 );
-/*N*/
-/*N*/ ViewShell *pSh = GetShell();
-/*N*/ if ( pSh )
-/*N*/ pSh->SetFirstVisPageInvalid();
+/*N*/ AdjustRootSize( CHG_NEWPAGE, 0 );
/*N*/ }
/*************************************************************************
diff --git a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
index 088224f..0aa7881 100644
--- a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
@@ -52,7 +52,6 @@
#include "flyfrm.hxx" // SwFlyFrm
#include "ftnfrm.hxx" // SwFtnFrm
#include "dbg_lay.hxx"
-#include "frmsh.hxx"
#include <bf_svx/lrspitem.hxx>
#include <bf_svx/brshitem.hxx>
#include <fmtftntx.hxx>
diff --git a/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx
index 0d0b69b..5766b02 100644
--- a/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx
@@ -53,7 +53,6 @@
#include <bf_svx/boxitem.hxx>
#include <bf_svx/shaditem.hxx>
#include <viewsh.hxx>
-#include <frmsh.hxx>
namespace binfilter {
// No inline cause we need the function pointers
diff --git a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
index 4807154..4cc0e00 100644
--- a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
@@ -66,7 +66,6 @@
#include "flyfrms.hxx"
#include "txtfrm.hxx" //HasFtn()
#include "htmltbl.hxx"
-#include "frmsh.hxx"
#include "sectfrm.hxx" //SwSectionFrm
namespace binfilter {
@@ -949,9 +948,6 @@ namespace binfilter {
/*N*/ }
/*N*/ else if ( GetFollow() == GetNext() )
/*N*/ ((SwTabFrm*)GetFollow())->MoveFwd( TRUE, FALSE );
-/*N*/ ViewShell *pSh;
-/*N*/ if ( 0 != (pSh = GetShell()) )
-/*N*/ pSh->Imp()->ResetScroll();
/*N*/ }
/*N*/ continue;
/*N*/ }
@@ -1317,21 +1313,6 @@ namespace binfilter {
/*N*/ else
/*N*/ (this->*fnRect->fnSetXMargins)( nLeftSpacing, nRightSpacing );
/*N*/
-/*N*/ ViewShell *pSh;
-/*N*/ if ( bCheckBrowseWidth && GetFmt()->GetDoc()->IsBrowseMode() &&
-/*N*/ GetUpper()->IsPageBodyFrm() && // nur PageBodyFrms, nicht etwa ColBodyFrms
-/*N*/ 0 != (pSh = GetShell()) && pSh->VisArea().Width() )
-/*N*/ {
-/*N*/ //Nicht ueber die Kante des sichbaren Bereiches hinausragen.
-/*N*/ //Die Seite kann breiter sein, weil es Objekte mit "ueberbreite"
-/*N*/ //geben kann (RootFrm::ImplCalcBrowseWidth())
-/*N*/ const Size aBorder = pSh->GetOut()->PixelToLogic( pSh->GetBrowseBorder() );
-/*N*/ long nWidth = pSh->VisArea().Width() - 2 * aBorder.Width();
-/*N*/ nWidth -= Prt().Left();
-/*N*/ nWidth -= pAttrs->CalcRightLine();
-/*N*/ Prt().Width( Min( nWidth, Prt().Width() ) );
-/*N*/ }
-/*N*/
/*N*/ if ( nOldHeight != (Prt().*fnRect->fnGetHeight)() )
/*N*/ bValidSize = FALSE;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx
index cfdcd04..d7c1a57 100644
--- a/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx
@@ -53,7 +53,7 @@
#include <crstate.hxx>
#include <frmtool.hxx>
#include <hints.hxx>
-#include <frmsh.hxx>
+
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
index 2547d6e..27c7e8f 100644
--- a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
@@ -39,6 +39,7 @@
#include <horiornt.hxx>
+#include <rootfrm.hxx>
#include <fmtornt.hxx>
#include <pagefrm.hxx>
#include <section.hxx>
@@ -60,7 +61,6 @@
#include <ftnfrm.hxx>
#include <tabfrm.hxx>
#include <flyfrms.hxx>
-#include <frmsh.hxx>
#include <sectfrm.hxx>
#include <fmtclds.hxx>
#include <txtfrm.hxx>
@@ -1020,17 +1020,11 @@ namespace binfilter {
/*N*/ long nBrowseAdd = 0;
/*N*/ if ( bBrowse && GetUpper()->IsPageFrm() ) // nur (Page)BodyFrms
/*N*/ {
-/*N*/ ViewShell *pSh = GetShell();
/*N*/ SwLayoutFrm *pUp = GetUpper();
/*N*/ long nChg;
/*N*/ const long nUpPrtBottom = pUp->Frm().Height() -
/*N*/ pUp->Prt().Height() - pUp->Prt().Top();
/*N*/ SwRect aInva( pUp->Frm() );
-/*N*/ if ( pSh )
-/*N*/ {
-/*N*/ aInva.Pos().X() = pSh->VisArea().Left();
-/*N*/ aInva.Width( pSh->VisArea().Width() );
-/*N*/ }
/*N*/ if ( nDiff > 0 )
/*N*/ {
/*N*/ nChg = BROWSE_HEIGHT - pUp->Frm().Height();
@@ -1039,7 +1033,6 @@ namespace binfilter {
/*N*/ if ( !IsBodyFrm() )
/*N*/ {
/*?*/ SetCompletePaint();
-/*?*/ if ( !pSh || pSh->VisArea().Height() >= pUp->Frm().Height() )
/*?*/ {
/*?*/ //Ersteinmal den Body verkleinern. Der waechst dann schon
/*?*/ //wieder.
@@ -1069,14 +1062,6 @@ namespace binfilter {
/*N*/ //mindestens so gross wie die VisArea.
/*N*/ nChg = nDiff;
/*N*/ long nInvaAdd = 0;
-/*N*/ if ( pSh && !pUp->GetPrev() &&
-/*N*/ pUp->Frm().Height() + nDiff < pSh->VisArea().Height() )
-/*N*/ {
-/*?*/ //Das heisst aber wiederum trotzdem, das wir geeignet invalidieren
-/*?*/ //muessen.
-/*?*/ nChg = pSh->VisArea().Height() - pUp->Frm().Height();
-/*?*/ nInvaAdd = -(nDiff - nChg);
-/*N*/ }
/*N*/
/*N*/ //Invalidieren inklusive unterem Rand.
/*N*/ long nBorder = nUpPrtBottom + 20;
@@ -1094,28 +1079,15 @@ namespace binfilter {
/*N*/ //(NotifyFlys).
/*N*/ pUp->InvalidateSize();
/*N*/ }
-/*N*/ if ( !bTst )
-/*N*/ {
-/*N*/ //Unabhaengig von nChg
-/*N*/ if ( pSh && aInva.HasArea() && pUp->GetUpper() )
-/*?*/ pSh->InvalidateWindows( aInva );
-/*N*/ }
/*N*/ if ( !bTst && nChg )
/*N*/ {
/*N*/ const SwRect aOldRect( pUp->Frm() );
/*N*/ pUp->Frm().SSize().Height() += nChg;
/*N*/ pUp->Prt().SSize().Height() += nChg;
-/*N*/ if ( pSh )
-/*N*/ pSh->Imp()->SetFirstVisPageInvalid();
/*N*/
/*N*/ if ( GetNext() )
/*?*/ GetNext()->_InvalidatePos();
/*N*/
-/*N*/ //Ggf. noch ein Repaint ausloesen.
-/*N*/ const SvxGraphicPosition ePos = pUp->GetFmt()->GetBackground().GetGraphicPos();
-/*N*/ if ( ePos != GPOS_NONE && ePos != GPOS_TILED )
-/*?*/ pSh->InvalidateWindows( pUp->Frm() );
-/*N*/
/*N*/ if ( pUp->GetUpper() )
/*N*/ {
/*N*/ if ( pUp->GetNext() )
@@ -2676,17 +2648,6 @@ namespace binfilter {
/*N*/ {
/*?*/ const SwFrm *pRel = GetUpper();
/*?*/ long nRel = LONG_MAX;
-/*?*/ const ViewShell *pSh = GetShell();
-/*?*/ if ( pRel->IsPageBodyFrm() && GetFmt()->GetDoc()->IsBrowseMode() &&
-/*?*/ pSh && pSh->VisArea().Width())
-/*?*/ {
-/*?*/ nRel = pSh->VisArea().Width();
-/*?*/ const Size aBorder = pSh->GetOut()->PixelToLogic( pSh->GetBrowseBorder() );
-/*?*/ nRel -= 2*aBorder.Width();
-/*?*/ long nDiff = nRel - pRel->Prt().Width();
-/*?*/ if ( nDiff > 0 )
-/*?*/ nRel -= nDiff;
-/*?*/ }
/*?*/ nRel = Min( nRel, pRel->Prt().Width() );
/*?*/ nRet = nRel * nPercent / 100;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index 82d9088..d0162d3 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -48,7 +48,6 @@
#include <viewsh.hxx> // ViewShell
#include <frmatr.hxx>
#include <flyfrms.hxx>
-#include <frmsh.hxx>
#include <txtcfg.hxx>
#include <itrform2.hxx> // SwTxtFormatter
#include <widorp.hxx> // Widows and Orphans
@@ -1198,12 +1197,7 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ }
/*N*/ SwTwips nRght = Max( nOldWidth, pNew->Width() +
/*N*/ pNew->GetHangingMargin() );
-/*N*/ ViewShell *pSh = GetShell();
-/*N*/ const SwViewOption *pOpt = pSh ? pSh->GetViewOptions() : 0;
-/*N*/ if( pOpt && (pOpt->IsParagraph() || pOpt->IsLineBreak()) )
-/*?*/ nRght += ( Max( nOldAscent, pNew->GetAscent() ) );
-/*N*/ else
-/*N*/ nRght += ( Max( nOldAscent, pNew->GetAscent() ) / 4);
+/*N*/ nRght += ( Max( nOldAscent, pNew->GetAscent() ) / 4);
/*N*/ nRght += rLine.GetLeftMargin();
/*N*/ if( rRepaint.GetOfst() || rRepaint.GetRightOfst() < nRght )
/*N*/ rRepaint.SetRightOfst( nRght );
diff --git a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
index 7769ab9..3b07675 100644
--- a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
@@ -58,7 +58,6 @@
#include <inftxt.hxx> // SwTxtInfo
#include <noteurl.hxx> // SwNoteURL
#include <porftn.hxx> // SwFtnPortion
-#include <frmsh.hxx>
#include <itratr.hxx>
namespace binfilter {
@@ -184,26 +183,17 @@ extern const sal_Char sBulletFntName[];
/*N*/ pFrm = pFrame;
/*N*/ SwTxtInfo::CtorInit( pFrm );
/*N*/ const SwTxtNode *pNd = pFrm->GetTxtNode();
-/*N*/ pVsh = pFrm->GetShell();
+/*N*/ pVsh = NULL;
/*N*/
-/*N*/ // Get the output and reference device
-/*N*/ if ( pVsh )
-/*N*/ {
-/*N*/ pOut = pVsh->GetOut();
-/*N*/ pRef = &pVsh->GetRefDev();
-/*N*/ bOnWin = pVsh->GetWin() || OUTDEV_WINDOW == pOut->GetOutDevType();
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ //Zugriff ueber StarONE, es muss keine Shell existieren oder aktiv sein.
-/*N*/ if ( pNd->GetDoc()->IsBrowseMode() ) //?!?!?!?
-/*N*/ //in Ermangelung eines Besseren kann hier ja wohl nur noch das
-/*N*/ //AppWin genommen werden?
-/*N*/ pOut = GetpApp()->GetDefaultDevice();
-/*N*/ else
-/*N*/ pOut = pNd->GetDoc()->GetPrt(); //Muss es geben (oder sal_True uebergeben?)
-/*N*/ pRef = pOut;
-/*N*/ }
+/*N*/ //Zugriff ueber StarONE, es muss keine Shell existieren oder aktiv sein.
+/*N*/ if ( pNd->GetDoc()->IsBrowseMode() ) //?!?!?!?
+/*N*/ //in Ermangelung eines Besseren kann hier ja wohl nur noch das
+/*N*/ //AppWin genommen werden?
+/*N*/ pOut = GetpApp()->GetDefaultDevice();
+/*N*/ else
+/*N*/ pOut = pNd->GetDoc()->GetPrt(); //Muss es geben (oder sal_True uebergeben?)
+
+/*N*/ pRef = pOut;
/*N*/
/*N*/ #ifdef DBG_UTIL
/*N*/ ChkOutDev( *this );
@@ -238,9 +228,7 @@ extern const sal_Char sBulletFntName[];
/*N*/ //
/*N*/ // The Options
/*N*/ //
-/*N*/ pOpt = pVsh ?
-/*N*/ pVsh->GetViewOptions() :
-/*N*/ SW_MOD()->GetViewOption(pNd->GetDoc()->IsHTMLMode()); //Options vom Module wg. StarONE
+/*N*/ pOpt = SW_MOD()->GetViewOption(pNd->GetDoc()->IsHTMLMode()); //Options vom Module wg. StarONE
/*N*/
/*N*/ // bURLNotify wird gesetzt, wenn MakeGraphic dies vorbereitet
/*N*/ // TODO: Aufdröseln
diff --git a/binfilter/bf_sw/source/core/text/sw_porrst.cxx b/binfilter/bf_sw/source/core/text/sw_porrst.cxx
index 029442b..cce87c1 100644
--- a/binfilter/bf_sw/source/core/text/sw_porrst.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porrst.cxx
@@ -51,7 +51,6 @@
#include <inftxt.hxx>
#include <tgrditem.hxx>
#include <pagedesc.hxx> // SwPageDesc
-#include <frmsh.hxx>
#include <frmatr.hxx>
#include <atrhndl.hxx>
namespace binfilter {
@@ -150,7 +149,6 @@ namespace binfilter {
/*N*/
/*N*/ SwFont *pFnt;
/*N*/ const SwTxtNode& rTxtNode = *GetTxtNode();
-/*N*/ ViewShell *pSh = GetShell();
/*N*/ if ( rTxtNode.HasSwAttrSet() )
/*N*/ {
/*N*/ const SwAttrSet *pAttrSet = &( rTxtNode.GetSwAttrSet() );
@@ -158,30 +156,16 @@ namespace binfilter {
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ SwFontAccess aFontAccess( &rTxtNode.GetAnyFmtColl(), pSh);
+/*N*/ SwFontAccess aFontAccess( &rTxtNode.GetAnyFmtColl(), NULL);
/*N*/ pFnt = new SwFont( *aFontAccess.Get()->GetFont() );
-/*N*/ pFnt->ChkMagic( pSh, pFnt->GetActual() );
+/*N*/ pFnt->ChkMagic( NULL, pFnt->GetActual() );
/*N*/ }
/*N*/
/*N*/ if ( IsVertical() )
/*?*/ pFnt->SetVertical( 2700 );
/*N*/
-/*N*/ OutputDevice *pOut = pSh ? pSh->GetOut() : 0;
-/*N*/ if ( !pOut || !rTxtNode.GetDoc()->IsBrowseMode() ||
-/*N*/ ( pSh->GetViewOptions()->IsPrtFormat() ) )
-/*N*/ {
-/*N*/ pOut = &rTxtNode.GetDoc()->GetRefDev();
-/*N*/ }
-/*N*/
-/*N*/ const SwDoc* pDoc = rTxtNode.GetDoc();
- /*N*/ if( ::binfilter::IsShowChanges( pDoc->GetRedlineMode() ) )
-/*N*/ {
-/*N*/ MSHORT nRedlPos = pDoc->GetRedlinePos( rTxtNode );
-/*N*/ if( MSHRT_MAX != nRedlPos )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
+/*N*/ OutputDevice *pOut = NULL;
+/*N*/ pOut = &rTxtNode.GetDoc()->GetRefDev();
/*N*/
/*N*/ SwTwips nRet;
/*N*/ if( !pOut )
@@ -191,8 +175,8 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*N*/ pFnt->SetFntChg( sal_True );
-/*N*/ pFnt->ChgPhysFnt( pSh, pOut );
-/*N*/ nRet = pFnt->GetHeight( pSh, pOut );
+/*N*/ pFnt->ChgPhysFnt( NULL, pOut );
+/*N*/ nRet = pFnt->GetHeight( NULL, pOut );
/*N*/ }
/*N*/ delete pFnt;
/*N*/ return nRet;
@@ -305,21 +289,17 @@ namespace binfilter {
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ ViewShell *pSh = GetShell();
-/*N*/ SwFontAccess aFontAccess( pFmt, pSh );
+/*N*/ SwFontAccess aFontAccess( pFmt, NULL );
/*N*/ SwFont aFnt( *aFontAccess.Get()->GetFont() );
/*N*/ OutputDevice *pOut = 0;
-/*N*/ if( !GetTxtNode()->GetDoc()->IsBrowseMode() ||
-/*N*/ (pSh && pSh->GetViewOptions()->IsPrtFormat()) )
+/*N*/ if( !GetTxtNode()->GetDoc()->IsBrowseMode() )
/*N*/ pOut = &GetTxtNode()->GetDoc()->GetRefDev();
-/*N*/ if( pSh && !pOut )
-/*?*/ pOut = pSh->GetWin();
/*N*/ if( !pOut )
/*?*/ pOut = GetpApp()->GetDefaultDevice();
/*N*/ MapMode aOldMap( pOut->GetMapMode() );
/*N*/ pOut->SetMapMode( MapMode( MAP_TWIP ) );
-/*N*/ aFnt.ChgFnt( pSh, pOut );
-/*N*/ rRegDiff = aFnt.GetHeight( pSh, pOut );
+/*N*/ aFnt.ChgFnt( NULL, pOut );
+/*N*/ rRegDiff = aFnt.GetHeight( NULL, pOut );
/*N*/ KSHORT nNettoHeight = rRegDiff;
/*N*/ switch( rSpace.GetLineSpaceRule() )
/*N*/ {
@@ -361,7 +341,7 @@ namespace binfilter {
/*N*/ }
/*N*/ pDesc->SetRegHeight( rRegDiff );
/*N*/ pDesc->SetRegAscent( rRegDiff - nNettoHeight +
-/*N*/ aFnt.GetAscent( pSh, pOut ) );
+/*N*/ aFnt.GetAscent( NULL, pOut ) );
/*N*/ pOut->SetMapMode( aOldMap );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx b/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx
index 0a4a8b9..a2e2e07 100644
--- a/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx
@@ -43,7 +43,6 @@
#include <horiornt.hxx>
#include <doc.hxx> // SwDoc
-#include <frmsh.hxx>
#include <breakit.hxx>
//////////////////////////
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx b/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
index 098e6af..5833941 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
@@ -65,7 +65,6 @@
#include <widorp.hxx> // SwFrmBreak
#include <txtcache.hxx>
#include <fntcache.hxx> // GetLineSpace benutzt pLastFont
-#include <frmsh.hxx>
#include <wrong.hxx> // SwWrongList
#include <lineinfo.hxx>
@@ -266,27 +265,15 @@ namespace binfilter {
/*N*/ sal_Bool SwTxtFrm::IsHiddenNow() const
/*N*/ {
-/*N*/ SwFrmSwapper aSwapper( this, sal_True );
+/*N*/ SwFrmSwapper aSwapper( this, sal_True );
/*N*/
/*N*/ if( !Frm().Width() && IsValid() && GetUpper()->IsValid() )
-/*N*/ //bei Stackueberlauf (StackHack) invalid!
/*N*/ {
-/*N*/ OSL_ENSURE( Frm().Width(), "SwTxtFrm::IsHiddenNow: thin frame" );
+/*N*/ OSL_ENSURE( Frm().Width(), "SwTxtFrm::IsHiddenNow: thin frame" );
/*N*/ return sal_True;
/*N*/ }
/*N*/
-/*N*/ if( !GetTxtNode()->IsVisible() )
-/*N*/ {
-/*N*/ const ViewShell *pVsh = GetShell();
-/*N*/ if ( !pVsh )
-/*N*/ return sal_False;
-/*N*/
-/*N*/ return ! pVsh->GetWin() ||
-/*N*/ (!pVsh->GetViewOptions()->IsShowHiddenPara() &&
-/*N*/ !pVsh->GetViewOptions()->IsFldName());
-/*N*/ }
-/*N*/ else
-/*N*/ return sal_False;
+/*N*/ return sal_False;
/*N*/ }
@@ -534,19 +521,6 @@ namespace binfilter {
/*M*/ if( IsInRange( aFrmFmtSetRange, nWhich ) || RES_FMT_CHG == nWhich )
/*M*/ {
/*M*/ SwCntntFrm::Modify( pOld, pNew );
-/*M*/ if( nWhich == RES_FMT_CHG && GetShell() )
-/*M*/ {
-/*M*/ // Collection hat sich geaendert
-/*M*/ Prepare( PREP_CLEAR );
-/*M*/ _InvalidatePrt();
-/*M*/ SET_WRONG( 0, STRING_LEN, Invalidate );
-/*N*/ SetDerivedR2L( sal_False );
-/*N*/ CheckDirChange();
-/*N*/ // OD 09.12.2002 #105576# - Force complete paint due to existing
-/*N*/ // indents.
-/*N*/ SetCompletePaint();
-/*M*/ InvalidateLineNum();
-/*M*/ }
/*M*/ return;
/*M*/ }
/*M*/
@@ -879,12 +853,6 @@ namespace binfilter {
/*M*/
/*M*/ if( nCount )
/*M*/ {
-/*M*/ if( GetShell() )
-/*M*/ {
-/*M*/ Prepare( PREP_CLEAR );
-/*M*/ _InvalidatePrt();
-/*M*/ }
-/*M*/
/*M*/ if( nClear )
/*M*/ {
/*M*/ SwAttrSetChg aOldSet( *(SwAttrSetChg*)pOld );
@@ -926,16 +894,6 @@ namespace binfilter {
/*M*/ }
/*M*/ break;
/*M*/
-/* Seit dem neuen Blocksatz muessen wir immer neu formatieren:
- case RES_PARATR_ADJUST:
- {
- if( GetShell() )
- {
- Prepare( PREP_CLEAR );
- }
- break;
- }
-*/
/*M*/ // 6870: SwDocPosUpdate auswerten.
/*M*/ case RES_DOCPOS_UPDATE:
/*M*/ {
@@ -1754,7 +1712,6 @@ public:
/*N*/ KSHORT SwTxtFrm::GetLineSpace() const
/*N*/ {
/*N*/ KSHORT nRet = 0;
-/*N*/ long nTmp;
/*N*/
/*N*/ const SwAttrSet* pSet = GetAttrSet();
/*N*/ const SvxLineSpacingItem &rSpace = pSet->GetLineSpacing();
@@ -1762,49 +1719,6 @@ public:
/*N*/ switch( rSpace.GetInterLineSpaceRule() )
/*N*/ {
/*N*/ case SVX_INTER_LINE_SPACE_PROP:
-/*N*/ {
-/*N*/ ViewShell* pVsh = (ViewShell*)GetShell();
-/*N*/ if ( !pVsh )
-/*N*/ break;
-/*N*/ OutputDevice *pOut = pVsh->GetOut();
-/*N*/ if( !pVsh->GetDoc()->IsBrowseMode() ||
-/*N*/ pVsh->GetViewOptions()->IsPrtFormat() )
-/*N*/ {
-/*N*/ pOut = &GetTxtNode()->GetDoc()->GetRefDev();
-/*N*/ }
-/*N*/ SwFont aFont( pSet, GetTxtNode()->GetDoc() );
-/*N*/ // Wir muessen dafuer sorgen, dass am OutputDevice der Font
-/*N*/ // korrekt restauriert wird, sonst droht ein Last!=Owner.
-/*N*/ if ( pLastFont )
-/*N*/ {
-/*N*/ SwFntObj *pOldFont = pLastFont;
-/*N*/ pLastFont = NULL;
-/*N*/ aFont.SetFntChg( sal_True );
-/*N*/ aFont.ChgPhysFnt( pVsh, pOut );
-/*N*/ nRet = aFont.GetHeight( pVsh, pOut );
-/*N*/ pLastFont->Unlock();
-/*N*/ pLastFont = pOldFont;
-/*N*/ pLastFont->SetDevFont( pVsh, pOut );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*?*/ Font aOldFont = pOut->GetFont();
-/*?*/ aFont.SetFntChg( sal_True );
-/*?*/ aFont.ChgPhysFnt( pVsh, pOut );
-/*?*/ nRet = aFont.GetHeight( pVsh, pOut );
-/*?*/ pLastFont->Unlock();
-/*?*/ pLastFont = NULL;
-/*?*/ pOut->SetFont( aOldFont );
-/*N*/ }
-/*N*/ nTmp = nRet;
-/*N*/ nTmp *= rSpace.GetPropLineSpace();
-/*N*/ nTmp /= 100;
-/*N*/ nTmp -= nRet;
-/*N*/ if ( nTmp > 0 )
-/*N*/ nRet = (KSHORT)nTmp;
-/*N*/ else
-/*N*/ nRet = 0;
-/*N*/ }
/*N*/ break;
/*?*/ case SVX_INTER_LINE_SPACE_FIX:
/*?*/ if ( rSpace.GetInterLineSpace() > 0 )
diff --git a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
index fa1b840..0277e0c 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
@@ -52,7 +52,6 @@
#include "porftn.hxx"
#include "porfly.hxx"
#include "itrform2.hxx"
-#include "frmsh.hxx"
#include "ftnfrm.hxx" // FindErgoSumFrm(), FindQuoVadisFrm(),
#include "pagedesc.hxx"
#include "sectfrm.hxx" // SwSectionFrm
@@ -573,14 +572,9 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ //wachsen.
/*N*/ if ( pFtnFrm->GetFollow() && nDiff > 0 )
/*N*/ {
-/*?*/ SwTwips nHeight = (pCont->Frm().*fnRect->fnGetHeight)();
/*?*/ pBoss->RearrangeFtns( nDeadLine, sal_False, pFtn );
/*?*/ ValidateBodyFrm();
/*?*/ ValidateFrm();
-/*?*/ ViewShell *pSh = GetShell();
-/*?*/ if ( pSh && nHeight == (pCont->Frm().*fnRect->fnGetHeight)() )
-/*?*/ //Damit uns nix durch die Lappen geht.
-/*?*/ pSh->InvalidateWindows( pCont->Frm() );
/*?*/ }
/*?*/ bInFtnConnect = sal_False;
/*?*/ return;
diff --git a/binfilter/bf_sw/source/core/text/sw_txtio.cxx b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
index 2e83816..d7c982b 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtio.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
@@ -50,7 +50,6 @@
#include "portox.hxx"
#include "pordrop.hxx"
#include "pormulti.hxx"
-#include "frmsh.hxx"
// So kann man die Layoutstruktur ausgeben lassen
// #define AMA_LAYOUT
diff --git a/binfilter/bf_sw/source/ui/inc/basesh.hxx b/binfilter/bf_sw/source/ui/inc/basesh.hxx
deleted file mode 100644
index 84b337f..0000000
--- a/binfilter/bf_sw/source/ui/inc/basesh.hxx
+++ /dev/null
@@ -1,140 +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 _SWBASESH_HXX
-#define _SWBASESH_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-
-#include <shellid.hxx>
-
-#define _SVSTDARR_USHORTSSORT
-#define _SVSTDARR_USHORTS
-
-#include <tools/link.hxx>
-#include <vcl/timer.hxx>
-#include <bf_sfx2/module.hxx>
-#include <bf_sfx2/shell.hxx>
-#include <bf_svtools/svstdarr.hxx>
-class Graphic;
-
-namespace binfilter {
-
-class GraphicFilter;
-class SfxItemSet;
-
-class SwWrtShell;
-class SwCrsrShell;
-class SwView;
-
-class SwFlyFrmAttrMgr;
-
-extern void DisableAllItems(SfxItemSet &);
-struct DBTextStruct_Impl;
-class SwBaseShell: public SfxShell
-{
- SwView &rView;
-
- // DragModus
- static USHORT nFrameMode;
-
- // Bug 75078 - if in GetState the asynch call of GetGraphic returns
- // synch, the set the state directly into the itemset
- SfxItemSet* pGetStateSet;
-
- //Update-Timer fuer Graphic
- SvUShortsSort aGrfUpdateSlots;
-
- DECL_LINK( GraphicArrivedHdl, SwCrsrShell* );
-
-protected:
-
- SwWrtShell& GetShell ();
-
- SwView& GetView() { return rView; }
-
- SwFlyFrmAttrMgr *pFrmMgr;
-
- DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl* );
-
- void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; }
- BOOL AddGrfUpdateSlot( USHORT nSlot )
- { return aGrfUpdateSlots.Insert( nSlot ); }
-
-public:
- SwBaseShell(SwView &rShell);
- virtual ~SwBaseShell();
- SFX_DECL_INTERFACE(SW_BASESHELL);
- TYPEINFO();
-
- void ExecDelete(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
-
- void ExecClpbrd(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");};
- void StateClpbrd(SfxItemSet &);
-
- void ExecUndo(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");};
- void StateUndo(SfxItemSet &);
-
- void Execute(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");};
- void GetState(SfxItemSet &);
- void StateStyle(SfxItemSet &);
-
- void ExecuteGallery(SfxRequest&){DBG_BF_ASSERT(0, "STRIP");};
- void GetGalleryState(SfxItemSet&){DBG_BF_ASSERT(0, "STRIP");};
-
- void ExecDlg(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");};
-
- void StateStatusLine(SfxItemSet &rSet);
- void ExecTxtCtrl(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;
- void GetTxtFontCtrlState(SfxItemSet& rSet);
- void GetTxtCtrlState(SfxItemSet& rSet);
- void GetBorderState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");};
- void GetBckColState(SfxItemSet &rSet);
-
- void ExecBckCol(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");};
- void SetWrapMode( USHORT nSlot );
-
- void StateDisableItems(SfxItemSet &){DBG_BF_ASSERT(0, "STRIP");};
-
- void EditRegionDialog(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP"); };
- void InsertRegionDialog(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP"); };
-
- void ExecField(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");};
-
- static void _SetFrmMode( USHORT nMode ) { nFrameMode = nMode; }
- static USHORT GetFrmMode() { return nFrameMode; }
-
- //public fuer D&D
-
-};
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/beziersh.hxx b/binfilter/bf_sw/source/ui/inc/beziersh.hxx
deleted file mode 100644
index 70534c6..0000000
--- a/binfilter/bf_sw/source/ui/inc/beziersh.hxx
+++ /dev/null
@@ -1,45 +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 _SWBEZIERSH_HXX
-#define _SWBEZIERSH_HXX
-
-#include "basesh.hxx"
-namespace binfilter {
-
-class SwBezierShell: public SwBaseShell
-{
-public:
- SFX_DECL_INTERFACE(SW_BEZIERSHELL);
-
- SwBezierShell(SwView &rView);
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/drawsh.hxx b/binfilter/bf_sw/source/ui/inc/drawsh.hxx
deleted file mode 100644
index 1a73b68..0000000
--- a/binfilter/bf_sw/source/ui/inc/drawsh.hxx
+++ /dev/null
@@ -1,57 +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 _SWDRAWSH_HXX
-#define _SWDRAWSH_HXX
-
-#include "drwbassh.hxx"
-namespace binfilter {
-
-class SdrObject;
-class SwDrawBaseShell;
-
-class SwDrawShell: public SwDrawBaseShell
-{
-public:
- SFX_DECL_INTERFACE(SW_DRAWSHELL);
-
- SwDrawShell(SwView &rView):SwDrawBaseShell(rView){DBG_BF_ASSERT(0, "STRIP");} ;
-
- void Execute(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");};
- void ExecDrawDlg(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");};
- void ExecDrawAttrArgs(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");};
- void GetDrawAttrState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");};
-
- void ExecFormText(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");};
- void GetFormTextState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");};
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/drformsh.hxx b/binfilter/bf_sw/source/ui/inc/drformsh.hxx
deleted file mode 100644
index 68091e2..0000000
--- a/binfilter/bf_sw/source/ui/inc/drformsh.hxx
+++ /dev/null
@@ -1,50 +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 _SWDRWFORMSH_HXX
-#define _SWDRWFORMSH_HXX
-
-#include "drwbassh.hxx"
-namespace binfilter {
-
-class SdrObject;
-class SwDrawBaseShell;
-
-class SwDrawFormShell: public SwDrawBaseShell
-{
-public:
- SFX_DECL_INTERFACE(SW_DRAWFORMSHELL);
-
- SwDrawFormShell(SwView &rView):SwDrawBaseShell(rView){DBG_BF_ASSERT(0, "STRIP");} ;
-
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/drwbassh.hxx b/binfilter/bf_sw/source/ui/inc/drwbassh.hxx
deleted file mode 100644
index 88679ac..0000000
--- a/binfilter/bf_sw/source/ui/inc/drwbassh.hxx
+++ /dev/null
@@ -1,58 +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 _SWDRWBASSH_HXX
-#define _SWDRWBASSH_HXX
-
-#include "basesh.hxx"
-namespace binfilter {
-
-class SfxItemSet;
-class SwWrtShell;
-class SwView;
-
-class SwDrawBase;
-class SvxNameDialog;
-
-class SwDrawBaseShell: public SwBaseShell
-{
-
-public:
- SwDrawBaseShell(SwView &rShell):SwBaseShell( rShell ){DBG_BF_ASSERT(0, "STRIP");}
-
- SFX_DECL_INTERFACE(SW_DRAWBASESHELL);
-
- void DisableState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");};
-
-
-};
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/frmsh.hxx b/binfilter/bf_sw/source/ui/inc/frmsh.hxx
deleted file mode 100644
index 120c8ce..0000000
--- a/binfilter/bf_sw/source/ui/inc/frmsh.hxx
+++ /dev/null
@@ -1,50 +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 _SWFRMSH_HXX
-#define _SWFRMSH_HXX
-
-#include "basesh.hxx"
-namespace binfilter {
-
-class SwFrameShell: public SwBaseShell
-{
-
-public:
- SFX_DECL_INTERFACE(SW_FRAMESHELL);
-
- SwFrameShell(SwView &rView):SwBaseShell( rView ){DBG_BF_ASSERT(0, "STRIP");} ;
-
- void ExecFrameStyle(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;
- void GetLineStyleState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} ;
- void StateInsert(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} ;
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/grfsh.hxx b/binfilter/bf_sw/source/ui/inc/grfsh.hxx
deleted file mode 100644
index 411447e..0000000
--- a/binfilter/bf_sw/source/ui/inc/grfsh.hxx
+++ /dev/null
@@ -1,48 +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 _SWGRFSH_HXX
-#define _SWGRFSH_HXX
-
-#include "frmsh.hxx"
-namespace binfilter {
-
-class SwGrfShell: public SwBaseShell
-{
-public:
- SFX_DECL_INTERFACE(SW_GRFSHELL);
-
- void ExecAttr(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void GetAttrState(SfxItemSet &){DBG_BF_ASSERT(0, "STRIP");} ;
-
- SwGrfShell(SwView &rView):SwBaseShell(rView){DBG_BF_ASSERT(0, "STRIP");} ;
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/listsh.hxx b/binfilter/bf_sw/source/ui/inc/listsh.hxx
deleted file mode 100644
index 8dd332b..0000000
--- a/binfilter/bf_sw/source/ui/inc/listsh.hxx
+++ /dev/null
@@ -1,47 +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 _SWLISTSH_HXX
-#define _SWLISTSH_HXX
-
-#include "basesh.hxx"
-namespace binfilter {
-
-class SwListShell: public SwBaseShell
-{
-public:
- SFX_DECL_INTERFACE(SW_LISTSHELL);
- TYPEINFO();
-
- SwListShell(SwView &rView);
-
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/olesh.hxx b/binfilter/bf_sw/source/ui/inc/olesh.hxx
deleted file mode 100644
index 057e08b..0000000
--- a/binfilter/bf_sw/source/ui/inc/olesh.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 _SWOLESH_HXX
-#define _SWOLESH_HXX
-
-#include "frmsh.hxx"
-namespace binfilter {
-
-class SwOleShell: public SwFrameShell
-{
-public:
- SFX_DECL_INTERFACE(SW_OLESHELL);
-
- SwOleShell(SwView &rView);
-
-};
-
-} //namespace binfilter
-#endif
-
-
-
-
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/tabsh.hxx b/binfilter/bf_sw/source/ui/inc/tabsh.hxx
deleted file mode 100644
index 70fbb6f..0000000
--- a/binfilter/bf_sw/source/ui/inc/tabsh.hxx
+++ /dev/null
@@ -1,53 +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 _SWTABSH_HXX
-#define _SWTABSH_HXX
-
-#include "basesh.hxx"
-namespace binfilter {
-
-class SwTableShell: public SwBaseShell
-{
-public:
- SFX_DECL_INTERFACE(SW_TABSHELL);
- TYPEINFO();
-
- void GetState(SfxItemSet &);
- void GetFrmBorderState(SfxItemSet &rSet);
- void GetLineStyleState(SfxItemSet &rSet);
- void ExecTableStyle(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;
-
- void ExecNumberFormat(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;
-
- SwTableShell(SwView &rView);
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/textsh.hxx b/binfilter/bf_sw/source/ui/inc/textsh.hxx
deleted file mode 100644
index 45dc06f..0000000
--- a/binfilter/bf_sw/source/ui/inc/textsh.hxx
+++ /dev/null
@@ -1,79 +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 _SWTEXTSH_HXX
-#define _SWTEXTSH_HXX
-
-#include <basesh.hxx>
-class Button;
-namespace binfilter {
-
-
-class SwTextShell: public SwBaseShell
-{
-
-
-public:
- SFX_DECL_INTERFACE(SW_TEXTSHELL);
- TYPEINFO();
-
-
- void GetState(SfxItemSet &);
-
- void ExecInsert(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void StateInsert(SfxItemSet&);
- void ExecEnterNum(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecBasicMove(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecMove(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecMovePage(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecMoveCol(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecMoveLingu(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecMoveMisc(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void StateField(SfxItemSet &);
- void ExecIdx(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void GetIdxState(SfxItemSet &);
- void ExecGlossary(SfxRequest &);
-
- void ExecCharAttr(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecCharAttrArgs(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecParaAttr(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecParaAttrArgs(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecAttr(SfxRequest &);
- void ExecDB(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecTransliteration(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
-
- void GetAttrState(SfxItemSet &);
-
- SwTextShell(SwView &rView);
- virtual ~SwTextShell();
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/wdrwbase.hxx b/binfilter/bf_sw/source/ui/inc/wdrwbase.hxx
deleted file mode 100644
index 381bea6..0000000
--- a/binfilter/bf_sw/source/ui/inc/wdrwbase.hxx
+++ /dev/null
@@ -1,51 +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 _SWWDRWBASESH_HXX
-#define _SWWDRWBASESH_HXX
-
-#include "drwbassh.hxx"
-namespace binfilter {
-
-class SwWebDrawBaseShell: public SwDrawBaseShell
-{
-protected:
- SwWebDrawBaseShell(SwView &rShell);
-
-public:
- virtual ~SwWebDrawBaseShell();
-
- SFX_DECL_INTERFACE(SW_WEBDRAWBASESHELL);
- TYPEINFO();
-};
-
-
-} //namespace binfilter
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/wformsh.hxx b/binfilter/bf_sw/source/ui/inc/wformsh.hxx
deleted file mode 100644
index 76e4832..0000000
--- a/binfilter/bf_sw/source/ui/inc/wformsh.hxx
+++ /dev/null
@@ -1,49 +0,0 @@
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list