include/svl/itemset.hxx | 2 - include/svtools/ruler.hxx | 2 - include/svx/fmtools.hxx | 2 - include/svx/ruler.hxx | 2 - include/tools/debug.hxx | 12 ++++----- linguistic/source/dicimp.cxx | 2 - linguistic/source/lngopt.cxx | 2 - reportdesign/source/core/api/Section.cxx | 3 -- sc/source/ui/view/tabcont.cxx | 4 +-- sd/source/ui/dlg/navigatr.cxx | 4 +-- sd/source/ui/func/futempl.cxx | 6 ++-- sfx2/source/menu/virtmenu.cxx | 6 ++-- svl/source/items/itemset.cxx | 7 ++--- svtools/source/contnr/imivctl.hxx | 2 - svtools/source/contnr/imivctl2.cxx | 10 +++---- svtools/source/control/ruler.cxx | 4 +-- svtools/source/control/tabbar.cxx | 2 - svx/source/dialog/hdft.cxx | 2 - svx/source/dialog/svxruler.cxx | 12 ++++----- svx/source/fmcomp/fmgridcl.cxx | 2 - svx/source/fmcomp/fmgridif.cxx | 2 - svx/source/fmcomp/gridcell.cxx | 6 ++-- svx/source/form/filtnav.cxx | 2 - svx/source/gallery2/galexpl.cxx | 2 - svx/source/svdraw/svdglev.cxx | 2 - sw/inc/docsh.hxx | 4 +-- sw/inc/editsh.hxx | 2 - sw/source/core/edit/eddel.cxx | 6 ++-- sw/source/core/frmedt/fecopy.cxx | 2 - sw/source/uibase/app/docst.cxx | 20 +++++++-------- sw/source/uibase/inc/pview.hxx | 2 - sw/source/uibase/inc/view.hxx | 4 +-- sw/source/uibase/uiview/pview.cxx | 6 ++-- sw/source/uibase/uiview/viewport.cxx | 14 +++++----- sw/source/uibase/wrtsh/select.cxx | 2 - toolkit/source/awt/vclxwindows.cxx | 8 +++--- unotools/source/config/securityoptions.cxx | 2 - writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 14 +++++----- xmloff/source/text/txtparae.cxx | 6 ++-- xmloff/source/transform/Oasis2OOo.cxx | 16 ++++++------ 40 files changed, 104 insertions(+), 106 deletions(-)
New commits: commit 2049e3ec22db0684683261746188b40428a0d0e2 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 12:29:22 2015 +0200 XMLTransformerActionInit parameters are generically of type sal_uInt32 Change-Id: I8a013c8ca8938ef2d8e1786cda3dba61fe3038a5 diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 028b3ce..74bd9ad 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -588,7 +588,7 @@ static XMLTransformerActionInit aStyleActionTable[] = ENTRY0( SVG, HEIGHT, XML_ATACTION_IN2INCH ), ENTRY0( DRAW, START, XML_ATACTION_NEG_PERCENT ), ENTRY0( DRAW, END, XML_ATACTION_NEG_PERCENT ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_True ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(true) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; @@ -643,7 +643,7 @@ static XMLTransformerActionInit aTextStyleRefActionTable[] = XML_FAMILY_TYPE_TEXT ), ENTRY1( TEXT, VISITED_STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_TEXT ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_False ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(false) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; @@ -745,7 +745,7 @@ static XMLTransformerActionInit aShapeActionTable[] = ENTRY0( DR3D, FOCAL_LENGTH, XML_ATACTION_IN2INCH ), ENTRY1Q( DRAW, CONTROL, XML_ATACTION_RENAME, XML_NAMESPACE_FORM, XML_ID ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_True ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(true) ), // BM: needed by chart:legend. The legend needs also the draw actions. As // there is no merge mechanism, all actions have to be in the same table @@ -792,7 +792,7 @@ static XMLTransformerActionInit aConnectorActionTable[] = ENTRY0( DRAW, LINE_SKEW, XML_ATACTION_INS2INCHS ), ENTRY1Q( DRAW, CONTROL, XML_ATACTION_RENAME, XML_NAMESPACE_FORM, XML_ID ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_True ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(true) ), ENTRY0( DRAW, START_SHAPE, XML_ATACTION_DECODE_ID ), ENTRY0( DRAW, END_SHAPE, XML_ATACTION_DECODE_ID ), @@ -952,7 +952,7 @@ static XMLTransformerActionInit aBackgroundImageActionTable[] = { ENTRY1Q( DRAW, OPACITY, XML_ATACTION_RENAME_NEG_PERCENT, XML_NAMESPACE_DRAW, XML_TRANSPARENCY ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_True ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(true) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; @@ -973,7 +973,7 @@ static XMLTransformerActionInit aFormControlActionTable[] = XML_NAMESPACE_FORM, XML_SERVICE_NAME, XML_NAMESPACE_OOO ), ENTRY0( FORM, ID, XML_ATACTION_MOVE_TO_ELEM ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_False ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(false) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; @@ -1006,7 +1006,7 @@ static XMLTransformerActionInit aFormPropActionTable[] = // OASIS_XLINK_ACTIONS static XMLTransformerActionInit aXLinkActionTable[] = { - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_False ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(false) ), ENTRY0( TABLE, REFRESH_DELAY, XML_ATACTION_RNG2ISO_DATETIME ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; @@ -1087,7 +1087,7 @@ static XMLTransformerActionInit aFormActionTable[] = XML_ATACTION_RENAME_REMOVE_NAMESPACE_PREFIX, XML_NAMESPACE_FORM, XML_SERVICE_NAME, XML_NAMESPACE_OOO ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_False ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(false) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; commit 8a360b3031328c45df4e05f804cbc19b528f6b38 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 12:27:33 2015 +0200 txtparae_bContainsIllegalCharacters var wants to be of type bool Change-Id: Ie8b481ab1759725ba40e3cf1bb6611d3c058b53b diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 636323a..5be4ccc 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -248,7 +248,7 @@ namespace xmloff } #ifdef DBG_UTIL -static int txtparae_bContainsIllegalCharacters = sal_False; +static bool txtparae_bContainsIllegalCharacters = false; #endif // The following map shows which property values are required: @@ -1336,7 +1336,7 @@ XMLTextParagraphExport::~XMLTextParagraphExport() delete pListElements; delete pListAutoPool; #ifdef DBG_UTIL - txtparae_bContainsIllegalCharacters = sal_False; + txtparae_bContainsIllegalCharacters = false; #endif PopTextListsHelper(); DBG_ASSERT( maTextListsHelperStack.empty(), @@ -3443,7 +3443,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText, OSL_ENSURE( txtparae_bContainsIllegalCharacters || cChar >= 0x0020, "illegal character in text content" ); - txtparae_bContainsIllegalCharacters = sal_True; + txtparae_bContainsIllegalCharacters = true; #endif bExpCharAsText = false; } commit 74f150fe1b2671d4c4c95aebe510f37ff88038d7 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 12:26:08 2015 +0200 Booleans are logged via sal_uInt32 here Change-Id: I634402fb0739b8d42d43264c57340dd030f86d78 diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index b31d16d..e85036f 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -219,19 +219,19 @@ void lcl_debug_TableBorder(table::TableBorder & rBorder) { dmapper_logger->startElement("TableBorder"); lcl_debug_BorderLine(rBorder.TopLine); - dmapper_logger->attribute("IsTopLineValid", rBorder.IsTopLineValid); + dmapper_logger->attribute("IsTopLineValid", sal_uInt32(rBorder.IsTopLineValid)); lcl_debug_BorderLine(rBorder.BottomLine); - dmapper_logger->attribute("IsBottomLineValid", rBorder.IsBottomLineValid); + dmapper_logger->attribute("IsBottomLineValid", sal_uInt32(rBorder.IsBottomLineValid)); lcl_debug_BorderLine(rBorder.LeftLine); - dmapper_logger->attribute("IsLeftLineValid", rBorder.IsLeftLineValid); + dmapper_logger->attribute("IsLeftLineValid", sal_uInt32(rBorder.IsLeftLineValid)); lcl_debug_BorderLine(rBorder.RightLine); - dmapper_logger->attribute("IsRightLineValid", rBorder.IsRightLineValid); + dmapper_logger->attribute("IsRightLineValid", sal_uInt32(rBorder.IsRightLineValid)); lcl_debug_BorderLine(rBorder.VerticalLine); - dmapper_logger->attribute("IsVerticalLineValid", rBorder.IsVerticalLineValid); + dmapper_logger->attribute("IsVerticalLineValid", sal_uInt32(rBorder.IsVerticalLineValid)); lcl_debug_BorderLine(rBorder.HorizontalLine); - dmapper_logger->attribute("IsHorizontalLineValid", rBorder.IsHorizontalLineValid); + dmapper_logger->attribute("IsHorizontalLineValid", sal_uInt32(rBorder.IsHorizontalLineValid)); dmapper_logger->attribute("Distance", rBorder.Distance); - dmapper_logger->attribute("IsDistanceValid", rBorder.IsDistanceValid); + dmapper_logger->attribute("IsDistanceValid", sal_uInt32(rBorder.IsDistanceValid)); dmapper_logger->endElement(); } #endif commit cb1507746ab47ba1b15e0871c57181aa51ef66d4 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 12:24:12 2015 +0200 SvtSecurityOptions_Impl::m_nSecLevel is of type sal_Int32 Change-Id: I82576e00de006caa6f7f6e414e5399d035aed1bf diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index cf5c3b9..4b1f484 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -220,7 +220,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() ,m_bRecommendPwd(false) ,m_bCtrlClickHyperlink(false) ,m_bBlockUntrustedRefererLinks(false) - ,m_nSecLevel ( sal_True ) + ,m_nSecLevel ( 1 ) ,m_seqTrustedAuthors ( DEFAULT_TRUSTEDAUTHORS ) ,m_bDisableMacros ( false ) ,m_bROSecureURLs ( CFG_READONLY_DEFAULT ) commit c446a09217670c025076cbc9135bcdb5d8e11757 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 12:22:20 2015 +0200 SwWrtShell::IntelligentCut return type is int/SwWrtShell::word Change-Id: Ib87cf099d7eade7d6dd04f14b5693c8b2f9115ec diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 2577dca..afe4d92 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -861,7 +861,7 @@ int SwWrtShell::IntelligentCut(int nSelection, bool bCut) // there are multiple cursors, since a second was placed // already at the target position. if( IsAddMode() || !(nSelection & nsSelectionType::SEL_TXT) ) - return sal_False; + return NO_WORD; OUString sTxt; CharClass& rCC = GetAppCharClass(); commit 433a36118998e8a33eaef726891e2475f0e9395e Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:58:57 2015 +0200 SwView::PageUp/DownCrsr return types want to be bool Change-Id: I3466798845cf41f6c6db1dcd586b366b8a99c588 diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index 8cd1d5cf..5aaba5a 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -299,8 +299,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // scrollbar movements SAL_DLLPRIVATE long PageUp(); SAL_DLLPRIVATE long PageDown(); - SAL_DLLPRIVATE long PageUpCrsr(bool bSelect); - SAL_DLLPRIVATE long PageDownCrsr(bool bSelect); + SAL_DLLPRIVATE bool PageUpCrsr(bool bSelect); + SAL_DLLPRIVATE bool PageDownCrsr(bool bSelect); SAL_DLLPRIVATE long PhyPageUp(); SAL_DLLPRIVATE long PhyPageDown(); diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index bcdca2d..00e3142 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -619,7 +619,7 @@ long SwView::PhyPageDown() return 1; } -long SwView::PageUpCrsr( bool bSelect ) +bool SwView::PageUpCrsr( bool bSelect ) { if ( !bSelect ) { @@ -629,7 +629,7 @@ long SwView::PageUpCrsr( bool bSelect ) m_pWrtShell->MoveCrsr(); m_pWrtShell->GotoFtnAnchor(); m_pWrtShell->Right(CRSR_SKIP_CHARS, false, 1, false ); - return 1; + return true; } } @@ -640,12 +640,12 @@ long SwView::PageUpCrsr( bool bSelect ) PageUp() ) { m_pWrtShell->ResetCursorStack(); - return sal_True; + return true; } - return sal_False; + return false; } -long SwView::PageDownCrsr(bool bSelect) +bool SwView::PageDownCrsr(bool bSelect) { SwTwips lOff = 0; if ( GetPageScrollDownOffset( lOff ) && @@ -654,9 +654,9 @@ long SwView::PageDownCrsr(bool bSelect) PageDown() ) { m_pWrtShell->ResetCursorStack(); - return sal_True; + return true; } - return sal_False; + return false; } // Handler of the scrollbars commit 3c20a55d07b6b74d2ab69e76617d3bfffd885f13 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:57:32 2015 +0200 SwPagePreviewWin::MovePage return type wants to be bool Change-Id: I827807ebb596941f7749a318770d18f4036f35ed diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index b33a451..3434d46 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -107,7 +107,7 @@ public: // Add <MV_SELPAGE>, <MV_SCROLL> enum MoveMode{ MV_CALC, MV_PAGE_UP, MV_PAGE_DOWN, MV_DOC_STT, MV_DOC_END, MV_SELPAGE, MV_SCROLL, MV_NEWWINSIZE }; - int MovePage( int eMoveMode ); + bool MovePage( int eMoveMode ); // Create the status bar's string OUString GetStatusStr( sal_uInt16 nPageCount ) const; diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 973cc91..4977850 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -270,7 +270,7 @@ void SwPagePreviewWin::CalcWish( sal_uInt8 nNewRow, sal_uInt8 nNewCol ) } // mnSttPage is Absolute -int SwPagePreviewWin::MovePage( int eMoveMode ) +bool SwPagePreviewWin::MovePage( int eMoveMode ) { // number of pages up const sal_uInt16 nPages = mnRow * mnCol; @@ -353,7 +353,7 @@ int SwPagePreviewWin::MovePage( int eMoveMode ) maPaintedPreviewDocRect, bPaintPageAtFirstCol ); if( nNewSttPage == mnSttPage && eMoveMode != MV_SELPAGE ) - return sal_False; + return false; SetPagePreview(mnRow, mnCol); mnSttPage = nNewSttPage; @@ -368,7 +368,7 @@ int SwPagePreviewWin::MovePage( int eMoveMode ) SfxBindings& rBindings = mrView.GetViewFrame()->GetBindings(); rBindings.Invalidate( aInval ); - return sal_True; + return true; } void SwPagePreviewWin::SetWinSize( const Size& rNewSize ) commit dea3816e4dda94a6909739329d658f44b1255c21 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:55:53 2015 +0200 SwDocShell::ApplyStyles return type is sal_uInt16 Change-Id: I90eb30fffcee8c443b6ed464721d8ce0c217fcdb diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index d8aa0ea..fc2c021 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -914,7 +914,7 @@ sal_uInt16 SwDocShell::ApplyStyles(const OUString &rName, sal_uInt16 nFamily, SAL_WARN_IF( !pStyle, "sw.ui", "Style not found" ); if(!pStyle) - return sal_False; + return 0; SwWrtShell *pSh = pShell ? pShell : GetWrtShell(); commit 0f2ad91a3654a08adf642d0c375545708d6b49ab Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:53:56 2015 +0200 SwDocShell::Edit return type is sal_uInt16 Change-Id: Ief662e65a8d8ccf4d905f2710fc04abda5c0f5b1 diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 904f19a..d8aa0ea 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -744,7 +744,7 @@ sal_uInt16 SwDocShell::Edit( } if(!pStyle) - return sal_False; + return 0; // put dialogues together rtl::Reference< SwDocStyleSheet > xTmp( new SwDocStyleSheet( *static_cast<SwDocStyleSheet*>(pStyle) ) ); commit ff37332a81bf42d0905e957183f2ce76710c3294 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:53:23 2015 +0200 SwEditShell::Copy return type wants to be bool Change-Id: Id39077324630cead2584bae48dd8470335f4d1fb diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 5bfea50..6f16adf 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -198,7 +198,7 @@ public: void SetLinkUpdMode( sal_uInt16 nMode ); /// Copy content of all ranges at current position of cursor to given Shell. - long Copy( SwEditShell* pDestShell = 0 ); + bool Copy( SwEditShell* pDestShell = 0 ); /** For copying via ClipBoard: If table is copied into table, move all cursors away from it. diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx index 8c0e777..37d9b55 100644 --- a/sw/source/core/edit/eddel.cxx +++ b/sw/source/core/edit/eddel.cxx @@ -144,7 +144,7 @@ long SwEditShell::Delete() return nRet; } -long SwEditShell::Copy( SwEditShell* pDestShell ) +bool SwEditShell::Copy( SwEditShell* pDestShell ) { if( !pDestShell ) pDestShell = this; @@ -193,7 +193,7 @@ long SwEditShell::Copy( SwEditShell* pDestShell ) // Check if a selection would be copied into itself if( pDestShell->GetDoc() == GetDoc() && *rPaM.Start() <= *pTmp && *pTmp < *rPaM.End() ) - return sal_False; + return false; } } @@ -290,7 +290,7 @@ long SwEditShell::Copy( SwEditShell* pDestShell ) pDestShell->SaveTblBoxCntnt( pDestShell->GetCrsr()->GetPoint() ); - return (long)bRet; + return bRet; } /** Replace a selected area in a text node with a given string. diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 0e36a90..d825631 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -636,7 +636,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, bRet = false; if( bRet ) - bRet = 0 != SwEditShell::Copy( pDestShell ); + bRet = SwEditShell::Copy( pDestShell ); } pDestShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineMode_intern( eOldRedlMode ); commit 738844c52eddb4884ac96476d4e7b74e5e58f2c9 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:39:03 2015 +0200 SwDocShell::Delete/Hide return types want to be bool Change-Id: I8adde9de3c8af05cf5cfe2e9d944248d893f7ee8 diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 50bfdf3..b38f47a 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -130,8 +130,8 @@ class SW_DLLPUBLIC SwDocShell SwWrtShell* pActShell = 0, const bool bBasic = false ); - SAL_DLLPRIVATE sal_uInt16 Delete(const OUString &rName, sal_uInt16 nFamily); - SAL_DLLPRIVATE sal_uInt16 Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden); + SAL_DLLPRIVATE bool Delete(const OUString &rName, sal_uInt16 nFamily); + SAL_DLLPRIVATE bool Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden); SAL_DLLPRIVATE sal_uInt16 ApplyStyles(const OUString &rName, const sal_uInt16 nFamily, SwWrtShell* pShell = 0, diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index e110b0d..904f19a 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -460,11 +460,11 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) nRet = Edit(aParam, aEmptyOUStr, nFamily, nMask, false, OString(), pActShell ); break; case SID_STYLE_DELETE: - nRet = Delete(aParam, nFamily); + nRet = sal_uInt16(Delete(aParam, nFamily)); break; case SID_STYLE_HIDE: case SID_STYLE_SHOW: - nRet = Hide(aParam, nFamily, nSlot == SID_STYLE_HIDE); + nRet = sal_uInt16(Hide(aParam, nFamily, nSlot == SID_STYLE_HIDE)); break; case SID_STYLE_APPLY: // Shell-switch in ApplyStyles @@ -870,7 +870,7 @@ sal_uInt16 SwDocShell::Edit( return nRet; } -sal_uInt16 SwDocShell::Delete(const OUString &rName, sal_uInt16 nFamily) +bool SwDocShell::Delete(const OUString &rName, sal_uInt16 nFamily) { SfxStyleSheetBase *pStyle = m_xBasePool->Find(rName, (SfxStyleFamily)nFamily); @@ -882,12 +882,12 @@ sal_uInt16 SwDocShell::Delete(const OUString &rName, sal_uInt16 nFamily) m_xBasePool->Remove(pStyle); GetWrtShell()->EndAllAction(); - return sal_True; + return true; } - return sal_False; + return false; } -sal_uInt16 SwDocShell::Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden) +bool SwDocShell::Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden) { SfxStyleSheetBase *pStyle = m_xBasePool->Find(rName, (SfxStyleFamily)nFamily); @@ -900,9 +900,9 @@ sal_uInt16 SwDocShell::Hide(const OUString &rName, sal_uInt16 nFamily, bool bHid xTmp->SetHidden( bHidden ); GetWrtShell()->EndAllAction(); - return sal_True; + return true; } - return sal_False; + return false; } // apply template commit 7d722ac710a0c19b03c0c4c7615c299df43a843d Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:31:57 2015 +0200 ImpGetPercent transports the return value as type sal_uInt16/SDR_TRISTATE Change-Id: I49adba804bbbf79390b105f894b0d11f3b6ae2dc diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 82b2adc..77e191d 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -143,7 +143,7 @@ SDR_TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const { ForceUndirtyMrkPnt(); bool bFirst=true; - sal_uInt16 nRet=sal_True; + sal_uInt16 nRet=sal_uInt16(true); const_cast<SdrGlueEditView*>(this)->ImpDoMarkedGluePoints(ImpGetPercent,true,&bFirst,&nRet); return (SDR_TRISTATE)nRet; } commit 1b687bb6b277b500c4c3d155da546ba88bc07ff6 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:27:28 2015 +0200 GalleryExplorer::GetSdrObjCount return type is sal_uIntPtr Change-Id: If7a59be1421184f948f9cf36ee72e4963d5d0595 diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 7b9058a..c19985c 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -197,7 +197,7 @@ sal_uIntPtr GalleryExplorer::GetSdrObjCount( const OUString& rThemeName ) sal_uIntPtr GalleryExplorer::GetSdrObjCount( sal_uIntPtr nThemeId ) { Gallery* pGal = ::Gallery::GetGalleryInstance(); - return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False ); + return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : 0 ); } bool GalleryExplorer::GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSdrModelPos, commit 9f387fa51c138e9a01d097990e17294840aaa473 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:26:28 2015 +0200 css.awt.ItemEvent.Highlighted is of type long Change-Id: Iff42783f04a9a037a6183784478ea66b04aa7d32 diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index ca3e34f..5a0b5b6 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3986,7 +3986,7 @@ void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Win { awt::ItemEvent aEvent; aEvent.Source = *this; - aEvent.Highlighted = sal_False; + aEvent.Highlighted = 0; aEvent.Selected = m_pBox->GetState(); m_aItemListeners.notifyEach( &awt::XItemListener::itemStateChanged, aEvent ); } @@ -4312,7 +4312,7 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Wind ::com::sun::star::awt::ItemEvent aEvent; aEvent.Source = *this; - aEvent.Highlighted = sal_False; + aEvent.Highlighted = 0; // Bei Mehrfachselektion 0xFFFF, sonst die ID aEvent.Selected = (m_pBox->GetSelectEntryCount() == 1 ) @@ -4514,7 +4514,7 @@ void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Win { awt::ItemEvent aEvent; aEvent.Source = *this; - aEvent.Highlighted = sal_False; + aEvent.Highlighted = 0; // Bei Mehrfachselektion 0xFFFF, sonst die ID aEvent.Selected = ( m_pComboBox->GetSelectEntryCount() == 1 ) diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index a8c8cc0..cf3aa4f 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -1032,7 +1032,7 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { ::com::sun::star::awt::ItemEvent aEvent; aEvent.Source = (::cppu::OWeakObject*)this; - aEvent.Highlighted = sal_False; + aEvent.Highlighted = 0; aEvent.Selected = pCheckBox->GetState(); maItemListeners.itemStateChanged( aEvent ); } @@ -1330,7 +1330,7 @@ void VCLXRadioButton::ImplClickedOrToggled( bool bToggled ) { ::com::sun::star::awt::ItemEvent aEvent; aEvent.Source = (::cppu::OWeakObject*)this; - aEvent.Highlighted = sal_False; + aEvent.Highlighted = 0; aEvent.Selected = pRadioButton->IsChecked() ? 1 : 0; maItemListeners.itemStateChanged( aEvent ); } @@ -2049,7 +2049,7 @@ void VCLXListBox::ImplCallItemListeners() { ::com::sun::star::awt::ItemEvent aEvent; aEvent.Source = (::cppu::OWeakObject*)this; - aEvent.Highlighted = sal_False; + aEvent.Highlighted = 0; // Set to 0xFFFF on multiple selection, selected entry ID otherwise aEvent.Selected = (pListBox->GetSelectEntryCount() == 1 ) ? pListBox->GetSelectEntryPos() : 0xFFFF; @@ -4469,7 +4469,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { ::com::sun::star::awt::ItemEvent aEvent; aEvent.Source = (::cppu::OWeakObject*)this; - aEvent.Highlighted = sal_False; + aEvent.Highlighted = 0; // Set to 0xFFFF on multiple selection, selected entry ID otherwise aEvent.Selected = pComboBox->GetEntryPos( pComboBox->GetText() ); commit 4a8f12391dd46f48fe8df12b889ac5c221b18402 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:21:34 2015 +0200 Fix Boolean expression Change-Id: I657aee03b220e40cfb12c0dbab9defd9721a1036 diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 8bb336fa..861e13c 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -904,7 +904,7 @@ void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( Ru sal_Bool SAL_CALL FmXGridControl::hasElements() throw( RuntimeException, std::exception ) { Reference< XElementAccess > xPeer(getPeer(), UNO_QUERY); - return xPeer.is() ? xPeer->hasElements() : 0; + return xPeer.is() && xPeer->hasElements(); } commit eebef7c8bbb0d318cebd17da969196602c184c86 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:17:03 2015 +0200 SfxRequest generically uses an SfxUInt16Item here Change-Id: I872d666bee073ef570971ec36e678cc7354fc498 diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 5825eaa..8404daa 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -206,12 +206,12 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if( pStyleSheet ) { pSSPool->Remove( pStyleSheet ); - nRetMask = sal_True; + nRetMask = sal_uInt16(true); mpDoc->SetChanged(true); } else { - nRetMask = sal_False; + nRetMask = sal_uInt16(false); } break; @@ -219,7 +219,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) case SID_STYLE_SHOW: pStyleSheet = pSSPool->Find( aStyleName, (SfxStyleFamily) nFamily); pStyleSheet->SetHidden( nSId == SID_STYLE_HIDE ); - nRetMask = sal_True; + nRetMask = sal_uInt16(true); break; case SID_STYLE_APPLY: commit c61b562dcfa25d2e07d39bf9c03438e462c6d142 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:08:59 2015 +0200 nOK var wants to be of type bool Change-Id: I9e4129270a3d0bb744d8fbaf1641fcbdf1e2b0a7 diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 21fa0d9..3e77310 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -799,14 +799,14 @@ bool SdNavigatorWin::Notify(NotifyEvent& rNEvt) */ void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt ) { - long nOK = sal_False; + bool nOK = false; if (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) { if( SdPageObjsTLB::IsInDrag() ) { // during drag'n'drop we just stop the drag but do not close the navigator - nOK = sal_True; + nOK = true; } else { commit 41b52249414ec8efe1042e2a1fe44e0e57a179da Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:07:28 2015 +0200 Fix Boolean expression Change-Id: Ic0042037847fa1ed277a23325a0bfcbab3b0900c diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 7ce500d..0007774 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -574,8 +574,7 @@ sal_Bool SAL_CALL OSection::hasForms() throw (uno::RuntimeException, std::except { // no lock because m_xDrawPage_FormSupplier is const return (m_xDrawPage_FormSupplier.is()) - ? m_xDrawPage_FormSupplier->hasForms() - : 0; + && m_xDrawPage_FormSupplier->hasForms(); } commit d6550ca7bbcb375cdb7ca677749a2e248c9f007f Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:05:33 2015 +0200 Fix sal_Int16 var initialization Change-Id: I485fce696a1c1b18a563f56b0d69bb3816bd8784 diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index f98ec4f..b12938a 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -467,7 +467,7 @@ bool LinguProps::getPropertyBool(const OUString& aPropertyName) throw (css::uno: sal_Int16 LinguProps::getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException) { uno::Any any = getPropertyValue(aPropertyName); - sal_Int16 b = sal_False; + sal_Int16 b = 0; any >>= b; return b; } commit 2227bcc1f915aef367c4252bc1d1f5b7030dac87 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:04:32 2015 +0200 Fix sal_Bool -> bool assignment Change-Id: I2cd55fa3ecef70b29b940e682faf98c7f6718b3c diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 8f42eae..9f109a3 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -770,7 +770,7 @@ void SAL_CALL DictionaryNeo::setActive( sal_Bool bActivate ) if (bIsActive != bool(bActivate)) { - bIsActive = bActivate != 0; + bIsActive = bActivate; sal_Int16 nEvent = bIsActive ? DictionaryEventFlags::ACTIVATE_DIC : DictionaryEventFlags::DEACTIVATE_DIC; commit 5e70740d93b9fa327ca73d3d15512ade0c5611d6 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:02:46 2015 +0200 DbgIs* return types want to be bool Change-Id: I86587025d397d2d84f9aed1e204ae21056829a1c diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx index 4b0ee11..b6e2f62 100644 --- a/include/tools/debug.hxx +++ b/include/tools/debug.hxx @@ -69,31 +69,31 @@ inline void DbgSaveData( const DbgData& rData ) DbgFunc( DBG_FUNC_SAVEDATA, (void*)&rData ); } -inline sal_uIntPtr DbgIsResource() +inline bool DbgIsResource() { DbgData* pData = DbgGetData(); if ( pData ) return pData->nTestFlags & DBG_TEST_RESOURCE; else - return sal_False; + return false; } -inline sal_uIntPtr DbgIsDialog() +inline bool DbgIsDialog() { DbgData* pData = DbgGetData(); if ( pData ) return pData->nTestFlags & DBG_TEST_DIALOG; else - return sal_False; + return false; } -inline sal_uIntPtr DbgIsBoldAppFont() +inline bool DbgIsBoldAppFont() { DbgData* pData = DbgGetData(); if ( pData ) return pData->nTestFlags & DBG_TEST_BOLDAPPFONT; else - return sal_False; + return false; } inline void DbgSetTestSolarMutex( DbgTestSolarMutexProc pProc ) commit 832f4c4be4322d0185115e7f61e2940de11f90cb Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:01:36 2015 +0200 CursorWrapper::hasOrderedBookmarks return type wants to be bool Change-Id: Ib42cf4990dd83b3d9589256992eff7254fe81b4b diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 06b8a32..0784991 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -142,7 +142,7 @@ public: bool moveToBookmark(const css::uno::Any& bookmark) throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->moveToBookmark(bookmark); } bool moveRelativeToBookmark(const css::uno::Any& bookmark, sal_Int32 rows) throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->moveRelativeToBookmark(bookmark, rows); } sal_Int32 compareBookmarks(const css::uno::Any& lhs, const css::uno::Any& rhs) const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->compareBookmarks(lhs, rhs); } - sal_Int32 hasOrderedBookmarks() const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->hasOrderedBookmarks(); } + bool hasOrderedBookmarks() const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->hasOrderedBookmarks(); } sal_Int32 hashBookmark(const css::uno::Any& bookmark) const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->hashBookmark(bookmark); } // css::sdbc::XResultSet commit ed3c716c311cadd9f3f4f9fee1975ce8c7c19dee Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 11:00:32 2015 +0200 bOleServer/bMac vars want to be of type bool Change-Id: Ie86c43f594486b38b779df2fbc8bd8f15682fa7b diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 6f217bc..c085e84 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -138,7 +138,7 @@ static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFr if the OLE server application exist or not. */ -bool IsItemHidden_Impl( sal_uInt16 nItemId, int bOleServer, int bMac ) +bool IsItemHidden_Impl( sal_uInt16 nItemId, bool bOleServer, bool bMac ) { return ( bMac && ( nItemId == SID_MINIMIZED ) ) || @@ -327,8 +327,8 @@ void SfxVirtualMenu::CreateFromSVMenu() // remember some values SfxGetpApp(); - const int bOleServer = sal_False; - const int bMac = sal_False; + const bool bOleServer = false; + const bool bMac = false; SvtMenuOptions aOptions; aOptions.AddListenerLink( LINK( this, SfxVirtualMenu, SettingsChanged ) ); commit b3c27fe8673519a7932c647f2d727125419e52b1 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 10:52:04 2015 +0200 DropTargetHelper::ExecuteDrop return type is sal_Int8/DND_ACTION_* Change-Id: Id25c19d556a11ae0a767f177ca9f6efb5ab2e478 diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 9d5e3af..98156a8 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -538,12 +538,12 @@ sal_Int8 ScTabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) pViewData->GetView()->MoveTable( lcl_DocShellNr(pDoc), nPos, rEvt.mnAction != DND_ACTION_MOVE ); rData.pCellTransfer->SetDragWasInternal(); // don't delete - return sal_True; + return DND_ACTION_COPY; } } } - return 0; + return DND_ACTION_NONE; } sal_Int8 ScTabControl::AcceptDrop( const AcceptDropEvent& rEvt ) diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index cb489b0..25b64d0 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -362,7 +362,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { OSL_FAIL("FmGridHeader::ExecuteDrop: caught an exception while creatin' the column !"); ::comphelper::disposeComponent(xStatement); - return sal_False; + return DND_ACTION_NONE; } return DND_ACTION_LINK; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 2a39c1e..5417818 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1395,7 +1395,7 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt ) insertFilterItem(m_aControlExchange->getDraggedEntries(),pTargetItems,DND_ACTION_COPY == rEvt.mnAction); - return sal_True; + return DND_ACTION_COPY; } commit 9b0733f737c19cebcc852393a39b22b19ad22b09 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 10:46:58 2015 +0200 CheckBox::GetSavedValue return type is TriState Change-Id: I15fe6556ec236267d820cb26f297cee45fe55d10 diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 54974ad..9339be9 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -509,7 +509,7 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox ) { bool bDelete = true; - if ( !mbDisableQueryBox && pBox && m_pTurnOnBox->GetSavedValue() == sal_True ) + if ( !mbDisableQueryBox && pBox && m_pTurnOnBox->GetSavedValue() == TRISTATE_TRUE ) { short nResult; if (nId == SID_ATTR_PAGE_HEADERSET) commit dd4c3f3060fc5b34a64b7c09389e3aa6522a9abc Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 10:44:39 2015 +0200 TabBar::GetPageBits return type is TabBarPageBits (aka sal_uInt16) Change-Id: I3f1970c3ccf5df32005596bbcca8e09e481a980b diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 45807d3..5d0e1b0 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -1909,7 +1909,7 @@ TabBarPageBits TabBar::GetPageBits( sal_uInt16 nPageId ) const if ( nPos != PAGE_NOT_FOUND ) return mpImpl->mpItemList[nPos]->mnBits; else - return sal_False; + return 0; } sal_uInt16 TabBar::GetPageCount() const commit f5a1a26d8fe3aaf7ef88980b44b830f5b1702108 Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 10:43:39 2015 +0200 Ruler::StartDrag return type wants to be bool Change-Id: Ica4957a5575a6ec5d6ff2b6fddaa3d637426d851 diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 76a7bc5..e19b05a 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -717,7 +717,7 @@ public: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual long StartDrag(); + virtual bool StartDrag(); virtual void Drag(); virtual void EndDrag(); virtual void Click(); diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index 2cef64f..267758a 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -212,7 +212,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener protected: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void Click() SAL_OVERRIDE; - virtual long StartDrag() SAL_OVERRIDE; + virtual bool StartDrag() SAL_OVERRIDE; virtual void Drag() SAL_OVERRIDE; virtual void EndDrag() SAL_OVERRIDE; virtual void ExtraDown() SAL_OVERRIDE; diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index d65875c..1ade381 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2287,12 +2287,12 @@ void Ruler::DataChanged( const DataChangedEvent& rDCEvt ) } } -long Ruler::StartDrag() +bool Ruler::StartDrag() { if ( maStartDragHdl.IsSet() ) return maStartDragHdl.Call( this ); else - return sal_False; + return false; } void Ruler::Drag() diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 9c8146d..20f0b9b 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -3174,7 +3174,7 @@ void SvxRuler::CalcMinMax() } } -long SvxRuler::StartDrag() +bool SvxRuler::StartDrag() { /* Beginning of a drag operation (SV-handler) evaluates modifier and @@ -3189,12 +3189,12 @@ long SvxRuler::StartDrag() bool bContentProtected = mxRulerImpl->aProtectItem.IsCntntProtected(); if(!bValid) - return sal_False; + return false; mxRulerImpl->lLastLMargin = GetMargin1(); mxRulerImpl->lLastRMargin = GetMargin2(); - long bOk = 1; + bool bOk = true; if(GetStartDragHdl().IsSet()) bOk = Ruler::StartDrag(); @@ -3215,7 +3215,7 @@ long SvxRuler::StartDrag() } else { - bOk = sal_False; + bOk = false; } break; case RULER_TYPE_BORDER: // Table, column (Modifier) @@ -3232,7 +3232,7 @@ long SvxRuler::StartDrag() case RULER_TYPE_INDENT: // Paragraph indents (Modifier) { if( bContentProtected ) - return sal_False; + return false; sal_uInt16 nIndent = INDENT_LEFT_MARGIN; if((nIndent) == GetDragAryPos() + INDENT_GAP) { // Left paragraph indent mpIndents[0] = mpIndents[INDENT_FIRST_LINE]; @@ -3249,7 +3249,7 @@ long SvxRuler::StartDrag() } case RULER_TYPE_TAB: // Tabs (Modifier) if( bContentProtected ) - return sal_False; + return false; EvalModifier(); mpTabs[0] = mpTabs[GetDragAryPos() + 1]; mpTabs[0].nStyle |= RULER_STYLE_DONTKNOW; commit 97e000474db7c1ae3ce4b160a860ef2bd930380e Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 10:29:08 2015 +0200 IcnCursor_Impl::GetSortListPos bVertical param wants to be of type bool Change-Id: I2d6cbddb5dbaca33b41d87aefbb5559b3b30f674 diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index b1dcdf8..dc1946b 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -584,7 +584,7 @@ class IcnCursor_Impl sal_uInt16 GetSortListPos( SvxIconChoiceCtrlEntryPtrVec& rList, long nValue, - int bVertical); + bool bVertical); SvxIconChoiceCtrlEntry* SearchCol( sal_uInt16 nCol, sal_uInt16 nTop, diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index 659be51..16ea52f 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -34,7 +34,7 @@ IcnCursor_Impl::~IcnCursor_Impl() } sal_uInt16 IcnCursor_Impl::GetSortListPos( SvxIconChoiceCtrlEntryPtrVec& rList, long nValue, - int bVertical ) + bool bVertical ) { sal_uInt16 nCount = rList.size(); if( !nCount ) @@ -85,11 +85,11 @@ void IcnCursor_Impl::ImplCreate() nX = sal::static_int_cast< short >(nCols - 1); SvxIconChoiceCtrlEntryPtrVec& rColEntry = (*xColumns)[nX]; - sal_uInt16 nIns = GetSortListPos( rColEntry, rRect.Top(), sal_True ); + sal_uInt16 nIns = GetSortListPos( rColEntry, rRect.Top(), true ); rColEntry.insert( rColEntry.begin() + nIns, pEntry ); SvxIconChoiceCtrlEntryPtrVec& rRowEntry = (*xRows)[nY]; - nIns = GetSortListPos( rRowEntry, rRect.Left(), sal_False ); + nIns = GetSortListPos( rRowEntry, rRect.Left(), false ); rRowEntry.insert( rRowEntry.begin() + nIns, pEntry ); pEntry->nX = nX; @@ -497,7 +497,7 @@ void IcnCursor_Impl::CreateGridAjustData( IconChoiceMap& rLists, SvxIconChoiceCt SvxIconChoiceCtrlEntry* pEntry = pView->aEntries[ nCur ]; const Rectangle& rRect = pView->GetEntryBoundRect( pEntry ); short nY = (short)( ((rRect.Top()+rRect.Bottom())/2) / pView->nGridDY ); - sal_uInt16 nIns = GetSortListPos( rLists[nY], rRect.Left(), sal_False ); + sal_uInt16 nIns = GetSortListPos( rLists[nY], rRect.Left(), false ); rLists[ nY ].insert( rLists[ nY ].begin() + nIns, pEntry ); } } @@ -518,7 +518,7 @@ void IcnCursor_Impl::CreateGridAjustData( IconChoiceMap& rLists, SvxIconChoiceCt short nY = (short)( ((rRect.Top()+rRect.Bottom())/2) / pView->nGridDY ); if( nY == nRefRow ) { - sal_uInt16 nIns = GetSortListPos( rRow, rRect.Left(), sal_False ); + sal_uInt16 nIns = GetSortListPos( rRow, rRect.Left(), false ); rRow.insert( rRow.begin() + nIns, pEntry ); } } commit 94e4f13d325018a74773d029e3c1c1a365cf5ccd Author: Stephan Bergmann <[email protected]> Date: Tue Apr 28 10:25:53 2015 +0200 SfxItemSet::PutDirect return value is unused Change-Id: Icf3e09318677655897f4a5308f066829982b9520 diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 75f7250..f706e42 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -66,7 +66,7 @@ protected: // Notification-Callback virtual void Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew ); - int PutDirect(const SfxPoolItem &rItem); + void PutDirect(const SfxPoolItem &rItem); public: SfxItemSet( const SfxItemSet& ); diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 04c92fc..4862706 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1563,7 +1563,7 @@ SfxItemSet *SfxItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const : new SfxItemSet(*m_pPool, m_pWhichRanges); } -int SfxItemSet::PutDirect(const SfxPoolItem &rItem) +void SfxItemSet::PutDirect(const SfxPoolItem &rItem) { SfxItemArray ppFnd = m_pItems; const sal_uInt16* pPtr = m_pWhichRanges; @@ -1582,7 +1582,7 @@ int SfxItemSet::PutDirect(const SfxPoolItem &rItem) if( pOld ) // One already present { if( rItem == **ppFnd ) - return sal_False; // Already present! + return; // Already present! m_pPool->Remove( *pOld ); } else @@ -1598,12 +1598,11 @@ int SfxItemSet::PutDirect(const SfxPoolItem &rItem) rItem.AddRef(); } - return sal_True; + return; } ppFnd += *(pPtr+1) - *pPtr + 1; pPtr += 2; } - return sal_False; } sal_Int32 SfxItemSet::getHash() const _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
