core.git: Branch 'distro/collabora/co-23.05' - sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/sfxbasemodel.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 145188f674ccf2a0e485ba85a018b04ef21fcf53
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Feb 26 12:59:09 2024 +0000
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Feb 26 14:59:55 2024 +0100

    Revert "lok: fix export pdf error"
    
    this would silence an error if pdf export failed, I think the
    export warning we see is from svg export, and from a failed
    attempt to export a selection for a svg preview, which
    "return early without error if no shape is selected"
    attempt to address in an alternative approach
    
    This reverts commit 74d22a7dad84f4abff1819764b8c407d89bb0985.
    
    Change-Id: Ic2a54fddea2e5912e27184c7fa0a1e39b84b5886
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163944
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 34776cdd95ea..ab05b4604084 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3239,9 +3239,7 @@ void SfxBaseModel::impl_store(  const   OUString&         
          sURL
         SfxGetpApp()->NotifyEvent( SfxEventHint( bSaveTo ? 
SfxEventHintId::SaveToDocFailed : SfxEventHintId::SaveAsDocFailed, 
GlobalEventConfig::GetEventName( bSaveTo ? GlobalEventId::SAVETODOCFAILED : 
GlobalEventId::SAVEASDOCFAILED),
                                                 m_pData->m_pObjectShell.get() 
) );
 
-        if ( comphelper::LibreOfficeKit::isActive() &&
-             aFilterName.indexOf("pdf_Export") > 0 &&
-             SfxViewShell::Current() )
+        if ( comphelper::LibreOfficeKit::isActive() && SfxViewShell::Current() 
)
             SfxViewShell::Current()->libreOfficeKitViewCallback( 
LOK_CALLBACK_EXPORT_FILE, "ERROR" );
 
         std::stringstream aErrCode;