strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: #80231# no SfxHelpPI any longer

Browse source
This commit is contained in:
Peter Burow 2000-11-28 10:28:12 +00:00
parent 0f0b628429
commit 918957cc8e
2 changed files with 13 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
svx/source/dialog/iconcdlg.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: iconcdlg.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: pw $ $Date: 2000-11-22 13:51:18 $
* last change: $Author: pb $ $Date: 2000-11-28 11:25:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -62,13 +62,13 @@
#ifndef _SFXAPP_HXX
#include <sfx2/app.hxx>
#endif
#ifndef _SFX_HELP_HXX
#include <sfx2/sfxhelp.hxx>
#endif
#ifndef _TOOLS_RC_H
#include <tools/rc.h>
#endif
#ifndef _SHL_HXX
#include <tools/shl.hxx>
#endif
#define _SVSTDARR_USHORTS
#include <svtools/svstdarr.hxx>
@ -398,7 +398,7 @@ IconChoiceDialog ::~IconChoiceDialog ()
aTabDlgOpt.SetPosition( GetPosPixel().X(), GetPosPixel().Y() );
aTabDlgOpt.SetPageID( mnCurrentPageId );
const USHORT nCount = maPageList.Count();
const ULONG nCount = maPageList.Count();
for ( i = 0; i < nCount; ++i )
{
@ -446,10 +446,6 @@ IconChoiceDialog ::~IconChoiceDialog ()
delete pRanges;
if ( pOutSet )
delete pOutSet;
SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI();
if ( pHelpPI )
pHelpPI->ResetTopic();
}
/**********************************************************************
@ -975,10 +971,6 @@ void IconChoiceDialog::ActivatePageImpl ()
pData->pPage->ActivatePage( *pExampleSet );
}
SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI();
if ( pHelpPI )
pHelpPI->LoadTopic( pData->pPage->GetHelpId() );
SetHelpId( pData->pPage->GetHelpId() );
BOOL bReadOnly = pData->pPage->IsReadOnly();
@ -1040,7 +1032,7 @@ BOOL IconChoiceDialog::DeActivatePageImpl ()
pSet = GetRefreshedSet();
DBG_ASSERT( pSet, "GetRefreshedSet() liefert NULL" );
// alle Pages als neu zu initialsieren flaggen
const USHORT nCount = maPageList.Count();
const ULONG nCount = maPageList.Count();
for ( USHORT i = 0; i < nCount; ++i )
{
@ -1103,7 +1095,7 @@ const USHORT* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
SvUShorts aUS( 16, 16 );
ULONG nCount = maPageList.Count();
ULONG i;
USHORT i;
for ( i = 0; i < nCount; ++i )
{
IconChoicePageData* pData = maPageList.GetObject (i);
@ -1128,7 +1120,7 @@ const USHORT* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
nCount = aUS.Count();
for ( i = 0; i < nCount; ++i )
aUS[i] = (USHORT) rPool.GetWhich( aUS[i] );
aUS[i] = rPool.GetWhich( aUS[i] );
}
// sortieren
@ -1360,7 +1352,7 @@ short IconChoiceDialog::Ok()
const ULONG nCount = maPageList.Count();
for ( ULONG i = 0; i < nCount; ++i )
for ( USHORT i = 0; i < nCount; ++i )
{
IconChoicePageData* pData = GetPageData ( i );
@ -1406,7 +1398,7 @@ BOOL IconChoiceDialog::IsInOK() const
void IconChoiceDialog::FocusOnIcon( USHORT nId )
{
// set focus to icon for the current visible page
for ( int i=0; i<maIconCtrl.GetEntryCount(); i++)
for ( USHORT i=0; i<maIconCtrl.GetEntryCount(); i++)
{
SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i );
USHORT* pUserData = (USHORT*) pEntry->GetUserData();

51
svx/source/editeng/svxacorr.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: svxacorr.cxx,v $
*
* $Revision: 1.11 $
* $Revision: 1.12 $
*
* last change: $Author: jp $ $Date: 2000-11-20 21:18:47 $
* last change: $Author: pb $ $Date: 2000-11-28 11:28:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -88,9 +88,6 @@
#ifndef _SVSTOR_HXX //autogen
#include <so3/svstor.hxx>
#endif
#ifndef _SFX_HELP_HXX
#include <sfx2/sfxhelp.hxx>
#endif
#ifndef _SFX_DOCFILE_HXX
#include <sfx2/docfile.hxx>
#endif
@ -1276,50 +1273,6 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
}
} while( FALSE );
if( nRet )
{
SvtHelpOptions aOpt;
if( aOpt.IsHelpAgentAutoStartMode() )
{
// at time max 16 help ids (from 1 to 15)
static BYTE aHelpIdArr[ HID_AUTOCORR_HELP_END -
HID_AUTOCORR_HELP_START ] = {0};
ULONG nHelpId = 0;
if( nRet & ( Autocorrect|CptlSttSntnc|CptlSttWrd) )
{
// von 0 - 7
if( nRet & Autocorrect )
nHelpId += 4;
if( nRet & CptlSttSntnc )
nHelpId += 2;
if( nRet & CptlSttWrd )
nHelpId += 1;
}
else
{
if( nRet & ChgQuotes) nHelpId = 8;
else if( nRet & ChgSglQuotes) nHelpId = 9;
else if( nRet & SetINetAttr) nHelpId = 10;
else if( nRet & IngnoreDoubleSpace) nHelpId = 11;
else if( nRet & ChgWeightUnderl) nHelpId = 12;
else if( nRet & ChgFractionSymbol ) nHelpId = 13;
else if( nRet & ChgToEnEmDash) nHelpId = 14;
else if( nRet & ChgOrdinalNumber) nHelpId = 15;
}
DBG_ASSERT( nHelpId && nHelpId < (HID_AUTOCORR_HELP_END -
HID_AUTOCORR_HELP_START + 1),
"wrong HelpId Range" );
if( nHelpId && aHelpIdArr[ --nHelpId ] < 10 ) // maximal 10 mal zeigen
{
++aHelpIdArr[ nHelpId ];
nHelpId += HID_AUTOCORR_HELP_START;
SfxHelp::ShowHint( nHelpId );
}
}
}
return nRet;
}