summaryrefslogtreecommitdiff
path: root/sw/source/ui/dbui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/dbui')
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx4
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx8
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx8
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx12
6 files changed, 18 insertions, 18 deletions
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index b622a1fb1727..f7f853273e8d 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -744,7 +744,7 @@ IMPL_LINK_NOARG(SwFindEntryDialog, FindHdl_Impl)
IMPL_LINK_NOARG(SwFindEntryDialog, FindEnableHdl_Impl)
{
- m_aFindPB.Enable(m_aFindED.GetText().Len() > 0);
+ m_aFindPB.Enable(!m_aFindED.GetText().isEmpty());
return 0;
}
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 507248932ff1..bd2134f6d6de 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -242,7 +242,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
{
FreeResource();
- nGBFmtLen = aFlFormat.GetText().Len();
+ nGBFmtLen = aFlFormat.GetText().getLength();
if(xColSupp.is())
{
@@ -799,7 +799,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
{
// set the selected FieldName at the FormatGroupBox, so that
// it's clear what field is configured by the format!
- String sTxt( aFlFormat.GetText().Copy( 0, nGBFmtLen ));
+ String sTxt( aFlFormat.GetText().copy( 0, nGBFmtLen ));
if( aSrch.sColumn.isEmpty() )
{
aRbDbFmtFromDb.Enable( sal_False );
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 1d2e4ce2abfe..d91418613636 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -518,12 +518,12 @@ void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt)
void SwRestrictedComboBox::Modify()
{
Selection aSel = GetSelection();
- String sTemp = GetText();
+ OUString sTemp = GetText();
for(sal_uInt16 i = 0; i < sForbiddenChars.Len(); i++)
{
sTemp = comphelper::string::remove(sTemp, sForbiddenChars.GetChar(i));
}
- sal_uInt16 nDiff = GetText().Len() - sTemp.Len();
+ sal_Int32 nDiff = GetText().getLength() - sTemp.getLength();
if(nDiff)
{
aSel.setMin(aSel.getMin() - nDiff);
@@ -822,7 +822,7 @@ void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl()
m_aRemoveFieldIB.Enable(m_aDragED.HasCurrentItem() ? sal_True : sal_False);
SvTreeListEntry* pEntry = m_aAddressElementsLB.GetCurEntry();
m_aInsertFieldIB.Enable( pEntry &&
- (0 < (sal_Int32)(sal_IntPtr)pEntry->GetUserData() || m_aFieldCB.GetText().Len()));
+ (0 < (sal_Int32)(sal_IntPtr)pEntry->GetUserData() || !m_aFieldCB.GetText().isEmpty()));
}
void SwCustomizeAddressBlockDialog::SetAddress(const ::rtl::OUString& rAddress)
@@ -1427,7 +1427,7 @@ long AddressMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
}
-void AddressMultiLineEdit::SetText( const String& rStr )
+void AddressMultiLineEdit::SetText( const OUString& rStr )
{
MultiLineEdit::SetText(rStr);
//set attributes to all address tokens
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index bd7ab5d3b474..9c2d76be843b 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -173,7 +173,7 @@ public:
void SetSelectionChangedHdl( const Link& rLink ) {m_aSelectionLink = rLink;}
- void SetText( const String& rStr );
+ void SetText( const OUString& rStr );
String GetAddress();
void InsertNewEntry( const String& rStr );
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 96244f415fba..5cbaa819da84 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -201,8 +201,8 @@ void SwMailMergeGreetingsPage::UpdatePreview()
}
}
- String sPreview = bFemale ? m_aFemaleLB.GetSelectEntry() :
- bNoValue ? m_aNeutralCB.GetText() : m_aMaleLB.GetSelectEntry();
+ String sPreview = bFemale ? OUString(m_aFemaleLB.GetSelectEntry()) :
+ bNoValue ? m_aNeutralCB.GetText() : OUString(m_aMaleLB.GetSelectEntry());
sPreview = SwAddressPreview::FillData(sPreview, m_pWizard->GetConfigItem());
m_aPreviewWIN.SetAddress(sPreview);
@@ -367,7 +367,7 @@ sal_Bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPage
aAssignment[MM_PART_GENDER] = m_aFemaleColumnLB.GetSelectEntry();
rConfig.SetColumnAssignment( rDBData, aAssignment );
}
- if(m_aFemaleFieldCB.GetText() != m_aFemaleFieldCB.GetSavedValue())
+ if(m_aFemaleFieldCB.GetText() != OUString(m_aFemaleFieldCB.GetSavedValue()))
rConfig.SetFemaleGenderValue(m_aFemaleFieldCB.GetText());
lcl_StoreGreetingsBox(m_aFemaleLB, rConfig, SwMailMergeConfigItem::FEMALE);
@@ -561,7 +561,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl)
aAssignment[MM_PART_GENDER] = ::rtl::OUString();
rConfigItem.SetColumnAssignment( rDBData, aAssignment );
}
- if(m_aFemaleFieldCB.GetText() != m_aFemaleFieldCB.GetSavedValue())
+ if(m_aFemaleFieldCB.GetText() != OUString(m_aFemaleFieldCB.GetSavedValue()))
rConfigItem.SetFemaleGenderValue(m_aFemaleFieldCB.GetText());
EndDialog(RET_OK);
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 10b0024b8e35..20705bd5f469 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -179,7 +179,7 @@ SwSaveWarningBox_Impl::~SwSaveWarningBox_Impl()
IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, Edit*, pEdit)
{
- aOKPB.Enable(pEdit->GetText().Len() > 0);
+ aOKPB.Enable(!pEdit->GetText().isEmpty());
return 0;
}
@@ -206,7 +206,7 @@ SwSendQueryBox_Impl::~SwSendQueryBox_Impl()
IMPL_LINK( SwSendQueryBox_Impl, ModifyHdl, Edit*, pEdit)
{
- aOKPB.Enable(bIsEmptyAllowed || (pEdit->GetText().Len() > 0));
+ aOKPB.Enable(bIsEmptyAllowed || !pEdit->GetText().isEmpty());
return 0;
}
@@ -528,7 +528,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton)
if(!m_aFromRB.IsChecked())
m_aSendAllRB.Check();
- if(!m_aAttachmentED.GetText().Len())
+ if(m_aAttachmentED.GetText().isEmpty())
{
String sAttach( m_sDefaultAttachmentST );
sAttach += '.';
@@ -626,7 +626,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton)
{
INetURLObject aURL = pDocShell->GetMedium()->GetURLObject();
//update the attachment name
- if(!m_aAttachmentED.GetText().Len())
+ if(m_aAttachmentED.GetText().isEmpty())
{
if ( pDocShell->HasName() )
{
@@ -1098,7 +1098,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
return 0;
::rtl::OUString sMimeType = pSfxFlt->GetMimeType();
- if(!m_aSubjectED.GetText().Len())
+ if(m_aSubjectED.GetText().isEmpty())
{
SwSendQueryBox_Impl aQuery(pButton, m_sNoSubjectQueryST);
aQuery.SetIsEmptyTextAllowed(true);
@@ -1111,7 +1111,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
else
return 0;
}
- if(!bAsBody && !m_aAttachmentED.GetText().Len())
+ if(!bAsBody && m_aAttachmentED.GetText().isEmpty())
{
SwSendQueryBox_Impl aQuery(pButton, m_sNoAttachmentNameST);
aQuery.SetIsEmptyTextAllowed(false);
generated by cgit (git 2.34.1) at 2025-04-29 15:36:25 +0000