RepositoryExternal.mk | 2 +- connectivity/CppunitTest_connectivity_ado.mk | 4 ++++ connectivity/Module_connectivity.mk | 11 +++++------ connectivity/qa/connectivity/ado/DriverTest.cxx | 4 +--- lpsolve/ExternalProject_lpsolve.mk | 2 -- lpsolve/UnpackedTarball_lpsolve.mk | 3 +-- sd/source/ui/view/ViewShellBase.cxx | 4 +--- sw/inc/doc.hxx | 2 +- sw/inc/fmtcol.hxx | 10 +++++----- sw/inc/format.hxx | 6 +++--- sw/inc/htmltbl.hxx | 6 +++--- sw/inc/lineinfo.hxx | 2 +- sw/inc/ndgrf.hxx | 12 ++++++------ sw/source/core/attr/format.cxx | 20 ++++++++++---------- sw/source/core/doc/fmtcol.cxx | 24 ++++++++++++------------ sw/source/core/doc/gctable.cxx | 8 ++++---- sw/source/core/doc/htmltbl.cxx | 4 ++-- sw/source/core/doc/lineinfo.cxx | 2 +- sw/source/core/doc/notxtfrm.cxx | 20 ++++++++++---------- sw/source/core/doc/visiturl.cxx | 8 ++++---- sw/source/core/graphic/ndgrf.cxx | 6 +++--- sw/source/core/inc/notxtfrm.hxx | 2 +- sw/source/core/inc/tblrwcl.hxx | 12 ++++++------ sw/source/core/layout/fly.cxx | 2 +- 24 files changed, 86 insertions(+), 90 deletions(-)
New commits: commit 88e457dc60b7a7e5f4048e00c0418bc57537c029 Author: Takeshi Abe <[email protected]> Date: Thu Nov 8 12:16:44 2012 +0900 sal_Bool to bool Change-Id: Idfbc33106b20b06c5247c50d099972305f016a51 diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 0183d1f..ca5efc9 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1803,7 +1803,7 @@ public: // Query if ::com::sun::star::util::URL was visited. // Query via Doc, if only a ::com::sun::star::text::Bookmark has been given. // In this case the document name has to be set in front. - sal_Bool IsVisitedURL( const String& rURL ) const; + bool IsVisitedURL( const String& rURL ) const; /// Save current values for automatic registration of exceptions in Autocorrection. void SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew ); diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 941e20c..5cb721b 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -103,7 +103,7 @@ public: inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext); SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; } - sal_Bool IsAtDocNodeSet() const; + bool IsAtDocNodeSet() const; void SetAttrOutlineLevel( int ); int GetAttrOutlineLevel() const; @@ -117,9 +117,9 @@ public: /** Override to recognize changes on the <SwNumRuleItem> and register/unregister the paragragh style at the corresponding <SwNumRule> instance. */ - virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr ); - virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet ); - virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); + virtual bool SetFmtAttr( const SfxPoolItem& rAttr ); + virtual bool SetFmtAttr( const SfxItemSet& rSet ); + virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); /// Override <ResetAllFmtAttr()> to stay assigned to list level of outline style. virtual sal_uInt16 ResetAllFmtAttr(); @@ -256,7 +256,7 @@ public: const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const; const SwFmtCollConditions& GetCondColls() const { return aCondColls; } void InsertCondition( const SwCollCondition& rCond ); - sal_Bool RemoveCondition( const SwCollCondition& rCond ); + bool RemoveCondition( const SwCollCondition& rCond ); void SetConditions( const SwFmtCollConditions& ); }; diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 8b8b61b..51cea19 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -98,9 +98,9 @@ public: sal_Bool bInParents = sal_True ) const; inline SfxItemState GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent = sal_True, const SfxPoolItem **ppItem = 0 ) const; - virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr ); - virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet ); - virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); + virtual bool SetFmtAttr( const SfxPoolItem& rAttr ); + virtual bool SetFmtAttr( const SfxItemSet& rSet ); + virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); /** Takes all hints from Delta-Array, @return count of deleted hints. */ diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index a3c06d2..2f027e9 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -64,12 +64,12 @@ class SwHTMLTableLayoutCnts sal_uInt8 nPass1Done; ///< How many times has Pass 1 been called? sal_uInt8 nWidthSet; ///< How many times has the width been set? - sal_Bool bNoBreakTag; ///< <NOBR>-Tag over complete content. + bool bNoBreakTag; ///< <NOBR>-Tag over complete content. public: SwHTMLTableLayoutCnts( const SwStartNode* pSttNd, SwHTMLTableLayout* pTab, - sal_Bool bNoBreakTag, SwHTMLTableLayoutCnts* pNxt ); + bool bNoBreakTag, SwHTMLTableLayoutCnts* pNxt ); ~SwHTMLTableLayoutCnts(); @@ -89,7 +89,7 @@ public: void SetPass1Done( sal_uInt8 nRef ) { nPass1Done = nRef; } sal_Bool IsPass1Done( sal_uInt8 nRef ) const { return nRef==nPass1Done; } - sal_Bool HasNoBreakTag() const { return bNoBreakTag; } + bool HasNoBreakTag() const { return bNoBreakTag; } }; class SwHTMLTableLayoutCell diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx index 8dcb732..22bb1a9 100644 --- a/sw/inc/lineinfo.hxx +++ b/sw/inc/lineinfo.hxx @@ -57,7 +57,7 @@ public: SwLineNumberInfo(const SwLineNumberInfo&); SwLineNumberInfo& operator=(const SwLineNumberInfo&); - sal_Bool operator==( const SwLineNumberInfo& rInf ) const; + bool operator==( const SwLineNumberInfo& rInf ) const; SwCharFmt *GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const; void SetCharFmt( SwCharFmt* ); diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 317b4d3..7bc2028 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -184,11 +184,11 @@ public: #ifndef _FESHVIEW_ONLY_INLINE_NEEDED /// Query link-data. - sal_Bool IsGrfLink() const { return refLink.Is(); } - inline sal_Bool IsLinkedFile() const; - inline sal_Bool IsLinkedDDE() const; + bool IsGrfLink() const { return refLink.Is(); } + inline bool IsLinkedFile() const; + inline bool IsLinkedDDE() const; ::sfx2::SvBaseLinkRef GetLink() const { return refLink; } - sal_Bool GetFileFilterNms( String* pFileNm, String* pFilterNm ) const; + bool GetFileFilterNms( String* pFileNm, String* pFilterNm ) const; void ReleaseLink(); /** Scale an image-map: the image-map becomes zoomed in / out by @@ -221,11 +221,11 @@ inline const SwGrfNode *SwNode::GetGrfNode() const } #ifndef _FESHVIEW_ONLY_INLINE_NEEDED -inline sal_Bool SwGrfNode::IsLinkedFile() const +inline bool SwGrfNode::IsLinkedFile() const { return refLink.Is() && OBJECT_CLIENT_GRF == refLink->GetObjType(); } -inline sal_Bool SwGrfNode::IsLinkedDDE() const +inline bool SwGrfNode::IsLinkedDDE() const { return refLink.Is() && OBJECT_CLIENT_DDE == refLink->GetObjType(); } diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index f9287c3..65b3d00 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -386,7 +386,7 @@ sal_Bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom) return sal_True; } -sal_Bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr ) +bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr ) { if ( IsInCache() || IsInSwFntCache() ) { @@ -396,14 +396,14 @@ sal_Bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr ) // if Modify is locked then no modifications will be sent; // but call Modify always for FrmFmts - sal_Bool bRet = sal_False; + bool bRet = false; const sal_uInt16 nFmtWhich = Which(); if( IsModifyLocked() || ( !GetDepends() && (RES_GRFFMTCOLL == nFmtWhich || RES_TXTFMTCOLL == nFmtWhich ) ) ) { - if( 0 != ( bRet = (0 != aSet.Put( rAttr ))) ) + if( ( bRet = (0 != aSet.Put( rAttr ))) ) aSet.SetModifyAtAttr( this ); // #i71574# if ( nFmtWhich == RES_TXTFMTCOLL && rAttr.Which() == RES_PARATR_NUMRULE ) @@ -431,10 +431,10 @@ sal_Bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr ) return bRet; } -sal_Bool SwFmt::SetFmtAttr( const SfxItemSet& rSet ) +bool SwFmt::SetFmtAttr( const SfxItemSet& rSet ) { if( !rSet.Count() ) - return sal_False; + return false; if ( IsInCache() ) { @@ -445,14 +445,14 @@ sal_Bool SwFmt::SetFmtAttr( const SfxItemSet& rSet ) // if Modify is locked then no modifications will be sent; // but call Modify always for FrmFmts - sal_Bool bRet = sal_False; + bool bRet = false; const sal_uInt16 nFmtWhich = Which(); if ( IsModifyLocked() || ( !GetDepends() && ( RES_GRFFMTCOLL == nFmtWhich || RES_TXTFMTCOLL == nFmtWhich ) ) ) { - if( 0 != ( bRet = (0 != aSet.Put( rSet ))) ) + if( ( bRet = (0 != aSet.Put( rSet ))) ) aSet.SetModifyAtAttr( this ); // #i71574# if ( nFmtWhich == RES_TXTFMTCOLL ) @@ -478,10 +478,10 @@ sal_Bool SwFmt::SetFmtAttr( const SfxItemSet& rSet ) } // remove Hint using nWhich from array with delta -sal_Bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 ) +bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 ) { if( !aSet.Count() ) - return sal_False; + return false; if( !nWhich2 || nWhich2 < nWhich1 ) nWhich2 = nWhich1; // then set to 1st ID, only this item @@ -500,7 +500,7 @@ sal_Bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 ) SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ), aNew( *aSet.GetPool(), aSet.GetRanges() ); - sal_Bool bRet = 0 != aSet.ClearItem_BC( nWhich1, nWhich2, &aOld, &aNew ); + bool bRet = 0 != aSet.ClearItem_BC( nWhich1, nWhich2, &aOld, &aNew ); if( bRet ) { SwAttrSetChg aChgOld( aSet, aOld ); diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 0e65267..7058d8b 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -335,18 +335,18 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SwFmtColl::Modify( pOld, pNew ); } -sal_Bool SwTxtFmtColl::IsAtDocNodeSet() const +bool SwTxtFmtColl::IsAtDocNodeSet() const { SwIterator<SwCntntNode,SwFmtColl> aIter( *this ); const SwNodes& rNds = GetDoc()->GetNodes(); for( SwCntntNode* pNode = aIter.First(); pNode; pNode = aIter.Next() ) if( &(pNode->GetNodes()) == &rNds ) - return sal_True; + return true; - return sal_False; + return false; } -sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr ) +bool SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr ) { const bool bIsNumRuleItem = rAttr.Which() == RES_PARATR_NUMRULE; if ( bIsNumRuleItem ) @@ -354,7 +354,7 @@ sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr ) TxtFmtCollFunc::RemoveFromNumRule( *this ); } - const sal_Bool bRet = SwFmtColl::SetFmtAttr( rAttr ); + const bool bRet = SwFmtColl::SetFmtAttr( rAttr ); if ( bIsNumRuleItem ) { @@ -364,7 +364,7 @@ sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr ) return bRet; } -sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxItemSet& rSet ) +bool SwTxtFmtColl::SetFmtAttr( const SfxItemSet& rSet ) { const bool bIsNumRuleItemAffected = rSet.GetItemState( RES_PARATR_NUMRULE, sal_False ) == SFX_ITEM_SET; @@ -373,7 +373,7 @@ sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxItemSet& rSet ) TxtFmtCollFunc::RemoveFromNumRule( *this ); } - const sal_Bool bRet = SwFmtColl::SetFmtAttr( rSet ); + const bool bRet = SwFmtColl::SetFmtAttr( rSet ); if ( bIsNumRuleItemAffected ) { @@ -383,7 +383,7 @@ sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxItemSet& rSet ) return bRet; } -sal_Bool SwTxtFmtColl::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 ) +bool SwTxtFmtColl::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 ) { const bool bIsNumRuleItemAffected = ( nWhich2 != 0 && nWhich2 > nWhich1 ) @@ -395,7 +395,7 @@ sal_Bool SwTxtFmtColl::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 ) TxtFmtCollFunc::RemoveFromNumRule( *this ); } - const sal_Bool bRet = SwFmtColl::ResetFmtAttr( nWhich1, nWhich2 ); + const bool bRet = SwFmtColl::ResetFmtAttr( nWhich1, nWhich2 ); return bRet; } @@ -597,14 +597,14 @@ void SwConditionTxtFmtColl::InsertCondition( const SwCollCondition& rCond ) } -sal_Bool SwConditionTxtFmtColl::RemoveCondition( const SwCollCondition& rCond ) +bool SwConditionTxtFmtColl::RemoveCondition( const SwCollCondition& rCond ) { - sal_Bool bRet = sal_False; + bool bRet = false; for( sal_uInt16 n = 0; n < aCondColls.size(); ++n ) if( aCondColls[ n ] == rCond ) { aCondColls.erase( aCondColls.begin() + n ); - bRet = sal_True; + bRet = true; } return bRet; diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx index 3bd5110..2a2e312 100644 --- a/sw/source/core/doc/gctable.cxx +++ b/sw/source/core/doc/gctable.cxx @@ -41,7 +41,7 @@ inline const SvxBorderLine* GetLineTB( const SvxBoxItem* pBox, bool bTop ) } -sal_Bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrmFmt& rFmt ) +bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrmFmt& rFmt ) { const SvxBorderLine* pBrd; const SfxPoolItem* pItem; @@ -49,10 +49,10 @@ sal_Bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrmFmt& rFmt ) 0 != ( pBrd = ((SvxBoxItem*)pItem)->GetLeft() ) ) { if( *pBrdLn == *pBrd ) - bAnyBorderFnd = sal_True; - return sal_True; + bAnyBorderFnd = true; + return true; } - return sal_False; + return false; } diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 4dea4f7..409ae1c 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -88,7 +88,7 @@ public: SwHTMLTableLayoutCnts::SwHTMLTableLayoutCnts( const SwStartNode *pSttNd, SwHTMLTableLayout* pTab, - sal_Bool bNoBrTag, + bool bNoBrTag, SwHTMLTableLayoutCnts* pNxt ) : pNext( pNxt ), pBox( 0 ), pTable( pTab ), pStartNode( pSttNd ), nPass1Done( 0 ), nWidthSet( 0 ), bNoBreakTag( bNoBrTag ) @@ -437,7 +437,7 @@ SwFrmFmt *SwHTMLTableLayout::FindFlyFrmFmt() const static void lcl_GetMinMaxSize( sal_uLong& rMinNoAlignCnts, sal_uLong& rMaxNoAlignCnts, sal_uLong& rAbsMinNoAlignCnts, - SwTxtNode *pTxtNd, sal_uLong nIdx, sal_Bool bNoBreak ) + SwTxtNode *pTxtNd, sal_uLong nIdx, bool bNoBreak ) { pTxtNd->GetMinMaxSize( nIdx, rMinNoAlignCnts, rMaxNoAlignCnts, rAbsMinNoAlignCnts ); diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx index 00552a9..5aa3270 100644 --- a/sw/source/core/doc/lineinfo.cxx +++ b/sw/source/core/doc/lineinfo.cxx @@ -107,7 +107,7 @@ SwLineNumberInfo& SwLineNumberInfo::operator=(const SwLineNumberInfo &rCpy) return *this; } -sal_Bool SwLineNumberInfo::operator==( const SwLineNumberInfo& rInf ) const +bool SwLineNumberInfo::operator==( const SwLineNumberInfo& rInf ) const { return GetRegisteredIn() == rInf.GetRegisteredIn() && aType.GetNumberingType() == rInf.GetNumType().GetNumberingType() && diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index a62026c..423dc35 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -79,9 +79,9 @@ using namespace com::sun::star; extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx -inline sal_Bool GetRealURL( const SwGrfNode& rNd, String& rTxt ) +inline bool GetRealURL( const SwGrfNode& rNd, String& rTxt ) { - sal_Bool bRet = rNd.GetFileFilterNms( &rTxt, 0 ); + bool bRet = rNd.GetFileFilterNms( &rTxt, 0 ); if( bRet ) rTxt = URIHelper::removePassword( rTxt, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS); @@ -90,7 +90,7 @@ inline sal_Bool GetRealURL( const SwGrfNode& rNd, String& rTxt ) static void lcl_PaintReplacement( const SwRect &rRect, const String &rText, const ViewShell &rSh, const SwNoTxtFrm *pFrm, - sal_Bool bDefect ) + bool bDefect ) { static Font *pFont = 0; if ( !pFont ) @@ -108,7 +108,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const String &rText, const SwFmtURL &rURL = pFrm->FindFlyFrm()->GetFmt()->GetURL(); if( rURL.GetURL().Len() || rURL.GetMap() ) { - sal_Bool bVisited = sal_False; + bool bVisited = false; if ( rURL.GetMap() ) { ImageMap *pMap = (ImageMap*)rURL.GetMap(); @@ -117,7 +117,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const String &rText, IMapObject *pObj = pMap->GetIMapObject( i ); if( rSh.GetDoc()->IsVisitedURL( pObj->GetURL() ) ) { - bVisited = sal_True; + bVisited = true; break; } } @@ -134,7 +134,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const String &rText, pFont->SetUnderline( eUnderline ); pFont->SetColor( aCol ); - const BitmapEx& rBmp = ViewShell::GetReplacementBitmap( bDefect != sal_False ); + const BitmapEx& rBmp = ViewShell::GetReplacementBitmap( bDefect ); Graphic::DrawEx( rSh.GetOut(), rText, *pFont, rBmp, rRect.Pos(), rRect.SSize() ); } @@ -249,7 +249,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const GetRealURL( *(SwGrfNode*)pNd, aTxt ); if( !aTxt.Len() ) aTxt = FindFlyFrm()->GetFmt()->GetName(); - lcl_PaintReplacement( Frm(), aTxt, *pSh, this, sal_False ); + lcl_PaintReplacement( Frm(), aTxt, *pSh, this, false ); } return; } @@ -369,7 +369,7 @@ static void lcl_CalcRect( Point& rPt, Size& rDim, sal_uInt16 nMirror ) *************************************************************************/ void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect, - sal_Bool ) const + bool ) const { // Currently only used for scaling, cropping and mirroring the contour of graphics! // Everything else is handled by GraphicObject @@ -938,7 +938,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons String aTxt( pGrfNd->GetTitle() ); if ( !aTxt.Len() ) GetRealURL( *pGrfNd, aTxt ); - ::lcl_PaintReplacement( aAlignedGrfArea, aTxt, *pShell, this, sal_False ); + ::lcl_PaintReplacement( aAlignedGrfArea, aTxt, *pShell, this, false ); bContinue = false; } else if( rGrfObj.IsCached( pOut, aAlignedGrfArea.Pos(), @@ -1037,7 +1037,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons if ( nResId ) aText = SW_RESSTR( nResId ); - ::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, sal_True ); + ::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, true ); } // When printing, we must not collect the graphics diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx index 0c95d5b..1036634 100644 --- a/sw/source/core/doc/visiturl.cxx +++ b/sw/source/core/doc/visiturl.cxx @@ -64,7 +64,7 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint ) pDoc->GetDocShell()->GetMedium()->GetName().equals(sURL) ) (sBkmk = pIURL->GetMark()).Insert( INET_MARK_TOKEN, 0 ); - sal_Bool bAction = sal_False, bUnLockView = sal_False; + bool bAction = false, bUnLockView = false; const SwFmtINetFmt* pItem; const SwTxtINetFmt* pTxtAttr; const SwTxtNode* pTxtNd; @@ -80,7 +80,7 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint ) if( !bAction && pESh ) { pESh->StartAllAction(); - bAction = sal_True; + bAction = true; bUnLockView = !pESh->IsViewLocked(); pESh->LockView( sal_True ); } @@ -101,9 +101,9 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint ) // Check if the URL has been visited before. Via the Doc, if only one Bookmark is set // We need to put the Doc's name before it! -sal_Bool SwDoc::IsVisitedURL( const String& rURL ) const +bool SwDoc::IsVisitedURL( const String& rURL ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( rURL.Len() ) { INetURLHistory *pHist = INetURLHistory::GetOrCreate(); diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 4907787..31c3deb 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -529,9 +529,9 @@ short SwGrfNode::SwapOut() } -sal_Bool SwGrfNode::GetFileFilterNms( String* pFileNm, String* pFilterNm ) const +bool SwGrfNode::GetFileFilterNms( String* pFileNm, String* pFilterNm ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( refLink.Is() && refLink->GetLinkManager() ) { sal_uInt16 nType = refLink->GetObjType(); @@ -548,7 +548,7 @@ sal_Bool SwGrfNode::GetFileFilterNms( String* pFileNm, String* pFilterNm ) const ( *pFileNm += sTopic ) += sfx2::cTokenSeperator; *pFileNm += sItem; pFilterNm->AssignAscii( RTL_CONSTASCII_STRINGPARAM( "DDE" )); - bRet = sal_True; + bRet = true; } } } diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index db8e158..cc680df 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -63,7 +63,7 @@ public: SwCrsrMoveState* = 0) const; const Size &GetGrfSize() const { return GetSize(); } - void GetGrfArea( SwRect &rRect, SwRect * = 0, sal_Bool bMirror = sal_True ) const; + void GetGrfArea( SwRect &rRect, SwRect * = 0, bool bMirror = true ) const; sal_Bool IsTransparent() const; diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index e50098d..16f415c 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -139,18 +139,18 @@ struct _SwGCLineBorder class _SwGCBorder_BoxBrd { const editeng::SvxBorderLine* pBrdLn; - sal_Bool bAnyBorderFnd; + bool bAnyBorderFnd; public: - _SwGCBorder_BoxBrd() : pBrdLn( 0 ), bAnyBorderFnd( sal_False ) {} + _SwGCBorder_BoxBrd() : pBrdLn( 0 ), bAnyBorderFnd( false ) {} void SetBorder( const editeng::SvxBorderLine& rBorderLine ) - { pBrdLn = &rBorderLine; bAnyBorderFnd = sal_False; } + { pBrdLn = &rBorderLine; bAnyBorderFnd = false; } // checke, ob die linke Border dieselbe wie die gesetzte ist - // returnt sal_False falls gar keine Border gesetzt ist - sal_Bool CheckLeftBorderOfFormat( const SwFrmFmt& rFmt ); + // returnt false falls gar keine Border gesetzt ist + bool CheckLeftBorderOfFormat( const SwFrmFmt& rFmt ); - sal_Bool IsAnyBorderFound() const { return bAnyBorderFnd; } + bool IsAnyBorderFound() const { return bAnyBorderFnd; } }; void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ); diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 5a1c9fe..fb80962 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -2652,7 +2652,7 @@ sal_Bool SwFlyFrm::GetContour( PolyPolygon& rContour, SwRect aClip; SwRect aOrig; Lower()->Calc(); - ((SwNoTxtFrm*)Lower())->GetGrfArea( aClip, &aOrig, sal_False ); + ((SwNoTxtFrm*)Lower())->GetGrfArea( aClip, &aOrig, false ); // OD 16.04.2003 #i13147# - copy method code <SvxContourDlg::ScaleContour(..)> // in order to avoid that graphic has to be loaded for contour scale. //SvxContourDlg::ScaleContour( rContour, aGrf, MAP_TWIP, aOrig.SSize() ); commit b668d3aaf5690bd067c0ed283e9492ae576117f9 Author: Thorsten Behrens <[email protected]> Date: Thu Nov 8 00:35:02 2012 +0100 Fix white line at the bottom during slideshow. This partially reverts 0a5b49e7199198974113dc2e8b68257b881fb9fb, which affects _all_ Impress views, including slideshow. Change-Id: I297c09bc3c6466e83acfd423fc24d75da9df2833 diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 414dc5d..ae9c4e4 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1303,11 +1303,9 @@ void ViewShellBase::Implementation::ResizePixel ( rOrigin.X()+aBaseBorder.Left(), rOrigin.Y()+aBaseBorder.Top()); - // -1 (below) is there to let one line of _pFrame->GetWindow() visible, - // so that it plays better with the overall look Size aViewWindowSize ( rSize.Width() - aBaseBorder.Left() - aBaseBorder.Right(), - rSize.Height() - aBaseBorder.Top() - aBaseBorder.Bottom() - 1); + rSize.Height() - aBaseBorder.Top() - aBaseBorder.Bottom()); mpViewWindow->SetPosSizePixel(aViewWindowPosition, aViewWindowSize); maClientArea = Rectangle(Point(0,0), aViewWindowSize); commit 7f071c1067c7fa675e741a9050bcbb1d13f0a5ca Author: Peter Foley <[email protected]> Date: Wed Nov 7 18:25:22 2012 -0500 fix lpsolve for android Change-Id: Id7643c33e7d311e04ab7035f68f3c3415fda0fb2 diff --git a/lpsolve/UnpackedTarball_lpsolve.mk b/lpsolve/UnpackedTarball_lpsolve.mk index fc376b3..2e895a0 100644 --- a/lpsolve/UnpackedTarball_lpsolve.mk +++ b/lpsolve/UnpackedTarball_lpsolve.mk @@ -27,8 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\ lpsolve/lp_solve_5.5.patch \ )) -$(eval $(call gb_UnpackedTarball_add_file,lpsolve,\ - lpsolve/lpsolve55/ccc.static,lpsolve/ccc.static)) +$(eval $(call gb_UnpackedTarball_add_file,lpsolve,lpsolve55/ccc.static,lpsolve/ccc.static)) endif # vim: set noet sw=4 ts=4: commit 29d5e29a313d8100fad63841224306c1083382a9 Author: Peter Foley <[email protected]> Date: Wed Nov 7 18:18:08 2012 -0500 fix system lpsolve Change-Id: I452b0514da11bbcf16a2f69b214fca90a1c76e2b diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 120dd65..7688e42 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1236,7 +1236,7 @@ define gb_LinkTarget__use_lpsolve $(call gb_LinkTarget_add_libs,$(1),-llpsolve55) $(call gb_LinkTarget_add_defs,$(1),\ -DSYSTEM_LPSOLVE \ -)) +) endef commit c68cd0125dcf8d9f57ee0e1a540a939859e8eed6 Author: David Ostrovsky <[email protected]> Date: Wed Nov 7 23:15:37 2012 +0100 enable ado driver unit test again The problem is that ado driver creates a link file in the tree leaving it dirty: tinderbox doesn't like it. Instead of reading the mdb file direct from srcdir we copy it first to workdir and read it from there with the new function: getPathFromWorkdir. Thank you Norbert! Change-Id: I504bc26b80686db55a505bac19a95cc9c6022fcc Reviewed-on: https://gerrit.libreoffice.org/1004 Reviewed-by: Norbert Thiebaud <[email protected]> Tested-by: Norbert Thiebaud <[email protected]> diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk index d35f62b..f837f99 100644 --- a/connectivity/CppunitTest_connectivity_ado.mk +++ b/connectivity/CppunitTest_connectivity_ado.mk @@ -67,4 +67,8 @@ $(eval $(call gb_CppunitTest_use_components,connectivity_ado,\ $(eval $(call gb_CppunitTest_use_configuration,connectivity_ado)) +$(call gb_CppunitTest_get_target,connectivity_ado) : $(WORKDIR)/CppunitTest/TS001018407.mdb +$(WORKDIR)/CppunitTest/TS001018407.mdb : $(SRCDIR)/connectivity/qa/connectivity/ado/TS001018407.mdb + $(call gb_Deliver_deliver,$<,$@) + # vim: set noet sw=4 ts=4: diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index c01f007..08cae21 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -145,12 +145,11 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\ endif -# FIXME: Makes tinderbox unhappy as it leaves unclean tree -#ifeq ($(GUI),WNT) -#$(eval $(call gb_Module_add_check_targets,connectivity,\ -# CppunitTest_connectivity_ado \ -#)) -#endif +ifeq ($(GUI),WNT) +$(eval $(call gb_Module_add_check_targets,connectivity,\ + CppunitTest_connectivity_ado \ +)) +endif ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\ diff --git a/connectivity/qa/connectivity/ado/DriverTest.cxx b/connectivity/qa/connectivity/ado/DriverTest.cxx index c2e357e..ee96eeb 100755 --- a/connectivity/qa/connectivity/ado/DriverTest.cxx +++ b/connectivity/qa/connectivity/ado/DriverTest.cxx @@ -65,10 +65,8 @@ void AdoDriverTest::setUp() m_xAdoComponent = getMultiServiceFactory()->createInstance("com.sun.star.comp.sdbc.ado.ODriver"); CPPUNIT_ASSERT_MESSAGE("no ado component!", m_xAdoComponent.is()); - // is this the best way to pass test file through URL? - // may be take a custom Sequence< PropertyValue > route? OUString url = OUString("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=") + - getPathFromSrc("/connectivity/qa/connectivity/ado/TS001018407.mdb"); + getPathFromWorkdir("/CppunitTest/TS001018407.mdb"); Sequence< PropertyValue > info; Reference< XDriver> xDriver(m_xAdoComponent, UNO_QUERY); commit db8ab560b45e6433946335fdabc85dfa9c75374b Author: Michael Stahl <[email protected]> Date: Wed Nov 7 23:47:27 2012 +0100 lpsolve: why would it need hunspell Change-Id: If2173e32340cdfe4068dd36b4245ceb6d0bcf2bd diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk index a398e7c..0b6e34e 100644 --- a/lpsolve/ExternalProject_lpsolve.mk +++ b/lpsolve/ExternalProject_lpsolve.mk @@ -11,8 +11,6 @@ $(eval $(call gb_ExternalProject_ExternalProject,lpsolve)) $(eval $(call gb_ExternalProject_use_unpacked,lpsolve,lpsolve)) -$(eval $(call gb_ExternalProject_use_package,lpsolve,hunspell)) - $(eval $(call gb_ExternalProject_register_targets,lpsolve,\ build \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
