diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:50:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:50:31 +0000 |
| commit | 20efba54c45d7736f3dd2096760e69d148a5e606 (patch) | |
| tree | b746feb4d15dd907145fc484ef8edee619db10a2 | |
| parent | 79b89f18218759a2d543e4a5f47ca996c1edad5a (diff) | |
INTEGRATION: CWS dba30c (1.75.144); FILE MERGED
2008/04/16 06:46:10 fs 1.75.144.2: RESYNC: (1.75-1.76); FILE MERGED
2008/04/02 10:47:44 fs 1.75.144.1: the text formatting toolbar should not be visible when the document is read-only - it's completely disabled then, anyway
| -rw-r--r-- | svx/source/form/fmshell.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 70e42665afb2..ebf12618deee 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmshell.cxx,v $ - * $Revision: 1.76 $ + * $Revision: 1.77 $ * * This file is part of OpenOffice.org. * @@ -502,7 +502,7 @@ sal_Bool FmFormShell::HasUIFeature( sal_uInt32 nFeature ) } else if ( ( nFeature & FM_UI_FEATURE_SHOW_TEXT_CONTROL_BAR ) == FM_UI_FEATURE_SHOW_TEXT_CONTROL_BAR ) { - bResult = m_pImpl->IsActiveControl( true ); + bResult = !GetImpl()->IsReadonlyDoc() && m_pImpl->IsActiveControl( true ); } else if ((nFeature & FM_UI_FEATURE_SHOW_DATANAVIGATOR) == FM_UI_FEATURE_SHOW_DATANAVIGATOR) { |