diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2015-04-10 18:52:33 +0200 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2015-04-13 09:08:40 +0000 |
| commit | 5c308ad7696f3873c0747afef1ea143047e4eafb (patch) | |
| tree | 4ad2e9b2eafc10c388eea2dc54d49d5b266d9a99 /sfx2/source/doc | |
| parent | e904e6ad4876c095ab5ee7bd40540635c520c9de (diff) | |
tdf#90478: Hide explanation on ODF when default format is alien
When saving a file that is not in ODF format (the default format), there
is a dialog asking if should keep the original format or rather use ODF.
But the default format can be changed to a different one than ODF, and
the dialog will let users choose between saving in the default format
or the one they chose in the save as dialog.
In this case, the explanation about ODF shown in the dialog is
pointless, so this commit hides it.
Change-Id: I91cf95d35b70cb46e7667025a4a649b390205f0b
Reviewed-on: https://gerrit.libreoffice.org/15234
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
Diffstat (limited to 'sfx2/source/doc')
| -rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 12519424e271..3dc833cfbe6a 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -833,7 +833,8 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName ) return STATUS_SAVEAS; } } - if ( !SfxStoringHelper::WarnUnacceptableFormat( GetModel(), aUIName, aDefUIName, aDefExtension, true ) ) + if ( !SfxStoringHelper::WarnUnacceptableFormat( GetModel(), aUIName, aDefUIName, aDefExtension, + true, (bool)( nDefFiltFlags & SfxFilterFlags::ALIEN ) ) ) return STATUS_SAVEAS_STANDARDNAME; } } @@ -1875,13 +1876,14 @@ bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::XMod const OUString& aOldUIName, const OUString& /*aDefUIName*/, const OUString& aDefExtension, - bool /*bCanProceedFurther*/ ) + bool /*bCanProceedFurther*/, + bool bDefIsAlien ) { if ( !SvtSaveOptions().IsWarnAlienFormat() ) return true; vcl::Window* pWin = SfxStoringHelper::GetModelWindow( xModel ); - SfxAlienWarningDialog aDlg( pWin, aOldUIName, aDefExtension ); + SfxAlienWarningDialog aDlg( pWin, aOldUIName, aDefExtension, bDefIsAlien ); return aDlg.Execute() == RET_OK; } |