CWS-TOOLING: integrate CWS os150

6 files changed, 40 insertions, 37 deletions

diff --git a/editeng/inc/editeng/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx
index f68fe3e317..8e66ca94f8 100644..100755
--- a/editeng/inc/editeng/fontitem.hxx
+++ b/editeng/inc/editeng/fontitem.hxx
@@ -81,31 +81,24 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     // ZugriffsMethoden:
-    inline String &GetFamilyName() { return aFamilyName; }
+    void SetFamilyName( const String& rFamilyName ) { aFamilyName = rFamilyName; }
     inline const String &GetFamilyName() const { return aFamilyName; }
 
-    inline String &GetStyleName() { return aStyleName; }
+    void SetStyleName(const String &rStyleName ) { aStyleName = rStyleName; }
     inline const String &GetStyleName() const { return aStyleName; }
 
-    inline FontFamily &GetFamily() { return eFamily; }
+    void SetFamily( FontFamily _eFamily ) { eFamily = _eFamily; }
     inline FontFamily GetFamily() const { return eFamily; }
 
-    inline FontPitch &GetPitch() { return ePitch; }
+    void SetPitch(FontPitch _ePitch ) { ePitch = _ePitch; }
     inline FontPitch GetPitch() const { return ePitch; }
 
-    inline rtl_TextEncoding &GetCharSet() { return eTextEncoding; }
+    void SetCharSet(rtl_TextEncoding _eEncoding) { eTextEncoding = _eEncoding; }
+    
     inline rtl_TextEncoding GetCharSet() const { return eTextEncoding; }
 
-    inline SvxFontItem& operator=(const SvxFontItem& rFont)
-    {
-        aFamilyName =  rFont.GetFamilyName();
-        aStyleName =   rFont.GetStyleName();
-        eFamily =      rFont.GetFamily();
-        ePitch =   rFont.GetPitch();
-        eTextEncoding = rFont.GetCharSet();
-        return *this;
-    }
-
+    SvxFontItem& operator=(const SvxFontItem& rFont);
+    
     static void EnableStoreUnicodeNames( sal_Bool bEnable );
 
 };
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 277597efde..ba4c42f0bf 100644..100755
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1472,7 +1472,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
                 if ( hConv )
                 {
                     SvxFontItem aNewFontItem( rFontItem );
-                    aNewFontItem.GetFamilyName() = GetFontToSubsFontName( hConv );
+                    aNewFontItem.SetFamilyName( GetFontToSubsFontName( hConv ) );
 
                     pC->GetAttribs().Remove( nAttr );
                     XEditAttribute* pNewAttr = CreateAttrib( aNewFontItem, pAttr->GetStart(), pAttr->GetEnd() );
@@ -1503,7 +1503,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
             if ( hConv )
             {
                 SvxFontItem aNewFontItem( rFontItem );
-                aNewFontItem.GetFamilyName() = GetFontToSubsFontName( hConv );
+                aNewFontItem.SetFamilyName( GetFontToSubsFontName( hConv ) );
                 pC->GetParaAttribs().Put( aNewFontItem );
 
                 for ( sal_uInt16 nChar = 0; nChar < pC->GetText().Len(); nChar++ )
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 0f9ae6772e..8f88c598c7 100755
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1682,11 +1682,11 @@ void ImpEditEngine::SetLanguageAndFont(
     {
         // set new font attribute
         SvxFontItem aFontItem = (SvxFontItem&) aNewSet.Get( nFontWhichId );
-        aFontItem.GetFamilyName()   = pFont->GetName();
-        aFontItem.GetFamily()       = pFont->GetFamily();
-        aFontItem.GetStyleName()    = pFont->GetStyleName();
-        aFontItem.GetPitch()        = pFont->GetPitch();
-        aFontItem.GetCharSet()      = pFont->GetCharSet();
+        aFontItem.SetFamilyName( pFont->GetName());
+        aFontItem.SetFamily( pFont->GetFamily());
+        aFontItem.SetStyleName( pFont->GetStyleName());
+        aFontItem.SetPitch( pFont->GetPitch());
+        aFontItem.SetCharSet( pFont->GetCharSet() );
         aNewSet.Put( aFontItem );
     }
 
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 96108d50a5..770d8fe05f 100644..100755
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -302,11 +302,11 @@ void TextConvWrapper::SetLanguageAndFont( const ESelection &rESel,
     {
         // set new font attribute
         SvxFontItem aFontItem = (SvxFontItem&) aNewSet.Get( nFontWhichId );
-        aFontItem.GetFamilyName()   = pFont->GetName();
-        aFontItem.GetFamily()       = pFont->GetFamily();
-        aFontItem.GetStyleName()    = pFont->GetStyleName();
-        aFontItem.GetPitch()        = pFont->GetPitch();
-        aFontItem.GetCharSet()      = pFont->GetCharSet();
+        aFontItem.SetFamilyName( pFont->GetName());
+        aFontItem.SetFamily( pFont->GetFamily());
+        aFontItem.SetStyleName( pFont->GetStyleName());
+        aFontItem.SetPitch( pFont->GetPitch());
+        aFontItem.SetCharSet(pFont->GetCharSet());
         aNewSet.Put( aFontItem );
     }
 
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index e4b437e2e3..364ac1cc64 100644..100755
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -256,6 +256,16 @@ SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
 }
 
 // -----------------------------------------------------------------------
+SvxFontItem& SvxFontItem::operator=(const SvxFontItem& rFont)
+{
+    aFamilyName =  rFont.GetFamilyName();
+    aStyleName =   rFont.GetStyleName();
+    eFamily =      rFont.GetFamily();
+    ePitch =   rFont.GetPitch();
+    eTextEncoding = rFont.GetCharSet();
+    return *this;
+}
+// -----------------------------------------------------------------------
 
 sal_Bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
@@ -3806,11 +3816,11 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo
                                                   aOutTypeArr[ n ].nLanguage,
                                                   DEFAULTFONT_FLAGS_ONLYONE, 0 ) );
         SvxFontItem* pItem = aItemArr[ n ];
-        pItem->GetFamily() = aFont.GetFamily();
-        pItem->GetFamilyName() = aFont.GetName();
-        pItem->GetStyleName().Erase();
-        pItem->GetPitch() = aFont.GetPitch();
-        pItem->GetCharSet() = aFont.GetCharSet();
+        pItem->SetFamily( aFont.GetFamily() );
+        pItem->SetFamilyName( aFont.GetName() );
+        pItem->SetStyleName( String() );
+        pItem->SetPitch( aFont.GetPitch());
+        pItem->SetCharSet(aFont.GetCharSet());
     }
 }
 
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 04ea67fbd8..8564ab29d5 100644..100755
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -91,11 +91,11 @@ void SvxUnoFontDescriptor::FillItemSet( const awt::FontDescriptor& rDesc, SfxIte
 
     {
         SvxFontItem aFontItem( EE_CHAR_FONTINFO );
-        aFontItem.GetFamilyName()= rDesc.Name;
-        aFontItem.GetStyleName() = rDesc.StyleName;
-        aFontItem.GetFamily()    = (FontFamily)rDesc.Family;
-        aFontItem.GetCharSet()   = rDesc.CharSet;
-        aFontItem.GetPitch()     = (FontPitch)rDesc.Pitch;
+        aFontItem.SetFamilyName( rDesc.Name);
+        aFontItem.SetStyleName( rDesc.StyleName);
+        aFontItem.SetFamily( (FontFamily)rDesc.Family);
+        aFontItem.SetCharSet( rDesc.CharSet );
+        aFontItem.SetPitch( (FontPitch)rDesc.Pitch);
         rSet.Put(aFontItem);
     }