diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-07-08 16:54:27 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-07-08 17:32:26 +0200 |
commit | 39f42b0b03489459540404dd218c38709853c021 (patch) | |
tree | 0dcc88595e768efcb63d54a09061db9ad0d14603 | |
parent | b63524d269a792e20777a91e4ed7e8ceae7ff55f (diff) |
error: friend declaration specifying a default argument must be a definition
...(Clang trunk towards 3.4); this appears to be specific to C++11, which added at
the end of 8.3.6/4 [dcl.fct.default]: "If a friend declaration specifies a default
argument expression, that declaration shall be a definition and shall be the only
declaration of the function or function template in the translation unit."
Change-Id: I750c60a2206d7af41322ebb31aa6deca2491067f
-rw-r--r-- | sw/inc/unotbl.hxx | 2 | ||||
-rw-r--r-- | sw/inc/viewsh.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/frame.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/frmtool.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unotbl.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/view/vprint.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index a8cc7b952156..38aa412098b0 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -71,7 +71,7 @@ class SwXCell : public SwXCellBaseClass, public SwClient { friend void sw_setString( SwXCell &rCell, const OUString &rTxt, - sal_Bool bKeepNumberFmt = sal_False ); + sal_Bool bKeepNumberFmt ); friend double sw_getValue( SwXCell &rCell ); friend void sw_setValue( SwXCell &rCell, double nVal ); diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 72d7c4839c0c..92c5f0e5bdcc 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -109,7 +109,7 @@ class SW_DLLPUBLIC ViewShell : public Ring // Set SwVisArea in order to enable clean formatting before printing. - friend void SetSwVisArea( ViewShell *pSh, const SwRect &, sal_Bool bPDFExport = sal_False ); + friend void SetSwVisArea( ViewShell *pSh, const SwRect & ); static BitmapEx* mpReplaceBmp; ///< replaced display of still loaded images static BitmapEx* mpErrorBmp; ///< error display of missed images diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index f93ae6771f18..eeb84d878b53 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -234,7 +234,7 @@ class SwFrm: public SwClient, public SfxBroadcaster friend class SwLooping; // voids lower during creation of a column - friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart = NULL ); + friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart ); friend void RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow ); #ifdef DBG_UTIL diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index fc2e76324c43..45b63bf62d8d 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -70,7 +70,7 @@ SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, ViewShell *pSh ); sal_uLong SqRt( BigInt nX ); -SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart ); +SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart = NULL ); void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow ); // Get CntntNodes, create CntntFrms, and add them to LayFrm. diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 8110f66fbf41..a4ff25536de1 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -692,7 +692,7 @@ static inline OUString lcl_getString( SwXCell &rCell ) /* non UNO function call to set string in SwXCell */ void sw_setString( SwXCell &rCell, const OUString &rTxt, - sal_Bool bKeepNumberFmt ) + sal_Bool bKeepNumberFmt = sal_False ) { if(rCell.IsValid()) { diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 6cea260e3b43..6f5f8ce82acc 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -172,7 +172,7 @@ void SwPaintQueue::Remove( ViewShell *pSh ) } } -void SetSwVisArea( ViewShell *pSh, const SwRect &rRect, sal_Bool /*bPDFExport*/ ) +void SetSwVisArea( ViewShell *pSh, const SwRect &rRect ) { OSL_ENSURE( !pSh->GetWin(), "Drucken mit Window?" ); pSh->maVisArea = rRect; |