[Libreoffice-commits] .: 5 commits - binfilter/bf_sc binfilter/bf_sw binfilter/inc binfilter/prj
Joseph Powers
jpowers at kemper.freedesktop.org
Fri Sep 30 07:27:04 PDT 2011
binfilter/bf_sc/source/core/data/sc_document.cxx | 9 -
binfilter/bf_sc/source/core/tool/sc_rangenam.cxx | 30 ----
binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx | 7 -
binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx | 8 -
binfilter/bf_sc/source/core/tool/sc_refupdat.cxx | 9 -
binfilter/bf_sc/source/core/tool/sc_token.cxx | 11 +
binfilter/bf_sc/source/core/tool/sc_viewopti.cxx | 6
binfilter/bf_sc/source/ui/docshell/makefile.mk | 3
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 54 ++-----
binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx | 88 ------------
binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx | 6
binfilter/bf_sc/source/ui/inc/editsh.hxx | 69 ---------
binfilter/bf_sc/source/ui/inc/olinefun.hxx | 67 ---------
binfilter/bf_sc/source/ui/unoobj/makefile.mk | 2
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 72 +---------
binfilter/bf_sw/source/core/bastyp/sw_init.cxx | 1
binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docbm.cxx | 1
binfilter/bf_sw/source/core/doc/sw_doccorr.cxx | 1
binfilter/bf_sw/source/core/doc/sw_docedt.cxx | 2
binfilter/bf_sw/source/core/doc/sw_visiturl.cxx | 1
binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx | 7 -
binfilter/bf_sw/source/core/docnode/sw_section.cxx | 1
binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx | 2
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 1
binfilter/bf_sw/source/core/edit/makefile.mk | 54 -------
binfilter/bf_sw/source/core/edit/sw_edfld.cxx | 105 ---------------
binfilter/bf_sw/source/core/edit/sw_ednumber.cxx | 49 -------
binfilter/bf_sw/source/core/edit/sw_edredln.cxx | 46 ------
binfilter/bf_sw/source/core/edit/sw_edtab.cxx | 51 -------
binfilter/bf_sw/source/core/edit/sw_edws.cxx | 50 -------
binfilter/bf_sw/source/core/fields/sw_fldbas.cxx | 2
binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx | 1
binfilter/bf_sw/source/core/makefile.mk | 3
binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx | 21 ---
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 10 -
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 4
binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx | 1
binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx | 1
binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx | 1
binfilter/inc/bf_sc/rangenam.hxx | 3
binfilter/inc/bf_sw/edimp.hxx | 92 -------------
binfilter/inc/bf_sw/editsh.hxx | 3
binfilter/prj/build.lst | 3
44 files changed, 54 insertions(+), 906 deletions(-)
New commits:
commit c3da14bec375da1a2e41407bc99cb25d9edc4b17
Author: Joseph Powers <jpowers27 at cox.net>
Date: Fri Sep 30 07:21:46 2011 -0700
The whole SwPamRanges stuff is read only so dump it
We never store anything in the SwPamRanges stuff; nore do we use the
SwPamRange class for anything. Thus, it should be safe to just dump it.
diff --git a/binfilter/bf_sw/source/core/edit/makefile.mk b/binfilter/bf_sw/source/core/edit/makefile.mk
deleted file mode 100644
index e806636..0000000
--- a/binfilter/bf_sw/source/core/edit/makefile.mk
+++ /dev/null
@@ -1,50 +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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-BFPRJ=..$/..$/..
-
-PRJNAME=binfilter
-TARGET=sw_edit
-
-NO_HIDS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/inc$/bf_sw$/swpre.mk
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/bf_sw$/sw.mk
-INC+= -I$(PRJ)$/inc$/bf_sw
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/sw_ednumber.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/binfilter/bf_sw/source/core/edit/sw_ednumber.cxx b/binfilter/bf_sw/source/core/edit/sw_ednumber.cxx
deleted file mode 100644
index a5b51d6..0000000
--- a/binfilter/bf_sw/source/core/edit/sw_ednumber.cxx
+++ /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.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-
-#include <horiornt.hxx>
-
-#include <edimp.hxx>
-#include <doc.hxx>
-#include <ndtxt.hxx>
-#include <viscrs.hxx>
-#include <paratr.hxx>
-namespace binfilter {
-
-/*N*/ SV_IMPL_VARARR_SORT( _SwPamRanges, SwPamRange )
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/makefile.mk b/binfilter/bf_sw/source/core/makefile.mk
index 272cf04..5805407 100644
--- a/binfilter/bf_sw/source/core/makefile.mk
+++ b/binfilter/bf_sw/source/core/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
@@ -50,7 +50,6 @@ SUBLIBS1= \
$(SLB)$/sw_graphic.lib \
$(SLB)$/sw_para.lib \
$(SLB)$/sw_attr.lib \
- $(SLB)$/sw_edit.lib \
$(SLB)$/sw_crsr.lib \
$(SLB)$/sw_view.lib \
$(SLB)$/sw_frmedt.lib \
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx b/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
index a663f0f..89728b9 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
@@ -59,7 +59,6 @@
#include <docsh.hxx>
#include <section.hxx>
#include <shellio.hxx>
-#include <edimp.hxx>
#include <cntfrm.hxx>
#include <pagefrm.hxx>
#include <bf_svtools/eitem.hxx>
@@ -549,14 +548,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
}
UnoActionContext aAction(pDoc);
- if( rPam.GetNext() != &rPam ) // Mehrfachselektion ?
- {
- SwPamRanges aRangeArr( rPam );
- SwPaM aPam( *rPam.GetPoint() );
- for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n )
- pDoc->SetNumRule( aRangeArr.SetPam( n, aPam ), aRule );
- }
- else
+ if( rPam.GetNext() == &rPam ) // Mehrfachselektion ?
pDoc->SetNumRule( rPam, aRule );
@@ -605,7 +597,6 @@ void resetCrsrPropertyValue(const SfxItemPropertyMap* pMap, SwPaM& rPam)
switch(pMap->nWID)
{
case FN_UNO_PARA_STYLE :
-// lcl_SetTxtFmtColl(aValue, pUnoCrsr);
break;
case FN_UNO_PAGE_STYLE :
break;
@@ -613,14 +604,7 @@ void resetCrsrPropertyValue(const SfxItemPropertyMap* pMap, SwPaM& rPam)
{
UnoActionContext aAction(pDoc);
- if( rPam.GetNext() != &rPam ) // Mehrfachselektion ?
- {
- SwPamRanges aRangeArr( rPam );
- SwPaM aPam( *rPam.GetPoint() );
- for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n )
- pDoc->SetNodeNumStart( *aRangeArr.SetPam( n, aPam ).GetPoint(), 1 );
- }
- else
+ if( rPam.GetNext() == &rPam ) // Mehrfachselektion ?
pDoc->SetNodeNumStart( *rPam.GetPoint(), 0 );
}
@@ -628,7 +612,6 @@ void resetCrsrPropertyValue(const SfxItemPropertyMap* pMap, SwPaM& rPam)
case FN_UNO_NUM_LEVEL :
break;
case FN_UNO_NUM_RULES:
-// lcl_setNumberingProperty(aValue, pUnoCrsr);
break;
case FN_UNO_CHARFMT_SEQUENCE:
{
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index 28e99eb..b65f33e 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -75,7 +75,6 @@
#include <poolfmt.hrc>
#include <poolfmt.hxx>
#include <viscrs.hxx>
-#include <edimp.hxx>
#include <fchrfmt.hxx>
#include <cntfrm.hxx>
#include <pagefrm.hxx>
@@ -389,14 +388,7 @@ void lcl_SetNodeNumStart( SwPaM& rCrsr, uno::Any aValue )
SwDoc* pDoc = rCrsr.GetDoc();
UnoActionContext aAction(pDoc);
- if( rCrsr.GetNext() != &rCrsr ) // Mehrfachselektion ?
- {
- SwPamRanges aRangeArr( rCrsr );
- SwPaM aPam( *rCrsr.GetPoint() );
- for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n )
- pDoc->SetNodeNumStart( *aRangeArr.SetPam( n, aPam ).GetPoint(), nStt );
- }
- else
+ if( rCrsr.GetNext() == &rCrsr ) // Mehrfachselektion ?
pDoc->SetNodeNumStart( *rCrsr.GetPoint(), nStt );
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
index aa2423a..364db35 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
@@ -72,7 +72,6 @@
#include <poolfmt.hrc>
#include <poolfmt.hxx>
#include <viscrs.hxx>
-#include <edimp.hxx>
#include <fchrfmt.hxx>
#include <cntfrm.hxx>
#include <pagefrm.hxx>
@@ -148,9 +147,6 @@ using namespace ::com::sun::star::drawing;
using rtl::OUString;
-//collectn.cxx
-//BOOL lcl_IsNumeric(const String&);
-
void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
SwDependArr& rFrameArr, BOOL bSort )
{
diff --git a/binfilter/inc/bf_sw/edimp.hxx b/binfilter/inc/bf_sw/edimp.hxx
deleted file mode 100644
index 41d2ef6..0000000
--- a/binfilter/inc/bf_sw/edimp.hxx
+++ /dev/null
@@ -1,92 +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 _EDIMP_HXX
-#define _EDIMP_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-#include "crsrsh.hxx"
-namespace binfilter {
-
-/*
- * MACROS um ueber alle Bereiche zu iterieren
- */
-#define PCURCRSR (_pStartCrsr)
-
-#define FOREACHPAM_START(pCURSH) \
- {\
- SwPaM *_pStartCrsr = (pCURSH)->GetCrsr(), *__pStartCrsr = _pStartCrsr; \
- do {
-
-#define FOREACHPAM_END() \
- } while( (_pStartCrsr=(SwPaM *)_pStartCrsr->GetNext()) != __pStartCrsr ); \
- }
-
-
-#define FOREACHCURSOR_START(pCURSH) \
- {\
- SwShellCrsr *_pStartCrsr = *(pCURSH)->GetSwCrsr(), *__pStartCrsr = _pStartCrsr; \
- do {
-
-#define FOREACHCURSOR_END() \
- } while( (_pStartCrsr=*(SwCursor*)_pStartCrsr->GetNext()) != __pStartCrsr ); \
- }
-
-
-struct SwPamRange
-{
- ULONG nStart, nEnd;
-
- SwPamRange() : nStart( 0 ), nEnd( 0 ) {}
- SwPamRange( ULONG nS, ULONG nE ) : nStart( nS ), nEnd( nE ) {}
-
- BOOL operator==( const SwPamRange& rRg )
- { return nStart == rRg.nStart ? TRUE : FALSE; }
- BOOL operator<( const SwPamRange& rRg )
- { return nStart < rRg.nStart ? TRUE : FALSE; }
-};
-
-SV_DECL_VARARR_SORT( _SwPamRanges, SwPamRange, 0, 1 )
-
-class SwPamRanges : private _SwPamRanges
-{
-public:
- SwPamRanges( const SwPaM& /*rRing*/ ){DBG_BF_ASSERT(0, "STRIP");}
-
- SwPaM& SetPam( USHORT /*nArrPos*/, SwPaM& rPam ){DBG_BF_ASSERT(0, "STRIP"); return rPam;}
-
- USHORT Count() const
- { return _SwPamRanges::Count(); }
-};
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/prj/build.lst b/binfilter/prj/build.lst
index 3136247..2a51216 100644
--- a/binfilter/prj/build.lst
+++ b/binfilter/prj/build.lst
@@ -136,7 +136,6 @@ bf binfilter\bf_sw\source\core\crsr nmake - all bf_sw_crsr NULL
bf binfilter\bf_sw\source\core\doc nmake - all bf_sw_doc NULL
bf binfilter\bf_sw\source\core\docnode nmake - all bf_sw_dcnd NULL
bf binfilter\bf_sw\source\core\draw nmake - all bf_sw_draw NULL
-bf binfilter\bf_sw\source\core\edit nmake - all bf_sw_edit NULL
bf binfilter\bf_sw\source\core\fields nmake - all bf_sw_fld NULL
bf binfilter\bf_sw\source\core\frmedt nmake - all bf_sw_frmed NULL
bf binfilter\bf_sw\source\core\graphic nmake - all bf_sw_grph NULL
@@ -159,7 +158,7 @@ bf binfilter\bf_sw\source\filter\excel nmake - all bf_sw_ex
bf binfilter\bf_sw\source\filter\w4w nmake - all bf_sw_w4w NULL
bf binfilter\bf_sw\source\filter\sw6 nmake - all bf_sw_sw6 NULL
bf binfilter\bf_sw\source\ui nmake - all bf_sw_ui bf_sw_app bf_sw_conf bf_sw_dbui bf_sw_fldui bf_sw_globd bf_sw_index bf_sw_misc bf_sw_shell bf_sw_uiuno bf_sw_utlui bf_sw_web NULL
-bf binfilter\bf_sw\source\core nmake - all bf_sw_core bf_sw_attr bf_sw_bast bf_sw_crsr bf_sw_dcnd bf_sw_doc bf_sw_draw bf_sw_edit bf_sw_fld bf_sw_frmed bf_sw_grph bf_sw_layo bf_sw_ole bf_sw_para bf_sw_sw3io bf_sw_swg bf_sw_text bf_sw_tox bf_sw_txtnd bf_sw_uco bf_sw_view NULL
+bf binfilter\bf_sw\source\core nmake - all bf_sw_core bf_sw_attr bf_sw_bast bf_sw_crsr bf_sw_dcnd bf_sw_doc bf_sw_draw bf_sw_fld bf_sw_frmed bf_sw_grph bf_sw_layo bf_sw_ole bf_sw_para bf_sw_sw3io bf_sw_swg bf_sw_text bf_sw_tox bf_sw_txtnd bf_sw_uco bf_sw_view NULL
bf binfilter\bf_sw\source\filter nmake - all bf_sw_flt bf_sw_ascii bf_sw_bsflt bf_sw_wrtr bf_sw_xml bf_sw_lotus bf_sw_excel bf_sw_w4w bf_sw_sw6 NULL
bf binfilter\bf_sw\util nmake - all bf_sw_util bf_sw_core bf_sw_flt bf_sw_ui bf_sd_util bf_sb_util bf_so3_util NULL
bf binfilter\filter\source\bf_offwrp nmake - all bf_offwrp bf_sf_detect bf_fm_util bf_sh_util bf_sw_util bf_sb_util bf_so3_util NULL
commit 1b72feff42c38cee2a51442dba8af657c70bb89c
Author: Joseph Powers <jpowers27 at cox.net>
Date: Fri Sep 30 06:54:27 2011 -0700
Remove one of the two editsh.hxx files
diff --git a/binfilter/bf_sc/source/ui/inc/editsh.hxx b/binfilter/bf_sc/source/ui/inc/editsh.hxx
deleted file mode 100644
index c6215b7..0000000
--- a/binfilter/bf_sc/source/ui/inc/editsh.hxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SC_EDITSH_HXX
-#define SC_EDITSH_HXX
-
-#include <bf_sfx2/shell.hxx>
-#include <bf_sfx2/module.hxx>
-#include <tools/link.hxx>
-
-#include "shellids.hxx"
-class TransferableDataHelper;
-class TransferableClipboardListener;
-namespace binfilter {
-
-class EditView;
-class ScViewData;
-class ScInputHandler;
-class SvxURLField;
-
-class ScEditShell : public SfxShell
-{
-
-
-public:
- SFX_DECL_INTERFACE(SCID_EDIT_SHELL);
-
- ScEditShell(EditView* pView, ScViewData* pData){DBG_BF_ASSERT(0, "STRIP");}
- void Execute(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}
- void ExecuteTrans(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}
- void GetState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}
- void GetClipState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");}
- void ExecuteAttr(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}
- void GetAttrState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}
- void ExecuteUndo(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}
- void GetUndoState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}
-};
-
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_init.cxx b/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
index f70bbb3..d86347e 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
@@ -110,7 +110,6 @@
#include <fmtruby.hxx>
#include <tgrditem.hxx>
#include <hfspacingitem.hxx>
-#include <editsh.hxx>
#include <init.hxx>
#include <paratr.hxx>
#include <grfatr.hxx>
diff --git a/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx b/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx
index 481d750..9b4d6cc 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx
@@ -36,7 +36,7 @@
#include <doc.hxx>
#include <cntfrm.hxx>
-#include <editsh.hxx>
+#include <crsrsh.hxx>
#include <frmfmt.hxx>
#include <viscrs.hxx>
#include <ndtxt.hxx>
diff --git a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
index 29943a6..5dd3d7b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
@@ -44,7 +44,6 @@
#include <redline.hxx>
#include <docary.hxx>
#include <viscrs.hxx>
-#include <editsh.hxx>
#include <unocrsr.hxx>
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
index 9888904..c4fb8a5 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
@@ -37,7 +37,6 @@
#include <doc.hxx>
#include <rootfrm.hxx>
#include <viscrs.hxx>
-#include <editsh.hxx>
#include <bookmrk.hxx>
#include <mvsave.hxx>
#include <docary.hxx>
diff --git a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
index 5963aba..24abc1f 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
@@ -50,7 +50,7 @@
#include <section.hxx>
#include "comcore.hrc"
#include <viscrs.hxx>
-#include "editsh.hxx"
+
namespace binfilter {
using namespace ::com::sun::star;
diff --git a/binfilter/bf_sw/source/core/doc/sw_visiturl.cxx b/binfilter/bf_sw/source/core/doc/sw_visiturl.cxx
index a45187e..4105bc2 100644
--- a/binfilter/bf_sw/source/core/doc/sw_visiturl.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_visiturl.cxx
@@ -44,7 +44,6 @@
#include <hints.hxx>
#include <ndtxt.hxx>
#include <viscrs.hxx>
-#include <editsh.hxx>
#include <docsh.hxx>
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
index 3ea4423..01070bb 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
@@ -57,7 +57,6 @@
#include <docary.hxx>
#include <redline.hxx>
#include <tblrwcl.hxx>
-#include <editsh.hxx>
#include <node2lay.hxx>
@@ -65,12 +64,6 @@
#include "docsh.hxx"
-#ifdef _MSAVE_HXX
-#endif
-
-#ifdef LINUX
-#endif
-
#include <ndtxt.hxx>
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/docnode/sw_section.cxx b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
index 50d003d..07bb7e9 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_section.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
@@ -51,7 +51,6 @@
#include <doc.hxx>
#include <pam.hxx>
-#include <editsh.hxx>
#include <hints.hxx>
#include <docsh.hxx>
#include <ndtxt.hxx>
diff --git a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
index 7aa5f40..7c90c71 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
@@ -54,7 +54,7 @@
#include <osl/diagnose.h>
#include <pam.hxx>
-#include <editsh.hxx>
+#include <swtable.hxx>
#include <swbaslnk.hxx>
#include <swserv.hxx>
#include <ndgrf.hxx>
diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index 65fe366..f12dc33 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -59,7 +59,6 @@
#include <doc.hxx>
#include <hints.hxx>
#include <txtfrm.hxx>
-#include <editsh.hxx>
#include <docary.hxx>
#include <bf_svx/xoutx.hxx>
diff --git a/binfilter/bf_sw/source/core/edit/makefile.mk b/binfilter/bf_sw/source/core/edit/makefile.mk
index 378b056..e806636 100644
--- a/binfilter/bf_sw/source/core/edit/makefile.mk
+++ b/binfilter/bf_sw/source/core/edit/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
@@ -42,11 +42,7 @@ INC+= -I$(PRJ)$/inc$/bf_sw
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/sw_edfld.obj \
- $(SLO)$/sw_ednumber.obj \
- $(SLO)$/sw_edredln.obj \
- $(SLO)$/sw_edtab.obj \
- $(SLO)$/sw_edws.obj
+ $(SLO)$/sw_ednumber.obj
# --- Targets -------------------------------------------------------
diff --git a/binfilter/bf_sw/source/core/edit/sw_edfld.cxx b/binfilter/bf_sw/source/core/edit/sw_edfld.cxx
deleted file mode 100644
index 0550881..0000000
--- a/binfilter/bf_sw/source/core/edit/sw_edfld.cxx
+++ /dev/null
@@ -1,105 +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.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-
-#include <horiornt.hxx>
-
-#include <editsh.hxx>
-#include <ndtxt.hxx> // GetCurFld
-#include <fmtfld.hxx>
-#include <txtfld.hxx>
-#include <expfld.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
-
-#include "pam.hxx"
-
-#include "doc.hxx"
-
-namespace binfilter {
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::rtl;
-
-
-// wenn Selektion groesser Max Nodes oder mehr als Max Selektionen
-// => keine Attribute
-static const USHORT nMaxLookup = 40;
-
-/*--------------------------------------------------------------------
- Beschreibung: Feldtypen zu einer ResId zaehlen
- wenn 0 alle zaehlen
- --------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Feldtypen zu einer ResId finden
- wenn 0 alle finden
- --------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------
- Beschreibung: Den ersten Typen mit ResId und Namen finden
- --------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------
- Beschreibung: Feldtypen loeschen
- --------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------
- Beschreibung: FieldType ueber Name loeschen
- --------------------------------------------------------------------*/
-
-
-
-/*************************************************************************
-|*
-|* SwEditShell::Insert( SwField )
-|*
-|* Beschreibung an der Cursorposition ein Feld einfuegen
-|* Quelle: vgl. SwEditShell::Insert( String )
-|*
-*************************************************************************/
-
-
-/*N*/ inline SwTxtFld *GetDocTxtFld( const SwPosition* pPos )
-/*N*/ {
-/*N*/ SwTxtNode *pNode = pPos->nNode.GetNode().GetTxtNode();
-/*N*/ if( pNode )
-/*N*/ return pNode->GetTxtFld( pPos->nContent );
-/*N*/ else
-/*N*/ return 0;
-/*N*/ }
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/edit/sw_ednumber.cxx b/binfilter/bf_sw/source/core/edit/sw_ednumber.cxx
index 07b9e63..a5b51d6 100644
--- a/binfilter/bf_sw/source/core/edit/sw_ednumber.cxx
+++ b/binfilter/bf_sw/source/core/edit/sw_ednumber.cxx
@@ -34,7 +34,6 @@
#include <horiornt.hxx>
-#include <editsh.hxx>
#include <edimp.hxx>
#include <doc.hxx>
#include <ndtxt.hxx>
diff --git a/binfilter/bf_sw/source/core/edit/sw_edredln.cxx b/binfilter/bf_sw/source/core/edit/sw_edredln.cxx
deleted file mode 100644
index 795482c..0000000
--- a/binfilter/bf_sw/source/core/edit/sw_edredln.cxx
+++ /dev/null
@@ -1,46 +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.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-
-#include <osl/diagnose.h>
-
-
-#include <horiornt.hxx>
-
-#include "doc.hxx"
-#include "editsh.hxx"
-namespace binfilter {
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/edit/sw_edtab.cxx b/binfilter/bf_sw/source/core/edit/sw_edtab.cxx
deleted file mode 100644
index d3b9f5d..0000000
--- a/binfilter/bf_sw/source/core/edit/sw_edtab.cxx
+++ /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.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#define ITEMID_BOXINFO SID_ATTR_BORDER_INNER
-#include <hintids.hxx>
-
-#define _SVSTDARR_ULONGS
-
-
-
-#include <horiornt.hxx>
-
-#include <editsh.hxx>
-#include <doc.hxx>
-#include <hints.hxx>
-#include <node.hxx>
-#include <mdiexp.hxx>
-namespace binfilter {
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/edit/sw_edws.cxx b/binfilter/bf_sw/source/core/edit/sw_edws.cxx
deleted file mode 100644
index c5f366f..0000000
--- a/binfilter/bf_sw/source/core/edit/sw_edws.cxx
+++ /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.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-
-#include <vcl/window.hxx>
-
-#include <horiornt.hxx>
-
-#include <editsh.hxx>
-#include <doc.hxx>
-#include <pam.hxx>
-namespace binfilter {
-
-/*N*/ SwEditShell::~SwEditShell() // USED
-/*N*/ {
-/*N*/ }
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
index 9a67faa..e0e1609 100644
--- a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
@@ -44,7 +44,7 @@
#include <osl/diagnose.h>
#include <viscrs.hxx>
-#include <editsh.hxx>
+#include <crsrsh.hxx>
#include <docfld.hxx>
#include <docufld.hxx>
#include <shellres.hxx>
diff --git a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
index af75d56..75c6129 100644
--- a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
+++ b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
@@ -67,7 +67,6 @@
#include <swbaslnk.hxx>
#include <pagefrm.hxx>
#include <viscrs.hxx>
-#include <editsh.hxx>
#include <pam.hxx>
namespace binfilter {
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
index 8780fb6..8bbde2b 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
@@ -51,7 +51,6 @@
#include <horiornt.hxx>
#include <doc.hxx>
-#include <editsh.hxx>
#include <pagedesc.hxx>
#include <poolfmt.hxx>
#include <fltini.hxx>
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
index a5faaff..737d218 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
@@ -61,7 +61,6 @@
#include <poolfmt.hxx>
#include <ndtxt.hxx>
#include <pam.hxx>
-#include <editsh.hxx>
#include "xmlimp.hxx"
diff --git a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
index ce876cb..95dbf1f 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
@@ -47,7 +47,6 @@
#include <fldupde.hxx>
#include <linkenum.hxx>
#include <bf_sfx2/printer.hxx>
-#include <editsh.hxx>
#include <bf_sfx2/docinf.hxx>
#include <drawdoc.hxx>
#include <bf_svtools/zforlist.hxx>
diff --git a/binfilter/inc/bf_sw/editsh.hxx b/binfilter/inc/bf_sw/editsh.hxx
index 4b373ad..783e267 100644
--- a/binfilter/inc/bf_sw/editsh.hxx
+++ b/binfilter/inc/bf_sw/editsh.hxx
@@ -38,6 +38,7 @@
#include <itabenum.hxx>
#include <swdbdata.hxx>
#include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
+
namespace com { namespace sun { namespace star { namespace uno {
template < class > class Sequence;
}}}}
@@ -231,7 +232,7 @@ public:
const SvNumberFormatter* GetNumberFormatter() const
{ return ((SwEditShell*)this)->GetNumberFormatter(); }
- virtual ~SwEditShell();
+ virtual ~SwEditShell() {}
private:
// fuer METWARE:
commit 2a405ba42b292ca0a67d34de630afacc71950c1a
Author: Joseph Powers <jpowers27 at cox.net>
Date: Fri Sep 30 06:47:28 2011 -0700
Some simple DBG_BF_ASSERT() cleanup
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 3950a85..5adafe7 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -257,7 +257,6 @@ namespace binfilter {
/*N*/ ScRange aRange( 0,0,nPos, MAXCOL,MAXROW,MAXTAB );
/*N*/ xColNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,1 );
/*N*/ xRowNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,1 );
-/*N*/ pRangeName->UpdateTabRef( nPos, 1 );
/*N*/ pDBCollection->UpdateReference(
/*N*/ URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 );
/*N*/ if (pPivotCollection)
@@ -319,7 +318,6 @@ namespace binfilter {
/*N*/ aRange.aEnd.SetTab( MAXTAB );
/*N*/ xColNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,-1 );
/*N*/ xRowNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,-1 );
-/*N*/ pRangeName->UpdateTabRef( nTab, 2 );
/*N*/ pDBCollection->UpdateReference(
/*N*/ URM_INSDEL, 0,0,nTab, MAXCOL,MAXROW,MAXTAB, 0,0,-1 );
/*N*/ if (pPivotCollection)
@@ -1073,13 +1071,6 @@ void ScDocument::GetDataArea( USHORT, USHORT&, USHORT&, USHORT&, USHORT&, BOOL )
/*N*/ pFormatExchangeList = NULL;
/*N*/ if ( bRangeNameReplace )
/*N*/ {
-/*N*/ // first update all inserted named formulas if they contain other
-/*N*/ // range names and used indices changed
-/*N*/ for (i = 0; i < nClipRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch
-/*N*/ {
-/*N*/ if ( pClipRangeNames[i] )
-/*N*/ pClipRangeNames[i]->ReplaceRangeNamesInUse( aClipRangeMap );
-/*N*/ }
/*N*/ // then update the formulas, they might need the just updated range names
/*N*/ USHORT nC1_b = nCol1;
/*N*/ USHORT nR1_b = nRow1;
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx b/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
index 109034a..04adbd6 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
@@ -289,27 +289,6 @@ namespace binfilter {
/*N*/ return BOOL( pCode->GetNextReference() != NULL );
/*N*/ }
-// bei TransferTab von einem in ein anderes Dokument anpassen,
-// um Referenzen auf die eigene Tabelle mitzubekommen
-
-
-
-/*N*/ void ScRangeData::ReplaceRangeNamesInUse( const ScIndexMap& /*rMap*/ )
-/*N*/ {
-/*N*/ BOOL bCompile = FALSE;
-/*N*/ for ( ScToken* p = pCode->First(); p; p = pCode->Next() )
-/*N*/ {
-/*N*/ if ( p->GetOpCode() == ocName )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/ if ( bCompile )
-/*N*/ {
-/*N*/ ScCompiler aComp( pDoc, aPos, *pCode );
-/*N*/ aComp.CompileTokenArray();
-/*N*/ }
-/*N*/ }
/*N*/ void ScRangeData::ValidateTabRefs()
@@ -503,15 +482,6 @@ namespace binfilter {
-/*N*/ void ScRangeName::UpdateTabRef(USHORT /*nOldTable*/, USHORT /*nFlag*/, USHORT /*nNewTable*/)
-/*N*/ {
-/*N*/ for (USHORT i=0; i<nCount; i++)
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
index 4022c71..a0c8573 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
@@ -133,10 +133,6 @@ namespace binfilter {
/*N*/ nRowEnd = aEndPos.GetRow();
/*N*/ bResult = TRUE;
/*N*/ }
-/*N*/ else
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ }
/*N*/ else if( eScope==RUTL_DBASE )
@@ -188,9 +184,6 @@ namespace binfilter {
//------------------------------------------------------------------------
-
-//------------------------------------------------------------------------
-
/*N*/ ScArea& ScArea::operator=( const ScArea& r )
/*N*/ {
/*N*/ nTab = r.nTab;
diff --git a/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx b/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx
index 7c7375b..b5fd75a 100644
--- a/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx
@@ -55,10 +55,10 @@ namespace binfilter {
/*N*/ }
-/*N*/ void ScRefreshTimer::SetRefreshDelay( ULONG /*nSeconds*/ )
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+void ScRefreshTimer::SetRefreshDelay( ULONG /*nSeconds*/ )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
diff --git a/binfilter/bf_sc/source/core/tool/sc_refupdat.cxx b/binfilter/bf_sc/source/core/tool/sc_refupdat.cxx
index f4dd3c1..931b461 100644
--- a/binfilter/bf_sc/source/core/tool/sc_refupdat.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_refupdat.cxx
@@ -299,15 +299,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/ else if (eUpdateRefMode == URM_MOVE)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if (eUpdateRefMode == URM_REORDER)
-/*N*/ {
-/*?*/ // bisher nur fuer nDz (MoveTab)
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ if ( eRet == UR_NOTHING )
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_token.cxx b/binfilter/bf_sc/source/core/tool/sc_token.cxx
index c55fd17..00f5323 100644
--- a/binfilter/bf_sc/source/core/tool/sc_token.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_token.cxx
@@ -571,10 +571,13 @@ USHORT lcl_ScRawTokenOffset()
/*N*/ ScToken* ScFAPToken::GetFAPOrigToken() const { return pOrigToken; }
-/*N*/ BOOL ScFAPToken::operator==( const ScToken& r ) const
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;/*N*/ return ScToken::operator==( r ) && pOrigToken == r.GetFAPOrigToken();
-/*N*/ }
+
+BOOL ScFAPToken::operator==( const ScToken& r ) const
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return FALSE;
+ // return ScToken::operator==( r ) && pOrigToken == r.GetFAPOrigToken();
+}
/*N*/ double ScDoubleToken::GetDouble() const { return fDouble; }
diff --git a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
index ae8f325..c0564c8 100644
--- a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
@@ -592,19 +592,19 @@ using ::rtl::OUString;
/*N*/ IMPL_LINK( ScViewCfg, LayoutCommitHdl, void *, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK
/*N*/ return 0;
/*N*/ }
/*N*/ IMPL_LINK( ScViewCfg, DisplayCommitHdl, void *, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK
/*N*/ return 0;
/*N*/ }
/*N*/ IMPL_LINK( ScViewCfg, GridCommitHdl, void *, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK
/*N*/ return 0;
/*N*/ }
diff --git a/binfilter/inc/bf_sc/rangenam.hxx b/binfilter/inc/bf_sc/rangenam.hxx
index f11ac87..3fa1a32 100644
--- a/binfilter/inc/bf_sc/rangenam.hxx
+++ b/binfilter/inc/bf_sc/rangenam.hxx
@@ -141,8 +141,6 @@ public:
void ValidateTabRefs();
- void ReplaceRangeNamesInUse( const ScIndexMap& rMap );
-
static void MakeValidName( String& rName );
#ifdef WNT
static int __cdecl QsortNameCompare( const void*, const void* );
@@ -190,7 +188,6 @@ public:
/*N*/ void UpdateReference(UpdateRefMode eUpdateRefMode,
/*N*/ const ScRange& rRange,
/*N*/ short nDx, short nDy, short nDz );
- void UpdateTabRef(USHORT nTable, USHORT nFlag, USHORT nNewTable = 0);
/*N*/ void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest );
/*N*/ void UpdateGrow( const ScRange& rArea, USHORT nGrowX, USHORT nGrowY );
virtual BOOL Insert(DataObject* pDataObject);
commit edc6d3d9e4b83da913aa3656bec3fe62a8a4af83
Author: Joseph Powers <jpowers27 at cox.net>
Date: Thu Sep 29 07:17:46 2011 -0700
Remove DBG_BF_ASSERT
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index e3ffccd..066ff14 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -537,23 +537,6 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*?*/ else
/*?*/ OSL_FAIL("Calc3/4: kein Storage");
/*N*/ }
-/*N*/ else if (aFltName.EqualsAscii(pFilterXML))
-/*?*/ { DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ else if (aFltName.EqualsAscii(pFilterSc10))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if (aFltName.EqualsAscii(pFilterLotus))
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if ( aFltName.EqualsAscii(pFilterExcel4) || aFltName.EqualsAscii(pFilterExcel5) ||
-/*N*/ aFltName.EqualsAscii(pFilterExcel95) || aFltName.EqualsAscii(pFilterExcel97) ||
-/*N*/ aFltName.EqualsAscii(pFilterEx4Temp) || aFltName.EqualsAscii(pFilterEx5Temp) ||
-/*N*/ aFltName.EqualsAscii(pFilterEx95Temp) || aFltName.EqualsAscii(pFilterEx97Temp) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ else if (aFltName.EqualsAscii(pFilterAscii))
/*N*/ {
/*N*/ SfxItemSet* pSet = rMedium.GetItemSet();
@@ -614,17 +597,8 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ bSetColWidths = TRUE;
/*N*/ bSetSimpleTextColWidths = TRUE;
/*N*/ }
-/*N*/ else if (aFltName.EqualsAscii(pFilterDBase))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ else if (aFltName.EqualsAscii(pFilterDif))
/*N*/ {
-/*?*/ SvStream* pStream = rMedium.GetInStream();
-/*?*/ if (pStream)
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ bSetColWidths = TRUE;
/*?*/ bSetSimpleTextColWidths = TRUE;
/*N*/ }
@@ -653,14 +627,26 @@ DBG_BF_ASSERT(0, "STRIP");
/*?*/ bSetColWidths = TRUE;
/*?*/ bSetSimpleTextColWidths = TRUE;
/*N*/ }
-/*N*/ else if (aFltName.EqualsAscii(pFilterRtf))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if (aFltName.EqualsAscii(pFilterHtml) || aFltName.EqualsAscii(pFilterHtmlWebQ))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+ else if (
+ aFltName.EqualsAscii(pFilterExcel4)
+ || aFltName.EqualsAscii(pFilterExcel5)
+ || aFltName.EqualsAscii(pFilterExcel95)
+ || aFltName.EqualsAscii(pFilterExcel97)
+ || aFltName.EqualsAscii(pFilterEx4Temp)
+ || aFltName.EqualsAscii(pFilterEx5Temp)
+ || aFltName.EqualsAscii(pFilterEx95Temp)
+ || aFltName.EqualsAscii(pFilterEx97Temp)
+ || aFltName.EqualsAscii(pFilterXML)
+ || aFltName.EqualsAscii(pFilterSc10)
+ || aFltName.EqualsAscii(pFilterLotus)
+ || aFltName.EqualsAscii(pFilterDBase)
+ || aFltName.EqualsAscii(pFilterRtf)
+ || aFltName.EqualsAscii(pFilterHtml)
+ || aFltName.EqualsAscii(pFilterHtmlWebQ)
+ )
+ {
+ // Ignore these filters; Don't let the else generate an error
+ }
/*N*/ else
/*N*/ {
/*N*/ if (!GetError())
commit 55c72b1befc36ccf4b9d72d2a6df343e8f2a6d7c
Author: Joseph Powers <jpowers27 at cox.net>
Date: Thu Sep 29 07:05:25 2011 -0700
Remove class ScOutlineDocFunc
diff --git a/binfilter/bf_sc/source/ui/docshell/makefile.mk b/binfilter/bf_sc/source/ui/docshell/makefile.mk
index 9ca2216..400d470 100644
--- a/binfilter/bf_sc/source/ui/docshell/makefile.mk
+++ b/binfilter/bf_sc/source/ui/docshell/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
@@ -53,7 +53,6 @@ SLOFILES = \
$(SLO)$/sc_dbdocimp.obj \
$(SLO)$/sc_impex.obj \
$(SLO)$/sc_docfunc.obj \
- $(SLO)$/sc_olinefun.obj \
$(SLO)$/sc_pntlock.obj \
$(SLO)$/sc_sizedev.obj \
$(SLO)$/sc_editable.obj
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx
deleted file mode 100644
index 088abff..0000000
--- a/binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx
+++ /dev/null
@@ -1,88 +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.
- *
- ************************************************************************/
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-
-#include "olinefun.hxx"
-
-#include "docsh.hxx"
-#include "globstr.hrc"
-#include "bf_sc.hrc"
-namespace binfilter {
-
-
-
-/*N*/ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& /*rRange*/, BOOL /*bColumns*/, BOOL /*bRecord*/, BOOL /*bApi*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-/*N*/ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& /*rRange*/, BOOL /*bColumns*/, BOOL /*bRecord*/, BOOL /*bApi*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-/*N*/ BOOL ScOutlineDocFunc::RemoveAllOutlines( USHORT /*nTab*/, BOOL /*bRecord*/, BOOL /*bApi*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-//------------------------------------------------------------------------
-
-/*N*/ BOOL ScOutlineDocFunc::AutoOutline( const ScRange& /*rRange*/, BOOL /*bRecord*/, BOOL /*bApi*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return TRUE;
-/*N*/ }
-
-//------------------------------------------------------------------------
-
-/*N*/ BOOL ScOutlineDocFunc::SelectLevel( USHORT /*nTab*/, BOOL /*bColumns*/, USHORT /*nLevel*/,
-/*N*/ BOOL /*bRecord*/, BOOL /*bPaint*/, BOOL /*bApi*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return TRUE;
-/*N*/ }
-
-//------------------------------------------------------------------------
-
-/*N*/ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& /*rRange*/, BOOL /*bRecord*/, BOOL /*bApi*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-/*N*/ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& /*rRange*/, BOOL/* bRecord*/, BOOL /*bApi*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx b/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx
index fdc57c2..e02a179 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx
@@ -373,12 +373,6 @@ namespace binfilter {
/*M*/ pDocShell = new ScDocShell( SFX_CREATE_MODE_INTERNAL );
/*M*/ aRef = pDocShell;
/*M*/
-/*M*/ ScDocument* pDoc = pDocShell->GetDocument();
-/*M*/ if( pDoc )
-/*M*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/
/*M*/ pDocShell->DoLoad( pMedium );
/*M*/
/*M*/ String aNew = GetOptions(*pMedium); // Optionen werden beim Laden per Dialog gesetzt
diff --git a/binfilter/bf_sc/source/ui/inc/olinefun.hxx b/binfilter/bf_sc/source/ui/inc/olinefun.hxx
deleted file mode 100644
index 4e4d0e2..0000000
--- a/binfilter/bf_sc/source/ui/inc/olinefun.hxx
+++ /dev/null
@@ -1,67 +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_OLINEFUN_HXX
-#define SC_OLINEFUN_HXX
-
-#include "global.hxx"
-namespace binfilter {
-
-class ScDocShell;
-class ScRange;
-
-
-// ---------------------------------------------------------------------------
-
-class ScOutlineDocFunc
-{
-private:
- ScDocShell& rDocShell;
-
-public:
- ScOutlineDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {}
- ~ScOutlineDocFunc() {}
-
- BOOL MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi );
- BOOL RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi );
- BOOL RemoveAllOutlines( USHORT nTab, BOOL bRecord, BOOL bApi );
- BOOL AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bApi );
-
- BOOL SelectLevel( USHORT nTab, BOOL bColumns, USHORT nLevel,
- BOOL bRecord, BOOL bPaint, BOOL bApi );
-
- BOOL ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi );
- BOOL HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi );
-};
-
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/unoobj/makefile.mk b/binfilter/bf_sc/source/ui/unoobj/makefile.mk
index 3e4e91b..def7879 100644
--- a/binfilter/bf_sc/source/ui/unoobj/makefile.mk
+++ b/binfilter/bf_sc/source/ui/unoobj/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
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index 171539a..8e829f8 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -85,7 +85,6 @@
#include "docpool.hxx"
#include "docfunc.hxx"
#include "dbdocfun.hxx"
-#include "olinefun.hxx"
#include "hints.hxx"
#include "cell.hxx"
#include "undotab.hxx"
@@ -6915,100 +6914,43 @@ void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rRange,
table::TableOrientation nOrientation )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
- ScDocShell* pDocSh = GetDocShell();
- if ( pDocSh )
- {
- BOOL bColumns = ( nOrientation == table::TableOrientation_COLUMNS );
- ScRange aGroupRange;
- ScUnoConversion::FillScRange( aGroupRange, rRange );
- ScOutlineDocFunc aFunc(*pDocSh);
- aFunc.MakeOutline( aGroupRange, bColumns, TRUE, TRUE );
- }
+ DBG_BF_ASSERT(0, "STRIP");
}
void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rRange,
table::TableOrientation nOrientation )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
- ScDocShell* pDocSh = GetDocShell();
- if ( pDocSh )
- {
- BOOL bColumns = ( nOrientation == table::TableOrientation_COLUMNS );
- ScRange aGroupRange;
- ScUnoConversion::FillScRange( aGroupRange, rRange );
- ScOutlineDocFunc aFunc(*pDocSh);
- aFunc.RemoveOutline( aGroupRange, bColumns, TRUE, TRUE );
- }
+ DBG_BF_ASSERT(0, "STRIP");
}
void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rRange )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
- ScDocShell* pDocSh = GetDocShell();
- if ( pDocSh )
- {
- ScRange aFormulaRange;
- ScUnoConversion::FillScRange( aFormulaRange, rRange );
- ScOutlineDocFunc aFunc(*pDocSh);
- aFunc.AutoOutline( aFormulaRange, TRUE, TRUE );
- }
+ DBG_BF_ASSERT(0, "STRIP");
}
void SAL_CALL ScTableSheetObj::clearOutline() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
- ScDocShell* pDocSh = GetDocShell();
- if ( pDocSh )
- {
- USHORT nTab = GetTab_Impl();
- ScOutlineDocFunc aFunc(*pDocSh);
- aFunc.RemoveAllOutlines( nTab, TRUE, TRUE );
- }
+ DBG_BF_ASSERT(0, "STRIP");
}
void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rRange )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
- ScDocShell* pDocSh = GetDocShell();
- if ( pDocSh )
- {
- ScRange aMarkRange;
- ScUnoConversion::FillScRange( aMarkRange, rRange );
- ScOutlineDocFunc aFunc(*pDocSh);
- aFunc.HideMarkedOutlines( aMarkRange, TRUE, TRUE );
- }
+ DBG_BF_ASSERT(0, "STRIP");
}
void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rRange )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
- ScDocShell* pDocSh = GetDocShell();
- if ( pDocSh )
- {
- ScRange aMarkRange;
- ScUnoConversion::FillScRange( aMarkRange, rRange );
- ScOutlineDocFunc aFunc(*pDocSh);
- aFunc.ShowMarkedOutlines( aMarkRange, TRUE, TRUE );
- }
+ DBG_BF_ASSERT(0, "STRIP");
}
void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientation nOrientation )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
- ScDocShell* pDocSh = GetDocShell();
- if ( pDocSh )
- {
- BOOL bColumns = ( nOrientation == table::TableOrientation_COLUMNS );
- USHORT nTab = GetTab_Impl();
- ScOutlineDocFunc aFunc(*pDocSh);
- aFunc.SelectLevel( nTab, bColumns, nLevel, TRUE, TRUE, TRUE );
- }
+ DBG_BF_ASSERT(0, "STRIP");
}
// XProtectable
More information about the Libreoffice-commits
mailing list