diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-11-21 10:50:39 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-21 10:51:36 +0000 |
commit | a57300a5fcabe38a0d8bb4e7218a3d1be9616bbd (patch) | |
tree | b2a57fdfacf95460a040786341d88789b0fac3a9 | |
parent | 16982944a1800963ee01f6e429f5330cc82b5710 (diff) |
make this just every so slightly less awful
Change-Id: Iddc39359d426f345eff0abf9fc9616e19597a0a4
-rw-r--r-- | editeng/source/editeng/editobj.cxx | 14 | ||||
-rw-r--r-- | editeng/source/editeng/editobj2.hxx | 7 | ||||
-rw-r--r-- | editeng/source/editeng/impedit4.cxx | 4 |
3 files changed, 13 insertions, 12 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 06e20d94c017..5a370837d350 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1027,8 +1027,8 @@ void EditTextObjectImpl::SetStyleSheet(sal_Int32 nPara, const OUString& rName, c return; ContentInfo& rC = *aContents[nPara].get(); - rC.GetStyle() = rName; - rC.GetFamily() = rFamily; + rC.SetStyle(rName); + rC.SetFamily(rFamily); } bool EditTextObjectImpl::ImpChangeStyleSheets( @@ -1045,8 +1045,8 @@ bool EditTextObjectImpl::ImpChangeStyleSheets( { if ( rC.GetStyle() == rOldName ) { - rC.GetStyle() = rNewName; - rC.GetFamily() = eNewFamily; + rC.SetStyle(rNewName); + rC.SetFamily(eNewFamily); bChanges = true; } } @@ -1307,10 +1307,10 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) pC->SetText(OStringToOUString(aByteString, eSrcEncoding)); // StyleName and Family... - pC->GetStyle() = rIStream.ReadUniOrByteString(eSrcEncoding); + pC->SetStyle(rIStream.ReadUniOrByteString(eSrcEncoding)); sal_uInt16 nStyleFamily(0); rIStream.ReadUInt16( nStyleFamily ); - pC->GetFamily() = (SfxStyleFamily)nStyleFamily; + pC->SetFamily((SfxStyleFamily)nStyleFamily); // Paragraph attributes ... pC->GetParaAttribs().Load( rIStream ); @@ -1530,7 +1530,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) rtl_uString *pStr = rtl_uString_alloc(nL); rIStream.ReadBytes(pStr->buffer, nL*sizeof(sal_Unicode) ); - rC.GetStyle() = OUString(pStr, SAL_NO_ACQUIRE); + rC.SetStyle(OUString(pStr, SAL_NO_ACQUIRE)); } } } diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index 736e7cd7c483..9aaef1d441eb 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -142,12 +142,13 @@ public: XEditAttributesType& GetCharAttribs() { return maCharAttribs; } const OUString& GetStyle() const { return aStyle; } - const SfxItemSet& GetParaAttribs() const { return aParaAttribs; } SfxStyleFamily GetFamily() const { return eFamily; } - OUString& GetStyle() { return aStyle; } + void SetStyle(const OUString& rStyle) { aStyle = rStyle; } + void SetFamily(const SfxStyleFamily& rFamily) { eFamily = rFamily; } + + const SfxItemSet& GetParaAttribs() const { return aParaAttribs; } SfxItemSet& GetParaAttribs() { return aParaAttribs; } - SfxStyleFamily& GetFamily() { return eFamily; } const WrongList* GetWrongList() const; void SetWrongList( WrongList* p ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 7e6bc3adf9b0..dde54ad48dc4 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1078,8 +1078,8 @@ EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel, SfxItemPool // The StyleSheet... if ( pNode->GetStyleSheet() ) { - pC->GetStyle() = pNode->GetStyleSheet()->GetName(); - pC->GetFamily() = pNode->GetStyleSheet()->GetFamily(); + pC->SetStyle(pNode->GetStyleSheet()->GetName()); + pC->SetFamily(pNode->GetStyleSheet()->GetFamily()); } // The Text... |