svtools/source/filter/filter.cxx | 3 --- sw/source/core/docnode/ndsect.cxx | 4 ---- sw/source/core/docnode/node.cxx | 8 -------- sw/source/core/table/swtable.cxx | 10 ---------- tools/source/stream/strmunx.cxx | 4 ++-- 5 files changed, 2 insertions(+), 27 deletions(-)
New commits: commit 6612ea7d9b03dc9cec1c98fdff0e1a22d2aab241 Author: Takeshi Abe <[email protected]> Date: Mon Oct 3 01:46:06 2011 +0900 definition of ALPHA is no longer available for DEC Alpha proper ifdef for DEC Alpha should be covered with AXP diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index 72fc266..5c9edab 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -29,9 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#if defined UNX && defined ALPHA -#include <fstream.hxx> -#endif #include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <ucbhelper/content.hxx> diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index aa5d5ec..51538f6 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -990,11 +990,7 @@ SwSectionNode* SwNode::FindSectionNode() return GetSectionNode(); SwStartNode* pTmp = pStartOfSection; while( !pTmp->IsSectionNode() && pTmp->GetIndex() ) -#if defined( ALPHA ) && defined( UNX ) - pTmp = ((SwNode*)pTmp)->pStartOfSection; -#else pTmp = pTmp->pStartOfSection; -#endif return pTmp->GetSectionNode(); } diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index b1bb096..ad3c4a3 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -400,11 +400,7 @@ SwTableNode* SwNode::FindTableNode() return GetTableNode(); SwStartNode* pTmp = pStartOfSection; while( !pTmp->IsTableNode() && pTmp->GetIndex() ) -#if defined( ALPHA ) && defined( UNX ) - pTmp = ((SwNode*)pTmp)->pStartOfSection; -#else pTmp = pTmp->pStartOfSection; -#endif return pTmp->GetTableNode(); } @@ -803,11 +799,7 @@ SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp ) SwStartNode* pTmp = IsStartNode() ? (SwStartNode*)this : pStartOfSection; while( eTyp != pTmp->GetStartNodeType() && pTmp->GetIndex() ) -#if defined( ALPHA ) && defined( UNX ) - pTmp = ((SwNode*)pTmp)->pStartOfSection; -#else pTmp = pTmp->pStartOfSection; -#endif return eTyp == pTmp->GetStartNodeType() ? pTmp : 0; } diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 524ebcb..1f456e7 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -595,12 +595,6 @@ void lcl_ProcessLineGet( const SwTableLine *pLine, SwTabCols &rToFill, } } -// MS: Sonst Absturz auf der DEC-Kiste -// -#if defined(ALPHA) && defined(WNT) -#pragma optimize("", off) -#endif - void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart, sal_Bool bRefreshHidden, sal_Bool bCurRowOnly ) const { @@ -691,10 +685,6 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart, } } -#if defined(ALPHA) && defined(WNT) -#pragma optimize("", on) -#endif - /************************************************************************* |* |* SwTable::SetTabCols() diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 110d2d1..2dfe2bb 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -228,7 +228,7 @@ static sal_uInt32 GetSvError( int nErrno ) { 0, SVSTREAM_OK }, { EACCES, SVSTREAM_ACCESS_DENIED }, { EBADF, SVSTREAM_INVALID_HANDLE }, -#if defined(RS6000) || defined(ALPHA) || defined(NETBSD) || \ +#if defined(RS6000) || defined(NETBSD) || \ defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || \ defined(__FreeBSD_kernel__) || defined (AIX) || defined(DRAGONFLY) || \ defined(IOS) @@ -245,7 +245,7 @@ static sal_uInt32 GetSvError( int nErrno ) { EAGAIN, SVSTREAM_LOCKING_VIOLATION }, { EISDIR, SVSTREAM_PATH_NOT_FOUND }, { ELOOP, SVSTREAM_PATH_NOT_FOUND }, -#if !defined(RS6000) && !defined(ALPHA) && !defined(NETBSD) && !defined (FREEBSD) && \ +#if !defined(RS6000) && !defined(NETBSD) && !defined (FREEBSD) && \ !defined(MACOSX) && !defined(OPENBSD) && !defined(__FreeBSD_kernel__) && \ !defined(DRAGONFLY) { EMULTIHOP, SVSTREAM_PATH_NOT_FOUND }, _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
