Merge commit 'ooo/DEV300_m103'

Conflicts:
basic/source/runtime/makefile.mk
basic/source/runtime/step2.cxx
desktop/prj/build.lst
desktop/source/app/app.cxx
desktop/source/deployment/registry/dp_backend.cxx
drawinglayer/source/attribute/fontattribute.cxx
editeng/inc/editeng/fontitem.hxx
editeng/source/editeng/edtspell.cxx
editeng/source/misc/svxacorr.cxx
framework/inc/services/substitutepathvars.hxx
framework/source/services/substitutepathvars.cxx
sfx2/qa/cppunit/makefile.mk
sfx2/source/doc/SfxDocumentMetaData.cxx
sfx2/source/doc/objxtor.cxx
svx/source/dialog/svxruler.cxx
sysui/desktop/icons/so9_base_app.ico
sysui/desktop/icons/so9_calc_app.ico
sysui/desktop/icons/so9_draw_app.ico
sysui/desktop/icons/so9_impress_app.ico
sysui/desktop/icons/so9_main_app.ico
sysui/desktop/icons/so9_math_app.ico
sysui/desktop/icons/so9_writer_app.ico
xmlhelp/source/cxxhelp/provider/databases.cxx
xmlhelp/source/cxxhelp/provider/db.cxx
xmlhelp/source/cxxhelp/provider/db.hxx

2 files changed, 8 insertions, 14 deletions

diff --git a/editeng/inc/editeng/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx
index 6db7858d27ba..3aac10a7bd90 100755
--- a/editeng/inc/editeng/fontitem.hxx
+++ b/editeng/inc/editeng/fontitem.hxx
@@ -82,30 +82,23 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     // Access methods:
-    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/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index d2a40e185bc3..0659b737949a 100755
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -82,6 +82,7 @@ public:
     virtual sal_Bool Delete( xub_StrLen nStt, xub_StrLen nEnd ) = 0;
     virtual sal_Bool Insert( xub_StrLen nPos, const String& rTxt ) = 0;
     virtual sal_Bool Replace( xub_StrLen nPos, const String& rTxt ) = 0;
+    virtual sal_Bool ReplaceRange( xub_StrLen nPos, xub_StrLen nLen, const String& rTxt ) = 0;
 
     virtual sal_Bool SetAttr( xub_StrLen nStt, xub_StrLen nEnd, sal_uInt16 nSlotId,
                             SfxPoolItem& ) = 0;