diff options
33 files changed, 64 insertions, 115 deletions
diff --git a/include/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx index d5d838f309d7..3615c82550c7 100644 --- a/include/svtools/accessibletable.hxx +++ b/include/svtools/accessibletable.hxx @@ -64,7 +64,7 @@ public: virtual sal_Int32 GetCurrentColumn() const = 0; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex )= 0; virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const= 0; - virtual bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow )= 0; + virtual void GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow )= 0; virtual bool HasColHeader() = 0; virtual bool HasRowHeader() = 0; diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 2b641f9b8944..cad8aaaf1d3e 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -500,7 +500,7 @@ public: // movement of visible area long ScrollColumns( long nColumns ); long ScrollRows( long nRows ); - bool MakeFieldVisible( long nRow, sal_uInt16 nColId, bool bComplete = false ); + void MakeFieldVisible( long nRow, sal_uInt16 nColId, bool bComplete = false ); // access and movement of cursor long GetCurRow() const { return nCurRow; } diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx index b636fddf9519..f0927967883e 100644 --- a/include/svtools/contextmenuhelper.hxx +++ b/include/svtools/contextmenuhelper.hxx @@ -85,7 +85,7 @@ class SVT_DLLPUBLIC ContextMenuHelper // creates an association between current module/controller bound to the // provided frame and their ui configuration managers. - bool associateUIConfigurationManagers(); + void associateUIConfigurationManagers(); // resets associations to create associations again on-demand. // Useful for implementations which recycle frames. Normal diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index cf38dc3eae75..f4b5dd5105c6 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -296,7 +296,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox sal_uInt16 nStyle, Bitmap& rBmp ); using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); - bool UpdatePaintLineColor(); // returns sal_True if maPaintCol has changed + void UpdatePaintLineColor(); // returns sal_True if maPaintCol has changed virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void UpdateEntries( long nOldWidth ); diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 00af59b1abd2..7af671faf9ab 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -466,7 +466,6 @@ namespace svt bool Is() const {return pEvent != nullptr;} bool IsDown() const {return bDown;} const BrowserMouseEvent* operator->() const {return pEvent;} - const BrowserMouseEvent& operator*() const {return *pEvent;} SVT_DLLPUBLIC void Clear(); void Set(const BrowserMouseEvent* pEvt, bool bIsDown); diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 23f5ce7a34ab..a6c2286defaa 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -65,7 +65,7 @@ private: ResMgr *pMgr; ResMgr *pFreeMgr; - SVT_DLLPRIVATE bool GetClassString(sal_uLong lErrId, OUString &) const; + SVT_DLLPRIVATE void GetClassString(sal_uLong lErrId, OUString &) const; virtual bool CreateString( const ErrorInfo *, OUString &, sal_uInt16 &) const override; }; diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index 1f0db36ef777..735c45189d37 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -56,9 +56,6 @@ public: inline sal_Int32 getDefaultColor() const { return m_nDefaultColor; } inline void setColor(sal_Int32 _nColor) { m_nColor = _nColor; } - - bool operator !=(const ExtendedColorConfigValue& rCmp) const - { return m_nColor != rCmp.m_nColor;} }; class SVT_DLLPUBLIC ExtendedColorConfig : public SfxBroadcaster, public SfxListener diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 8e50fe3e4aec..7b31fd5860c3 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -459,10 +459,8 @@ public: tile bitmap is smaller. Otherwise, the tile is drawn as is. This is useful if e.g. you want only a few, very large bitmap drawings appear on the outdev. - - @return sal_True, if drawing completed successfully */ - bool DrawTiled( + void DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx index 177545761e55..900e674618b5 100644 --- a/include/svtools/imap.hxx +++ b/include/svtools/imap.hxx @@ -130,7 +130,6 @@ class IMapCompat IMapCompat() {} IMapCompat( const IMapCompat& ) {} IMapCompat& operator=( const IMapCompat& ) { return *this; } - bool operator==( const IMapCompat& ) { return false; } public: diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx index db061d6a0d4e..2d7f4756f1a0 100644 --- a/include/svtools/inetimg.hxx +++ b/include/svtools/inetimg.hxx @@ -56,7 +56,7 @@ public: const OUString& GetTargetFrame() const { return aTargetFrame; } // Im-/Export - bool Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const; + void Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const; bool Read( SvStream& rIStm, SotClipboardFormatId nFormat ); }; diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index fbd2e599aa3b..98c27ed38107 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -248,7 +248,7 @@ public: void SetStyle( WinBits nWinStyle ); WinBits GetStyle() const; - bool SetChoiceWithCursor ( bool bDo = true ); + void SetChoiceWithCursor ( bool bDo = true ); void SetFont( const vcl::Font& rFont ); void SetPointFont( const vcl::Font& rFont ); diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 07ee08b5ad52..a32cd0cc399d 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -230,7 +230,7 @@ public: virtual bool ParseMetaOptions( const css::uno::Reference< css::document::XDocumentProperties>&, SvKeyValueIterator* ); - bool ParseScriptOptions( OUString& rLangString, const OUString&, HTMLScriptLanguage& rLang, + void ParseScriptOptions( OUString& rLangString, const OUString&, HTMLScriptLanguage& rLang, OUString& rSrc, OUString& rLibrary, OUString& rModule ); // remove a comment around the content of <SCRIPT> or <STYLE> diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 0bbb46da65de..aad018d49dca 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -268,7 +268,7 @@ public: virtual void Clone(SvLBoxItem* pSource) override; - bool SetModeImages(const Image& rBitmap1, const Image& rBitmap2); + void SetModeImages(const Image& rBitmap1, const Image& rBitmap2); inline void SetBitmap1(const Image& rImage); inline void SetBitmap2(const Image& rImage); diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index a91e6a3f0060..3f60a4019613 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -123,10 +123,10 @@ public: inline sal_uLong GetLineNr() const { return nlLineNr; } inline sal_uLong GetLinePos() const { return nlLinePos; } - inline sal_uLong IncLineNr() { return ++nlLineNr; } + inline void IncLineNr() { ++nlLineNr; } inline sal_uLong IncLinePos() { return ++nlLinePos; } - inline sal_uLong SetLineNr( sal_uLong nlNum ); // inline bottom - inline sal_uLong SetLinePos( sal_uLong nlPos ); // inline bottom + inline void SetLineNr( sal_uLong nlNum ); // inline bottom + inline void SetLinePos( sal_uLong nlPos ); // inline bottom sal_Unicode GetNextChar(); void RereadLookahead(); @@ -167,11 +167,11 @@ public: }; -inline sal_uLong SvParser::SetLineNr( sal_uLong nlNum ) -{ sal_uLong nlOld = nlLineNr; nlLineNr = nlNum; return nlOld; } +inline void SvParser::SetLineNr( sal_uLong nlNum ) +{ nlLineNr = nlNum; } -inline sal_uLong SvParser::SetLinePos( sal_uLong nlPos ) -{ sal_uLong nlOld = nlLinePos; nlLinePos = nlPos; return nlOld; } +inline void SvParser::SetLinePos( sal_uLong nlPos ) +{ nlLinePos = nlPos; } inline sal_uInt16 SvParser::GetCharSize() const { diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 29d2e6ba7a91..678981feeb5c 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -474,7 +474,7 @@ public: bool StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion ); sal_uInt16 ShowDropPos( const Point& rPos ); void HideDropPos(); - bool SwitchPage( const Point& rPos ); + void SwitchPage( const Point& rPos ); void EndSwitchPage(); void SetPageText( sal_uInt16 nPageId, const OUString& rText ); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 9d286ced863c..8bcf3d800395 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -549,14 +549,14 @@ protected: using SvListView::SelectAll; SVT_DLLPRIVATE short GetHeightOffset( const Image& rBmp, Size& rLogicSize); - SVT_DLLPRIVATE short GetHeightOffset( const vcl::Font& rFont, Size& rLogicSize); + SVT_DLLPRIVATE void GetHeightOffset( Size& rLogicSize); SVT_DLLPRIVATE void SetEntryHeight( SvTreeListEntry* pEntry ); SVT_DLLPRIVATE void AdjustEntryHeight( const Image& rBmp ); - SVT_DLLPRIVATE void AdjustEntryHeight( const vcl::Font& rFont ); + SVT_DLLPRIVATE void AdjustEntryHeight(); SVT_DLLPRIVATE void ImpEntryInserted( SvTreeListEntry* pEntry ); - SVT_DLLPRIVATE long PaintEntry1( SvTreeListEntry&, long nLine, vcl::RenderContext& rRenderContext, + SVT_DLLPRIVATE void PaintEntry1( SvTreeListEntry&, long nLine, vcl::RenderContext& rRenderContext, SvLBoxTabFlags nTabFlagMask = SvLBoxTabFlags::ALL, bool bHasClipRegion=false ); @@ -581,7 +581,7 @@ protected: SvLBoxTab* GetFirstDynamicTab() const; SvLBoxTab* GetFirstDynamicTab( sal_uInt16& rTabPos ) const; SvLBoxTab* GetFirstTab( SvLBoxTabFlags nFlagMask, sal_uInt16& rTabPos ); - SvLBoxTab* GetLastTab( SvLBoxTabFlags nFlagMask, sal_uInt16& rTabPos ); + void GetLastTab( SvLBoxTabFlags nFlagMask, sal_uInt16& rTabPos ); SvLBoxTab* GetTab( SvTreeListEntry*, SvLBoxItem* ) const; void ClearTabList(); @@ -612,7 +612,7 @@ protected: bool AreChildrenTransient() const; void SetChildrenNotTransient(); - void AdjustEntryHeightAndRecalc( const vcl::Font& rFont ); + void AdjustEntryHeightAndRecalc(); public: void SetExtendedWinBits( ExtendedWinBits _nBits ); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index e4fac32860f0..88da972ee0e8 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -278,7 +278,7 @@ private: ValueSet & operator= (const ValueSet &) = delete; protected: - bool StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion ); + void StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion ); virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index fab1cfdcbddc..df848febc39c 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -279,13 +279,10 @@ namespace svt A very essential precondition for using this method is that your <method>determineNextState</method> method is able to determine the next state without actually having the page of the current state. - @return - <TRUE/> if and only if traveling was successful - @see skipUntil @see skipBackwardUntil */ - bool skip( sal_Int32 _nSteps = 1 ); + void skip( sal_Int32 _nSteps = 1 ); /** skips one or more states, until a given state is reached diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index c7e0bc5fb70c..1038ac7aaf04 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -125,7 +125,7 @@ namespace svt { namespace table SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) override; SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const override; - SVT_DLLPRIVATE virtual bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ) override; + SVT_DLLPRIVATE virtual void GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ) override; SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const override; SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const override; diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 77b44538b3e7..61e17bd68a7e 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -1968,7 +1968,7 @@ bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const -bool BrowseBox::MakeFieldVisible +void BrowseBox::MakeFieldVisible ( long nRow, // line number of the field (starting with 0) sal_uInt16 nColId, // column ID of the field @@ -1981,14 +1981,6 @@ bool BrowseBox::MakeFieldVisible accordingly. If 'bComplete' is set, the field should become visible in its entirety. - [Returned Value] - - bool true - The given field is already visible or was already visible. - - false - The given field could not be made visible or in the case of - 'bComplete' could not be made visible in its entirety. */ { @@ -1996,12 +1988,12 @@ bool BrowseBox::MakeFieldVisible if ( !bBootstrapped || ( aTestSize.Width() == 0 && aTestSize.Height() == 0 ) ) - return false; + return; // is it visible already? bool bVisible = IsFieldVisible( nRow, nColId, bComplete ); if ( bVisible ) - return true; + return; // calculate column position, field rectangle and painting area sal_uInt16 nColPos = GetColumnPos( nColId ); @@ -2041,9 +2033,6 @@ bool BrowseBox::MakeFieldVisible if ( nRow > nBottomRow ) // scroll further to the top ScrollRows( nRow - nBottomRow ); - - // it might still not actually fit, e.g. if the window is too small - return IsFieldVisible( nRow, nColId, bComplete ); } diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index b69ce115308e..afa032a08c6e 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -286,9 +286,9 @@ bool SvtIconChoiceCtrl::IsEntryEditing() const return _pImp->IsEntryEditing(); } -bool SvtIconChoiceCtrl::SetChoiceWithCursor ( bool bDo ) +void SvtIconChoiceCtrl::SetChoiceWithCursor ( bool bDo ) { - return _pImp->SetChoiceWithCursor (bDo); + _pImp->SetChoiceWithCursor (bDo); } void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt ) diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 365c1a5817a7..c5e5403d2cdd 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -470,12 +470,10 @@ sal_uInt16 SvLBoxContextBmp::GetType() const return SV_ITEM_ID_LBOXCONTEXTBMP; } -bool SvLBoxContextBmp::SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 ) +void SvLBoxContextBmp::SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 ) { - bool bSuccess = true; m_pImpl->m_aImage1 = _rBitmap1; m_pImpl->m_aImage2 = _rBitmap2; - return bSuccess; } Image& SvLBoxContextBmp::implGetImageStore( bool _bFirst ) diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 05ee850a4933..e7d19a0f4be6 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1412,7 +1412,7 @@ void SvTreeListBox::InitTreeView() nContextBmpWidthMax = 0; SetFont( GetFont() ); - AdjustEntryHeightAndRecalc( GetFont() ); + AdjustEntryHeightAndRecalc(); SetSpaceBetweenEntries( 0 ); SetLineColor(); @@ -2183,7 +2183,7 @@ void SvTreeListBox::ModelHasCleared() if( !(nTreeFlags & SvTreeFlags::FIXEDHEIGHT )) nEntryHeight = 0; - AdjustEntryHeight( GetFont() ); + AdjustEntryHeight(); AdjustEntryHeight( GetDefaultExpandedEntryBmp() ); AdjustEntryHeight( GetDefaultCollapsedEntryBmp() ); @@ -2249,13 +2249,9 @@ short SvTreeListBox::GetHeightOffset(const Image& rBmp, Size& aSizeLogic ) return nOffset; } -short SvTreeListBox::GetHeightOffset(const vcl::Font& /* rFont */, Size& aSizeLogic ) +void SvTreeListBox::GetHeightOffset(Size& aSizeLogic ) { - short nOffset = 0; aSizeLogic = Size(GetTextWidth(OUString('X')), GetTextHeight()); - if( GetEntryHeight() > aSizeLogic.Height() ) - nOffset = ( GetEntryHeight() - (short)aSizeLogic.Height()) / 2; - return nOffset; } void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry ) @@ -2307,10 +2303,10 @@ void SvTreeListBox::AdjustEntryHeight( const Image& rBmp ) } } -void SvTreeListBox::AdjustEntryHeight( const vcl::Font& rFont ) +void SvTreeListBox::AdjustEntryHeight() { Size aSize; - GetHeightOffset( rFont, aSize ); + GetHeightOffset( aSize ); if( aSize.Height() > nEntryHeight ) { nEntryHeight = (short)aSize.Height() + nEntryHeightOffs; @@ -2504,12 +2500,12 @@ void SvTreeListBox::SetFont( const vcl::Font& rFont ) if (aTempFont == aOrigFont) return; - AdjustEntryHeightAndRecalc( GetFont() ); + AdjustEntryHeightAndRecalc(); } -void SvTreeListBox::AdjustEntryHeightAndRecalc( const vcl::Font& rFont ) +void SvTreeListBox::AdjustEntryHeightAndRecalc() { - AdjustEntryHeight( rFont ); + AdjustEntryHeight(); // always invalidate, else things go wrong in SetEntryHeight RecalcViewData(); } @@ -2567,7 +2563,7 @@ void SvTreeListBox::SetSpaceBetweenEntries( short nOffsLogic ) nEntryHeight = nEntryHeight - nEntryHeightOffs; nEntryHeightOffs = (short)nOffsLogic; nEntryHeight = nEntryHeight + nOffsLogic; - AdjustEntryHeightAndRecalc( GetFont() ); + AdjustEntryHeightAndRecalc(); pImp->SetEntryHeight( nEntryHeight ); } } @@ -2818,7 +2814,7 @@ void SvTreeListBox::InvalidateEntry(SvTreeListEntry* pEntry) } } -long SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::RenderContext& rRenderContext, +void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::RenderContext& rRenderContext, SvLBoxTabFlags nTabFlags, bool bHasClipRegion) { @@ -3138,8 +3134,6 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render if (bHasClipRegion && bResetClipRegion) rRenderContext.SetClipRegion(); - - return 0; // nRowLen; } void SvTreeListBox::PreparePaint(vcl::RenderContext& /*rRenderContext*/, SvTreeListEntry& /*rEntry*/) @@ -3560,7 +3554,7 @@ SvLBoxTab* SvTreeListBox::GetFirstTab( SvLBoxTabFlags nFlagMask, sal_uInt16& rPo return nullptr; } -SvLBoxTab* SvTreeListBox::GetLastTab( SvLBoxTabFlags nFlagMask, sal_uInt16& rTabPos ) +void SvTreeListBox::GetLastTab( SvLBoxTabFlags nFlagMask, sal_uInt16& rTabPos ) { sal_uInt16 nPos = (sal_uInt16)aTabs.size(); while( nPos ) @@ -3570,11 +3564,10 @@ SvLBoxTab* SvTreeListBox::GetLastTab( SvLBoxTabFlags nFlagMask, sal_uInt16& rTab if( (pTab->nFlags & nFlagMask) ) { rTabPos = nPos; - return pTab; + return; } } rTabPos = 0xffff; - return nullptr; } void SvTreeListBox::RequestHelp( const HelpEvent& rHEvt ) @@ -3746,7 +3739,7 @@ void SvTreeListBox::ApplySettings(vcl::RenderContext& rRenderContext) aFont = rStyleSettings.GetFieldFont(); aFont.SetColor(rStyleSettings.GetWindowTextColor()); SetPointFont(rRenderContext, aFont); - AdjustEntryHeightAndRecalc(aFont); + AdjustEntryHeightAndRecalc(); rRenderContext.SetTextColor(rStyleSettings.GetFieldTextColor()); rRenderContext.SetTextFillColor(); @@ -3766,7 +3759,7 @@ void SvTreeListBox::InitSettings(bool bFont, bool bForeground, bool bBackground) aFont = rStyleSettings.GetFieldFont(); aFont.SetColor(rStyleSettings.GetWindowTextColor()); SetPointFont(*this, aFont); - AdjustEntryHeightAndRecalc(aFont); + AdjustEntryHeightAndRecalc(); } if (bForeground || bFont) diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 92f18c38fcf4..5c411202463c 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -827,7 +827,7 @@ sal_uInt16 LineListBox::GetEntryStyle( sal_Int32 nPos ) const return ( pData ) ? pData->GetStyle() : css::table::BorderLineStyle::NONE; } -bool LineListBox::UpdatePaintLineColor() +void LineListBox::UpdatePaintLineColor() { const StyleSettings& rSettings = GetSettings().GetStyleSettings(); Color aNewCol( rSettings.GetWindowColor().IsDark()? rSettings.GetLabelTextColor() : aColor ); @@ -836,8 +836,6 @@ bool LineListBox::UpdatePaintLineColor() if( bRet ) maPaintCol = aNewCol; - - return bRet; } void LineListBox::UpdateEntries( long nOldWidth ) diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index a71036bd04d8..307987955451 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -2510,9 +2510,8 @@ void TabBar::HideDropPos() } } -bool TabBar::SwitchPage(const Point& rPos) +void TabBar::SwitchPage(const Point& rPos) { - bool bSwitch = false; sal_uInt16 nSwitchId = GetPageId(rPos); if (!nSwitchId) EndSwitchPage(); @@ -2537,15 +2536,12 @@ bool TabBar::SwitchPage(const Point& rPos) Update(); ImplActivatePage(); ImplSelect(); - bSwitch = true; } mbInSwitching = false; } } } } - - return bSwitch; } void TabBar::EndSwitchPage() diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index e6481b9b7e9d..fe799ff8cf68 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -2167,10 +2167,10 @@ void ValueSet::SetFormat(bool bFormat) mbFormat = bFormat; } -bool ValueSet::StartDrag( const CommandEvent& rEvent, vcl::Region& rRegion ) +void ValueSet::StartDrag( const CommandEvent& rEvent, vcl::Region& rRegion ) { if ( rEvent.GetCommand() != CommandEventId::StartDrag ) - return false; + return; // if necessary abort an existing action EndSelection(); @@ -2186,7 +2186,7 @@ bool ValueSet::StartDrag( const CommandEvent& rEvent, vcl::Region& rRegion ) // don't activate dragging if no item was clicked on if ( !nSelId ) - return false; + return; // Check out if the page was selected. If not set as current page and // call select. @@ -2201,8 +2201,6 @@ bool ValueSet::StartDrag( const CommandEvent& rEvent, vcl::Region& rRegion ) // assign region rRegion = aRegion; - - return true; } Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCols, diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index b1f08ef15160..ec4ce04f06e9 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -506,12 +506,12 @@ namespace svt } - bool OWizardMachine::skip(sal_Int32 _nSteps) + void OWizardMachine::skip(sal_Int32 _nSteps) { DBG_ASSERT(_nSteps > 0, "OWizardMachine::skip: invalid number of steps!"); // allowed to leave the current page? if ( !prepareLeaveCurrentState( eTravelForward ) ) - return false; + return; WizardState nCurrentState = getCurrentState(); WizardState nNextState = determineNextState(nCurrentState); @@ -519,7 +519,7 @@ namespace svt while (_nSteps-- > 0) { if (WZS_INVALID_STATE == nNextState) - return false; + return; // remember the skipped state in the history m_pImpl->aStateHistory.push(nCurrentState); @@ -538,11 +538,10 @@ namespace svt // if somebody does a skip and then does not allow to leave ... // (can't be a commit error, as we've already committed the current page. So if ShowPage fails here, // somebody behaves really strange ...) - return false; + return; } // all fine - return true; } diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 40b601ea09ce..74346e9aa064 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -574,11 +574,11 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, return bRet; } -bool GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, +void GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, const Size& rOffset, const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags, int nTileCacheSize1D ) { if( pOut == nullptr || rSize.Width() == 0 || rSize.Height() == 0 ) - return false; + return; const MapMode aOutMapMode( pOut->GetMapMode() ); const MapMode aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() ); @@ -593,7 +593,7 @@ bool GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const while (((sal_Int64)rSize.Height() * nTileCacheSize1D) > SAL_MAX_UINT16) nTileCacheSize1D /= 2; - return ImplDrawTiled( pOut, rArea, aOutTileSize, rOffset, pAttr, nFlags, nTileCacheSize1D ); + ImplDrawTiled( pOut, rArea, aOutTileSize, rOffset, pAttr, nFlags, nTileCacheSize1D ); } bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index c7248717dbbd..f98407097ae1 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -263,7 +263,7 @@ struct ErrorResource_Impl : private Resource }; -bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const +void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const /* [Description] @@ -273,7 +273,6 @@ bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const */ { - bool bRet = false; std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() )); if( pResMgr ) { @@ -282,10 +281,8 @@ bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const if(aEr) { rStr = static_cast<ResString>(aEr).GetString(); - bRet = true; } } - return bRet; } diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx index f2963081ebed..2f075997e0ab 100644 --- a/svtools/source/svhtml/htmlsupp.cxx +++ b/svtools/source/svhtml/htmlsupp.cxx @@ -35,7 +35,7 @@ static HTMLOptionEnum const aScriptLangOptEnums[] = { nullptr, 0 } }; -bool HTMLParser::ParseScriptOptions( OUString& rLangString, const OUString& rBaseURL, +void HTMLParser::ParseScriptOptions( OUString& rLangString, const OUString& rBaseURL, HTMLScriptLanguage& rLang, OUString& rSrc, OUString& rLibrary, @@ -77,8 +77,6 @@ bool HTMLParser::ParseScriptOptions( OUString& rLangString, const OUString& rBas break; } } - - return true; } void HTMLParser::RemoveSGMLComment( OUString &rString, bool bFull ) diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index b30d5836504e..5975b67c8ebe 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -194,9 +194,9 @@ namespace svt { namespace table } - bool TableControl::GoToCell(sal_Int32 _nColPos, sal_Int32 _nRowPos) + void TableControl::GoToCell(sal_Int32 _nColPos, sal_Int32 _nRowPos) { - return m_pImpl->goTo( _nColPos, _nRowPos ); + m_pImpl->goTo( _nColPos, _nRowPos ); } diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 3ae2b5b10129..6c74a1be305f 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -377,7 +377,7 @@ ContextMenuHelper::dispatchCommand( // retrieves and stores references to our user-interface // configuration managers, like image manager, ui command // description manager. -bool +void ContextMenuHelper::associateUIConfigurationManagers() { uno::Reference< frame::XFrame > xFrame( m_xWeakFrame ); @@ -445,13 +445,9 @@ ContextMenuHelper::associateUIConfigurationManagers() } catch ( uno::Exception& ) { - m_bUICfgMgrAssociated = true; - return false; } m_bUICfgMgrAssociated = true; } - - return true; } Image diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index d1b7fd74717c..4bcea5ae65d4 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -25,9 +25,8 @@ static const sal_Unicode TOKEN_SEPARATOR = '\001'; -bool INetImage::Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const +void INetImage::Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const { - bool bRet = false; switch( nFormat ) { case SotClipboardFormatId::INET_IMAGE: @@ -47,7 +46,6 @@ bool INetImage::Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const rOStm.Write(sOut.getStr(), sOut.getLength()); static const sal_Char aEndChar[2] = { 0 }; rOStm.Write( aEndChar, sizeof( aEndChar )); - bRet = 0 == rOStm.GetError(); } break; @@ -55,7 +53,6 @@ bool INetImage::Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const break; default: break; } - return bRet; } bool INetImage::Read( SvStream& rIStm, SotClipboardFormatId nFormat ) |