diff options
-rw-r--r-- | editeng/source/editeng/eertfpar.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/eertfpar.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 1 | ||||
-rw-r--r-- | editeng/source/misc/hangulhanja.cxx | 4 | ||||
-rw-r--r-- | editeng/source/misc/txtrange.cxx | 6 | ||||
-rw-r--r-- | editeng/source/uno/unoedprx.cxx | 3 | ||||
-rw-r--r-- | extensions/source/bibliography/datman.cxx | 5 | ||||
-rw-r--r-- | extensions/source/logging/loghandler.cxx | 2 | ||||
-rw-r--r-- | extensions/source/logging/loghandler.hxx | 1 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserlistbox.cxx | 8 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserlistbox.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/composeduiupdate.cxx | 5 | ||||
-rw-r--r-- | extensions/source/propctrlr/defaultforminspection.cxx | 8 | ||||
-rw-r--r-- | extensions/source/propctrlr/defaultforminspection.hxx | 1 | ||||
-rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 8 | ||||
-rw-r--r-- | extensions/source/propctrlr/propcontroller.hxx | 1 |
17 files changed, 12 insertions, 49 deletions
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index 19a4225073db..65e24dd5adf0 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -147,7 +147,7 @@ void EditRTFParser::AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& r MapMode _aEditMapMode(mpEditEngine->GetRefDevice()->GetMapMode().GetMapUnit()); aSz = mpEditEngine->GetRefDevice()->LogicToLogic(aSz, &aPntMode, &_aEditMapMode); SvxFontHeightItem aFontHeightItem( aSz.Width(), 100, EE_CHAR_FONTHEIGHT ); - vcl::Font aDefFont( GetDefFont() ); + vcl::Font aDefFont( GetFont( nDefFont ) ); SvxFontItem aFontItem( aDefFont.GetFamilyType(), aDefFont.GetFamilyName(), aDefFont.GetStyleName(), aDefFont.GetPitch(), aDefFont.GetCharSet(), EE_CHAR_FONTINFO ); diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx index 250000a8b7cc..16eff0da1d04 100644 --- a/editeng/source/editeng/eertfpar.hxx +++ b/editeng/source/editeng/eertfpar.hxx @@ -63,8 +63,6 @@ public: virtual SvParserState CallParser() override; - vcl::Font GetDefFont() { return GetFont( nDefFont ); } - EditPaM GetCurPaM() const { return aCurSel.Max(); } }; diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index f23bd81943e5..eeacfe0bdb4c 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -196,7 +196,7 @@ void lcl_translateTwips(vcl::Window& rParent, vcl::Window& rChild) void ImpEditView::DrawSelection( EditSelection aTmpSel, vcl::Region* pRegion, OutputDevice* pTargetDevice ) { - if ( GetSelectionMode() == EE_SELMODE_HIDDEN ) + if ( eSelectionMode == EE_SELMODE_HIDDEN ) return; // It must be ensured before rendering the selection, that the contents of diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 0a9dfb547bb8..1771aac97ebb 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -325,7 +325,6 @@ public: vcl::Window* GetWindow() const { return pOutWin; } - EESelectionMode GetSelectionMode() const { return eSelectionMode; } void SetSelectionMode( EESelectionMode eMode ); inline const Pointer& GetPointer(); diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 00b0da046717..41d351af4f8b 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -131,8 +131,6 @@ namespace editeng public: void DoDocumentConversion( ); - inline bool IsByCharacter( ) const { return m_bByCharacter; } - inline bool IsValid() const { return m_xConverter.is(); } inline LanguageType GetSourceLang() const { return m_nSourceLang; } @@ -328,7 +326,7 @@ namespace editeng sal_Int32 nLength = m_sCurrentPortion.getLength() - nStartSearch; m_nCurrentConversionType = implGetConversionType(); - m_nCurrentConversionOption = IsByCharacter() ? CHARACTER_BY_CHARACTER : css::i18n::TextConversionOption::NONE; + m_nCurrentConversionOption = m_bByCharacter ? CHARACTER_BY_CHARACTER : css::i18n::TextConversionOption::NONE; if( m_bIgnorePostPositionalWord ) m_nCurrentConversionOption = m_nCurrentConversionOption | IGNORE_POST_POSITIONAL_WORD; diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx index e5b798c16315..a5e80f84af74 100644 --- a/editeng/source/misc/txtrange.cxx +++ b/editeng/source/misc/txtrange.cxx @@ -139,8 +139,6 @@ public: void Concat( const tools::PolyPolygon* pPoly ); // inlines void NoteLast() { if( bMultiple ) NoteRange( nAct == nFirst ); } - void SetClosed( const bool bNew ){ bClosed = bNew; } - bool IsClosed() const { return bClosed; } void SetConcat( const bool bNew ){ bConcat = bNew; } bool IsConcat() const { return bConcat; } }; @@ -311,7 +309,7 @@ void SvxBoundArgs::Calc( const tools::PolyPolygon& rPoly ) if( nCount ) { const Point& rNull = rPol[ 0 ]; - SetClosed( IsConcat() || ( rNull == rPol[ nCount - 1 ] ) ); + bClosed = IsConcat() || ( rNull == rPol[ nCount - 1 ] ); nLast = Area( rNull ); if( nLast & 12 ) { @@ -393,7 +391,7 @@ void SvxBoundArgs::Calc( const tools::PolyPolygon& rPoly ) NoteFarPoint( A(rNext), B(rNext)-nUpper, nUpDiff ); } nLast = nNext; - if( ++nIdx == nCount && !IsClosed() ) + if( ++nIdx == nCount && !bClosed ) { if( !( nNext & 12 ) ) NoteLast(); diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 86e30b776521..5a47cb202eea 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -103,7 +103,6 @@ public: void SetBulletOffset( sal_Int32 nOffset, sal_Int32 nLen ) { mnBulletOffset = nOffset; mnBulletLen = nLen; } sal_Int32 GetBulletOffset() const { return mnBulletOffset; } sal_Int32 GetBulletLen() const { return mnBulletLen; } - void AreInBullet() { mbInBullet = true; } bool InBullet() const { return mbInBullet; } /// returns false if the given range is non-editable (e.g. contains bullets or _parts_ of fields) @@ -245,7 +244,7 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder& if( nIndex < nBulletLen ) { - AreInBullet(); + mbInBullet = true; SetBulletOffset( nIndex, nBulletLen ); mnEEIndex = 0; return; diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 6508e542e2af..b0d763bd404c 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -243,9 +243,6 @@ public: MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pDatMan); virtual ~MappingDialog_Impl() override; virtual void dispose() override; - - void SetModified() {bModified = true;} - }; static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , @@ -433,7 +430,7 @@ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox&, rListBox, void) aListBoxe->SelectEntryPos(0); } } - SetModified(); + bModified = true; } IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl, Button*, void) diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index 54d4f7083b55..1f9717c3321c 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.cxx @@ -75,7 +75,7 @@ namespace logging { m_rMutex.acquire(); - if ( !getIsInitialized() ) + if ( !m_bInitialized ) throw DisposedException("component not initialized" ); if ( m_rBHelper.bDisposed ) diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx index d41b80b4c69a..8b54c24b46fe 100644 --- a/extensions/source/logging/loghandler.hxx +++ b/extensions/source/logging/loghandler.hxx @@ -56,7 +56,6 @@ namespace logging ); public: - bool getIsInitialized() const { return m_bInitialized; } void setIsInitialized() { m_bInitialized = true; } bool getEncoding( OUString& _out_rEncoding ) const; diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 7036a7b22e8e..b0e723171b52 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -623,12 +623,6 @@ namespace pcr } - void OBrowserListBox::UpdateAll() - { - Resize(); - } - - void OBrowserListBox::DisableUpdate() { m_bUpdate = false; @@ -638,7 +632,7 @@ namespace pcr void OBrowserListBox::EnableUpdate() { m_bUpdate = true; - UpdateAll(); + Resize(); } diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 9ef2c6fe2c54..07f2d4869d1e 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -107,8 +107,6 @@ namespace pcr virtual ~OBrowserListBox() override; virtual void dispose() override; - void UpdateAll(); - void ActivateListBox( bool _bActive ); sal_uInt16 CalcVisibleLines(); diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 2bf17ca2fa02..4d84c4e6b2ae 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -147,9 +147,6 @@ namespace pcr protected: virtual ~CachedInspectorUI() override; - /// determines whether the instance is already disposed - inline bool isDisposed() const { return m_bDisposed; } - /// throws an exception if the component is already disposed void checkDisposed() const; @@ -207,7 +204,7 @@ namespace pcr void CachedInspectorUI::checkDisposed() const { - if ( isDisposed() ) + if (m_bDisposed) throw DisposedException(); } diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 5af33e4cbe6d..09a7eecab288 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -206,7 +206,7 @@ namespace pcr StlSyntaxSequence< Any > arguments( _arguments ); if ( arguments.empty() ) { // constructor: "createDefault()" - createDefault(); + m_bConstructed = true; return; } @@ -223,12 +223,6 @@ namespace pcr } - void DefaultFormComponentInspectorModel::createDefault() - { - m_bConstructed = true; - } - - void DefaultFormComponentInspectorModel::createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( _nMinHelpTextLines > _nMaxHelpTextLines ) ) diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index cf0fa74a76d3..cc7dd7bb18be 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -66,7 +66,6 @@ namespace pcr protected: // Service constructors - void createDefault(); void createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ); }; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 23cf9720d5d5..43a1e6c089a7 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -320,7 +320,7 @@ namespace pcr StlSyntaxSequence< Any > arguments( _arguments ); if ( arguments.empty() ) { // constructor: "createDefault()" - createDefault(); + m_bConstructed = true; return; } @@ -337,12 +337,6 @@ namespace pcr } - void OPropertyBrowserController::createDefault() - { - m_bConstructed = true; - } - - void OPropertyBrowserController::createWithModel( const Reference< XObjectInspectorModel >& _rxModel ) { osl_atomic_increment( &m_refCount ); diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index b771e67471f7..52b8b4ae0fdb 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -388,7 +388,6 @@ namespace pcr private: // constructors - void createDefault(); void createWithModel( const css::uno::Reference< css::inspection::XObjectInspectorModel >& _rxModel ); }; |