diff options
author | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 14:48:27 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 14:48:27 +0000 |
commit | d409a0ac2d32d4c1c7fab8f3615672f18832011e (patch) | |
tree | fad00fae14d78432b3fad2104da7674b4217ece8 /svx | |
parent | 22ce2814c6348376ec75b613873250b9eb4d4ba1 (diff) |
INTEGRATION: CWS sj17 (1.9.104); FILE MERGED
2005/03/18 17:24:11 sj 1.9.104.2: RESYNC: (1.9-1.10); FILE MERGED
2005/03/09 17:33:29 sj 1.9.104.1: #i37687# fixed status update for master/slave commands
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 92267fe03b6f..650f8167ac8e 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fontworkbar.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2005-03-01 19:12:29 $ + * last change: $Author: rt $ $Date: 2005-03-29 15:48:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -666,11 +666,6 @@ void FontworkBar::getState( SdrView* pSdrView, SfxItemSet& rSet ) if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) rSet.DisableItem( SID_FONTWORK_SAME_LETTER_HEIGHTS ); } - if ( rSet.GetItemState( SID_FONTWORK_SHAPE_TYPES ) != SFX_ITEM_UNKNOWN ) - { - if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) - rSet.DisableItem( SID_FONTWORK_SHAPE_TYPES ); - } if ( rSet.GetItemState( SID_FONTWORK_SHAPE_TYPE ) != SFX_ITEM_UNKNOWN ) { if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) |