[Libreoffice-commits] core.git: editeng/source

[Caolán McNamara]

 editeng/source/editeng/editobj.cxx  |   14 +++++++-------
 editeng/source/editeng/editobj2.hxx |    7 ++++---
 editeng/source/editeng/impedit4.cxx |    4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit a57300a5fcabe38a0d8bb4e7218a3d1be9616bbd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 21 10:50:39 2016 +0000

    make this just every so slightly less awful
    
    Change-Id: Iddc39359d426f345eff0abf9fc9616e19597a0a4

diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 06e20d9..5a37083 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 736e7cd7..9aaef1d 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 7e6bc3ad..dde54ad 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...