diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 12:53:50 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 12:53:50 +0000 |
commit | 2677d870ed308d413b8cfd907b28c4d7b3ae6b48 (patch) | |
tree | 638c2f4b06173a95f4767055247c746fbfec3d68 /sc/source/ui/drawfunc/drtxtob.cxx | |
parent | de4fed181c0fac276b245bfd79f885b9d21989e4 (diff) |
INTEGRATION: CWS dr12 (1.18.170); FILE MERGED
2004/08/12 12:47:54 sab 1.18.170.3: RESYNC: (1.19-1.20); FILE MERGED
2004/02/25 10:20:59 dr 1.18.170.2: RESYNC: (1.18-1.19); FILE MERGED
2004/02/24 10:14:14 jmarmion 1.18.170.1: #i21255# text formatting for cell notes
Diffstat (limited to 'sc/source/ui/drawfunc/drtxtob.cxx')
-rw-r--r-- | sc/source/ui/drawfunc/drtxtob.cxx | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 8229ab9b22e8..9ad29e55eba0 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drtxtob.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2004-08-02 12:58:16 $ + * last change: $Author: hr $ $Date: 2004-09-08 13:53:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -372,13 +372,7 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) if (IsNoteEdit()) { - // Funktionen, die bei Notizen disabled sind: - - rSet.DisableItem( SID_TEXT_STANDARD ); - rSet.DisableItem( SID_DRAWTEXT_ATTR_DLG ); - - if(!bHasFontWork) - bDisableFontWork = TRUE; + // issue 21255 - Notes now support rich text formatting. } if ( bDisableFontWork ) @@ -852,15 +846,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) { if ( IsNoteEdit() ) { - // Notizen haben keine Text-Attribute !!! - SfxWhichIter aIter(rDestSet); - USHORT nWhich = aIter.FirstWhich(); - while ( nWhich ) - { - rDestSet.DisableItem( nWhich ); - nWhich = aIter.NextWhich(); - } - return; + // issue 21255 - Notes now support rich text formatting. } SvtLanguageOptions aLangOpt; |