diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
| commit | 6a75a47be7b3aafbb655ffa70609fd2ed7ca4b3e (patch) | |
| tree | d00d2024213e09b8eba4704b8b6660eb42c3921c /cui/source/dialogs/cuifmsearch.cxx | |
| parent | 7fb1e1ea8c9f8d3ef13524d1327272824df7110d (diff) | |
| parent | eee3dbc7af039669d447d2e55abd896ea3383df1 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
automation/source/communi/communi.cxx
automation/source/server/recorder.cxx
automation/source/server/server.cxx
basctl/source/basicide/basobj2.cxx
Diffstat (limited to 'cui/source/dialogs/cuifmsearch.cxx')
| -rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 7d38ea63ca8d..b4556cccdf3e 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -267,7 +267,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI // fill the listboxes // method of field comparison - USHORT nResIds[] = { + sal_uInt16 nResIds[] = { RID_STR_SEARCH_ANYWHERE, RID_STR_SEARCH_BEGINNING, RID_STR_SEARCH_END, @@ -278,7 +278,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI m_lbPosition.SelectEntryPos(MATCHING_ANYWHERE); // the field listbox - for (USHORT i=0; i<strVisibleFields.GetTokenCount(';'); ++i) + for (sal_uInt16 i=0; i<strVisibleFields.GetTokenCount(';'); ++i) m_lbField.InsertEntry(strVisibleFields.GetToken(i, ';')); @@ -420,7 +420,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton ) aDlg->Execute(); - INT32 nFlags = aDlg->GetTransliterationFlags(); + sal_Int32 nFlags = aDlg->GetTransliterationFlags(); m_pSearchEngine->SetTransliterationFlags(nFlags); m_cbCase.Check(m_pSearchEngine->GetCaseSensitive()); |