Skip to content

Commit

Permalink
#i124422# fix default arguments in friend declarations
Browse files Browse the repository at this point in the history
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.


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1594871 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
hdu-hh committed May 15, 2014
1 parent 4d40bd3 commit 5766e80
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 15 deletions.
7 changes: 4 additions & 3 deletions main/sw/inc/unotbl.hxx
Expand Up @@ -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:
Expand All @@ -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 );

Expand Down
5 changes: 2 additions & 3 deletions main/sw/inc/viewsh.hxx
Expand Up @@ -110,9 +110,8 @@ class SW_DLLPUBLIC ViewShell : public Ring
// 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
Expand Down
6 changes: 4 additions & 2 deletions main/sw/source/core/inc/frame.hxx
Expand Up @@ -142,6 +142,8 @@ typedef void (SwFrm:: *SwFrmMakePos)( const SwFrm*, const SwFrm*, sal_Bool );
typedef long (*SwOperator)( long, long );
typedef void (SwFrm:: *SwFrmSet)( long, long );

SwFrm* SaveCntnt( SwLayoutFrm*, SwFrm* pStart = NULL );

struct SwRectFnCollection
{
SwRectGet fnGetTop;
Expand Down Expand Up @@ -279,8 +281,8 @@ class SwFrm: public SwClient, public SfxBroadcaster
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
Expand Down
9 changes: 2 additions & 7 deletions main/sw/source/core/view/vprint.cxx
Expand Up @@ -190,14 +190,9 @@ void SwPaintQueue::Remove( ViewShell *pSh )
}
}

/******************************************************************************
* 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;
Expand Down

0 comments on commit 5766e80

Please sign in to comment.