Commits

Anonymous committed dc0fa73

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@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@275801 (milestone: DEV300:m57)
2009-08-28 12:36:27 +0200 cmc r275523 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@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

  • Participants
  • Parent commits c1aacc3

Comments (0)

Files changed (99)

binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx

 #include <unotools/tempfile.hxx>
 #include <ucbhelper/content.hxx>
 #include <sot/storinfo.hxx>
-#include <shell/systemshell.hxx>
 
 #include "objsh.hxx"
 #include "request.hxx"

binfilter/bf_sw/source/core/doc/makefile.mk

 		$(SLO)$/sw_visiturl.obj \
 		$(SLO)$/sw_htmltbl.obj
 
-.IF "$(OS)$(CVER)"=="MACOSXC295"
-SLOFILES += $(SLO)$/sw_gcc_outl.obj
-.ENDIF
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :	target.mk

binfilter/bf_sw/source/core/doc/sw_gcc_outl.cxx

-/*************************************************************************
- *
- * 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
-}

binfilter/prj/build.lst

-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

connectivity/source/drivers/adabas/makefile.mk

 # --- Targets ----------------------------------
 
 
-.INCLUDE : $(PRJ)$/target.pmk
+.INCLUDE : $(PRJ)$/target.pmk

connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx

 // -------------------------------------------------------------------------
 ::rtl::OUString MTypeConverter::nsACStringToOUString( const nsACString& _source )
 {
-    const char* buffer = _source.BeginReading();
-    const char* bufferEnd = _source.EndReading();
-    return ::rtl::OUString( buffer, bufferEnd - buffer, RTL_TEXTENCODING_ASCII_US );
+    const char* buffer = _source.BeginReading();
+    const char* bufferEnd = _source.EndReading();
+    return ::rtl::OUString( buffer, static_cast<sal_Int32>(bufferEnd - buffer), RTL_TEXTENCODING_ASCII_US );
 }
 // -------------------------------------------------------------------------
 ::rtl::OString MTypeConverter::nsACStringToOString( const nsACString& _source )
 {
-    const char* buffer = _source.BeginReading();
-    const char* bufferEnd = _source.EndReading();
-    return ::rtl::OString( buffer, bufferEnd - buffer );
+    const char* buffer = _source.BeginReading();
+    const char* bufferEnd = _source.EndReading();
+    return ::rtl::OString( buffer, static_cast<sal_Int32>(bufferEnd - buffer) );
 }
 // -------------------------------------------------------------------------
 void MTypeConverter::asciiOUStringToNsACString( const ::rtl::OUString& _asciiString, nsACString& _dest )
 // -------------------------------------------------------------------------
 void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest )
 {
-    _dest.Truncate();
-    _dest.AppendASCII( _asciiString );
+    _dest.Truncate();
+    _dest.AppendASCII( _asciiString );
 }
 // -------------------------------------------------------------------------
 void MTypeConverter::nsStringToOUString(nsString const &nss, ::rtl::OUString &ous)

connectivity/source/drivers/odbcbase/OConnection.cxx

 	SQLRETURN nSQLRETURN = 0;
 	SDB_ODBC_CHAR szConnStrOut[4096];
 	SDB_ODBC_CHAR szConnStrIn[2048];
-	SWORD cbConnStrOut;
+	SQLSMALLINT cbConnStrOut;
 	memset(szConnStrOut,'\0',4096);
 	memset(szConnStrIn,'\0',2048);
 	::rtl::OString aConStr(::rtl::OUStringToOString(aConnectStr,getTextEncoding()));

connectivity/source/drivers/odbcbase/OPreparedStatement.cxx

 	checkParameterIndex(parameterIndex);
 
 	sal_Int8* lenBuf = getLengthBuf (parameterIndex);
-	*(SDWORD*)lenBuf = SQL_NULL_DATA;
+	*(SQLLEN*)lenBuf = SQL_NULL_DATA;
 
 
-	SQLINTEGER	prec = 0;
-	SQLUINTEGER nColumnSize = 0;
+	SQLLEN prec = 0;
+	SQLULEN nColumnSize = 0;
 	if (sqlType == SQL_CHAR || sqlType == SQL_VARCHAR || sqlType == SQL_LONGVARCHAR)
 	{
 		prec = 1;
 											nDecimalDigits,
 											NULL,
 											prec,
-											(SDWORD*)lenBuf
+											(SQLLEN*)lenBuf
 											);
 	OTools::ThrowException(m_pConnection,nReturn,m_aStatementHandle,SQL_HANDLE_STMT,*this);
 }
 
     // Bind the parameter with SQL_LEN_DATA_AT_EXEC
 	SQLSMALLINT   Ctype = SQL_C_CHAR;
-	SDWORD	atExec = SQL_LEN_DATA_AT_EXEC (length);
+	SQLLEN	atExec = SQL_LEN_DATA_AT_EXEC (length);
 	memcpy (dataBuf, &ParameterIndex, sizeof(ParameterIndex));
 	memcpy (lenBuf, &atExec, sizeof (atExec));
 
 	OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
 	N3SQLBindParameter(m_aStatementHandle,
 						(SQLUSMALLINT)ParameterIndex,
-						(SQLSMALLINT)SQL_PARAM_INPUT,
+						(SQLUSMALLINT)SQL_PARAM_INPUT,
 						Ctype,
 						(SQLSMALLINT)SQLtype,
-						(SQLUINTEGER)length,
+						(SQLULEN)length,
 						0,
 						dataBuf,
 						sizeof(ParameterIndex),
-						(SDWORD*)lenBuf);
+						(SQLLEN*)lenBuf);
 
 	// Save the input stream
 	boundParams[ParameterIndex - 1].setInputStream (x, length);

connectivity/source/drivers/odbcbase/OResultSet.cxx

 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 
-	SQLSMALLINT nMaxLen = 20;
-	SQLINTEGER nRealLen = 0;
+	SQLLEN nMaxLen = 20;
+	SQLLEN nRealLen = 0;
 	Sequence<sal_Int8> aBookmark(nMaxLen);
 
 	SQLRETURN nRet = N3SQLBindCol(m_aStatementHandle,
     sal_Bool bPositionByBookmark = ( NULL != getOdbcFunction( ODBC3SQLBulkOperations ) );
 	if ( bPositionByBookmark )
 	{
-		SQLINTEGER nRealLen = 0;
+		SQLLEN nRealLen = 0;
 		nRet = N3SQLBindCol(m_aStatementHandle,
 							0,
 							SQL_C_VARBOOKMARK,

connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx

 	return  sValue;
 }
 // -------------------------------------------------------------------------
-SWORD OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
+SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
                                               ,sal_Int32 _ident) throw(SQLException, RuntimeException)
 {
-	SWORD nValue=0;
+	SQLLEN nValue=0;
 	OTools::ThrowException(_pConnection,(*(T3SQLColAttribute)_pConnection->getOdbcFunction(ODBC3SQLColAttribute))(_aStatementHandle,
 										 (SQLUSMALLINT)_column,
 										 (SQLUSMALLINT)_ident,
 	return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE);
 }
 // -------------------------------------------------------------------------
-SWORD OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
+SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 column)
                                                throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
-    SWORD nType = 0;
+    SQLSMALLINT nType = 0;
     try
     {
 	    nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE);

connectivity/source/drivers/odbcbase/OStatement.cxx

     m_xResultSet = Reference< XResultSet >();
 }
 //--------------------------------------------------------------------
-sal_Int32 OStatement_Base::getRowCount () throw( SQLException)
+SQLLEN OStatement_Base::getRowCount () throw( SQLException)
 {
 	::osl::MutexGuard aGuard( m_aMutex );
 	checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 
-	sal_Int32	numRows = 0;
+	SQLLEN numRows = 0;
 
 	try {
 		THROW_SQL(N3SQLRowCount(m_aStatementHandle,&numRows));
 		SQLRETURN nError = N3SQLMoreResults(m_aStatementHandle);
 		if(nError == SQL_SUCCESS)
 		{
-			N3SQLRowCount(m_aStatementHandle,&pArray[j]);
+			SQLLEN nRowCount=0;
+			N3SQLRowCount(m_aStatementHandle,&nRowCount);
+			pArray[j] = nRowCount;
 		}
 	}
 	return aRet;

connectivity/source/drivers/odbcbase/OTools.cxx

 						sal_Bool &_bWasNull,
 						const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 						void* _pValue,
-						SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+						SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::getValue" );
-	SQLINTEGER pcbValue = SQL_NULL_DATA;
+	SQLLEN pcbValue = SQL_NULL_DATA;
 	OTools::ThrowException(_pConnection,
 							(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 										(SQLUSMALLINT)columnIndex,
 										_nType,
 										_pValue,
-										(SQLINTEGER)_rSize,
+										_nSize,
 										&pcbValue),
 							_aStatementHandle,SQL_HANDLE_STMT,_xInterface,sal_False);
 	_bWasNull = pcbValue == SQL_NULL_DATA;
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindParameter" );
 	SQLRETURN nRetcode;
-	SWORD   fSqlType;
-	SWORD   fCType;
-	SDWORD  nMaxLen = 0;
+	SQLSMALLINT fSqlType;
+	SQLSMALLINT fCType;
+	SQLLEN  nMaxLen = 0;
 	//	void*&   pData   = pDataBuffer;
-	SQLINTEGER* pLen    = (SQLINTEGER*)pLenBuffer;
-	SQLUINTEGER nColumnSize=0;
+	SQLLEN* pLen    = (SQLLEN*)pLenBuffer;
+	SQLULEN nColumnSize=0;
 	SQLSMALLINT	nDecimalDigits=0;
 
 	OTools::getBindTypes(_bUseWChar,_bUseOldTimeDate,_nODBCtype,fCType,fSqlType);
 void OTools::bindData(	SQLSMALLINT _nOdbcType,
 						sal_Bool _bUseWChar,
 						sal_Int8 *&_pData,
-						SQLINTEGER*& pLen,
+						SQLLEN*& pLen,
 						const void* _pValue,
 						rtl_TextEncoding _nTextEncoding,
-						SQLUINTEGER& _nColumnSize)
+						SQLULEN& _nColumnSize)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindData" );
 	_nColumnSize = 0;
 			{
 				sal_Int32 nLen = 0;
                 nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
-				*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+				*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 			}
 			break;
 		case SQL_LONGVARCHAR:
 				::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding));
 				nLen = aString.getLength();
 			}
-			*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+			*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 		}   break;
 		case SQL_DATE:
 			*(DATE_STRUCT*)_pData = *(DATE_STRUCT*)_pValue;
-			*pLen = (SDWORD)sizeof(DATE_STRUCT);
+			*pLen = (SQLLEN)sizeof(DATE_STRUCT);
 			_nColumnSize = 10;
 			break;
 		case SQL_TIME:
 			*(TIME_STRUCT*)_pData = *(TIME_STRUCT*)_pValue;
-			*pLen = (SDWORD)sizeof(TIME_STRUCT);
+			*pLen = (SQLLEN)sizeof(TIME_STRUCT);
 			_nColumnSize = 8;
 			break;
 		case SQL_TIMESTAMP:
 			*(TIMESTAMP_STRUCT*)_pData = *(TIMESTAMP_STRUCT*)_pValue;
-			*pLen = (SDWORD)sizeof(TIMESTAMP_STRUCT);
+			*pLen = (SQLLEN)sizeof(TIMESTAMP_STRUCT);
 			_nColumnSize = 19;
 			break;
 	}
 						SQLSMALLINT _nMaxLen,
 						const void* _pValue,
 						void* _pData,
-						SQLINTEGER *pLen,
+						SQLLEN *pLen,
 						const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 						rtl_TextEncoding _nTextEncoding,
 						sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 	SQLRETURN nRetcode;
 	SQLSMALLINT   fSqlType;
 	SQLSMALLINT   fCType;
-	SQLSMALLINT   nMaxLen = _nMaxLen;
+	SQLLEN nMaxLen = _nMaxLen;
 
 	OTools::getBindTypes(	sal_False,
 							_bUseOldTimeDate,
 					_pData = (void*)(columnIndex);
 					sal_Int32 nLen = 0;
                     nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
-					*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+					*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 				}
 					break;
 				case SQL_LONGVARCHAR:
 					_pData = (void*)(columnIndex);
 					sal_Int32 nLen = 0;
 					nLen = ((::rtl::OUString*)_pValue)->getLength();
-					*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+					*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 				}   break;
 				case SQL_DATE:
 					*pLen = sizeof(DATE_STRUCT);
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::ThrowException" );
 
 	SDB_ODBC_CHAR szSqlState[5];
-	SDWORD pfNativeError;
+	SQLINTEGER pfNativeError;
 	SDB_ODBC_CHAR szErrorMessage[SQL_MAX_MESSAGE_LENGTH];
 	szErrorMessage[0] = '\0';
-	SWORD pcbErrorMsg = 0;
+	SQLSMALLINT pcbErrorMsg = 0;
 
 	// Informationen zur letzten Operation:
 	// wenn hstmt != SQL_NULL_HSTMT ist (Benutzung von SetStatus in SdbCursor, SdbTable, ...),
 Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
 										 SQLHANDLE _aStatementHandle,
 										 sal_Int32 columnIndex,
-										 SWORD  _fSqlType,
+										 SQLSMALLINT _fSqlType,
 										 sal_Bool &_bWasNull,
 										 const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
 {
 	char aCharArray[2048];
 	// Erstmal versuchen, die Daten mit dem kleinen Puffer
 	// abzuholen:
-	SQLINTEGER nMaxLen = sizeof aCharArray - 1;
+	SQLLEN nMaxLen = sizeof aCharArray - 1;
 	//	GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
-	SQLINTEGER pcbValue = 0;
+	SQLLEN pcbValue = 0;
 	OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 										(SQLUSMALLINT)columnIndex,
 										_fSqlType,
 										(SQLPOINTER)aCharArray,
-										(SQLINTEGER)nMaxLen,
+										nMaxLen,
 										&pcbValue),
 							_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 
 ::rtl::OUString OTools::getStringValue(OConnection* _pConnection,
 									   SQLHANDLE _aStatementHandle,
 									   sal_Int32 columnIndex,
-									   SWORD  _fSqlType,
+									   SQLSMALLINT _fSqlType,
 									   sal_Bool &_bWasNull,
 									   const Reference< XInterface >& _xInterface,
 									   rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException)
 		{
 			sal_Unicode waCharArray[2048];
 			// read the unicode data
-			sal_Int32 nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
+			SQLLEN nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
 			//	GETDATA(SQL_C_WCHAR, waCharArray, nMaxLen + sizeof(sal_Unicode));
 
-			SQLINTEGER pcbValue=0;
+			SQLLEN pcbValue=0;
 			OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 												(SQLUSMALLINT)columnIndex,
 												SQL_C_WCHAR,
 												&waCharArray,
-												(SQLINTEGER)nMaxLen*sizeof(sal_Unicode),
+												(SQLLEN)nMaxLen*sizeof(sal_Unicode),
 												&pcbValue),
 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 			_bWasNull = pcbValue == SQL_NULL_DATA;
 				return ::rtl::OUString();
 			// Bei Fehler bricht der GETDATA-Makro mit return ab,
 			// bei NULL mit break!
-            SQLINTEGER nRealSize = 0;
+            SQLLEN nRealSize = 0;
             if ( pcbValue > -1 )
                 nRealSize = pcbValue / sizeof(sal_Unicode);
-			SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(nRealSize, nMaxLen) : (nMaxLen-1);
+			SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(nRealSize, nMaxLen) : (nMaxLen-1);
 			waCharArray[nLen] = 0;
 			aData.append(waCharArray,nLen);
 
 												(SQLUSMALLINT)columnIndex,
 												SQL_C_WCHAR,
 												&waCharArray,
-												(SQLINTEGER)nLen+1,
+												(SQLLEN)nLen+1,
 												&pcbValue),
 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
                 nRealSize = 0;
 			char aCharArray[2048];
 			// Erstmal versuchen, die Daten mit dem kleinen Puffer
 			// abzuholen:
-			SDWORD nMaxLen = sizeof aCharArray - 1;
+			SQLLEN nMaxLen = sizeof aCharArray - 1;
 			//	GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
-			SQLINTEGER pcbValue = 0;
+			SQLLEN pcbValue = 0;
 			OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 												(SQLUSMALLINT)columnIndex,
 												SQL_C_CHAR,
 												&aCharArray,
-												(SQLINTEGER)nMaxLen,
+												nMaxLen,
 												&pcbValue),
 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 			_bWasNull = pcbValue == SQL_NULL_DATA;
 			if(_bWasNull)
 				return ::rtl::OUString();
 
-			SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
+			SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
 			aCharArray[nLen] = 0;
 			if ( ((pcbValue == SQL_NO_TOTAL) || pcbValue > nMaxLen) && aCharArray[nLen-1] == 0 && nLen > 0 )
 				--nLen;

connectivity/source/inc/odbc/OFunctions.hxx

 													SQLSMALLINT *		StringLengthPtr,
 													SQLSMALLINT *		TypePtr,
 													SQLSMALLINT *		SubTypePtr,
-													SQLINTEGER *		LengthPtr,
+													SQLLEN *			LengthPtr,
 													SQLSMALLINT *		PrecisionPtr,
 													SQLSMALLINT *		ScalePtr,
 													SQLSMALLINT *		NullablePtr);
 													SQLSMALLINT			Precision,
 													SQLSMALLINT			Scale,
 													SQLPOINTER			DataPtr,
-													SQLINTEGER *		StringLengthPtr,
-													SQLINTEGER *		IndicatorPtr);
+													SQLLEN *			StringLengthPtr,
+													SQLLEN *			IndicatorPtr);
 
 	#define N3SQLSetDescRec(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSetDescRec)getOdbcFunction(ODBC3SQLSetDescRec))(a,b,c,d,e,f,g,h,i,j)
 	*/
 													SQLSMALLINT			InputOutputType,
 													SQLSMALLINT			ValueType,
 													SQLSMALLINT			ParameterType,
-													SQLUINTEGER			ColumnSize,
+													SQLULEN				ColumnSize,
 													SQLSMALLINT			DecimalDigits,
 													SQLPOINTER			ParameterValuePtr,
-													SQLINTEGER			BufferLength,
-													SQLINTEGER *		StrLen_or_IndPtr);
+													SQLLEN				BufferLength,
+													SQLLEN *			StrLen_or_IndPtr);
 
 	#define N3SQLBindParameter(a,b,c,d,e,f,g,h,i,j) (*(T3SQLBindParameter)getOdbcFunction(ODBC3SQLBindParameter))(a,b,c,d,e,f,g,h,i,j)
 
 	typedef SQLRETURN (SQL_API  *T3SQLDescribeParam) (SQLHSTMT			StatementHandle,
 													SQLUSMALLINT		ParameterNumber,
 													SQLSMALLINT *		DataTypePtr,
-													SQLUINTEGER *		ParameterSizePtr,
+													SQLULEN *			ParameterSizePtr,
 													SQLSMALLINT *		DecimalDigitsPtr,
 													SQLSMALLINT *		NullablePtr);
 
 
 	typedef SQLRETURN  (SQL_API  *T3SQLPutData) (		SQLHSTMT			StatementHandle,
 													SQLPOINTER			DataPtr,
-													SQLINTEGER			StrLen_or_Ind);
+													SQLLEN				StrLen_or_Ind);
 
 	#define N3SQLPutData(a,b,c) (*(T3SQLPutData)getOdbcFunction(ODBC3SQLPutData))(a,b,c)
 
 	// Retrieving results and information about results
 	typedef SQLRETURN  (SQL_API  *T3SQLRowCount) (	SQLHSTMT			StatementHandle,
-													SQLINTEGER *		RowCountPtr);
+													SQLLEN *			RowCountPtr);
 
 	#define N3SQLRowCount(a,b) (*(T3SQLRowCount)getOdbcFunction(ODBC3SQLRowCount))(a,b)
 
 	#define N3SQLNumResultCols(a,b) (*(T3SQLNumResultCols)getOdbcFunction(ODBC3SQLNumResultCols))(a,b)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLDescribeCol) (	SQLHSTMT			StatementHandle,
-													SQLSMALLINT			ColumnNumber,
+													SQLUSMALLINT		ColumnNumber,
 													SQLCHAR *			ColumnName,
 													SQLSMALLINT			BufferLength,
 													SQLSMALLINT *		NameLengthPtr,
 													SQLSMALLINT *		DataTypePtr,
-													SQLUINTEGER *		ColumnSizePtr,
+													SQLULEN *			ColumnSizePtr,
 													SQLSMALLINT *		DecimalDigitsPtr,
 													SQLSMALLINT *		NullablePtr);
 
 													SQLPOINTER			CharacterAttributePtr,
 													SQLSMALLINT			BufferLength,
 													SQLSMALLINT *		StringLengthPtr,
-													SQLPOINTER			NumericAttributePtr);
+													SQLLEN *			NumericAttributePtr);
 
 	#define N3SQLColAttribute(a,b,c,d,e,f,g) (*(T3SQLColAttribute)getOdbcFunction(ODBC3SQLColAttribute))(a,b,c,d,e,f,g)
 
 													SQLUSMALLINT		ColumnNumber,
 													SQLSMALLINT			TargetType,
 													SQLPOINTER			TargetValuePtr,
-													SQLINTEGER			BufferLength,
-													SQLINTEGER *		StrLen_or_IndPtr);
+													SQLLEN				BufferLength,
+													SQLLEN *			StrLen_or_IndPtr);
 
 	#define N3SQLBindCol(a,b,c,d,e,f) (*(T3SQLBindCol)getOdbcFunction(ODBC3SQLBindCol))(a,b,c,d,e,f)
 
 
 	typedef SQLRETURN  (SQL_API  *T3SQLFetchScroll) (	SQLHSTMT			StatementHandle,
 													SQLSMALLINT			FetchOrientation,
-													SQLINTEGER			FetchOffset);
+													SQLLEN				FetchOffset);
 
 	#define N3SQLFetchScroll(a,b,c) (*(T3SQLFetchScroll)getOdbcFunction(ODBC3SQLFetchScroll))(a,b,c)
 
 													SQLUSMALLINT		ColumnNumber,
 													SQLSMALLINT			TargetType,
 													SQLPOINTER			TargetValuePtr,
-													SQLINTEGER			BufferLength,
-													SQLINTEGER *		StrLen_or_IndPtr);
+													SQLLEN				BufferLength,
+													SQLLEN *			StrLen_or_IndPtr);
 
 	#define N3SQLGetData(a,b,c,d,e,f) (*(T3SQLGetData)getOdbcFunction(ODBC3SQLGetData))(a,b,c,d,e,f)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLSetPos) (		SQLHSTMT			StatementHandle,
-													SQLUSMALLINT		RowNumber,
+													SQLSETPOSIROW		RowNumber,
 													SQLUSMALLINT		Operation,
 													SQLUSMALLINT		LockType);
 
 	#define N3SQLSetPos(a,b,c,d) (*(T3SQLSetPos)getOdbcFunction(ODBC3SQLSetPos))(a,b,c,d)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLBulkOperations) (	SQLHSTMT		StatementHandle,
-														SQLUSMALLINT	Operation);
+														SQLSMALLINT	Operation);
 
 	#define N3SQLBulkOperations(a,b) (*(T3SQLBulkOperations)getOdbcFunction(ODBC3SQLBulkOperations))(a,b)
 
 	#define N3SQLProcedures(a,b,c,d,e,f,g) (*(T3SQLProcedures)getOdbcFunction(ODBC3SQLProcedures))(a,b,c,d,e,f,g)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLSpecialColumns) (SQLHSTMT			StatementHandle,
-													SQLSMALLINT			IdentifierType,
+													SQLUSMALLINT		IdentifierType,
 													SQLCHAR *			CatalogName,
 													SQLSMALLINT			NameLength1,
 													SQLCHAR *			SchemaName,
 													SQLSMALLINT			NameLength2,
 													SQLCHAR *			TableName,
 													SQLSMALLINT			NameLength3,
-													SQLSMALLINT			Scope,
-													SQLSMALLINT			Nullable);
+													SQLUSMALLINT		Scope,
+													SQLUSMALLINT		Nullable);
 
 	#define N3SQLSpecialColumns(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSpecialColumns)getOdbcFunction(ODBC3SQLSpecialColumns))(a,b,c,d,e,f,g,h,i,j)
 

connectivity/source/inc/odbc/OResultSet.hxx

 			typedef ::std::vector<ORowSetValue>			TDataRow;
 
 			TVoidVector									m_aBindVector;
-			::std::vector<sal_Int32>					m_aLengthVector;
+			::std::vector<SQLLEN>						m_aLengthVector;
             ::std::map<sal_Int32,SWORD>					m_aODBCColumnTypes;
 			::com::sun::star::uno::Sequence<sal_Int8>	m_aBookmark;
 

connectivity/source/inc/odbc/OResultSetMetaData.hxx

 			virtual ~OResultSetMetaData();
 
 
-            static  SWORD getNumColAttrib(OConnection* _pConnection
+            static SQLLEN getNumColAttrib(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
                                               ,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
-            static SWORD getColumnODBCType(OConnection* _pConnection
+            static SQLSMALLINT getColumnODBCType(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 column)

connectivity/source/inc/odbc/OStatement.hxx

 			*/
 			virtual OResultSet* createResulSet();
 
-            sal_Int32 getRowCount () throw( ::com::sun::star::sdbc::SQLException);
+            SQLLEN getRowCount () throw( ::com::sun::star::sdbc::SQLException);
 
 
 			void disposeResultSet();

connectivity/source/inc/odbc/OTools.hxx

 			static ::rtl::OUString getStringValue(	OConnection* _pConnection,	
 													SQLHANDLE _aStatementHandle,
 													sal_Int32 columnIndex,
-													SWORD  _fSqlType,
+													SQLSMALLINT _fSqlType,
 													sal_Bool &_bWasNull,
 													const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 													rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 			static  ::com::sun::star::uno::Sequence<sal_Int8> getBytesValue(OConnection* _pConnection,	
 																			SQLHANDLE _aStatementHandle,
 																			sal_Int32 columnIndex,
-																			SWORD  _fSqlType,
+																			SQLSMALLINT _fSqlType,
 																			sal_Bool &_bWasNull,
 																			const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 			static void getValue(	OConnection* _pConnection,	
 									sal_Bool &_bWasNull,
 									const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 									void* _pValue,
-									SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+									SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
 			/** 
 				bindData copies the from pValue to pData
 			static void bindData(	SQLSMALLINT _nOdbcType,
 									sal_Bool _bUseWChar,
 									sal_Int8 *&_pData,
-									SQLINTEGER*& pLen,
+									SQLLEN*& pLen,
 									const void* _pValue,
 									rtl_TextEncoding _nTextEncoding,
-									SQLUINTEGER& _nColumnSize);
+									SQLULEN& _nColumnSize);
 
 			static void bindParameter(	OConnection* _pConnection,	
 										SQLHANDLE _hStmt,
 									SQLSMALLINT _nMaxLen,
 									const void* _pValue,
 									void*		_pData,
-									SQLINTEGER *pLen,
+									SQLLEN *pLen,
 									const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 									rtl_TextEncoding _nTextEncoding,
 									sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 	 /* strip out any \<nl> combinations where \ is the current
 	  * CONTINUATION char */
 	 for(p=q; (p=strchr(p,CONTINUATION_CHAR))!=NIL(char); )
-	    if( p[1] == '\n' )
-	       strcpy( p, p+2 );
+	    if( p[1] == '\n' ) {
+	       size_t len = strlen(p+2)+1;
+	       memmove ( p, p+2, len );
+	    }
 	    else
 	       p++;
 
 	 p = DmStrSpn(q ," \t");	/* Strip white space before ... */
 	 if( p != q ) {
-	    strcpy( q, p);
+	    size_t len = strlen(p)+1;
+	    memmove( q, p, len );
 	    p = q;
 	 }
 
 char *tok;
 {
    if( strchr( "\"\\vantbrf01234567", tok[1] ) ) {
+      size_t len;
       switch( tok[1] ) {
 	 case 'a' : *tok = 0x07; break;
 	 case 'b' : *tok = '\b'; break;
 	    register int j = 0;
 	    for( ; i<2 && isdigit(tok[2]); i++ ) {
 	       j = (j << 3) + (tok[1] - '0');
-	       strcpy( tok+1, tok+2 );
+	       len = strlen(tok+2)+1;
+	       memmove( tok+1, tok+2, len );
 	    }
 	    j = (j << 3) + (tok[1] - '0');
 	    *tok = j;
 	 }
       }
-      strcpy( tok+1, tok+2 );
+      len = strlen(tok+2)+1;
+      memmove( tok+1, tok+2, len );
    }
 }
 
       if( (e = Basename(s)) != s) {
 	 if( !(mod & DIRECTORY_FLAG) ) {
 	    /* Move the basename to the start. */
-	    strcpy(s, e);
+	    size_t len = strlen(e)+1;
+	    memmove(s, e, len);
 	 }
 	 else
 	    s = e;
 
       if( !(mod & FILE_FLAG) ) {
 	 /* Move the suffix to the start. */
-	 strcpy( s, e );
+	 size_t len = strlen(e)+1;
+         memmove(s, e, len);
       }
       else
 	 s = e;
 	      done = !lev;
 	      break;
             } else {
+              size_t len;
 	      s[1] = ' ';
-	      strcpy( s, s+1 );
+              len = strlen(s+1)+1;
+	      memmove( s, s+1, len );
 	    }
 	    /*FALLTHRU*/
 	 case ' ':
        * converted them to a real space. Let's verify this. */
       for( p=s; *p && *p != edelim && *p; p++ ) {
 	if( p[0] == '\\' && p[1] == '\n' ) {
+	  size_t len;
 	  p[1] = ' ';
-	  strcpy( p, p+1 );
+	  len = strlen(p+1)+1;
+	  memmove( p, p+1, len );
 	}
       }
       if( !*p )
       *flag = 1;
       res   = Expand( start );
 
-      if( (t = DmStrSpn( res, " \t" )) != res ) strcpy( res, t );
+      if( (t = DmStrSpn( res, " \t" )) != res ) {
+          size_t len = strlen(t)+1;
+          memmove( res, t, len );
+      }
    }
 
    FREE( start );       /* this is ok! start is assigned a DmSubStr above */
 	  * text lines on input.  The maximum size of this is governened by
 	  * Buffer_size */
 	    if( q != p && q[-1] == CONTINUATION_CHAR ) {
-	       strcpy( q, q+1 );
+	       size_t len = strlen(q+1)+1;
+	       memmove( q, q+1, len );
 	       q--;
 	       cont = FALSE;
 	    }
    while( (c = strchr(c, COMMENT_CHAR)) != NIL(char) ) {
       if( Comment || State == NORMAL_SCAN )
 	 if( c != str && c[-1] == ESCAPE_CHAR ) {
-	    strcpy( c-1, c );        /* copy it left, due to \# */
+	    size_t len = strlen(c)+1;
+	    memmove( c-1, c, len );  /* copy it left, due to \# */
 	    if( pend ) (*pend)--;    /* shift tail pointer left */
 	 }
 	 else {
        * Nothing in Expand() should be able to change dynamic macros. */
       cmnd = Expand( rp->st_string );
 
-      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
-	 strcpy(cmnd,p);
+      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
+	 size_t len = strlen(p)+1;
+	 memmove(cmnd,p,len);
+      }
 
       /* COMMAND macro is set to "$(CMNDNAME) $(CMNDARGS)" by default, it is
        * possible for the user to reset it to, for example
 	 shell  = ((l_attr & A_SHELL) != 0);
 
 	 /* clean up the attributes that we may have just added. */
-	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
-	    strcpy(cmnd,p);
+	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
+	    size_t len = strlen(p)+1;
+	    memmove(cmnd,p,len);
+	 }
       }
 
 #if defined(MSDOS)
    for( p=cmnd; *(n = DmStrPbrk(p,tmp)) != '\0'; )
       /* Remove the \<nl> sequences. */
       if(*n == CONTINUATION_CHAR && n[1] == '\n') {
+	 size_t len = strlen(n+2)+1;
 	 DB_PRINT( "make", ("fixing [%s]", p) );
-	 strcpy( n, n+2 );
+	 memmove( n, n+2, len );
 	 p = n;
       }
       /* Look for an escape sequence and replace it by it's corresponding
    char *tpath;
    int hasdriveletter = 0;
    int delentry;
+   size_t len;
 
    DB_ENTER( "Clean_path" );
 
 	    p++;
 	 }
 	 while( *p == *DirSepStr);
-	 strcpy(t+1,p);
+	 len = strlen(p)+1;
+	 memmove(t+1,p,len);
 	 continue;
       }
 
       /* Remove './'. If OOODMAKEMODE is set do this only if it is not at
        * the start of the path. */
       if ( p-q == 1 && *q == '.' && (q != path || !STOBOOL(OOoDmMode)) ) {
-	 strcpy(q,p+1);
+	 len = strlen(p+1)+1;
+	 memmove(q,p+1,len);
 	 q = tpath;
 	 continue;
       }
 	 }
 	 while( *t == *DirSepStr);
 	 /* q points to first letter of the current directory/file. */
-	 strcpy(q,t);
+	 len = strlen(t)+1;
+	 memmove(q,t,len);
 	 q = tpath;
       }
       else
 	 /* Handle %-targets. */
 	 CELLPTR cur;
 	 CELLPTR tpq = NIL(CELL);
-	 CELLPTR nprq;
+	 CELLPTR nprq = NULL;
 
 #ifdef DBUG
 	 DB_PRINT( "%", ("Handling %%-target [%s : : <prerequisites follow, maybe empty>]",
 
 	    if( *name == '\'' && name[len-1]=='\'' ){
 	       name[len-1] = '\0';
-	       strcpy(name,name+1);
+	       len = strlen(name+1)+1;
+	       memmove(name,name+1,len);
 	       /* add indirect prerequisite */
 	       _add_indirect_prereq( cur );
 	    }

openssl/makefile.mk

 	ADDITIONAL_FILES:= \
 		libcrypto_OOo_0_9_8k.map \
 		libssl_OOo_0_9_8k.map
-	.IF "$(CPU)" == "X"
+	.IF "$(CPU)" == "I"
+		CONFIGURE_ACTION=Configure linux-elf
+	.ELIF "$(CPU)" == "X"
+		CONFIGURE_ACTION=Configure linux-x86_64
+	.ELIF "$(BUILD64)" == "1"
 		CONFIGURE_ACTION=Configure linux-generic64
 	.ELSE
-		CONFIGURE_ACTION=Configure linux-elf
+		CONFIGURE_ACTION=Configure linux-generic32
 	.ENDIF
 	# if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
 	#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map'
 		libssl_OOo_0_9_8k.map
 	#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map'
 
-	# We need a 64 BIT switch (currently I disable 64 Bit by default). 
-	# Please replace this with a global switch if available
-	#USE_64 = 1
+	# Use BUILD64 when 1 to select new specific 64bit Configurations if necessary
 
-	# Solaris INTEL
-	.IF "$(CPUNAME)" == "INTEL" 
+	.IF "$(CPUNAME)" == "INTEL" # Solaris INTEL
 		.IF "$(CPU)" == "X"
 		   CONFIGURE_ACTION=Configure solaris64-x86_64-cc
 		.ELSE
 		   CONFIGURE_ACTION=Configure solaris-x86-cc
 		.ENDIF
+	.ELIF "$(CPU)" == "U" # Solaris SPARC
+	   CONFIGURE_ACTION=Configure solaris64-sparcv9-cc
 	.ELSE
-	# Solaris SPARC
-		.IF "$(CPU)" == "U"
-		   CONFIGURE_ACTION=Configure solaris64-sparcv9-cc
-		.ENDIF
-.ENDIF
+	   CONFIGURE_ACTION=Configure solaris-sparcv9-cc
+	.ENDIF
 .ENDIF
 
 .IF "$(OS)" == "WNT"
 elsif ( $platform =~ m/linux/ ) 
 {
 # General Linux settings:
-      $CVER           = "C300";
+      $CVER           = "C341";
       $BIG_SVX        = "TRUE";
       $COM            = "GCC";
       $COMPATH        = '@COMPATH@'; 
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
       }
 
-      if( @GCCVER@ >= 30401 ) {
-         $OUTPATH     = "unxlngi6";
-      	 $CVER        = "C341";
-      }
-      else {
-         $OUTPATH     = "unxlngi4";
-      }
+      $OUTPATH     = "unxlngi6";
    }
    elsif ($platform =~ m/^x86_64/)
    {  print "Setting Linux x86-64 specific values... ";
       $outfile        = "LinuxX86-64Env.Set";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
-      $CVER           = "C341";
       $OUTPATH        = "unxlngx6";
       # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
       $outfile        = "LinuxIA64Env.Set";
       $CPU            = "A";
       $CPUNAME        = "IA64";
-      $CVER           = "C341";
       $OUTPATH        = "unxlnga";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64".$ds."server";
       $outfile        = "LinuxM68KEnv.Set";
       $CPU            = "6";
       $CPUNAME        = "M68K";
-      $CVER           = "C341";
       $OUTPATH        = "unxlngm68k";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k".$ds."server";

sfx2/inc/pch/precompiled_sfx2.hxx

 #include "sal/config.h"
 #include "sal/types.h"
 #include "setup_native/qswin32.h"
-#include "shell/systemshell.hxx"
 #include "sot/clsids.hxx"
 #include "sot/exchange.hxx"
 #include "sot/factory.hxx"

sfx2/source/appl/sfxpicklist.cxx

 #include <unotools/localfilehelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-#include <shell/systemshell.hxx>
-
 // ----------------------------------------------------------------------------
 
 #include <sfx2/app.hxx>
                 pDocSh->Get_Impl()->bWaitingForPicklist = sal_False;
 
                 if ( aURL.GetProtocol() == INET_PROT_FILE )
-                    SystemShell::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
+                    Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
 			}
             break;
 		}

sfx2/source/doc/objstor.cxx

 #include <sot/storinfo.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <shell/systemshell.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/documentconstants.hxx>
                 if ( aUrl.GetProtocol() == INET_PROT_FILE )
                 {
                     const SfxFilter* pOrgFilter = pMedium->GetOrigFilter();
-                    SystemShell::AddToRecentDocumentList(
+                    Application::AddToRecentDocumentList(
                         aUrl.GetURLNoPass( INetURLObject::NO_DECODE ),
                         (pOrgFilter) ? pOrgFilter->GetMimeType() : String() );
                 }

sfx2/util/makefile.mk

 		$(TOOLSLIB) \
 		$(I18NISOLANGLIB) \
 		$(SAXLIB) \
-		$(SYSSHELLLIB) \
 		$(COMPHELPERLIB) \
         $(UCBHELPERLIB) \
 		$(CPPUHELPERLIB) \

shell/inc/systemshell.hxx

-/*************************************************************************
- *
- * 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: systemshell.hxx,v $
- * $Revision: 1.5 $
- *
- * 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 _SYSTEMSHELL_HXX_
-#define _SYSTEMSHELL_HXX_
-
-#include <rtl/ustring.hxx>
-
-namespace SystemShell
-{
-    /** Add a file to the system shells recent document list if there is any.
-          This function may have no effect under Unix because there is no 
-          standard API among the different desktop managers.
-          
-          @param aFileUrl
-                    The file url of the document.
-					
-		  @param aMimeType
-		  The mime content type of the document specified by aFileUrl.
-		  If an empty string will be provided "application/octet-stream"
-		  will be used.
-    */
-    void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType);
-}
-
-#endif

shell/prj/build.lst

 sl    shell\source\cmdmail                         nmake   -   p   sl_cmdmail sl_inc NULL
 sl    shell\source\all                             nmake   -   all sl_all sl_inc NULL
 sl    shell\source\unix\sysshell                   nmake   -   u   sl_unix_sysshell sl_all sl_inc NULL
-sl    shell\source\aqua\sysshell                   nmake   -   u   sl_aqua_sysshell sl_all sl_inc NULL
-sl    shell\source\win32\sysshell                  nmake   -   w   sl_win32_sysshell sl_inc NULL
-sl    shell\source\os2\sysshell                    nmake   -   p   sl_os2_sysshell sl_inc NULL
 sl    shell\source\tools\lngconvex                 nmake   -   w   sl_win32_lngconv sl_inc NULL
 sl    shell\source\tools\regsvrex                  nmake   -   w   sl_win32_regsvrex  sl_inc NULL
 sl    shell\source\all\zipfile                     nmake   -   w   sl_all_zipfile  sl_inc NULL
-mkdir: %_DEST%\inc%_EXT%\shell
-
-..\inc\*.hxx %_DEST%\inc%_EXT%\shell\*.hxx
-
 ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
 ..\%__SRC%\slb\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%

shell/source/aqua/sysshell/makefile.mk

-#*************************************************************************
-#
-# 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: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
-# 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=..$/..$/..
-
-PRJNAME=shell
-TARGET=sysshell
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-CFLAGSCXX+=$(OBJCXXFLAGS)
-
-# --- Files --------------------------------------------------------
-
-.IF "$(OS)" == "MACOSX"
-
-LIB1OBJFILES=$(SLO)$/systemshell.obj
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1ARCHIV=$(SLB)$/lib$(TARGET).a
-
-.ELSE
-
-dummy:
-	@echo "Nothing to build for $(OS)"
-
-.ENDIF # MACOSX
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk

shell/source/aqua/sysshell/systemshell.cxx

-/*************************************************************************
- *
- * 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: systemshell.cxx,v $
- * $Revision: 1.3 $
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_shell.hxx"
-#include "systemshell.hxx"
-
-#include <comphelper/processfactory.hxx>
-
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_Hpp_
-#include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp>
-#include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include <premac.h>
-#include <Cocoa/Cocoa.h>
-#include <postmac.h>
-
-using namespace ::com::sun::star;
-
-// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
-// to UTF-8 before encoding non ascii characters, which is not what other apps expect.
-static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
-{
-	rtl::OUString extUrl;
-		
-	uno::Reference< lang::XMultiServiceFactory > sm = comphelper::getProcessServiceFactory();
-	if (sm.is())
-	{
-		uno::Reference< beans::XPropertySet > pset;
-		sm->queryInterface( getCppuType( &pset )) >>= pset;
-		if (pset.is())
-		{
-			uno::Reference< uno::XComponentContext > context;
-            static const rtl::OUString DEFAULT_CONTEXT( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) );
-			pset->getPropertyValue(DEFAULT_CONTEXT) >>= context;
-			if (context.is())
-				extUrl = uri::ExternalUriReferenceTranslator::create(context)->translateToExternal(internalUrl);
-		}
-	}
-	return extUrl;
-}
-
-// #i104525# many versions of OSX have problems with some URLs:
-// when an app requests OSX to add one of these URLs to the "Recent Items" list
-// then this app gets killed (TextEdit, Preview, etc. and also OOo)
-static bool isDangerousUrl( const rtl::OUString& rUrl)
-{
-	// use a heuristic that detects all known cases since there is no official comment
-	// on the exact impact and root cause of the OSX bug
-	const int nLen = rUrl.getLength();
-	const sal_Unicode* p = rUrl.getStr();
-	for( int i = 0; i < nLen-3; ++i, ++p) {
-		if( p[0] != '%')
-			continue;
-		// escaped percent?
-		if( (p[1] == '2') && (p[2] == '5'))
-			return true;
-		// escapes are considered to be UTF-8 encoded
-		// => check for invalid UTF-8 leading byte
-		if( (p[1] != 'f') && (p[1] != 'F'))
-			continue;
-		int cLowNibble = p[2];
-		if( (cLowNibble >= '0') && (cLowNibble <= '9'))
-			return false;
-		if( cLowNibble >= 'a')
-			cLowNibble -= 'a' - 'A';
-		if( (cLowNibble < 'A') || (cLowNibble >= 'C'))
-			return true;
-	}
-
-	return false;
-}
-
-namespace SystemShell {
-    
-    //##############################
-    void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& /*aMimeType*/)
-    {
-        // Convert file URL for external use (see above)
-        rtl::OUString externalUrl = translateToExternalUrl(aFileUrl);
-        if( 0 == externalUrl.getLength() )
-            externalUrl = aFileUrl;
-
-        if( externalUrl.getLength()
-        &&  !isDangerousUrl( externalUrl))
-        {
-            NSString* pString = [[NSString alloc] initWithCharacters: externalUrl.getStr() length: externalUrl.getLength()];
-            NSURL* pURL = [NSURL URLWithString: pString];
-
-            if( pURL )
-            {
-                NSDocumentController* pCtrl = [NSDocumentController sharedDocumentController];
-                [pCtrl noteNewRecentDocumentURL: pURL];
-            }
-            if( pString )
-                [pString release];
-
-        }
-    }
-    
-} // namespace SystemShell
-

shell/source/os2/sysshell/makefile.mk

-#*************************************************************************
-#
-# 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: makefile.mk,v $
-#
-# $Revision: 1.11 $
-#
-# 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=..$/..$/..
-
-PRJNAME=SHELL
-TARGET=sysshell
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/systemshell.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk

shell/source/os2/sysshell/systemshell.cxx

-/*************************************************************************
- *
- * 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: systemshell.cxx,v $
- * $Revision: 1.9 $
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_shell.hxx"
-
-#ifndef _SYSTEMSHELL_HXX_
-#include "../../../inc/systemshell.hxx"
-#endif
-