diff options
author | Peter Foley <pefoley2@verizon.net> | 2011-12-18 01:28:13 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2011-12-18 01:28:13 +0100 |
commit | 1841baf54f053c54969d0164185e2366f9efb3fd (patch) | |
tree | 62ccee153a7d6c84df83a913948b1921a5ac1e21 /extensions/source/activex | |
parent | 42506a1cfdad85ead9620b363de99d7475a8fb08 (diff) |
extensions: convert activex to gbuild
Diffstat (limited to 'extensions/source/activex')
-rw-r--r-- | extensions/source/activex/README.txt (renamed from extensions/source/activex/main/README.txt) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SOActionsApproval.cxx (renamed from extensions/source/activex/main/SOActionsApproval.cpp) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SOActionsApproval.h (renamed from extensions/source/activex/main/SOActionsApproval.h) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SOActionsApproval.rgs (renamed from extensions/source/activex/main/SOActionsApproval.rgs) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SOActiveX.cxx (renamed from extensions/source/activex/main/SOActiveX.cpp) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SOActiveX.h (renamed from extensions/source/activex/main/SOActiveX.h) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SOActiveX.rgs (renamed from extensions/source/activex/main/SOActiveX.rgs) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SOComWindowPeer.cxx (renamed from extensions/source/activex/main/SOComWindowPeer.cpp) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SOComWindowPeer.h (renamed from extensions/source/activex/main/SOComWindowPeer.h) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SOComWindowPeer.rgs (renamed from extensions/source/activex/main/SOComWindowPeer.rgs) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SODispatchInterceptor.cxx (renamed from extensions/source/activex/main/SODispatchInterceptor.cpp) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SODispatchInterceptor.h (renamed from extensions/source/activex/main/SODispatchInterceptor.h) | 0 | ||||
-rw-r--r-- | extensions/source/activex/SODispatchInterceptor.rgs (renamed from extensions/source/activex/main/SODispatchInterceptor.rgs) | 0 | ||||
-rw-r--r-- | extensions/source/activex/StdAfx2.cxx (renamed from extensions/source/activex/main/StdAfx2.cpp) | 0 | ||||
-rw-r--r-- | extensions/source/activex/StdAfx2.h (renamed from extensions/source/activex/main/StdAfx2.h) | 0 | ||||
-rw-r--r-- | extensions/source/activex/com_uno_helper.h (renamed from extensions/source/activex/main/com_uno_helper.h) | 0 | ||||
-rw-r--r-- | extensions/source/activex/example.html (renamed from extensions/source/activex/main/example.html) | 0 | ||||
-rw-r--r-- | extensions/source/activex/main/makefile.mk | 157 | ||||
-rw-r--r-- | extensions/source/activex/msidl/makefile.mk | 62 | ||||
-rw-r--r-- | extensions/source/activex/resource.h (renamed from extensions/source/activex/main/resource.h) | 0 | ||||
-rw-r--r-- | extensions/source/activex/so_activex.cxx (renamed from extensions/source/activex/main/so_activex.cpp) | 0 | ||||
-rw-r--r-- | extensions/source/activex/so_activex.def (renamed from extensions/source/activex/main/so_activex.def) | 0 | ||||
-rw-r--r-- | extensions/source/activex/so_activex.idl (renamed from extensions/source/activex/msidl/so_activex.idl) | 0 | ||||
-rw-r--r-- | extensions/source/activex/so_activex.rc (renamed from extensions/source/activex/main/so_activex.rc) | 2 |
24 files changed, 0 insertions, 221 deletions
diff --git a/extensions/source/activex/main/README.txt b/extensions/source/activex/README.txt index 9d647987aaa7..9d647987aaa7 100644 --- a/extensions/source/activex/main/README.txt +++ b/extensions/source/activex/README.txt diff --git a/extensions/source/activex/main/SOActionsApproval.cpp b/extensions/source/activex/SOActionsApproval.cxx index e0ce5c5da58e..e0ce5c5da58e 100644 --- a/extensions/source/activex/main/SOActionsApproval.cpp +++ b/extensions/source/activex/SOActionsApproval.cxx diff --git a/extensions/source/activex/main/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h index a5570312864d..a5570312864d 100644 --- a/extensions/source/activex/main/SOActionsApproval.h +++ b/extensions/source/activex/SOActionsApproval.h diff --git a/extensions/source/activex/main/SOActionsApproval.rgs b/extensions/source/activex/SOActionsApproval.rgs index 543320813948..543320813948 100644 --- a/extensions/source/activex/main/SOActionsApproval.rgs +++ b/extensions/source/activex/SOActionsApproval.rgs diff --git a/extensions/source/activex/main/SOActiveX.cpp b/extensions/source/activex/SOActiveX.cxx index f95e42772185..f95e42772185 100644 --- a/extensions/source/activex/main/SOActiveX.cpp +++ b/extensions/source/activex/SOActiveX.cxx diff --git a/extensions/source/activex/main/SOActiveX.h b/extensions/source/activex/SOActiveX.h index fea95d09c9b9..fea95d09c9b9 100644 --- a/extensions/source/activex/main/SOActiveX.h +++ b/extensions/source/activex/SOActiveX.h diff --git a/extensions/source/activex/main/SOActiveX.rgs b/extensions/source/activex/SOActiveX.rgs index d3814df3b241..d3814df3b241 100644 --- a/extensions/source/activex/main/SOActiveX.rgs +++ b/extensions/source/activex/SOActiveX.rgs diff --git a/extensions/source/activex/main/SOComWindowPeer.cpp b/extensions/source/activex/SOComWindowPeer.cxx index 7fb56dbdfd32..7fb56dbdfd32 100644 --- a/extensions/source/activex/main/SOComWindowPeer.cpp +++ b/extensions/source/activex/SOComWindowPeer.cxx diff --git a/extensions/source/activex/main/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h index c819e17a81ea..c819e17a81ea 100644 --- a/extensions/source/activex/main/SOComWindowPeer.h +++ b/extensions/source/activex/SOComWindowPeer.h diff --git a/extensions/source/activex/main/SOComWindowPeer.rgs b/extensions/source/activex/SOComWindowPeer.rgs index 42e985a31a1b..42e985a31a1b 100644 --- a/extensions/source/activex/main/SOComWindowPeer.rgs +++ b/extensions/source/activex/SOComWindowPeer.rgs diff --git a/extensions/source/activex/main/SODispatchInterceptor.cpp b/extensions/source/activex/SODispatchInterceptor.cxx index dcddf0d86b0c..dcddf0d86b0c 100644 --- a/extensions/source/activex/main/SODispatchInterceptor.cpp +++ b/extensions/source/activex/SODispatchInterceptor.cxx diff --git a/extensions/source/activex/main/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h index 538b12f24d2e..538b12f24d2e 100644 --- a/extensions/source/activex/main/SODispatchInterceptor.h +++ b/extensions/source/activex/SODispatchInterceptor.h diff --git a/extensions/source/activex/main/SODispatchInterceptor.rgs b/extensions/source/activex/SODispatchInterceptor.rgs index 19fe0b5f0e4c..19fe0b5f0e4c 100644 --- a/extensions/source/activex/main/SODispatchInterceptor.rgs +++ b/extensions/source/activex/SODispatchInterceptor.rgs diff --git a/extensions/source/activex/main/StdAfx2.cpp b/extensions/source/activex/StdAfx2.cxx index f1cf88d10d14..f1cf88d10d14 100644 --- a/extensions/source/activex/main/StdAfx2.cpp +++ b/extensions/source/activex/StdAfx2.cxx diff --git a/extensions/source/activex/main/StdAfx2.h b/extensions/source/activex/StdAfx2.h index 5c540b0ba329..5c540b0ba329 100644 --- a/extensions/source/activex/main/StdAfx2.h +++ b/extensions/source/activex/StdAfx2.h diff --git a/extensions/source/activex/main/com_uno_helper.h b/extensions/source/activex/com_uno_helper.h index 230fc63a6e77..230fc63a6e77 100644 --- a/extensions/source/activex/main/com_uno_helper.h +++ b/extensions/source/activex/com_uno_helper.h diff --git a/extensions/source/activex/main/example.html b/extensions/source/activex/example.html index 3efee1f75a03..3efee1f75a03 100644 --- a/extensions/source/activex/main/example.html +++ b/extensions/source/activex/example.html diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk deleted file mode 100644 index ea70b66d0f0f..000000000000 --- a/extensions/source/activex/main/makefile.mk +++ /dev/null @@ -1,157 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJNAME=extensions -TARGET=so_activex - -use_shl_versions= - -# --- Settings ---------------------------------- -.INCLUDE : settings.mk - -.IF "$(GUI)$(COM)" == "WNTMSC" && "$(DISABLE_ACTIVEX)"=="" - -VERSIONOBJ= -LIBTARGET=NO -USE_DEFFILE=YES -UWINAPILIB= - -.IF "$(BUILD_X64)"!="" -USE_DEFFILE_X64=TRUE -.ENDIF - -INCPRE+=$(foreach,i,$(ATL_INCLUDE) -I$(i)) \ - -I$(MISC) \ - -# --- Files ------------------------------------- - - -.IF "$(PRODUCT)"!="" -RC+=-DPRODUCT -.ENDIF - -RCFILES=\ - $(TARGET).rc -RCDEPN=$(MISC)$/envsettings.h - -SLOFILES=\ - $(SLO)$/so_activex.obj \ - $(SLO)$/SOActiveX.obj \ - $(SLO)$/SOComWindowPeer.obj \ - $(SLO)$/SODispatchInterceptor.obj \ - $(SLO)$/SOActionsApproval.obj \ - $(SLO)$/StdAfx2.obj - -SHL1TARGET=$(TARGET) -SHL1STDLIBS=\ - $(UUIDLIB) \ - $(ADVAPI32LIB) \ - $(OLE32LIB) \ - $(OLEAUT32LIB) \ - $(GDI32LIB) \ - $(URLMONLIB) \ - $(SHLWAPILIB) - -.IF "$(COM)" == "MSC" -.IF "$(USE_DEBUG_RUNTIME)" != "" - SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib -.ELSE - SHL1STDLIBS+= $(ATL_LIB)$/atls.lib -.ENDIF -.ENDIF - - -# $(KERNEL32LIB) \ -# rpcndr.lib \ -# rpcns4.lib \ -# rpcrt4.lib - -#$(KERNEL32LIB) rpcndr.lib rpcns4.lib rpcrt4.lib - -SHL1OBJS=$(SLOFILES) - -SHL1LIBS= -SHL1DEF=$(TARGET).def -SHL1RES=$(RES)$/$(TARGET).res - -.ENDIF - -.IF "$(BUILD_X64)"!="" -# -------------------- x64 ----------------------- - -CDEFS_X64+:=$(foreach,i,$(CDEFS) $(subst,-D_X86_=1, $i)) -LIBTARGET_X64=NO -USE_DEFFILE_X64=YES -UWINAPILIB_X64= - -SLOFILES_X64= \ - $(SLO_X64)$/so_activex.obj \ - $(SLO_X64)$/SOActiveX.obj \ - $(SLO_X64)$/SOComWindowPeer.obj \ - $(SLO_X64)$/SODispatchInterceptor.obj \ - $(SLO_X64)$/SOActionsApproval.obj \ - $(SLO_X64)$/StdAfx2.obj - -SHL1TARGET_X64=$(TARGET) - -SHL1STDLIBS_X64+=\ - $(UUIDLIB_X64) \ - $(ADVAPI32LIB_X64) \ - $(OLE32LIB_X64) \ - $(OLEAUT32LIB_X64) \ - $(GDI32LIB_X64) \ - $(URLMONLIB_X64) \ - $(SHLWAPILIB_X64) \ - $(KERNEL32LIB_X64) \ - $(USER32LIB_X64) \ - $(MSVCRT_X64) \ - $(MSVCPRT_X64) \ - $(OLDNAMESLIB_X64) - -SHL1OBJS_X64=$(SLOFILES_X64) -SHL1DEF_X64=$(TARGET).def - -.IF "$(USE_DEBUG_RUNTIME)" != "" -SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atlsd.lib -.ELSE -SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib -.ENDIF - -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ---------------------------------- - -.INCLUDE : set_wntx64.mk -VERSIONOBJ_X64= -.INCLUDE : target.mk -.INCLUDE : tg_wntx64.mk - -$(MISC)$/envsettings.h : makefile.mk - -$(RM) $@ -# it looks wrong; but rc likes it that way... - echo "#define MISC .\..\$(INPATH)\misc" > $@ diff --git a/extensions/source/activex/msidl/makefile.mk b/extensions/source/activex/msidl/makefile.mk deleted file mode 100644 index be9103ead216..000000000000 --- a/extensions/source/activex/msidl/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJNAME=extensions -TARGET=msidl - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -.IF "$(GUI)$(COM)" == "WNTMSC" && "$(DISABLE_ACTIVEX)"=="" - -# --- Targets ---------------------------------- - -ALL : $(MISC)$/activex_component - -MTL=midl.exe -MTL_PROJ= - -SOURCE=so_activex.idl - -MTL_SWITCHES=-tlb $(MISC)$/so_activex.tlb -h $(MISC)$/so_activex.h -iid $(MISC)$/so_activex_i.c -dlldata $(MISC)$/so_activex_dll.c -proxy $(MISC)$/so_activex_p.c -Oicf - -.IF "$(COM)"=="GCC" -MTL_SWITCHES+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)" - -$(MISC)$/activex_component : $(SOURCE) - $(MTL) $(MTL_SWITCHES) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE) -.ELSE -$(MISC)$/activex_component : $(SOURCE) - $(WRAPCMD) $(MTL) $(MTL_SWITCHES) $(INCLUDE) $(SOURCE) && $(TOUCH) $@ -.ENDIF - -.ENDIF - -.INCLUDE : target.mk - diff --git a/extensions/source/activex/main/resource.h b/extensions/source/activex/resource.h index fe74853c6d15..fe74853c6d15 100644 --- a/extensions/source/activex/main/resource.h +++ b/extensions/source/activex/resource.h diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/so_activex.cxx index 94dd0ccdcf1c..94dd0ccdcf1c 100644 --- a/extensions/source/activex/main/so_activex.cpp +++ b/extensions/source/activex/so_activex.cxx diff --git a/extensions/source/activex/main/so_activex.def b/extensions/source/activex/so_activex.def index e3d56b070dad..e3d56b070dad 100644 --- a/extensions/source/activex/main/so_activex.def +++ b/extensions/source/activex/so_activex.def diff --git a/extensions/source/activex/msidl/so_activex.idl b/extensions/source/activex/so_activex.idl index d1a7d9936eed..d1a7d9936eed 100644 --- a/extensions/source/activex/msidl/so_activex.idl +++ b/extensions/source/activex/so_activex.idl diff --git a/extensions/source/activex/main/so_activex.rc b/extensions/source/activex/so_activex.rc index 2370a5162187..adba0ee79f8c 100644 --- a/extensions/source/activex/main/so_activex.rc +++ b/extensions/source/activex/so_activex.rc @@ -104,8 +104,6 @@ END // Generated from the TEXTINCLUDE 3 resource. // -#include "envsettings.h" - 1 TYPELIB MISC\so_activex.tlb ///////////////////////////////////////////////////////////////////////////// |