diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
| commit | 1fb042333fe6287756ff1fac11d18cd7c150730d (patch) | |
| tree | 595de5d187177832ce656d7832af9dce9dce2d99 /sfx2/source/dialog/filedlghelper.cxx | |
| parent | 5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'sfx2/source/dialog/filedlghelper.cxx')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index b740453cf5ff..0f3b35648061 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1433,8 +1433,8 @@ void lcl_saveLastURLs(SvStringsDtor*& rpURLLi ::comphelper::SequenceAsVector< ::rtl::OUString >& lLastURLs ) { lLastURLs.clear(); - USHORT c = rpURLList->Count(); - USHORT i = 0; + sal_uInt16 c = rpURLList->Count(); + sal_uInt16 i = 0; for (i=0; i<c; ++i) lLastURLs.push_back(*(rpURLList->GetObject(i))); } @@ -1522,15 +1522,15 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList, // check password checkbox if the document had password before if( mbHasPassword ) { - SFX_ITEMSET_ARG( rpSet, pPassItem, SfxBoolItem, SID_PASSWORDINTERACTION, FALSE ); + SFX_ITEMSET_ARG( rpSet, pPassItem, SfxBoolItem, SID_PASSWORDINTERACTION, sal_False ); mbPwdCheckBoxState = ( pPassItem != NULL && pPassItem->GetValue() ); // in case the document has password to modify, the dialog should be shown - SFX_ITEMSET_ARG( rpSet, pPassToModifyItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, FALSE ); + SFX_ITEMSET_ARG( rpSet, pPassToModifyItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, sal_False ); mbPwdCheckBoxState |= ( pPassToModifyItem && pPassToModifyItem->GetValue().hasValue() ); } - SFX_ITEMSET_ARG( rpSet, pSelectItem, SfxBoolItem, SID_SELECTION, FALSE ); + SFX_ITEMSET_ARG( rpSet, pSelectItem, SfxBoolItem, SID_SELECTION, sal_False ); if ( pSelectItem ) mbSelection = pSelectItem->GetValue(); else @@ -1957,7 +1957,7 @@ void FileDialogHelper_Impl::addGraphicFilter() // create the list of filters mpGraphicFilter = new GraphicFilter; - USHORT i, j, nCount = mpGraphicFilter->GetImportFormatCount(); + sal_uInt16 i, j, nCount = mpGraphicFilter->GetImportFormatCount(); // compute the extension string for all known import filters String aExtensions; @@ -1966,7 +1966,7 @@ void FileDialogHelper_Impl::addGraphicFilter() { j = 0; String sWildcard; - while( TRUE ) + while( sal_True ) { sWildcard = mpGraphicFilter->GetImportWildcard( i, j++ ); if ( !sWildcard.Len() ) @@ -2006,7 +2006,7 @@ void FileDialogHelper_Impl::addGraphicFilter() String aExt; j = 0; String sWildcard; - while( TRUE ) + while( sal_True ) { sWildcard = mpGraphicFilter->GetImportWildcard( i, j++ ); if ( !sWildcard.Len() ) |