mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make this just every so slightly less awful

Browse Source 
Change-Id: Iddc39359d426f345eff0abf9fc9616e19597a0a4
This commit is contained in:
Caolán McNamara
2016-11-21 10:50:39 +00:00
parent 16982944a1
commit a57300a5fc
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
editeng/source/editeng/editobj.cxx
View File

@@ -1027,8 +1027,8 @@ void EditTextObjectImpl::SetStyleSheet(sal_Int32 nPara, const OUString& rName, c
return; return;
ContentInfo& rC = *aContents[nPara].get(); ContentInfo& rC = *aContents[nPara].get();
rC.GetStyle() = rName; rC.SetStyle(rName);
rC.GetFamily() = rFamily; rC.SetFamily(rFamily);
} }
bool EditTextObjectImpl::ImpChangeStyleSheets( bool EditTextObjectImpl::ImpChangeStyleSheets(
@@ -1045,8 +1045,8 @@ bool EditTextObjectImpl::ImpChangeStyleSheets(
{ {
if ( rC.GetStyle() == rOldName ) if ( rC.GetStyle() == rOldName )
{ {
rC.GetStyle() = rNewName; rC.SetStyle(rNewName);
rC.GetFamily() = eNewFamily; rC.SetFamily(eNewFamily);
bChanges = true; bChanges = true;
} }
} }
@@ -1307,10 +1307,10 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
pC->SetText(OStringToOUString(aByteString, eSrcEncoding)); pC->SetText(OStringToOUString(aByteString, eSrcEncoding));
// StyleName and Family... // StyleName and Family...
pC->GetStyle() = rIStream.ReadUniOrByteString(eSrcEncoding); pC->SetStyle(rIStream.ReadUniOrByteString(eSrcEncoding));
sal_uInt16 nStyleFamily(0); sal_uInt16 nStyleFamily(0);
rIStream.ReadUInt16( nStyleFamily ); rIStream.ReadUInt16( nStyleFamily );
pC->GetFamily() = (SfxStyleFamily)nStyleFamily; pC->SetFamily((SfxStyleFamily)nStyleFamily);
// Paragraph attributes ... // Paragraph attributes ...
pC->GetParaAttribs().Load( rIStream ); pC->GetParaAttribs().Load( rIStream );
@@ -1530,7 +1530,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
rtl_uString *pStr = rtl_uString_alloc(nL); rtl_uString *pStr = rtl_uString_alloc(nL);
rIStream.ReadBytes(pStr->buffer, nL*sizeof(sal_Unicode) ); rIStream.ReadBytes(pStr->buffer, nL*sizeof(sal_Unicode) );
rC.GetStyle() = OUString(pStr, SAL_NO_ACQUIRE); rC.SetStyle(OUString(pStr, SAL_NO_ACQUIRE));
} }
} }
} }

7
editeng/source/editeng/editobj2.hxx
View File

@@ -142,12 +142,13 @@ public:
XEditAttributesType& GetCharAttribs() { return maCharAttribs; } XEditAttributesType& GetCharAttribs() { return maCharAttribs; }
const OUString& GetStyle() const { return aStyle; } const OUString& GetStyle() const { return aStyle; }
const SfxItemSet& GetParaAttribs() const { return aParaAttribs; }
SfxStyleFamily GetFamily() const { return eFamily; } 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; } SfxItemSet& GetParaAttribs() { return aParaAttribs; }
SfxStyleFamily& GetFamily() { return eFamily; }
const WrongList* GetWrongList() const; const WrongList* GetWrongList() const;
void SetWrongList( WrongList* p ); void SetWrongList( WrongList* p );

4
editeng/source/editeng/impedit4.cxx
View File

@@ -1078,8 +1078,8 @@ EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel, SfxItemPool
// The StyleSheet... // The StyleSheet...
if ( pNode->GetStyleSheet() ) if ( pNode->GetStyleSheet() )
{ {
pC->GetStyle() = pNode->GetStyleSheet()->GetName(); pC->SetStyle(pNode->GetStyleSheet()->GetName());
pC->GetFamily() = pNode->GetStyleSheet()->GetFamily(); pC->SetFamily(pNode->GetStyleSheet()->GetFamily());
} }
// The Text... // The Text...