Author: hdu Date: Thu May 15 11:31:37 2014 New Revision: 1594871 URL: http://svn.apache.org/r1594871 Log: #i124422# fix default arguments in friend declarations
chapter 8.3.6.4 of the C++11 standard requests that friend declarations must not specify default unless these declarations are also definitions. Older compilers still tolerate such constructs that were still undecided until http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#136 but clang>=3.4 or xcode>=5.1 now report errors for such code. The errors break the build and so they have to be fixed. Cleaner alternatives to the fixes are possible but for now they are intended to allow the build while being minimally invasive. Modified: openoffice/trunk/main/sw/inc/unotbl.hxx openoffice/trunk/main/sw/inc/viewsh.hxx openoffice/trunk/main/sw/source/core/inc/frame.hxx openoffice/trunk/main/sw/source/core/view/vprint.cxx Modified: openoffice/trunk/main/sw/inc/unotbl.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/unotbl.hxx?rev=1594871&r1=1594870&r2=1594871&view=diff ============================================================================== --- openoffice/trunk/main/sw/inc/unotbl.hxx (original) +++ openoffice/trunk/main/sw/inc/unotbl.hxx Thu May 15 11:31:37 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/trunk/main/sw/inc/viewsh.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/viewsh.hxx?rev=1594871&r1=1594870&r2=1594871&view=diff ============================================================================== --- openoffice/trunk/main/sw/inc/viewsh.hxx (original) +++ openoffice/trunk/main/sw/inc/viewsh.hxx Thu May 15 11:31:37 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/trunk/main/sw/source/core/inc/frame.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/inc/frame.hxx?rev=1594871&r1=1594870&r2=1594871&view=diff ============================================================================== --- openoffice/trunk/main/sw/source/core/inc/frame.hxx (original) +++ openoffice/trunk/main/sw/source/core/inc/frame.hxx Thu May 15 11:31:37 2014 @@ -142,6 +142,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; @@ -279,8 +281,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/trunk/main/sw/source/core/view/vprint.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/view/vprint.cxx?rev=1594871&r1=1594870&r2=1594871&view=diff ============================================================================== --- openoffice/trunk/main/sw/source/core/view/vprint.cxx (original) +++ openoffice/trunk/main/sw/source/core/view/vprint.cxx Thu May 15 11:31:37 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;
