diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-15 11:46:34 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-15 11:46:34 +0100 |
| commit | 2112e06294b4cb08f97fc60d456a93c289c6ff2b (patch) | |
| tree | 0aab619b1162cd2cc3afb9a630776b9dc9bf6a33 /svx/source/form | |
| parent | masterfix DEV300: #i10000# - -> _ (diff) | |
| parent | impress210: merge (diff) | |
| download | core-2112e06294b4cb08f97fc60d456a93c289c6ff2b.tar.gz core-2112e06294b4cb08f97fc60d456a93c289c6ff2b.zip | |
Automated merge with http://hg-lan.germany.sun.com/ooo/DEV300
Diffstat (limited to 'svx/source/form')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 2ff40610fa77..29eac2ab48d1 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1569,7 +1569,7 @@ void FmXFormShell::ExecuteSearch() aContextNames.swap( aValidContexts ); } - if (m_aSearchForms.size() == 0) + if (m_aSearchForms.empty() ) { // es gibt keine Controls, die alle Bedingungen fuer eine Suche erfuellen ErrorBox(NULL, WB_OK, SVX_RESSTR(RID_STR_NODATACONTROLS)).Execute(); return; @@ -2571,7 +2571,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn strFieldList.EraseTrailingChars(';'); sFieldDisplayNames.EraseTrailingChars(';'); - if (!pfmscContextInfo->arrFields.size()) + if (pfmscContextInfo->arrFields.empty()) { pfmscContextInfo->arrFields.clear(); pfmscContextInfo->xCursor = NULL; @@ -3741,7 +3741,7 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeacti // move all events from our queue to a new one, omit the events for the deactivated // page ::std::queue< FmLoadAction > aNewEvents; - while ( m_aLoadingPages.size() ) + while ( !m_aLoadingPages.empty() ) { FmLoadAction aAction = m_aLoadingPages.front(); m_aLoadingPages.pop(); |