diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-09 16:20:50 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-09 16:20:50 -0600 |
| commit | cc5db648bcc3114fefcbf9741586f7cb6aa00b2f (patch) | |
| tree | 518184d1a205c0173f30a54bbee0ffaa0f9bb433 /cui/source/dialogs | |
| parent | 7fc838e84c345c13e1dbd32052e1d9c5985a7859 (diff) | |
| parent | 8427b0f498b040a465cc20c4a323191d6b2aea5f (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (185 commits)
masterfix DEV300: #i10000# usage of L10N build_type
masterfix: #i10000# INT16 -> sal_Int16
fixed compile errors after resync to m100, part2
gridsort: post-rebase fixes
CWS gnumake3: found another tools integer type
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
native359: #i114398# changing mac langpack icon
native359: #i115669# fixing package description for solaris packages
gnumake3: remove comphelper version; fix including extract.hxx
locales34: #i106785# add Haitian_Haiti [ht-HT] to language list and locale data; locale data contributed by <jcpoulard>
sb138: #i116659# timely termination of OnLogRotateThread
accfixes: removed include of obsolete header file
accfixes: removed obsolete file
removetooltypes01: #i112600# Fix build problems on non-pro
accfixes: moved some shared strings to svx part2
accfixes: moved some shared strings to svx
accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)
removetooltypes01: #i112600# Remove tools types for Mac specific parts
fixed tab order in BasicIDE, Library dialog tab page
added some accessible names in BasicIDE
...
Conflicts:
UnoControls/source/base/registercontrols.cxx
accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
automation/inc/automation/communi.hxx
automation/inc/automation/simplecm.hxx
automation/source/communi/communi.cxx
automation/source/inc/rcontrol.hxx
automation/source/miniapp/servuid.hxx
automation/source/server/XMLParser.cxx
automation/source/server/cmdbasestream.cxx
automation/source/server/profiler.hxx
automation/source/server/recorder.cxx
automation/source/server/retstrm.hxx
automation/source/server/server.cxx
automation/source/server/sta_list.cxx
automation/source/server/statemnt.cxx
automation/source/server/statemnt.hxx
automation/source/simplecm/packethandler.cxx
automation/source/simplecm/simplecm.cxx
automation/source/simplecm/tcpio.cxx
automation/source/simplecm/tcpio.hxx
automation/source/testtool/comm_bas.hxx
automation/source/testtool/cretstrm.hxx
automation/source/testtool/httprequest.cxx
automation/source/testtool/httprequest.hxx
automation/source/testtool/objtest.cxx
automation/source/testtool/objtest.hxx
basctl/source/basicide/baside2.cxx
basctl/source/basicide/baside2.hxx
basctl/source/basicide/baside2b.cxx
basctl/source/basicide/baside3.cxx
basctl/source/basicide/basides1.cxx
basctl/source/basicide/basides2.cxx
basctl/source/basicide/basidesh.cxx
basctl/source/basicide/basidesh.src
basctl/source/basicide/basobj3.cxx
basctl/source/basicide/bastype2.cxx
basctl/source/basicide/bastype3.cxx
basctl/source/basicide/bastypes.cxx
basctl/source/basicide/brkdlg.cxx
basctl/source/basicide/iderdll.cxx
basctl/source/basicide/macrodlg.cxx
basctl/source/basicide/moduldl2.cxx
basctl/source/basicide/moduldlg.cxx
basctl/source/basicide/objdlg.cxx
basctl/source/basicide/scriptdocument.cxx
basctl/source/basicide/tbxctl.cxx
basctl/source/basicide/tbxctl.hxx
basctl/source/basicide/tbxctl.src
basctl/source/dlged/dlged.cxx
basctl/source/dlged/dlgedfunc.cxx
basctl/source/dlged/dlgedobj.cxx
basctl/source/inc/basidesh.hxx
basctl/source/inc/bastypes.hxx
basctl/source/inc/dlgedmod.hxx
basctl/source/inc/dlgedpage.hxx
crashrep/prj/build.lst
cui/inc/pch/precompiled_cui.hxx
cui/source/customize/acccfg.cxx
cui/source/customize/acccfg.hrc
cui/source/customize/acccfg.src
cui/source/customize/cfg.cxx
cui/source/customize/cfgutil.cxx
cui/source/customize/macropg.cxx
cui/source/customize/macropg.src
cui/source/customize/selector.cxx
cui/source/dialogs/SpellDialog.cxx
cui/source/dialogs/commonlingui.cxx
cui/source/dialogs/cuicharmap.cxx
cui/source/dialogs/cuifmsearch.cxx
cui/source/dialogs/cuigaldlg.cxx
cui/source/dialogs/cuigrfflt.cxx
cui/source/dialogs/hldocntp.cxx
cui/source/dialogs/hldoctp.cxx
cui/source/dialogs/hlinettp.cxx
cui/source/dialogs/hlmailtp.cxx
cui/source/dialogs/hlmarkwn.cxx
cui/source/dialogs/hlmarkwn.src
cui/source/dialogs/hltpbase.cxx
cui/source/dialogs/iconcdlg.cxx
cui/source/dialogs/passwdomdlg.cxx
cui/source/dialogs/pastedlg.cxx
cui/source/dialogs/scriptdlg.cxx
cui/source/dialogs/thesdlg.cxx
cui/source/dialogs/zoom.cxx
cui/source/factory/dlgfact.hxx
cui/source/inc/SpellDialog.hxx
cui/source/inc/autocdlg.hxx
cui/source/inc/backgrnd.hxx
cui/source/inc/bbdlg.hxx
cui/source/inc/cfg.hxx
cui/source/inc/cfgutil.hxx
cui/source/inc/cuigaldlg.hxx
cui/source/inc/cuigrfflt.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/hldocntp.hxx
cui/source/inc/hltpbase.hxx
cui/source/inc/iconcdlg.hxx
cui/source/inc/numpages.hxx
cui/source/inc/page.hxx
cui/source/inc/postdlg.hxx
cui/source/inc/scriptdlg.hxx
cui/source/inc/transfrm.hxx
cui/source/inc/zoom.hxx
cui/source/options/cfgchart.cxx
cui/source/options/cuisrchdlg.cxx
cui/source/options/dbregister.cxx
cui/source/options/dbregister.src
cui/source/options/fontsubs.cxx
cui/source/options/internationaloptions.cxx
cui/source/options/optasian.cxx
cui/source/options/optchart.cxx
cui/source/options/optcolor.cxx
cui/source/options/optcolor.src
cui/source/options/optfltr.cxx
cui/source/options/optfltr.src
cui/source/options/optgdlg.cxx
cui/source/options/optgdlg.src
cui/source/options/optgenrl.cxx
cui/source/options/opthtml.cxx
cui/source/options/optimprove.cxx
cui/source/options/optinet2.cxx
cui/source/options/optinet2.hxx
cui/source/options/optjava.cxx
cui/source/options/optlingu.cxx
cui/source/options/optsave.cxx
cui/source/options/optsave.hxx
cui/source/options/treeopt.cxx
cui/source/options/webconninfo.cxx
cui/source/tabpages/autocdlg.cxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/dstribut.cxx
cui/source/tabpages/grfpage.cxx
cui/source/tabpages/macroass.cxx
cui/source/tabpages/measure.cxx
cui/source/tabpages/numfmt.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/page.cxx
cui/source/tabpages/paragrph.cxx
cui/source/tabpages/swpossizetabpage.cxx
cui/source/tabpages/tabarea.src
cui/source/tabpages/textanim.cxx
cui/source/tabpages/textattr.cxx
cui/source/tabpages/tparea.cxx
cui/source/tabpages/tpbitmap.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tpgradnt.cxx
cui/source/tabpages/tphatch.cxx
cui/source/tabpages/tpline.cxx
cui/source/tabpages/tplnedef.cxx
cui/source/tabpages/tplneend.cxx
cui/source/tabpages/tpshadow.cxx
cui/source/tabpages/transfrm.cxx
embedserv/source/embed/register.cxx
extensions/inc/pch/precompiled_extensions.hxx
extensions/inc/propctrlr.hrc
extensions/source/abpilot/abpservices.cxx
extensions/source/bibliography/bibload.cxx
extensions/source/bibliography/datman.cxx
extensions/source/bibliography/general.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/inc/componentmodule.cxx
extensions/source/nsplugin/source/so_env.cxx
extensions/source/ole/oleobjw.cxx
extensions/source/ole/oleobjw.hxx
extensions/source/oooimprovement/invite_job.cxx
extensions/source/oooimprovement/onlogrotate_job.cxx
extensions/source/plugin/base/service.cxx
extensions/source/plugin/inc/plugin/unx/mediator.hxx
extensions/source/plugin/inc/plugin/unx/plugcon.hxx
extensions/source/plugin/unx/mediator.cxx
extensions/source/plugin/unx/nppapi.cxx
extensions/source/plugin/unx/plugcon.cxx
extensions/source/preload/services.cxx
extensions/source/propctrlr/formmetadata.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/resource/resource.cxx
extensions/source/scanner/sane.hxx
extensions/source/scanner/sanedlg.cxx
extensions/source/scanner/scanunx.cxx
extensions/source/scanner/scanwin.cxx
extensions/source/scanner/twain.cxx
extensions/source/scanner/twain.hxx
extensions/source/update/check/updatecheckconfig.cxx
extensions/test/stm/datatest.cxx
extensions/test/stm/marktest.cxx
extensions/test/stm/pipetest.cxx
extensions/test/stm/testfactreg.cxx
extensions/workben/testpgp.cxx
forms/qa/complex/forms/CheckOGroupBoxModel.java
forms/qa/makefile.mk
forms/source/component/Button.cxx
forms/source/component/Button.hxx
forms/source/component/ListBox.cxx
forms/source/inc/forms_module_impl.hxx
forms/source/misc/services.cxx
forms/source/solar/control/navtoolbar.cxx
javainstaller2/prj/build.lst
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
lingucomponent/prj/build.lst
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sreg.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/source/manifest/ManifestExport.cxx
package/source/manifest/UnoRegister.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/owriteablestream.hxx
package/source/xstor/xstorage.hxx
package/source/zippackage/ZipPackageFolder.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/mac/ooo/DS_Store
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
xmlsecurity/prj/build.lst
xmlsecurity/source/component/registerservices.cxx
xmlsecurity/source/dialogs/stbcontrl.cxx
xmlsecurity/source/framework/xsec_framework.cxx
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
xmlsecurity/tools/demo/util.hxx
xmlsecurity/workben/signaturetest.cxx
Diffstat (limited to 'cui/source/dialogs')
64 files changed, 1471 insertions, 989 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index e18f2e3f13e1..b185e3191aa7 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -74,6 +74,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::linguistic2; +using ::rtl::OUString; + #define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) // struct SpellDialog_Impl --------------------------------------------- @@ -83,19 +85,21 @@ struct SpellDialog_Impl }; // ----------------------------------------------------------------------- -#define SPELLUNDO_CHANGE_LANGUAGE (TEXTUNDO_USER + 1) -#define SPELLUNDO_CHANGE_TEXTENGINE (TEXTUNDO_USER + 2) -#define SPELLUNDO_CHANGE_NEXTERROR (TEXTUNDO_USER + 3) -#define SPELLUNDO_CHANGE_ADD_TO_DICTIONARY (TEXTUNDO_USER + 4) -#define SPELLUNDO_CHANGE_GROUP (TEXTUNDO_USER + 5) //undo list -#define SPELLUNDO_MOVE_ERROREND (TEXTUNDO_USER + 6) -#define SPELLUNDO_UNDO_EDIT_MODE (TEXTUNDO_USER + 7) -#define SPELLUNDO_ADD_IGNORE_RULE (TEXTUNDO_USER + 8) +#define SPELLUNDO_START 200 + +#define SPELLUNDO_CHANGE_LANGUAGE (SPELLUNDO_START + 1) +#define SPELLUNDO_CHANGE_TEXTENGINE (SPELLUNDO_START + 2) +#define SPELLUNDO_CHANGE_NEXTERROR (SPELLUNDO_START + 3) +#define SPELLUNDO_CHANGE_ADD_TO_DICTIONARY (SPELLUNDO_START + 4) +#define SPELLUNDO_CHANGE_GROUP (SPELLUNDO_START + 5) //undo list +#define SPELLUNDO_MOVE_ERROREND (SPELLUNDO_START + 6) +#define SPELLUNDO_UNDO_EDIT_MODE (SPELLUNDO_START + 7) +#define SPELLUNDO_ADD_IGNORE_RULE (SPELLUNDO_START + 8) namespace svx{ class SpellUndoAction_Impl : public SfxUndoAction { - USHORT m_nId; + sal_uInt16 m_nId; const Link& m_rActionLink; //undo of button enabling bool m_bEnableChangePB; @@ -114,7 +118,7 @@ class SpellUndoAction_Impl : public SfxUndoAction long m_nOffset; public: - SpellUndoAction_Impl(USHORT nId, const Link& rActionLink) : + SpellUndoAction_Impl(sal_uInt16 nId, const Link& rActionLink) : m_nId(nId), m_rActionLink( rActionLink), m_bEnableChangePB(false), @@ -130,7 +134,7 @@ public: ~SpellUndoAction_Impl(); virtual void Undo(); - virtual USHORT GetId() const; + virtual sal_uInt16 GetId() const; void SetEnableChangePB(){m_bEnableChangePB = true;} bool IsEnableChangePB(){return m_bEnableChangePB;} @@ -180,7 +184,7 @@ void SpellUndoAction_Impl::Undo() } //----------------------------------------------------------------------- -USHORT SpellUndoAction_Impl::GetId()const +sal_uInt16 SpellUndoAction_Impl::GetId()const { return m_nId; } @@ -297,7 +301,7 @@ void SpellDialog::Init_Impl() aLanguageLB.SetSelectHdl(LINK( this, SpellDialog, LanguageSelectHdl ) ); // initialize language ListBox - aLanguageLB.SetLanguageList( LANG_LIST_SPELL_USED, FALSE, FALSE, TRUE ); + aLanguageLB.SetLanguageList( LANG_LIST_SPELL_USED, sal_False, sal_False, sal_True ); // get current language UpdateBoxes_Impl(); @@ -409,7 +413,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent { //remove undo if a new sentence is active aSentenceED.ResetUndo(); - aUndoPB.Enable(FALSE); + aUndoPB.Enable(sal_False); } } } @@ -423,7 +427,7 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) pThis->aAutoCorrPB.Show(pThis->rParent.HasAutoCorrection()); pThis->SpellContinue_Impl(); pThis->aSentenceED.ResetUndo(); - pThis->aUndoPB.Enable(FALSE); + pThis->aUndoPB.Enable(sal_False); pThis->LockFocusChanges(true); if( pThis->aChangePB.IsEnabled() ) @@ -611,7 +615,7 @@ IMPL_LINK( SpellDialog, ChangeHdl, Button *, EMPTYARG ) aSentenceED.ChangeMarkedWord(aString, GetSelectedLang_Impl()); SpellContinue_Impl(); bModified = false; - aSentenceED.UndoActionEnd( SPELLUNDO_CHANGE_GROUP ); + aSentenceED.UndoActionEnd(); } if(!aChangePB.IsEnabled()) aIgnorePB.GrabFocus(); @@ -652,7 +656,7 @@ IMPL_LINK( SpellDialog, ChangeAllHdl, Button *, EMPTYARG ) aSentenceED.ChangeMarkedWord(aString, eLang); SpellContinue_Impl(); bModified = false; - aSentenceED.UndoActionEnd( SPELLUNDO_CHANGE_GROUP ); + aSentenceED.UndoActionEnd(); return 1; } // ----------------------------------------------------------------------- @@ -697,7 +701,7 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton ) SpellContinue_Impl(); bModified = false; - aSentenceED.UndoActionEnd( SPELLUNDO_CHANGE_GROUP ); + aSentenceED.UndoActionEnd(); return 1; } @@ -706,7 +710,7 @@ IMPL_LINK( SpellDialog, UndoHdl, Button*, EMPTYARG ) { aSentenceED.Undo(); if(!aSentenceED.GetUndoActionCount()) - aUndoPB.Enable(FALSE); + aUndoPB.Enable(sal_False); return 0; } @@ -718,14 +722,14 @@ IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction ) case SPELLUNDO_CHANGE_TEXTENGINE: { if(pAction->IsEnableChangePB()) - aChangePB.Enable(FALSE); + aChangePB.Enable(sal_False); if(pAction->IsEnableChangeAllPB()) - aChangeAllPB.Enable(FALSE); + aChangeAllPB.Enable(sal_False); } break; case SPELLUNDO_CHANGE_NEXTERROR: { - aSentenceED.MoveErrorMarkTo((USHORT)pAction->GetOldErrorStart(), (USHORT)pAction->GetOldErrorEnd(), false); + aSentenceED.MoveErrorMarkTo((sal_uInt16)pAction->GetOldErrorStart(), (sal_uInt16)pAction->GetOldErrorEnd(), false); if(pAction->IsErrorLanguageSelected()) { UpdateBoxes_Impl(); @@ -807,7 +811,7 @@ void SpellDialog::SetSelectedLang_Impl( LanguageType nLang ) LanguageType SpellDialog::GetSelectedLang_Impl() const { - INT16 nLang = aLanguageLB.GetSelectLanguage(); + sal_Int16 nLang = aLanguageLB.GetSelectLanguage(); return nLang; } @@ -905,7 +909,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) -----------------------------------------------------------------------*/ void SpellDialog::InitUserDicts() { - sal_uInt16 nLang = aLanguageLB.GetSelectLanguage(); + const LanguageType nLang = aLanguageLB.GetSelectLanguage(); const Reference< XDictionary > *pDic = 0; @@ -923,82 +927,89 @@ void SpellDialog::InitUserDicts() pImpl->aDics = xDicList->getDictionaries(); } - // Benutzerbuecher anzeigen + SvtLinguConfig aCfg; + const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); + + // list suitable dictionaries + bool bEnable = false; const sal_Int32 nSize = pImpl->aDics.getLength(); pDic = pImpl->aDics.getConstArray(); - sal_Int32 i; delete aAddToDictMB.GetPopupMenu(); PopupMenu* pMenu = new PopupMenu; - for (i = 0; i < nSize; ++i ) + pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS); + sal_uInt16 nItemId = 1; // menu items should be enumerated from 1 and not 0 + for (sal_Int32 i = 0; i < nSize; ++i) { - Reference< XDictionary > xDic( pDic[i], UNO_QUERY ); - if (!xDic.is() || SvxGetIgnoreAllList() == xDic) + uno::Reference< linguistic2::XDictionary > xDicTmp( pDic[i], uno::UNO_QUERY ); + if (!xDicTmp.is() || SvxGetIgnoreAllList() == xDicTmp) continue; - // add only active and not read-only dictionaries to list - // from which to choose from - Reference< frame::XStorable > xStor( xDic, UNO_QUERY ); - if ( xDic->isActive() && (!xStor.is() || !xStor->isReadonly()) ) + uno::Reference< frame::XStorable > xStor( xDicTmp, uno::UNO_QUERY ); + LanguageType nActLanguage = SvxLocaleToLanguage( xDicTmp->getLocale() ); + if( xDicTmp->isActive() + && xDicTmp->getDictionaryType() != linguistic2::DictionaryType_NEGATIVE + && (nLang == nActLanguage || LANGUAGE_NONE == nActLanguage ) + && (!xStor.is() || !xStor->isReadonly()) ) { - sal_Bool bNegativ = xDic->getDictionaryType() == DictionaryType_NEGATIVE; - pMenu->InsertItem( (USHORT)i + 1, ::GetDicInfoStr( xDic->getName(), - SvxLocaleToLanguage( xDic->getLocale() ), bNegativ ) ); - } - } - aAddToDictMB.SetPopupMenu(pMenu); - - aAddToDictMB.Disable(); + pMenu->InsertItem( nItemId, xDicTmp->getName() ); + bEnable = sal_True; - sal_uInt16 k; - for ( k = 0; k < pMenu->GetItemCount(); ++k ) - { - sal_uInt16 nId = pMenu->GetItemId(k) - 1; - sal_Bool bFound = sal_False; - - const sal_uInt16 nDicLang = SvxLocaleToLanguage( pDic[nId]->getLocale() ); - const sal_Bool bDicNegativ = - pDic[nId]->getDictionaryType() == DictionaryType_NEGATIVE; - // Stimmt die Sprache "uberein, dann enable - if ((nDicLang == nLang || nDicLang == LANGUAGE_NONE) && !bDicNegativ) - bFound = sal_True; + uno::Reference< lang::XServiceInfo > xSvcInfo( xDicTmp, uno::UNO_QUERY ); + if (xSvcInfo.is()) + { + OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage( + xSvcInfo->getImplementationName(), bHC) ); + if (aDictionaryImageUrl.getLength() > 0) + { + Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) ); + pMenu->SetItemImage( nItemId, aImage ); + } + } - if (bFound) - { - aAddToDictMB.Enable(); - break; + ++nItemId; } } + aAddToDictMB.SetPopupMenu(pMenu); + aAddToDictMB.Enable( bEnable ); } //----------------------------------------------------------------------- IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton ) { aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP ); - USHORT nItem = pButton->GetCurItemId(); //GetErrorText() returns the current error even if the text is already //manually changed - String sNewWord= aSentenceED.GetErrorText(); + const String aNewWord= aSentenceED.GetErrorText(); + + sal_uInt16 nItemId = pButton->GetCurItemId(); + PopupMenu *pMenu = pButton->GetPopupMenu(); + String aDicName ( pMenu->GetItemText( nItemId ) ); + + uno::Reference< linguistic2::XDictionary > xDic; + uno::Reference< linguistic2::XDictionaryList > xDicList( SvxGetDictionaryList() ); + if (xDicList.is()) + xDic = xDicList->getDictionaryByName( aDicName ); - Reference< XDictionary > xDic( pImpl->aDics.getConstArray()[ nItem - 1 ], UNO_QUERY ); sal_Int16 nAddRes = DIC_ERR_UNKNOWN; if (xDic.is()) { - String sTmpTxt( sNewWord ); - sal_Bool bNegEntry = xDic->getDictionaryType() == DictionaryType_NEGATIVE; - nAddRes = linguistic::AddEntryToDic( xDic, sTmpTxt, bNegEntry, - ::rtl::OUString(), LANGUAGE_NONE ); + nAddRes = linguistic::AddEntryToDic( xDic, aNewWord, sal_False, OUString(), LANGUAGE_NONE ); + // save modified user-dictionary if it is persistent + uno::Reference< frame::XStorable > xSavDic( xDic, uno::UNO_QUERY ); + if (xSavDic.is()) + xSavDic->store(); - if(nAddRes == DIC_ERR_NONE) + if (nAddRes == DIC_ERR_NONE) { SpellUndoAction_Impl* pAction = new SpellUndoAction_Impl( SPELLUNDO_CHANGE_ADD_TO_DICTIONARY, aDialogUndoLink); - pAction->SetDictionary(xDic); - pAction->SetAddedWord(sTmpTxt); - aSentenceED.AddUndoAction(pAction); + pAction->SetDictionary( xDic ); + pAction->SetAddedWord( aNewWord ); + aSentenceED.AddUndoAction( pAction ); } // failed because there is already an entry? - if (DIC_ERR_NONE != nAddRes && xDic->getEntry( sTmpTxt ).is()) + if (DIC_ERR_NONE != nAddRes && xDic->getEntry( aNewWord ).is()) nAddRes = DIC_ERR_NONE; } if (DIC_ERR_NONE != nAddRes) @@ -1006,12 +1017,10 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton ) SvxDicError( this, nAddRes ); return 0; // Nicht weitermachen } - // nach dem Aufnehmen ggf. '='-Zeichen entfernen - sNewWord.EraseAllChars( sal_Unicode( '=' ) ); // go on SpellContinue_Impl(); - aSentenceED.UndoActionEnd( SPELLUNDO_CHANGE_GROUP ); + aSentenceED.UndoActionEnd(); return 0; } @@ -1113,7 +1122,7 @@ void SpellDialog::InvalidateDialog() sal_Int16 i = 0; while(aDisableArr[i]) { - aDisableArr[i]->Enable(FALSE); + aDisableArr[i]->Enable(sal_False); i++; } SfxModelessDialog::Deactivate(); @@ -1178,7 +1187,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) sServiceName = xNamed->getName(); SpellErrorDescription aDesc( false, aStart->xAlternatives->getWord(), aStart->xAlternatives->getLocale(), aStart->xAlternatives->getAlternatives(), 0, sServiceName); - aSentenceED.SetAttrib( SpellErrorAttrib(aDesc), 0, (USHORT) nStartPosition, (USHORT) nEndPosition ); + aSentenceED.SetAttrib( SpellErrorAttrib(aDesc), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition ); } else if(aStart->bIsGrammarError ) { @@ -1192,11 +1201,11 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) &aStart->sDialogTitle, &aStart->aGrammarError.aFullComment, &aStart->aGrammarError.aRuleIdentifier ); - aSentenceED.SetAttrib( SpellErrorAttrib(aDesc), 0, (USHORT) nStartPosition, (USHORT) nEndPosition ); + aSentenceED.SetAttrib( SpellErrorAttrib(aDesc), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition ); } if(aStart->bIsField) - aSentenceED.SetAttrib( SpellBackgroundAttrib(COL_LIGHTGRAY), 0, (USHORT) nStartPosition, (USHORT) nEndPosition ); - aSentenceED.SetAttrib( SpellLanguageAttrib(aStart->eLanguage), 0, (USHORT) nStartPosition, (USHORT) nEndPosition ); + aSentenceED.SetAttrib( SpellBackgroundAttrib(COL_LIGHTGRAY), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition ); + aSentenceED.SetAttrib( SpellLanguageAttrib(aStart->eLanguage), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition ); nStartPosition = nEndPosition; } ++aStart; @@ -1205,7 +1214,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) if(!bHasReplaced) aSentenceED.ClearModifyFlag(); aSentenceED.ResetUndo(); - aUndoPB.Enable(FALSE); + aUndoPB.Enable(sal_False); bRet = nStartPosition > 0; } return bRet; @@ -1496,7 +1505,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) break; } //save the current paragraph - USHORT nCurrentLen = GetText().Len(); + sal_uInt16 nCurrentLen = GetText().Len(); if(nAction != ACTION_SELECTFIELD) pTextView->GetWindow()->KeyInput(rKeyEvt); else @@ -1517,8 +1526,8 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if(pErrorAttrLeft) { TextAttrib* pNewError = pErrorAttrLeft->GetAttr().Clone(); - USHORT nStart = pErrorAttrLeft->GetStart(); - USHORT nEnd = pErrorAttrLeft->GetEnd(); + sal_uInt16 nStart = pErrorAttrLeft->GetStart(); + sal_uInt16 nEnd = pErrorAttrLeft->GetEnd(); pTextEngine->RemoveAttrib( 0, *pErrorAttrLeft ); SetAttrib( *pNewError, 0, nStart, ++nEnd ); //only active errors move the mark @@ -1534,13 +1543,13 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) else if(pErrorAttr) { //determine the change - USHORT nAddedChars = GetText().Len() - nCurrentLen; + sal_uInt16 nAddedChars = GetText().Len() - nCurrentLen; TextAttrib* pNewError = pErrorAttr->GetAttr().Clone(); - USHORT nStart = pErrorAttr->GetStart(); - USHORT nEnd = pErrorAttr->GetEnd(); + sal_uInt16 nStart = pErrorAttr->GetStart(); + sal_uInt16 nEnd = pErrorAttr->GetEnd(); pTextEngine->RemoveAttrib( 0, *pErrorAttr ); - nStart = nStart - (USHORT)nAddedChars; + nStart = nStart - (sal_uInt16)nAddedChars; SetAttrib( *pNewError, 0, nStart - nAddedChars, nEnd ); //only if the error is active the mark is moved here if(bIsErrorActive) @@ -1553,8 +1562,8 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if(pBackAttrLeft) { TextAttrib* pNewBack = pBackAttrLeft->GetAttr().Clone(); - USHORT _nStart = pBackAttrLeft->GetStart(); - USHORT _nEnd = pBackAttrLeft->GetEnd(); + sal_uInt16 _nStart = pBackAttrLeft->GetStart(); + sal_uInt16 _nEnd = pBackAttrLeft->GetEnd(); pTextEngine->RemoveAttrib( 0, *pBackAttrLeft ); SetAttrib( *pNewBack, 0, _nStart, _nEnd - nAddedChars); delete pNewBack; @@ -1603,14 +1612,14 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError ) if (bIgnoreCurrentError) m_aIgnoreErrorsAt.insert( m_nErrorStart ); ExtTextEngine* pTextEngine = GetTextEngine(); - USHORT nTextLen = pTextEngine->GetTextLen(0); + sal_uInt16 nTextLen = pTextEngine->GetTextLen(0); if(m_nErrorEnd >= nTextLen - 1) return false; //if it's not already modified the modified flag has to be reset at the and of the marking bool bModified = IsModified(); bool bRet = false; - const USHORT nOldErrorStart = m_nErrorStart; - const USHORT nOldErrorEnd = m_nErrorEnd; + const sal_uInt16 nOldErrorStart = m_nErrorStart; + const sal_uInt16 nOldErrorEnd = m_nErrorEnd; //create a cursor behind the end of the last error //- or at 0 at the start of the sentence @@ -1646,7 +1655,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError ) m_nErrorEnd = pNextError->GetEnd(); ChangeMarkedWord(xEntry->getReplacementText(), SvxLocaleToLanguage( pSpellErrorDescription->aLocale )); - aCursor.GetIndex() = aCursor.GetIndex() + (USHORT)(xEntry->getReplacementText().getLength()); + aCursor.GetIndex() = aCursor.GetIndex() + (sal_uInt16)(xEntry->getReplacementText().getLength()); } else break; @@ -1683,11 +1692,11 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError ) } //----------------------------------------------------------------------- -void SentenceEditWindow_Impl::MoveErrorMarkTo(USHORT nStart, USHORT nEnd, bool bGrammarError) +void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_uInt16 nStart, sal_uInt16 nEnd, bool bGrammarError) { TextEngine* pTextEngine = GetTextEngine(); - pTextEngine->RemoveAttribs( 0, (USHORT)TEXTATTR_FONTCOLOR, TRUE ); - pTextEngine->RemoveAttribs( 0, (USHORT)TEXTATTR_FONTWEIGHT, TRUE ); + pTextEngine->RemoveAttribs( 0, (sal_uInt16)TEXTATTR_FONTCOLOR, sal_True ); + pTextEngine->RemoveAttribs( 0, (sal_uInt16)TEXTATTR_FONTWEIGHT, sal_True ); pTextEngine->SetAttrib( TextAttribFontWeight(WEIGHT_BOLD), 0, nStart, nEnd ); pTextEngine->SetAttrib( TextAttribFontColor(bGrammarError ? COL_LIGHTBLUE : COL_LIGHTRED), 0, nStart, nEnd ); m_nErrorStart = nStart; @@ -1702,7 +1711,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT TextSelection aSel(TextPaM(0, m_nErrorStart), TextPaM(0, m_nErrorEnd)); //Remove spell errror attribute ExtTextEngine* pTextEngine = GetTextEngine(); - pTextEngine->UndoActionStart( TEXTUNDO_INSERT ); + pTextEngine->UndoActionStart(); const TextCharAttrib* pErrorAttrib = pTextEngine->FindCharAttrib( TextPaM(0, m_nErrorStart), TEXTATTR_SPELL_ERROR ); DBG_ASSERT(pErrorAttrib, "no error attribute found"); const SpellErrorDescription* pSpellErrorDescription = 0; @@ -1722,30 +1731,30 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT const TextCharAttrib* pLangAttrib = pTextEngine->FindCharAttrib( TextPaM(0, m_nErrorEnd), TEXTATTR_SPELL_LANGUAGE ); - USHORT nTextLen = pTextEngine->GetTextLen( 0 ); + sal_uInt16 nTextLen = pTextEngine->GetTextLen( 0 ); if(pLangAttrib && !pLangAttrib->GetStart() && pLangAttrib->GetEnd() == nTextLen) { SpellLanguageAttrib aNewLangAttrib( static_cast<const SpellLanguageAttrib&>(pLangAttrib->GetAttr()).GetLanguage()); pTextEngine->RemoveAttrib(0, *pLangAttrib); - pTextEngine->SetAttrib( aNewLangAttrib, 0, (USHORT)(m_nErrorEnd + nDiffLen) , nTextLen ); + pTextEngine->SetAttrib( aNewLangAttrib, 0, (sal_uInt16)(m_nErrorEnd + nDiffLen) , nTextLen ); } } // undo expanded attributes! if( pBackAttrib && pBackAttrib->GetStart() < m_nErrorStart && pBackAttrib->GetEnd() == m_nErrorEnd + nDiffLen) { TextAttrib* pNewBackground = pBackAttrib->GetAttr().Clone(); - USHORT nStart = pBackAttrib->GetStart(); + sal_uInt16 nStart = pBackAttrib->GetStart(); pTextEngine->RemoveAttrib(0, *pBackAttrib); pTextEngine->SetAttrib(*pNewBackground, 0, nStart, m_nErrorStart); delete pNewBackground; } - pTextEngine->SetModified(TRUE); + pTextEngine->SetModified(sal_True); //adjust end position long nEndTemp = m_nErrorEnd; nEndTemp += nDiffLen; - m_nErrorEnd = (USHORT)nEndTemp; + m_nErrorEnd = (sal_uInt16)nEndTemp; SpellUndoAction_Impl* pAction = new SpellUndoAction_Impl( SPELLUNDO_MOVE_ERROREND, GetSpellDialog()->aDialogUndoLink); @@ -1754,7 +1763,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT if(pSpellErrorDescription) SetAttrib( SpellErrorAttrib(*pSpellErrorDescription), 0, m_nErrorStart, m_nErrorEnd ); SetAttrib( SpellLanguageAttrib(eLanguage), 0, m_nErrorStart, m_nErrorEnd ); - pTextEngine->UndoActionEnd( TEXTUNDO_INSERT ); + pTextEngine->UndoActionEnd(); } //------------------------------------------------- @@ -1811,7 +1820,7 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA } //----------------------------------------------------------------------- -void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd ) +void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd ) { GetTextEngine()->SetAttrib(rAttr, nPara, nStart, nEnd); } @@ -1826,10 +1835,10 @@ void SentenceEditWindow_Impl::SetText( const String& rStr ) //----------------------------------------------------------------------- struct LanguagePosition_Impl { - USHORT nPosition; + sal_uInt16 nPosition; LanguageType eLanguage; - LanguagePosition_Impl(USHORT nPos, LanguageType eLang) : + LanguagePosition_Impl(sal_uInt16 nPos, LanguageType eLang) : nPosition(nPos), eLanguage(eLang) {} @@ -1837,7 +1846,7 @@ struct LanguagePosition_Impl typedef std::vector<LanguagePosition_Impl> LanguagePositions_Impl; void lcl_InsertBreakPosition_Impl( - LanguagePositions_Impl& rBreakPositions, USHORT nInsert, LanguageType eLanguage) + LanguagePositions_Impl& rBreakPositions, sal_uInt16 nInsert, LanguageType eLanguage) { LanguagePositions_Impl::iterator aStart = rBreakPositions.begin(); while(aStart != rBreakPositions.end()) @@ -1868,7 +1877,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore { svx::SpellPortions aRet; ExtTextEngine* pTextEngine = GetTextEngine(); - const USHORT nTextLen = pTextEngine->GetTextLen(0); + const sal_uInt16 nTextLen = pTextEngine->GetTextLen(0); if(nTextLen) { TextPaM aCursor(0, 0); @@ -1914,7 +1923,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore LanguagePositions_Impl::iterator aStart = aBreakPositions.begin(); //start should always be Null eLang = aStart->eLanguage; - USHORT nStart = aStart->nPosition; + sal_uInt16 nStart = aStart->nPosition; DBG_ASSERT(!nStart, "invalid start position - language attribute missing?"); ++aStart; @@ -1939,11 +1948,11 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore // quick partly fix of #i71318. Correct fix needs to patch the TextEngine itself... // this one will only prevent text from disappearing. It may to not have the // correct language and will probably not spell checked... - ULONG nPara = pTextEngine->GetParagraphCount(); + sal_uLong nPara = pTextEngine->GetParagraphCount(); if (nPara > 1) { String aLeftOverText; - for (ULONG i = 1; i < nPara; ++i) + for (sal_uLong i = 1; i < nPara; ++i) { aLeftOverText.AppendAscii( "\x0a" ); // the manual line break... aLeftOverText += pTextEngine->GetText(i); @@ -1967,12 +1976,12 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore //----------------------------------------------------------------------- void SentenceEditWindow_Impl::Undo() { - SfxUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); + ::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); DBG_ASSERT(GetUndoActionCount(), "no undo actions available" ); if(!GetUndoActionCount()) return; bool bSaveUndoEdit = IsUndoEditMode(); - USHORT nId; + sal_uInt16 nId; //if the undo edit mode is active then undo all changes until the UNDO_EDIT_MODE action has been found do { @@ -1991,38 +2000,38 @@ void SentenceEditWindow_Impl::ResetUndo() } //----------------------------------------------------------------------- -void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg ) +void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg ) { - SfxUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); + ::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); rUndoMgr.AddUndoAction(pAction, bTryMerg); GetSpellDialog()->aUndoPB.Enable(); } //----------------------------------------------------------------------- -USHORT SentenceEditWindow_Impl::GetUndoActionCount() +sal_uInt16 SentenceEditWindow_Impl::GetUndoActionCount() { return GetTextEngine()->GetUndoManager().GetUndoActionCount(); } //----------------------------------------------------------------------- -void SentenceEditWindow_Impl::UndoActionStart( USHORT nId ) +void SentenceEditWindow_Impl::UndoActionStart( sal_uInt16 nId ) { GetTextEngine()->UndoActionStart(nId); } //----------------------------------------------------------------------- -void SentenceEditWindow_Impl::UndoActionEnd( USHORT nId ) +void SentenceEditWindow_Impl::UndoActionEnd() { - GetTextEngine()->UndoActionEnd(nId); + GetTextEngine()->UndoActionEnd(); } //----------------------------------------------------------------------- void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset) { if(nOffset > 0) - m_nErrorEnd = m_nErrorEnd - (USHORT)nOffset; + m_nErrorEnd = m_nErrorEnd - (sal_uInt16)nOffset; else - m_nErrorEnd = m_nErrorEnd -(USHORT)- nOffset; + m_nErrorEnd = m_nErrorEnd -(sal_uInt16)- nOffset; } //----------------------------------------------------------------------- @@ -2056,8 +2065,8 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) //remove error marks TextEngine* pTextEngine = GetTextEngine(); - pTextEngine->RemoveAttribs( 0, (USHORT)TEXTATTR_FONTCOLOR, TRUE ); - pTextEngine->RemoveAttribs( 0, (USHORT)TEXTATTR_FONTWEIGHT, TRUE ); + pTextEngine->RemoveAttribs( 0, (sal_uInt16)TEXTATTR_FONTCOLOR, sal_True ); + pTextEngine->RemoveAttribs( 0, (sal_uInt16)TEXTATTR_FONTWEIGHT, sal_True ); //put the appropriate action on the Undo-stack SpellUndoAction_Impl* pAction = new SpellUndoAction_Impl( diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src index cc14ba6a9f4b..663b156b467a 100644 --- a/cui/source/dialogs/SpellDialog.src +++ b/cui/source/dialogs/SpellDialog.src @@ -61,6 +61,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK }; ListBox LB_LANGUAGE { + HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE"; Pos = MAP_APPFONT( 110, 6 ); Size = MAP_APPFONT( 93, 55 ); Border = TRUE; @@ -76,6 +77,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK MultiLineEdit ED_NEWWORD { + HelpID = "cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD"; Pos = MAP_APPFONT( 6, 37 ); Size = MAP_APPFONT( 197, 48 ); Border = TRUE; @@ -91,6 +93,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK }; ListBox LB_SUGGESTION { + HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION"; Pos = MAP_APPFONT( 6, 99 ); Size = MAP_APPFONT( 197, 48 ); Border = TRUE; @@ -98,6 +101,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK CheckBox CB_CHECK_GRAMMAR { + HelpID = "cui:CheckBox:RID_SVXDLG_SPELLCHECK:CB_CHECK_GRAMMAR"; Pos = MAP_APPFONT( 6, 153 ); Size = MAP_APPFONT( 100, 10 ); Text [ en-US ] = "Check ~grammar" ; @@ -106,6 +110,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK PushButton PB_IGNORE { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORE"; Pos = MAP_APPFONT( 209, 37 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "~Ignore Once" ; @@ -113,12 +118,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK PushButton PB_IGNOREALL { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNOREALL"; Pos = MAP_APPFONT( 209, 54 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "I~gnore All" ; }; PushButton PB_IGNORERULE { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORERULE"; Pos = MAP_APPFONT( 209, 54 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "I~gnore Rule" ; @@ -126,6 +133,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK }; MenuButton MB_ADDTODICT { + HelpID = "cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT"; Pos = MAP_APPFONT( 209, 71 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "~Add" ; @@ -133,6 +141,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK PushButton PB_CHANGE { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGE"; Pos = MAP_APPFONT( 209, 99 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "~Change" ; @@ -141,12 +150,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK PushButton PB_CHANGEALL { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGEALL"; Pos = MAP_APPFONT( 209, 117 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "Change A~ll" ; }; PushButton PB_EXPLAIN { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_EXPLAIN"; Pos = MAP_APPFONT( 209, 117 ); Size = MAP_APPFONT( 55, 14 ); Hide = TRUE; @@ -154,6 +165,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK }; PushButton PB_AUTOCORR { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR"; Pos = MAP_APPFONT( 209, 134 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "AutoCor~rect" ; @@ -172,12 +184,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK }; PushButton PB_OPTIONS { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS"; Pos = MAP_APPFONT( 87, 170 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "O~ptions..." ; }; PushButton PB_UNDO { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO"; Pos = MAP_APPFONT( 148, 170 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "~Undo" ; @@ -185,6 +199,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK PushButton PB_CLOSE { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CLOSE"; Pos = MAP_APPFONT ( 209 , 170 ) ; Size = MAP_APPFONT ( 55 , 14 ) ; TabStop = TRUE ; diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx new file mode 100644 index 000000000000..b530005f32b8 --- /dev/null +++ b/cui/source/dialogs/about.cxx @@ -0,0 +1,424 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_cui.hxx" + +// include --------------------------------------------------------------- + +#include <vcl/svapp.hxx> +#include <vcl/msgbox.hxx> +#include <tools/stream.hxx> +#include <tools/urlobj.hxx> +#include <rtl/bootstrap.hxx> +#include <unotools/configmgr.hxx> +#include <unotools/bootstrap.hxx> +#include <com/sun/star/uno/Any.h> +#include <vcl/graph.hxx> +#include <svtools/filter.hxx> +#include <sfx2/sfxuno.hxx> +#include "about.hxx" +#include <sfx2/sfxdefs.hxx> +#include <sfx2/app.hxx> +#include <sfx2/sfxcommands.h> +#include "about.hrc" +#include <dialmgr.hxx> +#include <svtools/svtools.hrc> + +// defines --------------------------------------------------------------- + +#define SCROLL_OFFSET 1 +#define SPACE_OFFSET 5 +#define SCROLL_TIMER 30 + +#define WELCOME_URL DEFINE_CONST_UNICODE( "http://www.openoffice.org/welcome/credits.html" ) + +// class AboutDialog ----------------------------------------------------- +static void layoutText( FixedInfo &rText, long &nY, long nTextWidth, Size a6Size ) +{ + Point aTextPos = rText.GetPosPixel(); + aTextPos.X() = a6Size.Width() * 2; + aTextPos.Y() = nY; + rText.SetPosPixel( aTextPos ); + + Size aTxtSiz = rText.GetSizePixel(); + aTxtSiz.Width() = nTextWidth; + Size aCalcSize = rText.CalcMinimumSize( nTextWidth ); + aTxtSiz.Height() = aCalcSize.Height(); + rText.SetSizePixel( aTxtSiz ); + + nY += aTxtSiz.Height(); +} + +String InitDevVersionStr() +{ + const String sCWSSchema( String::CreateFromAscii( "[CWS:" ) ); + rtl::OUString sDefault; + String sBuildId( utl::Bootstrap::getBuildIdData( sDefault ) ); + OSL_ENSURE( sBuildId.Len() > 0, "No BUILDID in bootstrap file" ); + if ( sBuildId.Len() > 0 && sBuildId.Search( sCWSSchema ) == STRING_NOTFOUND ) + { + // no cws part in brand buildid -> try basis buildid + rtl::OUString sBasisBuildId( DEFINE_CONST_OUSTRING( + "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) ); + rtl::Bootstrap::expandMacros( sBasisBuildId ); + sal_Int32 nIndex = sBasisBuildId.indexOf( sCWSSchema ); + if ( nIndex != -1 ) + sBuildId += String( sBasisBuildId.copy( nIndex ) ); + } + + String sProductSource( utl::Bootstrap::getProductSource( sDefault ) ); + OSL_ENSURE( sProductSource.Len() > 0, "No ProductSource in bootstrap file" ); + + // the product source is something like "DEV300", where the + // build id is something like "300m12(Build:12345)". For better readability, + // strip the duplicate UPD ("300"). + if ( sProductSource.Len() ) + { + bool bMatchingUPD = + ( sProductSource.Len() >= 3 ) + && ( sBuildId.Len() >= 3 ) + && ( sProductSource.Copy( sProductSource.Len() - 3 ) == sBuildId.Copy( 0, 3 ) ); + OSL_ENSURE( bMatchingUPD, "BUILDID and ProductSource do not match in their UPD" ); + if ( bMatchingUPD ) + sProductSource = sProductSource.Copy( 0, sProductSource.Len() - 3 ); + + // prepend the product source + sBuildId.Insert( sProductSource, 0 ); + } + + // --> PB 2008-10-30 #i94693# + // if the build ids of the basis or ure layer are different from the build id + // of the brand layer then show them + rtl::OUString aBasisProductBuildId( DEFINE_CONST_OUSTRING( + "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" ) ); + rtl::Bootstrap::expandMacros( aBasisProductBuildId ); + rtl::OUString aUREProductBuildId( DEFINE_CONST_OUSTRING( + "${$URE_BIN_DIR/" SAL_CONFIGFILE("version") ":ProductBuildid}" ) ); + rtl::Bootstrap::expandMacros( aUREProductBuildId ); + if ( sBuildId.Search( String( aBasisProductBuildId ) ) == STRING_NOTFOUND + || sBuildId.Search( String( aUREProductBuildId ) ) == STRING_NOTFOUND ) + { + String sTemp( '-' ); + sTemp += String( aBasisProductBuildId ); + sTemp += '-'; + sTemp += String( aUREProductBuildId ); + sBuildId.Insert( sTemp, sBuildId.Search( ')' ) ); + } + // <-- + + // the build id format is "milestone(build)[cwsname]". For readability, it would + // be nice to have some more spaces in there. + xub_StrLen nPos = 0; + if ( ( nPos = sBuildId.Search( sal_Unicode( '(' ) ) ) != STRING_NOTFOUND ) + sBuildId.Insert( sal_Unicode( ' ' ), nPos ); + if ( ( nPos = sBuildId.Search( sal_Unicode( '[' ) ) ) != STRING_NOTFOUND ) + sBuildId.Insert( sal_Unicode( ' ' ), nPos ); + return sBuildId; +} + +AboutDialog::AboutDialog( Window* pParent, const ResId& rId ) : + + SfxModalDialog ( pParent, rId ), + + aOKButton ( this, ResId( ABOUT_BTN_OK, *rId.GetResMgr() ) ), + aVersionText ( this, ResId( ABOUT_FTXT_VERSION, *rId.GetResMgr() ) ), + aCopyrightText ( this, ResId( ABOUT_FTXT_COPYRIGHT, *rId.GetResMgr() ) ), + aBuildData ( this ), + pDeveloperAry(0), + aAccelStr ( ResId( ABOUT_STR_ACCEL, *rId.GetResMgr() ) ), + aTimer (), + nOff ( 0 ), + m_nDeltaWidth ( 0 ), + m_nPendingScrolls( 0 ), + bNormal ( sal_True ) +{ + aDevVersionStr = InitDevVersionStr(); + + ::com::sun::star::lang::Locale aLocale; + ResMgr* pResMgr = ResMgr::SearchCreateResMgr( "about", aLocale ); + if ( pResMgr ) + { + aCopyrightTextStr = String( ResId( ABOUT_STR_COPYRIGHT, *pResMgr ) ); + pDeveloperAry = new ResStringArray( ResId( ABOUT_STR_DEVELOPER_ARY, *pResMgr ) ); + delete pResMgr; + } + + rtl::OUString sProduct; + utl::ConfigManager::GetDirectConfigProperty(utl::ConfigManager::PRODUCTNAME) >>= sProduct; + + // load image from module path + aAppLogo = SfxApplication::GetApplicationLogo(); + + // Transparenter Font + Font aFont = GetFont(); + aFont.SetTransparent( sal_True ); + SetFont( aFont ); + + // if necessary more info + String sVersion = aVersionText.GetText(); + sVersion.SearchAndReplaceAscii( "$(VER)", Application::GetDisplayName() ); + sVersion += '\n'; + sVersion += aDevVersionStr; + aVersionText.SetText( sVersion ); + + // Initialisierung fuer Aufruf Entwickler + if ( aAccelStr.Len() && ByteString(U2S(aAccelStr)).IsAlphaAscii() ) + { + Accelerator *pAccel = 0, *pPrevAccel = 0, *pFirstAccel = 0; + aAccelStr.ToUpperAscii(); + + for ( sal_uInt16 i = 0; i < aAccelStr.Len(); ++i ) + { + pPrevAccel = pAccel; + pAccel = new Accelerator; + aAccelList.Insert( pAccel, LIST_APPEND ); + sal_uInt16 nKey = aAccelStr.GetChar(i) - 'A' + KEY_A; + pAccel->InsertItem( 1, KeyCode( nKey, KEY_MOD1 ) ); + if ( i > 0 ) + pPrevAccel->SetAccel( 1, pAccel ); + if ( i == 0 ) + pFirstAccel = pAccel; + } + pAccel->SetSelectHdl( LINK( this, AboutDialog, AccelSelectHdl ) ); + GetpApp()->InsertAccel( pFirstAccel ); + } + + // set for background and text the correct system color + const StyleSettings& rSettings = GetSettings().GetStyleSettings(); + Color aWhiteCol( rSettings.GetWindowColor() ); + Wallpaper aWall( aWhiteCol ); + SetBackground( aWall ); + Font aNewFont( aCopyrightText.GetFont() ); + aNewFont.SetTransparent( sal_True ); + + aVersionText.SetFont( aNewFont ); + aCopyrightText.SetFont( aNewFont ); + + aVersionText.SetBackground(); + aCopyrightText.SetBackground(); + + Color aTextColor( rSettings.GetWindowTextColor() ); + aVersionText.SetControlForeground( aTextColor ); + aCopyrightText.SetControlForeground( aTextColor ); + aBuildData.SetBackground( aWall ); + + Font aSmallFont = rSettings.GetInfoFont(); + Size aSmaller = aNewFont.GetSize(); + aSmaller.Width() = (long) (aSmaller.Width() * 0.75); + aSmaller.Height() = (long) (aSmaller.Height() * 0.75); + aNewFont.SetSize( aSmaller ); + aBuildData.SetFont( aNewFont ); + aBuildData.SetBackground( aWall ); +#ifdef BUILD_VER_STRING + String aBuildString( DEFINE_CONST_UNICODE( BUILD_VER_STRING ) ); +#else + String aBuildString; +#endif + aBuildData.SetText( aBuildString ); + aBuildData.Show(); + + // determine size and position of the dialog & elements + Size aAppLogoSiz = aAppLogo.GetSizePixel(); + Size aOutSiz = GetOutputSizePixel(); + aOutSiz.Width() = aAppLogoSiz.Width(); + + Size a6Size = aVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); + long nY = aAppLogoSiz.Height() + ( a6Size.Height() * 2 ); + long nDlgMargin = a6Size.Width() * 4 ; + long nCtrlMargin = a6Size.Height() * 2; + long nTextWidth = aOutSiz.Width() - nDlgMargin; + + aCopyrightText.SetText( aCopyrightTextStr ); + + layoutText( aVersionText, nY, nTextWidth, a6Size ); + nY += nCtrlMargin; + + // OK-Button-Position (at the bottom and centered) + Size aOKSiz = aOKButton.GetSizePixel(); + Point aOKPnt = aOKButton.GetPosPixel(); + + // Multiline edit with Copyright-Text + Point aCopyPnt = aCopyrightText.GetPosPixel(); + Size aCopySize = aCopyrightText.GetSizePixel(); + aCopySize.Width() = nTextWidth; + aCopySize.Height() = aOutSiz.Height() - nY - ( aOKSiz.Height() * 2 ) - nCtrlMargin; + + aCopyPnt.X() = ( aOutSiz.Width() - aCopySize.Width() ) / 2; + aCopyPnt.Y() = nY; + aCopyrightText.SetPosSizePixel( aCopyPnt, aCopySize ); + + nY += aCopySize.Height() + nCtrlMargin; + aOKPnt.X() = ( aOutSiz.Width() - aOKSiz.Width() ) / 2; + aOKPnt.Y() = nY; + aOKButton.SetPosPixel( aOKPnt ); + + // Change the width of the dialog + SetOutputSizePixel( aOutSiz ); + + FreeResource(); + + SetHelpId( CMD_SID_ABOUT ); +} + +// ----------------------------------------------------------------------- + +AboutDialog::~AboutDialog() +{ + // L"oschen des Entwickleraufrufs + delete pDeveloperAry; + if ( aAccelList.Count() ) + { + GetpApp()->RemoveAccel( aAccelList.First() ); + Accelerator* pAccel = aAccelList.Last(); + + while ( pAccel ) + { + delete pAccel; + pAccel = aAccelList.Prev(); + } + } +} + +// ----------------------------------------------------------------------- + +IMPL_LINK( AboutDialog, TimerHdl, Timer *, pTimer ) +{ + (void)pTimer; //unused + ++m_nPendingScrolls; + Invalidate( INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN ); + return 0; +} + +// ----------------------------------------------------------------------- + +IMPL_LINK( AboutDialog, AccelSelectHdl, Accelerator *, pAccelerator ) +{ +#ifdef YURI_DARIO + aCopyrightText.SetHelpText( DEFINE_CONST_UNICODE("Conoscere qualcuno ovunque egli sia, con cui comprendersi nonostante le distanze\n" + "e le differenze, puo' trasformare la terra in un giardino. baci Valeria") ); +#endif + + (void)pAccelerator; //unused + // init Timer + aTimer.SetTimeoutHdl( LINK( this, AboutDialog, TimerHdl ) ); + + // init scroll mode + nOff = GetOutputSizePixel().Height(); + MapMode aMapMode( MAP_PIXEL ); + SetMapMode( aMapMode ); + bNormal = sal_False; + + // start scroll Timer + aTimer.SetTimeout( SCROLL_TIMER ); + aTimer.Start(); + return 0; +} + +// ----------------------------------------------------------------------- + +sal_Bool AboutDialog::Close() +{ + // stop Timer and finish the dialog + aTimer.Stop(); + EndDialog( RET_OK ); + return( sal_False ); +} + +// ----------------------------------------------------------------------- + +void AboutDialog::Paint( const Rectangle& rRect ) +{ + SetClipRegion( rRect ); + + if ( bNormal ) // not in scroll mode + { + Point aPos( m_nDeltaWidth / 2, 0 ); + DrawImage( aPos, aAppLogo ); + return; + } + + // scroll the content + const int nDeltaY = -SCROLL_OFFSET * m_nPendingScrolls; + if( !nDeltaY ) + return; + nOff += nDeltaY; + Scroll( 0, nDeltaY, SCROLL_NOERASE ); + m_nPendingScrolls = 0; + + // draw the credits text + const Font aOrigFont = GetFont(); + const int nFullWidth = GetOutputSizePixel().Width(); + + int nY = nOff; + const int nDevCnt = static_cast<int>( pDeveloperAry->Count() ); + for( int i = 0; i < nDevCnt; ++i ) + { + if( nY >= rRect.Bottom() ) + break; + + int nPos2 = nY + GetTextHeight() + 3; + if( nPos2 >= rRect.Top() + nDeltaY ) + { + const String aStr = pDeveloperAry->GetString(i); + const long nVal = pDeveloperAry->GetValue(i); + + if ( nVal ) + { + // emphasize the headers + Font aFont = aOrigFont; + aFont.SetWeight( (FontWeight)nVal ); + SetFont( aFont ); + nPos2 = nY + GetTextHeight() + 3; + } + + // clear text background + Rectangle aEraseRect( Point(0,nY), Size( nFullWidth, nPos2-nY)); + Erase( aEraseRect ); + + // draw centered text + const long nTextWidth = GetTextWidth( aStr ); + long nX = (nFullWidth - 5 - nTextWidth) / 2; + if( nX < 0 ) + nX = SPACE_OFFSET; + const Point aPnt( nX, nY ); + DrawText( aPnt, aStr ); + + // restore the font if needed + if( nVal ) + SetFont( aOrigFont ); + } + nY = nPos2; + } + + // close dialog if the whole text has been scrolled + if ( nY <= 0 ) + { + bNormal = sal_True; + Close(); + } +} diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc new file mode 100644 index 000000000000..9271e6c53faf --- /dev/null +++ b/cui/source/dialogs/about.hrc @@ -0,0 +1,34 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include <sfx2/sfx.hrc> + +#define ABOUT_BTN_OK 1 +#define ABOUT_FTXT_VERSION 1 +#define ABOUT_STR_ACCEL 3 +#define ABOUT_FTXT_COPYRIGHT 4 + diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src new file mode 100644 index 000000000000..18806c6ee76c --- /dev/null +++ b/cui/source/dialogs/about.src @@ -0,0 +1,67 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "about.hrc" + +ModalDialog RID_DEFAULTABOUT +{ + HelpID = "cui:ModalDialog:RID_DEFAULTABOUT"; + OutputSize = TRUE ; + Size = MAP_APPFONT ( 245 , 260 ) ; + Moveable = TRUE ; + SVLook = TRUE ; + Text [ x-comment ] = "PB: ; PB: only %PRODUCTNAME"; + Text [ en-US ] = "About %PRODUCTNAME" ; + OKButton ABOUT_BTN_OK + { + DefButton = TRUE ; + Pos = MAP_APPFONT ( 174 , 6 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + FixedText ABOUT_FTXT_VERSION + { + Pos = MAP_APPFONT ( 54 , 6 ) ; + Size = MAP_APPFONT ( 118 , 16 ) ; + WordBreak = TRUE ; + Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ; + }; + MultiLineEdit ABOUT_FTXT_COPYRIGHT + { + HelpID = "cui:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT"; + Border = TRUE ; + Pos = MAP_APPFONT ( 54 , 25 ) ; + Size = MAP_APPFONT ( 168 , 51 ) ; + IgnoreTab = TRUE ; + ReadOnly = TRUE ; + AutoVScroll = TRUE ; + }; + String ABOUT_STR_ACCEL + { + Text = "SDT" ; + }; +}; + diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src index 8dc5b3a3f857..8d7f655b179f 100644 --- a/cui/source/dialogs/charmap.src +++ b/cui/source/dialogs/charmap.src @@ -35,7 +35,7 @@ // RID_SVXDLG_CHARMAP ---------------------------------------------------- ModalDialog RID_SVXDLG_CHARMAP { - HelpId = SID_CHARMAP ; + HelpId = CMD_SID_CHARMAP ; SvLook = TRUE ; Text [ en-US ] = "Special Characters"; Size = MAP_APPFONT ( 297 , 153 ) ; @@ -60,6 +60,7 @@ ModalDialog RID_SVXDLG_CHARMAP }; ListBox LB_FONT { + HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT"; Pos = MAP_APPFONT ( 42 , 6 ) ; Size = MAP_APPFONT ( 70 , 58 ) ; Sort = TRUE ; @@ -74,6 +75,7 @@ ModalDialog RID_SVXDLG_CHARMAP }; ListBox LB_SUBSET { + HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET"; Pos = MAP_APPFONT ( 161 , 6 ) ; Size = MAP_APPFONT ( 63 , 68 ) ; Sort = FALSE ; @@ -128,6 +130,7 @@ ModalDialog RID_SVXDLG_CHARMAP }; PushButton BTN_DELETE { + HelpID = "cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE"; Pos = MAP_APPFONT ( 242 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete"; diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index 99c7079a53eb..4f91a0ebd3a1 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -104,6 +104,7 @@ SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent ) ,aAuditBox ( this, CUI_RES( GB_AUDIT ) ) { FreeResource(); + aAktWord.SetAccessibleName(aWordText.GetText()); SetPosSizePixel( Point( 0, 0 ), _pParent->GetOutputSizePixel() ); Show(); } @@ -178,52 +179,6 @@ void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow, // (FirstWindow, LastWindow) was no valid control group } -// ----------------------------------------------------------------------- -String SvxCommonLinguisticControl::GetNewEditWord() -{ - return aNewWordED.GetText(); -} - -// ----------------------------------------------------------------------- -void SvxCommonLinguisticControl::SetNewEditWord( const String& _rNew ) -{ - aNewWordED.SetText( _rNew ); -} - -//----------------------------------------------------------------------------- -void SvxCommonLinguisticControl::UpdateIgnoreHelp( ) -{ - - String aInfoStr( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); - aInfoStr.Append( GetCurrentText() ); - - String aString = GetNonMnemonicString( aIgnoreAllBtn.GetText() ); - aString.Append( aInfoStr ); - aIgnoreAllBtn.SetQuickHelpText( aString ); - - aString = GetNonMnemonicString( aIgnoreBtn.GetText() ); - aString.Append( aInfoStr ); - aIgnoreBtn.SetQuickHelpText( aString ); -} - -//----------------------------------------------------------------------------- -void SvxCommonLinguisticControl::UpdateChangesHelp( const String& _rNewText ) -{ - String aInfoStr( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); - aInfoStr.Append( GetCurrentText() ); - aInfoStr.Append( String( RTL_CONSTASCII_USTRINGPARAM( " -> " ) ) ); - aInfoStr.Append( _rNewText ); - // TODO: shouldn't this be part of the resources, for proper localization? - - String aString = GetNonMnemonicString( aChangeAllBtn.GetText() ); - aString.Append( aInfoStr ); - aChangeAllBtn.SetQuickHelpText( aString ); - - aString = GetNonMnemonicString( aChangeBtn.GetText() ); - aString.Append( aInfoStr ); - aChangeBtn.SetQuickHelpText( aString ); -} - //----------------------------------------------------------------------------- void SvxCommonLinguisticControl::Paint( const Rectangle& rRect ) { diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 80edc1b73475..37e27b89658b 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -151,18 +151,6 @@ public: // returns the location (upper-left corner) of the group of action buttons inline Point GetActionButtonsLocation( ) const { return aIgnoreBtn.GetPosPixel(); } - - // updates the help texts for the "change" and "change all" buttons according to the currently - // entered texts - void UpdateChangesHelp( const String& _rNewText ); - inline void UpdateChangesHelp( ) { UpdateChangesHelp( GetWordInputControl().GetText() ); } - - // updates the help texts for the "ignore" and "always ignore" buttons according to the currently - // entered texts - void UpdateIgnoreHelp( ); - - String GetNewEditWord(); - void SetNewEditWord( const String& _rNew ); }; diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 9ec9c84253b7..777851cce643 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -58,26 +58,26 @@ // class SvxCharacterMap ================================================= -SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne, const SfxItemSet* pSet ) : +SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool bOne, const SfxItemSet* pSet ) : SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_CHARMAP ) ), mpCharMapData( 0 ) { - SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, FALSE ); + SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, sal_False ); if ( pItem ) bOne = pItem->GetValue(); mpCharMapData = new SvxCharMapData( this, bOne, &CUI_MGR() ); - SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, FALSE ); + SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, sal_False ); if ( pCharItem ) SetChar( pCharItem->GetValue() ); - SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, FALSE ); + SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, sal_False ); if ( pDisableItem && pDisableItem->GetValue() ) DisableFontSelection(); - SFX_ITEMSET_ARG( pSet, pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE ); - SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, FALSE ); + SFX_ITEMSET_ARG( pSet, pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); + SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, sal_False ); if ( pFontItem ) { Font aFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), GetCharFont().GetSize() ); @@ -169,7 +169,7 @@ short SvxCharacterMap::Execute() // class SvxShowText ===================================================== -SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, BOOL bCenter ) +SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, sal_Bool bCenter ) : Control( pParent, rResId ), mbCenter( bCenter) {} @@ -236,7 +236,7 @@ void SvxShowText::SetFont( const Font& rFont ) aFont.SetWeight( WEIGHT_NORMAL ); aFont.SetAlign( ALIGN_TOP ); aFont.SetSize( PixelToLogic( Size( 0, nWinHeight/2 ) ) ); - aFont.SetTransparent( TRUE ); + aFont.SetTransparent( sal_True ); Control::SetFont( aFont ); mnY = ( nWinHeight - GetTextHeight() ) / 2; @@ -258,7 +258,7 @@ SvxShowText::~SvxShowText() // class SvxCharacterMap ================================================= -SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pResContext ) +SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* pResContext ) : mpDialog( pDialog ), aShowSet ( pDialog, ResId( CT_SHOWSET, *pResContext ) ), aShowText ( pDialog, ResId( CT_SHOWTEXT, *pResContext ) ), @@ -271,13 +271,13 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ), aSubsetLB ( pDialog, ResId( LB_SUBSET, *pResContext ) ), aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ), - aShowChar ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), TRUE ), + aShowChar ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), sal_True ), aCharCodeText ( pDialog, ResId( FT_CHARCODE, *pResContext ) ), bOne( bOne_ ), pSubsetMap( NULL ) { aFont = pDialog->GetFont(); - aFont.SetTransparent( TRUE ); + aFont.SetTransparent( sal_True ); aFont.SetFamily( FAMILY_DONTKNOW ); aFont.SetPitch( PITCH_DONTKNOW ); aFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW ); @@ -301,8 +301,8 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe if ( aFontName != aLastName ) { aLastName = aFontName; - USHORT nPos = aFontLB.InsertEntry( aFontName ); - aFontLB.SetEntryData( nPos, (void*)(ULONG)i ); + sal_uInt16 nPos = aFontLB.InsertEntry( aFontName ); + aFontLB.SetEntryData( nPos, (void*)(sal_uLong)i ); } } // the font may not be in the list => @@ -317,7 +317,7 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe if ( aFontLB.GetEntryPos( aToken ) != LISTBOX_ENTRY_NOTFOUND ) { aDefStr = aToken; - bFound = TRUE; + bFound = sal_True; break; } } @@ -381,7 +381,7 @@ IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG ) rtl::OUString aOUStr( &cChar, 1 ); aShowText.SetText( aOUStr ); } - mpDialog->EndDialog( TRUE ); + mpDialog->EndDialog( sal_True ); return 0; } @@ -389,8 +389,8 @@ IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG ) IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG ) { - USHORT nPos = aFontLB.GetSelectEntryPos(), - nFont = (USHORT)(ULONG)aFontLB.GetEntryData( nPos ); + sal_uInt16 nPos = aFontLB.GetSelectEntryPos(), + nFont = (sal_uInt16)(sal_uLong)aFontLB.GetEntryData( nPos ); aFont = mpDialog->GetDevFont( nFont ); aFont.SetWeight( WEIGHT_DONTKNOW ); aFont.SetItalic( ITALIC_NONE ); @@ -416,7 +416,7 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG ) delete pSubsetMap; pSubsetMap = NULL; - BOOL bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL); + sal_Bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL); if( bNeedSubset ) { FontCharMap aFontCharMap; @@ -430,7 +430,7 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG ) const Subset* s; while( NULL != (s = pSubsetMap->GetNextSubset( bFirst )) ) { - USHORT nPos_ = aSubsetLB.InsertEntry( s->GetName() ); + sal_uInt16 nPos_ = aSubsetLB.InsertEntry( s->GetName() ); aSubsetLB.SetEntryData( nPos_, (void*)s ); // NOTE: subset must live at least as long as the selected font if( bFirst ) @@ -438,7 +438,7 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG ) bFirst = false; } if( aSubsetLB.GetEntryCount() <= 1 ) - bNeedSubset = FALSE; + bNeedSubset = sal_False; } aSubsetText.Show( bNeedSubset); @@ -451,7 +451,7 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG ) IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG ) { - USHORT nPos = aSubsetLB.GetSelectEntryPos(); + sal_uInt16 nPos = aSubsetLB.GetSelectEntryPos(); const Subset* pSubset = reinterpret_cast<const Subset*> (aSubsetLB.GetEntryData(nPos)); if( pSubset ) { @@ -466,7 +466,7 @@ IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG ) IMPL_LINK( SvxCharMapData, CharDoubleClickHdl, Control *, EMPTYARG ) { - mpDialog->EndDialog( TRUE ); + mpDialog->EndDialog( sal_True ); return 0; } @@ -567,7 +567,7 @@ IMPL_LINK( SvxCharMapData, AssignHdl, PushButton *, EMPTYARG ) { const SfxItemSet* pOutSet = pDlg->GetOutputItemSet(); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pOutSet->GetItemState( SID_CHARMAP, FALSE, &pItem ) ) + if( SFX_ITEM_SET == pOutSet->GetItemState( SID_CHARMAP, sal_False, &pItem ) ) { // show assigned shortcut } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 7d38ea63ca8d..b4556cccdf3e 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -267,7 +267,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI // fill the listboxes // method of field comparison - USHORT nResIds[] = { + sal_uInt16 nResIds[] = { RID_STR_SEARCH_ANYWHERE, RID_STR_SEARCH_BEGINNING, RID_STR_SEARCH_END, @@ -278,7 +278,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI m_lbPosition.SelectEntryPos(MATCHING_ANYWHERE); // the field listbox - for (USHORT i=0; i<strVisibleFields.GetTokenCount(';'); ++i) + for (sal_uInt16 i=0; i<strVisibleFields.GetTokenCount(';'); ++i) m_lbField.InsertEntry(strVisibleFields.GetToken(i, ';')); @@ -420,7 +420,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton ) aDlg->Execute(); - INT32 nFlags = aDlg->GetTransliterationFlags(); + sal_Int32 nFlags = aDlg->GetTransliterationFlags(); m_pSearchEngine->SetTransliterationFlags(nFlags); m_cbCase.Check(m_pSearchEngine->GetCaseSensitive()); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index bd5240e1e7c4..9b2c7cc52606 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -38,7 +38,6 @@ #include <svx/gallery1.hxx> #include <svx/galtheme.hxx> #include "cuigaldlg.hxx" -#include <svl/pickerhelper.hxx> #include "helpid.hrc" #include <unotools/syslocale.hxx> #include <cppuhelper/implbase1.hxx> @@ -53,6 +52,9 @@ #include <sfx2/sfxuno.hxx> #include "dialmgr.hxx" #include "gallery.hrc" +#include <svx/dialogs.hrc> +#include <svx/dialmgr.hxx> + // -------------- // - Namespaces - @@ -131,7 +133,7 @@ void SAL_CALL SearchThread::onTerminated() void SearchThread::ImplSearch( const INetURLObject& rStartURL, const ::std::vector< String >& rFormats, - BOOL bRecursive ) + sal_Bool bRecursive ) { { SolarMutexGuard aGuard; @@ -166,7 +168,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, bFolder = sal_False; if( bRecursive && bFolder ) - ImplSearch( aFoundURL, rFormats, TRUE ); + ImplSearch( aFoundURL, rFormats, sal_True ); else { sal_Bool bDocument = xRow->getBoolean( 2 ); // property "IsDocument" @@ -196,7 +198,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, ); mpBrowser->aLbxFound.InsertEntry( GetReducedString( aFoundURL, 50 ), - (USHORT) mpBrowser->aFoundList.size() - 1 ); + (sal_uInt16) mpBrowser->aFoundList.size() - 1 ); } } } @@ -296,9 +298,9 @@ void SAL_CALL TakeThread::run() { String aName; INetURLObject aURL; - USHORT nEntries; + sal_uInt16 nEntries; GalleryTheme* pThm = mpBrowser->GetXChgData()->pTheme; - USHORT nPos; + sal_uInt16 nPos; GalleryProgress* pStatusProgress; { @@ -308,7 +310,7 @@ void SAL_CALL TakeThread::run() pThm->LockBroadcaster(); } - for( USHORT i = 0; i < nEntries && schedule(); i++ ) + for( sal_uInt16 i = 0; i < nEntries && schedule(); i++ ) { // kompletten Filenamen aus FoundList holen if( mpBrowser->bTakeAll ) @@ -317,7 +319,7 @@ void SAL_CALL TakeThread::run() aURL = INetURLObject(*mpBrowser->aFoundList[ nPos = mpBrowser->aLbxFound.GetSelectEntryPos( i ) ]); // Position in Taken-Liste uebernehmen - mrTakenList.Insert( (void*) (ULONG)nPos, LIST_APPEND ); + mrTakenList.Insert( (void*) (sal_uLong)nPos, LIST_APPEND ); { SolarMutexGuard aGuard; @@ -386,12 +388,12 @@ IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG ) sal_uInt32 i, nCount; GetParent()->EnterWait(); - mpBrowser->aLbxFound.SetUpdateMode( FALSE ); + mpBrowser->aLbxFound.SetUpdateMode( sal_False ); mpBrowser->aLbxFound.SetNoSelection(); // mark all taken positions in aRemoveEntries for( i = 0UL, nCount = maTakenList.Count(); i < nCount; ++i ) - aRemoveEntries[ (ULONG) maTakenList.GetObject( i ) ] = true; + aRemoveEntries[ (sal_uLong) maTakenList.GetObject( i ) ] = true; maTakenList.Clear(); @@ -421,7 +423,7 @@ IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG ) aRemainingVector.clear(); - mpBrowser->aLbxFound.SetUpdateMode( TRUE ); + mpBrowser->aLbxFound.SetUpdateMode( sal_True ); mpBrowser->SelectFoundHdl( NULL ); GetParent()->LeaveWait(); @@ -564,7 +566,7 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) : GalleryTheme::InsertAllThemes( aLbResName ); - aLbResName.SelectEntryPos( (USHORT) pThm->GetId() ); + aLbResName.SelectEntryPos( (sal_uInt16) pThm->GetId() ); aLbResName.GrabFocus(); aBtnOk.SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) ); @@ -575,10 +577,10 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) : IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG ) { Gallery* pGal = pThm->GetParent(); - const ULONG nId = GetId(); - BOOL bDifferentThemeExists = FALSE; + const sal_uLong nId = GetId(); + sal_Bool bDifferentThemeExists = sal_False; - for( ULONG i = 0, nCount = pGal->GetThemeCount(); i < nCount && !bDifferentThemeExists; i++ ) + for( sal_uLong i = 0, nCount = pGal->GetThemeCount(); i < nCount && !bDifferentThemeExists; i++ ) { const GalleryThemeEntry* pInfo = pGal->GetThemeInfo( i ); @@ -593,7 +595,7 @@ IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG ) InfoBox aBox( this, aStr ); aBox.Execute(); aLbResName.GrabFocus(); - bDifferentThemeExists = TRUE; + bDifferentThemeExists = sal_True; } } @@ -632,7 +634,7 @@ GalleryThemeProperties::GalleryThemeProperties( Window* pParent, ExchangeData* _ // ------------------------------------------------------------------------ -void GalleryThemeProperties::PageCreated( USHORT nId, SfxTabPage &rPage ) +void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { if( RID_SVXTABPAGE_GALLERY_GENERAL == nId ) ( (TPGalleryThemeGeneral&) rPage ).SetXChgData( pData ); @@ -660,6 +662,11 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& aFtMSShowChangeDate ( this, CUI_RES( FT_MS_SHOW_CHANGEDATE ) ) { FreeResource(); + + String aAccName(SVX_RES(RID_SVXSTR_GALLERY_THEMENAME)); + aEdtMSName.SetAccessibleName(aAccName); + aFiMSImage.SetAccessibleName(aAccName); + aEdtMSName.SetAccessibleRelationLabeledBy( &aFiMSImage ); } // ------------------------------------------------------------------------ @@ -672,8 +679,8 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) String aOutStr( String::CreateFromInt32( pThm->GetObjectCount() ) ); String aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) ); String aAccess; - String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); - BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); + String aType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); + sal_Bool bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME ); aEdtMSName.SetText( pThm->GetName() ); @@ -712,7 +719,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) aFtMSShowChangeDate.SetText( aAccess ); // Image setzen - USHORT nId; + sal_uInt16 nId; if( pThm->IsImported() ) nId = RID_SVXBMP_THEME_IMPORTED_BIG; @@ -728,10 +735,10 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) // ------------------------------------------------------------------------ -BOOL TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ ) +sal_Bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ ) { pData->aEditedTitle = aEdtMSName.GetText(); - return TRUE; + return sal_True; } // ------------------------------------------------------------------------ @@ -747,24 +754,27 @@ SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet& rS TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) : SfxTabPage ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ), + aFtFileType ( this, CUI_RES(FT_FILETYPE ) ), + aCbbFileType ( this, CUI_RES(CBB_FILETYPE ) ), + aLbxFound ( this, CUI_RES(LBX_FOUND ) ), aBtnSearch ( this, CUI_RES(BTN_SEARCH ) ), aBtnTake ( this, CUI_RES(BTN_TAKE ) ), aBtnTakeAll ( this, CUI_RES(BTN_TAKEALL ) ), aCbxPreview ( this, CUI_RES(CBX_PREVIEW ) ), - aCbbFileType ( this, CUI_RES(CBB_FILETYPE ) ), - aLbxFound ( this, CUI_RES(LBX_FOUND ) ), - aFtFileType ( this, CUI_RES(FT_FILETYPE ) ), aWndPreview ( this, CUI_RES( WND_BRSPRV ) ), nCurFilterPos (0), nFirstExtFilterPos (0), - bEntriesFound (FALSE), - bInputAllowed (TRUE), - bSearchRecursive (FALSE), + bEntriesFound (sal_False), + bInputAllowed (sal_True), + bSearchRecursive (sal_False), xDialogListener ( new ::svt::DialogClosedListener() ) { FreeResource(); xDialogListener->SetDialogClosedLink( LINK( this, TPGalleryThemeProperties, DialogClosedHdl ) ); + aLbxFound.SetAccessibleName(String(SVX_RES(RID_SVXSTR_GALLERY_FILESFOUND))); + aWndPreview.SetAccessibleName(aCbxPreview.GetText()); + aLbxFound.SetAccessibleRelationLabeledBy(&aLbxFound); } // ------------------------------------------------------------------------ @@ -857,7 +867,7 @@ void TPGalleryThemeProperties::FillFilterList() FilterEntry* pFilterEntry; FilterEntry* pTestEntry; sal_uInt16 i, nKeyCount; - BOOL bInList; + sal_Bool bInList; // graphic filters for( i = 0, nKeyCount = pFilter->GetImportFormatCount(); i < nKeyCount; i++ ) @@ -865,12 +875,12 @@ void TPGalleryThemeProperties::FillFilterList() aExt = pFilter->GetImportFormatShortName( i ); aName = pFilter->GetImportFormatName( i ); pTestEntry = (FilterEntry*) aFilterEntryList.First(); - bInList = FALSE; + bInList = sal_False; String aExtensions; int j = 0; String sWildcard; - while( TRUE ) + while( sal_True ) { sWildcard = pFilter->GetImportWildcard( i, j++ ); if ( !sWildcard.Len() ) @@ -888,7 +898,7 @@ void TPGalleryThemeProperties::FillFilterList() { if ( pTestEntry->aFilterName == aExt ) { - bInList = TRUE; + bInList = sal_True; break; } pTestEntry = (FilterEntry*) aFilterEntryList.Next(); @@ -931,7 +941,7 @@ void TPGalleryThemeProperties::FillFilterList() { int j = 0; String sWildcard; - while( TRUE ) + while( sal_True ) { sWildcard = pFilter->GetImportWildcard( i, j++ ); if ( !sWildcard.Len() ) @@ -957,7 +967,7 @@ void TPGalleryThemeProperties::FillFilterList() } } -#if defined(WIN) || defined(WNT) +#if defined(WNT) if ( aExtensions.Len() > 240 ) aExtensions = DEFINE_CONST_UNICODE( "*.*" ); #endif @@ -1110,7 +1120,7 @@ void TPGalleryThemeProperties::DoPreview() if( aString != aPreviewString ) { INetURLObject _aURL( *aFoundList[ aLbxFound.GetEntryPos( aString ) ] ); - bInputAllowed = FALSE; + bInputAllowed = sal_False; if ( !aWndPreview.SetGraphic( _aURL ) ) { @@ -1125,7 +1135,7 @@ void TPGalleryThemeProperties::DoPreview() xMediaPlayer->start(); } - bInputAllowed = TRUE; + bInputAllowed = sal_True; aPreviewString = aString; } } @@ -1149,7 +1159,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG ) } else { - bTakeAll = FALSE; + bTakeAll = sal_False; TakeFiles(); } } @@ -1164,7 +1174,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeAllHdl, void *, EMPTYARG ) if( bInputAllowed ) { aPreviewTimer.Stop(); - bTakeAll = TRUE; + bTakeAll = sal_True; TakeFiles(); } @@ -1177,7 +1187,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG ) { if( bInputAllowed ) { - BOOL bPreviewPossible = FALSE; + sal_Bool bPreviewPossible = sal_False; aPreviewTimer.Stop(); @@ -1186,7 +1196,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG ) if( aLbxFound.GetSelectEntryCount() == 1 ) { aCbxPreview.Enable(); - bPreviewPossible = TRUE; + bPreviewPossible = sal_True; } else aCbxPreview.Disable(); @@ -1237,14 +1247,14 @@ IMPL_LINK( TPGalleryThemeProperties, EndSearchProgressHdl, SearchProgress *, EMP aLbxFound.SelectEntryPos( 0 ); aBtnTakeAll.Enable(); aCbxPreview.Enable(); - bEntriesFound = TRUE; + bEntriesFound = sal_True; } else { aLbxFound.InsertEntry( String( CUI_RES( RID_SVXSTR_GALLERY_NOFILES ) ) ); aBtnTakeAll.Disable(); aCbxPreview.Disable(); - bEntriesFound = FALSE; + bEntriesFound = sal_False; } return 0L; } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 82e95178a2bb..2e8caee8b188 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -93,10 +93,10 @@ GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId, mfScaleY ( 0.0 ), maSizePixel ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ), maPreview ( this, CUI_RES( CTL_PREVIEW ) ), - maFlParameter ( this, CUI_RES( FL_PARAMETER ) ), maBtnOK ( this, CUI_RES( BTN_OK ) ), maBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - maBtnHelp ( this, CUI_RES( BTN_HELP ) ) + maBtnHelp ( this, CUI_RES( BTN_HELP ) ), + maFlParameter ( this, CUI_RES( FL_PARAMETER ) ) { const Size aPreviewSize( maPreview.GetOutputSizePixel() ); Size aGrfSize( maSizePixel ); @@ -170,7 +170,7 @@ IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG ) // ---------------- GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic, - USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ) : + sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges ) : GraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ), maFtWidth ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ), maMtrWidth ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ), @@ -192,6 +192,12 @@ GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraph maCbxEdges.SetToggleHdl( GetModifyHdl() ); maMtrWidth.GrabFocus(); + + maFtWidth.SetAccessibleRelationMemberOf(&maFlParameter); + maMtrWidth.SetAccessibleRelationMemberOf(&maFlParameter); + maFtHeight.SetAccessibleRelationMemberOf(&maFlParameter); + maMtrHeight.SetAccessibleRelationMemberOf(&maFlParameter); + maCbxEdges.SetAccessibleRelationMemberOf(&maFlParameter); } // ----------------------------------------------------------------------------- @@ -243,7 +249,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, // ------------------ GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, - BYTE cGreyThreshold, BOOL bInvert ) : + sal_uInt8 cGreyThreshold, sal_Bool bInvert ) : GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ), maFtThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ), maMtrThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ), @@ -307,7 +313,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, // ---------------------- GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, - USHORT nSepiaPercent ) : + sal_uInt16 nSepiaPercent ) : GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ), maFtSepia ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ), maMtrSepia ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) ) @@ -357,7 +363,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, // ----------------------- GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic, - USHORT nPosterCount ) : + sal_uInt16 nPosterCount ) : GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ), maFtPoster ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ), maNumPoster ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) ) @@ -383,7 +389,7 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { Graphic aRet; - const USHORT nPosterCount = GetPosterColorCount(); + const sal_uInt16 nPosterCount = GetPosterColorCount(); if( rGraphic.IsAnimated() ) { @@ -443,7 +449,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { Graphic aRet; - USHORT nAzim, nElev; + sal_uInt16 nAzim, nElev; switch( maCtlLight.GetActualRP() ) { diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 7c38c610b639..cc2cd69f53d7 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -46,7 +46,7 @@ using ::com::sun::star::frame::XFrame; //# # //######################################################################## -SvxHlinkCtrl::SvxHlinkCtrl( USHORT _nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg ) +SvxHlinkCtrl::SvxHlinkCtrl( sal_uInt16 _nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg ) : SfxControllerItem ( _nId, rBindings ) ,aOnlineForwarder ( SID_INTERNET_ONLINE , *this ) ,aRdOnlyForwarder ( SID_READONLY_MODE, *this ) @@ -54,7 +54,7 @@ SvxHlinkCtrl::SvxHlinkCtrl( USHORT _nId, SfxBindings & rBindings, SvxHpLinkDlg* pParent = pDlg; } -void SvxHlinkCtrl::StateChanged( USHORT nSID, SfxItemState eState, +void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if ( eState == SFX_ITEM_AVAILABLE ) @@ -73,7 +73,7 @@ void SvxHlinkCtrl::StateChanged( USHORT nSID, SfxItemState eState, break; case SID_READONLY_MODE : { - pParent->SetReadOnlyMode( ( (SfxBoolItem*)pState)->GetValue() == TRUE ); + pParent->SetReadOnlyMode( ( (SfxBoolItem*)pState)->GetValue() == sal_True ); } break; } @@ -129,9 +129,6 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, SvxHyperlinkNewDocTp::Create ); pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) ); - // all tab pages set -> create mnemonics - // CreateIconTextAutoMnemonics(); #99671# not useful, because this is not what user expects when using mnemonics on the pages - // create itemset for tabpages mpItemSet = new SfxItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK, SID_HYPERLINK_SETLINK ); @@ -142,7 +139,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) SetInputSet (mpItemSet); // Init Dialog - Start (FALSE); + Start (sal_False); pBindings->Update( SID_READONLY_MODE ); @@ -169,12 +166,12 @@ SvxHpLinkDlg::~SvxHpLinkDlg () |* |************************************************************************/ -BOOL SvxHpLinkDlg::Close() +sal_Bool SvxHpLinkDlg::Close() { GetDispatcher()->Execute( SID_HYPERLINK_DIALOG, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - return TRUE; + return sal_True; } /************************************************************************* @@ -201,13 +198,13 @@ void SvxHpLinkDlg::Move() // Size of Extrawindow Size aExtraWndSize( pCurrentPage->GetSizeExtraWnd() ); - BOOL bDoInvalid ; + sal_Bool bDoInvalid ; if( aDlgPos.X()+(1.02*aDlgSize.Width())+aExtraWndSize.Width() > aWindowSize.Width() ) { if( aDlgPos.X() - ( 0.02*aDlgSize.Width() ) - aExtraWndSize.Width() < 0 ) { // Pos Extrawindow anywhere - bDoInvalid = pCurrentPage->MoveToExtraWnd( Point( 1, long(1.1*aDlgPos.Y()) ), TRUE ); + bDoInvalid = pCurrentPage->MoveToExtraWnd( Point( 1, long(1.1*aDlgPos.Y()) ), sal_True ); } else { @@ -281,9 +278,9 @@ IMPL_LINK ( SvxHpLinkDlg, ClickCloseHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -USHORT SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem ) +sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem ) { - USHORT nPageId = RID_SVXPAGE_HYPERLINK_INTERNET; + sal_uInt16 nPageId = RID_SVXPAGE_HYPERLINK_INTERNET; String aStrURL ( pItem->GetURL() ); INetURLObject aURL ( aStrURL ); @@ -377,7 +374,7 @@ void SvxHpLinkDlg::SetReadOnlyMode( sal_Bool bRdOnly ) |* |************************************************************************/ -void SvxHpLinkDlg::PageCreated( USHORT /*nId*/, IconChoicePage& rPage ) +void SvxHpLinkDlg::PageCreated( sal_uInt16 /*nId*/, IconChoicePage& rPage ) { SvxHyperlinkTabPageBase& rHyperlinkPage = dynamic_cast< SvxHyperlinkTabPageBase& >( rPage ); Reference< XFrame > xDocumentFrame; diff --git a/cui/source/dialogs/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src index 9b60adf854ca..05475f880a3c 100644 --- a/cui/source/dialogs/cuiimapdlg.src +++ b/cui/source/dialogs/cuiimapdlg.src @@ -31,6 +31,7 @@ ModalDialog RID_SVXDLG_IMAPURL { + HelpID = "cui:ModalDialog:RID_SVXDLG_IMAPURL"; SVLook = TRUE ; OutputSize = TRUE ; Closeable = TRUE ; @@ -46,6 +47,7 @@ ModalDialog RID_SVXDLG_IMAPURL }; Edit EDT_URL { + HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_URL"; Border = TRUE ; TabStop = TRUE ; Left = TRUE ; @@ -61,6 +63,7 @@ ModalDialog RID_SVXDLG_IMAPURL }; ComboBox CBB_TARGETS { + HelpID = "cui:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS"; Border = TRUE ; Sort = TRUE ; Pos = MAP_APPFONT ( 6 , 43 ) ; @@ -78,6 +81,7 @@ ModalDialog RID_SVXDLG_IMAPURL }; Edit EDT_NAME { + HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_NAME"; Border = TRUE ; TabStop = TRUE ; Left = TRUE ; @@ -94,6 +98,7 @@ ModalDialog RID_SVXDLG_IMAPURL Edit EDT_URLDESCRIPTION { + HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION"; Border = TRUE ; TabStop = TRUE ; Left = TRUE ; @@ -109,6 +114,7 @@ ModalDialog RID_SVXDLG_IMAPURL MultiLineEdit EDT_DESCRIPTION { + HelpID = "cui:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 122 ) ; Size = MAP_APPFONT ( 202 , 34 ) ; diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index aa1fd6ab285f..2e14b9752ab0 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -56,7 +56,7 @@ FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent) { m_aRecordNo.SetMin(1); m_aRecordNo.SetMax(0x7FFFFFFF); - m_aRecordNo.SetStrictFormat(TRUE); + m_aRecordNo.SetStrictFormat(sal_True); m_aRecordNo.SetDecimalDigits(0); FreeResource(); diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index e624b0ef2d5d..78cef105a297 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -210,7 +210,7 @@ IMPL_LINK_INLINE_END( SvxMessDialog, Button2Hdl, Button *, EMPTYARG ) /*************************************************************************/ -void SvxMessDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt ) +void SvxMessDialog::SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ) { switch ( nBtnId ) { diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src index 1d72e877f230..291a50fbc47c 100644 --- a/cui/source/dialogs/dlgname.src +++ b/cui/source/dialogs/dlgname.src @@ -49,6 +49,7 @@ ModalDialog RID_SVXDLG_NAME }; Edit EDT_STRING { + HelpID = "cui:Edit:RID_SVXDLG_NAME:EDT_STRING"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 112 , 12 ) ; @@ -96,6 +97,7 @@ ModalDialog RID_SVXDLG_OBJECT_NAME }; Edit NTD_EDT_NAME { + HelpID = "cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 168 , 12 ) ; @@ -153,6 +155,7 @@ ModalDialog RID_SVXDLG_OBJECT_TITLE_DESC }; Edit NTD_EDT_TITLE { + HelpID = "cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 168 , 12 ) ; @@ -169,6 +172,7 @@ ModalDialog RID_SVXDLG_OBJECT_TITLE_DESC }; MultiLineEdit NTD_EDT_DESC { + HelpID = "cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 41 ) ; Size = MAP_APPFONT ( 168 , (12 * 3) - 2 ) ; @@ -218,12 +222,14 @@ ModalDialog RID_SVXDLG_MESSBOX Moveable = TRUE ; PushButton BTN_1 { + HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_1"; Pos = MAP_APPFONT ( 25 , 44 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; PushButton BTN_2 { + HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_2"; Pos = MAP_APPFONT ( 78 , 44 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src index 186db5a48735..c705f42c5789 100644 --- a/cui/source/dialogs/fmsearch.src +++ b/cui/source/dialogs/fmsearch.src @@ -45,6 +45,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; RadioButton RB_SEARCHFORTEXT { + HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT"; Pos = MAP_APPFONT( 12, 23 ); Size = MAP_APPFONT( 50, 10 ); Group = TRUE; @@ -52,12 +53,14 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; RadioButton RB_SEARCHFORNULL { + HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL"; Pos = MAP_APPFONT( 12, 36 ); Size = MAP_APPFONT( 207, 10 ); Text [ en-US ] = "Field content is ~NULL"; }; RadioButton RB_SEARCHFORNOTNULL { + HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL"; Pos = MAP_APPFONT( 12, 49 ); Size = MAP_APPFONT( 207, 10 ); Text [ en-US ] = "Field content is not NU~LL"; @@ -86,6 +89,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; ListBox LB_FORM { + HelpID = "cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM"; Border = TRUE; Pos = MAP_APPFONT( 110, 76 ); Size = MAP_APPFONT( 109, 60 ); @@ -102,6 +106,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; RadioButton RB_SINGLEFIELD { + HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SINGLEFIELD"; Pos = MAP_APPFONT( 24, 106 ); Size = MAP_APPFONT( 75, 10 ); Text [ en-US ] = "Single field"; @@ -204,6 +209,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; CheckBox CB_HALFFULLFORMS { + HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_HALFFULLFORMS"; Pos = MAP_APPFONT( 105, 209 ); Size = MAP_APPFONT( 85, 10 ); TabStop = TRUE ; @@ -211,6 +217,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; CheckBox CB_SOUNDSLIKECJK { + HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_SOUNDSLIKECJK"; Pos = MAP_APPFONT( 190, 209 ); Size = MAP_APPFONT( 84, 10 ); TabStop = TRUE ; @@ -218,6 +225,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; PushButton PB_SOUNDSLIKESETTINGS { + HelpID = "cui:PushButton:RID_SVXDLG_SEARCHFORM:PB_SOUNDSLIKESETTINGS"; Pos = MAP_APPFONT( 275, 207 ); Size = MAP_APPFONT( 14, 14 ); TabStop = TRUE ; diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index db0d4bbf3973..b1c53e65c706 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -94,6 +94,7 @@ TabPage RID_SVXTABPAGE_GALLERY_GENERAL }; Edit EDT_MS_NAME { + HelpID = "cui:Edit:RID_SVXTABPAGE_GALLERY_GENERAL:EDT_MS_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 10 ) ; Size = MAP_APPFONT ( 194 , 12 ) ; @@ -174,6 +175,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; ComboBox CBB_FILETYPE { + HelpID = "cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE"; Pos = MAP_APPFONT ( 57 , 6 ) ; Size = MAP_APPFONT ( 121 , 69 ) ; TabStop = TRUE ; @@ -183,6 +185,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; MultiListBox LBX_FOUND { + HelpID = "cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 23 ) ; Size = MAP_APPFONT ( 172 , 156 ) ; @@ -191,6 +194,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; PushButton BTN_SEARCH { + HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH"; Pos = MAP_APPFONT ( 184 , 6 ) ; Size = MAP_APPFONT ( 70 , 14 ) ; TabStop = TRUE ; @@ -198,6 +202,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; PushButton BTN_TAKE { + HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE"; Pos = MAP_APPFONT ( 184 , 24 ) ; Size = MAP_APPFONT ( 70 , 14 ) ; TabStop = TRUE ; @@ -205,6 +210,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; PushButton BTN_TAKEALL { + HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL"; Pos = MAP_APPFONT ( 184 , 42 ) ; Size = MAP_APPFONT ( 70 , 14 ) ; TabStop = TRUE ; @@ -212,6 +218,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; CheckBox CBX_PREVIEW { + HelpID = "cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW"; Pos = MAP_APPFONT ( 184 , 76 ) ; Size = MAP_APPFONT ( 70 , 12 ) ; Text [ en-US ] = "Pr~eview" ; @@ -224,6 +231,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; PushButton BTN_MADDIN1 { + HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_MADDIN1"; Pos = MAP_APPFONT ( 220 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -231,6 +239,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; PushButton BTN_MADDIN2 { + HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_MADDIN2"; Pos = MAP_APPFONT ( 220 , 80 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -388,6 +397,7 @@ ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ModalDialog RID_SVXDLG_GALLERY_THEMEID { + HelpID = "cui:ModalDialog:RID_SVXDLG_GALLERY_THEMEID"; OutputSize = TRUE ; Border = TRUE ; SVLook = TRUE ; @@ -415,6 +425,7 @@ ModalDialog RID_SVXDLG_GALLERY_THEMEID }; ListBox LB_RESNAME { + HelpID = "cui:ListBox:RID_SVXDLG_GALLERY_THEMEID:LB_RESNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 100 , 60 ) ; @@ -437,10 +448,6 @@ String RID_SVXSTR_GALLERYPROPS_OBJECT { Text [ en-US ] = "Object;Objects" ; }; -String RID_SVXSTR_GALLERYPROPS_GALTHEME -{ - Text [ en-US ] = "Gallery Theme" ; -}; String RID_SVXSTR_GALLERY_READONLY { Text [ en-US ] = " (read-only)" ; diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index 76cf9ecc6f74..c13eaf373b2a 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -37,7 +37,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC { - HelpID = SID_GRFFILTER_MOSAIC; + HelpID = CMD_SID_GRFFILTER_MOSAIC; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -66,6 +66,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC #define MA_Y1 MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERMOSAIC_MTR_WIDTH { + HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y1 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -91,6 +92,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC #define MA_Y3 MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERMOSAIC_MTR_HEIGHT { + HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 12, MA_Y3 ) ; Size = MAP_APPFONT ( 35, 12 ) ; @@ -109,6 +111,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC #define MA_Y4 MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y CheckBox DLG_FILTERMOSAIC_CBX_EDGES { + HelpID = "cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES"; Pos = MAP_APPFONT ( 12, MA_Y4 ) ; Size = MAP_APPFONT ( 91, 12 ) ; TabStop = TRUE ; @@ -141,7 +144,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE { - HelpID = SID_GRFFILTER_SOLARIZE; + HelpID = CMD_SID_GRFFILTER_SOLARIZE; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -170,6 +173,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE #define MA_Y6 MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERSOLARIZE_MTR_THRESHOLD { + HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y6 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -186,6 +190,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE #define MA_Y7 MA_Y6 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y CheckBox DLG_FILTERSOLARIZE_CBX_INVERT { + HelpID = "cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT"; Pos = MAP_APPFONT ( 12, 46 ) ; Size = MAP_APPFONT ( 77, 12 ) ; TabStop = TRUE ; @@ -218,7 +223,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA { - HelpID = SID_GRFFILTER_SEPIA; + HelpID = CMD_SID_GRFFILTER_SEPIA; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -247,6 +252,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA #define MA_Y9 MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERSEPIA_MTR_SEPIA { + HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y9 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -290,7 +296,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA ModalDialog RID_SVX_GRFFILTER_DLG_POSTER { - HelpID = SID_GRFFILTER_POSTER; + HelpID = CMD_SID_GRFFILTER_POSTER; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -319,6 +325,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER #define MA_Y11 MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y NumericField DLG_FILTERPOSTER_NUM_POSTER { + HelpID = "cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y11 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -359,13 +366,14 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB { + HelpID = "cui:TabPage:RID_SVX_GRFFILTER_DLG_EMBOSS_TAB"; Pos = MAP_APPFONT ( 0, 0 ) ; Size = MAP_APPFONT ( 0, 0 ) ; }; ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS { - HelpID = SID_GRFFILTER_EMBOSS; + HelpID = CMD_SID_GRFFILTER_EMBOSS; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 01d01525bc1f..732613dcccb0 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -49,7 +49,7 @@ #include <comphelper/processfactory.hxx> #define HHC editeng::HangulHanjaConversion -#define LINE_CNT static_cast< USHORT >(2) +#define LINE_CNT static_cast< sal_uInt16 >(2) //............................................................................. namespace svx @@ -107,7 +107,7 @@ namespace svx PseudoRubyText( const String& _rPrimary, const String& _rSecondary, const RubyPosition _ePosition ); public: - void Paint( OutputDevice& _rDevice, const Rectangle& _rRect, USHORT _nTextStyle, + void Paint( OutputDevice& _rDevice, const Rectangle& _rRect, sal_uInt16 _nTextStyle, Rectangle* _pPrimaryLocation = NULL, Rectangle* _pSecondaryLocation = NULL, ::vcl::ControlLayoutData* _pLayoutData = NULL ); }; @@ -121,7 +121,7 @@ namespace svx } //------------------------------------------------------------------------- - void PseudoRubyText::Paint( OutputDevice& _rDevice, const Rectangle& _rRect, USHORT _nTextStyle, + void PseudoRubyText::Paint( OutputDevice& _rDevice, const Rectangle& _rRect, sal_uInt16 _nTextStyle, Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation, ::vcl::ControlLayoutData* _pLayoutData ) { bool bLayoutOnly = NULL != _pLayoutData; @@ -193,7 +193,7 @@ namespace svx // now draw the texts // as we already calculated the precise rectangles for the texts, we don't want to // use the alignment flags given - within it's rect, every text is centered - USHORT nDrawTextStyle( _nTextStyle ); + sal_uInt16 nDrawTextStyle( _nTextStyle ); nDrawTextStyle &= ~( TEXT_DRAW_RIGHT | TEXT_DRAW_LEFT | TEXT_DRAW_BOTTOM | TEXT_DRAW_TOP ); nDrawTextStyle |= TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER; @@ -256,7 +256,7 @@ namespace svx ++aTextRect.Top(); --aTextRect.Bottom(); // calculate the text flags for the painting - USHORT nTextStyle = TEXT_DRAW_MNEMONIC; + sal_uInt16 nTextStyle = TEXT_DRAW_MNEMONIC; WinBits nStyle = GetStyle( ); // the horizontal alignment @@ -326,7 +326,7 @@ namespace svx { OutputDevice* pDev = rUDEvt.GetDevice(); Rectangle aRect = rUDEvt.GetRect(); - USHORT nItemId = rUDEvt.GetItemId(); + sal_uInt16 nItemId = rUDEvt.GetItemId(); String sText = *static_cast< String* >( GetItemData( nItemId ) ); pDev->DrawText( aRect, sText, TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER ); @@ -334,7 +334,7 @@ namespace svx void SuggestionSet::ClearSet() { - USHORT i, nCount = GetItemCount(); + sal_uInt16 i, nCount = GetItemCount(); for ( i = 0; i < nCount; ++i ) delete static_cast< String* >( GetItemData(i) ); Clear(); @@ -430,7 +430,7 @@ namespace svx if( m_bDisplayListBox != bDisplayListBox ) { Control& rOldControl = implGetCurrentControl(); - BOOL bHasFocus = rOldControl.HasFocus(); + sal_Bool bHasFocus = rOldControl.HasFocus(); m_bDisplayListBox = bDisplayListBox; @@ -452,12 +452,12 @@ namespace svx m_bInSelectionUpdate = true; if(pControl==&m_aListBox) { - USHORT nPos = m_aListBox.GetSelectEntryPos(); + sal_uInt16 nPos = m_aListBox.GetSelectEntryPos(); m_aValueSet.SelectItem( nPos+1 ); //itemid == pos+1 (id 0 has special meaning) } else { - USHORT nPos = m_aValueSet.GetSelectItemId()-1; //itemid == pos+1 (id 0 has special meaning) + sal_uInt16 nPos = m_aValueSet.GetSelectItemId()-1; //itemid == pos+1 (id 0 has special meaning) m_aListBox.SelectEntryPos( nPos ); } m_bInSelectionUpdate = false; @@ -476,21 +476,21 @@ namespace svx } void SuggestionDisplay::InsertEntry( const XubString& rStr ) { - USHORT nItemId = m_aListBox.InsertEntry( rStr ) + 1; //itemid == pos+1 (id 0 has special meaning) + sal_uInt16 nItemId = m_aListBox.InsertEntry( rStr ) + 1; //itemid == pos+1 (id 0 has special meaning) m_aValueSet.InsertItem( nItemId ); String* pItemData = new String(rStr); m_aValueSet.SetItemData( nItemId, pItemData ); } - void SuggestionDisplay::SelectEntryPos( USHORT nPos ) + void SuggestionDisplay::SelectEntryPos( sal_uInt16 nPos ) { m_aListBox.SelectEntryPos( nPos ); m_aValueSet.SelectItem( nPos+1 ); //itemid == pos+1 (id 0 has special meaning) } - USHORT SuggestionDisplay::GetEntryCount() const + sal_uInt16 SuggestionDisplay::GetEntryCount() const { return m_aListBox.GetEntryCount(); } - XubString SuggestionDisplay::GetEntry( USHORT nPos ) const + XubString SuggestionDisplay::GetEntry( sal_uInt16 nPos ) const { return m_aListBox.GetEntry( nPos ); } @@ -675,12 +675,6 @@ namespace svx } //------------------------------------------------------------------------- - void HangulHanjaConversionDialog::SetOptionsHdl( const Link& _rHdl ) - { - m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eOptions, _rHdl ); - } - - //------------------------------------------------------------------------- void HangulHanjaConversionDialog::SetFindHdl( const Link& _rHdl ) { m_aFind.SetClickHdl( _rHdl ); @@ -745,9 +739,9 @@ namespace svx pOtherBox = &m_aHangulOnly; if (pBox && pOtherBox) { - BOOL bBoxChecked = pBox->IsChecked(); + sal_Bool bBoxChecked = pBox->IsChecked(); if (bBoxChecked) - pOtherBox->Check( FALSE ); + pOtherBox->Check( sal_False ); pOtherBox->Enable( !bBoxChecked ); } @@ -851,20 +845,15 @@ namespace svx } //------------------------------------------------------------------------- - sal_Bool HangulHanjaConversionDialog::GetByCharacter( ) const - { - return m_aReplaceByChar.IsChecked(); - } - //------------------------------------------------------------------------- void HangulHanjaConversionDialog::SetConversionDirectionState( sal_Bool _bTryBothDirections, HHC::ConversionDirection _ePrimaryConversionDirection ) { // default state: try both direction - m_aHangulOnly.Check( FALSE ); - m_aHangulOnly.Enable( TRUE ); - m_aHanjaOnly.Check( FALSE ); - m_aHanjaOnly.Enable( TRUE ); + m_aHangulOnly.Check( sal_False ); + m_aHangulOnly.Enable( sal_True ); + m_aHanjaOnly.Check( sal_False ); + m_aHanjaOnly.Enable( sal_True ); if (!_bTryBothDirections) { @@ -1103,7 +1092,7 @@ namespace svx IMPL_LINK( HangulHanjaOptionsDialog, DeleteDictHdl, void*, EMPTYARG ) { - USHORT nSelPos = m_aDictsLB.GetSelectEntryPos(); + sal_uInt16 nSelPos = m_aDictsLB.GetSelectEntryPos(); if( nSelPos != LISTBOX_ENTRY_NOTFOUND ) { Reference< XConversionDictionary > xDic( m_aDictList[ nSelPos ] ); @@ -1152,7 +1141,7 @@ namespace svx ,m_pCheckButtonData ( NULL ) ,m_xConversionDictionaryList( NULL ) { - m_aDictsLB.SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); + m_aDictsLB.SetStyle( m_aDictsLB.GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); m_aDictsLB.SetSelectionMode( SINGLE_SELECTION ); m_aDictsLB.SetHighlightRange(); m_aDictsLB.SetSelectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) ); @@ -1479,8 +1468,8 @@ namespace svx { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); const KeyCode& rKeyCode = pKEvt->GetKeyCode(); - USHORT nMod = rKeyCode.GetModifier(); - USHORT nCode = rKeyCode.GetCode(); + sal_uInt16 nMod = rKeyCode.GetModifier(); + sal_uInt16 nCode = rKeyCode.GetCode(); if( nCode == KEY_TAB && ( !nMod || KEY_SHIFT == nMod ) ) { bool bUp = KEY_SHIFT == nMod; @@ -1863,7 +1852,7 @@ namespace svx aName = xDic->getName(); m_aBookLB.InsertEntry( aName ); } - m_aBookLB.SelectEntryPos( USHORT( _nSelDict ) ); + m_aBookLB.SelectEntryPos( sal_uInt16( _nSelDict ) ); FreeResource(); diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src index 11e2fe415c38..d4736a491490 100644 --- a/cui/source/dialogs/hangulhanjadlg.src +++ b/cui/source/dialogs/hangulhanjadlg.src @@ -44,6 +44,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA PushButton PB_FIND { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND"; Pos = MAP_APPFONT( 207, 23 ); Size = MAP_APPFONT( 30, 14 ); @@ -67,6 +68,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_SIMPLE_CONVERSION { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION"; Pos = MAP_APPFONT( 51, 81 ); Size = MAP_APPFONT( 60, 8 ); @@ -77,6 +79,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANJA_HANGUL_BRACKETED { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED"; Pos = MAP_APPFONT( 114, 81 ); Size = MAP_APPFONT( 60, 8 ); @@ -85,6 +88,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANGUL_HANJA_BRACKETED { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED"; Pos = MAP_APPFONT( 177, 81 ); Size = MAP_APPFONT( 60, 8 ); @@ -93,6 +97,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANGUL_HANJA_ABOVE { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE"; Pos = MAP_APPFONT( 51, 95 ); Size = MAP_APPFONT( 60, 16 ); @@ -102,6 +107,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANGUL_HANJA_BELOW { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW"; Pos = MAP_APPFONT( 114, 95 ); Size = MAP_APPFONT( 60, 16 ); @@ -111,6 +117,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANJA_HANGUL_ABOVE { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE"; Pos = MAP_APPFONT( 56, 114 ); Size = MAP_APPFONT( 60, 16 ); @@ -120,6 +127,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANJA_HANGUL_BELOW { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW"; Pos = MAP_APPFONT( 114, 114 ); Size = MAP_APPFONT( 60, 16 ); @@ -137,6 +145,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA CheckBox CB_HANGUL_ONLY { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY"; Pos = MAP_APPFONT( 51, 134 ); Size = MAP_APPFONT( 60, 8 ); @@ -145,6 +154,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA CheckBox CB_HANJA_ONLY { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY"; Pos = MAP_APPFONT( 114, 134 ); Size = MAP_APPFONT( 55, 8 ); @@ -159,6 +169,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA CheckBox CB_REPLACE_BY_CHARACTER { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER"; Pos = MAP_APPFONT( 241, 81 ); Size = MAP_APPFONT( 55, 24 ); @@ -212,36 +223,42 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_OPT }; CheckBox CB_IGNOREPOST { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST"; Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_9 ) ; Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ; Text[ en-US ] = "Ignore post-positional word"; }; CheckBox CB_SHOWRECENTLYFIRST { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST"; Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_11 ) ; Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ; Text [ en-US ] = "Show recently used entries first"; }; CheckBox CB_AUTOREPLACEUNIQUE { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE"; Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_12 ) ; Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ; Text [ en-US ] = "Replace all unique entries automatically"; }; PushButton PB_HHO_NEW { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW"; Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_2 ) ; Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ; Text [ en-US ] = "New..."; }; PushButton PB_HHO_EDIT { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT"; Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_4 ) ; Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ; Text [ en-US ] = "Edit..."; }; PushButton PB_HHO_DELETE { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE"; Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_6 ) ; Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ; Text [ en-US ] = "Delete"; @@ -291,6 +308,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_NEWDICT }; Edit ED_DICTNAME { + HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 14 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; @@ -340,6 +358,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; ListBox LB_BOOK { + HelpID = "cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK"; Pos = MAP_APPFONT ( HHE_COL_3 , HHE_ROW_1 ) ; Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_3 , 60 ) ; DropDown = TRUE; @@ -353,6 +372,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; ComboBox LB_ORIGINAL { + HelpID = "cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL"; Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_5 ) ; Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_1 , 60 ) ; DropDown = TRUE; @@ -366,6 +386,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; Edit ED_1 { + HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1"; Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 ) ; Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ; Hide = False; @@ -373,6 +394,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; Edit ED_2 { + HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2"; Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 12 ) ; Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ; Hide = False; @@ -380,6 +402,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; Edit ED_3 { + HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3"; Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 24 ) ; Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ; Hide = False; @@ -387,6 +410,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; Edit ED_4 { + HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4"; Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 36 ) ; Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ; Hide = False; @@ -401,12 +425,14 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; PushButton PB_HHE_NEW { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW"; Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a1 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text [ en-US ] = "New"; }; PushButton PB_HHE_DELETE { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE"; Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a3 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text [ en-US ] = "Delete"; diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 3d7942f4dadc..356416a61753 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -94,7 +94,7 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const String& rPath, const Stri } if ( bIsValidURL ) { - USHORT nPos = maLbDocTypes.GetSelectEntryPos(); + sal_uInt16 nPos = maLbDocTypes.GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) aURLObject.SetExtension( ((DocumentTypeData*)maLbDocTypes.GetEntryData( nPos ))->aStrExt ); } @@ -121,7 +121,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& maLbDocTypes ( this, CUI_RES (LB_DOCUMENT_TYPES) ) { // Set HC bitmaps and disable display of bitmap names. - maBtCreate.EnableTextDisplay (FALSE); + maBtCreate.EnableTextDisplay (sal_False); InitStdControls(); FreeResource(); @@ -138,12 +138,15 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& maBtCreate.SetClickHdl ( LINK ( this, SvxHyperlinkNewDocTp, ClickNewHdl_Impl ) ); + maBtCreate.SetAccessibleRelationMemberOf( &maGrpNewDoc ); + maBtCreate.SetAccessibleRelationLabeledBy( &maFtPath ); + FillDocumentList (); } SvxHyperlinkNewDocTp::~SvxHyperlinkNewDocTp () { - for ( USHORT n=0; n<maLbDocTypes.GetEntryCount(); n++ ) + for ( sal_uInt16 n=0; n<maLbDocTypes.GetEntryCount(); n++ ) { DocumentTypeData* pTypeData = (DocumentTypeData*) maLbDocTypes.GetEntryData ( n ); @@ -169,37 +172,6 @@ void SvxHyperlinkNewDocTp::FillDlgFields ( String& /*aStrURL*/ ) #define INTERNETSHORTCUT_URL_TAG "URL" #define INTERNETSHORTCUT_ICONID_TAG "IconIndex" -void SvxHyperlinkNewDocTp::ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder ) -{ - // Open file - Config aCfg( rFile ); - aCfg.SetGroup( INTERNETSHORTCUT_ID_TAG ); - - // read URL - rURL = aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_URL_TAG) ), RTL_TEXTENCODING_ASCII_US ); - SvtPathOptions aPathOpt; - rURL = aPathOpt.SubstituteVariable( rURL ); - - // read target - if ( pShowAsFolder ) - { - String aTemp( aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_TARGET_TAG ) ), RTL_TEXTENCODING_ASCII_US ) ); - *pShowAsFolder = aTemp == String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_FOLDER_TAG ) ); - } - - // read image-ID - String aStrIconId( aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_ICONID_TAG ) ), RTL_TEXTENCODING_ASCII_US ) ); - rIconId = aStrIconId.ToInt32(); - - // read title - String aLangStr = aPathOpt.SubstituteVariable( DEFINE_CONST_UNICODE("$(vlang)") ); - ByteString aLang( aLangStr, RTL_TEXTENCODING_UTF8 ); - ByteString aGroup = INTERNETSHORTCUT_ID_TAG; - ( ( aGroup += '-' ) += aLang ) += ".W"; - aCfg.SetGroup( aGroup ); - rTitle = String( aCfg.ReadKey( INTERNETSHORTCUT_TITLE_TAG ), RTL_TEXTENCODING_UTF7 ); -} - void SvxHyperlinkNewDocTp::FillDocumentList () { EnterWait(); @@ -306,7 +278,7 @@ void SvxHyperlinkNewDocTp::SetInitFocus() |* \************************************************************************/ -BOOL SvxHyperlinkNewDocTp::AskApply() +sal_Bool SvxHyperlinkNewDocTp::AskApply() { INetURLObject aINetURLObject; sal_Bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject ); @@ -375,7 +347,7 @@ void SvxHyperlinkNewDocTp::DoApply () if ( aStrNewName != aEmptyStr ) { // get private-url - USHORT nPos = maLbDocTypes.GetSelectEntryPos(); + sal_uInt16 nPos = maLbDocTypes.GetSelectEntryPos(); if( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos=0; String aStrDocName ( ( ( DocumentTypeData* ) @@ -454,14 +426,14 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, maCbbPath.GetBaseURL(), aStrURL ); String aStrPath = aStrURL; - BOOL bZeroPath = ( aStrPath.Len() == 0 ); - BOOL bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled + sal_Bool bZeroPath = ( aStrPath.Len() == 0 ); + sal_Bool bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled // as file name, otherwise we do not yet know if( bZeroPath ) aStrPath = SvtPathOptions().GetWorkPath(); else if( !::utl::UCBContentHelper::IsFolder( aStrURL ) ) - bHandleFileName = TRUE; + bHandleFileName = sal_True; xFolderPicker->setDisplayDirectory( aStrPath ); DisableClose( sal_True ); @@ -492,7 +464,7 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) maLbDocTypes.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { // get private-url - USHORT nPos = maLbDocTypes.GetSelectEntryPos(); + sal_uInt16 nPos = maLbDocTypes.GetSelectEntryPos(); aNewURL.setExtension( ( ( DocumentTypeData* ) maLbDocTypes.GetEntryData( nPos ) )->aStrExt ); } diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 770736162f0b..63d96e8a0b75 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -59,11 +59,11 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS maFtURL ( this, CUI_RES (FT_URL) ), maFtFullURL ( this, CUI_RES (FT_FULL_URL) ), maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), - mbMarkWndOpen ( FALSE ) + mbMarkWndOpen ( sal_False ) { // Disable display of bitmap names. - maBtBrowse.EnableTextDisplay (FALSE); - maBtFileopen.EnableTextDisplay (FALSE); + maBtBrowse.EnableTextDisplay (sal_False); + maBtFileopen.EnableTextDisplay (sal_False); InitStdControls(); FreeResource(); @@ -86,6 +86,10 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS maCbbPath.SetLoseFocusHdl( LINK ( this, SvxHyperlinkDocTp, LostFocusPathHdl_Impl ) ); + maBtBrowse.SetAccessibleRelationMemberOf( &maGrpTarget ); + maBtBrowse.SetAccessibleRelationLabeledBy( &maFtTarget ); + maBtFileopen.SetAccessibleRelationMemberOf( &maGrpDocument ); + maBtFileopen.SetAccessibleRelationLabeledBy( &maFtPath ); maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkDocTp, TimeoutHdl_Impl ) ); } diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 4109846bff4c..77e4cc1d2531 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -59,18 +59,18 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maRbtLinktypTelnet ( this, CUI_RES (RB_LINKTYP_TELNET) ), maFtTarget ( this, CUI_RES (FT_TARGET_HTML) ), maCbbTarget ( this, INET_PROT_HTTP ), + maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), maFtLogin ( this, CUI_RES (FT_LOGIN) ), maEdLogin ( this, CUI_RES (ED_LOGIN) ), + maBtTarget ( this, CUI_RES (BTN_TARGET) ), maFtPassword ( this, CUI_RES (FT_PASSWD) ), maEdPassword ( this, CUI_RES (ED_PASSWD) ), maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ), - maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), - maBtTarget ( this, CUI_RES (BTN_TARGET) ), - mbMarkWndOpen ( FALSE ) + mbMarkWndOpen ( sal_False ) { // Disable display of bitmap names. - maBtBrowse.EnableTextDisplay (FALSE); - maBtTarget.EnableTextDisplay (FALSE); + maBtBrowse.EnableTextDisplay (sal_False); + maBtTarget.EnableTextDisplay (sal_False); InitStdControls(); FreeResource(); @@ -99,12 +99,12 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, /////////////////////////////////////// // set defaults maRbtLinktypInternet.Check (); - maFtLogin.Show( FALSE ); - maFtPassword.Show( FALSE ); - maEdLogin.Show( FALSE ); - maEdPassword.Show( FALSE ); - maCbAnonymous.Show( FALSE ); - maBtTarget.Enable( FALSE ); + maFtLogin.Show( sal_False ); + maFtPassword.Show( sal_False ); + maEdLogin.Show( sal_False ); + maEdPassword.Show( sal_False ); + maCbAnonymous.Show( sal_False ); + maBtTarget.Enable( sal_False ); maBtBrowse.Enable( maStrStdDocURL != aEmptyStr ); /////////////////////////////////////// @@ -120,6 +120,13 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maCbbTarget.SetLoseFocusHdl ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) ); maCbbTarget.SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) ); maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) ); + + maFtTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp ); + maCbbTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp ); + maBtTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp ); + maBtTarget.SetAccessibleRelationLabeledBy( &maFtTarget ); + maBtBrowse.SetAccessibleRelationMemberOf( &maGrpLinkTyp ); + maBtBrowse.SetAccessibleRelationLabeledBy( &maFtTarget ); } SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp () @@ -182,7 +189,7 @@ void SvxHyperlinkInternetTp::setFTPUser(const String& rUser, const String& rPass maFtPassword.Enable (); maEdLogin.Enable (); maEdPassword.Enable (); - maCbAnonymous.Check(FALSE); + maCbAnonymous.Check(sal_False); } /************************************************************************* @@ -300,11 +307,11 @@ void SvxHyperlinkInternetTp::SetScheme( const String& aScheme ) { //if aScheme is empty or unknown the default beaviour is like it where HTTP - BOOL bFTP = aScheme.SearchAscii( sFTPScheme ) == 0; - BOOL bTelnet = FALSE; + sal_Bool bFTP = aScheme.SearchAscii( sFTPScheme ) == 0; + sal_Bool bTelnet = sal_False; if( !bFTP ) bTelnet = aScheme.SearchAscii( sTelnetScheme ) == 0; - BOOL bInternet = !(bFTP || bTelnet); + sal_Bool bInternet = !(bFTP || bTelnet); //update protocol button selection: maRbtLinktypFTP.Check(bFTP); @@ -453,11 +460,11 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, void *, EMPTYARG ) SfxStringItem aName( SID_FILE_NAME, maStrStdDocURL ); SfxStringItem aRefererItem( SID_REFERER, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) ); - SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, TRUE ); - SfxBoolItem aSilent( SID_SILENT, TRUE ); - SfxBoolItem aReadOnly( SID_DOC_READONLY, TRUE ); + SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True ); + SfxBoolItem aSilent( SID_SILENT, sal_True ); + SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True ); - SfxBoolItem aBrowse( SID_BROWSE, TRUE ); + SfxBoolItem aBrowse( SID_BROWSE, sal_True ); const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL }; (((SvxHpLinkDlg*)mpDialog)->GetBindings())->Execute( SID_OPENDOC, ppItems, 0, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); @@ -523,7 +530,7 @@ void SvxHyperlinkInternetTp::SetMarkStr ( String& aStrMark ) |* |************************************************************************/ -void SvxHyperlinkInternetTp::SetOnlineMode( BOOL /*bEnable*/ ) +void SvxHyperlinkInternetTp::SetOnlineMode( sal_Bool /*bEnable*/ ) { // State of target-button in subject to the current url-string // ( Can't display any targets in an document, if there is no @@ -534,9 +541,9 @@ void SvxHyperlinkInternetTp::SetOnlineMode( BOOL /*bEnable*/ ) if( aStrCurrentTarget == aEmptyStr || aStrCurrentTarget.EqualsIgnoreCaseAscii( sHTTPScheme ) || aStrCurrentTarget.EqualsIgnoreCaseAscii( sHTTPSScheme ) ) - maBtTarget.Enable( FALSE ); + maBtTarget.Enable( sal_False ); else - maBtTarget.Enable( TRUE ); + maBtTarget.Enable( sal_True ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 0a2f7af154d5..bc1ab0b41c61 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -61,7 +61,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte maEdSubject ( this, CUI_RES (ED_SUBJECT) ) { // Disable display of bitmap names. - maBtAdrBook.EnableTextDisplay (FALSE); + maBtAdrBook.EnableTextDisplay (sal_False); InitStdControls(); FreeResource(); @@ -86,6 +86,9 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) maBtAdrBook.Hide(); + + maBtAdrBook.SetAccessibleRelationMemberOf( &maGrpMailNews ); + maBtAdrBook.SetAccessibleRelationLabeledBy( &maFtReceiver ); } SvxHyperlinkMailTp::~SvxHyperlinkMailTp () @@ -209,7 +212,7 @@ void SvxHyperlinkMailTp::SetScheme( const String& aScheme ) //if aScheme is empty or unknown the default beaviour is like it where MAIL const sal_Char sNewsScheme[] = INET_NEWS_SCHEME; - BOOL bMail = aScheme.SearchAscii( sNewsScheme ) != 0; + sal_Bool bMail = aScheme.SearchAscii( sNewsScheme ) != 0; //update protocol button selection: maRbtMail.Check(bMail); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index a19309b4a7d7..e2f666a1e7cb 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -60,9 +60,9 @@ using namespace ::rtl; struct TargetData { OUString aUStrLinkname; - BOOL bIsTarget; + sal_Bool bIsTarget; - TargetData ( OUString aUStrLName, BOOL bTarget ) + TargetData ( OUString aUStrLName, sal_Bool bTarget ) : bIsTarget ( bTarget ) { if ( bIsTarget ) @@ -130,8 +130,8 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent ) maBtApply( this, CUI_RES (BT_APPLY) ), maBtClose( this, CUI_RES (BT_CLOSE) ), maLbTree ( this, CUI_RES (TLB_MARK) ), - mbUserMoved ( FALSE ), - mbFirst ( TRUE ), + mbUserMoved ( sal_False ), + mbFirst ( sal_True ), mpParent ( pParent ), mnError ( LERR_NOERROR ) { @@ -142,9 +142,12 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent ) maLbTree.SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) ); // Tree-ListBox mit Linien versehen - maLbTree.SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | + maLbTree.SetStyle( maLbTree.GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | //WB_HASLINESATROOT | - WB_HSCROLL | WB_HASBUTTONSATROOT ) ); + WB_HSCROLL | WB_HASBUTTONSATROOT ); + + maLbTree.SetAccessibleName(String(CUI_RES(STR_MARK_TREE))); + } SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd() @@ -158,9 +161,9 @@ SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd() |* |************************************************************************/ -USHORT SvxHlinkDlgMarkWnd::SetError( USHORT nError) +sal_uInt16 SvxHlinkDlgMarkWnd::SetError( sal_uInt16 nError) { - USHORT nOldError = mnError; + sal_uInt16 nOldError = mnError; mnError = nError; if( mnError != LERR_NOERROR ) @@ -177,11 +180,11 @@ USHORT SvxHlinkDlgMarkWnd::SetError( USHORT nError) |* |************************************************************************/ -BOOL SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos ) +sal_Bool SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos ) { if ( !mbUserMoved ) { - BOOL bOldStatus = mbUserMoved; + sal_Bool bOldStatus = mbUserMoved; SetPosPixel ( aNewPos ); mbUserMoved = bOldStatus; } @@ -194,12 +197,12 @@ void SvxHlinkDlgMarkWnd::Move () Window::Move(); if ( IsReallyVisible() ) - mbUserMoved = TRUE; + mbUserMoved = sal_True; } -BOOL SvxHlinkDlgMarkWnd::ConnectToDialog( BOOL bDoit ) +sal_Bool SvxHlinkDlgMarkWnd::ConnectToDialog( sal_Bool bDoit ) { - BOOL bOldStatus = mbUserMoved; + sal_Bool bOldStatus = mbUserMoved; mbUserMoved = !bDoit; @@ -246,7 +249,7 @@ void SvxHlinkDlgMarkWnd::RefreshTree ( String aStrURL ) |* |************************************************************************/ -BOOL SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) +sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) { mnError = LERR_NOERROR; @@ -269,7 +272,7 @@ BOOL SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) { uno::Sequence< beans::PropertyValue > aArg(1); aArg.getArray()[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" )); - aArg.getArray()[0].Value <<= (sal_Bool) TRUE; + aArg.getArray()[0].Value <<= (sal_Bool) sal_True; xComp = xLoader->loadComponentFromURL( aURL, OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0, aArg ); } catch( const io::IOException& ) @@ -322,19 +325,19 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink { int nEntries=0; const uno::Sequence< OUString > aNames( xLinks->getElementNames() ); - const ULONG nLinks = aNames.getLength(); + const sal_uLong nLinks = aNames.getLength(); const OUString* pNames = aNames.getConstArray(); Color aMaskColor( COL_LIGHTMAGENTA ); const OUString aProp_LinkDisplayName( RTL_CONSTASCII_USTRINGPARAM( "LinkDisplayName" ) ); const OUString aProp_LinkTarget( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.LinkTarget" ) ); const OUString aProp_LinkDisplayBitmap( RTL_CONSTASCII_USTRINGPARAM( "LinkDisplayBitmap" ) ); - for( ULONG i = 0; i < nLinks; i++ ) + for( sal_uLong i = 0; i < nLinks; i++ ) { uno::Any aAny; OUString aLink( *pNames++ ); - BOOL bError = FALSE; + sal_Bool bError = sal_False; try { aAny = xLinks->getByName( aLink ); @@ -343,7 +346,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink { // if the name of the target was invalid (like empty headings) // no object can be provided - bError = TRUE; + bError = sal_True; } if(bError) continue; @@ -362,7 +365,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink // is it a target ? uno::Reference< lang::XServiceInfo > xSI( xTarget, uno::UNO_QUERY ); - BOOL bIsTarget = xSI->supportsService( aProp_LinkTarget ); + sal_Bool bIsTarget = xSI->supportsService( aProp_LinkTarget ); // create userdata TargetData *pData = new TargetData ( aLink, bIsTarget ); @@ -380,7 +383,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink pEntry = maLbTree.InsertEntry ( aStrDisplayname, aBmp, aBmp, pParentEntry, - FALSE, LIST_APPEND, + sal_False, LIST_APPEND, (void*)pData ); nEntries++; } @@ -389,7 +392,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink // insert Displayname into treelist without bitmaps pEntry = maLbTree.InsertEntry ( aStrDisplayname, pParentEntry, - FALSE, LIST_APPEND, + sal_False, LIST_APPEND, (void*)pData ); nEntries++; } @@ -399,7 +402,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink // insert Displayname into treelist without bitmaps pEntry = maLbTree.InsertEntry ( aStrDisplayname, pParentEntry, - FALSE, LIST_APPEND, + sal_False, LIST_APPEND, (void*)pData ); nEntries++; } @@ -446,14 +449,14 @@ void SvxHlinkDlgMarkWnd::ClearTree() SvLBoxEntry* SvxHlinkDlgMarkWnd::FindEntry ( String aStrName ) { - BOOL bFound=FALSE; + sal_Bool bFound=sal_False; SvLBoxEntry* pEntry = maLbTree.First(); while ( pEntry && !bFound ) { TargetData* pUserData = ( TargetData * ) pEntry->GetUserData (); if ( aStrName == String( pUserData->aUStrLinkname ) ) - bFound = TRUE; + bFound = sal_True; else pEntry = maLbTree.Next( pEntry ); } diff --git a/cui/source/dialogs/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc index f9d03f14e91c..39c7b2d53d18 100644 --- a/cui/source/dialogs/hlmarkwn.hrc +++ b/cui/source/dialogs/hlmarkwn.hrc @@ -28,4 +28,7 @@ #define BT_APPLY 1 #define BT_CLOSE 2 #define TLB_MARK 3 +// IAccessibility2 implementation 2009. ------ +#define STR_MARK_TREE 5000 +// ------ IAccessibility2 implementation 2009. diff --git a/cui/source/dialogs/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src index ac0bba11e346..450afc36758f 100644 --- a/cui/source/dialogs/hlmarkwn.src +++ b/cui/source/dialogs/hlmarkwn.src @@ -76,3 +76,9 @@ String RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN { Text [ en-US ] = "Couldn't open the document." ; }; + +String STR_MARK_TREE +{ + Text [ en-US ] = "Mark Tree" ; +}; + diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 0b4abd3a03f9..4088f56ec7a4 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -96,7 +96,7 @@ SvxFramesComboBox::~SvxFramesComboBox () |* |************************************************************************/ -SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart, BOOL bAddresses ) +SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart, sal_Bool bAddresses ) : SvtURLBox ( pParent, eSmart ), DropTargetHelper ( this ), mbAccessAddress (bAddresses) @@ -168,7 +168,7 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent, mpBtScript ( NULL ), mbIsCloseDisabled ( sal_False ), mpDialog ( pParent ), - mbStdControlsInit ( FALSE ), + mbStdControlsInit ( sal_False ), aEmptyStr() { // create bookmark-window @@ -227,10 +227,13 @@ void SvxHyperlinkTabPageBase::InitStdControls () mpBtScript = new ImageButton ( this, ResId (BTN_SCRIPT, *m_pResMgr) ); mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) ); - mpBtScript->EnableTextDisplay (FALSE); + mpBtScript->EnableTextDisplay (sal_False); + + mpBtScript->SetAccessibleRelationMemberOf( mpGrpMore ); + mpBtScript->SetAccessibleRelationLabeledBy( mpFtForm ); } - mbStdControlsInit = TRUE; + mbStdControlsInit = sal_True; } /************************************************************************* @@ -239,12 +242,12 @@ void SvxHyperlinkTabPageBase::InitStdControls () |* \************************************************************************/ -BOOL SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, BOOL bDisConnectDlg ) +sal_Bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, sal_Bool bDisConnectDlg ) { - BOOL bReturn = mpMarkWnd->MoveTo ( aNewPos ); + sal_Bool bReturn = mpMarkWnd->MoveTo ( aNewPos ); if( bDisConnectDlg ) - mpMarkWnd->ConnectToDialog( FALSE ); + mpMarkWnd->ConnectToDialog( sal_False ); return ( !bReturn && IsMarkWndVisible() ); } @@ -277,7 +280,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd () { // Pos Extrawindow anywhere MoveToExtraWnd( Point(10,10) ); // very unlikely - mpMarkWnd->ConnectToDialog( FALSE ); + mpMarkWnd->ConnectToDialog( sal_False ); } else { @@ -304,7 +307,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd () void SvxHyperlinkTabPageBase::FillStandardDlgFields ( SvxHyperlinkItem* pHyperlinkItem ) { // Frame - USHORT nPos = mpCbbFrame->GetEntryPos ( pHyperlinkItem->GetTargetFrame() ); + sal_uInt16 nPos = mpCbbFrame->GetEntryPos ( pHyperlinkItem->GetTargetFrame() ); if ( nPos != LISTBOX_ENTRY_NOTFOUND) mpCbbFrame->SetText ( pHyperlinkItem->GetTargetFrame() ); @@ -356,10 +359,10 @@ void SvxHyperlinkTabPageBase::DoApply () |* \************************************************************************/ -BOOL SvxHyperlinkTabPageBase::AskApply () +sal_Bool SvxHyperlinkTabPageBase::AskApply () { // default-implementation - return TRUE; + return sal_True; } /************************************************************************* @@ -380,7 +383,7 @@ void SvxHyperlinkTabPageBase::SetMarkStr ( String& /*aStrMark*/ ) |* \************************************************************************/ -void SvxHyperlinkTabPageBase::SetOnlineMode( BOOL /*bEnable*/ ) +void SvxHyperlinkTabPageBase::SetOnlineMode( sal_Bool /*bEnable*/ ) { // default-implemtation : do nothing } @@ -402,7 +405,7 @@ void SvxHyperlinkTabPageBase::SetInitFocus() |* |************************************************************************/ -BOOL SvxHyperlinkTabPageBase::IsHTMLDoc() const +sal_Bool SvxHyperlinkTabPageBase::IsHTMLDoc() const { return ((SvxHpLinkDlg*)mpDialog)->IsHTMLDoc(); } @@ -447,9 +450,9 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG ) because if no JAVA is installed an error box occurs and then it is possible to close the HyperLinkDlg before its child (MacroAssignDlg) -> GPF */ - BOOL bIsInputEnabled = GetParent()->IsInputEnabled(); + sal_Bool bIsInputEnabled = GetParent()->IsInputEnabled(); if ( bIsInputEnabled ) - GetParent()->EnableInput( FALSE ); + GetParent()->EnableInput( sal_False ); // <-- SfxMacroAssignDlg aDlg( this, mxDocumentFrame, *pItemSet ); @@ -467,7 +470,7 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG ) SFX_EVENT_MOUSEOUT_OBJECT); if ( bIsInputEnabled ) - GetParent()->EnableInput( TRUE ); + GetParent()->EnableInput( sal_True ); // <-- // execute dlg DisableClose( sal_True ); @@ -477,7 +480,7 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG ) { const SfxItemSet* pOutSet = aDlg.GetOutputItemSet(); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, FALSE, &pItem )) + if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, sal_False, &pItem )) { pHyperlinkItem->SetMacroTable( ((SvxMacroItem*)pItem)->GetMacroTable() ); } @@ -494,7 +497,7 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG ) |* |************************************************************************/ -USHORT SvxHyperlinkTabPageBase::GetMacroEvents() +sal_uInt16 SvxHyperlinkTabPageBase::GetMacroEvents() { SvxHyperlinkItem *pHyperlinkItem = (SvxHyperlinkItem *) GetItemSet().GetItem (SID_HYPERLINK_GETLINK); @@ -516,9 +519,9 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable() |* |************************************************************************/ -BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL ) +sal_Bool SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( rURL.GetFull().getLength() > 0 ) { @@ -597,7 +600,7 @@ void SvxHyperlinkTabPageBase::GetDataFromCommonFields( String& aStrName, aStrFrame = mpCbbFrame->GetText(); eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1); if( IsHTMLDoc() ) - eMode = (SvxLinkInsertMode) ( UINT16(eMode) | HLINK_HTMLMODE ); + eMode = (SvxLinkInsertMode) ( sal_uInt16(eMode) | HLINK_HTMLMODE ); } /************************************************************************* @@ -634,7 +637,7 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet) |* |************************************************************************/ -BOOL SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) +sal_Bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) { String aStrURL, aStrName, aStrIntName, aStrFrame; SvxLinkInsertMode eMode; @@ -643,14 +646,14 @@ BOOL SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) if ( !aStrName.Len() ) //automatically create a visible name if the link is created without name aStrName = CreateUiNameFromURL(aStrURL); - USHORT nEvents = GetMacroEvents(); + sal_uInt16 nEvents = GetMacroEvents(); SvxMacroTableDtor* pTable = GetMacroTable(); SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK, aStrName, aStrURL, aStrFrame, aStrIntName, eMode, nEvents, pTable ); rOut.Put (aItem); - return TRUE; + return sal_True; } String SvxHyperlinkTabPageBase::CreateUiNameFromURL( const String& aStrURL ) @@ -717,7 +720,7 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet) GetCurentItemData ( aStrURL, aStrName, aStrIntName, aStrFrame, eMode); - USHORT nEvents = GetMacroEvents(); + sal_uInt16 nEvents = GetMacroEvents(); SvxMacroTableDtor* pTable = GetMacroTable(); if( _pSet ) @@ -730,12 +733,12 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet) return( LEAVE_PAGE ); } -BOOL SvxHyperlinkTabPageBase::ShouldOpenMarkWnd() +sal_Bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd() { - return FALSE; + return sal_False; } -void SvxHyperlinkTabPageBase::SetMarkWndShouldOpen(BOOL) +void SvxHyperlinkTabPageBase::SetMarkWndShouldOpen(sal_Bool) { } diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index 734cc181f9b3..66c9be97525d 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -56,18 +56,21 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; RadioButton RB_LINKTYP_INTERNET { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET"; Pos = MAP_APPFONT( COL_2, 13 ); Size = MAP_APPFONT( 57, 10 ); Text [ en-US ] = "~Web"; }; RadioButton RB_LINKTYP_FTP { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP"; Pos = MAP_APPFONT( 114 + COL_DIFF, 13 ); Size = MAP_APPFONT( 56 - COL_DIFF, 10 ); Text [ en-US ] = "~FTP"; }; RadioButton RB_LINKTYP_TELNET { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET"; Pos = MAP_APPFONT( 173, 13 ); Size = MAP_APPFONT( 56, 10 ); Text [ en-US ] = "~Telnet"; @@ -86,6 +89,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; Edit ED_LOGIN { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 42 ) ; Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ; @@ -98,6 +102,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; Edit ED_PASSWD { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 59 ) ; Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ; @@ -105,6 +110,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; CheckBox CBX_ANONYMOUS { + HelpID = "cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS"; Pos = MAP_APPFONT ( COL_2 , 75 ) ; Size = MAP_APPFONT ( 89 - COL_DIFF , 10 ) ; TabStop = TRUE ; @@ -112,6 +118,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; ImageButton BTN_BROWSE { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE"; Pos = MAP_APPFONT ( 235, 24 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -127,6 +134,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET ImageButton BTN_TARGET { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET"; Pos = MAP_APPFONT ( 235, 40+2 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -154,6 +162,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; ComboBox CB_FRAME { + HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 104 ) ; Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; @@ -169,6 +178,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; ListBox LB_FORM { + HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM"; Border = TRUE ; Pos = MAP_APPFONT ( 160 , 104 ) ; Size = MAP_APPFONT ( 70 , 60 ) ; @@ -190,6 +200,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; Edit ED_INDICATION { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 122 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; @@ -202,12 +213,14 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; Edit ED_TEXT { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 139 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; }; ImageButton BTN_SCRIPT { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT"; Pos = MAP_APPFONT ( 235, 103-1 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -245,12 +258,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; RadioButton RB_LINKTYP_MAIL { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL"; Pos = MAP_APPFONT( COL_2, 13 ); Size = MAP_APPFONT( 56 - COL_DIFF, 10 ); Text [ en-US ] = "~E-mail"; }; RadioButton RB_LINKTYP_NEWS { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS"; Pos = MAP_APPFONT( 113, 13 ); Size = MAP_APPFONT( 56, 10 ); Text [ en-US ] = "~News"; @@ -269,12 +284,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; Edit ED_SUBJECT { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 42 ) ; Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ; }; ImageButton BTN_ADRESSBOOK { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK"; Pos = MAP_APPFONT ( 235, 24 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -303,6 +320,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; ComboBox CB_FRAME { + HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 104 ) ; Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; @@ -318,6 +336,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; ListBox LB_FORM { + HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM"; Border = TRUE ; Pos = MAP_APPFONT ( 160 , 104 ) ; Size = MAP_APPFONT ( 70 , 60 ) ; @@ -339,6 +358,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; Edit ED_INDICATION { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 122 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; @@ -351,12 +371,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; Edit ED_TEXT { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 139 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; }; ImageButton BTN_SCRIPT { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT"; Pos = MAP_APPFONT ( 235, 103-1 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -399,6 +421,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; ImageButton BTN_FILEOPEN { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN"; Pos = MAP_APPFONT ( 235, 14 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -424,6 +447,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Edit ED_TARGET_DOC { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 52 ) ; Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ; @@ -442,6 +466,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; ImageButton BTN_BROWSE { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE"; Pos = MAP_APPFONT ( 235, 51 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -468,6 +493,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; ComboBox CB_FRAME { + HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 104 ) ; Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; @@ -483,6 +509,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; ListBox LB_FORM { + HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM"; Border = TRUE ; Pos = MAP_APPFONT ( 160 , 104 ) ; Size = MAP_APPFONT ( 70 , 60 ) ; @@ -504,6 +531,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Edit ED_INDICATION { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 122 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; @@ -516,12 +544,14 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Edit ED_TEXT { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 139 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; }; ImageButton BTN_SCRIPT { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT"; Pos = MAP_APPFONT ( 235, 103-1 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -558,12 +588,14 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; RadioButton RB_EDITNOW { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW"; Pos = MAP_APPFONT( COL_2, 13 ); Size = MAP_APPFONT( 85 - COL_DIFF, 10 ); Text [ en-US ] = "Edit ~now"; }; RadioButton RB_EDITLATER { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER"; Pos = MAP_APPFONT( 142, 13 ); Size = MAP_APPFONT( 84, 10 ); Text [ en-US ] = "Edit ~later"; @@ -576,6 +608,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; Edit ED_PATH_NEWDOC { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 25 ) ; Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ; @@ -588,6 +621,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; ListBox LB_DOCUMENT_TYPES { + HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 42 ) ; Size = MAP_APPFONT ( 176 - COL_DIFF , 40 ) ; @@ -596,6 +630,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; ImageButton BTN_CREATE { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE"; Pos = MAP_APPFONT ( 235, 24 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -623,6 +658,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; ComboBox CB_FRAME { + HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 104 ) ; Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; @@ -638,6 +674,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; ListBox LB_FORM { + HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM"; Border = TRUE ; Pos = MAP_APPFONT ( 160 , 104 ) ; Size = MAP_APPFONT ( 70 , 60 ) ; @@ -659,6 +696,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; Edit ED_INDICATION { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 122 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; @@ -671,12 +709,14 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; Edit ED_TEXT { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 139 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; }; ImageButton BTN_SCRIPT { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT"; Pos = MAP_APPFONT ( 235, 103-1 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -697,7 +737,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT *************************************************************************/ ModalDialog RID_SVXDLG_NEWHYPERLINK { - HelpID = SID_HYPERLINK_DIALOG; + HelpID = CMD_SID_HYPERLINK_DIALOG; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 325 , 185 ) ; diff --git a/cui/source/dialogs/hyphen.hrc b/cui/source/dialogs/hyphen.hrc index f76e2aa75770..f76e2aa75770 100755..100644 --- a/cui/source/dialogs/hyphen.hrc +++ b/cui/source/dialogs/hyphen.hrc diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src index 06547352b35d..f8bf26202bfa 100755..100644 --- a/cui/source/dialogs/hyphen.src +++ b/cui/source/dialogs/hyphen.src @@ -52,6 +52,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; Edit ED_WORD { + HelpID = "cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD"; BORDER = TRUE ; Pos = MAP_APPFONT ( 5 , 17 ) ; Size = MAP_APPFONT ( 132 , 12 ) ; @@ -60,6 +61,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; ImageButton BTN_LEFT { + HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT"; Pos = MAP_APPFONT ( 56 , 33 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TABSTOP = TRUE ; @@ -67,6 +69,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; ImageButton BTN_RIGHT { + HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT"; Pos = MAP_APPFONT ( 75 , 33 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TABSTOP = TRUE ; @@ -82,6 +85,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; PushButton BTN_HYPH_CONTINUE { + HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE"; Pos = MAP_APPFONT ( 144 , 35 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Skip" ; @@ -89,6 +93,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; PushButton BTN_HYPH_DELETE { + HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE"; Pos = MAP_APPFONT ( 144 , 52 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Remove" ; @@ -107,6 +112,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; PushButton BTN_HYPH_ALL { + HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL"; Pos = MAP_APPFONT ( 63 , 93 ) ; Size = MAP_APPFONT ( 74 , 14 ) ; Text [ en-US ] = "Hyphenate ~All" ; diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index ddeb7040bbdd..8adc57ddc7ba 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -55,7 +55,7 @@ int IconcDlgCmpUS_Impl( const void* p1, const void* p2 ) #endif #endif { - return *(USHORT*)p1 - *(USHORT*)p2; + return *(sal_uInt16*)p1 - *(sal_uInt16*)p2; } // some stuff for easier changes for SvtViewOptions @@ -93,9 +93,9 @@ IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId, const SfxItemSet &rAttrSet ) : TabPage ( pParent, rResId ), pSet ( &rAttrSet ), - bHasExchangeSupport ( FALSE ), + bHasExchangeSupport ( sal_False ), pDialog ( NULL ), - bStandard ( FALSE ) + bStandard ( sal_False ) { SetStyle ( GetStyle() | WB_DIALOGCONTROL | WB_HIDE ); } @@ -135,9 +135,9 @@ void IconChoicePage::FillUserData() // ----------------------------------------------------------------------- -BOOL IconChoicePage::IsReadOnly() const +sal_Bool IconChoicePage::IsReadOnly() const { - return FALSE; + return sal_False; } // ----------------------------------------------------------------------- @@ -149,56 +149,6 @@ sal_Bool IconChoicePage::QueryClose() /********************************************************************** | -| handling itemsets -| -\**********************************************************************/ - -const SfxPoolItem* IconChoicePage::GetItem( const SfxItemSet& rSet, - USHORT nSlot ) -{ - const SfxItemPool* pPool = rSet.GetPool(); - USHORT nWh = pPool->GetWhich( nSlot ); - const SfxPoolItem* pItem = 0; - rSet.GetItemState( nWh, TRUE, &pItem ); - - if ( !pItem && nWh != nSlot ) - pItem = &pPool->GetDefaultItem( nWh ); - - return pItem; -} - -// ----------------------------------------------------------------------- - -const SfxPoolItem* IconChoicePage::GetOldItem( const SfxItemSet& rSet, - USHORT nSlot ) -{ - const SfxItemSet& rOldSet = GetItemSet(); - USHORT nWh = GetWhich( nSlot ); - const SfxPoolItem* pItem = 0; - - if ( bStandard && rOldSet.GetParent() ) - pItem = GetItem( *rOldSet.GetParent(), nSlot ); - else if ( rSet.GetParent() && SFX_ITEM_DONTCARE == rSet.GetItemState( nWh ) ) - pItem = GetItem( *rSet.GetParent(), nSlot ); - else - pItem = GetItem( rOldSet, nSlot ); - - return pItem; -} - -// ----------------------------------------------------------------------- - -const SfxPoolItem* IconChoicePage::GetExchangeItem( const SfxItemSet& rSet, - USHORT nSlot ) -{ - if ( pDialog && !pDialog->IsInOK() && pDialog->GetExampleSet() ) - return GetItem( *pDialog->GetExampleSet(), nSlot ); - else - return GetOldItem( rSet, nSlot ); -} - -/********************************************************************** -| | window-methods | \**********************************************************************/ @@ -208,16 +158,16 @@ void IconChoicePage::ImplInitSettings() Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { - EnableChildTransparentMode( TRUE ); + EnableChildTransparentMode( sal_True ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( TRUE ); + SetPaintTransparent( sal_True ); SetBackground(); } else { - EnableChildTransparentMode( FALSE ); + EnableChildTransparentMode( sal_False ); SetParentClipMode( 0 ); - SetPaintTransparent( FALSE ); + SetPaintTransparent( sal_False ); if ( IsControlBackground() ) SetBackground( GetControlBackground() ); @@ -285,18 +235,18 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, pRanges ( NULL ), nResId ( rResId.GetId() ), - bHideResetBtn ( FALSE ), - bModal ( FALSE ), - bInOK ( FALSE ), - bModified ( FALSE ), - bItemsReset ( FALSE ) + bHideResetBtn ( sal_False ), + bModal ( sal_False ), + bInOK ( sal_False ), + bModified ( sal_False ), + bItemsReset ( sal_False ) { maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN ); SetCtrlPos ( meChoicePos ); maIconCtrl.SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) ); maIconCtrl.Show(); - maIconCtrl.SetChoiceWithCursor ( TRUE ); + maIconCtrl.SetChoiceWithCursor ( sal_True ); maIconCtrl.SetSelectionMode( SINGLE_SELECTION ); maIconCtrl.SetHelpId( HID_ICCDIALOG_CHOICECTRL ); @@ -319,7 +269,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, aHelpBtn.Show(); aResetBtn.Show(); - SetPosSizeCtrls ( TRUE ); + SetPosSizeCtrls ( sal_True ); } // ----------------------------------------------------------------------- @@ -358,7 +308,7 @@ IconChoiceDialog ::~IconChoiceDialog () for ( ULONG i=0; i < maIconCtrl.GetEntryCount(); i++) { SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i ); - USHORT* pUserData = (USHORT*) pEntry->GetUserData(); + sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData(); delete pUserData; } @@ -376,13 +326,13 @@ IconChoiceDialog ::~IconChoiceDialog () \**********************************************************************/ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( - USHORT nId, + sal_uInt16 nId, const String& rIconText, const Image& rChoiceIcon, CreatePage pCreateFunc /* != 0 */, GetPageRanges pRangesFunc /* darf 0 sein */, - BOOL bItemsOnDemand, - ULONG /*nPos*/ + sal_Bool bItemsOnDemand, + sal_uLong /*nPos*/ ) { IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc, @@ -393,7 +343,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( pData->fnGetRanges = pRangesFunc; pData->bOnDemand = bItemsOnDemand; - USHORT *pId = new USHORT ( nId ); + sal_uInt16 *pId = new sal_uInt16 ( nId ); SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon ); pEntry->SetUserData ( (void*) pId ); return pEntry; @@ -405,7 +355,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( | \**********************************************************************/ -void IconChoiceDialog::RemoveTabPage( USHORT nId ) +void IconChoiceDialog::RemoveTabPage( sal_uInt16 nId ) { IconChoicePageData* pData = GetPageData ( nId ); @@ -442,17 +392,17 @@ void IconChoiceDialog::RemoveTabPage( USHORT nId ) } // remove Icon - BOOL bFound=FALSE; + bool bFound = FALSE; for ( ULONG i=0; i<maIconCtrl.GetEntryCount() && !bFound; i++) { SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i ); - USHORT* pUserData = (USHORT*) pEntry->GetUserData(); + sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData(); if ( *pUserData == nId ) { delete pUserData; maIconCtrl.RemoveEntry ( pEntry ); - bFound = TRUE; + bFound = true; } } @@ -524,13 +474,6 @@ EIconChoicePos IconChoiceDialog::SetCtrlPos( const EIconChoicePos& rPos ) return eOldPos; } -void IconChoiceDialog::SetCtrlColor ( const Color& rColor ) -{ - Wallpaper aWallpaper ( rColor ); - maIconCtrl.SetBackground( aWallpaper ); - maIconCtrl.SetFontColorToBackground (); -} - /********************************************************************** | | Show / Hide page or button @@ -561,7 +504,7 @@ void IconChoiceDialog::RemoveResetButton() // ----------------------------------------------------------------------- -void IconChoiceDialog::ShowPage( USHORT nId ) +void IconChoiceDialog::ShowPage( sal_uInt16 nId ) { bool bInvalidate = GetCurPageId() != nId; SetCurPageId( nId ); @@ -591,7 +534,7 @@ void IconChoiceDialog::Resize() } } -void IconChoiceDialog::SetPosSizeCtrls ( BOOL bInit ) +void IconChoiceDialog::SetPosSizeCtrls ( sal_Bool bInit ) { const Point aCtrlOffset ( LogicToPixel( Point( CTRLS_OFFSET, CTRLS_OFFSET ), MAP_APPFONT ) ); Size aOutSize ( GetOutputSizePixel() ); @@ -692,7 +635,7 @@ void IconChoiceDialog::SetPosSizeCtrls ( BOOL bInit ) //////////////////////////////////////// // Buttons positionieren // - ULONG nXOffset=0; + sal_uLong nXOffset=0; if ( meChoicePos == PosRight ) nXOffset = aNewIconCtrlSize.Width()+(2*aCtrlOffset.X()); @@ -730,7 +673,7 @@ void IconChoiceDialog::SetPosSizeCtrls ( BOOL bInit ) Invalidate(); } -void IconChoiceDialog::SetPosSizePages ( USHORT nId ) +void IconChoiceDialog::SetPosSizePages ( sal_uInt16 nId ) { const Point aCtrlOffset ( LogicToPixel( Point( CTRLS_OFFSET, CTRLS_OFFSET ), MAP_APPFONT ) ); IconChoicePageData* pData = GetPageData ( nId ); @@ -786,13 +729,13 @@ void IconChoiceDialog::SetPosSizePages ( USHORT nId ) IMPL_LINK ( IconChoiceDialog , ChosePageHdl_Impl, void *, EMPTYARG ) { - ULONG nPos; + sal_uLong nPos; SvxIconChoiceCtrlEntry *pEntry = maIconCtrl.GetSelectedEntry ( nPos ); if ( !pEntry ) pEntry = maIconCtrl.GetCursor( ); - USHORT *pId = (USHORT*)pEntry->GetUserData (); + sal_uInt16 *pId = (sal_uInt16*)pEntry->GetUserData (); if( *pId != mnCurrentPageId ) { @@ -817,7 +760,7 @@ IMPL_LINK ( IconChoiceDialog , ChosePageHdl_Impl, void *, EMPTYARG ) IMPL_LINK( IconChoiceDialog, OkHdl, Button *, EMPTYARG ) { - bInOK = TRUE; + bInOK = sal_True; if ( OK_Impl() ) { @@ -910,7 +853,7 @@ void IconChoiceDialog::ActivatePageImpl () pData->pPage->Reset( *pSet ); } - pData->bRefresh = FALSE; + pData->bRefresh = sal_False; if ( pExampleSet ) pData->pPage->ActivatePage( *pExampleSet ); @@ -928,7 +871,7 @@ void IconChoiceDialog::ActivatePageImpl () // ----------------------------------------------------------------------- -BOOL IconChoiceDialog::DeActivatePageImpl () +sal_Bool IconChoiceDialog::DeActivatePageImpl () { IconChoicePageData *pData = GetPageData ( mnCurrentPageId ); @@ -980,17 +923,17 @@ BOOL IconChoiceDialog::DeActivatePageImpl () { IconChoicePageData* pObj = maPageList[ i ]; if ( pObj->pPage != pPage ) // eigene Page nicht mehr refreshen - pObj->bRefresh = TRUE; + pObj->bRefresh = sal_True; else - pObj->bRefresh = FALSE; + pObj->bRefresh = sal_False; } } } if ( nRet & IconChoicePage::LEAVE_PAGE ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } // ----------------------------------------------------------------------- @@ -1017,7 +960,7 @@ void IconChoiceDialog::ResetPageImpl () | \**********************************************************************/ -const USHORT* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) +const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) { if ( pSet ) { @@ -1035,10 +978,10 @@ const USHORT* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) IconChoicePageData* pData = maPageList[ i ]; if ( pData->fnGetRanges ) { - const USHORT* pTmpRanges = (pData->fnGetRanges)(); - const USHORT* pIter = pTmpRanges; + const sal_uInt16* pTmpRanges = (pData->fnGetRanges)(); + const sal_uInt16* pIter = pTmpRanges; - USHORT nLen; + sal_uInt16 nLen; for( nLen = 0; *pIter; ++nLen, ++pIter ) ; aUS.Insert( pTmpRanges, nLen, aUS.Count() ); @@ -1061,14 +1004,14 @@ const USHORT* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) #if defined __SUNPRO_CC #pragma disable_warn #endif - qsort( (void*)aUS.GetData(), aUS.Count(), sizeof(USHORT), IconcDlgCmpUS_Impl ); + qsort( (void*)aUS.GetData(), aUS.Count(), sizeof(sal_uInt16), IconcDlgCmpUS_Impl ); #if defined __SUNPRO_CC #pragma enable_warn #endif } - pRanges = new USHORT[aUS.Count() + 1]; - memcpy(pRanges, aUS.GetData(), sizeof(USHORT) * aUS.Count()); + pRanges = new sal_uInt16[aUS.Count() + 1]; + memcpy(pRanges, aUS.GetData(), sizeof(sal_uInt16) * aUS.Count()); pRanges[aUS.Count()] = 0; return pRanges; @@ -1091,48 +1034,14 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) // ----------------------------------------------------------------------- -// Liefert die Pages, die ihre Sets onDemand liefern, das OutputItemSet. -const SfxItemSet* IconChoiceDialog::GetOutputItemSet ( USHORT nId ) -{ - IconChoicePageData * pData = GetPageData ( nId ); - DBG_ASSERT( pData, "TabPage nicht gefunden" ); - - if ( pData ) - { - if ( !pData->pPage ) - return NULL; - - if ( pData->bOnDemand ) - return &pData->pPage->GetItemSet(); - - return pOutSet; - } - - return NULL; -} - -// ----------------------------------------------------------------------- - -int IconChoiceDialog::FillOutputItemSet() -{ - int nRet = IconChoicePage::LEAVE_PAGE; - if ( OK_Impl() ) - Ok(); - else - nRet = IconChoicePage::KEEP_PAGE; - return nRet; -} - -// ----------------------------------------------------------------------- - -void IconChoiceDialog::PageCreated( USHORT /*nId*/, IconChoicePage& /*rPage*/ ) +void IconChoiceDialog::PageCreated( sal_uInt16 /*nId*/, IconChoicePage& /*rPage*/ ) { // not interested in } // ----------------------------------------------------------------------- -SfxItemSet* IconChoiceDialog::CreateInputItemSet( USHORT ) +SfxItemSet* IconChoiceDialog::CreateInputItemSet( sal_uInt16 ) { DBG_WARNINGFILE( "CreateInputItemSet nicht implementiert" ); @@ -1157,11 +1066,11 @@ short IconChoiceDialog::Execute() // ----------------------------------------------------------------------- -void IconChoiceDialog::Start( BOOL bShow ) +void IconChoiceDialog::Start( sal_Bool bShow ) { aCancelBtn.SetClickHdl( LINK( this, IconChoiceDialog, CancelHdl ) ); - bModal = FALSE; + bModal = sal_False; Start_Impl(); @@ -1192,7 +1101,7 @@ sal_Bool IconChoiceDialog::QueryClose() void IconChoiceDialog::Start_Impl() { Point aPos; - USHORT nActPage; + sal_uInt16 nActPage; if ( mnCurrentPageId == 0 || mnCurrentPageId == USHRT_MAX ) nActPage = maPageList.front()->nId; @@ -1208,7 +1117,7 @@ void IconChoiceDialog::Start_Impl() SetWindowState( ByteString( aTabDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); // initiale TabPage aus Programm/Hilfe/Konfig - nActPage = (USHORT)aTabDlgOpt.GetPageID(); + nActPage = (sal_uInt16)aTabDlgOpt.GetPageID(); if ( USHRT_MAX != mnCurrentPageId ) nActPage = mnCurrentPageId; @@ -1240,7 +1149,7 @@ const SfxItemSet* IconChoiceDialog::GetRefreshedSet() | \**********************************************************************/ -IconChoicePageData* IconChoiceDialog::GetPageData ( USHORT nId ) +IconChoicePageData* IconChoiceDialog::GetPageData ( sal_uInt16 nId ) { IconChoicePageData *pRet = NULL; for ( size_t i=0; i < maPageList.size(); i++ ) @@ -1261,7 +1170,7 @@ IconChoicePageData* IconChoiceDialog::GetPageData ( USHORT nId ) | \**********************************************************************/ -BOOL IconChoiceDialog::OK_Impl() +sal_Bool IconChoiceDialog::OK_Impl() { IconChoicePage* pPage = GetPageData ( mnCurrentPageId )->pPage; @@ -1272,7 +1181,7 @@ BOOL IconChoiceDialog::OK_Impl() if ( pSet ) { SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( pPage->HasExchangeSupport() ) nRet = pPage->DeactivatePage( &aTmp ); @@ -1284,7 +1193,7 @@ BOOL IconChoiceDialog::OK_Impl() pOutSet->Put( aTmp ); } else if ( bRet ) - bModified |= TRUE; + bModified |= sal_True; } else nRet = pPage->DeactivatePage( NULL ); @@ -1298,16 +1207,16 @@ BOOL IconChoiceDialog::OK_Impl() short IconChoiceDialog::Ok() { - bInOK = TRUE; + bInOK = sal_True; if ( !pOutSet ) { if ( !pExampleSet && pSet ) - pOutSet = pSet->Clone( FALSE ); // ohne Items + pOutSet = pSet->Clone( sal_False ); // ohne Items else if ( pExampleSet ) pOutSet = new SfxItemSet( *pExampleSet ); } - BOOL _bModified = FALSE; + sal_Bool _bModified = sal_False; for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) { @@ -1329,7 +1238,7 @@ short IconChoiceDialog::Ok() if ( pPage->FillItemSet( aTmp ) ) { - _bModified |= TRUE; + _bModified |= sal_True; pExampleSet->Put( aTmp ); pOutSet->Put( aTmp ); } @@ -1338,27 +1247,20 @@ short IconChoiceDialog::Ok() } if ( _bModified || ( pOutSet && pOutSet->Count() > 0 ) ) - _bModified |= TRUE; + _bModified |= sal_True; return _bModified ? RET_OK : RET_CANCEL; } // ----------------------------------------------------------------------- -BOOL IconChoiceDialog::IsInOK() const -{ - return bInOK; -} - -// ----------------------------------------------------------------------- - -void IconChoiceDialog::FocusOnIcon( USHORT nId ) +void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId ) { // set focus to icon for the current visible page - for ( USHORT i=0; i<maIconCtrl.GetEntryCount(); i++) + for ( sal_uInt16 i=0; i<maIconCtrl.GetEntryCount(); i++) { SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i ); - USHORT* pUserData = (USHORT*) pEntry->GetUserData(); + sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData(); if ( pUserData && *pUserData == nId ) { @@ -1368,11 +1270,5 @@ void IconChoiceDialog::FocusOnIcon( USHORT nId ) } } -// ----------------------------------------------------------------------- - -void IconChoiceDialog::CreateIconTextAutoMnemonics( void ) -{ - maIconCtrl.CreateAutoMnemonics(); -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 041ef64e5d26..891761fcf368 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -94,9 +94,9 @@ static String impl_getSvtResString( sal_uInt32 nId ) return aRet; } -BOOL InsertObjectDialog_Impl::IsCreateNew() const +sal_Bool InsertObjectDialog_Impl::IsCreateNew() const { - return FALSE; + return sal_False; } uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified( ::rtl::OUString* /*pGraphicMediaType*/ ) @@ -194,11 +194,6 @@ void SvInsertOleDlg::SelectDefault() aLbObjecttype.SelectEntryPos( 0 ); } -void SvInsertOleDlg::FillObjectServerList( SvObjectServerList* pList ) -{ - pList->FillInsertObjects(); -} - // ----------------------------------------------------------------------- SvInsertOleDlg::SvInsertOleDlg ( @@ -209,11 +204,11 @@ SvInsertOleDlg::SvInsertOleDlg : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OLEOBJECT ), xStorage ), aRbNewObject( this, CUI_RES( RB_NEW_OBJECT ) ), aRbObjectFromfile( this, CUI_RES( RB_OBJECT_FROMFILE ) ), + aGbObject( this, CUI_RES( GB_OBJECT ) ), aLbObjecttype( this, CUI_RES( LB_OBJECTTYPE ) ), aEdFilepath( this, CUI_RES( ED_FILEPATH ) ), aBtnFilepath( this, CUI_RES( BTN_FILEPATH ) ), aCbFilelink( this, CUI_RES( CB_FILELINK ) ), - aGbObject( this, CUI_RES( GB_OBJECT ) ), aOKButton1( this, CUI_RES( 1 ) ), aCancelButton1( this, CUI_RES( 1 ) ), aHelpButton1( this, CUI_RES( 1 ) ), @@ -227,8 +222,9 @@ SvInsertOleDlg::SvInsertOleDlg Link aLink( LINK( this, SvInsertOleDlg, RadioHdl ) ); aRbNewObject.SetClickHdl( aLink ); aRbObjectFromfile.SetClickHdl( aLink ); - aRbNewObject.Check( TRUE ); + aRbNewObject.Check( sal_True ); RadioHdl( NULL ); + aBtnFilepath.SetAccessibleRelationMemberOf(&aGbObject); } short SvInsertOleDlg::Execute() @@ -244,10 +240,10 @@ short SvInsertOleDlg::Execute() // fill listbox and select default ListBox& rBox = GetObjectTypes(); - rBox.SetUpdateMode( FALSE ); - for ( ULONG i = 0; i < m_pServers->Count(); i++ ) + rBox.SetUpdateMode( sal_False ); + for ( sal_uLong i = 0; i < m_pServers->Count(); i++ ) rBox.InsertEntry( (*m_pServers)[i].GetHumanName() ); - rBox.SetUpdateMode( TRUE ); + rBox.SetUpdateMode( sal_True ); SelectDefault(); ::rtl::OUString aName; @@ -255,8 +251,8 @@ short SvInsertOleDlg::Execute() if ( m_xStorage.is() && ( nRet = Dialog::Execute() ) == RET_OK ) { String aFileName; - BOOL bLink = FALSE; - BOOL bCreateNew = IsCreateNew(); + sal_Bool bLink = sal_False; + sal_Bool bCreateNew = IsCreateNew(); if ( bCreateNew ) { // create and insert new embedded object @@ -452,11 +448,11 @@ IMPL_LINK( SvInsertPlugInDialog, BrowseHdl, PushButton *, EMPTYARG ) SvInsertPlugInDialog::SvInsertPlugInDialog( Window* pParent, const uno::Reference < embed::XStorage >& xStorage ) : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_PLUGIN ), xStorage ), + aGbFileurl( this, CUI_RES( GB_FILEURL ) ), aEdFileurl( this, CUI_RES( ED_FILEURL ) ), aBtnFileurl( this, CUI_RES( BTN_FILEURL ) ), - aGbFileurl( this, CUI_RES( GB_FILEURL ) ), - aEdPluginsOptions( this, CUI_RES( ED_PLUGINS_OPTIONS ) ), aGbPluginsOptions( this, CUI_RES( GB_PLUGINS_OPTIONS ) ), + aEdPluginsOptions( this, CUI_RES( ED_PLUGINS_OPTIONS ) ), aOKButton1( this, CUI_RES( 1 ) ), aCancelButton1( this, CUI_RES( 1 ) ), aHelpButton1( this, CUI_RES( 1 ) ), @@ -475,7 +471,7 @@ SvInsertPlugInDialog::~SvInsertPlugInDialog() static void Plugin_ImplFillCommandSequence( const String& aCommands, uno::Sequence< beans::PropertyValue >& aCommandSequence ) { - USHORT nEaten; + sal_uInt16 nEaten; SvCommandList aLst; aLst.AppendCommands( aCommands, &nEaten ); @@ -645,7 +641,7 @@ short SvInsertAppletDialog::Execute() m_aClass.Erase(); m_aCommands.Erase(); - BOOL bOK = FALSE; + sal_Bool bOK = sal_False; uno::Reference < beans::XPropertySet > xSet; if ( m_xObj.is() ) { @@ -672,7 +668,7 @@ short SvInsertAppletDialog::Execute() String aText( CUI_RES( STR_EDIT_APPLET ) ); SetText( aText ); - bOK = TRUE; + bOK = sal_True; } catch ( uno::Exception& ) { @@ -701,7 +697,7 @@ short SvInsertAppletDialog::Execute() { try { - BOOL bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE; + sal_Bool bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE; if ( bIPActive ) m_xObj->changeState( embed::EmbedStates::RUNNING ); @@ -742,22 +738,23 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, , aFTURL ( this, CUI_RES( FT_URL ) ) , aEDURL ( this, CUI_RES( ED_URL ) ) , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) ) + + , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) ) , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) ) , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) ) , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) ) - , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) ) , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) ) + , aFLFrameBorder( this, CUI_RES( GB_BORDER ) ) , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) ) , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) ) - , aFLFrameBorder( this, CUI_RES( GB_BORDER ) ) , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) ) + , aFLMargin( this, CUI_RES( GB_MARGIN ) ) , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) ) , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) ) , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) ) , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) ) , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) - , aFLMargin( this, CUI_RES( GB_MARGIN ) ) , aOKButton1( this, CUI_RES( 1 ) ) , aCancelButton1( this, CUI_RES( 1 ) ) , aHelpButton1( this, CUI_RES( 1 ) ) @@ -786,22 +783,25 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, con , aFTURL ( this, CUI_RES( FT_URL ) ) , aEDURL ( this, CUI_RES( ED_URL ) ) , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) ) + + , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) ) , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) ) , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) ) , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) ) - , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) ) + , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) ) + , aFLFrameBorder( this, CUI_RES( GB_BORDER ) ) , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) ) , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) ) - , aFLFrameBorder( this, CUI_RES( GB_BORDER ) ) + , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) ) + , aFLMargin( this, CUI_RES( GB_MARGIN ) ) , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) ) , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) ) , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) ) , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) ) , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) - , aFLMargin( this, CUI_RES( GB_MARGIN ) ) , aOKButton1( this, CUI_RES( 1 ) ) , aCancelButton1( this, CUI_RES( 1 ) ) , aHelpButton1( this, CUI_RES( 1 ) ) @@ -828,7 +828,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, con short SfxInsertFloatingFrameDialog::Execute() { short nRet = RET_OK; - BOOL bOK = FALSE; + sal_Bool bOK = sal_False; uno::Reference < beans::XPropertySet > xSet; if ( m_xObj.is() ) { @@ -851,10 +851,10 @@ short SfxInsertFloatingFrameDialog::Execute() if ( nSize == SIZE_NOT_SET ) { - aCBMarginWidthDefault.Check( TRUE ); + aCBMarginWidthDefault.Check( sal_True ); aNMMarginWidth.SetText( String::CreateFromInt32( DEFAULT_MARGIN_WIDTH ) ); - aFTMarginWidth.Enable( FALSE ); - aNMMarginWidth.Enable( FALSE ); + aFTMarginWidth.Enable( sal_False ); + aNMMarginWidth.Enable( sal_False ); } else aNMMarginWidth.SetText( String::CreateFromInt32( nSize ) ); @@ -864,17 +864,17 @@ short SfxInsertFloatingFrameDialog::Execute() if ( nSize == SIZE_NOT_SET ) { - aCBMarginHeightDefault.Check( TRUE ); + aCBMarginHeightDefault.Check( sal_True ); aNMMarginHeight.SetText( String::CreateFromInt32( DEFAULT_MARGIN_HEIGHT ) ); - aFTMarginHeight.Enable( FALSE ); - aNMMarginHeight.Enable( FALSE ); + aFTMarginHeight.Enable( sal_False ); + aNMMarginHeight.Enable( sal_False ); } else aNMMarginHeight.SetText( String::CreateFromInt32( nSize ) ); - BOOL bScrollOn = FALSE; - BOOL bScrollOff = FALSE; - BOOL bScrollAuto = FALSE; + sal_Bool bScrollOn = sal_False; + sal_Bool bScrollOff = sal_False; + sal_Bool bScrollAuto = sal_False; sal_Bool bSet = sal_False; aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll") ) ); @@ -887,7 +887,7 @@ short SfxInsertFloatingFrameDialog::Execute() bScrollOff = !bSet; } else - bScrollAuto = TRUE; + bScrollAuto = sal_True; aRBScrollingOn.Check( bScrollOn ); aRBScrollingOff.Check( bScrollOff ); @@ -904,8 +904,8 @@ short SfxInsertFloatingFrameDialog::Execute() aRBFrameBorderOff.Check( !bSet ); } - SetUpdateMode( TRUE ); - bOK = TRUE; + SetUpdateMode( sal_True ); + bOK = sal_True; } catch ( uno::Exception& ) { @@ -945,7 +945,7 @@ short SfxInsertFloatingFrameDialog::Execute() { try { - BOOL bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE; + sal_Bool bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE; if ( bIPActive ) m_xObj->changeState( embed::EmbedStates::RUNNING ); diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index e6653d01b6b9..d514ef431254 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -42,7 +42,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const return static_cast< sal_uInt16 >( aCountEdit.GetValue() ); } -SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) +SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& sHelpId ) : ModalDialog( pParent, CUI_RES(DLG_INS_ROW_COL) ), aCount( this, CUI_RES( FT_COUNT ) ), aCountEdit( this, CUI_RES( ED_COUNT ) ), @@ -68,7 +68,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) aTmp += aRow; } SetText( aTmp ); - SetHelpId( nHelpId ); + SetHelpId( sHelpId ); } short SvxInsRowColDlg::Execute(void) diff --git a/cui/source/dialogs/insrc.src b/cui/source/dialogs/insrc.src index 69f934a29049..f655620bcd54 100644 --- a/cui/source/dialogs/insrc.src +++ b/cui/source/dialogs/insrc.src @@ -31,6 +31,7 @@ ModalDialog DLG_INS_ROW_COL { + HelpID = "cui:ModalDialog:DLG_INS_ROW_COL"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 136 , 84 ) ; @@ -57,6 +58,7 @@ ModalDialog DLG_INS_ROW_COL }; RadioButton CB_POS_BEFORE { + HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE"; Pos = MAP_APPFONT ( 12 , 49 ) ; Size = MAP_APPFONT ( 56 , 10 ) ; Text [ en-US ] = "~Before" ; @@ -64,6 +66,7 @@ ModalDialog DLG_INS_ROW_COL }; RadioButton CB_POS_AFTER { + HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER"; Pos = MAP_APPFONT ( 12 , 62 ) ; Size = MAP_APPFONT ( 56 , 10 ) ; Text [ en-US ] = "A~fter" ; @@ -72,6 +75,7 @@ ModalDialog DLG_INS_ROW_COL }; NumericField ED_COUNT { + HelpID = "cui:NumericField:DLG_INS_ROW_COL:ED_COUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 44 , 14 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index eb1fe3432895..9d9b2cece04d 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -72,27 +72,28 @@ static long nTabs[] = }; -SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml ) +SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, sal_Bool bHtml ) : ModalDialog( pParent, CUI_RES( MD_UPDATE_BASELINKS ) ), aFtFiles( this, CUI_RES( FT_FILES ) ), aFtLinks( this, CUI_RES( FT_LINKS ) ), aFtType( this, CUI_RES( FT_TYPE ) ), aFtStatus( this, CUI_RES( FT_STATUS ) ), - aCancelButton1( this, CUI_RES( 1 ) ), - aHelpButton1( this, CUI_RES( 1 ) ), - aPbUpdateNow( this, CUI_RES( PB_UPDATE_NOW ) ), - aPbOpenSource( this, CUI_RES( PB_OPEN_SOURCE ) ), - aPbChangeSource( this, CUI_RES( PB_CHANGE_SOURCE ) ), - aPbBreakLink( this, CUI_RES( PB_BREAK_LINK ) ), + aTbLinks( this, CUI_RES(TB_LINKS ) ), aFtFiles2( this, CUI_RES( FT_FILES2 ) ), + aFtFullFileName( this, CUI_RES( FT_FULL_FILE_NAME ) ), aFtSource2( this, CUI_RES( FT_SOURCE2 ) ), + aFtFullSourceName( this, CUI_RES( FT_FULL_SOURCE_NAME ) ), aFtType2( this, CUI_RES( FT_TYPE2 ) ), + aFtFullTypeName( this, CUI_RES( FT_FULL_TYPE_NAME ) ), aFtUpdate( this, CUI_RES( FT_UPDATE ) ), aRbAutomatic( this, CUI_RES( RB_AUTOMATIC ) ), aRbManual( this, CUI_RES( RB_MANUAL ) ), - aFtFullFileName( this, CUI_RES( FT_FULL_FILE_NAME ) ), - aFtFullSourceName( this, CUI_RES( FT_FULL_SOURCE_NAME ) ), - aFtFullTypeName( this, CUI_RES( FT_FULL_TYPE_NAME ) ), + aCancelButton1( this, CUI_RES( 1 ) ), + aHelpButton1( this, CUI_RES( 1 ) ), + aPbUpdateNow( this, CUI_RES( PB_UPDATE_NOW ) ), + aPbOpenSource( this, CUI_RES( PB_OPEN_SOURCE ) ), + aPbChangeSource( this, CUI_RES( PB_CHANGE_SOURCE ) ), + aPbBreakLink( this, CUI_RES( PB_BREAK_LINK ) ), aStrAutolink( CUI_RES( STR_AUTOLINK ) ), aStrManuallink( CUI_RES( STR_MANUALLINK ) ), aStrBrokenlink( CUI_RES( STR_BROKENLINK ) ), @@ -102,8 +103,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml aStrCloselinkmsgMulti( CUI_RES( STR_CLOSELINKMSG_MULTI ) ), aStrWaitinglink( CUI_RES( STR_WAITINGLINK ) ), pLinkMgr( NULL ), - bHtmlMode(bHtml), - aTbLinks( this, CUI_RES(TB_LINKS ) ) + bHtmlMode(bHtml) { FreeResource(); @@ -115,6 +115,12 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml // UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) ); aUpdateTimer.SetTimeout( 1000 ); + //IAccessibility2 Implementation 2009----- + // Set the ZOrder, and accessible name to the dialog's title + aTbLinks.SetZOrder(0, WINDOW_ZORDER_FIRST); + aTbLinks.SetAccessibleName(this->GetText()); + aTbLinks.SetAccessibleRelationLabeledBy(&aFtFiles); + //-----IAccessibility2 Implementation 2009 OpenSource().Hide(); @@ -141,8 +147,8 @@ SvBaseLinksDlg::~SvBaseLinksDlg() *************************************************************************/ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) { - USHORT nSelectionCount = pSvTabListBox ? - (USHORT)pSvTabListBox->GetSelectionCount() : 0; + sal_uInt16 nSelectionCount = pSvTabListBox ? + (sal_uInt16)pSvTabListBox->GetSelectionCount() : 0; if(nSelectionCount > 1) { //bei Mehrfachselektion ggf. alte Eintraege deselektieren @@ -150,16 +156,16 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) SvBaseLink* pLink = 0; pEntry = pSvTabListBox->GetHdlEntry(); pLink = (SvBaseLink*)pEntry->GetUserData(); - USHORT nObjectType = pLink->GetObjType(); + sal_uInt16 nObjectType = pLink->GetObjType(); if((OBJECT_CLIENT_FILE & nObjectType) != OBJECT_CLIENT_FILE) { - pSvTabListBox->SelectAll(FALSE); + pSvTabListBox->SelectAll(sal_False); pSvTabListBox->Select(pEntry); nSelectionCount = 1; } else { - for( USHORT i = 0; i < nSelectionCount; i++) + for( sal_uInt16 i = 0; i < nSelectionCount; i++) { pEntry = i == 0 ? pSvTabListBox->FirstSelected() : pSvTabListBox->NextSelected(pEntry); @@ -167,7 +173,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) pLink = (SvBaseLink*)pEntry->GetUserData(); DBG_ASSERT(pLink, "Wo ist der Link?"); if( (OBJECT_CLIENT_FILE & pLink->GetObjType()) != OBJECT_CLIENT_FILE ) - pSvTabListBox->Select( pEntry, FALSE ); + pSvTabListBox->Select( pEntry, sal_False ); } } @@ -180,7 +186,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) } else { - USHORT nPos; + sal_uInt16 nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); if( !pLink ) return 0; @@ -232,7 +238,7 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadio { (void)pRadioButton; - USHORT nPos; + sal_uInt16 nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); if( pLink && !( FILEOBJECT & pLink->GetObjType() ) && LINKUPDATE_ALWAYS != pLink->GetUpdateMode() ) @@ -245,7 +251,7 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioBut { (void)pRadioButton; - USHORT nPos; + sal_uInt16 nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); if( pLink && !( FILEOBJECT & pLink->GetObjType() ) && LINKUPDATE_ONCALL != pLink->GetUpdateMode()) @@ -257,17 +263,17 @@ IMPL_LINK_INLINE_END( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButto IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG ) { SvTabListBox& rListBox = Links(); - USHORT nSelCnt = (USHORT)rListBox.GetSelectionCount(); + sal_uInt16 nSelCnt = (sal_uInt16)rListBox.GetSelectionCount(); if( 255 < nSelCnt ) nSelCnt = 255; std::vector< SvBaseLink* > aLnkArr; - std::vector< USHORT > aPosArr; + std::vector< sal_uInt16 > aPosArr; SvLBoxEntry* pE = rListBox.FirstSelected(); while( pE ) { - USHORT nFndPos = (USHORT)rListBox.GetModel()->GetAbsPos( pE ); + sal_uInt16 nFndPos = (sal_uInt16)rListBox.GetModel()->GetAbsPos( pE ); if( LISTBOX_ENTRY_NOTFOUND != nFndPos ) { aLnkArr.push_back( static_cast< SvBaseLink* >( pE->GetUserData() ) ); @@ -278,17 +284,17 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG ) if( !aLnkArr.empty() ) { - for( USHORT n = 0; n < aLnkArr.size(); ++n ) + for( sal_uInt16 n = 0; n < aLnkArr.size(); ++n ) { SvBaseLinkRef xLink = aLnkArr[ n ]; // suche erstmal im Array nach dem Eintrag - for( USHORT i = 0; i < pLinkMgr->GetLinks().Count(); ++i ) + for( sal_uInt16 i = 0; i < pLinkMgr->GetLinks().Count(); ++i ) if( &xLink == *pLinkMgr->GetLinks()[ i ] ) { - xLink->SetUseCache( FALSE ); + xLink->SetUseCache( sal_False ); SetType( *xLink, aPosArr[ n ], xLink->GetUpdateMode() ); - xLink->SetUseCache( TRUE ); + xLink->SetUseCache( sal_True ); break; } } @@ -319,7 +325,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG ) { SvLBoxEntry* pSelEntry = rListBox.FirstSelected(); if( pE != pSelEntry ) - rListBox.Select( pSelEntry, FALSE ); + rListBox.Select( pSelEntry, sal_False ); rListBox.Select( pE ); rListBox.MakeVisible( pE ); } @@ -333,7 +339,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) { (void)pPushButton; - USHORT nSelectionCount = (USHORT)Links().GetSelectionCount(); + sal_uInt16 nSelectionCount = (sal_uInt16)Links().GetSelectionCount(); if(nSelectionCount > 1) { PathDialog aPathDlg( this ); @@ -354,7 +360,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) { String aPath = aPathDlg.GetPath(); - for( USHORT i = 0; i < nSelectionCount; i++) + for( sal_uInt16 i = 0; i < nSelectionCount; i++) { pEntry = i==0 ? Links().FirstSelected() : @@ -381,7 +387,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) } else { - USHORT nPos; + sal_uInt16 nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); if ( pLink && (pLink->GetLinkSourceName().Len() != 0) ) pLink->Edit( this, LINK( this, SvBaseLinksDlg, EndEditHdl ) ); @@ -393,10 +399,10 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) { (void)pPushButton; - BOOL bModified = FALSE; + sal_Bool bModified = sal_False; if(Links().GetSelectionCount() <= 1) { - USHORT nPos; + sal_uInt16 nPos; SvBaseLinkRef xLink = GetSelEntry( &nPos ); if( !xLink.Is() ) return 0; @@ -408,7 +414,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) Links().GetModel()->Remove( Links().GetEntry( nPos ) ); // falls Object noch vorhanden, dann das schliessen - BOOL bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType(); + sal_Bool bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType(); // dem Link sagen, das er aufgeloest wird! xLink->Closed(); @@ -427,7 +433,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) if( pEntry ) Links().SetCurEntry( pEntry ); } - bModified = TRUE; + bModified = sal_True; } } else @@ -447,7 +453,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) pEntry = Links().NextSelected(pEntry); } Links().RemoveSelection(); - for( ULONG i = 0; i < aLinkList.Count(); i++ ) + for( sal_uLong i = 0; i < aLinkList.Count(); i++ ) { SvBaseLinkRef xLink = aLinkList.GetObject( i ); // dem Link sagen, das er aufgeloest wird! @@ -455,7 +461,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) // falls einer vergessen hat sich auszutragen pLinkMgr->Remove( &xLink ); - bModified = TRUE; + bModified = sal_True; } //Danach alle selektierten Eintraege entfernen } @@ -485,8 +491,8 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer ) { (void)pTimer; - Links().SetUpdateMode(FALSE); - for( ULONG nPos = Links().GetEntryCount(); nPos; ) + Links().SetUpdateMode(sal_False); + for( sal_uLong nPos = Links().GetEntryCount(); nPos; ) { SvLBoxEntry* pBox = Links().GetEntry( --nPos ); SvBaseLinkRef xLink( (SvBaseLink*)pBox->GetUserData() ); @@ -498,13 +504,13 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer ) Links().SetEntryText( sCur, pBox, 3 ); } } - Links().SetUpdateMode(TRUE); + Links().SetUpdateMode(sal_True); return 0; } IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) { - USHORT nPos; + sal_uInt16 nPos; GetSelEntry( &nPos ); if( _pLink && _pLink->WasLastEditOK() ) @@ -513,23 +519,23 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) // also suche den Link im Manager, wenn der nicht mehr existiert, // dann setze fuelle die Liste komplett neu. Ansonsten braucht // nur der editierte Linkt aktualisiert werden. - BOOL bLinkFnd = FALSE; - for( USHORT n = pLinkMgr->GetLinks().Count(); n; ) + sal_Bool bLinkFnd = sal_False; + for( sal_uInt16 n = pLinkMgr->GetLinks().Count(); n; ) if( _pLink == &(*pLinkMgr->GetLinks()[ --n ]) ) { - bLinkFnd = TRUE; + bLinkFnd = sal_True; break; } if( bLinkFnd ) { - Links().SetUpdateMode(FALSE); + Links().SetUpdateMode(sal_False); Links().GetModel()->Remove( Links().GetEntry( nPos ) ); SvLBoxEntry* pToUnselect = Links().FirstSelected(); InsertEntry( *_pLink, nPos, sal_True ); if(pToUnselect) - Links().Select(pToUnselect, FALSE); - Links().SetUpdateMode(TRUE); + Links().Select(pToUnselect, sal_False); + Links().SetUpdateMode(sal_True); } else { @@ -568,7 +574,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr ) if( pNewMgr ) // Update muss vor Clear gestoppt werden - Links().SetUpdateMode( FALSE ); + Links().SetUpdateMode( sal_False ); Links().Clear(); pLinkMgr = pNewMgr; @@ -576,7 +582,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr ) if( pLinkMgr ) { SvBaseLinks& rLnks = (SvBaseLinks&)pLinkMgr->GetLinks(); - for( USHORT n = 0; n < rLnks.Count(); ++n ) + for( sal_uInt16 n = 0; n < rLnks.Count(); ++n ) { SvBaseLinkRef* pLinkRef = rLnks[ n ]; if( !pLinkRef->Is() ) @@ -596,13 +602,13 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr ) Links().Select( pEntry ); LinksSelectHdl( 0 ); } - Links().SetUpdateMode( TRUE ); + Links().SetUpdateMode( sal_True ); Links().Invalidate(); } } -void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool bSelect ) +void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uInt16 nPos, sal_Bool bSelect ) { String aEntry, sFileNm, sLinkNm, sTypeNm, sFilter; @@ -640,12 +646,12 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool Links().Select(pE); } -SvBaseLink* SvBaseLinksDlg::GetSelEntry( USHORT* pPos ) +SvBaseLink* SvBaseLinksDlg::GetSelEntry( sal_uInt16* pPos ) { SvLBoxEntry* pE = Links().FirstSelected(); - USHORT nPos; + sal_uInt16 nPos; if( pE && LISTBOX_ENTRY_NOTFOUND != - ( nPos = (USHORT)Links().GetModel()->GetAbsPos( pE ) ) ) + ( nPos = (sal_uInt16)Links().GetModel()->GetAbsPos( pE ) ) ) { DBG_ASSERT( pE, "wo kommt der leere Eintrag her?" ); @@ -657,8 +663,8 @@ SvBaseLink* SvBaseLinksDlg::GetSelEntry( USHORT* pPos ) } void SvBaseLinksDlg::SetType( SvBaseLink& rLink, - USHORT nSelPos, - USHORT nType ) + sal_uInt16 nSelPos, + sal_uInt16 nType ) { rLink.SetUpdateMode( nType ); rLink.Update(); @@ -673,8 +679,8 @@ void SvBaseLinksDlg::SetActLink( SvBaseLink * pLink ) if( pLinkMgr ) { const SvBaseLinks& rLnks = pLinkMgr->GetLinks(); - USHORT nSelect = 0; - for( USHORT n = 0; n < rLnks.Count(); ++n ) + sal_uInt16 nSelect = 0; + for( sal_uInt16 n = 0; n < rLnks.Count(); ++n ) { SvBaseLinkRef* pLinkRef = rLnks[ n ]; // #109573# only visible links have been inserted into the TreeListBox, diff --git a/cui/source/dialogs/makefile.mk b/cui/source/dialogs/makefile.mk index 12239a1ac781..67bc5962cc10 100755..100644 --- a/cui/source/dialogs/makefile.mk +++ b/cui/source/dialogs/makefile.mk @@ -42,6 +42,7 @@ CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/i SRS1NAME=dialogs SRC1FILES = \ + about.src \ charmap.src \ commonlingui.src \ cuiimapdlg.src \ @@ -72,6 +73,7 @@ SRC1FILES = \ SLOFILES+=\ + $(SLO)$/about.obj \ $(SLO)$/commonlingui.obj \ $(SLO)$/cuicharmap.obj \ $(SLO)$/cuifmsearch.obj \ diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index 4c34d9338fe8..bdae49e60979 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -74,13 +74,13 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) OSL_ENSURE( xID.is(), "AddHdl_Impl: invalid ID interface!" ); // ensure the content of files are valid - USHORT nCount = aPathLB.GetEntryCount(); - BOOL bDuplicated = FALSE; + sal_uInt16 nCount = aPathLB.GetEntryCount(); + sal_Bool bDuplicated = sal_False; try { if( nCount > 0 ) // start comparison { - USHORT i; + sal_uInt16 i; ::ucbhelper::Content & VContent = aContent; // temporary Content reference Reference< XContent > xVContent; Reference< XContentIdentifier > xVID; @@ -111,7 +111,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) { if ( 0 == xProvider->compareContentIds( xID, xVID ) ) { - bDuplicated = TRUE; + bDuplicated = sal_True; break; } } @@ -132,7 +132,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) } else { - USHORT nPos = aPathLB.InsertEntry( sInsFile, LISTBOX_APPEND ); + sal_uInt16 nPos = aPathLB.InsertEntry( sInsFile, LISTBOX_APPEND ); aPathLB.SetEntryData( nPos, (void*) new String( sInsFile ) ); } @@ -144,9 +144,9 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) IMPL_LINK( SvxMultiFileDialog, DelHdl_Impl, PushButton *, EMPTYARG ) { - USHORT nPos = aPathLB.GetSelectEntryPos(); + sal_uInt16 nPos = aPathLB.GetSelectEntryPos(); aPathLB.RemoveEntry( nPos ); - USHORT nCnt = aPathLB.GetEntryCount(); + sal_uInt16 nCnt = aPathLB.GetEntryCount(); if ( nCnt ) { @@ -161,7 +161,7 @@ IMPL_LINK( SvxMultiFileDialog, DelHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -SvxMultiFileDialog::SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed ) : +SvxMultiFileDialog::SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed ) : SvxMultiPathDialog( pParent, bEmptyAllowed ) diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 030a88b617d8..3e763779b7c8 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -53,23 +53,23 @@ using namespace ::com::sun::star::uno; struct MultiPath_Impl { - BOOL bEmptyAllowed; - BOOL bIsClassPathMode; + sal_Bool bEmptyAllowed; + sal_Bool bIsClassPathMode; bool bIsRadioButtonMode; - MultiPath_Impl( BOOL bAllowed ) : - bEmptyAllowed( bAllowed ), bIsClassPathMode( FALSE ), bIsRadioButtonMode( false ) {} + MultiPath_Impl( sal_Bool bAllowed ) : + bEmptyAllowed( bAllowed ), bIsClassPathMode( sal_False ), bIsRadioButtonMode( false ) {} }; // class SvxMultiPathDialog ---------------------------------------------- IMPL_LINK( SvxMultiPathDialog, SelectHdl_Impl, void *, EMPTYARG ) { - ULONG nCount = pImpl->bIsRadioButtonMode ? aRadioLB.GetEntryCount() : aPathLB.GetEntryCount(); + sal_uLong nCount = pImpl->bIsRadioButtonMode ? aRadioLB.GetEntryCount() : aPathLB.GetEntryCount(); bool bIsSelected = pImpl->bIsRadioButtonMode ? aRadioLB.FirstSelected() != NULL : aPathLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; - BOOL bEnable = ( pImpl->bEmptyAllowed || nCount > 1 ); + sal_Bool bEnable = ( pImpl->bEmptyAllowed || nCount > 1 ); aDelBtn.Enable( bEnable && bIsSelected ); return 0; } @@ -103,7 +103,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG ) if ( pImpl->bIsRadioButtonMode ) { - ULONG nPos = aRadioLB.GetEntryPos( sInsPath, 1 ); + sal_uLong nPos = aRadioLB.GetEntryPos( sInsPath, 1 ); if ( 0xffffffff == nPos ) //See svtools/source/contnr/svtabbx.cxx SvTabListBox::GetEntryPos { String sNewEntry( '\t' ); @@ -129,7 +129,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG ) } else { - USHORT nPos = aPathLB.InsertEntry( sInsPath, LISTBOX_APPEND ); + sal_uInt16 nPos = aPathLB.InsertEntry( sInsPath, LISTBOX_APPEND ); aPathLB.SetEntryData( nPos, (void*)new String( aURL ) ); } } @@ -147,9 +147,9 @@ IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG ) SvLBoxEntry* pEntry = aRadioLB.FirstSelected(); delete (String*)pEntry->GetUserData(); bool bChecked = aRadioLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED; - ULONG nPos = aRadioLB.GetEntryPos( pEntry ); + sal_uLong nPos = aRadioLB.GetEntryPos( pEntry ); aRadioLB.RemoveEntry( pEntry ); - ULONG nCnt = aRadioLB.GetEntryCount(); + sal_uLong nCnt = aRadioLB.GetEntryCount(); if ( nCnt ) { nCnt--; @@ -167,9 +167,9 @@ IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG ) } else { - USHORT nPos = aPathLB.GetSelectEntryPos(); + sal_uInt16 nPos = aPathLB.GetSelectEntryPos(); aPathLB.RemoveEntry( nPos ); - USHORT nCnt = aPathLB.GetEntryCount(); + sal_uInt16 nCnt = aPathLB.GetEntryCount(); if ( nCnt ) { @@ -186,7 +186,7 @@ IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- -SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) : +SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed ) : ModalDialog( pParent, CUI_RES( RID_SVXDLG_MULTIPATH ) ), @@ -218,16 +218,19 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) : aDelBtn.SetClickHdl( LINK( this, SvxMultiPathDialog, DelHdl_Impl ) ); SelectHdl_Impl( NULL ); + + aAddBtn.SetAccessibleRelationMemberOf(&aPathLB); + aDelBtn.SetAccessibleRelationMemberOf(&aPathLB); } // ----------------------------------------------------------------------- SvxMultiPathDialog::~SvxMultiPathDialog() { - USHORT nPos = aPathLB.GetEntryCount(); + sal_uInt16 nPos = aPathLB.GetEntryCount(); while ( nPos-- ) delete (String*)aPathLB.GetEntryData(nPos); - nPos = (USHORT)aRadioLB.GetEntryCount(); + nPos = (sal_uInt16)aRadioLB.GetEntryCount(); while ( nPos-- ) { SvLBoxEntry* pEntry = aRadioLB.GetEntry( nPos ); @@ -246,7 +249,7 @@ String SvxMultiPathDialog::GetPath() const if ( pImpl->bIsRadioButtonMode ) { String sWritable; - for ( USHORT i = 0; i < aRadioLB.GetEntryCount(); ++i ) + for ( sal_uInt16 i = 0; i < aRadioLB.GetEntryCount(); ++i ) { SvLBoxEntry* pEntry = aRadioLB.GetEntry(i); if ( aRadioLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) @@ -264,7 +267,7 @@ String SvxMultiPathDialog::GetPath() const } else { - for ( USHORT i = 0; i < aPathLB.GetEntryCount(); ++i ) + for ( sal_uInt16 i = 0; i < aPathLB.GetEntryCount(); ++i ) { if ( sNewPath.Len() > 0 ) sNewPath += cDelim; @@ -279,9 +282,9 @@ String SvxMultiPathDialog::GetPath() const void SvxMultiPathDialog::SetPath( const String& rPath ) { sal_Unicode cDelim = pImpl->bIsClassPathMode ? CLASSPATH_DELIMITER : SVT_SEARCHPATH_DELIMITER; - USHORT nPos, nCount = rPath.GetTokenCount( cDelim ); + sal_uInt16 nPos, nCount = rPath.GetTokenCount( cDelim ); - for ( USHORT i = 0; i < nCount; ++i ) + for ( sal_uInt16 i = 0; i < nCount; ++i ) { String sPath = rPath.GetToken( i, cDelim ); String sSystemPath; @@ -323,7 +326,7 @@ void SvxMultiPathDialog::SetPath( const String& rPath ) void SvxMultiPathDialog::SetClassPathMode() { - pImpl->bIsClassPathMode = TRUE; + pImpl->bIsClassPathMode = sal_True; SetText( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE )); aPathFL.SetText( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ) ); } diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src index a43ab32bbbf6..59ea05308786 100644 --- a/cui/source/dialogs/multipat.src +++ b/cui/source/dialogs/multipat.src @@ -47,6 +47,7 @@ ModalDialog RID_SVXDLG_MULTIPATH }; ListBox LB_MULTIPATH { + HelpID = "cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 189 , 80 ) ; @@ -70,12 +71,14 @@ ModalDialog RID_SVXDLG_MULTIPATH }; PushButton BTN_ADD_MULTIPATH { + HelpID = "cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH"; Pos = MAP_APPFONT ( 204 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add..." ; }; PushButton BTN_DEL_MULTIPATH { + HelpID = "cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH"; Pos = MAP_APPFONT ( 204 , 31 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete" ; diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src index 6d9bf1998810..aac42ff4b7ef 100644 --- a/cui/source/dialogs/newtabledlg.src +++ b/cui/source/dialogs/newtabledlg.src @@ -30,6 +30,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG { + HelpID = "cui:ModalDialog:RID_SVX_NEWTABLE_DLG"; OutputSize = TRUE; SVLook = TRUE ; Moveable = TRUE ; @@ -44,6 +45,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG }; NumericField NF_COLUMNS { + HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS"; Border = TRUE ; Pos = MAP_APPFONT ( 80 , 6 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -63,6 +65,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG }; NumericField NF_ROWS { + HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS"; Border = TRUE ; Pos = MAP_APPFONT ( 80 , 6+15 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index e4bd2dd52de7..1634739b0c2e 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -175,7 +175,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aMoreFewerOptionsBTN.Enable( bIsPasswordToModify ); if (!bIsPasswordToModify) - m_aMoreFewerOptionsBTN.Hide( TRUE ); + m_aMoreFewerOptionsBTN.Hide( sal_True ); } diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 007ffa82762b..3d034664389c 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -52,10 +52,10 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent ) aFtObjectSource( this, CUI_RES( FT_OBJECT_SOURCE ) ), aRbPaste( this, CUI_RES( RB_PASTE ) ), aRbPasteLink( this, CUI_RES( RB_PASTE_LINK ) ), - aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ), aCbDisplayAsIcon( this, CUI_RES( CB_DISPLAY_AS_ICON ) ), aPbChangeIcon( this, CUI_RES( PB_CHANGE_ICON ) ), aFlChoice( this, CUI_RES( FL_CHOICE ) ), + aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ), aOKButton1( this, CUI_RES( 1 ) ), aCancelButton1( this, CUI_RES( 1 ) ), aHelpButton1( this, CUI_RES( 1 ) ), @@ -73,6 +73,8 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent ) ObjectLB().SetSelectHdl( LINK( this, SvPasteObjectDialog, SelectHdl ) ); ObjectLB().SetDoubleClickHdl( LINK( this, SvPasteObjectDialog, DoubleClickHdl ) ); SetDefault(); + + aLbInsertList.SetAccessibleName(aFlChoice.GetText()); } void SvPasteObjectDialog::SelectObject() @@ -105,8 +107,8 @@ IMPL_LINK_INLINE_END( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox ) void SvPasteObjectDialog::SetDefault() { - bLink = FALSE; - nAspect = (USHORT)::com::sun::star::embed::Aspects::MSOLE_CONTENT; + bLink = sal_False; + nAspect = (sal_uInt16)::com::sun::star::embed::Aspects::MSOLE_CONTENT; } SvPasteObjectDialog::~SvPasteObjectDialog() @@ -129,7 +131,7 @@ void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const String& rForm delete pStr; } -ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, +sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, const DataFlavorExVector* pFormats, const TransferableObjectDescriptor* ) { @@ -143,10 +145,10 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, //Dialogbox erzeugen und fuellen String aSourceName, aTypeName; - ULONG nSelFormat = 0; + sal_uLong nSelFormat = 0; SvGlobalName aEmptyNm; - ObjectLB().SetUpdateMode( FALSE ); + ObjectLB().SetUpdateMode( sal_False ); DataFlavorExVector::iterator aIter( ((DataFlavorExVector&)*pFormats).begin() ), aEnd( ((DataFlavorExVector&)*pFormats).end() ); @@ -218,7 +220,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, } } - ObjectLB().SetUpdateMode( TRUE ); + ObjectLB().SetUpdateMode( sal_True ); SelectObject(); if( aSourceName.Len() ) @@ -239,9 +241,9 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, bLink = PasteLink().IsChecked(); if( AsIconBox().IsChecked() ) - nAspect = (USHORT)com::sun::star::embed::Aspects::MSOLE_ICON; + nAspect = (sal_uInt16)com::sun::star::embed::Aspects::MSOLE_ICON; - nSelFormat = (ULONG)ObjectLB().GetEntryData( ObjectLB().GetSelectEntryPos() ); + nSelFormat = (sal_uLong)ObjectLB().GetEntryData( ObjectLB().GetSelectEntryPos() ); } return nSelFormat; diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index e00ed70cc1a7..407a0c29d9bc 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -69,14 +69,14 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc Sequence<PluginDescription > aDescriptions( xPMgr->getPluginDescriptions() ); const PluginDescription * pDescriptions = aDescriptions.getConstArray(); - for ( UINT32 nPos = aDescriptions.getLength(); nPos--; ) + for ( sal_uInt32 nPos = aDescriptions.getLength(); nPos--; ) { const PluginDescription & rDescr = pDescriptions[nPos]; StrSet& rTypes = aMap[ rDescr.Description ]; String aExtension( rDescr.Extension ); - for ( USHORT nCnt = aExtension.GetTokenCount( ';' ); nCnt--; ) + for ( sal_uInt16 nCnt = aExtension.GetTokenCount( ';' ); nCnt--; ) { // no default plugins anymore String aExt( aExtension.GetToken( nCnt, ';' ) ); @@ -119,7 +119,7 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc } else ShowServiceNotAvailableError( NULL, - String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.plugin.PluginManager" ) ), TRUE ); + String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.plugin.PluginManager" ) ), sal_True ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 0255e3c9fc55..e16815ce84ef 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -52,7 +52,7 @@ // static ---------------------------------------------------------------- -static USHORT pRanges[] = +static sal_uInt16 pRanges[] = { SID_ATTR_POSTIT_AUTHOR, SID_ATTR_POSTIT_TEXT, @@ -63,8 +63,8 @@ static USHORT pRanges[] = SvxPostItDialog::SvxPostItDialog( Window* pParent, const SfxItemSet& rCoreSet, - BOOL bPrevNext, - BOOL bRedline ) : + sal_Bool bPrevNext, + sal_Bool bRedline ) : SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_POSTIT ) ), @@ -102,8 +102,8 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, aFont.SetWeight( WEIGHT_LIGHT ); aEditED.SetFont( aFont ); - BOOL bNew = TRUE; - USHORT nWhich = 0; + sal_Bool bNew = sal_True; + sal_uInt16 nWhich = 0; if ( !bPrevNext ) { @@ -114,9 +114,9 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_AUTHOR ); String aAuthorStr, aDateStr, aTextStr; - if ( rSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE ) + if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE ) { - bNew = FALSE; + bNew = sal_False; const SvxPostItAuthorItem& rAuthor = (const SvxPostItAuthorItem&)rSet.Get( nWhich ); aAuthorStr = rAuthor.GetValue(); @@ -126,7 +126,7 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_DATE ); - if ( rSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE ) + if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE ) { const SvxPostItDateItem& rDate = (const SvxPostItDateItem&)rSet.Get( nWhich ); @@ -140,7 +140,7 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT ); - if ( rSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE ) + if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE ) { const SvxPostItTextItem& rText = (const SvxPostItTextItem&)rSet.Get( nWhich ); @@ -157,6 +157,10 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, SetText( CUI_RESSTR( STR_NOTIZ_INSERT ) ); FreeResource(); + + aEditED.SetAccessibleRelationLabeledBy(&aEditFT); + aEditED.SetAccessibleRelationMemberOf(&aPostItFL); + aAuthorBtn.SetAccessibleRelationMemberOf(&aPostItFL); } // ----------------------------------------------------------------------- @@ -179,14 +183,14 @@ void SvxPostItDialog::ShowLastAuthor(const String& rAuthor, const String& rDate) // ----------------------------------------------------------------------- -USHORT* SvxPostItDialog::GetRanges() +sal_uInt16* SvxPostItDialog::GetRanges() { return pRanges; } // ----------------------------------------------------------------------- -void SvxPostItDialog::EnableTravel(BOOL bNext, BOOL bPrev) +void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev) { aPrevBtn.Enable(bPrev); aNextBtn.Enable(bNext); @@ -228,7 +232,7 @@ IMPL_LINK( SvxPostItDialog, Stamp, Button *, EMPTYARG ) } aStr += aLocaleWrapper.getDate(aDate); aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ", " ) ); - aStr += aLocaleWrapper.getTime(aTime, FALSE, FALSE); + aStr += aLocaleWrapper.getTime(aTime, sal_False, sal_False); aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " ----\n" ) ); diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index 2a3dc5e98a00..9b652357296b 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -27,12 +27,13 @@ // include --------------------------------------------------------------- #include <cuires.hrc> #include "postdlg.hrc" +#include "helpid.hrc" #include <svx/dialogs.hrc> // for RID_SVXDLG_POSTIT // RID_SVXDLG_POSTIT ----------------------------------------------------- ModalDialog RID_SVXDLG_POSTIT { - HelpId = SID_POSTIT ; + HelpId = HID_POSTIT_DIALOG ; OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 198 , 134 ) ; @@ -60,6 +61,7 @@ ModalDialog RID_SVXDLG_POSTIT }; MultiLineEdit ED_EDIT { + HelpID = "cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 123 , 72 ) ; @@ -92,12 +94,14 @@ ModalDialog RID_SVXDLG_POSTIT }; ImageButton BTN_PREV { + HelpID = "cui:ImageButton:RID_SVXDLG_POSTIT:BTN_PREV"; Pos = MAP_APPFONT ( 141 , 60 ) ; Size = MAP_APPFONT ( 24 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_LEFT ; }; ImageButton BTN_NEXT { + HelpID = "cui:ImageButton:RID_SVXDLG_POSTIT:BTN_NEXT"; Pos = MAP_APPFONT ( 167 , 60 ) ; Size = MAP_APPFONT ( 24 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_RIGHT ; @@ -110,6 +114,7 @@ ModalDialog RID_SVXDLG_POSTIT }; PushButton BTN_AUTHOR { + HelpID = "cui:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR"; Pos = MAP_APPFONT ( 75 , 114 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Author" ; diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 40b5ecaf20e1..182e5bb02d5d 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -92,7 +92,7 @@ SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) : FreeResource(); SetSelectionMode( SINGLE_SELECTION ); - SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | + SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION | WB_HASLINES | WB_HASLINESATROOT ); SetNodeDefaultImages(); @@ -159,7 +159,7 @@ void SFTreeListBox::deleteAllTree() void SFTreeListBox::Init( const ::rtl::OUString& language ) { - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); deleteAllTree(); @@ -262,7 +262,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) 0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL ); } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } Reference< XInterface > @@ -358,18 +358,9 @@ void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::co } } -void SFTreeListBox::UpdateEntries() -{ -} - -SvLBoxEntry* SFTreeListBox::FindEntry( SvLBoxEntry* , const String& , BYTE ) -{ - return 0; -} - long SFTreeListBox::ExpandingHdl() { - return TRUE; + return sal_True; } void SFTreeListBox::ExpandAllTrees() @@ -377,7 +368,7 @@ void SFTreeListBox::ExpandAllTrees() } SvLBoxEntry * SFTreeListBox::insertEntry( - String const & rText, USHORT nBitmap, SvLBoxEntry * pParent, + String const & rText, sal_uInt16 nBitmap, SvLBoxEntry * pParent, bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, ::rtl::OUString factoryURL ) { SvLBoxEntry * p; @@ -396,7 +387,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry( } SvLBoxEntry * SFTreeListBox::insertEntry( - String const & rText, USHORT nBitmap, SvLBoxEntry * pParent, + String const & rText, sal_uInt16 nBitmap, SvLBoxEntry * pParent, bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData ) { Image aImage; @@ -449,7 +440,7 @@ void SFTreeListBox::ExpandedHdl() // ---------------------------------------------------------------------------- // InputDialog ------------------------------------------------------------ // ---------------------------------------------------------------------------- -InputDialog::InputDialog(Window * pParent, USHORT nMode ) +InputDialog::InputDialog(Window * pParent, sal_uInt16 nMode ) : ModalDialog( pParent, CUI_RES( RID_DLG_NEWLIB ) ), aText( this, CUI_RES( FT_NEWLIB ) ), aEdit( this, CUI_RES( ED_LIBNAME ) ), @@ -478,7 +469,7 @@ InputDialog::InputDialog(Window * pParent, USHORT nMode ) Size siz, newSiz; long gap; - USHORT style = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP | + sal_uInt16 style = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP | TEXT_DRAW_LEFT | TEXT_DRAW_WORDBREAK; // get dimensions of dialog instructions control @@ -592,10 +583,6 @@ short SvxScriptOrgDialog::Execute() return nRet; } -void SvxScriptOrgDialog::EnableButton( Button& , BOOL ) -{ -} - void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) { if ( node.is() ) @@ -887,38 +874,6 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry ) return model; } -Reference< XInterface > -SvxScriptOrgDialog::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName ) -{ - Reference< XInterface > xModel; - Reference< lang::XMultiComponentFactory > mcf = - xCtx->getServiceManager(); - Reference< frame::XDesktop > desktop ( - mcf->createInstanceWithContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ), xCtx ), - UNO_QUERY ); - - Reference< container::XEnumerationAccess > componentsAccess = - desktop->getComponents(); - Reference< container::XEnumeration > components = - componentsAccess->createEnumeration(); - while (components->hasMoreElements()) - { - Reference< frame::XModel > model( - components->nextElement(), UNO_QUERY ); - if ( model.is() ) - { - ::rtl::OUString sTdocUrl = ::comphelper::DocumentInfo::getDocumentTitle( model ); - if( sTdocUrl.equals( docName ) ) - { - xModel = model; - break; - } - } - } - return xModel; -} - void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) { @@ -930,7 +885,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) { ::rtl::OUString aNewName; ::rtl::OUString aNewStdName; - USHORT nMode = INPUTMODE_NEWLIB; + sal_uInt16 nMode = INPUTMODE_NEWLIB; if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 ) { aNewStdName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Library") ) ; @@ -942,8 +897,8 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) } //do we need L10N for this? ie somethng like: //String aNewStdName( ResId( STR_STDMODULENAME ) ); - BOOL bValid = FALSE; - USHORT i = 1; + sal_Bool bValid = sal_False; + sal_uInt16 i = 1; Sequence< Reference< browse::XBrowseNode > > childNodes; // no children => ok to create Parcel1 or Script1 without checking @@ -953,7 +908,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) { aNewName = aNewStdName; aNewName += String::CreateFromInt32( i ); - bValid = TRUE; + bValid = sal_True; } else { @@ -970,7 +925,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) { aNewName = aNewStdName; aNewName += String::CreateFromInt32( i ); - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; if(childNodes.getLength() > 0 ) { ::rtl::OUString nodeName = childNodes[0]->getName(); @@ -982,7 +937,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) { if ( (aNewName+extn).equals( childNodes[index]->getName() ) ) { - bFound = TRUE; + bFound = sal_True; break; } } @@ -992,7 +947,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) } else { - bValid = TRUE; + bValid = sal_True; } } @@ -1004,12 +959,12 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) if ( xNewDlg->Execute() && xNewDlg->GetObjectName().Len() ) { ::rtl::OUString aUserSuppliedName = xNewDlg->GetObjectName(); - bValid = TRUE; + bValid = sal_True; for( sal_Int32 index = 0; index < childNodes.getLength(); index++ ) { if ( (aUserSuppliedName+extn).equals( childNodes[index]->getName() ) ) { - bValid = FALSE; + bValid = sal_False; String aError( m_createErrStr ); aError.Append( m_createDupStr ); ErrorBox aErrorBox( static_cast<Window*>(this), WB_OK | RET_OK, aError ); @@ -1119,18 +1074,18 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) extn = aNewName.copy(extnPos); aNewName = aNewName.copy(0,extnPos); } - USHORT nMode = INPUTMODE_RENAME; + sal_uInt16 nMode = INPUTMODE_RENAME; std::auto_ptr< InputDialog > xNewDlg( new InputDialog( static_cast<Window*>(this), nMode ) ); xNewDlg->SetObjectName( aNewName ); - BOOL bValid; + sal_Bool bValid; do { if ( xNewDlg->Execute() && xNewDlg->GetObjectName().Len() ) { ::rtl::OUString aUserSuppliedName = xNewDlg->GetObjectName(); - bValid = TRUE; + bValid = sal_True; if( bValid ) aNewName = aUserSuppliedName; } @@ -1226,10 +1181,10 @@ void SvxScriptOrgDialog::deleteEntry( SvLBoxEntry* pEntry ) } -BOOL SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >& xProps, +sal_Bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >& xProps, ::rtl::OUString& propName ) { - BOOL result = false; + sal_Bool result = false; try { sal_Bool bTemp = sal_False; @@ -1299,7 +1254,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() if( aStoredEntry.Len() <= 0 ) return; SvLBoxEntry* pEntry = 0; - USHORT nIndex = 0; + sal_uInt16 nIndex = 0; while ( nIndex != STRING_NOTFOUND ) { String aTmp( aStoredEntry.GetToken( 0, ';', nIndex ) ); @@ -1322,28 +1277,6 @@ void SvxScriptOrgDialog::RestorePreviousSelection() aScriptsBox.SetCurEntry( pEntry ); } -BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1, - Reference< browse::XBrowseNode > node2 ) -{ - ::rtl::OUString userStr( RTL_CONSTASCII_USTRINGPARAM("user") ); - ::rtl::OUString shareStr( RTL_CONSTASCII_USTRINGPARAM("share") ); - if( node1->getName().equals( userStr ) ) - return true; - if( node2->getName().equals( userStr ) ) - return false; - if( node1->getName().equals( shareStr ) ) - return true; - if( node2->getName().equals( shareStr ) ) - return false; - return dialogSort2( node1, node2 ); -} - -BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, - Reference< browse::XBrowseNode > node2 ) -{ - return ( node1->getName().compareTo( node2->getName() ) < 0 ); -} - ::rtl::OUString ReplaceString( const ::rtl::OUString& source, const ::rtl::OUString& token, diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src index 5a551cede7ef..0c58be37e1b1 100644 --- a/cui/source/dialogs/scriptdlg.src +++ b/cui/source/dialogs/scriptdlg.src @@ -86,6 +86,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER PushButton SF_PB_RUN { + HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN"; Pos = MAP_APPFONT ( 144 , 6 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; DefButton = TRUE; @@ -101,6 +102,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER PushButton SF_PB_CREATE { + HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE"; Size = MAP_APPFONT ( 60 , 14 ) ; Pos = MAP_APPFONT ( 144 , 60 ) ; Text [ en-US ] = "~Create..." ; @@ -108,6 +110,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER }; PushButton SF_PB_EDIT { + HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT"; Size = MAP_APPFONT ( 60 , 14 ) ; Pos = MAP_APPFONT ( 144 , 77 ) ; Text [ en-US ] = "~Edit" ; @@ -115,12 +118,14 @@ ModalDialog RID_DLG_SCRIPTORGANIZER }; PushButton SF_PB_RENAME { + HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME"; Pos = MAP_APPFONT ( 144 , 94 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Rename..." ; }; PushButton SF_PB_DEL { + HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL"; Pos = MAP_APPFONT ( 144 , 114 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Delete..." ; @@ -136,6 +141,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER }; ModalDialog RID_DLG_NEWLIB { + HelpID = "cui:ModalDialog:RID_DLG_NEWLIB"; Text [ en-US ] = "Create Library" ; Size = MAP_APPFONT ( 160 , 50 ) ; Moveable = TRUE ; @@ -162,6 +168,7 @@ ModalDialog RID_DLG_NEWLIB }; Edit ED_LIBNAME { + HelpID = "cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 59 ) ; Size = MAP_APPFONT ( 92 , 12 ) ; diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 52b9f43bd0e8..99596c1123c7 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -57,7 +57,7 @@ SvxFormatCellsDialog::~SvxFormatCellsDialog() { } -void SvxFormatCellsDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { switch( nId ) { diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src index a66622a2091a..8cede7ee380b 100644 --- a/cui/source/dialogs/showcols.src +++ b/cui/source/dialogs/showcols.src @@ -29,6 +29,7 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS { + HelpID = "cui:ModalDialog:RID_SVX_DLG_SHOWGRIDCOLUMNS"; OutputSize = TRUE; SVLook = TRUE ; Size = MAP_APPFONT( 200, 117 ); @@ -45,6 +46,7 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS ListBox 1 { + HelpID = "cui:ListBox:RID_SVX_DLG_SHOWGRIDCOLUMNS:1"; Border = TRUE; Pos = MAP_APPFONT( 6, 39 ); Size = MAP_APPFONT( 188, 55 ); diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 81591e13317f..8b408bf71203 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -36,13 +36,13 @@ SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) : SvxStandardDialog(pParent, CUI_RES(RID_SVX_SPLITCELLDLG)) +, maCountFL(this, CUI_RES(FL_COUNT)) , maCountLbl(this, CUI_RES(FT_COUNT)) , maCountEdit(this, CUI_RES(ED_COUNT)) -, maCountFL(this, CUI_RES(FL_COUNT)) +, maDirFL(this, CUI_RES(FL_DIR)) , maHorzBox(this, CUI_RES(RB_HORZ)) , maVertBox(this, CUI_RES(RB_VERT)) , maPropCB(this, CUI_RES(CB_PROP)) -, maDirFL(this, CUI_RES(FL_DIR)) , maOKBtn(this, CUI_RES(BT_OK)) , maCancelBtn(this, CUI_RES(BT_CANCEL)) , maHelpBtn( this, CUI_RES( BT_HELP ) ) @@ -55,7 +55,7 @@ SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long maVertBox.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl )); if( mnMaxVertical < 2 ) - maVertBox.Enable(FALSE); + maVertBox.Enable(sal_False); //exchange the meaning of horizontal and vertical for vertical text if(bIsTableVertical) diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src index 9f435e3169b7..6fb9a990aa38 100644 --- a/cui/source/dialogs/splitcelldlg.src +++ b/cui/source/dialogs/splitcelldlg.src @@ -30,6 +30,7 @@ ModalDialog RID_SVX_SPLITCELLDLG { + HelpID = "cui:ModalDialog:RID_SVX_SPLITCELLDLG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 169 , 108 ) ; @@ -64,6 +65,7 @@ ModalDialog RID_SVX_SPLITCELLDLG }; NumericField ED_COUNT { + HelpID = "cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 82 , 14 ) ; Size = MAP_APPFONT ( 21 , 12 ) ; @@ -85,6 +87,7 @@ ModalDialog RID_SVX_SPLITCELLDLG }; ImageRadioButton RB_HORZ { + HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ"; Pos = MAP_APPFONT ( 12 , 47 ) ; Size = MAP_APPFONT ( 90 , 18 ) ; Group = TRUE; @@ -98,12 +101,14 @@ ModalDialog RID_SVX_SPLITCELLDLG }; CheckBox CB_PROP { + HelpID = "cui:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP"; Pos = MAP_APPFONT ( 18 , 68 ) ; Size = MAP_APPFONT ( 91 , 12 ) ; Text [ en-US ] = "~Into equal proportions"; }; ImageRadioButton RB_VERT { + HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 90 , 18 ) ; Text [ en-US ] = "~Vertically" ; diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index c503061a1f44..4f8b83bc67f9 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -84,7 +84,7 @@ SvxSearchFormatDialog::~SvxSearchFormatDialog() // ----------------------------------------------------------------------- -void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) +void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) { switch ( nId ) { @@ -125,7 +125,7 @@ void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) ( (SvxParaAlignTabPage&)rPage ).EnableJustifyExt(); break; case RID_SVXPAGE_BACKGROUND : - ( (SvxBackgroundTabPage&)rPage ).ShowParaControl(TRUE); + ( (SvxBackgroundTabPage&)rPage ).ShowParaControl(sal_True); break; } } @@ -134,7 +134,7 @@ void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst, - const USHORT* pWhRanges ) : + const sal_uInt16* pWhRanges ) : ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHATTR ) ), @@ -149,7 +149,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, { FreeResource(); - aAttrLB.SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT ); + aAttrLB.SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT ); aAttrLB.GetModel()->SetSortMode( SortAscending ); aOKBtn.SetClickHdl( LINK( this, SvxSearchAttributeDialog, OKHdl ) ); @@ -161,21 +161,21 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, SfxItemPool& rPool = pSh->GetPool(); SfxItemSet aSet( rPool, pWhRanges ); SfxWhichIter aIter( aSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while ( nWhich ) { - USHORT nSlot = rPool.GetSlotId( nWhich ); + sal_uInt16 nSlot = rPool.GetSlotId( nWhich ); if ( nSlot >= SID_SVX_START ) { - BOOL bChecked = FALSE, bFound = FALSE; - for ( USHORT i = 0; !bFound && i < rList.Count(); ++i ) + sal_Bool bChecked = sal_False, bFound = sal_False; + for ( sal_uInt16 i = 0; !bFound && i < rList.Count(); ++i ) { if ( nSlot == rList[i].nSlot ) { - bFound = TRUE; + bFound = sal_True; if ( IsInvalidItem( rList[i].pItem ) ) - bChecked = TRUE; + bChecked = sal_True; } } @@ -194,7 +194,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, if ( pEntry ) { aAttrLB.SetCheckButtonState( pEntry, bChecked ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED ); - pEntry->SetUserData( (void*)(ULONG)nSlot ); + pEntry->SetUserData( (void*)(sal_uLong)nSlot ); } } nWhich = aIter.NextWhich(); @@ -211,12 +211,12 @@ IMPL_LINK( SvxSearchAttributeDialog, OKHdl, Button *, EMPTYARG ) SearchAttrItem aInvalidItem; aInvalidItem.pItem = (SfxPoolItem*)-1; - for ( USHORT i = 0; i < aAttrLB.GetEntryCount(); ++i ) + for ( sal_uInt16 i = 0; i < aAttrLB.GetEntryCount(); ++i ) { - USHORT nSlot = (USHORT)(ULONG)aAttrLB.GetEntryData(i); - BOOL bChecked = aAttrLB.IsChecked(i); + sal_uInt16 nSlot = (sal_uInt16)(sal_uLong)aAttrLB.GetEntryData(i); + sal_Bool bChecked = aAttrLB.IsChecked(i); - USHORT j; + sal_uInt16 j; for ( j = rList.Count(); j; ) { SearchAttrItem& rItem = rList[ --j ]; @@ -243,7 +243,7 @@ IMPL_LINK( SvxSearchAttributeDialog, OKHdl, Button *, EMPTYARG ) } // remove invalid items (pItem == NULL) - for ( USHORT n = rList.Count(); n; ) + for ( sal_uInt16 n = rList.Count(); n; ) if ( !rList[ --n ].pItem ) rList.Remove( n ); @@ -256,10 +256,10 @@ IMPL_LINK( SvxSearchAttributeDialog, OKHdl, Button *, EMPTYARG ) SvxSearchSimilarityDialog::SvxSearchSimilarityDialog ( Window* pParent, - BOOL bRelax, - USHORT nOther, - USHORT nShorter, - USHORT nLonger + sal_Bool bRelax, + sal_uInt16 nOther, + sal_uInt16 nShorter, + sal_uInt16 nLonger ) : ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHSIMILARITY ) ), diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src index 04265a6d6726..8131b4e68a81 100644 --- a/cui/source/dialogs/srchxtra.src +++ b/cui/source/dialogs/srchxtra.src @@ -148,6 +148,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY }; NumericField NF_OTHER { + HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER"; Pos = MAP_APPFONT ( 86 , 14 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; Border = TRUE ; @@ -169,6 +170,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY }; NumericField NF_LONGER { + HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER"; Pos = MAP_APPFONT ( 86 , 28 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; Border = TRUE ; @@ -190,6 +192,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY }; NumericField NF_SHORTER { + HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER"; Pos = MAP_APPFONT ( 86 , 44 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; Border = TRUE ; @@ -205,6 +208,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY }; CheckBox CB_RELAX { + HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX"; Pos = MAP_APPFONT ( 12 , 60 ) ; Size = MAP_APPFONT ( 98 , 10 ) ; Text [ en-US ] = "~Combine" ; diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src index 6a943a3530f2..7fe0fc886455 100644 --- a/cui/source/dialogs/svuidlg.src +++ b/cui/source/dialogs/svuidlg.src @@ -30,6 +30,7 @@ ModalDialog MD_PASTE_OBJECT { + HelpID = "cui:ModalDialog:MD_PASTE_OBJECT"; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; @@ -49,6 +50,7 @@ ModalDialog MD_PASTE_OBJECT }; RadioButton RB_PASTE { + HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 48 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; @@ -57,6 +59,7 @@ ModalDialog MD_PASTE_OBJECT }; RadioButton RB_PASTE_LINK { + HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE_LINK"; Hide = TRUE ; Pos = MAP_APPFONT ( 78 , 48 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; @@ -64,12 +67,14 @@ ModalDialog MD_PASTE_OBJECT }; ListBox LB_INSERT_LIST { + HelpID = "cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 49 ) ; Size = MAP_APPFONT ( 202 , 74 ) ; }; CheckBox CB_DISPLAY_AS_ICON { + HelpID = "cui:CheckBox:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON"; Hide = TRUE ; Disable = TRUE ; Pos = MAP_APPFONT ( 150 , 62 ) ; @@ -78,6 +83,7 @@ ModalDialog MD_PASTE_OBJECT }; PushButton PB_CHANGE_ICON { + HelpID = "cui:PushButton:MD_PASTE_OBJECT:PB_CHANGE_ICON"; Hide = TRUE ; Pos = MAP_APPFONT ( 150 , 111 ) ; Size = MAP_APPFONT ( 64 , 14 ) ; @@ -112,6 +118,7 @@ ModalDialog MD_PASTE_OBJECT }; ModalDialog MD_UPDATE_BASELINKS { + HelpID = "cui:ModalDialog:MD_UPDATE_BASELINKS"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 337 , 166 ) ; @@ -154,24 +161,28 @@ ModalDialog MD_UPDATE_BASELINKS }; PushButton PB_UPDATE_NOW { + HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW"; Pos = MAP_APPFONT ( 270 , 43 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Update" ; }; PushButton PB_OPEN_SOURCE { + HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE"; Pos = MAP_APPFONT ( 270 , 60 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Open" ; }; PushButton PB_CHANGE_SOURCE { + HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE"; Pos = MAP_APPFONT ( 270 , 77 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Modify..." ; }; PushButton PB_BREAK_LINK { + HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK"; Pos = MAP_APPFONT ( 270 , 94 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Break Link" ; @@ -202,12 +213,14 @@ ModalDialog MD_UPDATE_BASELINKS }; RadioButton RB_AUTOMATIC { + HelpID = "cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC"; Pos = MAP_APPFONT ( 70 , 150 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "~Automatic" ; }; RadioButton RB_MANUAL { + HelpID = "cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL"; Pos = MAP_APPFONT ( 133 , 150 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Ma~nual" ; @@ -262,6 +275,7 @@ ModalDialog MD_UPDATE_BASELINKS }; ModalDialog MD_LINKEDIT { + HelpID = "cui:ModalDialog:MD_LINKEDIT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 222 , 58 ) ; @@ -293,6 +307,7 @@ ModalDialog MD_LINKEDIT }; Edit ED_FULL_SOURCE_NAME { + HelpID = "cui:Edit:MD_LINKEDIT:ED_FULL_SOURCE_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 5 , 35 ) ; Size = MAP_APPFONT ( 155 , 12 ) ; @@ -301,42 +316,49 @@ ModalDialog MD_LINKEDIT }; ModalDialog MD_INSERT_OLEOBJECT { + HelpID = "cui:ModalDialog:MD_INSERT_OLEOBJECT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 284 , 105 ) ; Moveable = TRUE ; RadioButton RB_NEW_OBJECT { + HelpID = "cui:RadioButton:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 81 , 10 ) ; Text [ en-US ] = "~Create new" ; }; RadioButton RB_OBJECT_FROMFILE { + HelpID = "cui:RadioButton:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE"; Pos = MAP_APPFONT ( 90 , 6 ) ; Size = MAP_APPFONT ( 81 , 10 ) ; Text [ en-US ] = "Create from ~file" ; }; ListBox LB_OBJECTTYPE { + HelpID = "cui:ListBox:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 33 ) ; Size = MAP_APPFONT ( 204 , 60 ) ; }; Edit ED_FILEPATH { + HelpID = "cui:Edit:MD_INSERT_OLEOBJECT:ED_FILEPATH"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 33 ) ; Size = MAP_APPFONT ( 204 , 12 ) ; }; PushButton BTN_FILEPATH { + HelpID = "cui:PushButton:MD_INSERT_OLEOBJECT:BTN_FILEPATH"; Pos = MAP_APPFONT ( 166 , 48 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Search..." ; }; CheckBox CB_FILELINK { + HelpID = "cui:CheckBox:MD_INSERT_OLEOBJECT:CB_FILELINK"; Pos = MAP_APPFONT ( 12 , 48 ) ; Size = MAP_APPFONT ( 138 , 10 ) ; Text [ en-US ] = "~Link to file" ; @@ -374,18 +396,21 @@ ModalDialog MD_INSERT_OLEOBJECT }; ModalDialog MD_INSERT_OBJECT_PLUGIN { + HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_PLUGIN"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 284 , 123 ) ; Moveable = TRUE ; Edit ED_FILEURL { + HelpID = "cui:Edit:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 204 , 12 ) ; }; PushButton BTN_FILEURL { + HelpID = "cui:PushButton:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL"; Pos = MAP_APPFONT ( 166 , 29 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Browse..." ; @@ -398,6 +423,7 @@ ModalDialog MD_INSERT_OBJECT_PLUGIN }; MultiLineEdit ED_PLUGINS_OPTIONS { + HelpID = "cui:MultiLineEdit:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 66 ) ; Size = MAP_APPFONT ( 204 , 45 ) ; @@ -430,6 +456,7 @@ ModalDialog MD_INSERT_OBJECT_PLUGIN }; ModalDialog MD_INSERT_OBJECT_APPLET { + HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_APPLET"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 284 , 164 ) ; @@ -442,6 +469,7 @@ ModalDialog MD_INSERT_OBJECT_APPLET }; Edit ED_CLASSFILE { + HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 204 , 12 ) ; @@ -454,12 +482,14 @@ ModalDialog MD_INSERT_OBJECT_APPLET }; Edit ED_CLASSLOCATION { + HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 55 ) ; Size = MAP_APPFONT ( 204 , 12 ) ; }; PushButton BTN_CLASS { + HelpID = "cui:PushButton:MD_INSERT_OBJECT_APPLET:BTN_CLASS"; Pos = MAP_APPFONT ( 166 , 70 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Search..." ; @@ -472,6 +502,7 @@ ModalDialog MD_INSERT_OBJECT_APPLET }; MultiLineEdit ED_APPLET_OPTIONS { + HelpID = "cui:MultiLineEdit:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 107 ) ; Size = MAP_APPFONT ( 204 , 45 ) ; @@ -513,6 +544,7 @@ Control TB_LINKS ModalDialog MD_INSERT_OBJECT_IFRAME { + HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_IFRAME"; Size = MAP_APPFONT ( 302 , 98 ) ; Hide = TRUE ; Moveable = TRUE ; @@ -543,6 +575,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; Edit ED_FRAMENAME { + HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME"; Border = TRUE ; Pos = MAP_APPFONT ( 45 , 6 ) ; Size = MAP_APPFONT ( 178 , 12 ) ; @@ -556,6 +589,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; Edit ED_URL { + HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL"; Border = TRUE ; Pos = MAP_APPFONT ( 45 , 24 ) ; Size = MAP_APPFONT ( 178 , 12 ) ; @@ -563,6 +597,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; PushButton BT_FILEOPEN { + HelpID = "cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN"; Pos = MAP_APPFONT ( 226 , 24 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -570,6 +605,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; RadioButton RB_SCROLLINGON { + HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 54 , 10 ) ; @@ -577,6 +613,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; RadioButton RB_SCROLLINGOFF { + HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 66 ) ; Size = MAP_APPFONT ( 54 , 10 ) ; @@ -584,6 +621,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; RadioButton RB_SCROLLINGAUTO { + HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 79 ) ; Size = MAP_APPFONT ( 54 , 10 ) ; @@ -597,6 +635,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; RadioButton RB_FRMBORDER_ON { + HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON"; TabStop = TRUE ; Pos = MAP_APPFONT ( 81 , 53 ) ; Size = MAP_APPFONT ( 42 , 10 ) ; @@ -604,6 +643,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; RadioButton RB_FRMBORDER_OFF { + HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF"; TabStop = TRUE ; Pos = MAP_APPFONT ( 81 , 66 ) ; Size = MAP_APPFONT ( 42 , 10 ) ; @@ -628,6 +668,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; NumericField NM_MARGINWIDTH { + HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 167 , 54 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; @@ -641,6 +682,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; CheckBox CB_MARGINWIDTHDEFAULT { + HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINWIDTHDEFAULT"; TabStop = TRUE ; Pos = MAP_APPFONT ( 190 , 56 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; @@ -654,6 +696,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; NumericField NM_MARGINHEIGHT { + HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 167 , 72 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; @@ -667,6 +710,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; CheckBox CB_MARGINHEIGHTDEFAULT { + HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT"; TabStop = TRUE ; Pos = MAP_APPFONT ( 190 , 74 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src index 9e9d2fb6eb03..4d6b96445115 100644 --- a/cui/source/dialogs/tbxform.src +++ b/cui/source/dialogs/tbxform.src @@ -28,6 +28,7 @@ ModalDialog RID_SVX_DLG_INPUTRECORDNO { + HelpID = "cui:ModalDialog:RID_SVX_DLG_INPUTRECORDNO"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 130 , 45 ) ; @@ -43,6 +44,7 @@ ModalDialog RID_SVX_DLG_INPUTRECORDNO }; NumericField 1 { + HelpID = "cui:NumericField:RID_SVX_DLG_INPUTRECORDNO:1"; Border = TRUE ; Pos = MAP_APPFONT ( 79 , 6 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 6c28969d43f8..ddd77621f322 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -51,6 +51,7 @@ #include <i18npool/mslangid.hxx> #include <comphelper/processfactory.hxx> #include <osl/file.hxx> +#include <svl/lngmisc.hxx> #include <stack> #include <algorithm> @@ -64,35 +65,6 @@ using ::rtl::OUString; #define A2S(x) String::CreateFromAscii( x ) -// GetReplaceEditString ------------------------------- - -static void GetReplaceEditString( String &rText ) -{ - // The strings returned by the thesaurus saometimes have some - // explanation text put in between '(' and ')' or a trailing '*'. - // These parts should not be put in the ReplaceEdit Text that may get - // inserted into the document. Thus we strip them from the text. - - xub_StrLen nPos = rText.Search( sal_Unicode('(') ); - while (STRING_NOTFOUND != nPos) - { - xub_StrLen nEnd = rText.Search( sal_Unicode(')'), nPos ); - if (STRING_NOTFOUND != nEnd) - rText.Erase( nPos, nEnd-nPos+1 ); - else - break; - nPos = rText.Search( sal_Unicode('(') ); - } - - nPos = rText.Search( sal_Unicode('*') ); - if (STRING_NOTFOUND != nPos) - rText.Erase( nPos ); - - // remove any possible remaining ' ' that may confuse the thesaurus - // when it gets called with the text - rText.EraseLeadingAndTrailingChars( sal_Unicode(' ') ); -} - // class LookUpComboBox_Impl -------------------------------------------------- LookUpComboBox_Impl::LookUpComboBox_Impl( @@ -103,7 +75,7 @@ LookUpComboBox_Impl::LookUpComboBox_Impl( m_aModifyTimer.SetTimeoutHdl( LINK( this, LookUpComboBox_Impl, ModifyTimer_Hdl ) ); m_aModifyTimer.SetTimeout( 500 ); - EnableAutocomplete( FALSE ); + EnableAutocomplete( sal_False ); } LookUpComboBox_Impl::~LookUpComboBox_Impl() @@ -156,7 +128,7 @@ void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSele AlternativesString_Impl::AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl, - SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) : + SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ), m_rControlImpl( rControl ) @@ -165,7 +137,7 @@ AlternativesString_Impl::AlternativesString_Impl( void AlternativesString_Impl::Paint( const Point& rPos, - SvLBox& rDev, USHORT, + SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) { AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry ); @@ -190,7 +162,7 @@ ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( SvxCheckListBox( pParent, CUI_RES( CT_THES_ALTERNATIVES ) ), m_rDialogImpl( rImpl ) { - SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); + SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); SetHighlightRange(); } @@ -358,7 +330,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() const sal_Int32 nMeanings = aMeanings.getLength(); const uno::Reference< linguistic2::XMeaning > *pMeanings = aMeanings.getConstArray(); - m_pAlternativesCT->SetUpdateMode( FALSE ); + m_pAlternativesCT->SetUpdateMode( sal_False ); // clear old user data of control before creating new ones via AddEntry below m_pAlternativesCT->ClearExtraData(); @@ -378,7 +350,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() m_pAlternativesCT->AddEntry( -1, pSynonyms[k], false ); } - m_pAlternativesCT->SetUpdateMode( TRUE ); + m_pAlternativesCT->SetUpdateMode( sal_True ); return nMeanings > 0; } @@ -407,7 +379,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, LanguageHdl_Impl, MenuButton *, pBtn ) PopupMenu *pMenu = aLangMBtn.GetPopupMenu(); if (pMenu && pBtn) { - USHORT nItem = pBtn->GetCurItemId(); + sal_uInt16 nItem = pBtn->GetCurItemId(); String aLangText( pMenu->GetItemText( nItem ) ); LanguageType nLang = SvtLanguageTable().GetType( aLangText ); DBG_ASSERT( nLang != LANGUAGE_NONE && nLang != LANGUAGE_DONTKNOW, "failed to get language" ); @@ -443,9 +415,9 @@ IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox ) { if (pBox && !aWordCB.IsTravelSelect()) // act only upon return key and not when traveling with cursor keys { - USHORT nPos = pBox->GetSelectEntryPos(); + sal_uInt16 nPos = pBox->GetSelectEntryPos(); String aStr( pBox->GetEntry( nPos ) ); - GetReplaceEditString( aStr ); + aStr = linguistic::GetThesaurusReplaceText( aStr ); aWordCB.SetText( aStr ); LookUp_Impl(); } @@ -463,7 +435,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox if (pData && !pData->IsHeader()) { aStr = pData->GetText(); - GetReplaceEditString( aStr ); + aStr = linguistic::GetThesaurusReplaceText( aStr ); } aReplaceEdit.SetText( aStr ); } @@ -480,7 +452,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis if (pData && !pData->IsHeader()) { aStr = pData->GetText(); - GetReplaceEditString( aStr ); + aStr = linguistic::GetThesaurusReplaceText( aStr ); } aWordCB.SetText( aStr ); @@ -680,7 +652,7 @@ SvxThesaurusDialog::SvxThesaurusDialog( } std::sort( aLangVec.begin(), aLangVec.end() ); for (size_t i = 0; i < aLangVec.size(); ++i) - pMenu->InsertItem( (USHORT)i+1, aLangVec[i] ); // menu items should be enumerated from 1 and not 0 + pMenu->InsertItem( (sal_uInt16)i+1, aLangVec[i] ); // menu items should be enumerated from 1 and not 0 m_pImpl->aLangMBtn.SetPopupMenu( pMenu ); SetWindowTitle( nLanguage ); diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc index aef4131db3e6..aef4131db3e6 100755..100644 --- a/cui/source/dialogs/thesdlg.hrc +++ b/cui/source/dialogs/thesdlg.hrc diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src index ca0f69c4ef2a..67fdced0f137 100755..100644 --- a/cui/source/dialogs/thesdlg.src +++ b/cui/source/dialogs/thesdlg.src @@ -34,7 +34,7 @@ // RID_SVXDLG_THES ------------------------------------------------------- ModalDialog RID_SVXDLG_THESAURUS { - HelpId = SID_THESAURUS ; + HelpId = CMD_SID_THESAURUS ; OutputSize = TRUE ; Size = MAP_APPFONT ( 235, 230 ) ; Text [ en-US ] = "Thesaurus" ; @@ -50,6 +50,7 @@ ModalDialog RID_SVXDLG_THESAURUS ImageButton BTN_LEFT { + HelpID = "cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT"; Pos = MAP_APPFONT ( 5 , 15 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TABSTOP = TRUE ; @@ -64,12 +65,14 @@ ModalDialog RID_SVXDLG_THESAURUS }; ComboBox CB_WORD { + HelpID = "cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD"; DropDown = TRUE ; Pos = MAP_APPFONT ( 24 , 16 ) ; Size = MAP_APPFONT ( 141 , 60 ) ; // have drop down space for several lines }; MenuButton MB_LANGUAGE { + HelpID = "cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE"; Pos = MAP_APPFONT ( 170 , 16 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Language" ; @@ -100,6 +103,7 @@ ModalDialog RID_SVXDLG_THESAURUS }; Edit ED_REPL { + HelpID = "cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL"; BORDER = TRUE ; Pos = MAP_APPFONT ( 5 , 184 ) ; Size = MAP_APPFONT ( 225 , 12 ) ; diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index d3b58ba31d1f..678b1257bf5f 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -132,9 +132,9 @@ class AlternativesString_Impl : public SvLBoxString public: AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl, - SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ); + SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ); - virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry); + virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); }; diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 42eda26ff2ff..89d0fa9f7483 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -56,30 +56,23 @@ // static ---------------------------------------------------------------- -static USHORT pRanges[] = -{ - SID_ATTR_ZOOM, - SID_ATTR_ZOOM, - 0 -}; - -#define SPECIAL_FACTOR ((USHORT)0xFFFF) +#define SPECIAL_FACTOR ((sal_uInt16)0xFFFF) // class SvxZoomDialog --------------------------------------------------- -USHORT SvxZoomDialog::GetFactor() const +sal_uInt16 SvxZoomDialog::GetFactor() const { if ( a100Btn.IsChecked() ) return 100; if ( aUserBtn.IsChecked() ) - return (USHORT)aUserEdit.GetValue(); + return (sal_uInt16)aUserEdit.GetValue(); else return SPECIAL_FACTOR; } // ----------------------------------------------------------------------- -void SvxZoomDialog::SetFactor( USHORT nNewFactor, USHORT nBtnId ) +void SvxZoomDialog::SetFactor( sal_uInt16 nNewFactor, sal_uInt16 nBtnId ) { aUserEdit.Disable(); @@ -122,30 +115,7 @@ void SvxZoomDialog::SetFactor( USHORT nNewFactor, USHORT nBtnId ) // ----------------------------------------------------------------------- -void SvxZoomDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt ) -{ - switch ( nBtnId ) - { - case ZOOMBTN_OPTIMAL: // Optimal-Button - aOptimalBtn.SetText( rNewTxt ); - break; - - case ZOOMBTN_PAGEWIDTH: // Seitenbreite-Button - aPageWidthBtn.SetText( rNewTxt ); - break; - - case ZOOMBTN_WHOLEPAGE: // Ganze Seite-Button - aWholePageBtn.SetText( rNewTxt ); - break; - - default: - OSL_FAIL( "wrong button number" ); - } -} - -// ----------------------------------------------------------------------- - -void SvxZoomDialog::HideButton( USHORT nBtnId ) +void SvxZoomDialog::HideButton( sal_uInt16 nBtnId ) { switch ( nBtnId ) { @@ -168,7 +138,7 @@ void SvxZoomDialog::HideButton( USHORT nBtnId ) // ----------------------------------------------------------------------- -void SvxZoomDialog::SetLimits( USHORT nMin, USHORT nMax ) +void SvxZoomDialog::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) { DBG_ASSERT( nMin < nMax, "invalid limits" ); aUserEdit.SetMin( nMin ); @@ -179,13 +149,6 @@ void SvxZoomDialog::SetLimits( USHORT nMin, USHORT nMax ) // ----------------------------------------------------------------------- -void SvxZoomDialog::SetSpinSize( USHORT nNewSpin ) -{ - aUserEdit.SetSpinSize( nNewSpin ); -} - -// ----------------------------------------------------------------------- - SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_ZOOM ) ), @@ -212,11 +175,11 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : rSet ( rCoreSet ), pOutSet ( NULL ), - bModified ( FALSE ) + bModified ( sal_False ) { #if ENABLE_LAYOUT - SetHelpId (SID_ATTR_ZOOM); + SetHelpId (".uno:Zoom"); #endif /* ENABLE_LAYOUT */ Link aLink = LINK( this, SvxZoomDialog, UserHdl ); a100Btn.SetClickHdl( aLink ); @@ -240,9 +203,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : aUserEdit.SetModifyHdl( LINK( this, SvxZoomDialog, SpinHdl ) ); // Default-Werte - USHORT nValue = 100; - USHORT nMin = 10; - USHORT nMax = 1000; + sal_uInt16 nValue = 100; + sal_uInt16 nMin = 10; + sal_uInt16 nMax = 1000; // ggf. erst den alten Wert besorgen const SfxUInt16Item* pOldUserItem = 0; @@ -265,15 +228,23 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : aUserEdit.SetLast( nMax ); aUserEdit.SetValue( nValue ); + aUserEdit.SetAccessibleRelationLabeledBy( &aUserBtn ); + aUserEdit.SetAccessibleName(aUserBtn.GetText()); + aColumnsEdit.SetAccessibleRelationLabeledBy(&aColumnsBtn); + aColumnsEdit.SetAccessibleName(aColumnsBtn.GetText()); + aColumnsEdit.SetAccessibleRelationMemberOf(&aColumnsBtn); + aBookModeChk.SetAccessibleRelationLabeledBy(&aColumnsBtn); + aBookModeChk.SetAccessibleRelationMemberOf(&aColumnsBtn); + const SfxPoolItem& rItem = rSet.Get( rSet.GetPool()->GetWhich( SID_ATTR_ZOOM ) ); if ( rItem.ISA(SvxZoomItem) ) { const SvxZoomItem& rZoomItem = (const SvxZoomItem&)rItem; - const USHORT nZoom = rZoomItem.GetValue(); + const sal_uInt16 nZoom = rZoomItem.GetValue(); const SvxZoomType eType = rZoomItem.GetType(); - const USHORT nValSet = rZoomItem.GetValueSet(); - USHORT nBtnId = 0; + const sal_uInt16 nValSet = rZoomItem.GetValueSet(); + sal_uInt16 nBtnId = 0; switch ( eType ) { @@ -304,14 +275,14 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : } else { - const USHORT nZoom = ( (const SfxUInt16Item&)rItem ).GetValue(); + const sal_uInt16 nZoom = ( (const SfxUInt16Item&)rItem ).GetValue(); SetFactor( nZoom ); } const SfxPoolItem* pViewLayoutItem = 0; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_VIEWLAYOUT, FALSE, &pViewLayoutItem ) ) + if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_VIEWLAYOUT, sal_False, &pViewLayoutItem ) ) { - const USHORT nColumns = static_cast<const SvxViewLayoutItem*>(pViewLayoutItem)->GetValue(); + const sal_uInt16 nColumns = static_cast<const SvxViewLayoutItem*>(pViewLayoutItem)->GetValue(); const bool bBookMode = static_cast<const SvxViewLayoutItem*>(pViewLayoutItem)->IsBookMode(); if ( 0 == nColumns ) @@ -368,16 +339,9 @@ SvxZoomDialog::~SvxZoomDialog() // ----------------------------------------------------------------------- -USHORT* SvxZoomDialog::GetRanges() -{ - return pRanges; -} - -// ----------------------------------------------------------------------- - IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn ) { - bModified |= TRUE; + bModified |= sal_True; if ( pBtn == &aUserBtn ) { @@ -395,7 +359,7 @@ IMPL_LINK( SvxZoomDialog, SpinHdl, MetricField *, EMPTYARG ) { if ( !aUserBtn.IsChecked() ) return 0; - bModified |= TRUE; + bModified |= sal_True; return 0; } @@ -403,7 +367,7 @@ IMPL_LINK( SvxZoomDialog, SpinHdl, MetricField *, EMPTYARG ) IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn ) { - bModified |= TRUE; + bModified |= sal_True; if ( pBtn == &aAutomaticBtn ) { @@ -446,7 +410,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutSpinHdl, MetricField *, pEdt ) aBookModeChk.Disable(); } - bModified |= TRUE; + bModified |= sal_True; return 0; } @@ -458,7 +422,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutCheckHdl, CheckBox *, pChk ) if ( pChk == &aBookModeChk && !aColumnsBtn.IsChecked() ) return 0; - bModified |= TRUE; + bModified |= sal_True; return 0; } @@ -474,7 +438,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn ) if ( &aOKBtn == pBtn ) { - USHORT nFactor = GetFactor(); + sal_uInt16 nFactor = GetFactor(); if ( SPECIAL_FACTOR == nFactor ) { @@ -500,7 +464,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn ) } else if ( aColumnsBtn.IsChecked() ) { - aViewLayoutItem.SetValue( static_cast<USHORT>(aColumnsEdit.GetValue()) ); + aViewLayoutItem.SetValue( static_cast<sal_uInt16>(aColumnsEdit.GetValue()) ); aViewLayoutItem.SetBookMode( aBookModeChk.IsChecked() ); } } @@ -521,7 +485,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn ) if ( pSh ) pSh->PutItem( SfxUInt16Item( SID_ATTR_ZOOM_USER, - (UINT16)aUserEdit.GetValue() ) ); + (sal_uInt16)aUserEdit.GetValue() ) ); EndDialog( RET_OK ); } else diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 67ca4ad3b957..f96323a36255 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -28,11 +28,12 @@ #include <cuires.hrc> #include "zoom.hrc" #include <svx/dialogs.hrc> // for RID_SVXDLG_ZOOM +#include "helpid.hrc" // RID_SVXDLG_ZOOM ------------------------------------------------------- ModalDialog RID_SVXDLG_ZOOM { - HelpId = SID_ATTR_ZOOM ; + HelpId = CMD_SID_ATTR_ZOOM; OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 242 , 112 ) ; @@ -46,36 +47,42 @@ ModalDialog RID_SVXDLG_ZOOM }; RadioButton BTN_OPTIMAL { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "~Optimal" ; }; RadioButton BTN_WHOLE_PAGE { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "~Fit width and height" ; }; RadioButton BTN_PAGE_WIDTH { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 105, 10 ) ; Text [ en-US ] = "Fit ~width" ; }; RadioButton BTN_100 { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 105, 10 ) ; Text = "~100 %" ; }; RadioButton BTN_USER { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER"; Pos = MAP_APPFONT ( 12 , 67 ) ; Size = MAP_APPFONT ( 72 , 10 ) ; Text [ en-US ] = "~Variable" ; }; MetricField ED_USER { + HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_USER"; Pos = MAP_APPFONT ( 86 , 66 ) ; Size = MAP_APPFONT ( 32 , 12 ) ; Border = TRUE ; @@ -95,24 +102,28 @@ ModalDialog RID_SVXDLG_ZOOM }; RadioButton BTN_AUTOMATIC { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC"; Pos = MAP_APPFONT ( 130 , 14 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Text [ en-US ] = "~Automatic" ; }; RadioButton BTN_SINGLE { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE"; Pos = MAP_APPFONT ( 130, 27 ) ; Size = MAP_APPFONT ( 106, 10 ) ; Text [ en-US ] = "~Single page" ; }; RadioButton BTN_COLUMNS { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS"; Pos = MAP_APPFONT ( 130, 41 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "~Columns" ; }; MetricField ED_COLUMNS { + HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS"; Pos = MAP_APPFONT ( 209 , 40 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; Border = TRUE ; @@ -126,6 +137,7 @@ ModalDialog RID_SVXDLG_ZOOM }; CheckBox CHK_BOOK { + HelpID = "cui:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK"; Pos = MAP_APPFONT ( 136 , 55 ) ; Size = MAP_APPFONT ( 85 , 10 ) ; Text [ en-US ] = "~Book mode" ; |