diff options
Diffstat (limited to 'cui/source/options')
-rw-r--r-- | cui/source/options/doclinkdialog.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/fontsubs.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optdict.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/optgdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optgenrl.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/opthtml.cxx | 14 | ||||
-rw-r--r-- | cui/source/options/optinet2.cxx | 22 | ||||
-rw-r--r-- | cui/source/options/optmemory.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optsave.cxx | 2 |
9 files changed, 30 insertions, 30 deletions
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 98b550069b38..d38b872ab27d 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -96,7 +96,7 @@ namespace svx void ODocumentLinkDialog::validate( ) { - m_aOK.Enable( (0 != m_aName.GetText().Len()) && ( 0 != m_aURL.GetText().Len() ) ); + m_aOK.Enable( ( !m_aName.GetText().isEmpty()) && ( !m_aURL.GetText().isEmpty() ) ); } //------------------------------------------------------------------ @@ -179,7 +179,7 @@ namespace svx if (0 != aFileDlg.Execute()) return 0L; - if (0 == m_aName.GetText().Len()) + if (m_aName.GetText().isEmpty()) { // default the name to the base of the chosen URL INetURLObject aParser; @@ -188,7 +188,7 @@ namespace svx m_aName.SetText(aParser.getBase(INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET)); - m_aName.SetSelection(Selection(0,m_aName.GetText().Len())); + m_aName.SetSelection(Selection(0,m_aName.GetText().getLength())); m_aName.GrabFocus(); } else diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index e511a3f9302b..1ce2e89c4281 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -385,7 +385,7 @@ void SvxFontSubstTabPage::CheckEnable() sEntry += aFont2CB.GetText(); // because of OS/2 optimization error (Bug #56267) a bit more intricate: - if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len()) + if (aFont1CB.GetText().isEmpty() || aFont2CB.GetText().isEmpty()) bApply = sal_False; else if(aFont1CB.GetText() == aFont2CB.GetText()) bApply = sal_False; diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 9855c8a31fb5..e8d3f4850ae0 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -194,7 +194,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl) { - if ( aNameEdit.GetText().Len() ) + if ( !aNameEdit.GetText().isEmpty() ) aOKBtn.Enable(); else aOKBtn.Disable(); @@ -552,7 +552,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) if(!bFirstSelect) { SvTreeListEntry* pEntry = pBox->FirstSelected(); - String sTmpShort(pBox->GetEntryText(pEntry, 0)); + OUString sTmpShort(pBox->GetEntryText(pEntry, 0)); // without this the curser is always at the beginning of a word, if the text // is set over the ModifyHdl, although you're editing there at the moment if(aWordED.GetText() != sTmpShort) @@ -761,7 +761,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) sal_Bool bIsChange = CDE_EQUAL != cmpDicEntry_Impl(aWordED.GetText(), aWordText) || CDE_EQUAL != cmpDicEntry_Impl(aReplaceED.GetText(), aReplaceText); - if (aWordED.GetText().Len() && bIsChange) + if (!aWordED.GetText().isEmpty() && bIsChange) bEnableNewReplace = sal_True; } diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 6b7f6ec496db..9bbfab856e90 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -350,7 +350,7 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) const SfxUInt16Item* pUInt16Item = PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) ); - sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().ToInt32(); + sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().toInt32(); if ( pUInt16Item && pUInt16Item->GetValue() != nNum ) { bModified = sal_True; @@ -1480,7 +1480,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // Configured date acceptance patterns, for example Y-M-D;M-D or empty for // locale default. - if (aDatePatternsED.GetText() != aDatePatternsED.GetSavedValue()) + if (aDatePatternsED.GetText() != OUString(aDatePatternsED.GetSavedValue())) pLangConfig->aSysLocaleOptions.SetDatePatternsConfigString( aDatePatternsED.GetText()); SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 5a1438b2073d..21278cf8b4d0 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -483,7 +483,7 @@ sal_Bool SvxGeneralTabPage::GetAddress_Impl() // modified? for (unsigned i = 0; i != vFields.size(); ++i) - if (vFields[i]->aEdit.GetSavedValue() != vFields[i]->aEdit.GetText()) + if (OUString(vFields[i]->aEdit.GetSavedValue()) != vFields[i]->aEdit.GetText()) return true; return false; } diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 999303046d8c..49a57fcba5dd 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -111,19 +111,19 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& ) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); - if(aSize1NF.GetSavedValue() != aSize1NF.GetText()) + if(OUString(aSize1NF.GetSavedValue()) != aSize1NF.GetText()) rHtmlOpt.SetFontSize(0, (sal_uInt16)aSize1NF.GetValue()); - if(aSize2NF.GetSavedValue() != aSize2NF.GetText()) + if(OUString(aSize2NF.GetSavedValue()) != aSize2NF.GetText()) rHtmlOpt.SetFontSize(1, (sal_uInt16)aSize2NF.GetValue()); - if(aSize3NF.GetSavedValue() != aSize3NF.GetText()) + if(OUString(aSize3NF.GetSavedValue()) != aSize3NF.GetText()) rHtmlOpt.SetFontSize(2, (sal_uInt16)aSize3NF.GetValue()); - if(aSize4NF.GetSavedValue() != aSize4NF.GetText()) + if(OUString(aSize4NF.GetSavedValue()) != aSize4NF.GetText()) rHtmlOpt.SetFontSize(3, (sal_uInt16)aSize4NF.GetValue()); - if(aSize5NF.GetSavedValue() != aSize5NF.GetText()) + if(OUString(aSize5NF.GetSavedValue()) != aSize5NF.GetText()) rHtmlOpt.SetFontSize(4, (sal_uInt16)aSize5NF.GetValue()); - if(aSize6NF.GetSavedValue() != aSize6NF.GetText()) + if(OUString(aSize6NF.GetSavedValue()) != aSize6NF.GetText()) rHtmlOpt.SetFontSize(5, (sal_uInt16)aSize6NF.GetValue()); - if(aSize7NF.GetSavedValue() != aSize7NF.GetText()) + if(OUString(aSize7NF.GetSavedValue()) != aSize7NF.GetText()) rHtmlOpt.SetFontSize(6, (sal_uInt16)aSize7NF.GetValue()); if(aNumbersEnglishUSCB.IsChecked() != aNumbersEnglishUSCB.GetSavedValue()) diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 240cb876684a..37a4c63d0e7f 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -414,49 +414,49 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) bModified = sal_True; } - if(aHttpProxyED.GetSavedValue() != aHttpProxyED.GetText()) + if(OUString(aHttpProxyED.GetSavedValue()) != aHttpProxyED.GetText()) { xPropertySet->setPropertyValue( aHttpProxyPN, makeAny(rtl::OUString(aHttpProxyED.GetText()))); bModified = sal_True; } - if ( aHttpPortED.GetSavedValue() != aHttpPortED.GetText() ) + if ( OUString(aHttpPortED.GetSavedValue()) != aHttpPortED.GetText() ) { xPropertySet->setPropertyValue( aHttpPortPN, - makeAny(aHttpPortED.GetText().ToInt32())); + makeAny(aHttpPortED.GetText().toInt32())); bModified = sal_True; } - if(aHttpsProxyED.GetSavedValue() != aHttpsProxyED.GetText()) + if(OUString(aHttpsProxyED.GetSavedValue()) != aHttpsProxyED.GetText()) { xPropertySet->setPropertyValue( aHttpsProxyPN, makeAny(rtl::OUString(aHttpsProxyED.GetText()))); bModified = sal_True; } - if ( aHttpsPortED.GetSavedValue() != aHttpsPortED.GetText() ) + if ( OUString(aHttpsPortED.GetSavedValue()) != aHttpsPortED.GetText() ) { xPropertySet->setPropertyValue( aHttpsPortPN, - makeAny(aHttpsPortED.GetText().ToInt32())); + makeAny(aHttpsPortED.GetText().toInt32())); bModified = sal_True; } - if(aFtpProxyED.GetSavedValue() != aFtpProxyED.GetText()) + if(OUString(aFtpProxyED.GetSavedValue()) != aFtpProxyED.GetText()) { xPropertySet->setPropertyValue( aFtpProxyPN, makeAny( rtl::OUString(aFtpProxyED.GetText()))); bModified = sal_True; } - if ( aFtpPortED.GetSavedValue() != aFtpPortED.GetText() ) + if ( OUString(aFtpPortED.GetSavedValue()) != aFtpPortED.GetText() ) { xPropertySet->setPropertyValue( aFtpPortPN, - makeAny(aFtpPortED.GetText().ToInt32())); + makeAny(aFtpPortED.GetText().toInt32())); bModified = sal_True; } - if ( aNoProxyForED.GetSavedValue() != aNoProxyForED.GetText() ) + if ( OUString(aNoProxyForED.GetSavedValue()) != aNoProxyForED.GetText() ) { xPropertySet->setPropertyValue( aNoProxyDescPN, makeAny( rtl::OUString(aNoProxyForED.GetText()))); @@ -1386,7 +1386,7 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& ) { sal_Bool bMailModified = sal_False; - if(!pImpl->aMailConfig.bROProgram && aMailerURLED.GetSavedValue() != aMailerURLED.GetText()) + if(!pImpl->aMailConfig.bROProgram && OUString(aMailerURLED.GetSavedValue()) != aMailerURLED.GetText()) { pImpl->aMailConfig.sProgram = aMailerURLED.GetText(); bMailModified = sal_True; diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index e5c43f79cf11..48e120fe7159 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -176,7 +176,7 @@ sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet ) boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); - if ( aUndoEdit.GetText() != aUndoEdit.GetSavedValue() ) + if ( aUndoEdit.GetText() != OUString(aUndoEdit.GetSavedValue()) ) officecfg::Office::Common::Undo::Steps::set( aUndoEdit.GetValue(), batch); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index d818d9199aa0..394ece1bd0eb 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -310,7 +310,7 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) bModified |= sal_True; } - if ( aAutoSaveEdit.GetText() != aAutoSaveEdit.GetSavedValue() ) + if ( aAutoSaveEdit.GetText() != OUString(aAutoSaveEdit.GetSavedValue()) ) { rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ), (sal_uInt16)aAutoSaveEdit.GetValue() ) ); |