diff options
| author | Raul Siddhartha <rsiddhartha@novell.com> | 2005-04-25 07:50:56 +0000 |
|---|---|---|
| committer | Raul Siddhartha <rsiddhartha@novell.com> | 2005-04-25 07:50:56 +0000 |
| commit | 38c0c6615dbb89fd3790f5c58049bb8bf94c1d98 (patch) | |
| tree | aa12587ed6e84ddc97048863d6d54b94f990c2a4 | |
| parent | 5ff117b0559334697c4323f90bcda8210e06eda6 (diff) | |
Fix for the calc file being unable to be saved as csv n#75811 ooo-build-1-9-79-2
* patches/src680/csv-filter-fix.diff, patches/src680-m79/apply: fix
for the calc file being unable to be saved as csv n#75811
| -rw-r--r-- | patches/src680-m79/apply | 2 | ||||
| -rw-r--r-- | patches/src680/csv-filter-fix.diff | 38 |
2 files changed, 40 insertions, 0 deletions
diff --git a/patches/src680-m79/apply b/patches/src680-m79/apply index 2ec5975f0..d9a56fe86 100644 --- a/patches/src680-m79/apply +++ b/patches/src680-m79/apply @@ -83,6 +83,8 @@ hack-alienwarn.diff wizard-table-filed-sizes.diff [ Fixes ] +# fix for the calc file being unable to be saved as csv n#75811 +csv-filter-fix.diff # fix the wizards crasher n#10512 wizards-crasher-fix.diff # Disable the printer properties which are unused IZ#14036, n#583 diff --git a/patches/src680/csv-filter-fix.diff b/patches/src680/csv-filter-fix.diff new file mode 100644 index 000000000..68858fd7a --- /dev/null +++ b/patches/src680/csv-filter-fix.diff @@ -0,0 +1,38 @@ +--- sfx2/source/doc/docfile.cxx 25 Feb 2005 09:44:12 -0000 1.161 ++++ sfx2/source/doc/docfile.cxx 15 Mar 2005 16:18:30 -0000 1.161.12.1 +@@ -1429,7 +1429,7 @@ sal_Bool SfxMedium::TransactedTransferFo + eError = ERRCODE_IO_GENERAL; + } + +- if( !eError ) ++ if( !eError || (eError & ERRCODE_WARNING_MASK) ) + { + Close(); + ::ucb::Content aTempCont; +@@ -1530,7 +1530,7 @@ void SfxMedium::Transfer_Impl() + OSL_ENSURE( sal_False, "The medium name is not convertable!\n" ); + } + +- if ( aNameURL.Len() && ( !eError || eError & ERRCODE_WARNING_MASK ) ) ++ if ( aNameURL.Len() && ( !eError || (eError & ERRCODE_WARNING_MASK) ) ) + { + Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; + Reference< XOutputStream > rOutStream; +@@ -1724,7 +1724,7 @@ void SfxMedium::Transfer_Impl() + eError = ERRCODE_IO_GENERAL; + } + +- if (!eError) ++ if ( !eError || (eError & ERRCODE_WARNING_MASK) ) + { + // free resources, otherwise the transfer may fail + Close(); +@@ -1781,7 +1781,7 @@ void SfxMedium::Transfer_Impl() + } + } + +- if ( !eError && !pImp->pTempFile ) ++ if ( ( !eError || (eError & ERRCODE_WARNING_MASK) ) && !pImp->pTempFile ) + { + // without a TempFile the physical and logical name should be the same after successful transfer + ::utl::LocalFileHelper::ConvertURLToPhysicalName( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), |