diff options
37 files changed, 28 insertions, 81 deletions
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index e6fb35d5c0ca..85f1133cd33a 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -212,7 +212,6 @@ class SwPostItMgr: public SfxListener bool IsShowAnchor() { return mbIsShowAnchor;} unsigned long GetSidebarWidth(bool bPx = false) const; unsigned long GetSidebarBorderWidth(bool bPx = false) const; - unsigned long GetNoteWidth(); void PrepareView(bool bIgnoreCount = false); diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index 3293963ed87a..28281fd887ca 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -578,11 +578,6 @@ protected: SwNumberTreeNode * CreatePhantom(); /** - Set if this node is a phantom. - */ - void SetPhantom(); - - /** Return if phantoms are counted. */ virtual bool IsCountPhantoms() const = 0; diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 22e4efd826fb..f07345b93b43 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -42,12 +42,11 @@ public: inline SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr ) { SetValue( rAttr.GetValue() ); - SetAutoFlag( rAttr.GetAutoFlag() ); + bAuto = rAttr.bAuto; return *this; } bool GetAutoFlag() const { return bAuto; } - void SetAutoFlag( bool bFlag ) { bAuto = bFlag; } }; class SwTableBoxFormula : public SfxPoolItem, public SwTableFormula diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index e663f613e287..c79e65a46d7e 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -64,7 +64,6 @@ public: bool IsDeleted() const { return bDeleted; } void SetDeleted( bool b ) { bDeleted = b; } - void UpdateNow() { refLink->Update(); } void Disconnect() { refLink->Disconnect(); } const ::sfx2::SvBaseLink& GetBaseLink() const { return *refLink; } diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 105cae3786f8..58ee21f2fdeb 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -190,7 +190,6 @@ public: // frees all SwFrameFormat! virtual ~SwFrameFormats() override; - void clear() { return m_Array.clear(); } bool empty() const { return m_Array.empty(); } size_t size() const { return m_Array.size(); } diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 2736161e381d..b3685bcdb826 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -193,7 +193,6 @@ public: virtual SwField* Copy() const override; inline void SetExpansion(const OUString& rStr) { aContent = rStr; } - const OUString& GetContent() const { return aContent; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; @@ -220,7 +219,6 @@ public: virtual SwField* Copy() const override; inline void SetExpansion(const OUString& rStr) { aContent = rStr; } - const OUString& GetContent() const { return aContent; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 618af04ba462..38344e151448 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -100,7 +100,6 @@ public: virtual void SetValue( const double& rVal ) override; virtual void SetLanguage(sal_uInt16 nLng) override; - inline const OUString& GetExpStr() const; inline void ChgExpStr(const OUString& rExpand); /// Called by formatting. @@ -132,9 +131,6 @@ public: inline void SwGetExpField::ChgExpStr(const OUString& rExpand) { sExpand = rExpand;} -inline const OUString& SwGetExpField::GetExpStr() const - { return sExpand; } - /// Called by formatting. inline bool SwGetExpField::IsInBodyText() const { return bIsInBodyText; } @@ -406,7 +402,6 @@ public: virtual sal_uInt16 GetSubType() const override; virtual void SetSubType(sal_uInt16 nType) override; - const OUString& GetExpStr() const { return sExpand; } void ChgExpStr(const OUString& rStr) { sExpand = rStr; } void CalcField( SwTableCalcPara& rCalcPara ); diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index e4f7643a2d56..0fd946059e5e 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -52,16 +52,13 @@ public: SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD, sal_uLong nFormat = 0, sal_uInt16 nLng = 0); - virtual sal_uInt16 GetSubType() const override; + virtual sal_uInt16 GetSubType() const override; virtual void SetSubType(sal_uInt16 nSub) override; virtual double GetValue() const override; virtual void SetPar2(const OUString& rStr) override; - virtual OUString GetPar2() const override; - - inline bool IsDate() const - { return (nSubType & DATEFLD) != 0; } + virtual OUString GetPar2() const override; inline void SetOffset(long nMinutes) { nOffset = nMinutes; } inline long GetOffset() const { return nOffset; } diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index d3416adf3998..5a09efbee57b 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -42,8 +42,6 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; - - SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); } }; inline SwFormatFillOrder &SwFormatFillOrder::operator=( const SwFormatFillOrder &rCpy ) diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 21e09108c00a..21f8db525627 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -155,9 +155,6 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText ) const { m_aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); } - /// Format-ID for reading/writing: - void ResetWritten() { m_bWritten = false; } - /// Query / set AutoFormat-flag. bool IsAuto() const { return m_bAutoFormat; } void SetAuto( bool bNew ) { m_bAutoFormat = bNew; } diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index f4a4ad137062..de586e9c7a60 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -202,10 +202,10 @@ public: {} inline SwGammaGrf& operator=( const SwGammaGrf& rCopy ) - { - SetValue( rCopy.GetValue() ); - return *this; - } + { + nValue = rCopy.nValue; + return *this; + } // pure virtual methods from SfxEnumItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -222,7 +222,6 @@ public: sal_uInt8 nMemberId ) override; const double& GetValue() const { return nValue; } - void SetValue( const double& rVal ) { nValue = rVal; } }; class SwInvertGrf: public SfxBoolItem diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 59321343c6f1..3248b62daab7 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -69,9 +69,6 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion SwPaM *pCursor ); void ChangeText_impl( const OUString &rNewText, bool bKeepAttributes ); - inline bool IsDrawObj() { return m_bIsDrawObj; } - inline void SetDrawObj( bool bNew ) { m_bIsDrawObj = bNew; } - protected: virtual void GetNextPortion( OUString& rNextPortion, LanguageType& rLangOfPortion, diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 12ca36e911cd..a6564a235288 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -242,8 +242,6 @@ class SwHTMLTableLayout SwFrameFormat *FindFlyFrameFormat() const; const SwDoc *GetDoc() const { return GetAnyBoxStartNode()->GetDoc(); } - void ClearPass1Info() { m_nMin = m_nMax = 0; } - void Resize_( sal_uInt16 nAbsAvail, bool bRecalc ); DECL_LINK( DelayedResize_Impl, Timer*, void ); diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index cf70536a1820..ce171924f106 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -167,8 +167,6 @@ public: bool HasGlossaries( const Reader& ); bool ReadGlossaries( const Reader&, SwTextBlocks&, bool bSaveRelFiles ); - const OUString& GetBaseURL() const { return sBaseURL;} - protected: void SetBaseURL( const OUString& rURL ) { sBaseURL = rURL; } void SetSkipImages( bool bSkipImages ) { mbSkipImages = bSkipImages; } diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 6e4251bbbfb7..96d212e68f5d 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -115,8 +115,6 @@ protected: bool m_bDontChangeModel; #endif - bool IsModifyLocked(){ return m_bModifyLocked;} - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override; public: diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 329e758afd07..8bb80366d9bf 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -196,7 +196,6 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - const SwTableLine* GetTableRow() const {return pLine;} static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine); }; diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 325c0ae9ab70..45de281191c3 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -47,7 +47,6 @@ public: void SetContent( const OUString& rStr, sal_uInt32 nFormat = 0 ); inline bool IsValid() const; - inline void ChgValid( bool bNew ); double GetValue(SwCalc& rCalc); // Recalculate member nValue. inline double GetValue() const; @@ -69,9 +68,6 @@ protected: inline bool SwUserFieldType::IsValid() const { return bValidValue; } -inline void SwUserFieldType::ChgValid( bool bNew ) - { bValidValue = bNew; } - inline double SwUserFieldType::GetValue() const { return nValue; } diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 0ef086c0c3d4..536e75c63872 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -576,8 +576,6 @@ public: void SetCursorAtTop( bool bFlag, bool bCenter = false ) { m_bTopCursor = bFlag; m_bCenterCursor = bCenter; } - bool IsCursorAtTop() const { return m_bTopCursor; } - bool IsCursorAtCenter() const { return m_bCenterCursor; } bool JumpToSwMark( const OUString& rMark ); diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index e3e2eec30bf0..63ba55c5fdee 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -198,8 +198,6 @@ public: static void Init( vcl::Window *pWin ); // Initializing of static data. - static sal_uInt16 GetPixelTwips() { return m_nPixelTwips; } - inline ViewOptFlags1 GetCoreOptions() const {return m_nCoreOptions;} inline void SetUIOptions( const SwViewOption& ); diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index 789d512cf4a3..49be27e7bdb9 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -72,7 +72,7 @@ SwNumberTreeNode * SwNumberTreeNode::CreatePhantom() else { pNew = Create(); - pNew->SetPhantom(); + pNew->mbPhantom = true; pNew->mpParent = this; std::pair<tSwNumberTreeChildren::iterator, bool> aInsert = @@ -725,11 +725,6 @@ bool SwNumberTreeNode::IsValid(const SwNumberTreeNode * pChild) const } -void SwNumberTreeNode::SetPhantom() -{ - mbPhantom = true; -} - bool SwNumberTreeNode::HasOnlyPhantoms() const { bool bResult = false; diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index 09202c36bd2c..d3a818dc6152 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -308,7 +308,7 @@ void SwFormat::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValu break; case RES_RESET_FMTWRITTEN: { - ResetWritten(); + m_bWritten = false; // mba: here we don't use the additional stuff from NotifyClients(). // should we?! diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index e20d29fe20e9..e96c431c347c 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -2073,7 +2073,7 @@ void SwFrameFormats::DeleteAndDestroyAll( bool keepDefault ) if ( _offset ) m_PosIndex.erase( begin() + _offset, end() ); else - clear(); + m_Array.clear(); } std::pair<SwFrameFormats::const_iterator,bool> SwFrameFormats::push_back( const value_type& x ) diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index c43d7f46f380..d3fe02c2c226 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -473,7 +473,7 @@ void SwHTMLTableLayout::AutoLayoutPass1() { m_nPass1Done++; - ClearPass1Info(); + m_nMin = m_nMax = 0; // clear pass1 info bool bFixRelWidths = false; sal_uInt16 i; diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 413b904e6f77..2c4e596d4ddb 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -304,7 +304,7 @@ void SwDDEFieldType::RefCntChgd() refLink->SetVisible( pDoc->getIDocumentLinksAdministration().IsVisibleLinks() ); pDoc->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( refLink.get() ); if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() ) - UpdateNow(); + refLink->Update(); } else { diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index ba7ff9318505..def0027360b2 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -372,7 +372,7 @@ bool SwAuthorField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const break; case FIELD_PROP_PAR1: - rAny <<= GetContent(); + rAny <<= aContent; break; default: @@ -522,7 +522,7 @@ bool SwFileNameField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const break; case FIELD_PROP_PAR3: - rAny <<= GetContent(); + rAny <<= aContent; break; default: diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 20109a7ef014..b313d9cc2a92 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -430,7 +430,7 @@ bool SwGetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= 0 != (nSubType & nsSwExtendedSubType::SUB_CMD); break; case FIELD_PROP_PAR4: - rAny <<= GetExpStr(); + rAny <<= sExpand; break; default: return SwField::QueryValue(rAny, nWhichId); diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx index e6e11451df72..1bd3b6313c38 100644 --- a/sw/source/core/fields/flddat.cxx +++ b/sw/source/core/fields/flddat.cxx @@ -165,7 +165,7 @@ bool SwDateTimeField::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const rVal <<= IsFixed(); break; case FIELD_PROP_BOOL2: - rVal <<= IsDate(); + rVal <<= (nSubType & DATEFLD) != 0; break; case FIELD_PROP_FORMAT: rVal <<= (sal_Int32)GetFormat(); diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index 6b4e873eba6c..1f5c7df71cbd 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -168,7 +168,7 @@ bool SwTableField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= 0 != (nsSwExtendedSubType::SUB_CMD & nSubType); break; case FIELD_PROP_PAR1: - rAny <<= GetExpStr(); + rAny <<= sExpand; break; case FIELD_PROP_FORMAT: rAny <<= (sal_Int32)GetFormat(); diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index 3c279dbe4691..77d12f28781a 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -199,7 +199,7 @@ OUString SwUserFieldType::GetName() const void SwUserFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { if( !pOld && !pNew ) - ChgValid( false ); + bValidValue = false; NotifyClients( pOld, pNew ); diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index f8eb4a5505f2..15449a0cce27 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -428,7 +428,7 @@ SwFormatFillOrder::SwFormatFillOrder( SwFillOrder nFO ) {} SfxPoolItem* SwFormatFillOrder::Clone( SfxItemPool* ) const { - return new SwFormatFillOrder( GetFillOrder() ); + return new SwFormatFillOrder( SwFillOrder(GetValue()) ); } sal_uInt16 SwFormatFillOrder::GetValueCount() const diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index f56f9bb6c7f0..f77c8a14d305 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -367,7 +367,7 @@ void SwTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) else CheckRegistration( pOld, pNew ); - if (pOldSize && pNewSize && !IsModifyLocked()) + if (pOldSize && pNewSize && !m_bModifyLocked) AdjustWidths( pOldSize->GetWidth(), pNewSize->GetWidth() ); } diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 108802c0dca1..676ea7be0239 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1441,7 +1441,7 @@ void SwXTextTableRow::SwClientNotify(const SwModify& rModify, const SfxHint& rHi { if(auto pFindHint = dynamic_cast<const FindUnoInstanceHint<SwTableLine, SwXTextTableRow>*>(&rHint)) { - if(!pFindHint->m_pCore && pFindHint->m_pCore == GetTableRow()) + if(!pFindHint->m_pCore && pFindHint->m_pCore == pLine) pFindHint->m_pResult = this; } else diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 35cd05255983..69e5ed9cb688 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -173,7 +173,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); - nError = po->Read( *pDoc, GetBaseURL(), *pPam, aFileName ); + nError = po->Read( *pDoc, sBaseURL, *pPam, aFileName ); // an ODF document may contain redline mode in settings.xml; save it! ePostReadRedlineFlags = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index 5f251ad9a5ca..0523a012deb5 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -141,7 +141,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b Color aOldLineColor( pOut->GetLineColor() ); pOut->SetLineColor( Color(COL_GRAY ) ); // to make it look nice, we subtract two pixels everywhere - sal_uInt16 nPix = GetPixelTwips() * 2; + sal_uInt16 nPix = m_nPixelTwips * 2; if( rRect.Width() <= 2 * nPix || rRect.Height() <= 2 * nPix ) nPix = 0; const Point aTopLeft( rRect.Left() + nPix, rRect.Top() + nPix ); diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 757c1f57f442..f4fd1bbb44f0 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -673,7 +673,7 @@ void SwPostItMgr::LayoutPostIts() + pPostIt->GetMetaHeight(); pPostIt->SetPosSizePixelRect( mlPageBorder , Y - GetInitialAnchorDistance(), - GetNoteWidth() , + GetSidebarWidth(true), aPostItHeight, pItem->maLayoutInfo.mPosition, mlPageEnd ); @@ -1890,11 +1890,6 @@ unsigned long SwPostItMgr::GetSidebarBorderWidth(bool bPx) const return mpWrtShell->GetOut()->PixelToLogic(Size(2,0)).Width(); } -unsigned long SwPostItMgr::GetNoteWidth() -{ - return GetSidebarWidth(true); -} - Color SwPostItMgr::GetColorDark(sal_uInt16 aAuthorIndex) { if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode()) diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 104255043df5..eccab27dc41d 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -120,7 +120,7 @@ SwHHCWrapper::~SwHHCWrapper() // check for existence of a draw view which means that there are // (or previously were) draw objects present in the document. // I.e. we like to check those too. - if ( IsDrawObj() /*&& bLastRet*/ && m_pView->GetWrtShell().HasDrawView() ) + if ( m_bIsDrawObj /*&& bLastRet*/ && m_pView->GetWrtShell().HasDrawView() ) { vcl::Cursor *pSave = m_pView->GetWindow()->GetCursor(); { @@ -686,7 +686,7 @@ bool SwHHCWrapper::HasOtherCnt_impl() void SwHHCWrapper::ConvStart_impl( SwConversionArgs /* [out] */ *pConversionArgs, SvxSpellArea eArea ) { - SetDrawObj( SvxSpellArea::Other == eArea ); + m_bIsDrawObj = SvxSpellArea::Other == eArea; m_pView->SpellStart( eArea, m_bStartDone, m_bEndDone, /* [out] */ pConversionArgs ); } diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 428b12ee708c..81716baa9793 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1927,8 +1927,8 @@ bool SwView::JumpToSwMark( const OUString& rMark ) if( !rMark.isEmpty() ) { // place bookmark at top-center - bool bSaveCC = IsCursorAtCenter(); - bool bSaveCT = IsCursorAtTop(); + bool bSaveCC = m_bCenterCursor; + bool bSaveCT = m_bTopCursor; SetCursorAtTop( true ); // For scrolling the FrameSet, the corresponding shell needs to have the focus. |