Author: jsc
Date: Fri May 31 07:27:08 2013
New Revision: 1488119
URL: http://svn.apache.org/r1488119
Log:
#122356# rename toolkit lib due to conflicts on MacOS, it's a workaround for
conflicts with sqlite..., will be probably solved with dropping mozilla libs
Added:
openoffice/trunk/main/toolkit/util/ootk.component
Modified:
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/drawinglayer/Library_drawinglayer.mk
openoffice/trunk/main/editeng/Library_editeng.mk
openoffice/trunk/main/framework/Library_fwi.mk
openoffice/trunk/main/framework/Library_fwk.mk
openoffice/trunk/main/framework/Library_fwl.mk
openoffice/trunk/main/framework/Library_fwm.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp
openoffice/trunk/main/sfx2/Library_qstart.mk
openoffice/trunk/main/sfx2/Library_sfx.mk
openoffice/trunk/main/solenv/inc/libs.mk
openoffice/trunk/main/svtools/Library_hatchwindowfactory.mk
openoffice/trunk/main/svtools/Library_svt.mk
openoffice/trunk/main/svx/Library_svx.mk
openoffice/trunk/main/svx/Library_svxcore.mk
openoffice/trunk/main/svx/Library_textconversiondlgs.mk
openoffice/trunk/main/sw/Library_msword.mk
openoffice/trunk/main/sw/Library_sw.mk
openoffice/trunk/main/sw/Library_swui.mk
openoffice/trunk/main/sw/Library_vbaswobj.mk
openoffice/trunk/main/toolkit/Library_tk.mk
openoffice/trunk/main/vbahelper/Library_msforms.mk
openoffice/trunk/main/vbahelper/Library_vbahelper.mk
openoffice/trunk/main/vcl/source/app/svapp.cxx
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Fri May 31 07:27:08 2013
@@ -73,7 +73,7 @@ $(eval $(call gb_Helper_register_librari
swd \
swui \
textconversiondlgs \
- tk \
+ ootk \
tl \
utl \
unordf \
Modified: openoffice/trunk/main/drawinglayer/Library_drawinglayer.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/drawinglayer/Library_drawinglayer.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/drawinglayer/Library_drawinglayer.mk (original)
+++ openoffice/trunk/main/drawinglayer/Library_drawinglayer.mk Fri May 31
07:27:08 2013
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
vcl \
$(gb_STDLIBS) \
Modified: openoffice/trunk/main/editeng/Library_editeng.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/Library_editeng.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/Library_editeng.mk (original)
+++ openoffice/trunk/main/editeng/Library_editeng.mk Fri May 31 07:27:08 2013
@@ -140,7 +140,7 @@ $(eval $(call gb_Library_add_linked_libs
basegfx \
lng \
svt \
- tk \
+ ootk \
vcl \
svl \
stl \
Modified: openoffice/trunk/main/framework/Library_fwi.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/Library_fwi.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/framework/Library_fwi.mk (original)
+++ openoffice/trunk/main/framework/Library_fwi.mk Fri May 31 07:27:08 2013
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
utl \
vcl \
Modified: openoffice/trunk/main/framework/Library_fwk.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/Library_fwk.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/framework/Library_fwk.mk (original)
+++ openoffice/trunk/main/framework/Library_fwk.mk Fri May 31 07:27:08 2013
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
Modified: openoffice/trunk/main/framework/Library_fwl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/Library_fwl.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/framework/Library_fwl.mk (original)
+++ openoffice/trunk/main/framework/Library_fwl.mk Fri May 31 07:27:08 2013
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
utl \
vcl \
Modified: openoffice/trunk/main/framework/Library_fwm.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/Library_fwm.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/framework/Library_fwm.mk (original)
+++ openoffice/trunk/main/framework/Library_fwm.mk Fri May 31 07:27:08 2013
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
utl \
vcl \
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Fri May 31
07:27:08 2013
@@ -90,7 +90,7 @@ my_components = \
component/sw/util/sw \
component/sw/util/swd \
component/sw/util/vbaswobj \
- component/toolkit/util/tk \
+ component/toolkit/util/ootk \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
component/xmloff/source/transform/xof \
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Fri May 31
07:27:08 2013
@@ -1503,7 +1503,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
#endif
-STD_LIB_FILE( gid_File_Lib_Tk, tk )
+STD_LIB_FILE( gid_File_Lib_Tk, ootk )
STD_LIB_FILE( gid_File_Lib_Acc, acc )
STD_LIB_FILE( gid_File_Lib_Tools, tl )
Modified: openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp (original)
+++ openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp Fri May 31 07:27:08 2013
@@ -43,25 +43,15 @@ End
#ifndef MACOSX
#ifdef WNT
-Directory gid_Dir_Sdkoo_Root
+Directory gid_Dir_OpenOffice_Sdk
ParentID = PREDEFINED_PROGDIR;
HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
End
-#endif
-
-#ifndef WNT
-Directory gid_Dir_Ooo_Openofficeorg_Sdk
+#else
+Directory gid_Dir_OpenOffice_Sdk
ParentID = PREDEFINED_PROGDIR;
- HostName = "${UNIXBASISROOTNAME}";
-End
-#endif
-
-#ifndef WNT
-Directory gid_Dir_Ooo_Basis_Sdk
- ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
- HostName = "basis${OOOBASEVERSION}";
- Styles = (BASISDIRECTORY);
+ HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
End
#endif
@@ -72,11 +62,7 @@ Directory gid_Dir_Basis_Sdk
ParentID = PREDEFINED_PROGDIR;
DosName = "OpenOffice_SDK";
#else
- #if defined WNT
- ParentID = gid_Dir_Sdkoo_Root;
- #else
- ParentID = gid_Dir_Ooo_Basis_Sdk;
- #endif
+ ParentID = gid_Dir_OpenOffice_Sdk;
DosName = "sdk";
#endif
End
@@ -183,7 +169,7 @@ Unixlink gid_Unixlink_Sal_Link_Sdk
Styles = ();
Name = SCP2_URE_DL_UNO_NORMAL("sal");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("sal", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_VER("sal", "3");
End
#endif
@@ -193,7 +179,7 @@ Unixlink gid_Unixlink_Salhelper_Link_Sdk
Styles = ();
Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
End
#endif
@@ -203,7 +189,7 @@ Unixlink gid_Unixlink_Cppu_Link_Sdk
Styles = ();
Name = SCP2_URE_DL_UNO_NORMAL("cppu");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("cppu", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_VER("cppu", "3");
End
#endif
@@ -214,7 +200,7 @@ Unixlink gid_Unixlink_Cppuhelper_Link_Sd
// Styles = (LAYERLINK);
Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper",
"3");
+ Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
End
#endif
@@ -224,7 +210,7 @@ Unixlink gid_Unixlink_Purpenvhelper_Link
Styles = ();
Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper",
"3");
+ Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
End
#endif
Modified: openoffice/trunk/main/sfx2/Library_qstart.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/Library_qstart.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/Library_qstart.mk (original)
+++ openoffice/trunk/main/sfx2/Library_qstart.mk Fri May 31 07:27:08 2013
@@ -68,7 +68,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
Modified: openoffice/trunk/main/sfx2/Library_sfx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/Library_sfx.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/Library_sfx.mk (original)
+++ openoffice/trunk/main/sfx2/Library_sfx.mk Fri May 31 07:27:08 2013
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
Modified: openoffice/trunk/main/solenv/inc/libs.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/libs.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/libs.mk (original)
+++ openoffice/trunk/main/solenv/inc/libs.mk Fri May 31 07:27:08 2013
@@ -166,7 +166,7 @@ AGGLIB=-lagg$(DLLPOSTFIX)
.ENDIF
FREETYPE_LIBS*=-lfreetype
FREETYPELIB=$(FREETYPE_LIBS)
-TKLIB=-ltk$(DLLPOSTFIX)
+TKLIB=-lootk$(DLLPOSTFIX)
LAYOUTLIB=-ltklayout$(DLLPOSTFIX)
SVTOOLLIB=-lsvt$(DLLPOSTFIX)
XMLSECLIB=-lxmlsec1
@@ -463,7 +463,7 @@ CPPCANVASLIB=icppcanvas.lib
FORLIB=ifor.lib
FORUILIB=iforui.lib
AGGLIB=iagg.lib
-TKLIB=itk.lib
+TKLIB=iootk.lib
LAYOUTLIB=itklayout.lib
SVXLLIB=svxl.lib
FREETYPELIB=freetype.lib
Modified: openoffice/trunk/main/svtools/Library_hatchwindowfactory.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/Library_hatchwindowfactory.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/Library_hatchwindowfactory.mk (original)
+++ openoffice/trunk/main/svtools/Library_hatchwindowfactory.mk Fri May 31
07:27:08 2013
@@ -40,7 +40,7 @@ $(eval $(call gb_Library_add_linked_libs
cppu \
cppuhelper \
sal \
- tk \
+ ootk \
tl \
vcl \
stl \
Modified: openoffice/trunk/main/svtools/Library_svt.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/Library_svt.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/Library_svt.mk (original)
+++ openoffice/trunk/main/svtools/Library_svt.mk Fri May 31 07:27:08 2013
@@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_linked_libs
sot \
stl \
svl \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
Modified: openoffice/trunk/main/svx/Library_svx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/Library_svx.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/svx/Library_svx.mk (original)
+++ openoffice/trunk/main/svx/Library_svx.mk Fri May 31 07:27:08 2013
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs
svl \
svt \
svxcore \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
Modified: openoffice/trunk/main/svx/Library_svxcore.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/Library_svxcore.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/svx/Library_svxcore.mk (original)
+++ openoffice/trunk/main/svx/Library_svxcore.mk Fri May 31 07:27:08 2013
@@ -72,7 +72,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
Modified: openoffice/trunk/main/svx/Library_textconversiondlgs.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/Library_textconversiondlgs.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/svx/Library_textconversiondlgs.mk (original)
+++ openoffice/trunk/main/svx/Library_textconversiondlgs.mk Fri May 31 07:27:08
2013
@@ -43,8 +43,8 @@ $(eval $(call gb_Library_add_linked_libs
sal \
svl \
svt \
- stl \
- tk \
+ stl \
+ ootk \
tl \
utl \
vcl \
Modified: openoffice/trunk/main/sw/Library_msword.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/Library_msword.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/sw/Library_msword.mk (original)
+++ openoffice/trunk/main/sw/Library_msword.mk Fri May 31 07:27:08 2013
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_add_linked_libs
svx \
svxcore \
sw \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
Modified: openoffice/trunk/main/sw/Library_sw.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/Library_sw.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/sw/Library_sw.mk (original)
+++ openoffice/trunk/main/sw/Library_sw.mk Fri May 31 07:27:08 2013
@@ -69,7 +69,7 @@ $(eval $(call gb_Library_add_linked_libs
svt \
svx \
svxcore \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
Modified: openoffice/trunk/main/sw/Library_swui.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/Library_swui.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/sw/Library_swui.mk (original)
+++ openoffice/trunk/main/sw/Library_swui.mk Fri May 31 07:27:08 2013
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs
svx \
svxcore \
sw \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
Modified: openoffice/trunk/main/sw/Library_vbaswobj.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/Library_vbaswobj.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/sw/Library_vbaswobj.mk (original)
+++ openoffice/trunk/main/sw/Library_vbaswobj.mk Fri May 31 07:27:08 2013
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs
svx \
svxcore \
sw \
- tk \
+ ootk \
tl \
utl \
vbahelper \
Modified: openoffice/trunk/main/toolkit/Library_tk.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/Library_tk.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/Library_tk.mk (original)
+++ openoffice/trunk/main/toolkit/Library_tk.mk Fri May 31 07:27:08 2013
@@ -21,15 +21,15 @@
-$(eval $(call gb_Library_Library,tk))
+$(eval $(call gb_Library_Library,ootk))
-$(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk))
+$(eval $(call gb_Library_set_componentfile,ootk,toolkit/util/ootk))
-$(eval $(call gb_Library_add_package_headers,tk,toolkit_inc))
+$(eval $(call gb_Library_add_package_headers,ootk,toolkit_inc))
-#$(eval $(call
gb_Library_add_precompiled_header,tk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit))
+#$(eval $(call
gb_Library_add_precompiled_header,ootk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit))
-$(eval $(call gb_Library_set_include,tk,\
+$(eval $(call gb_Library_set_include,ootk,\
$$(INCLUDE) \
-I$(SRCDIR)/toolkit/inc \
-I$(SRCDIR)/toolkit/inc/pch \
@@ -37,12 +37,12 @@ $(eval $(call gb_Library_set_include,tk,
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,tk,\
+$(eval $(call gb_Library_set_defs,ootk,\
$$(DEFS) \
-DTOOLKIT_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_linked_libs,tk,\
+$(eval $(call gb_Library_add_linked_libs,ootk,\
comphelper \
cppu \
cppuhelper \
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-$(eval $(call gb_Library_add_exception_objects,tk,\
+$(eval $(call gb_Library_add_exception_objects,ootk,\
toolkit/source/awt/asynccallback \
toolkit/source/awt/stylesettings \
toolkit/source/awt/vclxaccessiblecomponent \
@@ -152,12 +152,12 @@ $(eval $(call gb_Library_add_exception_o
))
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,tk,\
+$(eval $(call gb_Library_set_cxxflags,ootk,\
$$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
endif
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,tk,\
+$(eval $(call gb_Library_add_linked_libs,ootk,\
X11 \
))
endif
Added: openoffice/trunk/main/toolkit/util/ootk.component
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/util/ootk.component?rev=1488119&view=auto
==============================================================================
--- openoffice/trunk/main/toolkit/util/ootk.component (added)
+++ openoffice/trunk/main/toolkit/util/ootk.component Fri May 31 07:27:08 2013
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components";>
+ <implementation name="com.sun.star.awt.comp.AsyncCallback">
+ <service name="com.sun.star.awt.AsyncCallback"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.awt.Layout">
+ <service name="com.sun.star.awt.Layout"/>
+ <service name="com.sun.star.comp.awt.Layout"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlTabPage">
+ <service name="com.sun.star.awt.tab.UnoControlTabPage"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlTabPageModel">
+ <service name="com.sun.star.awt.tab.UnoControlTabPageModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlTabPageContainerModel">
+ <service name="com.sun.star.awt.tab.UnoControlTabPageContainerModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlTabPageContainer">
+ <service name="com.sun.star.awt.tab.UnoControlTabPageContainer"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.DefaultGridColumnModel">
+ <service name="com.sun.star.awt.grid.DefaultGridColumnModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.DefaultGridDataModel">
+ <service name="com.sun.star.awt.grid.DefaultGridDataModel"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.toolkit.GridColumn">
+ <service name="com.sun.star.awt.grid.GridColumn"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.toolkit.SortableGridDataModel">
+ <service name="com.sun.star.awt.grid.SortableGridDataModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.GridControl">
+ <service name="com.sun.star.awt.grid.UnoControlGrid"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.GridControlModel">
+ <service name="com.sun.star.awt.grid.UnoControlGridModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.MutableTreeDataModel">
+ <service name="com.sun.star.awt.tree.MutableTreeDataModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.StdTabController">
+ <service name="com.sun.star.awt.TabController"/>
+ <service name="stardiv.vcl.control.TabController"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.StdTabControllerModel">
+ <service name="com.sun.star.awt.TabControllerModel"/>
+ <service name="stardiv.vcl.controlmodel.TabController"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.TreeControl">
+ <service name="com.sun.star.awt.tree.TreeControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.TreeControlModel">
+ <service name="com.sun.star.awt.tree.TreeControlModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoButtonControl">
+ <service name="com.sun.star.awt.UnoControlButton"/>
+ <service name="stardiv.vcl.control.Button"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoCheckBoxControl">
+ <service name="com.sun.star.awt.UnoControlCheckBox"/>
+ <service name="stardiv.vcl.control.CheckBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoComboBoxControl">
+ <service name="com.sun.star.awt.UnoControlComboBox"/>
+ <service name="stardiv.vcl.control.ComboBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlButtonModel">
+ <service name="com.sun.star.awt.UnoControlButtonModel"/>
+ <service name="stardiv.vcl.controlmodel.Button"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlCheckBoxModel">
+ <service name="com.sun.star.awt.UnoControlCheckBoxModel"/>
+ <service name="stardiv.vcl.controlmodel.CheckBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlComboBoxModel">
+ <service name="com.sun.star.awt.UnoControlComboBoxModel"/>
+ <service name="stardiv.vcl.controlmodel.ComboBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlContainer">
+ <service name="com.sun.star.awt.UnoControlContainer"/>
+ <service name="stardiv.vcl.control.ControlContainer"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlContainerModel">
+ <service name="com.sun.star.awt.UnoControlContainerModel"/>
+ <service name="stardiv.vcl.controlmodel.ControlContainer"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlCurrencyFieldModel">
+ <service name="com.sun.star.awt.UnoControlCurrencyFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.CurrencyField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlDateFieldModel">
+ <service name="com.sun.star.awt.UnoControlDateFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.DateField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlDialogModel">
+ <service name="com.sun.star.awt.UnoControlDialogModel"/>
+ <service name="stardiv.vcl.controlmodel.Dialog"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlEditModel">
+ <service name="com.sun.star.awt.UnoControlEditModel"/>
+ <service name="stardiv.vcl.controlmodel.Edit"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlFileControlModel">
+ <service name="com.sun.star.awt.UnoControlFileControlModel"/>
+ <service name="stardiv.vcl.controlmodel.FileControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlFixedHyperlinkModel">
+ <service name="com.sun.star.awt.UnoControlFixedHyperlinkModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlFixedLineModel">
+ <service name="com.sun.star.awt.UnoControlFixedLineModel"/>
+ <service name="stardiv.vcl.controlmodel.FixedLine"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlFixedTextModel">
+ <service name="com.sun.star.awt.UnoControlFixedTextModel"/>
+ <service name="stardiv.vcl.controlmodel.FixedText"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlFormattedFieldModel">
+ <service name="com.sun.star.awt.UnoControlFormattedFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.FormattedField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlGroupBoxModel">
+ <service name="com.sun.star.awt.UnoControlGroupBoxModel"/>
+ <service name="stardiv.vcl.controlmodel.GroupBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlImageControlModel">
+ <service name="com.sun.star.awt.UnoControlImageButtonModel"/>
+ <service name="com.sun.star.awt.UnoControlImageControlModel"/>
+ <service name="stardiv.vcl.controlmodel.ImageButton"/>
+ <service name="stardiv.vcl.controlmodel.ImageControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlListBoxModel">
+ <service name="com.sun.star.awt.UnoControlListBoxModel"/>
+ <service name="stardiv.vcl.controlmodel.ListBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlNumericFieldModel">
+ <service name="com.sun.star.awt.UnoControlNumericFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.NumericField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlPatternFieldModel">
+ <service name="com.sun.star.awt.UnoControlPatternFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.PatternField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlProgressBarModel">
+ <service name="com.sun.star.awt.UnoControlProgressBarModel"/>
+ <service name="stardiv.vcl.controlmodel.ProgressBar"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlRadioButtonModel">
+ <service name="com.sun.star.awt.UnoControlRadioButtonModel"/>
+ <service name="stardiv.vcl.controlmodel.RadioButton"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlRoadmapModel">
+ <service name="com.sun.star.awt.UnoControlRoadmapModel"/>
+ <service name="stardiv.vcl.controlmodel.Roadmap"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlScrollBarModel">
+ <service name="com.sun.star.awt.UnoControlScrollBarModel"/>
+ <service name="stardiv.vcl.controlmodel.ScrollBar"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlTimeFieldModel">
+ <service name="com.sun.star.awt.UnoControlTimeFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.TimeField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoCurrencyFieldControl">
+ <service name="com.sun.star.awt.UnoControlCurrencyField"/>
+ <service name="stardiv.vcl.control.CurrencyField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoDateFieldControl">
+ <service name="com.sun.star.awt.UnoControlDateField"/>
+ <service name="stardiv.vcl.control.DateField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoDialogControl">
+ <service name="com.sun.star.awt.UnoControlDialog"/>
+ <service name="stardiv.vcl.control.Dialog"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoEditControl">
+ <service name="com.sun.star.awt.UnoControlEdit"/>
+ <service name="stardiv.vcl.control.Edit"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoFileControl">
+ <service name="com.sun.star.awt.UnoControlFileControl"/>
+ <service name="stardiv.vcl.control.FileControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoFixedHyperlinkControl">
+ <service name="com.sun.star.awt.UnoControlFixedHyperlink"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoFixedLineControl">
+ <service name="com.sun.star.awt.UnoControlFixedLine"/>
+ <service name="stardiv.vcl.control.FixedLine"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoFixedTextControl">
+ <service name="com.sun.star.awt.UnoControlFixedText"/>
+ <service name="stardiv.vcl.control.FixedText"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoFormattedFieldControl">
+ <service name="com.sun.star.awt.UnoControlFormattedField"/>
+ <service name="stardiv.vcl.control.FormattedField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoGroupBoxControl">
+ <service name="com.sun.star.awt.UnoControlGroupBox"/>
+ <service name="stardiv.vcl.control.GroupBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoImageControlControl">
+ <service name="com.sun.star.awt.UnoControlImageButton"/>
+ <service name="com.sun.star.awt.UnoControlImageControl"/>
+ <service name="stardiv.vcl.control.ImageButton"/>
+ <service name="stardiv.vcl.control.ImageControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoListBoxControl">
+ <service name="com.sun.star.awt.UnoControlListBox"/>
+ <service name="stardiv.vcl.control.ListBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoNumericFieldControl">
+ <service name="com.sun.star.awt.UnoControlNumericField"/>
+ <service name="stardiv.vcl.control.NumericField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoPatternFieldControl">
+ <service name="com.sun.star.awt.UnoControlPatternField"/>
+ <service name="stardiv.vcl.control.PatternField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoProgressBarControl">
+ <service name="com.sun.star.awt.UnoControlProgressBar"/>
+ <service name="stardiv.vcl.control.ProgressBar"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoRadioButtonControl">
+ <service name="com.sun.star.awt.UnoControlRadioButton"/>
+ <service name="stardiv.vcl.control.RadioButton"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoRoadmapControl">
+ <service name="com.sun.star.awt.UnoControlRoadmap"/>
+ <service name="stardiv.vcl.control.Roadmap"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoScrollBarControl">
+ <service name="com.sun.star.awt.UnoControlScrollBar"/>
+ <service name="stardiv.vcl.control.ScrollBar"/>
+ </implementation>
+ <implementation
name="org.openoffice.comp.toolkit.SpinningProgressControlModel">
+ <service name="com.sun.star.awt.SpinningProgressControlModel"/>
+ </implementation>
+ <implementation
name="org.openoffice.comp.toolkit.AnimatedImagesControlModel">
+ <service name="com.sun.star.awt.AnimatedImagesControlModel"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.toolkit.AnimatedImagesControl">
+ <service name="com.sun.star.awt.AnimatedImagesControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoSpinButtonControl">
+ <service name="com.sun.star.awt.UnoControlSpinButton"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoSpinButtonModel">
+ <service name="com.sun.star.awt.UnoControlSpinButtonModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoTimeFieldControl">
+ <service name="com.sun.star.awt.UnoControlTimeField"/>
+ <service name="stardiv.vcl.control.TimeField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.VCLXMenuBar">
+ <service name="com.sun.star.awt.MenuBar"/>
+ <service name="stardiv.vcl.MenuBar"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.VCLXPointer">
+ <service name="com.sun.star.awt.Pointer"/>
+ <service name="stardiv.vcl.Pointer"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.VCLXPopupMenu">
+ <service name="com.sun.star.awt.PopupMenu"/>
+ <service name="stardiv.vcl.PopupMenu"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.VCLXPrinterServer">
+ <service name="com.sun.star.awt.PrinterServer"/>
+ <service name="stardiv.vcl.PrinterServer"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.VCLXToolkit">
+ <service name="com.sun.star.awt.Toolkit"/>
+ <service name="stardiv.vcl.VclToolkit"/>
+ </implementation>
+</component>
Modified: openoffice/trunk/main/vbahelper/Library_msforms.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vbahelper/Library_msforms.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/vbahelper/Library_msforms.mk (original)
+++ openoffice/trunk/main/vbahelper/Library_msforms.mk Fri May 31 07:27:08 2013
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_linked_libs
svt \
svx \
stl \
- tk \
+ ootk \
tl \
vbahelper \
vcl \
Modified: openoffice/trunk/main/vbahelper/Library_vbahelper.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vbahelper/Library_vbahelper.mk?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/vbahelper/Library_vbahelper.mk (original)
+++ openoffice/trunk/main/vbahelper/Library_vbahelper.mk Fri May 31 07:27:08
2013
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
utl \
vcl \
Modified: openoffice/trunk/main/vcl/source/app/svapp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/svapp.cxx?rev=1488119&r1=1488118&r2=1488119&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/app/svapp.cxx (original)
+++ openoffice/trunk/main/vcl/source/app/svapp.cxx Fri May 31 07:27:08 2013
@@ -1728,7 +1728,7 @@ UnoWrapperBase* Application::GetUnoWrapp
static sal_Bool bAlreadyTriedToCreate = sal_False;
if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate
)
{
- ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "tk",
sal_True );
+ ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName(
"ootk", sal_True );
oslModule hTkLib = osl_loadModuleRelative(
&thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hTkLib )
