d9e322d60f
Instead of returning ErrCode class everywhere, return a new class ErrrCodeMsg, which combines an ErrCode with the other parameters that are used to control the error reporting. I do not change everything that uses ErrCode here, I started from SfxBaseController/SfxMedium and worked outwards. This change serves two purposes (1) Replace the extremely whacky ErrorInfo mechanism we were using to smuggle information into the error handler reporting mechanism with a very straightforward approach of just combining it into the error class. (2) Allow us to capture the source location that produced the error, which makes debugging the source of a problem soooo much easier. Change-Id: I978b8f00c9851b41a216c7ebdef2ef94251d5519 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157440 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
53 lines
1.4 KiB
C++
53 lines
1.4 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
#pragma once
|
|
|
|
#include <sal/types.h>
|
|
#include <cppunit/TestFixture.h>
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
#include <cppunit/plugin/TestPlugIn.h>
|
|
#include <test/bootstrapfixture.hxx>
|
|
#include <basic/sbstar.hxx>
|
|
#include <basic/basrdll.hxx>
|
|
#include <basic/sbmod.hxx>
|
|
#include <basic/sbmeth.hxx>
|
|
#include <basic/sbuno.hxx>
|
|
|
|
class MacroSnippet
|
|
{
|
|
private:
|
|
bool mbError;
|
|
ErrCodeMsg maErrCode;
|
|
BasicDLL maDll; // we need a dll instance for resource manager etc.
|
|
SbModuleRef mpMod;
|
|
StarBASICRef mpBasic;
|
|
|
|
void InitSnippet();
|
|
void MakeModule(const OUString& sName, const OUString& sSource);
|
|
|
|
public:
|
|
explicit MacroSnippet(const OUString& sSource);
|
|
MacroSnippet();
|
|
|
|
void LoadSourceFromFile(const OUString& sName, const OUString& sMacroFileURL);
|
|
|
|
SbxVariableRef Run(const css::uno::Sequence<css::uno::Any>& rArgs);
|
|
|
|
SbxVariableRef Run();
|
|
|
|
bool Compile();
|
|
|
|
DECL_LINK(BasicErrorHdl, StarBASIC*, bool);
|
|
|
|
bool HasError() const;
|
|
const ErrCodeMsg& getError() const;
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|