Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 252 insertions, 0 deletions

diff --git a/salhelper/test/dynamicloader/loader.cxx b/salhelper/test/dynamicloader/loader.cxx
new file mode 100644
index 000000000..7d7bed793
--- /dev/null
+++ b/salhelper/test/dynamicloader/loader.cxx
@@ -0,0 +1,57 @@
+/* -*- 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 .
+ */
+
+#include <salhelper/dynload.hxx>
+#include <rtl/ustring>
+#include "samplelib.hxx"
+
+
+using namespace salhelper;
+
+using OUString;
+
+
+class SampleLibLoader
+    : public ::salhelper::ODynamicLoader<SampleLib_Api>
+{
+public:
+    SampleLibLoader():
+        ::salhelper::ODynamicLoader<SampleLib_Api>
+            (OUString( SAL_MODULENAME( "samplelib") ),
+             OUString( SAMPLELIB_INIT_FUNCTION_NAME) )
+        {}
+
+};
+
+
+int main( int argc, char *argv[ ], char *envp[ ] )
+{
+    SampleLibLoader Loader;
+    SampleLibLoader Loader2;
+    Loader= Loader2;
+    SampleLib_Api *pApi= Loader.getApi();
+
+    sal_Int32 retint= pApi->funcA( 10);
+    double retdouble= pApi->funcB( 3.14);
+
+
+    return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/dynamicloader/makefile.mk b/salhelper/test/dynamicloader/makefile.mk
new file mode 100644
index 000000000..aca574384
--- /dev/null
+++ b/salhelper/test/dynamicloader/makefile.mk
@@ -0,0 +1,99 @@
+#
+# 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 .
+#
+
+PRJ=..$/..$/
+
+PRJNAME=salhelper
+TARGET=dynloader
+TARGET1=samplelib
+TARGETTYPE=CUI
+LIBTARGET=NO
+
+ENABLE_EXCEPTIONS=TRUE
+BOOTSTRAP_SERVICE=FALSE
+
+# --- Settings ---
+
+.INCLUDE : settings.mk
+
+# --- Files ---
+
+#RTTI on
+.IF "$(OS)" == "WNT"
+CFLAGS+= -GR
+.ENDIF
+
+#---------------------------------------------------------------------------
+# Build the test library which is loaded by the 
+# RealDynamicLoader
+
+SLOFILES= \
+        $(SLO)$/samplelib.obj
+
+LIB1TARGET=$(SLB)$/$(TARGET1).lib
+LIB1OBJFILES= \
+        $(SLO)$/samplelib.obj
+
+
+SHL1TARGET=	$(TARGET1)
+
+SHL1STDLIBS= \
+        $(CPPULIB)		\
+        $(CPPUHELPERLIB)	\
+        $(SALLIB)
+
+SHL1DEPN=
+SHL1IMPLIB=	i$(TARGET1)
+SHL1LIBS=	$(SLB)$/$(TARGET1).lib
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME=	$(SHL1TARGET)
+DEFLIB1NAME =$(TARGET1)
+DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt
+
+# ------------------------------------------------------------------------------
+
+APP1NOSAL=TRUE
+
+APP1TARGET=	$(TARGET)
+
+APP1OBJS=	$(OBJ)$/loader.obj
+
+APP1STDLIBS= \
+    $(SALLIB) \
+    $(CPPUHELPERLIB) \
+    $(CPPULIB)
+
+.IF "$(OS)" == "WNT"
+APP1STDLIBS+=   $(LB)$/isalhelper.lib
+.ELSE
+APP1STDLIBS+=   -lsalhelper$(UDK_MAJOR)$(COM)
+.ENDIF
+
+APP1DEF=	$(MISC)\$(APP1TARGET).def
+
+# --- Targets ---
+
+.INCLUDE : target.mk
+
+
+$(MISC)$/$(SHL1TARGET).flt: makefile.mk
+    @echo ------------------------------
+    @echo Making: $@
+    @echo __CT>>$@
+
diff --git a/salhelper/test/dynamicloader/samplelib.cxx b/salhelper/test/dynamicloader/samplelib.cxx
new file mode 100644
index 000000000..f904d43eb
--- /dev/null
+++ b/salhelper/test/dynamicloader/samplelib.cxx
@@ -0,0 +1,53 @@
+/* -*- 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 .
+ */
+
+#include "samplelib.hxx"
+#include <sal/types.h>
+
+extern "C"
+SampleLib_Api* SAL_CALL initSampleLibApi()
+{
+    static SampleLib_Api aApi= {0,0};
+    if (!aApi.funcA)
+    {
+        aApi.funcA= &funcA;
+        aApi.funcB= &funcB;
+        return (&aApi);
+    }
+    else
+    {
+        return (&aApi);
+    }
+
+}
+
+
+sal_Int32 SAL_CALL funcA( sal_Int32 a)
+{
+    return a;
+}
+
+
+double SAL_CALL funcB( double a)
+{
+    return a;
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/dynamicloader/samplelib.hxx b/salhelper/test/dynamicloader/samplelib.hxx
new file mode 100644
index 000000000..7b65a0ceb
--- /dev/null
+++ b/salhelper/test/dynamicloader/samplelib.hxx
@@ -0,0 +1,43 @@
+/* -*- 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_SALHELPER_TEST_DYNAMICLOADER_SAMPLELIB_HXX
+#define INCLUDED_SALHELPER_TEST_DYNAMICLOADER_SAMPLELIB_HXX
+
+#include <sal/types.h>
+
+struct SampleLib_Api
+{
+    sal_Int32 (*funcA)( sal_Int32 );
+    double (*funcB)( double );
+};
+
+
+typedef SampleLib_Api* (*InitSampleLib_Api)(void);
+
+#define SAMPLELIB_INIT_FUNCTION_NAME "initSampleLibApi"
+
+
+sal_Int32 SAL_CALL funcA( sal_Int32 a);
+double SAL_CALL funcB( double a);
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */