summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-07-08 16:54:27 +0200
committerLuboš Luňák <l.lunak@collabora.com>2014-10-06 18:10:28 +0200
commit664fb00dedbb56f18957b5671b2888ff00aa57e7 (patch)
treedae6d4d295fe3956035c7b705ff626fc21961957
parent6c7c6d18eee2f2697b79efe6986ec9d8bf6052a1 (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.hxx2
-rw-r--r--sw/inc/viewsh.hxx2
-rw-r--r--sw/source/core/inc/frame.hxx2
-rw-r--r--sw/source/core/inc/frmtool.hxx2
-rw-r--r--sw/source/core/unocore/unotbl.cxx2
-rw-r--r--sw/source/core/view/vprint.cxx2
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 3fd23507d581..73c748b7c1f2 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;