diff options
Diffstat (limited to 'cui')
36 files changed, 385 insertions, 889 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 159272f07c2b..9a2a918e1661 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1015,7 +1015,7 @@ void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAccele try { - if (sCommand.getLength()) + if (!sCommand.isEmpty()) xAccMgr->setKeyEvent(aAWTKey, sCommand); else xAccMgr->removeKeyEvent(aAWTKey); @@ -1233,7 +1233,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, EMPTYARG if ( ERRCODE_NONE == m_pFileDlg->GetError() ) sCfgName = m_pFileDlg->GetPath(); - if ( !sCfgName.getLength() ) + if ( sCfgName.isEmpty() ) return 0; GetTabDialog()->EnterWait(); @@ -1317,7 +1317,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG if ( ERRCODE_NONE == m_pFileDlg->GetError() ) sCfgName = m_pFileDlg->GetPath(); - if ( !sCfgName.getLength() ) + if ( sCfgName.isEmpty() ) return 0; GetTabDialog()->EnterWait(); @@ -1358,7 +1358,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG // set the correct media type if the storage was new created ::rtl::OUString sMediaType; xUIConfigProps->getPropertyValue(MEDIATYPE_PROPNAME) >>= sMediaType; - if (!sMediaType.getLength()) + if (sMediaType.isEmpty()) xUIConfigProps->setPropertyValue(MEDIATYPE_PROPNAME, css::uno::makeAny(MEDIATYPE_UICONFIG)); xCfgMgr = css::uno::Reference< css::ui::XUIConfigurationManager >(m_xSMGR->createInstance(SERVICE_UICONFIGMGR), css::uno::UNO_QUERY_THROW); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index de19df3769cf..35de8426617a 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -481,7 +481,7 @@ OUString GetUIModuleName( const OUString& aModuleId, const uno::Reference< css:: } } - if ( aModuleUIName.getLength() == 0 ) + if ( aModuleUIName.isEmpty() ) aModuleUIName = GetModuleName( aModuleId ); return aModuleUIName; @@ -613,7 +613,7 @@ ConvertSvxConfigEntry( // as an empty string. // It will be initialised again later using the command to label map. aPropSeq[2].Name = aDescriptorLabel; - if ( pEntry->HasChangedName() == sal_False && pEntry->GetCommand().getLength() ) + if ( pEntry->HasChangedName() == sal_False && !pEntry->GetCommand().isEmpty() ) { sal_Bool isDefaultName = sal_False; try @@ -694,7 +694,7 @@ ConvertToolbarEntry( // as an empty string. // It will be initialised again later using the command to label map. aPropSeq[2].Name = aDescriptorLabel; - if ( pEntry->HasChangedName() == sal_False && pEntry->GetCommand().getLength() ) + if ( pEntry->HasChangedName() == sal_False && !pEntry->GetCommand().isEmpty() ) { sal_Bool isDefaultName = sal_False; try @@ -781,7 +781,7 @@ sal_Bool impl_showKeyConfigTabPage( const css::uno::Reference< css::frame::XFram { ::rtl::OUString sModuleId = xMM->identify(xFrame); if ( - ( sModuleId.getLength() ) && + ( !sModuleId.isEmpty() ) && (!sModuleId.equals(MODULEID_STARTMODULE)) ) return sal_True; @@ -1187,7 +1187,7 @@ bool MenuSaveInData::LoadSubMenus( OUString subMenuTitle( rBaseTitle ); - if ( subMenuTitle.getLength() != 0 ) + if ( !subMenuTitle.isEmpty() ) { subMenuTitle += OUString( RTL_CONSTASCII_USTRINGPARAM(aMenuSeparatorStr)); @@ -1758,7 +1758,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) // if an item to select has been passed in (eg. the ResourceURL for a // toolbar) then try to select the SaveInData entry that has that item bool bURLToSelectFound = sal_False; - if ( m_aURLToSelect.getLength() != 0 ) + if ( !m_aURLToSelect.isEmpty() ) { if ( pDocData != NULL && pDocData->HasURL( m_aURLToSelect ) ) { @@ -3016,9 +3016,9 @@ SvxConfigEntry* SvxMainMenuOrganizerDialog::GetSelectedEntry() const OUString& SvxConfigEntry::GetHelpText() { - if ( aHelpText.getLength() == 0 ) + if ( aHelpText.isEmpty() ) { - if ( aCommand.getLength() ) + if ( !aCommand.isEmpty() ) { aHelpText = Application::GetHelp()->GetHelpText( aCommand, NULL ); } @@ -3688,7 +3688,7 @@ void SvxToolbarConfigPage::Init() ReloadTopLevelListBox(); sal_uInt16 nPos = 0; - if ( m_aURLToSelect.getLength() != 0 ) + if ( !m_aURLToSelect.isEmpty() ) { for ( sal_uInt16 i = 0 ; i < aTopLevelListBox.GetEntryCount(); ++i ) { @@ -3989,12 +3989,12 @@ SvxEntries* ToolbarSaveInData::GetEntries() uno::Reference< container::XIndexAccess > xToolbarSettings = GetConfigManager()->getSettings( url, sal_False ); - if ( uiname.getLength() == 0 ) + if ( uiname.isEmpty() ) { // try to get the name from m_xPersistentWindowState uiname = GetSystemUIName( url ); - if ( uiname.getLength() == 0 ) + if ( uiname.isEmpty() ) { uiname = systemname; } @@ -4077,12 +4077,12 @@ SvxEntries* ToolbarSaveInData::GetEntries() uno::Reference< container::XIndexAccess > xToolbarSettings = xParentCfgMgr->getSettings( url, sal_False ); - if ( uiname.getLength() == 0 ) + if ( uiname.isEmpty() ) { // try to get the name from m_xPersistentWindowState uiname = GetSystemUIName( url ); - if ( uiname.getLength() == 0 ) + if ( uiname.isEmpty() ) { uiname = systemname; } diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index b25e2e443fab..123088b82a2e 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -145,7 +145,7 @@ sal_Bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle) if (sArg.indexOf(CMDURL_FPART_ONLY) == 0) aStyle.sFamily = sArg.copy(LEN_FPART, sArg.getLength()-LEN_FPART); - if (aStyle.sFamily.getLength() && aStyle.sStyle.getLength()) + if (!(aStyle.sFamily.isEmpty() || aStyle.sStyle.isEmpty())) return sal_True; return sal_False; @@ -178,7 +178,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle) catch(const css::uno::Exception&) { aStyle.sLabel = ::rtl::OUString(); } - if (!aStyle.sLabel.getLength()) + if (aStyle.sLabel.isEmpty()) { aStyle.sLabel = aStyle.sCommand; } @@ -503,7 +503,7 @@ void SfxConfigGroupListBox_Impl::InitModule() try { m_xModuleCategoryInfo->getByName(sGroupID) >>= sGroupName; - if (!sGroupName.getLength()) + if (sGroupName.isEmpty()) continue; } catch(const css::container::NoSuchElementException&) @@ -813,7 +813,7 @@ Image SfxConfigGroupListBox_Impl::GetImage( } } } - if( factoryURL.getLength() > 0 ) + if( !factoryURL.isEmpty() ) { aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false ); } @@ -886,7 +886,7 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC { sUIName = ::rtl::OUString(); } // fallback for missing UINames !? - if (!sUIName.getLength()) + if (sUIName.isEmpty()) { sUIName = sCommand; } diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 26847cc25666..367fc6799cc9 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -791,7 +791,7 @@ Any _SvxMacroTabPage::GetPropsByName( const ::rtl::OUString& eventName, EventsHa Any aReturn; ::comphelper::NamedValueCollection aProps; - if ( rAssignedEvent.first.getLength() && rAssignedEvent.second.getLength() ) + if ( !(rAssignedEvent.first.isEmpty() || rAssignedEvent.second.isEmpty()) ) { aProps.put( "EventType", rAssignedEvent.first ); aProps.put( "Script", rAssignedEvent.second ); @@ -882,7 +882,7 @@ IMPL_LINK(AssignComponentDialog, ButtonHandler, Button *, EMPTYARG) { ::rtl::OUString aMethodName = maMethodEdit.GetText(); maURL = ::rtl::OUString(); - if( aMethodName.getLength() ) + if( !aMethodName.isEmpty() ) { maURL = aVndSunStarUNO; maURL += aMethodName; @@ -904,7 +904,7 @@ AssignComponentDialog::AssignComponentDialog( Window * pParent, const ::rtl::OUS maOKButton.SetClickHdl(LINK(this, AssignComponentDialog, ButtonHandler)); ::rtl::OUString aMethodName; - if( maURL.getLength() ) + if( !maURL.isEmpty() ) { sal_Int32 nIndex = maURL.indexOf( aVndSunStarUNO ); if( nIndex == 0 ) diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 2e9cd2539a93..d5beb563da30 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -470,7 +470,7 @@ void SvxConfigGroupListBox_Impl::Init() Reference< container::XNameAccess > xModuleCategories; if ( xAllCategories.is() ) { - if ( aModuleId.getLength() != 0 ) + if ( !aModuleId.isEmpty() ) { try { @@ -629,7 +629,7 @@ Image SvxConfigGroupListBox_Impl::GetImage( } } } - if( factoryURL.getLength() > 0 ) + if( !factoryURL.isEmpty() ) { aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false ); } @@ -720,7 +720,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected() for ( sal_Int32 i = 0; i < commands.getLength(); ++i ) { - if ( commands[i].Command.getLength() == 0 ) + if ( commands[i].Command.isEmpty() ) { continue; } @@ -756,7 +756,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected() { } - if ( aLabel.getLength() == 0 ) + if ( aLabel.isEmpty() ) { aLabel = commands[i].Command; } @@ -1072,7 +1072,7 @@ void SvxScriptSelectorDialog::UpdateUI() { OUString url = GetScriptURL(); - if ( url != NULL && url.getLength() != 0 ) + if ( url != NULL && !url.isEmpty() ) { String rMessage = aCommands.GetHelpText( aCommands.FirstSelected() ); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index cb68f6b90366..58e0be99d265 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -357,7 +357,7 @@ void SpellDialog::UpdateBoxes_Impl() aExplainLink.SetURL( pSpellErrorDescription->sExplanationURL ); aExplainFT.SetText( pSpellErrorDescription->sExplanation ); } - if( pSpellErrorDescription && pSpellErrorDescription->sDialogTitle.getLength() ) + if( pSpellErrorDescription && !pSpellErrorDescription->sDialogTitle.isEmpty() ) { // use this function to apply the correct image to be used... SetTitle_Impl( nAltLanguage ); @@ -400,7 +400,7 @@ void SpellDialog::UpdateBoxes_Impl() aIgnoreAllPB.Show( bShowChangeAll ); aAddToDictMB.Show( bShowChangeAll ); aIgnoreRulePB.Show( !bShowChangeAll ); - aIgnoreRulePB.Enable(pSpellErrorDescription && pSpellErrorDescription->sRuleId.getLength()); + aIgnoreRulePB.Enable(pSpellErrorDescription && !pSpellErrorDescription->sRuleId.isEmpty()); aAutoCorrPB.Show( bShowChangeAll && rParent.HasAutoCorrection() ); } @@ -926,7 +926,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) { String sVendor; const SpellErrorDescription* pSpellErrorDescription = aSentenceED.GetAlternatives(); - if( pSpellErrorDescription && pSpellErrorDescription->sServiceName.getLength() ) + if( pSpellErrorDescription && !pSpellErrorDescription->sServiceName.isEmpty() ) { uno::Reference< lang::XServiceDisplayName > xDisplayName( pSpellErrorDescription->xGrammarChecker, uno::UNO_QUERY ); if( xDisplayName.is() ) @@ -998,7 +998,7 @@ void SpellDialog::InitUserDicts() { OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage( xSvcInfo->getImplementationName()) ); - if (aDictionaryImageUrl.getLength() > 0) + if (!aDictionaryImageUrl.isEmpty()) { Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) ); pMenu->SetItemImage( nItemId, aImage ); @@ -1292,7 +1292,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe rtl::OUString &rString = aStart->sText; //dots are sometimes part of the spelled word but they are not necessarily part of the replacement - bool bDot = rString.getLength() && rString[rString.getLength() - 1] == '.'; + bool bDot = !rString.isEmpty() && rString[rString.getLength() - 1] == '.'; Reference<XDictionaryEntry> xEntry = xChangeAll->getEntry( rString ); @@ -1300,7 +1300,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe { rString = xEntry->getReplacementText(); - if(bDot && (!rString.getLength() || rString[rString.getLength() - 1] != '.')) + if(bDot && (rString.isEmpty() || rString[rString.getLength() - 1] != '.')) rString = rString + rtl::OUString(static_cast<sal_Unicode>('.')); aStart->xAlternatives = 0; @@ -2143,7 +2143,7 @@ IMPL_LINK( SpellDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink ) rtl::OUString sURL=pHyperlink->GetURL(); rtl::OUString sTitle=GetText(); - if ( ! sURL.getLength() ) // Nothing to do, when the URL is empty + if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty return 1; try { diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 03555748f12d..250a0d2c9376 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -95,7 +95,7 @@ GetBuildId() sBuildId = aBuffer.makeStringAndClear(); } - OSL_ENSURE( sBuildId.getLength() > 0, "No BUILDID in bootstrap file" ); + OSL_ENSURE( !sBuildId.isEmpty(), "No BUILDID in bootstrap file" ); return sBuildId; } @@ -260,7 +260,7 @@ IMPL_LINK( AboutDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink ) rtl::OUString sURL=pHyperlink->GetURL(); rtl::OUString sTitle=GetText(); - if ( ! sURL.getLength() ) // Nothing to do, when the URL is empty + if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty return 1; try { diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src index 8ee486228b9d..8db6636cee62 100644 --- a/cui/source/dialogs/about.src +++ b/cui/source/dialogs/about.src @@ -70,7 +70,7 @@ ModalDialog RID_DEFAULTABOUT }; String ABOUT_STR_VERSION { - Text[ en-US ] = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION"; + Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX %PRODUCTEXTENSION"; }; String ABOUT_STR_VENDOR { diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 5ae4a105e7c1..60772e9e24d3 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -258,7 +258,7 @@ void HexColorControl::Paste() ::rtl::OUString aText; aData >>= aText; - if( aText.getLength() && aText.matchAsciiL( "#", 1, 0 ) ) + if( !aText.isEmpty() && aText.matchAsciiL( "#", 1, 0 ) ) aText = aText.copy(1); if( aText.getLength() > 6 ) diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 732613dcccb0..865c05aa0506 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1518,7 +1518,7 @@ namespace svx Sequence< OUString >& _rEntries ) { bool bRet = false; - if( _xDict.is() && _rOrg.getLength() ) + if( _xDict.is() && !_rOrg.isEmpty() ) { try { diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index ae30fa0b5f4c..63d70f604ecb 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -204,7 +204,7 @@ void SvxHyperlinkNewDocTp::FillDocumentList () continue; // Insert into listbox - if ( aDocumentUrl.getLength() ) + if ( !aDocumentUrl.isEmpty() ) { if ( aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:factory/simpress?slot=6686" ) ) ) // SJ: #106216# do not start aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress @@ -460,7 +460,7 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) INetURLObject aNewURL( aStrTmp ); - if( aStrName.Len() > 0 && aNewURL.getExtension().getLength() > 0 && + if( aStrName.Len() > 0 && !aNewURL.getExtension().isEmpty() && maLbDocTypes.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { // get private-url diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 1018518b718d..68cc9b407294 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -134,7 +134,7 @@ void SvxHyperlinkInternetTp::FillDlgFields ( String& aStrURL ) setFTPUser(aURL.GetUser(), aURL.GetPass()); //do not show password and user in url - if(aURL.GetUser().getLength()!=0 || aURL.GetPass().getLength()!=0 ) + if(!aURL.GetUser().isEmpty() || !aURL.GetPass().isEmpty() ) aURL.SetUserAndPass(aEmptyStr,aEmptyStr); } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index e2f666a1e7cb..0e2bdc053456 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -262,7 +262,7 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) { uno::Reference< lang::XComponent > xComp; - if( aURL.getLength() ) + if( !aURL.isEmpty() ) { // load from url uno::Reference< frame::XComponentLoader > xLoader( xDesktop, uno::UNO_QUERY ); @@ -303,12 +303,12 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) else mnError = LERR_DOCNOTOPEN; - if ( aURL.getLength() ) + if ( !aURL.isEmpty() ) xComp->dispose(); } else { - if( aURL.getLength() ) + if( !aURL.isEmpty() ) mnError=LERR_DOCNOTOPEN; } } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 325ca92bffd2..06f57771005c 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -539,194 +539,6 @@ short SvInsertPlugInDialog::Execute() return nRet; } -// class SvInsertAppletDlg ----------------------------------------------- - -IMPL_LINK( SvInsertAppletDialog, BrowseHdl, PushButton *, EMPTYARG ) -{ - Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - if( xFactory.is() ) - { - Reference< XFilePicker > xFilePicker( xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ) ), UNO_QUERY ); - DBG_ASSERT( xFilePicker.is(), "could not get FilePicker service" ); - - Reference< XInitialization > xInit( xFilePicker, UNO_QUERY ); - Reference< XFilterManager > xFilterMgr( xFilePicker, UNO_QUERY ); - if( xInit.is() && xFilePicker.is() && xFilterMgr.is() ) - { - Sequence< Any > aServiceType( 1 ); - aServiceType[0] <<= TemplateDescription::FILEOPEN_SIMPLE; - xInit->initialize( aServiceType ); - - // add filter - try - { - xFilterMgr->appendFilter( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Applet" ) ), - OUString( RTL_CONSTASCII_USTRINGPARAM( "*.class" ) ) - ); - } - catch( IllegalArgumentException& ) - { - DBG_ASSERT( 0, "caught IllegalArgumentException when registering filter\n" ); - } - - if( xFilePicker->execute() == ExecutableDialogResults::OK ) - { - Sequence< OUString > aPathSeq( xFilePicker->getFiles() ); - - INetURLObject aObj( aPathSeq[0] ); - aEdClassfile.SetText( aObj.getName() ); - aObj.removeSegment(); - aEdClasslocation.SetText( aObj.PathToFileName() ); - } - } - } - - return 0; -} - -// ----------------------------------------------------------------------- - -SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Reference < embed::XStorage >& xStorage ) - : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_APPLET ), xStorage ), - aFtClassfile( this, CUI_RES( FT_CLASSFILE ) ), - aEdClassfile( this, CUI_RES( ED_CLASSFILE ) ), - aFtClasslocation( this, CUI_RES( FT_CLASSLOCATION ) ), - aEdClasslocation( this, CUI_RES( ED_CLASSLOCATION ) ), - aBtnClass( this, CUI_RES( BTN_CLASS ) ), - aGbClass( this, CUI_RES( GB_CLASS ) ), - aEdAppletOptions( this, CUI_RES( ED_APPLET_OPTIONS ) ), - aGbAppletOptions( this, CUI_RES( GB_APPLET_OPTIONS ) ), - aOKButton1( this, CUI_RES( 1 ) ), - aCancelButton1( this, CUI_RES( 1 ) ), - aHelpButton1( this, CUI_RES( 1 ) ), - m_pURL(0) -{ - FreeResource(); - aBtnClass.SetClickHdl( LINK( this, SvInsertAppletDialog, BrowseHdl ) ); -} - -SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Reference < embed::XEmbeddedObject >& xObj ) - : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_APPLET ), uno::Reference < embed::XStorage >() ), - aFtClassfile( this, CUI_RES( FT_CLASSFILE ) ), - aEdClassfile( this, CUI_RES( ED_CLASSFILE ) ), - aFtClasslocation( this, CUI_RES( FT_CLASSLOCATION ) ), - aEdClasslocation( this, CUI_RES( ED_CLASSLOCATION ) ), - aBtnClass( this, CUI_RES( BTN_CLASS ) ), - aGbClass( this, CUI_RES( GB_CLASS ) ), - aEdAppletOptions( this, CUI_RES( ED_APPLET_OPTIONS ) ), - aGbAppletOptions( this, CUI_RES( GB_APPLET_OPTIONS ) ), - aOKButton1( this, CUI_RES( 1 ) ), - aCancelButton1( this, CUI_RES( 1 ) ), - aHelpButton1( this, CUI_RES( 1 ) ), - m_pURL(0) -{ - m_xObj = xObj; - FreeResource(); - aBtnClass.SetClickHdl( LINK( this, SvInsertAppletDialog, BrowseHdl ) ); -} - - -SvInsertAppletDialog::~SvInsertAppletDialog() -{ - delete m_pURL; -} - -short SvInsertAppletDialog::Execute() -{ - short nRet = RET_OK; - m_aClass.Erase(); - m_aCommands.Erase(); - - sal_Bool bOK = sal_False; - uno::Reference < beans::XPropertySet > xSet; - if ( m_xObj.is() ) - { - try - { - if ( m_xObj->getCurrentState() == embed::EmbedStates::LOADED ) - m_xObj->changeState( embed::EmbedStates::RUNNING ); - xSet = uno::Reference < beans::XPropertySet >( m_xObj->getComponent(), uno::UNO_QUERY ); - ::rtl::OUString aStr; - uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode") ) ); - if ( aAny >>= aStr ) - SetClass( aStr ); - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase") ) ); - if ( aAny >>= aStr ) - SetClassLocation( aStr ); - uno::Sequence< beans::PropertyValue > aCommands; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands") ) ); - if ( aAny >>= aCommands ) - { - SvCommandList aList; - aList.FillFromSequence( aCommands ); - SetAppletOptions( aList.GetCommands() ); - } - - String aText( CUI_RES( STR_EDIT_APPLET ) ); - SetText( aText ); - bOK = sal_True; - } - catch ( uno::Exception& ) - { - OSL_FAIL( "No Applet!" ); - } - } - else - { - DBG_ASSERT( m_xStorage.is(), "No storage!"); - bOK = m_xStorage.is(); - } - - if ( bOK && ( nRet = Dialog::Execute() ) == RET_OK ) - { - if ( !m_xObj.is() ) - { - ::rtl::OUString aName; - SvGlobalName aClassId( SO3_APPLET_CLASSID ); - m_xObj = aCnt.CreateEmbeddedObject( aClassId.GetByteSequence(), aName ); - if ( m_xObj->getCurrentState() == embed::EmbedStates::LOADED ) - m_xObj->changeState( embed::EmbedStates::RUNNING ); - xSet = uno::Reference < beans::XPropertySet >( m_xObj->getComponent(), uno::UNO_QUERY ); - } - - if ( m_xObj.is() ) - { - try - { - sal_Bool bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE; - if ( bIPActive ) - m_xObj->changeState( embed::EmbedStates::RUNNING ); - - String aClassLocation = GetClassLocation(); - - // Hack, aFileName wird auch fuer Class benutzt - m_aClass = GetClass(); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode") ), makeAny( ::rtl::OUString( m_aClass ) ) ); - - ::rtl::OUString tmp = aClassLocation; - ::osl::File::getFileURLFromSystemPath(tmp, tmp); - aClassLocation = tmp; - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase") ), makeAny( tmp ) ); - m_aCommands = GetAppletOptions(); - - uno::Sequence< beans::PropertyValue > aCommandSequence; - Plugin_ImplFillCommandSequence( m_aCommands, aCommandSequence ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands") ), makeAny( aCommandSequence ) ); - - if ( bIPActive ) - m_xObj->changeState( embed::EmbedStates::INPLACE_ACTIVE ); - } - catch ( uno::Exception& ) - { - OSL_FAIL( "No Applet!" ); - } - } - } - - return nRet; -} - SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ) : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_IFRAME ), xStorage ) @@ -927,7 +739,7 @@ short SfxInsertFloatingFrameDialog::Execute() aURL = aObj.GetMainURL( INetURLObject::NO_DECODE ); } - if ( !m_xObj.is() && aURL.getLength() ) + if ( !m_xObj.is() && !aURL.isEmpty() ) { // create the object ::rtl::OUString aName; diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 7e021d020dbd..09709513a5af 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -379,7 +379,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry( bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, ::rtl::OUString factoryURL ) { SvLBoxEntry * p; - if( nBitmap == IMG_DOCUMENT && factoryURL.getLength() > 0 ) + if( nBitmap == IMG_DOCUMENT && !factoryURL.isEmpty() ) { Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false ); p = InsertEntry( @@ -1296,7 +1296,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() { sal_Int32 pos = source.indexOf( token ); - if ( pos != -1 && value.getLength() != 0 ) + if ( pos != -1 && !value.isEmpty() ) { return source.replaceAt( pos, token.getLength(), value ); } @@ -1323,7 +1323,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() result = ReplaceString( result, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%LINENUMBER") ), line ); - if ( type.getLength() != 0 ) + if ( !type.isEmpty() ) { result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\n") ); result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL))); @@ -1331,7 +1331,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() result += type; } - if ( message.getLength() != 0 ) + if ( !message.isEmpty() ) { result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\n") ); result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL))); @@ -1354,17 +1354,17 @@ void SvxScriptOrgDialog::RestorePreviousSelection() ::rtl::OUString type = ::rtl::OUString(); ::rtl::OUString message = eScriptError.Message; - if ( eScriptError.language.getLength() != 0 ) + if ( !eScriptError.language.isEmpty() ) { language = eScriptError.language; } - if ( eScriptError.scriptName.getLength() != 0 ) + if ( !eScriptError.scriptName.isEmpty() ) { script = eScriptError.scriptName; } - if ( eScriptError.Message.getLength() != 0 ) + if ( !eScriptError.Message.isEmpty() ) { message = eScriptError.Message; } @@ -1397,16 +1397,16 @@ void SvxScriptOrgDialog::RestorePreviousSelection() ::rtl::OUString type = unknown; ::rtl::OUString message = eScriptException.Message; - if ( eScriptException.language.getLength() != 0 ) + if ( !eScriptException.language.isEmpty() ) { language = eScriptException.language; } - if ( eScriptException.scriptName.getLength() != 0 ) + if ( !eScriptException.scriptName.isEmpty() ) { script = eScriptException.scriptName; } - if ( eScriptException.Message.getLength() != 0 ) + if ( !eScriptException.Message.isEmpty() ) { message = eScriptException.Message; } @@ -1423,7 +1423,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() CUI_RES( RID_SVXSTR_EXCEPTION_RUNNING ) ); } - if ( eScriptException.exceptionType.getLength() != 0 ) + if ( !eScriptException.exceptionType.isEmpty() ) { type = eScriptException.exceptionType; } @@ -1444,11 +1444,11 @@ void SvxScriptOrgDialog::RestorePreviousSelection() ::rtl::OUString message; - if ( sError.scriptName.getLength() > 0 ) + if ( !sError.scriptName.isEmpty() ) { script = sError.scriptName; } - if ( sError.language.getLength() > 0 ) + if ( !sError.language.isEmpty() ) { language = sError.language; } @@ -1565,7 +1565,7 @@ IMPL_LINK( SvxScriptErrorDialog, ShowDialog, ::rtl::OUString*, pMessage ) { ::rtl::OUString message; - if ( pMessage && pMessage->getLength() != 0 ) + if ( pMessage && !pMessage->isEmpty() ) { message = *pMessage; } diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index dde09339cb27..8c4d3ab63c47 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -305,7 +305,7 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL SvxThesaurusDi xThesaurus->queryMeanings( rTerm, rLocale, rProperties ) ); // text with '.' at the end? - if (0 == aMeanings.getLength() && rTerm.getLength() && + if ( 0 == aMeanings.getLength() && !rTerm.isEmpty() && rTerm.getStr()[ rTerm.getLength() - 1 ] == '.') { // try again without trailing '.' chars. It may be a word at the @@ -342,7 +342,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() uno::Sequence< OUString > aSynonyms( pMeanings[i]->querySynonyms() ); const sal_Int32 nSynonyms = aSynonyms.getLength(); const OUString *pSynonyms = aSynonyms.getConstArray(); - DBG_ASSERT( rMeaningTxt.getLength() > 0, "meaning with empty text" ); + DBG_ASSERT( !rMeaningTxt.isEmpty(), "meaning with empty text" ); DBG_ASSERT( nSynonyms > 0, "meaning without synonym" ); m_pAlternativesCT->AddEntry( i + 1, rMeaningTxt, true ); @@ -397,7 +397,7 @@ void SvxThesaurusDialog_Impl::LookUp_Impl() String aText( aWordCB.GetText() ); aLookUpText = OUString( aText ); - if (aLookUpText.getLength() > 0 && + if (!aLookUpText.isEmpty() && (aLookUpHistory.empty() || aLookUpText != aLookUpHistory.top())) aLookUpHistory.push( aLookUpText ); @@ -534,7 +534,7 @@ void SvxThesaurusDialog_Impl::UpdateVendorImage() Image aImage; String sThesImplName( lcl_GetThesImplName( SvxCreateLocale( nLookUpLanguage ) ) ); OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName ) ); - if (sThesImplName.Len() > 0 && aThesDialogImageUrl.getLength() > 0) + if (sThesImplName.Len() > 0 && !aThesDialogImageUrl.isEmpty()) aImage = Image( lcl_GetImageFromPngUrl( aThesDialogImageUrl ) ); else aImage = aVendorDefaultImage; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 8935d1e726e6..4169fed42630 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -110,7 +110,7 @@ struct TAccInfo sal_Bool isConfigured() const { - return (m_nKeyPos>-1 && m_nListPos>-1 && m_sCommand.getLength()); + return (m_nKeyPos>-1 && m_nListPos>-1 && !m_sCommand.isEmpty()); } sal_Int32 m_nKeyPos; diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 8cbc141b8b88..4f323b5bbb3d 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -127,44 +127,6 @@ public: virtual short Execute(); }; -// class SvInsertAppletDialog -------------------------------------------- - -class SvInsertAppletDialog : public InsertObjectDialog_Impl -{ -private: - FixedText aFtClassfile; - Edit aEdClassfile; - FixedText aFtClasslocation; - Edit aEdClasslocation; - PushButton aBtnClass; - FixedLine aGbClass; - MultiLineEdit aEdAppletOptions; - FixedLine aGbAppletOptions; - OKButton aOKButton1; - CancelButton aCancelButton1; - HelpButton aHelpButton1; - INetURLObject* m_pURL; - String m_aClass; - String m_aCommands; - String GetClass() const { return aEdClassfile.GetText(); } - String GetClassLocation() const { return aEdClasslocation.GetText(); } - String GetAppletOptions() const { return aEdAppletOptions.GetText(); } - - void SetClass( const String &rClass ) { aEdClassfile.SetText(rClass); } - void SetClassLocation( const String &rLocation ) { aEdClasslocation.SetText(rLocation); } - void SetAppletOptions( const String &rOptions ) { aEdAppletOptions.SetText(rOptions); } - DECL_LINK( BrowseHdl, PushButton * ); - -public: - SvInsertAppletDialog( Window* pParent, - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); - SvInsertAppletDialog( Window* pParent, - const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); - ~SvInsertAppletDialog(); - - virtual short Execute(); -}; - class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl { private: diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index ac12fc2abbbb..a107750bbc30 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -26,44 +26,17 @@ * ************************************************************************/ -#include <com/sun/star/uno/Reference.h> -#include <sfx2/basedlgs.hxx> -#include <sfx2/tabdlg.hxx> -#include <svtools/svtreebx.hxx> #include <tools/resary.hxx> -#include <vcl/image.hxx> #include <vcl/fixbrd.hxx> -#include <vcl/fixed.hxx> -#include <svx/xtable.hxx> -#include <vector> +class SfxModule; +class SfxShell; // static ---------------------------------------------------------------- sal_Bool EnableSSO(); CreateTabPage GetSSOCreator( void ); -// class OfaOptionsTreeListBox ------------------------------------------- - -class SfxModule; -class SfxShell; -class SfxItemSet; -class XColorList; -class OfaOptionsTreeListBox : public SvTreeListBox -{ - using SvListView::Collapse; - -private: - sal_Bool bInCollapse; - -public: - OfaOptionsTreeListBox(Window* pParent, const ResId& rResId) : - SvTreeListBox( pParent, rResId ), bInCollapse(sal_False) {} - - virtual sal_Bool Collapse( SvLBoxEntry* pParent ); - sal_Bool IsInCollapse()const {return bInCollapse;} -}; - // struct OrderedEntry --------------------------------------------------- struct OrderedEntry @@ -184,16 +157,8 @@ private: PushButton aBackPB; FixedBorder aHiddenGB; - FixedText aPageTitleFT; - FixedLine aLine1FL; - FixedText aHelpFT; - FixedImage aHelpImg; - - ImageList aPageImages; - ResStringArray aHelpTextsArr; - - OfaOptionsTreeListBox aTreeLB; + SvTreeListBox aTreeLB; String sTitle; String sNotLoadedError; @@ -202,19 +167,15 @@ private: // for the ColorTabPage SfxItemSet* pColorPageItemSet; - SvxColorTabPage *mpColorPage;; + SvxColorTabPage *mpColorPage; sal_Bool bForgetSelection; sal_Bool bExternBrowserActive; - sal_Bool bImageResized; - bool bInSelectHdl_Impl; bool bIsFromExtensionManager; // check "for the current document only" and set focus to "Western" languages box bool bIsForSetDocumentLanguage; - Timer aSelectTimer; - com::sun::star::uno::Reference < com::sun::star::awt::XContainerWindowProvider > m_xContainerWinProvider; @@ -247,10 +208,9 @@ protected: DECL_LINK(BackHdl_Impl, PushButton* ); DECL_LINK( OKHdl_Impl, Button * ); DECL_LINK( HintHdl_Impl, Timer * ); - DECL_LINK( SelectHdl_Impl, Timer * ); + void SelectHdl_Impl(); virtual long Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual short Execute(); public: diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index ff926c5179b6..e42385a493a4 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -209,7 +209,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) { SvLBoxEntry* pEntry = pPathBox->GetEntry(i); DatabaseRegistration* pRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() ); - if ( pRegistration && pRegistration->sLocation.getLength() ) + if ( pRegistration && !pRegistration->sLocation.isEmpty() ) { ::rtl::OUString sName( pPathBox->GetEntryText( pEntry, 0 ) ); OFileNotation aTransformer( pRegistration->sLocation ); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 3a50fc23e963..c42ba08a38f9 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1535,7 +1535,7 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage() if(!bFillItemSetCalled && aColorSchemeLB.GetSavedValue() != aColorSchemeLB.GetSelectEntryPos()) { rtl::OUString sOldScheme = aColorSchemeLB.GetEntry(aColorSchemeLB.GetSavedValue()); - if(sOldScheme.getLength()) + if(!sOldScheme.isEmpty()) { pColorConfig->SetCurrentSchemeName(sOldScheme); pExtColorConfig->SetCurrentSchemeName(sOldScheme); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 0e428e39ab2e..bc86de6241df 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1321,7 +1321,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe if (theNameAccess->hasByName(sUserLocaleKey)) theNameAccess->getByName(sUserLocaleKey) >>= m_sUserLocaleValue; // select the user specified locale in the listbox - if (m_sUserLocaleValue.getLength() > 0) + if (!m_sUserLocaleValue.isEmpty()) { sal_Int32 d = 0; for (sal_uInt16 i=0; i < aUserInterfaceLB.GetEntryCount(); i++) @@ -1527,7 +1527,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) } OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); - LanguageType eOldLocale = (sLang.getLength() ? + LanguageType eOldLocale = (!sLang.isEmpty() ? lcl_LangStringToLangType( sLang ) : LANGUAGE_SYSTEM); LanguageType eNewLocale = aLocaleSettingLB.GetSelectLanguage(); if ( eOldLocale != eNewLocale ) @@ -1539,7 +1539,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) Locale aLocale; SvxLanguageToLocale( aLocale, eNewLocale ); sNewLang = aLocale.Language; - if ( aLocale.Country.getLength() > 0 ) + if ( !aLocale.Country.isEmpty() ) { sNewLang += C2U("-"); sNewLang += aLocale.Country; @@ -1688,7 +1688,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) { OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); - if ( sLang.getLength() ) + if ( !sLang.isEmpty() ) aLocaleSettingLB.SelectLanguage(lcl_LangStringToLangType(sLang)); else aLocaleSettingLB.SelectLanguage( LANGUAGE_SYSTEM ); @@ -1711,7 +1711,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) LanguageType eLang; const NfCurrencyEntry* pCurr = NULL; sLang = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString(); - if ( sLang.getLength() ) + if ( !sLang.isEmpty() ) { SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( aAbbrev, eLang, sLang ); pCurr = SvNumberFormatter::GetCurrencyEntry( aAbbrev, eLang ); diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 34789e70aa2a..9ac8dc15a9af 100644 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -473,7 +473,7 @@ TabPage RID_SVXPAGE_INET_MAIL String STR_DEFAULT_FILENAME { - Text [ en-US ] = "All files (*.*)" ; + Text [ en-US ] = "All files" ; }; }; diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index d716f7f51464..736bfe0b5936 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -146,7 +146,7 @@ static sal_Int32 lcl_SeqGetEntryPos( static void lcl_OpenURL( ::rtl::OUString sURL ) { - if ( sURL.getLength() > 0 ) + if ( !sURL.isEmpty() ) { localizeWebserviceURI(sURL); try @@ -629,7 +629,7 @@ Sequence< OUString > SvxLinguData_Impl::GetSortedImplNames( sal_Int16 nLang, sal case TYPE_GRAMMAR : aImplName = rInfo.sGrammarImplName; break; } - if (aImplName.getLength() && (lcl_SeqGetIndex( aRes, aImplName) == -1)) // name not yet added + if (!aImplName.isEmpty() && (lcl_SeqGetIndex( aRes, aImplName) == -1)) // name not yet added { DBG_ASSERT( nIdx < aRes.getLength(), "index out of range" ); if (nIdx < aRes.getLength()) @@ -708,7 +708,7 @@ void lcl_MergeDisplayArray( if(rToAdd.xSpell.is()) { DBG_ASSERT( !pEntry->xSpell.is() && - pEntry->sSpellImplName.getLength() == 0, + pEntry->sSpellImplName.isEmpty(), "merge conflict" ); pEntry->sSpellImplName = rToAdd.sSpellImplName; pEntry->xSpell = rToAdd.xSpell; @@ -716,7 +716,7 @@ void lcl_MergeDisplayArray( if(rToAdd.xGrammar.is()) { DBG_ASSERT( !pEntry->xGrammar.is() && - pEntry->sGrammarImplName.getLength() == 0, + pEntry->sGrammarImplName.isEmpty(), "merge conflict" ); pEntry->sGrammarImplName = rToAdd.sGrammarImplName; pEntry->xGrammar = rToAdd.xGrammar; @@ -724,7 +724,7 @@ void lcl_MergeDisplayArray( if(rToAdd.xHyph.is()) { DBG_ASSERT( !pEntry->xHyph.is() && - pEntry->sHyphImplName.getLength() == 0, + pEntry->sHyphImplName.isEmpty(), "merge conflict" ); pEntry->sHyphImplName = rToAdd.sHyphImplName; pEntry->xHyph = rToAdd.xHyph; @@ -732,7 +732,7 @@ void lcl_MergeDisplayArray( if(rToAdd.xThes.is()) { DBG_ASSERT( !pEntry->xThes.is() && - pEntry->sThesImplName.getLength() == 0, + pEntry->sThesImplName.isEmpty(), "merge conflict" ); pEntry->sThesImplName = rToAdd.sThesImplName; pEntry->xThes = rToAdd.xThes; @@ -931,7 +931,7 @@ void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices if (pEntry && !pEntry->bConfigured) { const OUString &rSrvcImplName = pConfiguredServices[n]; - if (rSrvcImplName.getLength() && + if (!rSrvcImplName.isEmpty() && (pEntry->sSpellImplName == rSrvcImplName || pEntry->sGrammarImplName == rSrvcImplName || pEntry->sHyphImplName == rSrvcImplName || @@ -976,7 +976,7 @@ sal_Bool SvxLinguData_Impl::AddRemove( void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, sal_Bool bEnable ) { - DBG_ASSERT( rDisplayName.getLength(), "empty DisplayName" ); + DBG_ASSERT( !rDisplayName.isEmpty(), "empty DisplayName" ); ServiceInfo_Impl *pInfo = 0; ServiceInfo_Impl *pTmp = 0; @@ -2261,7 +2261,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pInfo->xSpell->hasLocale( aCurLocale ); aImplName = pInfo->sSpellImplName; } - if (aImplName.getLength() && bIsSuppLang) + if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); @@ -2305,7 +2305,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pInfo->xGrammar->hasLocale( aCurLocale ); aImplName = pInfo->sGrammarImplName; } - if (aImplName.getLength() && bIsSuppLang) + if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); @@ -2349,7 +2349,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pInfo->xHyph->hasLocale( aCurLocale ); aImplName = pInfo->sHyphImplName; } - if (aImplName.getLength() && bIsSuppLang) + if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); @@ -2393,7 +2393,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pInfo->xThes->hasLocale( aCurLocale ); aImplName = pInfo->sThesImplName; } - if (aImplName.getLength() && bIsSuppLang) + if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index e914524dc597..57534fcb1a27 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -344,31 +344,31 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) } SvtModuleOptions aModuleOpt; - if(pImpl->aDefaultArr[APP_MATH].getLength() && + if(!pImpl->aDefaultArr[APP_MATH].isEmpty() && pImpl->aDefaultArr[APP_MATH] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_MATH)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_MATH, pImpl->aDefaultArr[APP_MATH]); - if( pImpl->aDefaultArr[APP_DRAW].getLength() && + if( !pImpl->aDefaultArr[APP_DRAW].isEmpty() && pImpl->aDefaultArr[APP_DRAW] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_DRAW)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_DRAW, pImpl->aDefaultArr[APP_DRAW]); - if(pImpl->aDefaultArr[APP_IMPRESS].getLength() && + if(!pImpl->aDefaultArr[APP_IMPRESS].isEmpty() && pImpl->aDefaultArr[APP_IMPRESS] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS, pImpl->aDefaultArr[APP_IMPRESS]); - if(pImpl->aDefaultArr[APP_CALC].getLength() && + if(!pImpl->aDefaultArr[APP_CALC].isEmpty() && pImpl->aDefaultArr[APP_CALC] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_CALC)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_CALC, pImpl->aDefaultArr[APP_CALC]); - if(pImpl->aDefaultArr[APP_WRITER].getLength() && + if(!pImpl->aDefaultArr[APP_WRITER].isEmpty() && pImpl->aDefaultArr[APP_WRITER] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITER)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITER, pImpl->aDefaultArr[APP_WRITER]); - if(pImpl->aDefaultArr[APP_WRITER_WEB].getLength() && + if(!pImpl->aDefaultArr[APP_WRITER_WEB].isEmpty() && pImpl->aDefaultArr[APP_WRITER_WEB] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB, pImpl->aDefaultArr[APP_WRITER_WEB]); - if(pImpl->aDefaultArr[APP_WRITER_GLOBAL].getLength() && + if(!pImpl->aDefaultArr[APP_WRITER_GLOBAL].isEmpty() && pImpl->aDefaultArr[APP_WRITER_GLOBAL] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL, pImpl->aDefaultArr[APP_WRITER_GLOBAL]); @@ -463,7 +463,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) { SequenceAsHashMap aFilter(xList->nextElement()); OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),OUString()); - if (sFilter.getLength()) + if (!sFilter.isEmpty()) { sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),sal_Int32()); lList.push_back(sFilter); @@ -609,7 +609,7 @@ IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox ) if(pFilters[i] == pImpl->aDefaultArr[nData]) sSelect = pUIFilters[i]; } - if(sSelect.getLength()) + if(!sSelect.isEmpty()) aSaveAsLB.SelectEntry(sSelect); aSaveAsFI.Show(pImpl->aDefaultReadonlyArr[nData]); aSaveAsFT.Enable(!pImpl->aDefaultReadonlyArr[nData]); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 66210b70b1bf..9d02f0fe4d84 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -26,112 +26,87 @@ * ************************************************************************/ -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/loader/CannotActivateFactoryException.hpp> -#include <com/sun/star/linguistic2/XDictionaryList.hpp> +#include "cuires.hrc" +#include "helpid.hrc" +#include "treeopt.hrc" + +#include <svx/dialogs.hrc> + +#include "cfgchart.hxx" +#include "connpoolconfig.hxx" +#include "connpooloptions.hxx" +#include "cuioptgenrl.hxx" +#include "cuitabarea.hxx" +#include "dbregister.hxx" +#include "dbregisterednamesconfig.hxx" +#include "dialmgr.hxx" +#include "fontsubs.hxx" +#include "optaccessibility.hxx" +#include "optasian.hxx" +#include "optchart.hxx" +#include "optcolor.hxx" +#include "optctl.hxx" +#include "optfltr.hxx" +#include "optgdlg.hxx" +#include "opthtml.hxx" +#include "optinet2.hxx" +#include "optjava.hxx" +#include "optjsearch.hxx" +#include "optlingu.hxx" +#include "optmemory.hxx" +#include "optpath.hxx" +#include "optsave.hxx" +#include "optupdt.hxx" +#include "treeopt.hxx" + +#include <com/sun/star/awt/XContainerWindowEventHandler.hpp> +#include <com/sun/star/awt/XContainerWindowProvider.hpp> +#include <com/sun/star/awt/XControl.hpp> +#include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModuleManager.hpp> +#include <com/sun/star/loader/CannotActivateFactoryException.hpp> #include <com/sun/star/util/XMacroExpander.hpp> -#include <osl/module.hxx> -#include <com/sun/star/util/XCloseable.hpp> -#include <com/sun/star/frame/XLoadable.hpp> -#include <tools/rcid.h> -#include <tools/shl.hxx> -#include <tools/urlobj.hxx> -#include <comphelper/processfactory.hxx> -#include <toolkit/helper/vclunohelper.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/configurationhelper.hxx> -#include <com/sun/star/awt/XDialogProvider.hpp> -#include <com/sun/star/awt/XDialogProvider2.hpp> -#include <com/sun/star/awt/XContainerWindowProvider.hpp> -#include <com/sun/star/awt/XDialogEventHandler.hpp> -#include <com/sun/star/awt/XContainerWindowEventHandler.hpp> -#include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/XTopWindow.hpp> -#include <com/sun/star/awt/XControl.hpp> -#include <com/sun/star/awt/XTabController.hpp> -#include <vcl/help.hxx> +#include <comphelper/processfactory.hxx> +#include <editeng/optitems.hxx> +#include <editeng/unolingu.hxx> #include <linguistic/misc.hxx> +#include <osl/module.hxx> +#include <osl/process.h> +#include <rtl/bootstrap.hxx> +#include <rtl/uri.hxx> +#include <sfx2/app.hxx> +#include <sfx2/dispatch.hxx> +#include <sfx2/module.hxx> +#include <sfx2/printopt.hxx> +#include <sfx2/shell.hxx> +#include <sfx2/tplpitem.hxx> +#include <sfx2/viewsh.hxx> +#include <svl/languageoptions.hxx> #include <svtools/helpopt.hxx> +#include <svx/drawitem.hxx> +#include <svx/xtable.hxx> +#include <svx/xpool.hxx> +#include <toolkit/helper/vclunohelper.hxx> +#include <tools/shl.hxx> +#include <tools/urlobj.hxx> +#include <unotools/linguprops.hxx> +#include <unotools/misccfg.hxx> #include <unotools/moduleoptions.hxx> -#include <svl/languageoptions.hxx> #include <unotools/optionsdlg.hxx> -#include <sfx2/module.hxx> +#include <unotools/viewoptions.hxx> +#include <vcl/help.hxx> #include <vcl/msgbox.hxx> -#include <sfx2/dispatch.hxx> #include <vcl/waitobj.hxx> -#include <svl/slstitm.hxx> -#include <sfx2/viewfrm.hxx> -#include <unotools/viewoptions.hxx> -#include <sfx2/printopt.hxx> -#include <osl/module.h> -#include <osl/process.h> -#include <rtl/bootstrap.hxx> -#include <unotools/misccfg.hxx> -#include <sfx2/objsh.hxx> -#include <sfx2/viewsh.hxx> -#include <sfx2/tplpitem.hxx> -#include <svtools/apearcfg.hxx> -#include <unotools/linguprops.hxx> -#include <sfx2/app.hxx> -#include <svx/xdef.hxx> -#include <svx/xflclit.hxx> -#include <svx/xpool.hxx> -#include "cuitabarea.hxx" -#include <svx/ofaitem.hxx> -#include "opthtml.hxx" -#include "optcolor.hxx" -#include "optctl.hxx" -#include "optjava.hxx" -#include "optsave.hxx" -#include "optpath.hxx" -#include "cuioptgenrl.hxx" -#include "optlingu.hxx" -#include "optinet2.hxx" -#include "optasian.hxx" -#include "optaccessibility.hxx" -#include "optjsearch.hxx" -#include "connpooloptions.hxx" -#include "optupdt.hxx" -#include "optchart.hxx" -#include "optgdlg.hxx" -#include "optmemory.hxx" -#include "optfltr.hxx" -#include <cuires.hrc> -#include "helpid.hrc" -#include <dialmgr.hxx> -#include "treeopt.hxx" -#include "treeopt.hrc" -#include "fontsubs.hxx" -#include <editeng/unolingu.hxx> -#include <svx/xtable.hxx> -#include "connpoolconfig.hxx" -#include "dbregister.hxx" -#include "dbregisterednamesconfig.hxx" -#include "cfgchart.hxx" -#include <svx/dialogs.hrc> #ifndef _SVX_LANGITEM_HXX #define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE #include <editeng/langitem.hxx> #endif - -#include <editeng/optitems.hxx> - -#include <svx/drawitem.hxx> -#include <rtl/uri.hxx> - #ifdef LINUX -#include <string.h> -#include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> #endif using namespace ::com::sun::star; @@ -149,9 +124,6 @@ using namespace ::com::sun::star::util; #define C2U(cChar) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( cChar ) ) #endif -#define HINT_TIMEOUT 200 -#define SELECT_FIRST_TIMEOUT 0 -#define SELECT_TIMEOUT 300 #define EXPAND_PROTOCOL "vnd.sun.star.expand:" LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = NULL; @@ -365,7 +337,6 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem return pRet; } - struct OptionsMapping_Impl { const char* m_pGroupName; @@ -414,6 +385,7 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "Writer", "Print", RID_SW_TP_OPTPRINT_PAGE }, { "Writer", "Table", RID_SW_TP_OPTTABLE_PAGE }, { "Writer", "Changes", RID_SW_TP_REDLINE_OPT }, + { "Writer", "Comparison", RID_SW_TP_COMPARISON_OPT }, { "Writer", "Compatibility", RID_SW_TP_OPTCOMPATIBILITY_PAGE }, { "Writer", "AutoCaption", RID_SW_TP_OPTCAPTION_PAGE }, { "Writer", "MailMerge", RID_SW_TP_MAILCONFIG }, @@ -519,14 +491,6 @@ struct OptionsGroupInfo ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; } }; -sal_Bool OfaOptionsTreeListBox::Collapse( SvLBoxEntry* pParent ) -{ - bInCollapse = sal_True; - sal_Bool bRet = SvTreeListBox::Collapse(pParent); - bInCollapse = sal_False; - return bRet; -} - // ----------------------------------------------------------------------- #define INI_LIST() \ @@ -535,11 +499,6 @@ sal_Bool OfaOptionsTreeListBox::Collapse( SvLBoxEntry* pParent ) aHelpPB ( this, CUI_RES( PB_HELP ) ),\ aBackPB ( this, CUI_RES( PB_BACK ) ),\ aHiddenGB ( this, CUI_RES( FB_BORDER ) ),\ - aPageTitleFT ( this, CUI_RES( FT_PAGE_TITLE ) ),\ - aLine1FL ( this, CUI_RES( FL_LINE_1 ) ),\ - aHelpFT ( this, CUI_RES( FT_HELPTEXT ) ),\ - aHelpImg ( this, CUI_RES( IMG_HELP ) ),\ - aHelpTextsArr ( CUI_RES( STR_HELPTEXTS ) ),\ aTreeLB ( this, CUI_RES( TLB_PAGES ) ),\ sTitle ( GetText() ),\ sNotLoadedError ( CUI_RES( ST_LOAD_ERROR ) ),\ @@ -547,8 +506,6 @@ sal_Bool OfaOptionsTreeListBox::Collapse( SvLBoxEntry* pParent ) pColorPageItemSet ( NULL ),\ mpColorPage ( NULL ),\ bForgetSelection ( sal_False ),\ - bImageResized ( sal_False ),\ - bInSelectHdl_Impl ( false ),\ bIsFromExtensionManager( false ), \ bIsForSetDocumentLanguage( false ) @@ -580,11 +537,10 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ), INI_LIST() - { FreeResource(); - bIsFromExtensionManager = ( rExtensionId.getLength() > 0 ); + bIsFromExtensionManager = ( !rExtensionId.isEmpty() ); InitTreeAndHandler(); LoadExtensionOptions( rExtensionId ); ResizeTreeLB(); @@ -682,14 +638,7 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName, IMPL_LINK(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, EMPTYARG) { - if ( aSelectTimer.GetTimeout() == SELECT_FIRST_TIMEOUT ) - { - aSelectTimer.SetTimeout( SELECT_TIMEOUT ); - SelectHdl_Impl( NULL ); - } - else if ( aSelectTimer.GetTimeout() == SELECT_TIMEOUT ) - aSelectTimer.Start(); - + SelectHdl_Impl(); return 0; } @@ -821,8 +770,6 @@ void OfaTreeOptionsDialog::ApplyItemSets() void OfaTreeOptionsDialog::InitTreeAndHandler() { aTreeLB.SetNodeDefaultImages(); - aPageImages = ImageList( CUI_RES( RID_IMGLIST_TREEOPT ) ); - aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX ); aTreeLB.SetStyle( aTreeLB.GetStyle()|WB_HASBUTTONS | WB_HASBUTTONSATROOT | @@ -837,8 +784,6 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() aOkPB.SetClickHdl( LINK( this, OfaTreeOptionsDialog, OKHdl_Impl ) ); aHiddenGB.Show(); - aSelectTimer.SetTimeout( SELECT_FIRST_TIMEOUT ); - aSelectTimer.SetTimeoutHdl( LINK( this, OfaTreeOptionsDialog, SelectHdl_Impl ) ); } void OfaTreeOptionsDialog::ActivatePage( sal_uInt16 nResId ) @@ -988,46 +933,78 @@ long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) // -------------------------------------------------------------------- -void OfaTreeOptionsDialog::DataChanged( const DataChangedEvent& rDCEvt ) +void OfaTreeOptionsDialog::SelectHdl_Impl() { - SfxModalDialog::DataChanged( rDCEvt ); + SvTreeListBox* pBox = &aTreeLB; - SvLBoxEntry* pEntry = aTreeLB.GetCurEntry(); - if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) && - !aTreeLB.GetParent(pEntry)) + if(pCurrentPageEntry == pBox->GetCurEntry()) { - OptionsGroupInfo* pInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData()); - ImageList* pImgLst = &aPageImages; - for ( sal_uInt16 i = 0; i < aHelpTextsArr.Count(); ++i ) - { - if ( aHelpTextsArr.GetValue(i) == pInfo->m_nDialogId ) - { - aHelpImg.SetImage( pImgLst->GetImage( pInfo->m_nDialogId ) ); - break; - } - } + pBox->EndSelection(); + return; } -} -class FlagSet_Impl -{ - bool & rFlag; - public: - FlagSet_Impl(bool& bFlag) : rFlag(bFlag){rFlag = true;} - ~FlagSet_Impl(){rFlag = false;} -}; -IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) -{ - SvTreeListBox* pBox = &aTreeLB; SvLBoxEntry* pEntry = pBox->GetCurEntry(); SvLBoxEntry* pParent = pBox->GetParent(pEntry); + + // If the user has selected a category, automatically switch to a suitable + // default sub-page instead. + if (!pParent) + { + pBox->EndSelection(); + + OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData()); + + if(!pGroupInfo) + return; + + switch(pGroupInfo->m_nDialogId) + { + case SID_GENERAL_OPTIONS: + ActivatePage(RID_SFXPAGE_GENERAL); + break; + case SID_LANGUAGE_OPTIONS: + ActivatePage(OFA_TP_LANGUAGES); + break; + case SID_INET_DLG: + ActivatePage(RID_SVXPAGE_INET_PROXY); + break; + case SID_SW_EDITOPTIONS: + ActivatePage(RID_SW_TP_OPTLOAD_PAGE); + break; + case SID_SW_ONLINEOPTIONS: + ActivatePage(RID_SW_TP_HTML_CONTENT_OPT); + break; + case SID_SC_EDITOPTIONS: + ActivatePage(SID_SC_TP_LAYOUT); + break; + case SID_SD_EDITOPTIONS: + ActivatePage(SID_SI_TP_MISC); + break; + case SID_SD_GRAPHIC_OPTIONS: + ActivatePage(SID_SD_TP_MISC); + break; + case SID_SM_EDITOPTIONS: + ActivatePage(SID_SM_TP_PRINTOPTIONS); + break; + case SID_SCH_EDITOPTIONS: + ActivatePage(RID_OPTPAGE_CHART_DEFCOLORS); + break; + case SID_SB_STARBASEOPTIONS: + ActivatePage(SID_SB_CONNECTIONPOOLING); + break; + case SID_FILTER_DLG: + ActivatePage(RID_SFXPAGE_SAVE); + break; + default: + SAL_WARN("cui", "Unrecognized options category " << pGroupInfo->m_nDialogId); + break; + } + + return; + } + pBox->EndSelection(); - DBG_ASSERT(!bInSelectHdl_Impl, "Timeout handler called twice"); - if(bInSelectHdl_Impl || pCurrentPageEntry == pEntry) - return 0; - //#111938# lock the SelectHdl_Impl to prevent multiple executes - FlagSet_Impl aFlag(bInSelectHdl_Impl); TabPage* pOldPage = NULL; TabPage* pNewPage = NULL; OptionsPageInfo* pOptPageInfo = ( pCurrentPageEntry && aTreeLB.GetParent( pCurrentPageEntry ) ) @@ -1045,7 +1022,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) { // we cannot leave this page pBox->Select( pCurrentPageEntry ); - return 0; + return; } else pOptPageInfo->m_pPage->Hide(); @@ -1064,281 +1041,172 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) pGroupInfo->m_pExtPage->DeactivatePage(); } } - if ( pParent ) + + OptionsPageInfo *pPageInfo = (OptionsPageInfo *)pEntry->GetUserData(); + OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo *)pParent->GetUserData(); + if(!pPageInfo->m_pPage && pPageInfo->m_nPageId > 0) { - aPageTitleFT.Hide(); - aLine1FL.Hide(); - aHelpFT.Hide(); - aHelpImg.Hide(); - OptionsPageInfo *pPageInfo = (OptionsPageInfo *)pEntry->GetUserData(); - OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo *)pParent->GetUserData(); - if(!pPageInfo->m_pPage && pPageInfo->m_nPageId > 0) + if(pGroupInfo->m_bLoadError) + return; + if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId ) { - if(pGroupInfo->m_bLoadError) - return 0; - if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId ) + if(!pColorPageItemSet) { - if(!pColorPageItemSet) - { - // Move usage of a static XOutdevItemPool instance here - if(!mpStaticXOutdevItemPool) - { - mpStaticXOutdevItemPool = new XOutdevItemPool(); - } - pColorPageItemSet = new SfxItemSet( *mpStaticXOutdevItemPool, XATTR_FILLSTYLE, XATTR_FILLCOLOR); - pColorPageItemSet->Put( XFillColorItem() ); - } + // Move usage of a static XOutdevItemPool instance here + if(!mpStaticXOutdevItemPool) + mpStaticXOutdevItemPool = new XOutdevItemPool(); + + pColorPageItemSet = new SfxItemSet( *mpStaticXOutdevItemPool, XATTR_FILLSTYLE, XATTR_FILLCOLOR); + pColorPageItemSet->Put( XFillColorItem() ); } - else + } + else + { + if(pGroupInfo->m_pModule /*&& !pGroupInfo->pModule->IsLoaded()*/) { - if(pGroupInfo->m_pModule /*&& !pGroupInfo->pModule->IsLoaded()*/) - { - SfxModule* pOldModule = pGroupInfo->m_pModule; - sal_Bool bIdentical = pGroupInfo->m_pModule == pGroupInfo->m_pShell; + SfxModule* pOldModule = pGroupInfo->m_pModule; + sal_Bool bIdentical = pGroupInfo->m_pModule == pGroupInfo->m_pShell; - WaitObject aWait(this); - //pGroupInfo->pModule = pGroupInfo->pModule->Load(); - if(!pGroupInfo->m_pModule) - { - pGroupInfo->m_bLoadError = sal_True; - InfoBox(pBox, sNotLoadedError).Execute(); - return 0; - } - if(bIdentical) - pGroupInfo->m_pShell = pGroupInfo->m_pModule; - //jetzt noch testen, ob es auch in anderen Gruppen das gleiche Module gab (z.B. Text+HTML) - SvLBoxEntry* pTemp = aTreeLB.First(); - while(pTemp) + WaitObject aWait(this); + //pGroupInfo->pModule = pGroupInfo->pModule->Load(); + if(!pGroupInfo->m_pModule) + { + pGroupInfo->m_bLoadError = sal_True; + InfoBox(pBox, sNotLoadedError).Execute(); + return; + } + if(bIdentical) + pGroupInfo->m_pShell = pGroupInfo->m_pModule; + //jetzt noch testen, ob es auch in anderen Gruppen das gleiche Module gab (z.B. Text+HTML) + SvLBoxEntry* pTemp = aTreeLB.First(); + while(pTemp) + { + if(!aTreeLB.GetParent(pTemp) && pTemp != pEntry) { - if(!aTreeLB.GetParent(pTemp) && pTemp != pEntry) + OptionsGroupInfo* pTGInfo = (OptionsGroupInfo *)pTemp->GetUserData(); + if(pTGInfo->m_pModule == pOldModule) { - OptionsGroupInfo* pTGInfo = (OptionsGroupInfo *)pTemp->GetUserData(); - if(pTGInfo->m_pModule == pOldModule) - { - pTGInfo->m_pModule = pGroupInfo->m_pModule; - if(bIdentical) - pTGInfo->m_pShell = pGroupInfo->m_pModule; - } + pTGInfo->m_pModule = pGroupInfo->m_pModule; + if(bIdentical) + pTGInfo->m_pShell = pGroupInfo->m_pModule; } - pTemp = aTreeLB.Next(pTemp); } - } - -// if ( pPageInfo->nPageId != RID_OPTPAGE_CHART_DEFCOLORS ) - { - if(!pGroupInfo->m_pInItemSet) - pGroupInfo->m_pInItemSet = pGroupInfo->m_pShell - ? pGroupInfo->m_pShell->CreateItemSet( pGroupInfo->m_nDialogId ) - : CreateItemSet( pGroupInfo->m_nDialogId ); - if(!pGroupInfo->m_pOutItemSet) - pGroupInfo->m_pOutItemSet = new SfxItemSet( - *pGroupInfo->m_pInItemSet->GetPool(), - pGroupInfo->m_pInItemSet->GetRanges()); + pTemp = aTreeLB.Next(pTemp); } } - if(pGroupInfo->m_pModule) - { - pPageInfo->m_pPage = pGroupInfo->m_pModule->CreateTabPage( - pPageInfo->m_nPageId, this, *pGroupInfo->m_pInItemSet ); - } - else if(RID_SVXPAGE_COLOR != pPageInfo->m_nPageId) - pPageInfo->m_pPage = ::CreateGeneralTabPage( pPageInfo->m_nPageId, this, *pGroupInfo->m_pInItemSet ); - else - { - pPageInfo->m_pPage = ::CreateGeneralTabPage( - pPageInfo->m_nPageId, this, *pColorPageItemSet ); - mpColorPage = (SvxColorTabPage*)pPageInfo->m_pPage; - mpColorPage->SetupForViewFrame( SfxViewFrame::Current() ); - } + if(!pGroupInfo->m_pInItemSet) + pGroupInfo->m_pInItemSet = pGroupInfo->m_pShell + ? pGroupInfo->m_pShell->CreateItemSet( pGroupInfo->m_nDialogId ) + : CreateItemSet( pGroupInfo->m_nDialogId ); + if(!pGroupInfo->m_pOutItemSet) + pGroupInfo->m_pOutItemSet = new SfxItemSet( + *pGroupInfo->m_pInItemSet->GetPool(), + pGroupInfo->m_pInItemSet->GetRanges()); + } - DBG_ASSERT( pPageInfo->m_pPage, "tabpage could not created"); - if ( pPageInfo->m_pPage ) - { - SvtViewOptions aTabPageOpt( E_TABPAGE, String::CreateFromInt32( pPageInfo->m_nPageId ) ); - pPageInfo->m_pPage->SetUserData( GetViewOptUserItem( aTabPageOpt ) ); - - Point aTreePos(aTreeLB.GetPosPixel()); - Size aTreeSize(aTreeLB.GetSizePixel()); - Point aGBPos(aHiddenGB.GetPosPixel()); - Size aPageSize(pPageInfo->m_pPage->GetSizePixel()); - Size aGBSize(aHiddenGB.GetSizePixel()); - Point aPagePos( aGBPos.X() + ( aGBSize.Width() - aPageSize.Width() ) / 2, - aGBPos.Y() + ( aGBSize.Height() - aPageSize.Height() ) / 2 ); - pPageInfo->m_pPage->SetPosPixel( aPagePos ); - if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId ) - { - pPageInfo->m_pPage->Reset( *pColorPageItemSet ); - pPageInfo->m_pPage->ActivatePage( *pColorPageItemSet ); - } - else - { - pPageInfo->m_pPage->Reset( *pGroupInfo->m_pInItemSet ); - } - } + if(pPageInfo->m_nPageId == RID_SVXPAGE_COLOR) + { + pPageInfo->m_pPage = ::CreateGeneralTabPage( + pPageInfo->m_nPageId, this, *pColorPageItemSet ); + mpColorPage = (SvxColorTabPage*)pPageInfo->m_pPage; + mpColorPage->SetupForViewFrame( SfxViewFrame::Current() ); } - else if ( 0 == pPageInfo->m_nPageId && !pPageInfo->m_pExtPage ) + else { - if ( !m_xContainerWinProvider.is() ) - { - Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - m_xContainerWinProvider = Reference < awt::XContainerWindowProvider >( - xFactory->createInstance( - C2U("com.sun.star.awt.ContainerWindowProvider") ), UNO_QUERY ); - DBG_ASSERT( m_xContainerWinProvider.is(), "service com.sun.star.awt.ContainerWindowProvider could not be loaded" ); - } + pPageInfo->m_pPage = ::CreateGeneralTabPage(pPageInfo->m_nPageId, this, *pGroupInfo->m_pInItemSet ); - pPageInfo->m_pExtPage = new ExtensionsTabPage( - this, 0, pPageInfo->m_sPageURL, pPageInfo->m_sEventHdl, m_xContainerWinProvider ); - Size aSize = aHiddenGB.GetSizePixel(); - aSize.Width() = aSize.Width() - 4; - aSize.Height() = aSize.Height() - 4; - Point aPos = aHiddenGB.GetPosPixel(); - aPos.X() = aPos.X() + 2; - aPos.Y() = aPos.Y() + 2; - pPageInfo->m_pExtPage->SetPosSizePixel( aPos, aSize ); + if(!pPageInfo->m_pPage && pGroupInfo->m_pModule) + pPageInfo->m_pPage = pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, this, *pGroupInfo->m_pInItemSet); } + DBG_ASSERT( pPageInfo->m_pPage, "tabpage could not created"); if ( pPageInfo->m_pPage ) { - if ( RID_SVXPAGE_COLOR != pPageInfo->m_nPageId && - pPageInfo->m_pPage->HasExchangeSupport()) + SvtViewOptions aTabPageOpt( E_TABPAGE, String::CreateFromInt32( pPageInfo->m_nPageId ) ); + pPageInfo->m_pPage->SetUserData( GetViewOptUserItem( aTabPageOpt ) ); + + Point aTreePos(aTreeLB.GetPosPixel()); + Size aTreeSize(aTreeLB.GetSizePixel()); + Point aGBPos(aHiddenGB.GetPosPixel()); + Size aPageSize(pPageInfo->m_pPage->GetSizePixel()); + Size aGBSize(aHiddenGB.GetSizePixel()); + Point aPagePos( aGBPos.X() + ( aGBSize.Width() - aPageSize.Width() ) / 2, + aGBPos.Y() + ( aGBSize.Height() - aPageSize.Height() ) / 2 ); + pPageInfo->m_pPage->SetPosPixel( aPagePos ); + if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId ) { - pPageInfo->m_pPage->ActivatePage(*pGroupInfo->m_pOutItemSet); + pPageInfo->m_pPage->Reset( *pColorPageItemSet ); + pPageInfo->m_pPage->ActivatePage( *pColorPageItemSet ); } - pPageInfo->m_pPage->Show(); - } - else if ( pPageInfo->m_pExtPage ) - { - pPageInfo->m_pExtPage->Show(); - pPageInfo->m_pExtPage->ActivatePage(); - } - - String sTmpTitle = sTitle; - sTmpTitle += String::CreateFromAscii(" - "); - sTmpTitle += aTreeLB.GetEntryText(pParent); - sTmpTitle += String::CreateFromAscii(" - "); - sTmpTitle += aTreeLB.GetEntryText(pEntry); - SetText(sTmpTitle); - pCurrentPageEntry = pEntry; - if ( !bForgetSelection ) - { - if ( !pLastPageSaver ) - pLastPageSaver = new LastPageSaver; - if ( !bIsFromExtensionManager ) - pLastPageSaver->m_nLastPageId = pPageInfo->m_nPageId; - if ( pPageInfo->m_pExtPage ) + else { - if ( bIsFromExtensionManager ) - pLastPageSaver->m_sLastPageURL_ExtMgr = pPageInfo->m_sPageURL; - else - pLastPageSaver->m_sLastPageURL_Tools = pPageInfo->m_sPageURL; + pPageInfo->m_pPage->Reset( *pGroupInfo->m_pInItemSet ); } } - pNewPage = pPageInfo->m_pPage; } - else + else if ( 0 == pPageInfo->m_nPageId && !pPageInfo->m_pExtPage ) { - OptionsGroupInfo* pTGInfo = (OptionsGroupInfo *)pEntry->GetUserData(); - if ( pTGInfo->m_sPageURL.getLength() == 0 ) + if ( !m_xContainerWinProvider.is() ) { - ImageList* pImgLst = &aPageImages; - //hier den Hilfetext anzeigen - for ( sal_uInt16 i = 0; i < aHelpTextsArr.Count(); ++i ) - { - if ( aHelpTextsArr.GetValue(i) == pTGInfo->m_nDialogId ) - { - aHelpFT.SetText(aHelpTextsArr.GetString(i)); - aHelpImg.SetImage(pImgLst->GetImage(pTGInfo->m_nDialogId)); - break; - } - } - - aPageTitleFT.Show(); - aLine1FL.Show(); - aHelpFT.Show(); - aHelpImg.Show(); + Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); + m_xContainerWinProvider = Reference < awt::XContainerWindowProvider >( + xFactory->createInstance( + C2U("com.sun.star.awt.ContainerWindowProvider") ), UNO_QUERY ); + DBG_ASSERT( m_xContainerWinProvider.is(), "service com.sun.star.awt.ContainerWindowProvider could not be loaded" ); + } - //auf die Groesse der Bitmap anpassen - if(!bImageResized) - { - const long nCtrlDist = 2; - bImageResized = sal_True; - Point aImgPos(aHelpImg.GetPosPixel()); - Size aImgSize(aHelpImg.GetSizePixel()); - Point aTitlePos(aPageTitleFT.GetPosPixel()); - Point aLinePos(aLine1FL.GetPosPixel()); - Point aHelpPos(aHelpFT.GetPosPixel()); - Size aHelpSize(aHelpFT.GetSizePixel()); - long nXDiff = 0; - long nYDiff = 0; - if(aTitlePos.X() <= (aImgPos.X() + aImgSize.Width() + nCtrlDist)) - { - nXDiff = aImgPos.X() + aImgSize.Width() + nCtrlDist - aTitlePos.X(); - } - if(aLinePos.Y() <= (aImgPos.Y() + aImgSize.Height() + nCtrlDist)) - { - nYDiff = aImgPos.Y() + aImgSize.Height() + nCtrlDist - aLinePos.Y(); - } - aLinePos.Y() += nYDiff; - aLine1FL.SetPosPixel(aLinePos); - - aTitlePos.X() += nXDiff; - aPageTitleFT.SetPosPixel(aTitlePos); - - aHelpPos.X() += nXDiff; - aHelpPos.Y() += nYDiff; - aHelpSize.Width() -= nXDiff; - aHelpSize.Height() -= nYDiff; - aHelpFT.SetPosSizePixel(aHelpPos, aHelpSize); - - Font aFont = aHelpFT.GetFont(); - Size aSz = aFont.GetSize(); - aSz.Height() = (aSz.Height() * 14 ) / 10; - aFont.SetSize(aSz); - aPageTitleFT.SetFont(aFont); - } + pPageInfo->m_pExtPage = new ExtensionsTabPage( + this, 0, pPageInfo->m_sPageURL, pPageInfo->m_sEventHdl, m_xContainerWinProvider ); + Size aSize = aHiddenGB.GetSizePixel(); + aSize.Width() = aSize.Width() - 4; + aSize.Height() = aSize.Height() - 4; + Point aPos = aHiddenGB.GetPosPixel(); + aPos.X() = aPos.X() + 2; + aPos.Y() = aPos.Y() + 2; + pPageInfo->m_pExtPage->SetPosSizePixel( aPos, aSize ); + } - String sTmpTitle = sTitle; - sTmpTitle += String::CreateFromAscii(" - "); - aPageTitleFT.SetText(aTreeLB.GetEntryText(pEntry)); - sTmpTitle += aPageTitleFT.GetText(); - SetText(sTmpTitle); - pCurrentPageEntry = NULL; - } - else + if ( pPageInfo->m_pPage ) + { + if ( RID_SVXPAGE_COLOR != pPageInfo->m_nPageId && + pPageInfo->m_pPage->HasExchangeSupport()) { - if ( !pTGInfo->m_pExtPage ) - { - if ( !m_xContainerWinProvider.is() ) - { - Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - m_xContainerWinProvider = Reference < awt::XContainerWindowProvider >( - xFactory->createInstance( - C2U("com.sun.star.awt.ContainerWindowProvider") ), UNO_QUERY ); - DBG_ASSERT( m_xContainerWinProvider.is(), "service com.sun.star.awt.ContainerWindowProvider could not be loaded" ); - } - - pTGInfo->m_pExtPage = - new ExtensionsTabPage( this, 0, pTGInfo->m_sPageURL, rtl::OUString(), m_xContainerWinProvider ); - Size aSize = aHiddenGB.GetSizePixel(); - aSize.Width() = aSize.Width() - 4; - aSize.Height() = aSize.Height() - 4; - Point aPos = aHiddenGB.GetPosPixel(); - aPos.X() = aPos.X() + 2; - aPos.Y() = aPos.Y() + 2; - pTGInfo->m_pExtPage->SetPosSizePixel( aPos, aSize ); - } + pPageInfo->m_pPage->ActivatePage(*pGroupInfo->m_pOutItemSet); + } + pPageInfo->m_pPage->Show(); + } + else if ( pPageInfo->m_pExtPage ) + { + pPageInfo->m_pExtPage->Show(); + pPageInfo->m_pExtPage->ActivatePage(); + } - if ( pTGInfo->m_pExtPage ) - { - pTGInfo->m_pExtPage->Show(); - pTGInfo->m_pExtPage->ActivatePage(); - } + { + ::rtl::OUStringBuffer sTitleBuf(sTitle); + sTitleBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - ")); + sTitleBuf.append(aTreeLB.GetEntryText(pParent)); + sTitleBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - ")); + sTitleBuf.append(aTreeLB.GetEntryText(pEntry)); + SetText(sTitleBuf.makeStringAndClear()); + } - pCurrentPageEntry = pEntry; + pCurrentPageEntry = pEntry; + if ( !bForgetSelection ) + { + if ( !pLastPageSaver ) + pLastPageSaver = new LastPageSaver; + if ( !bIsFromExtensionManager ) + pLastPageSaver->m_nLastPageId = pPageInfo->m_nPageId; + if ( pPageInfo->m_pExtPage ) + { + if ( bIsFromExtensionManager ) + pLastPageSaver->m_sLastPageURL_ExtMgr = pPageInfo->m_sPageURL; + else + pLastPageSaver->m_sLastPageURL_Tools = pPageInfo->m_sPageURL; } } + pNewPage = pPageInfo->m_pPage; // restore lost focus, if necessary Window* pFocusWin = Application::GetFocusWindow(); @@ -1347,7 +1215,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) // then set the focus to the new page or if we are on a group set the focus to the options treebox pNewPage ? pNewPage->GrabFocus() : pBox->GrabFocus(); - return 0; + return; } OfaPageResource::OfaPageResource() : @@ -1399,7 +1267,7 @@ sal_Bool EnableSSO( void ) sal_Bool bSSOEnabled = ( theOfflineValue == theDefaultOfflineValue && - ( theServerTypeValue.getLength() == 0 || + ( theServerTypeValue.isEmpty() || theServerTypeValue == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("uno") ) ) && theBackendServiceTypeValue == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -2151,10 +2019,6 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void ) MoveControl( aHelpPB, nDelta ); MoveControl( aBackPB, nDelta ); MoveControl( aHiddenGB, nDelta ); - MoveControl( aPageTitleFT, nDelta ); - MoveControl( aLine1FL, nDelta ); - MoveControl( aHelpFT, nDelta ); - MoveControl( aHelpImg, nDelta ); } bool isNodeActive( OptionsNode* pNode, Module* pModule ) @@ -2195,7 +2059,7 @@ void OfaTreeOptionsDialog::LoadExtensionOptions( const rtl::OUString& rExtension ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY ); DBG_ASSERT( xRoot.is(), "OfaTreeOptionsDialog::LoadExtensionOptions(): no config" ); // when called by Tools - Options then load nodes of active module - if ( rExtensionId.getLength() == 0 ) + if ( rExtensionId.isEmpty() ) pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference< XFrame >() ), xRoot ); VectorOfNodes aNodeList; @@ -2338,15 +2202,15 @@ void OfaTreeOptionsDialog::LoadNodes( xNodeAccess->getByName( C2U("GroupId") ) >>= sGroupId; xNodeAccess->getByName( C2U("GroupIndex") ) >>= nGroupIndex; - if ( sLabel.getLength() == 0 ) + if ( sLabel.isEmpty() ) sLabel = sGroupName; - String sTemp = getGroupName( sLabel, rExtensionId.getLength() > 0 ); + String sTemp = getGroupName( sLabel, !rExtensionId.isEmpty() ); if ( sTemp.Len() > 0 ) sLabel = sTemp; OptionsNode* pNode = new OptionsNode( sNodeId, sLabel, sPageURL, bAllModules, sGroupId, nGroupIndex ); - if ( !rExtensionId.getLength() && !isNodeActive( pNode, pModule ) ) + if ( rExtensionId.isEmpty() && !isNodeActive( pNode, pModule ) ) { delete pNode; continue; @@ -2374,12 +2238,12 @@ void OfaTreeOptionsDialog::LoadNodes( xLeaveAccess->getByName( C2U("GroupId") ) >>= sLeafGrpId; xLeaveAccess->getByName( C2U("GroupIndex") ) >>= nLeafGrpIdx; - if ( !rExtensionId.getLength() || sId == rExtensionId ) + if ( rExtensionId.isEmpty() || sId == rExtensionId ) { OptionsLeaf* pLeaf = new OptionsLeaf( sId, sLeafLabel, sLeafURL, sEventHdl, sLeafGrpId, nLeafGrpIdx ); - if ( sLeafGrpId.getLength() > 0 ) + if ( !sLeafGrpId.isEmpty() ) { bool bAlreadyOpened = false; if ( pNode->m_aGroupedLeaves.size() > 0 ) @@ -2483,7 +2347,7 @@ void lcl_insertLeaf( { sal_uInt16 nNodeGrpId = getGroupNodeId( pNode->m_sId ); nGrpId = pDlg->AddGroup( pNode->m_sLabel, NULL, NULL, nNodeGrpId ); - if ( pNode->m_sPageURL.getLength() > 0 ) + if ( !pNode->m_sPageURL.isEmpty() ) { SvLBoxEntry* pGrpEntry = rTreeLB.GetEntry( 0, nGrpId ); DBG_ASSERT( pGrpEntry, "OfaTreeOptionsDialog::InsertNodes(): no group" ); @@ -2579,7 +2443,7 @@ void ExtensionsTabPage::CreateDialogWithHandler() { try { - bool bWithHandler = ( m_sEventHdl.getLength() > 0 ); + bool bWithHandler = ( !m_sEventHdl.isEmpty() ); if ( bWithHandler ) { Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); @@ -2653,7 +2517,7 @@ void ExtensionsTabPage::ActivatePage() Size aSize = GetSizePixel(); m_xPage->setPosSize( aPos.X() + 1, aPos.Y() + 1, aSize.Width() - 2, aSize.Height() - 2, awt::PosSize::POSSIZE ); - if ( m_sEventHdl.getLength() > 0 ) + if ( !m_sEventHdl.isEmpty() ) DispatchAction( C2U("initialize") ); } } diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc index 88e9697ce38b..46572f4d9c42 100644 --- a/cui/source/options/treeopt.hrc +++ b/cui/source/options/treeopt.hrc @@ -32,18 +32,9 @@ #define PB_HELP 3 #define PB_BACK 4 #define TLB_PAGES 5 -#define FT_HELPTEXT 6 -#define STR_HELPTEXTS 7 -#define IMG_LIST 8 -#define IMG_HELP 9 -#define FT_PAGE_TITLE 10 -#define FL_LINE_1 11 -#define BMP_ROOT_CLOSED 17 -#define BMP_ROOT_OPENED 18 #define FB_BORDER 19 -#define IMG_HINT 20 #define FT_HINT 21 #define CB_DISABLE 22 #define BTN_HINT 23 @@ -62,15 +53,10 @@ #define STR_SAVE_PAGE (STR_GENERAL_PAGES_START + 9) #define STR_USERDATA_PAGE (STR_GENERAL_PAGES_START + 10) -#define FB_IMAGE 43 - - // metrics #define WIDTH_PAGEFRAME 263 #define HEIGHT_PAGEFRAME 191 -#define WIDTH_IMG_HELP 25 -#define HEIGHT_IMG_HELP 30 #define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) #define COL_2 (COL_1+0) @@ -85,16 +71,9 @@ #define COL_5 (COL_6-RSC_SP_CTRL_GROUP_X) #define COL_4 (COL_5-RSC_CD_PUSHBUTTON_WIDTH) #define COL_3_1 (COL_3+RSC_SP_TBPG_INNERBORDER_LEFT) -#define COL_3_3 (COL_3_1+WIDTH_IMG_HELP) -#define COL_3_5 (COL_11-RSC_SP_TBPG_INNERBORDER_RIGHT) #define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) #define ROW_2 (ROW_1+HEIGHT_PAGEFRAME) #define ROW_3 (ROW_2+RSC_SP_CTRL_GROUP_Y) #define ROW_4 (ROW_3+RSC_CD_PUSHBUTTON_HEIGHT) #define ROW_5 (ROW_4+RSC_SP_DLG_INNERBORDER_BOTTOM) -#define ROW_1_1 (ROW_1+2) -#define ROW_1_2 (ROW_1+12) -#define ROW_1_3 (ROW_1_1+HEIGHT_IMG_HELP+2) -#define ROW_1_4 (ROW_1_3+8) - diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index 93ea0c283ca9..37bdc36d7c4f 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -83,62 +83,10 @@ ModalDialog RID_OFADLG_OPTIONS_TREE Size = MAP_APPFONT ( WIDTH_PAGEFRAME, HEIGHT_PAGEFRAME ) ; Hide = TRUE; }; - FixedImage IMG_HELP - { - Pos = MAP_APPFONT ( COL_3_1, ROW_1_1 ) ; - Size = MAP_APPFONT ( WIDTH_IMG_HELP, HEIGHT_IMG_HELP ) ; - Hide = TRUE; - }; - FixedText FT_PAGE_TITLE - { - Pos = MAP_APPFONT ( COL_3_3, ROW_1_2 ) ; - Size = MAP_APPFONT ( (COL_3_5-COL_3_3), 15 ) ; - Hide = TRUE; - }; - FixedLine FL_LINE_1 - { - Pos = MAP_APPFONT ( COL_3_1 , ROW_1_3 ) ; - Size = MAP_APPFONT ( (COL_3_5-COL_3_1), 1 ) ; - Comment = "Trennlinie" ; - Hide = TRUE; - }; - FixedText FT_HELPTEXT - { - Pos = MAP_APPFONT ( COL_3_3, ROW_1_4 ) ; - Size = MAP_APPFONT ( (COL_3_5-COL_3_3), (HEIGHT_PAGEFRAME-ROW_1_4-1) ) ; - WordBreak = TRUE; - Hide = TRUE; - }; String ST_LOAD_ERROR { Text [ en-US ] = "The selected module could not be loaded."; }; - StringArray STR_HELPTEXTS - { - ItemList [ en-US ] = - { - < "This dialog is used to define general settings when working with %PRODUCTNAME. Enter your personal data, the defaults to be used when saving documents, and paths to important files. These settings will be saved automatically and used in later sessions as well."; SID_GENERAL_OPTIONS; > ; - < "This is where you make settings concerning language and writing aids for your work with %PRODUCTNAME."; SID_LANGUAGE_OPTIONS; > ; - < "This is where you configure %PRODUCTNAME for the Internet. You can save your proxy settings." ; SID_INET_DLG; > ; - < "This is where you specify various settings for text documents. These settings determine how your text documents are handled in %PRODUCTNAME and are valid for all new %PRODUCTNAME Writer documents. You can also define a few settings for the active text document if you save it afterwards." ; SID_SW_EDITOPTIONS; > ; - < "This is where you define the basic settings for %PRODUCTNAME documents in HTML format. For example, you decide which contents should be displayed on the screen or printed, how the pages are scrolled on the screen, in which color keywords are highlighted in the source text and much more." ; SID_SW_ONLINEOPTIONS; > ; - < "This is where you define various global settings for spreadsheets. For example, you can define which contents should be displayed and in which direction the cursor will move after you enter data in a cell. You also define sort lists, the number of the decimal places displayed, etc." ; SID_SC_EDITOPTIONS; > ; - < "This is where you define the settings that apply to all newly saved presentations. Among other things, you decide which contents are displayed on the slides, which default unit of measure is used, if and how grid alignment is used, and if notes and handouts are always printed." ; SID_SD_EDITOPTIONS; > ; - < "This is where you define the settings for drawing documents. Among other things, you determine which contents are displayed on the pages, which scale is used, if and how grid alignment is used, and which contents are printed by default." ; SID_SD_GRAPHIC_OPTIONS; > ; - < "This is where you select the print format and print options for all newly saved formula documents. These options take effect when you want to print a formula directly from %PRODUCTNAME Math." ; SID_SM_EDITOPTIONS; > ; - < "This is where you specify general default settings for your %PRODUCTNAME Charts. Set the colors you want for all new charts." ; SID_SCH_EDITOPTIONS; > ; - < "This is where you define general settings for accessing external data sources."; SID_SB_STARBASEOPTIONS; > ; - < "This is where you define general settings for opening and saving documents in external formats. You can control the behavior of macros or OLE objects in Microsoft Office documents or define settings for HTML documents." ; SID_FILTER_DLG; > ; - }; - }; - Bitmap BMP_ROOT_CLOSED - { - File = "plus.bmp" ; - }; - Bitmap BMP_ROOT_OPENED - { - File = "minus.bmp" ; - }; }; Resource RID_OFADLG_OPTIONS_TREE_PAGES @@ -200,6 +148,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES < "Print" ; RID_SW_TP_OPTPRINT_PAGE ; > ; < "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ; < "Changes" ; RID_SW_TP_REDLINE_OPT ; > ; + < "Comparison" ; RID_SW_TP_COMPARISON_OPT ; > ; < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ; < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ; < "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >; @@ -303,33 +252,3 @@ String RID_RIDER_SLL_PERSONAL { Text [ en-US ] = "Personal certificates" ; }; - -#define MASK_COL MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } ; -#define IMGLST_IDLST \ - IdList = { \ - SID_GENERAL_OPTIONS; \ - SID_LANGUAGE_OPTIONS; \ - SID_INET_DLG; \ - SID_SW_EDITOPTIONS; \ - SID_SW_ONLINEOPTIONS; \ - SID_SC_EDITOPTIONS; \ - SID_SD_EDITOPTIONS; \ - SID_SD_GRAPHIC_OPTIONS; \ - SID_SM_EDITOPTIONS; \ - SID_SCH_EDITOPTIONS; \ - SID_SB_STARBASEOPTIONS; \ - SID_FILTER_DLG; \ - }; \ - IdCount = { \ - 12; \ - }; - -ImageList RID_IMGLIST_TREEOPT -{ - Prefix = "tr"; - MASK_COL - IMGLST_IDLST -}; - - - diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 147a18fb9192..541ba2aeef6e 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2597,7 +2597,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) const rtl::OUString aSmartTagType = xRec->getSmartTagName(j); rtl::OUString aSmartTagCaption = rSmartTagMgr.GetSmartTagCaption( aSmartTagType, aLocale ); - if ( !aSmartTagCaption.getLength() ) + if ( aSmartTagCaption.isEmpty() ) aSmartTagCaption = aSmartTagType; const rtl::OUString aLBEntry = aSmartTagCaption + diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index dd5d346b95d6..22928500d2e0 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -361,8 +361,8 @@ IMPL_LINK(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; SvxNumSettings_ImplPtr _pSet = aNumSettingsArr.GetObject(nIdx); sal_Int16 eNewType = _pSet->nNumberType; - const sal_Unicode cLocalPrefix = _pSet->sPrefix.getLength() ? _pSet->sPrefix.getStr()[0] : 0; - const sal_Unicode cLocalSuffix = _pSet->sSuffix.getLength() ? _pSet->sSuffix.getStr()[0] : 0; + const sal_Unicode cLocalPrefix = !_pSet->sPrefix.isEmpty() ? _pSet->sPrefix.getStr()[0] : 0; + const sal_Unicode cLocalSuffix = !_pSet->sSuffix.isEmpty() ? _pSet->sSuffix.getStr()[0] : 0; sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) @@ -744,7 +744,7 @@ IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) // #i93908# clear suffix for bullet lists aFmt.SetPrefix(::rtl::OUString()); aFmt.SetSuffix(::rtl::OUString()); - if( pLevelSettings->sBulletFont.getLength() && + if( !pLevelSettings->sBulletFont.isEmpty() && pLevelSettings->sBulletFont.compareTo( rActBulletFont.GetName())) { @@ -780,7 +780,7 @@ IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) else aFmt.SetBulletFont( &rActBulletFont ); - aFmt.SetBulletChar( pLevelSettings->sBulletChar.getLength() + aFmt.SetBulletChar( !pLevelSettings->sBulletChar.isEmpty() ? pLevelSettings->sBulletChar.getStr()[0] : 0 ); aFmt.SetCharFmtName( sBulletCharFmtName ); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index b0877be9dba9..2de889a80afe 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -1021,7 +1021,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pBitmapList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sob" ) ) ); } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index dca59c564862..579b9ed896f2 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -253,7 +253,7 @@ IMPL_LINK( SvxLoadSaveEmbed, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( XPropertyList::GetDefaultExt( meType ) ); } diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index e7fb9b4dcd9a..d82567009d8f 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -740,7 +740,7 @@ IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pGradientList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sog" ) ) ); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index a2cefa2f0d08..9568061c1195 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -779,7 +779,7 @@ IMPL_LINK( SvxHatchTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pHatchingList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "soh" ) ) ); } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 6073d54c3500..9b5876a28ed7 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -839,7 +839,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pDashList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sod" ) ) ); } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index f8d4e0c95891..25d8eafbe315 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -639,7 +639,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) { aFile.Append( pLineEndList->GetName() ); - if( !aFile.getExtension().getLength() ) + if( aFile.getExtension().isEmpty() ) aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "soe" ) ) ); } |