summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-06-27 13:24:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-06-28 14:56:46 +0200
commit9ba8b37db55d210b915170528fd87df196ab29e7 (patch)
treeae12802b319d7a7dea3f2f357c752b2c7e03c798 /oox
parent7ce1674658bef5bc4da7984c396b77ec09e3670f (diff)
use utl::TempFile directly in package
so we can (a) control the lifetime of the temp file properly and (b) we don't need to use file URLs which means we stay on the efficient path on Windows Change-Id: I2b1eed5f5afc8f89f53bde35ebb44e9922889817 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136557 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/ole/vbaproject.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index c868d83b6f72..001d97bc7513 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -36,6 +36,7 @@
#include <osl/diagnose.h>
#include <rtl/tencinfo.h>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/helper/textinputstream.hxx>
@@ -90,6 +91,7 @@ VbaFilterConfig::VbaFilterConfig( const Reference< XComponentContext >& rxContex
}
catch(const Exception& )
{
+ TOOLS_WARN_EXCEPTION("oox", "");
}
OSL_ENSURE( mxConfigAccess.is(), "VbaFilterConfig::VbaFilterConfig - cannot open configuration" );
}
@@ -131,6 +133,7 @@ void VbaMacroAttacherBase::resolveAndAttachMacro( const Reference< XVBAMacroReso
}
catch(const Exception& )
{
+ TOOLS_WARN_EXCEPTION("oox", "");
}
}
@@ -233,6 +236,7 @@ Reference< XNameContainer > VbaProject::openLibrary( sal_Int32 nPropId )
}
catch(const Exception& )
{
+ TOOLS_WARN_EXCEPTION("oox", "");
}
OSL_ENSURE( xLibrary.is(), "VbaProject::openLibrary - cannot create library" );
return xLibrary;
@@ -421,6 +425,7 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg )
}
catch(const Exception& )
{
+ TOOLS_WARN_EXCEPTION("oox", "");
}
}
@@ -510,6 +515,7 @@ void VbaProject::importModulesAndForms( StorageBase& rVbaPrjStrg, const GraphicH
}
catch(const Exception& )
{
+ TOOLS_WARN_EXCEPTION("oox", "");
}
}
}
@@ -533,6 +539,7 @@ void VbaProject::attachMacros()
}
catch(const Exception& )
{
+ TOOLS_WARN_EXCEPTION("oox", "");
}
}