diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 07:44:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 07:44:42 +0000 |
| commit | ac2ce1b9e6d6c3ec50eb164eb13de3c63bbbda24 (patch) | |
| tree | 7dfd259ba8687df476d7341b558faae9a92325f2 | |
| parent | 91ddfc74cec56a79bb70087362dfa408791984c4 (diff) | |
INTEGRATION: CWS fwkbugfix05 (1.7.38); FILE MERGED
2005/01/19 13:39:30 mba 1.7.38.2: RESYNC: (1.7-1.9); FILE MERGED
2005/01/14 12:31:15 mba 1.7.38.1: #i40045#: no warning for saving with default filter
| -rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index b7e579912d80..7c1f67f82714 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -2,9 +2,9 @@ * * $RCSfile: guisaveas.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2005-01-21 17:33:55 $ + * last change: $Author: rt $ $Date: 2005-01-31 08:44:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -659,11 +659,6 @@ sal_Int8 ModelData_Impl::CheckStateForSave() return STATUS_SAVEAS; // so at this point there is either an acceptable old filter or default one - - ::rtl::OUString aOldUIName = aOldFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "UIName" ), - ::rtl::OUString() ); - ::rtl::OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "UIName" ), - ::rtl::OUString() ); if ( !aOldFiltPropsHM.size() || !( nOldFiltFlags & SFX_FILTER_EXPORT ) ) { // so the default filter must be acceptable @@ -675,10 +670,17 @@ sal_Int8 ModelData_Impl::CheckStateForSave() { // the default filter is acceptable and the old filter is alian one // so ask to make a saveAs operation + ::rtl::OUString aOldUIName = aOldFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "UIName" ), + ::rtl::OUString() ); + ::rtl::OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "UIName" ), + ::rtl::OUString() ); + ::rtl::OUString aDefName = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Name" ), + ::rtl::OUString() ); ::rtl::OUString aPreusedFilterName = GetDocProps().getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "PreusedFilterName" ), ::rtl::OUString() ); - if ( !aPreusedFilterName.equals( aOldFilterName ) ) + + if ( !aPreusedFilterName.equals( aOldFilterName ) && !aOldFilterName.equals(aDefName) ) { if ( !SfxStoringHelper::WarnUnacceptableFormat( GetModel(), aOldUIName, aDefUIName, sal_True ) ) return STATUS_SAVEAS_STANDARDNAME; |