Author: jsc
Date: Thu Jun 12 14:56:18 2014
New Revision: 1602192
URL: http://svn.apache.org/r1602192
Log:
#124422# merge changes from trunk to be able to build on macos 10.9.3 and Xcode
5.1
Modified:
openoffice/branches/AOO410/main/filter/source/graphicfilter/ipbm/ipbm.cxx
openoffice/branches/AOO410/main/filter/source/graphicfilter/ipcd/ipcd.cxx
openoffice/branches/AOO410/main/filter/source/graphicfilter/ipcx/ipcx.cxx
openoffice/branches/AOO410/main/filter/source/graphicfilter/iras/iras.cxx
openoffice/branches/AOO410/main/filter/source/graphicfilter/itga/itga.cxx
openoffice/branches/AOO410/main/sc/ (props changed)
openoffice/branches/AOO410/main/sc/source/ui/view/drawview.cxx
openoffice/branches/AOO410/main/sd/source/ui/view/DocumentRenderer.cxx
openoffice/branches/AOO410/main/set_soenv.in
openoffice/branches/AOO410/main/shell/source/backends/macbe/macbackend.cxx
openoffice/branches/AOO410/main/sw/inc/unotbl.hxx
openoffice/branches/AOO410/main/sw/inc/viewsh.hxx
openoffice/branches/AOO410/main/sw/source/core/inc/frame.hxx
openoffice/branches/AOO410/main/sw/source/core/view/vprint.cxx
Modified:
openoffice/branches/AOO410/main/filter/source/graphicfilter/ipbm/ipbm.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/filter/source/graphicfilter/ipbm/ipbm.cxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/filter/source/graphicfilter/ipbm/ipbm.cxx
(original)
+++ openoffice/branches/AOO410/main/filter/source/graphicfilter/ipbm/ipbm.cxx
Thu Jun 12 14:56:18 2014
@@ -107,7 +107,8 @@ sal_Bool PBMReader::ReadPBM( SvStream &
{
case 0 :
maBmp = Bitmap( Size( mnWidth, mnHeight ), 1 );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) ==
sal_False )
+ mpAcc = maBmp.AcquireWriteAccess();
+ if ( !mpAcc )
return sal_False;
mpAcc->SetPaletteEntryCount( 2 );
mpAcc->SetPaletteColor( 0, BitmapColor( 0xff, 0xff,
0xff ) );
@@ -122,7 +123,8 @@ sal_Bool PBMReader::ReadPBM( SvStream &
else
maBmp = Bitmap( Size( mnWidth, mnHeight ), 8);
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) ==
sal_False )
+ mpAcc = maBmp.AcquireWriteAccess();
+ if ( !mpAcc )
return sal_False;
mnCol = (sal_uInt16)mnMaxVal + 1;
if ( mnCol > 256 )
@@ -137,7 +139,8 @@ sal_Bool PBMReader::ReadPBM( SvStream &
break;
case 2 :
maBmp = Bitmap( Size( mnWidth, mnHeight ), 24 );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) ==
sal_False )
+ mpAcc = maBmp.AcquireWriteAccess();
+ if ( !mpAcc )
return sal_False;
break;
}
Modified:
openoffice/branches/AOO410/main/filter/source/graphicfilter/ipcd/ipcd.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/filter/source/graphicfilter/ipcd/ipcd.cxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/filter/source/graphicfilter/ipcd/ipcd.cxx
(original)
+++ openoffice/branches/AOO410/main/filter/source/graphicfilter/ipcd/ipcd.cxx
Thu Jun 12 14:56:18 2014
@@ -155,7 +155,8 @@ sal_Bool PCDReader::ReadPCD( SvStream &
nBMPHeight = nWidth;
}
aBmp = Bitmap( Size( nBMPWidth, nBMPHeight ), 24 );
- if ( ( mpAcc = aBmp.AcquireWriteAccess() ) == sal_False )
+ mpAcc = aBmp.AcquireWriteAccess();
+ if ( !mpAcc )
return sal_False;
ReadImage( 5 ,65 );
Modified:
openoffice/branches/AOO410/main/filter/source/graphicfilter/ipcx/ipcx.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/filter/source/graphicfilter/ipcx/ipcx.cxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/filter/source/graphicfilter/ipcx/ipcx.cxx
(original)
+++ openoffice/branches/AOO410/main/filter/source/graphicfilter/ipcx/ipcx.cxx
Thu Jun 12 14:56:18 2014
@@ -114,7 +114,8 @@ sal_Bool PCXReader::ReadPCX( SvStream &
if ( nStatus )
{
aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel );
- if ( ( pAcc = aBmp.AcquireWriteAccess() ) == sal_False )
+ pAcc = aBmp.AcquireWriteAccess();
+ if ( !pAcc )
return sal_False;
if ( nDestBitsPerPixel <= 8 )
Modified:
openoffice/branches/AOO410/main/filter/source/graphicfilter/iras/iras.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/filter/source/graphicfilter/iras/iras.cxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/filter/source/graphicfilter/iras/iras.cxx
(original)
+++ openoffice/branches/AOO410/main/filter/source/graphicfilter/iras/iras.cxx
Thu Jun 12 14:56:18 2014
@@ -103,7 +103,8 @@ sal_Bool RASReader::ReadRAS( SvStream &
return sal_False;
maBmp = Bitmap( Size( mnWidth, mnHeight ), mnDstBitsPerPix );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False )
+ mpAcc = maBmp.AcquireWriteAccess();
+ if ( !mpAcc )
return sal_False;
if ( mnDstBitsPerPix <= 8 ) // paletten bildchen
Modified:
openoffice/branches/AOO410/main/filter/source/graphicfilter/itga/itga.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/filter/source/graphicfilter/itga/itga.cxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/filter/source/graphicfilter/itga/itga.cxx
(original)
+++ openoffice/branches/AOO410/main/filter/source/graphicfilter/itga/itga.cxx
Thu Jun 12 14:56:18 2014
@@ -685,7 +685,7 @@ sal_Bool TGAReader::ImplReadPalette()
mpFileHeader->nColorMapEntrySize = 0x3f; //
patch for the following switch routine
}
mpColorMap = new sal_uInt32[ nColors ]; // we will
always index dwords
- if ( mpColorMap == sal_False )
+ if ( !mpColorMap ) // NOTE: check for new-result==NULL because
exceptions are disabled in this module
return sal_False;
// out of memory %&!$&/!"�$
switch( mpFileHeader->nColorMapEntrySize )
Propchange: openoffice/branches/AOO410/main/sc/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/sc:r1594864
Modified: openoffice/branches/AOO410/main/sc/source/ui/view/drawview.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sc/source/ui/view/drawview.cxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sc/source/ui/view/drawview.cxx (original)
+++ openoffice/branches/AOO410/main/sc/source/ui/view/drawview.cxx Thu Jun 12
14:56:18 2014
@@ -1011,7 +1011,7 @@ SdrObject* ScDrawView::ApplyGraphicToObj
return &rHitObject;
}
- return false;
+ return NULL;
}
// eof
Modified: openoffice/branches/AOO410/main/sd/source/ui/view/DocumentRenderer.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sd/source/ui/view/DocumentRenderer.cxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sd/source/ui/view/DocumentRenderer.cxx
(original)
+++ openoffice/branches/AOO410/main/sd/source/ui/view/DocumentRenderer.cxx Thu
Jun 12 14:56:18 2014
@@ -115,7 +115,7 @@ namespace {
bool IsHandoutHorizontal (void) const
{
- return GetBoolValue("SlidesPerPageOrder", sal_Int32(0), true);
+ return GetBoolValue("SlidesPerPageOrder", NULL, true);
}
sal_Int32 GetHandoutPageCount (void) const
Modified: openoffice/branches/AOO410/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/set_soenv.in?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/set_soenv.in (original)
+++ openoffice/branches/AOO410/main/set_soenv.in Thu Jun 12 14:56:18 2014
@@ -1441,7 +1441,8 @@ elsif ($platform =~ m/cygwin/)
elsif ($platform =~ m/darwin/)
{
$FRAMEWORKSHOME = "@MACOSX_SDK_PATH@/System/Library/Frameworks";
- my $STLINC .=
$I."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
+ chomp( my $TOOLSPATH = `xcode-select --print-path` );
+ my $STLINC .=
$I."$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
$SOLARINC .= $STLINC .
$I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
$GUIBASE = "aqua";
}
Modified:
openoffice/branches/AOO410/main/shell/source/backends/macbe/macbackend.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/shell/source/backends/macbe/macbackend.cxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/shell/source/backends/macbe/macbackend.cxx
(original)
+++ openoffice/branches/AOO410/main/shell/source/backends/macbe/macbackend.cxx
Thu Jun 12 14:56:18 2014
@@ -412,7 +412,7 @@ css::uno::Any MacOSXBackend::getProperty
CFDictionaryRef rProxyDict = SCDynamicStoreCopyProxies(NULL);
if (!rProxyDict)
- rExceptionsList = false;
+ rExceptionsList = nil;
else
rExceptionsList = (CFArrayRef) CFDictionaryGetValue(rProxyDict,
kSCPropNetProxiesExceptionsList);
Modified: openoffice/branches/AOO410/main/sw/inc/unotbl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/unotbl.hxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sw/inc/unotbl.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/unotbl.hxx Thu Jun 12 14:56:18 2014
@@ -58,11 +58,12 @@ class SwTableCursor;
class SwTableBoxFmt;
class SwChartDataProvider;
class SwFrmFmt;
+class SwXCell;
+void lcl_setString( SwXCell&, const rtl::OUString &rTxt, sal_Bool
bKeepNumberFmt = sal_True );
-/* -----------------------------22.09.00 11:10--------------------------------
+// ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
class SwChartEventListenerContainer : public SwEventListenerContainer
{
public:
@@ -87,7 +88,7 @@ class SwXCell : public SwXCellBaseClass,
public SwClient
{
friend void lcl_setString( SwXCell &rCell, const rtl::OUString &rTxt,
- sal_Bool bKeepNumberFmt = sal_False );
+ sal_Bool bKeepNumberFmt );
friend double lcl_getValue( SwXCell &rCell );
friend void lcl_setValue( SwXCell &rCell, double nVal );
Modified: openoffice/branches/AOO410/main/sw/inc/viewsh.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/viewsh.hxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sw/inc/viewsh.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/viewsh.hxx Thu Jun 12 14:56:18 2014
@@ -110,9 +110,8 @@ class SW_DLLPUBLIC ViewShell : public Ri
// OD 12.12.2002 #103492# - for setting visible area for page preview paint
friend class SwPagePreviewLayout;
- //Umsetzen der SwVisArea, damit vor dem Drucken sauber formatiert
- //werden kann.
- friend void SetSwVisArea( ViewShell *pSh, const SwRect &, sal_Bool
bPDFExport = sal_False );
+ // setting the SwVisArea is used to get a clean formatting before printing
+ friend void SetSwVisArea( ViewShell*, const SwRect& /*, sal_Bool
bPDFExport = sal_False */ );
// --> PB 2007-05-30 #146850#
static BitmapEx* pReplaceBmp; // replaced display of still loaded
images
Modified: openoffice/branches/AOO410/main/sw/source/core/inc/frame.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/inc/frame.hxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sw/source/core/inc/frame.hxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/inc/frame.hxx Thu Jun 12
14:56:18 2014
@@ -139,6 +139,8 @@ typedef void (SwFrm:: *SwFrmMakePos)( co
typedef long (*SwOperator)( long, long );
typedef void (SwFrm:: *SwFrmSet)( long, long );
+SwFrm* SaveCntnt( SwLayoutFrm*, SwFrm* pStart = NULL );
+
struct SwRectFnCollection
{
SwRectGet fnGetTop;
@@ -276,8 +278,8 @@ class SwFrm: public SwClient, public Sfx
friend class SwLooping; // LoopControlling (layouter.cxx)
//Hebt die Lower waehrend eines Spaltenumbaus auf.
- friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart = NULL );
- friend void RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool
bGrow );
+ friend SwFrm *SaveCntnt( SwLayoutFrm*, SwFrm* pStart );
+ friend void RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling,
bool bGrow );
#if OSL_DEBUG_LEVEL > 1
//entfernt leere SwSectionFrms aus einer Kette
Modified: openoffice/branches/AOO410/main/sw/source/core/view/vprint.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/view/vprint.cxx?rev=1602192&r1=1602191&r2=1602192&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sw/source/core/view/vprint.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/view/vprint.cxx Thu Jun 12
14:56:18 2014
@@ -190,14 +190,9 @@ void SwPaintQueue::Remove( ViewShell *pS
}
}
-/******************************************************************************
- * Methode : void SetSwVisArea( ViewShell *pSh, Point
aPrtOffset, ...
- * Beschreibung:
- * Erstellt : OK 04.11.94 16:27
- * Aenderung :
-
******************************************************************************/
+//
******************************************************************************
-void SetSwVisArea( ViewShell *pSh, const SwRect &rRect, sal_Bool
/*bPDFExport*/ )
+void SetSwVisArea( ViewShell *pSh, const SwRect &rRect /*, sal_Bool
bPDFExport*/ )
{
ASSERT( !pSh->GetWin(), "Drucken mit Window?" );
pSh->aVisArea = rRect;
