Kaydet (Commit) d12a3e8b authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Combine fairly pointlessly split source code for SbiRuntime into one file

Insert basic/source/runtime/step[012].cxx into
basic/source/runtime/runtime.cxx.

Follow-up to https://gerrit.libreoffice.org/#/c/3373/ .

In many cases the sources for some class have been split up into several
source files, typically suffixed with a number 0, 1, 2 etc. Presumably this
has been done because some compiler years ago was not capable of compiling all
the source for that class at one time, or some other no longer relevant
reason.

It would be nice to get rid of this convention, so that clever compilers have
a better chance of noticing unused private fields in a class, for
instance. Just combining the source files in question into one source file and
removing the old source files from git leads to a discontinuity in version
control history. But the consensus seems to be that this is not such a big
deal.

I picked these sources just because they happened to be the first ones I came
across when looking for files called *0.cxx.

Change-Id: Ia7e8ece9a4374721bbcce6b0e2aba5721436faae
üst e4e9fba5
...@@ -98,9 +98,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ ...@@ -98,9 +98,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/sbdiagnose \ basic/source/runtime/sbdiagnose \
basic/source/runtime/stdobj \ basic/source/runtime/stdobj \
basic/source/runtime/stdobj1 \ basic/source/runtime/stdobj1 \
basic/source/runtime/step0 \
basic/source/runtime/step1 \
basic/source/runtime/step2 \
)) ))
endif endif
......
...@@ -411,7 +411,15 @@ public: ...@@ -411,7 +411,15 @@ public:
bool isVBAConstantType( const OUString& rName ); bool isVBAConstantType( const OUString& rName );
}; };
#endif SbxVariable* getDefaultProp( SbxVariable* pRef );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComListener( const ::com::sun::star::uno::Any& aControlAny,
const OUString& aVBAType,
const OUString& aPrefix,
SbxObjectRef xScopeObj );
bool checkUnoObjectType( SbUnoObject* refVal, const OUString& aClass );
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment