summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2003-09-25 09:44:07 +0000
committerHans-Joachim Lankenau <hjs@openoffice.org>2003-09-25 09:44:07 +0000
commit1b5ae14b06b943f60f0c82ca02778cb587e4aad6 (patch)
tree6c82d824e976be309b1b38d54cbe78fe8b6c90a3 /sfx2
parentb14c91a6d1da7809db478ddf86a67303ad51f04a (diff)
INTEGRATION: CWS os20 (1.32.148); FILE MERGED
2003/09/15 11:26:24 os 1.32.148.1: ##90374## unused SID_DESKTOPMODE removed
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/cfg.cxx12
1 files changed, 2 insertions, 10 deletions
diff --git a/sfx2/source/dialog/cfg.cxx b/sfx2/source/dialog/cfg.cxx
index 803d5f4f9767..26dcc167f180 100644
--- a/sfx2/source/dialog/cfg.cxx
+++ b/sfx2/source/dialog/cfg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cfg.cxx,v $
*
- * $Revision: 1.32 $
+ * $Revision: 1.33 $
*
- * last change: $Author: hr $ $Date: 2003-03-27 11:27:57 $
+ * last change: $Author: hjs $ $Date: 2003-09-25 10:44:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -479,11 +479,7 @@ void SfxConfigGroupListBox_Impl::Init( SvStringsDtor *pArr, SfxSlotPool* pPool )
while ( pSfxSlot )
{
USHORT nId = pSfxSlot->GetSlotId();
-#ifdef UNX
- if ( nId != SID_DESKTOPMODE && ( pSfxSlot->GetMode() & nMode ) )
-#else
if ( pSfxSlot->GetMode() & nMode )
-#endif
{
bActiveEntries = sal_True;
break;
@@ -616,11 +612,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
while ( pSfxSlot )
{
USHORT nId = pSfxSlot->GetSlotId();
-#ifdef UNX
- if ( nId != SID_DESKTOPMODE && ( pSfxSlot->GetMode() & nMode ) )
-#else
if ( pSfxSlot->GetMode() & nMode )
-#endif
{
String aName = pSlotPool->GetSlotName_Impl( *pSfxSlot );
if ( aName.Len() && !pFunctionListBox->GetEntry_Impl( nId ) )