#122356# rename toolkit lib due to conflicts on MacOS, it's a workaround for…

#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

Repository.mk

@@ -73,7 +73,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     swd \
     swui \
     textconversiondlgs \
-    tk \
+    ootk \
     tl \
     utl \
     unordf \

drawinglayer/Library_drawinglayer.mk

@@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,drawinglayer,\
 	stl \
 	svl \
 	svt \
-	tk \
+	ootk \
 	tl \
 	vcl \
     $(gb_STDLIBS) \

editeng/Library_editeng.mk

@@ -140,7 +140,7 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\
     basegfx \
     lng \
     svt \
-    tk \
+    ootk \
     vcl \
     svl \
     stl \

framework/Library_fwi.mk

@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
     stl \
     svl \
     svt \
-    tk \
+    ootk \
     tl \
     utl \
     vcl \

framework/Library_fwk.mk

@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
     stl \
     svl \
     svt \
-    tk \
+    ootk \
     tl \
     ucbhelper \
     utl \

framework/Library_fwl.mk

@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\
     stl \
     svl \
     svt \
-    tk \
+    ootk \
     tl \
     utl \
     vcl \

framework/Library_fwm.mk

@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\
     stl \
     svl \
     svt \
-    tk \
+    ootk \
     tl \
     utl \
     vcl \

postprocess/packcomponents/makefile.mk

@@ -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 \

scp2/source/ooo/file_library_ooo.scp

@@ -1503,7 +1503,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
 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 )

scp2/source/sdkoo/sdkoo.scp

@@ -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_Sdk
     // 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_Sdk
     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
 

sfx2/Library_qstart.mk

@@ -68,7 +68,7 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
     stl \
     svl \
     svt \
-    tk \
+    ootk \
     tl \
     ucbhelper \
     utl \

sfx2/Library_sfx.mk

@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     stl \
     svl \
     svt \
-    tk \
+    ootk \
     tl \
     ucbhelper \
     utl \

solenv/inc/libs.mk

@@ -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

svtools/Library_hatchwindowfactory.mk

@@ -40,7 +40,7 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
     cppu \
     cppuhelper \
     sal \
-    tk \
+    ootk \
     tl \
     vcl \
     stl \

svtools/Library_svt.mk

@@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
     sot \
     stl \
     svl \
-    tk \
+    ootk \
     tl \
     ucbhelper \
     utl \

svx/Library_svx.mk

@@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     svl \
     svt \
     svxcore \
-    tk \
+    ootk \
     tl \
     ucbhelper \
     utl \

svx/Library_svxcore.mk

@@ -72,7 +72,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
     stl \
     svl \
     svt \
-    tk \
+    ootk \
     tl \
     ucbhelper \
     utl \

svx/Library_textconversiondlgs.mk

@@ -43,8 +43,8 @@ $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
     sal \
     svl \
     svt \
-    stl \
-    tk \
+        stl \
+    ootk \
     tl \
     utl \
     vcl \

sw/Library_msword.mk

@@ -62,7 +62,7 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
     svx \
     svxcore \
     sw \
-    tk \
+    ootk \
     tl \
     ucbhelper \
     utl \

sw/Library_sw.mk

@@ -69,7 +69,7 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
     svt \
     svx \
     svxcore \
-    tk \
+    ootk \
     tl \
     ucbhelper \
     utl \

sw/Library_swui.mk

@@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,swui,\
     svx \
     svxcore \
     sw \
-    tk \
+    ootk \
     tl \
     ucbhelper \
     utl \

sw/Library_vbaswobj.mk

@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\
     svx \
     svxcore \
     sw \
-    tk \
+    ootk \
     tl \
     utl \
     vbahelper \

toolkit/Library_tk.mk

@@ -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,tk,\
     $(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_objects,tk,\
 ))
 
 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

vbahelper/Library_msforms.mk

@@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,msforms,\
     svt \
     svx \
     stl \
-    tk \
+    ootk \
     tl \
     vbahelper \
     vcl \

vbahelper/Library_vbahelper.mk

@@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,vbahelper,\
     stl \
     svl \
     svt \
-    tk \
+    ootk \
     tl \
     utl \
     vcl \

vcl/source/app/svapp.cxx

@@ -1728,7 +1728,7 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist )
     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 )