Skip to content

C
core
Kaydet (Commit) ecdce390 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert sw/source/ui/dbui/*.hxx from String to OUString 

Change-Id: I43deb5f70beddec6689a7e1cfb7d76e403b79819
üst 6d7f80a5
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 53 deletions
sw/source/ui/dbui/mmaddressblockpage.cxx
Dosyayı görüntüle @ ecdce390
......@@ -504,7 +504,7 @@ void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt)
if(rEvt.GetCharCode())
{
OUString sKey(rEvt.GetCharCode());
if( STRING_NOTFOUND != sForbiddenChars.Search(sKey))
if( -1 != sForbiddenChars.indexOf(sKey))
bCallParent = false;
}
if(bCallParent)
......@@ -515,9 +515,9 @@ void SwRestrictedComboBox::Modify()
{
Selection aSel = GetSelection();
OUString sTemp = GetText();
for(sal_uInt16 i = 0; i < sForbiddenChars.Len(); i++)
for(sal_uInt16 i = 0; i < sForbiddenChars.getLength(); i++)
{
sTemp = comphelper::string::remove(sTemp, sForbiddenChars.GetChar(i));
sTemp = comphelper::string::remove(sTemp, sForbiddenChars[i]);
}
sal_Int32 nDiff = GetText().getLength() - sTemp.getLength();
if(nDiff)
......@@ -1398,7 +1398,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr )
// Insert the new entry in front of the entry at the beginning of the selection
void AddressMultiLineEdit::InsertNewEntry( const String& rStr )
void AddressMultiLineEdit::InsertNewEntry( const OUString& rStr )
{
// insert new entry after current selected one.
ExtTextView* pTextView = GetTextView();
......@@ -1419,7 +1419,7 @@ void AddressMultiLineEdit::InsertNewEntry( const String& rStr )
Modify();
}
void AddressMultiLineEdit::InsertNewEntryAtPosition( const String& rStr, sal_uLong nPara, sal_uInt16 nIndex )
void AddressMultiLineEdit::InsertNewEntryAtPosition( const OUString& rStr, sal_uLong nPara, sal_uInt16 nIndex )
{
ExtTextEngine* pTextEngine = GetTextEngine();
TextPaM aInsertPos( nPara, nIndex );
......@@ -1559,9 +1559,9 @@ bool AddressMultiLineEdit::HasCurrentItem()
&& pBeginAttrib->GetEnd() >= rSelection.GetEnd().GetIndex()));
}
String AddressMultiLineEdit::GetCurrentItem()
OUString AddressMultiLineEdit::GetCurrentItem()
{
String sRet;
OUString sRet;
ExtTextEngine* pTextEngine = GetTextEngine();
ExtTextView* pTextView = GetTextView();
const TextSelection& rSelection = pTextView->GetSelection();
......@@ -1594,21 +1594,21 @@ void AddressMultiLineEdit::SelectCurrentItem()
}
}
String AddressMultiLineEdit::GetAddress()
OUString AddressMultiLineEdit::GetAddress()
{
String sRet;
OUString sRet;
ExtTextEngine* pTextEngine = GetTextEngine();
sal_uLong nParaCount = pTextEngine->GetParagraphCount();
for(sal_uLong nPara = nParaCount; nPara; --nPara)
{
String sPara = comphelper::string::stripEnd(pTextEngine->GetText(nPara - 1), ' ');
//don't add empty trailing paragraphs
if(sRet.Len() || sPara.Len())
if(!sRet.isEmpty() || sPara.Len())
{
sRet.Insert(sPara, 0);
sRet = sPara + sRet;
//insert the para break
if(nPara > 1)
sRet.Insert( '\n', 0);
sRet = "\n" + sRet;
}
}
return sRet;
......
sw/source/ui/dbui/mmaddressblockpage.hxx
Dosyayı görüntüle @ ecdce390
......@@ -171,23 +171,23 @@ public:
void SetSelectionChangedHdl( const Link& rLink ) {m_aSelectionLink = rLink;}
void SetText( const OUString& rStr );
String GetAddress();
OUString GetAddress();
void InsertNewEntry( const String& rStr );
void InsertNewEntryAtPosition( const String& rStr, sal_uLong nPara, sal_uInt16 nIndex );
void InsertNewEntry( const OUString& rStr );
void InsertNewEntryAtPosition( const OUString& rStr, sal_uLong nPara, sal_uInt16 nIndex );
void RemoveCurrentEntry();
void MoveCurrentItem(sal_uInt16 nMove);
sal_uInt16 IsCurrentItemMoveable();
bool HasCurrentItem();
String GetCurrentItem();
OUString GetCurrentItem();
void SelectCurrentItem();
};
// Dialog is used to create custom address blocks as well as custom greeting lines
class SwRestrictedComboBox : public ComboBox
{
String sForbiddenChars;
OUString sForbiddenChars;
protected:
virtual void KeyInput( const KeyEvent& );
......@@ -198,7 +198,7 @@ public:
{
}
void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;}
void SetForbiddenChars(const OUString& rSet){sForbiddenChars = rSet;}
};
class SwCustomizeAddressBlockDialog : public SfxModalDialog
......@@ -237,9 +237,9 @@ private:
::std::vector<String> m_aSalutations;
::std::vector<String> m_aPunctuations;
String m_sCurrentSalutation;
String m_sCurrentPunctuation;
String m_sCurrentText;
OUString m_sCurrentSalutation;
OUString m_sCurrentPunctuation;
OUString m_sCurrentText;
SwMailMergeConfigItem& m_rConfigItem;
DialogType m_eType;
......@@ -278,8 +278,8 @@ class SwAssignFieldsDialog : public SfxModalDialog
CancelButton m_aCancel;
HelpButton m_aHelp;
String m_sNone;
OUString m_rPreviewString;
OUString m_sNone;
OUString m_rPreviewString;
SwMailMergeConfigItem& m_rConfigItem;
......
sw/source/ui/dbui/mmgreetingspage.hxx
Dosyayı görüntüle @ ecdce390
......@@ -153,8 +153,8 @@ public:
SwMailBodyDialog(Window* pParent, SwMailMergeWizard* pWizard);
~SwMailBodyDialog();
void SetBody(const String& rBody ) {m_aBodyMLE.SetText(rBody);}
String GetBody() const {return m_aBodyMLE.GetText();}
void SetBody(const OUString& rBody ) {m_aBodyMLE.SetText(rBody);}
OUString GetBody() const {return m_aBodyMLE.GetText();}
};
#endif
......
sw/source/ui/dbui/mmoutputpage.hxx
Dosyayı görüntüle @ ecdce390
......@@ -84,17 +84,17 @@ class SwMailMergeOutputPage : public svt::OWizardPage
PushButton m_aSendDocumentsPB;
//some FixedLine labels
String m_sSaveStartST;
String m_sSaveMergedST;
String m_sPrintST;
String m_sSendMailST;
OUString m_sSaveStartST;
OUString m_sSaveMergedST;
OUString m_sPrintST;
OUString m_sSendMailST;
//misc strings
String m_sDefaultAttachmentST;
String m_sNoSubjectST;
String m_sConfigureMail;
OUString m_sDefaultAttachmentST;
OUString m_sNoSubjectST;
OUString m_sConfigureMail;
String m_sBody;
OUString m_sBody;
long m_nFromToRBPos;
long m_nFromToFTPos;
......@@ -107,8 +107,8 @@ class SwMailMergeOutputPage : public svt::OWizardPage
//some dialog data
Printer* m_pTempPrinter;
String m_sCC;
String m_sBCC;
OUString m_sCC;
OUString m_sBCC;
DECL_LINK(OutputTypeHdl_Impl, RadioButton*);
......@@ -168,17 +168,17 @@ class SW_DLLPUBLIC SwSendMailDialog : public ModelessDialog //SfxModalDialog
PushButton m_aStopPB;
PushButton m_aClosePB;
String m_sMore;
String m_sLess;
String m_sContinue;
String m_sStop;
String m_sSend;
String m_sTransferStatus;
OUString m_sMore;
OUString m_sLess;
OUString m_sContinue;
OUString m_sStop;
OUString m_sSend;
OUString m_sTransferStatus;
OUString m_sErrorStatus;
String m_sSendingTo;
String m_sCompleted;
String m_sFailed;
String m_sTerminateQuery;
OUString m_sSendingTo;
OUString m_sCompleted;
OUString m_sFailed;
OUString m_sTerminateQuery;
bool m_bCancel;
bool m_bDesctructionEnabled;
......
sw/source/ui/dbui/selectdbtabledialog.cxx
Dosyayı görüntüle @ ecdce390
......@@ -173,14 +173,14 @@ IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton)
return 0;
}
String SwSelectDBTableDialog::GetSelectedTable(bool& bIsTable)
OUString SwSelectDBTableDialog::GetSelectedTable(bool& bIsTable)
{
SvTreeListEntry* pEntry = m_aTableLB.FirstSelected();
bIsTable = pEntry->GetUserData() ? false : true;
return pEntry ? m_aTableLB.GetEntryText(pEntry, 0) : OUString();
}
void SwSelectDBTableDialog::SetSelectedTable(const String& rTable, bool bIsTable)
void SwSelectDBTableDialog::SetSelectedTable(const OUString& rTable, bool bIsTable)
{
SvTreeListEntry* pEntry = m_aTableLB.First();
while(pEntry)
......
sw/source/ui/dbui/selectdbtabledialog.hxx
Dosyayı görüntüle @ ecdce390
......@@ -44,10 +44,10 @@ class SwSelectDBTableDialog : public SfxModalDialog
CancelButton m_aCancel;
HelpButton m_aHelp;
String m_sName;
String m_sType;
String m_sTable;
String m_sQuery;
OUString m_sName;
OUString m_sType;
OUString m_sTable;
OUString m_sQuery;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
......@@ -59,8 +59,8 @@ public:
);
~SwSelectDBTableDialog();
String GetSelectedTable(bool& bIsTable);
void SetSelectedTable(const String& rTable, bool bIsTable);
OUString GetSelectedTable(bool& bIsTable);
void SetSelectedTable(const OUString& rTable, bool bIsTable);
};
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment