a272f5b7b3
Second or later compilation uses value type returned by previous execution of code. Use the defined type as return value of the runtime function of Basic always. (cherry picked from commit 7470c682e136a4a89c1e9474bbc79b2d61f31048) Conflicts: basic/inc/basic/sbxmeth.hxx basic/inc/basic/sbxobj.hxx basic/source/runtime/stdobj.cxx basic/source/sbx/sbxobj.cxx Change-Id: I3064e8403286a9c1401ef658bf139bedeae11f17
45 lines
1.7 KiB
C++
45 lines
1.7 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/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_BASIC_SBXMETH_HXX
|
|
#define INCLUDED_BASIC_SBXMETH_HXX
|
|
|
|
#include <basic/sbxvar.hxx>
|
|
#include <basic/basicdllapi.h>
|
|
|
|
class BASIC_DLLPUBLIC SbxMethod : public SbxVariable
|
|
{
|
|
bool mbIsRuntimeFunction;
|
|
SbxDataType mbRuntimeFunctionReturnType;
|
|
public:
|
|
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1);
|
|
TYPEINFO_OVERRIDE();
|
|
SbxMethod( const OUString& r, SbxDataType t, bool bIsRuntimeFunction=false );
|
|
SbxMethod( const SbxMethod& r );
|
|
virtual ~SbxMethod();
|
|
SbxMethod& operator=( const SbxMethod& r ) { SbxVariable::operator=( r ); return *this; }
|
|
virtual SbxClassType GetClass() const SAL_OVERRIDE;
|
|
bool IsRuntimeFunction() const { return mbIsRuntimeFunction; }
|
|
SbxDataType GetRuntimeFunctionReturnType() const{ return mbRuntimeFunctionReturnType; }
|
|
};
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|