[ooo-build-commit] Branch 'ooo/master' - binfilter/bf_sfx2 binfilter/bf_sw binfilter/prj

Jan Holesovsky kendy at kemper.freedesktop.org
Fri Oct 9 08:27:40 PDT 2009


 binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx   |    1 
 binfilter/bf_sw/source/core/doc/makefile.mk     |    4 
 binfilter/bf_sw/source/core/doc/sw_gcc_outl.cxx |  347 ------------------------
 binfilter/prj/build.lst                         |    2 
 4 files changed, 1 insertion(+), 353 deletions(-)

New commits:
commit 90e85979fdfbb18c27ab55fcc6e74730ec79b6d6
Author: Vladimir Glazounov <vg at openoffice.org>
Date:   Thu Oct 1 09:16:17 2009 +0000

    CWS-TOOLING: integrate CWS cmcfixes62
    2009-09-22 21:19:24 +0200 cmc  r276365 : #i100000# that's the most plausible explanation, -D$(CVER) is needed by scp2 under windows
    2009-09-19 16:10:36 +0200 cmc  r276303 : #i100000# revert this for no partically good reason
    2009-09-18 14:16:47 +0200 cmc  r276279 : remove extra build depend
    2009-09-18 08:56:15 +0200 cmc  r276265 : #i100000# rerun autoconf
    2009-09-17 14:59:38 +0200 cmc  r276245 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk at 276192 (milestone: DEV300:m59)
    2009-09-10 16:40:49 +0200 pl  r276041 : fix warning
    2009-09-10 11:34:55 +0200 pl  r276026 : disable warning from system header
    2009-09-09 19:30:45 +0200 pl  r276013 : use osl_getAsciiFunctionSymbol instead of strange cast
    2009-09-09 19:25:32 +0200 pl  r276012 : add some casting hacks to make compile on solaris cc
    2009-09-09 19:10:48 +0200 pl  r276009 : add missing Configure option for solaris sparce 32bit
    2009-09-09 18:37:05 +0200 pl  r276008 : merge fix for #i104525# into moved code
    2009-09-07 13:28:08 +0200 cmc  r275894 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk at 275801 (milestone: DEV300:m57)
    2009-08-28 12:36:27 +0200 cmc  r275523 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk at 275331 (milestone: DEV300:m56)
    2009-08-26 12:56:18 +0200 cmc  r275413 : #i104088# use the right headers in the right place
    2009-08-25 17:07:50 +0200 cmc  r275372 : #i104500# make openssl build on linux that isn't x86 or x86_64
    2009-08-25 13:08:48 +0200 cmc  r275347 : #i89237# pretty picswitch up
    2009-08-25 10:58:09 +0200 cmc  r275342 : #i104489# remove last unused code in starmath
    2009-08-25 10:23:33 +0200 cmc  r275338 : #i104088# clean up the define post-move
    2009-08-24 13:46:57 +0200 cmc  r275310 : #i104088# 64bit odbc api changes
    2009-08-24 13:42:52 +0200 cmc  r275309 : #i89237# unify linux platform mks under a generic parent
    2009-08-24 13:19:52 +0200 cmc  r275307 : #i104455# remove unused code
    2009-08-24 13:10:56 +0200 cmc  r275306 : #i104088# 64bit odbc api changes
    2009-08-24 10:07:50 +0200 cmc  r275293 : #i104306# move recent-used to vcl
    2009-08-24 09:32:08 +0200 cmc  r275291 : #i104306# move recent-used to vcl
    2009-08-23 22:01:07 +0200 cmc  r275286 : #i104306# move recently-used to vcl
    2009-08-22 15:25:25 +0200 cmc  r275285 : #i104088# 64bit odbc api changes
    2009-08-21 17:52:40 +0200 cmc  r275268 : #i104306# move recently-used to vcl
    2009-08-21 14:38:26 +0200 cmc  r275257 : #i104408 make these headers ready for c++0x
    2009-08-21 14:20:19 +0200 cmc  r275251 : #i104406# avoid overlapping strcpy to avoid bustage on recent toolchains
    2009-08-21 14:14:25 +0200 cmc  r275250 : #i104385# silence 64bit warnings

diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index b15ded4..430007b 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -138,7 +138,6 @@
 #include <unotools/tempfile.hxx>
 #include <ucbhelper/content.hxx>
 #include <sot/storinfo.hxx>
-#include <shell/systemshell.hxx>
 
 #include "objsh.hxx"
 #include "request.hxx"
diff --git a/binfilter/bf_sw/source/core/doc/makefile.mk b/binfilter/bf_sw/source/core/doc/makefile.mk
index ab7e3f1..74ada30 100644
--- a/binfilter/bf_sw/source/core/doc/makefile.mk
+++ b/binfilter/bf_sw/source/core/doc/makefile.mk
@@ -89,10 +89,6 @@ SLOFILES =	\
         $(SLO)$/sw_visiturl.obj \
         $(SLO)$/sw_htmltbl.obj
 
-.IF "$(OS)$(CVER)"=="MACOSXC295"
-SLOFILES += $(SLO)$/sw_gcc_outl.obj
-.ENDIF
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/binfilter/bf_sw/source/core/doc/sw_gcc_outl.cxx b/binfilter/bf_sw/source/core/doc/sw_gcc_outl.cxx
deleted file mode 100644
index 9724757..0000000
--- a/binfilter/bf_sw/source/core/doc/sw_gcc_outl.cxx
+++ /dev/null
@@ -1,347 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sw_gcc_outl.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <format.hxx>
-namespace binfilter {
-
-#if ( defined GCC && defined C272 )
-
-#if ( defined SINIX || defined HPUX || defined LINUX )
-const SwFmtCol &SwFmt::GetCol(BOOL bInP) const
-    { return aSet.GetCol(bInP); }
-const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const
-    { return aSet.GetAnchor(bInP); }
-const SwFmtHoriOrient &SwFmt::GetHoriOrient(BOOL bInP) const
-    { return aSet.GetHoriOrient(bInP); }
-const SwFmtSurround &SwFmt::GetSurround(BOOL bInP) const
-    { return aSet.GetSurround(bInP); }
-const SwFmtFooter &SwFmt::GetFooter(BOOL bInP) const
-    { return aSet.GetFooter(bInP); }
-const SwFmtHeader &SwFmt::GetHeader(BOOL bInP) const
-    { return aSet.GetHeader(bInP); }
-const SwFmtFillOrder &SwFmt::GetFillOrder(BOOL bInP) const
-    { return aSet.GetFillOrder(bInP); }
-const SwFmtFrmSize &SwFmt::GetFrmSize(BOOL bInP) const
-    { return aSet.GetFrmSize(bInP); }
-#endif
-#if ( defined HPUX )
-const SvxPaperBinItem &SwFmt::GetPaperBin(BOOL bInP) const
-    { return aSet.GetPaperBin(bInP); }
-const SvxLRSpaceItem &SwFmt::GetLRSpace(BOOL bInP) const
-    { return aSet.GetLRSpace(bInP); }
-const SvxULSpaceItem &SwFmt::GetULSpace(BOOL bInP) const
-    { return aSet.GetULSpace(bInP); }
-const SwFmtCntnt &SwFmt::GetCntnt(BOOL bInP) const
-    { return aSet.GetCntnt(bInP); }
-const SvxPrintItem &SwFmt::GetPrint(BOOL bInP) const
-    { return aSet.GetPrint(bInP); }
-const SvxOpaqueItem &SwFmt::GetOpaque(BOOL bInP) const
-    { return aSet.GetOpaque(bInP); }
-const SvxProtectItem &SwFmt::GetProtect(BOOL bInP) const
-    { return aSet.GetProtect(bInP); }
-const SwFmtVertOrient &SwFmt::GetVertOrient(BOOL bInP) const
-    { return aSet.GetVertOrient(bInP); }
-const SvxBoxItem &SwFmt::GetBox(BOOL bInP) const
-    { return aSet.GetBox(bInP); }
-const SvxFmtKeepItem &SwFmt::GetKeep(BOOL bInP) const
-    { return aSet.GetKeep(bInP); }
-const SvxBrushItem &SwFmt::GetBackground(BOOL bInP) const
-    { return aSet.GetBackground(bInP); }
-const SvxShadowItem &SwFmt::GetShadow(BOOL bInP) const
-    { return aSet.GetShadow(bInP); }
-const SwFmtPageDesc &SwFmt::GetPageDesc(BOOL bInP) const
-    { return aSet.GetPageDesc(bInP); }
-const SvxFmtBreakItem &SwFmt::GetBreak(BOOL bInP) const
-    { return aSet.GetBreak(bInP); }
-const SvxMacroItem &SwFmt::GetMacro(BOOL bInP) const
-    { return aSet.GetMacro(bInP); }
-#endif
-
-#endif
-
-
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-// GrP revisit with gcc3
-
-// fmtfordr.hxx
- const SwFmtFillOrder &SwAttrSet::GetFillOrder(BOOL bInP) const
-    { return (const SwFmtFillOrder&)Get( RES_FILL_ORDER,bInP); }
- const SwFmtFillOrder &SwFmt::GetFillOrder(BOOL bInP) const
-    { return aSet.GetFillOrder(bInP); }
-
-// fmtfsize.hxx
- const SwFmtFrmSize &SwAttrSet::GetFrmSize(BOOL bInP) const
-    { return (const SwFmtFrmSize&)Get( RES_FRM_SIZE,bInP); }
- const SwFmtFrmSize &SwFmt::GetFrmSize(BOOL bInP) const
-    { return aSet.GetFrmSize(bInP); }
-
-// fmtatr.hxx
- const SvxPaperBinItem &SwAttrSet::GetPaperBin(BOOL bInP) const
-    { return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); }
- const SvxPaperBinItem &SwFmt::GetPaperBin(BOOL bInP) const
-    { return aSet.GetPaperBin(bInP); }
- const SvxLRSpaceItem &SwAttrSet::GetLRSpace(BOOL bInP) const
-    { return (const SvxLRSpaceItem&)Get( RES_LR_SPACE,bInP); }
- const SvxLRSpaceItem &SwFmt::GetLRSpace(BOOL bInP) const
-    { return aSet.GetLRSpace(bInP); }
- const SvxULSpaceItem &SwAttrSet::GetULSpace(BOOL bInP) const
-    { return (const SvxULSpaceItem&)Get( RES_UL_SPACE,bInP); }
- const SvxULSpaceItem &SwFmt::GetULSpace(BOOL bInP) const
-    { return aSet.GetULSpace(bInP); }
-
-// fmtcntnt.hxx
- const SwFmtCntnt &SwAttrSet::GetCntnt(BOOL bInP) const
-    { return (const SwFmtCntnt&)Get( RES_CNTNT,bInP); }
- const SwFmtCntnt &SwFmt::GetCntnt(BOOL bInP) const
-    { return aSet.GetCntnt(bInP); }
-
-// fmthdft.hxx
- const SwFmtHeader &SwAttrSet::GetHeader(BOOL bInP) const
-    { return (const SwFmtHeader&)Get( RES_HEADER,bInP); }
- const SwFmtHeader &SwFmt::GetHeader(BOOL bInP) const
-    { return aSet.GetHeader(bInP); }
- const SwFmtFooter &SwAttrSet::GetFooter(BOOL bInP) const
-    { return (const SwFmtFooter&)Get( RES_FOOTER,bInP); }
- const SwFmtFooter &SwFmt::GetFooter(BOOL bInP) const
-    { return aSet.GetFooter(bInP); }
-
-// fmtatr.hxx
- const SvxPrintItem &SwAttrSet::GetPrint(BOOL bInP) const
-    { return (const SvxPrintItem&)Get( RES_PRINT,bInP); }
- const SvxPrintItem &SwFmt::GetPrint(BOOL bInP) const
-    { return aSet.GetPrint(bInP); }
- const SvxOpaqueItem &SwAttrSet::GetOpaque(BOOL bInP) const
-    { return (const SvxOpaqueItem&)Get( RES_OPAQUE,bInP); }
- const SvxOpaqueItem &SwFmt::GetOpaque(BOOL bInP) const
-    { return aSet.GetOpaque(bInP); }
- const SvxProtectItem &SwAttrSet::GetProtect(BOOL bInP) const
-    { return (const SvxProtectItem&)Get( RES_PROTECT,bInP); }
- const SvxProtectItem &SwFmt::GetProtect(BOOL bInP) const
-    { return aSet.GetProtect(bInP); }
-
-// fmtsrnd.hxx
- const SwFmtSurround &SwAttrSet::GetSurround(BOOL bInP) const
-    { return (const SwFmtSurround&)Get( RES_SURROUND,bInP); }
- const SwFmtSurround &SwFmt::GetSurround(BOOL bInP) const
-    { return aSet.GetSurround(bInP); }
-
-// fmtornt.hxx
- const SwFmtVertOrient &SwAttrSet::GetVertOrient(BOOL bInP) const
-    { return (const SwFmtVertOrient&)Get( RES_VERT_ORIENT,bInP); }
- const SwFmtVertOrient &SwFmt::GetVertOrient(BOOL bInP) const
-    { return aSet.GetVertOrient(bInP); }
- const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(BOOL bInP) const
-    { return (const SwFmtHoriOrient&)Get( RES_HORI_ORIENT,bInP); }
- const SwFmtHoriOrient &SwFmt::GetHoriOrient(BOOL bInP) const
-    { return aSet.GetHoriOrient(bInP); }
-
-// fmtanchr.hxx
-const SwFmtAnchor &SwAttrSet::GetAnchor(BOOL bInP) const
-    { return (const SwFmtAnchor&)Get( RES_ANCHOR,bInP); }
-const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const
-     { return aSet.GetAnchor(bInP); }
-
-// fmtatr.hxx
- const SvxBoxItem &SwAttrSet::GetBox(BOOL bInP) const
-    { return (const SvxBoxItem&)Get( RES_BOX,bInP); }
- const SvxBoxItem &SwFmt::GetBox(BOOL bInP) const
-    { return aSet.GetBox(bInP); }
- const SvxFmtKeepItem &SwAttrSet::GetKeep(BOOL bInP) const
-    { return (const SvxFmtKeepItem&)Get( RES_KEEP,bInP); }
- const SvxFmtKeepItem &SwFmt::GetKeep(BOOL bInP) const
-    { return aSet.GetKeep(bInP); }
- const SvxBrushItem &SwAttrSet::GetBackground(BOOL bInP) const
-    { return (const SvxBrushItem&)Get( RES_BACKGROUND,bInP); }
- const SvxBrushItem &SwFmt::GetBackground(BOOL bInP) const
-    { return aSet.GetBackground(bInP); }
- const SvxShadowItem &SwAttrSet::GetShadow(BOOL bInP) const
-    { return (const SvxShadowItem&)Get( RES_SHADOW,bInP); }
- const SvxShadowItem &SwFmt::GetShadow(BOOL bInP) const
-    { return aSet.GetShadow(bInP); }
-
-// fmtpdsc.hxx
- const SwFmtPageDesc &SwAttrSet::GetPageDesc(BOOL bInP) const
-    { return (const SwFmtPageDesc&)Get( RES_PAGEDESC,bInP); }
- const SwFmtPageDesc &SwFmt::GetPageDesc(BOOL bInP) const
-    { return aSet.GetPageDesc(bInP); }
-
-// fmtatr.hxx
- const SvxFmtBreakItem &SwAttrSet::GetBreak(BOOL bInP) const
-    { return (const SvxFmtBreakItem&)Get( RES_BREAK,bInP); }
- const SvxFmtBreakItem &SwFmt::GetBreak(BOOL bInP) const
-    { return aSet.GetBreak(bInP); }
-
-// fmtclds.hxx
- const SwFmtCol &SwAttrSet::GetCol(BOOL bInP) const
-    { return (const SwFmtCol&)Get( RES_COL,bInP); }
- const SwFmtCol &SwFmt::GetCol(BOOL bInP) const
-    { return aSet.GetCol(bInP); }
-
-// fmtatr.hxx
- const SvxMacroItem &SwAttrSet::GetMacro(BOOL bInP) const
-    { return (const SvxMacroItem&)Get( RES_FRMMACRO,bInP); }
- const SvxMacroItem &SwFmt::GetMacro(BOOL bInP) const
-    { return aSet.GetMacro(bInP); }
-
-// fmturl.hxx
-const SwFmtURL &SwAttrSet::GetURL(BOOL bInP) const
-    { return (const SwFmtURL&)Get( RES_URL,bInP); }
-const SwFmtURL &SwFmt::GetURL(BOOL bInP) const
-    { return aSet.GetURL(bInP); }
-
-// fmteiro.hxx
- const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(BOOL bInP) const
-    { return (const SwFmtEditInReadonly&)Get( RES_EDIT_IN_READONLY,bInP); }
- const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(BOOL bInP) const
-    { return aSet.GetEditInReadonly(bInP); }
-
-// fmtlsplt.hxx
- const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(BOOL bInP) const
-    { return (const SwFmtLayoutSplit&)Get( RES_LAYOUT_SPLIT,bInP); }
- const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(BOOL bInP) const
-    { return aSet.GetLayoutSplit(bInP); }
-
-// fmtcnct.hxx
-const SwFmtChain &SwAttrSet::GetChain(BOOL bInP) const
-    { return (const SwFmtChain&)Get( RES_CHAIN,bInP); }
-const SwFmtChain &SwFmt::GetChain(BOOL bInP) const
-    { return aSet.GetChain(bInP); }
-
-// fmtline.hxx
- const SwFmtLineNumber &SwAttrSet::GetLineNumber(BOOL bInP) const
-    { return (const SwFmtLineNumber&)Get( RES_LINENUMBER,bInP); }
- const SwFmtLineNumber &SwFmt::GetLineNumber(BOOL bInP) const
-    { return aSet.GetLineNumber(bInP); }
-
-// fmtftntx.hxx
- const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(BOOL bInP) const
-    { return (const SwFmtFtnAtTxtEnd&)Get( RES_FTN_AT_TXTEND, bInP); }
- const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(BOOL bInP) const
-    { return aSet.GetFtnAtTxtEnd(bInP); }
- const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(BOOL bInP) const
-    { return (const SwFmtEndAtTxtEnd&)Get( RES_END_AT_TXTEND, bInP); }
- const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(BOOL bInP) const
-    { return aSet.GetEndAtTxtEnd(bInP); }
-
-// fmtclbl.hxx
- const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(BOOL bInP) const
-    { return (const SwFmtNoBalancedColumns&)Get( RES_COLUMNBALANCE, bInP ); }
- const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(BOOL bInP) const
-    { return aSet.GetBalancedColumns( bInP ); }
-
-// grfatr.hxx
- const SwMirrorGrf &SwAttrSet::GetMirrorGrf(BOOL bInP) const
-    { return (const SwMirrorGrf&)Get( RES_GRFATR_MIRRORGRF,bInP); }
- const SwMirrorGrf &SwFmt::GetMirrorGrf(BOOL bInP) const
-    { return aSet.GetMirrorGrf(bInP); }
-
-// cellatr.hxx
- const SwTblBoxNumFormat      &SwAttrSet::GetTblBoxNumFmt(BOOL bInP) const
-    {   return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); }
- const SwTblBoxFormula            &SwAttrSet::GetTblBoxFormula(BOOL bInP) const
-    {   return (const SwTblBoxFormula&)Get( RES_BOXATR_FORMULA,bInP); }
- const SwTblBoxValue                      &SwAttrSet::GetTblBoxValue(BOOL bInP) const
-    {   return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); }
- const SwTblBoxNumFormat		&SwFmt::GetTblBoxNumFmt(BOOL bInP) const
-    {   return aSet.GetTblBoxNumFmt(bInP); }
- const SwTblBoxFormula		&SwFmt::GetTblBoxFormula(BOOL bInP) const
-    {   return aSet.GetTblBoxFormula(bInP); }
- const SwTblBoxValue			&SwFmt::GetTblBoxValue(BOOL bInP) const
-    {   return aSet.GetTblBoxValue(bInP); }
-
-// charatr.hxx
- const SvxFontItem         &SwAttrSet::GetFont(BOOL bInP) const
-    {   return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); }
- const SvxFontItem             &SwFmt::GetFont(BOOL bInP) const
-    {   return aSet.GetFont(bInP); }
-
-// frmatr.hxx
- const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(BOOL bInP) const
-    { return (const SvxFrameDirectionItem&)Get( RES_FRAMEDIR,bInP); }
- const SvxFrameDirectionItem	&SwFmt::GetFrmDir(BOOL bInP) const
-    { return aSet.GetFrmDir(bInP); }
-        
-#include <node.hxx>
-#include <ndole.hxx>
-#include <ndtxt.hxx>
-#include <ndnotxt.hxx>
-#include <ndgrf.hxx>
-
-/* [ed] 4/27/02 I changed all of the static casts below to dynamic casts.  While
-   debugging swriter, I noticed these functions weren't properly offsetting the
-   pointers to this to upcast the objects.  Instead, they returned the straight
-   pointer to the SwNode instead of the ponter to the start of the record of the
-   appropriate node type. 
-   
-   All of these are essentially trying to just mimic RTTI anyway. */
-   
-// ndole.hxx
- SwOLENode *SwNode::GetOLENode()
-{
-     return ND_OLENODE == nNodeType ? dynamic_cast<SwOLENode *>(this) : 0;
-}
- const SwOLENode *SwNode::GetOLENode() const
-{
-     return ND_OLENODE == nNodeType ? dynamic_cast<const SwOLENode *>(this) : 0;
-}
-
-// ndtxt.hxx
-       SwTxtNode   *SwNode::GetTxtNode()
-{
-     return ND_TEXTNODE == nNodeType ? dynamic_cast<SwTxtNode *>(this) : 0;
-}
- const SwTxtNode   *SwNode::GetTxtNode() const
-{
-     return ND_TEXTNODE == nNodeType ? dynamic_cast<const SwTxtNode *>(this) : 0;
-}
-
-// ndnotxt.hxx
- SwNoTxtNode *SwNode::GetNoTxtNode()
-{
-    return ND_NOTXTNODE & nNodeType ? dynamic_cast<SwNoTxtNode *>(this) : 0;
-}
- const SwNoTxtNode *SwNode::GetNoTxtNode() const
-{
-    return ND_NOTXTNODE & nNodeType ? dynamic_cast<const SwNoTxtNode *>(this) : 0;
-}
-
-// ndgrf.hxx
-       SwGrfNode	 *SwNode::GetGrfNode()
-{
-     return ND_GRFNODE == nNodeType ? dynamic_cast<SwGrfNode *>(this) : 0;
-}
- const SwGrfNode   *SwNode::GetGrfNode() const
-{
-     return ND_GRFNODE == nNodeType ? dynamic_cast<const SwGrfNode *>(this) : 0;
-}
-
-// defined MACOSX
-#endif
-}
diff --git a/binfilter/prj/build.lst b/binfilter/prj/build.lst
index bd82ea9..3007d98 100644
--- a/binfilter/prj/build.lst
+++ b/binfilter/prj/build.lst
@@ -1,4 +1,4 @@
-bf      binfilter :     idl basic goodies xmlscript connectivity framework stoc uui offuh shell NULL
+bf      binfilter :     idl basic goodies xmlscript connectivity framework stoc uui offuh NULL
 bf	binfilter											usr1	-	all	bf_mkout NULL
 bf	binfilter\bf_svtools\source\inc						get		-	all	bf_svt_sinc NULL
 bf  binfilter\bf_svtools\source\config					nmake	-	all bf_svt_config NULL


More information about the ooo-build-commit mailing list