Author: jsc
Date: Mon Apr 22 15:39:06 2013
New Revision: 1470584
URL: http://svn.apache.org/r1470584
Log:
#121101# consolidate directory entries, remove empty name/placeholder dirs
Modified:
openoffice/trunk/main/scp2/inc/macros.inc
openoffice/trunk/main/scp2/source/base/file_base.scp
openoffice/trunk/main/scp2/source/base/folderitem_base.scp
openoffice/trunk/main/scp2/source/calc/folderitem_calc.scp
openoffice/trunk/main/scp2/source/draw/folderitem_draw.scp
openoffice/trunk/main/scp2/source/impress/folderitem_impress.scp
openoffice/trunk/main/scp2/source/kde/file_kde.scp
openoffice/trunk/main/scp2/source/math/folderitem_math.scp
openoffice/trunk/main/scp2/source/onlineupdate/file_onlineupdate.scp
openoffice/trunk/main/scp2/source/ooo/common_brand.scp
openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/scp2/source/ooo/file_ooo.scp
openoffice/trunk/main/scp2/source/ooo/folderitem_ooo.scp
openoffice/trunk/main/scp2/source/ooo/makefile.mk
openoffice/trunk/main/scp2/source/ooo/profile_ooo.scp
openoffice/trunk/main/scp2/source/ooo/shortcut_ooo.scp
openoffice/trunk/main/scp2/source/ooo/starregistry_ooo.scp
openoffice/trunk/main/scp2/source/ooo/ure.scp
openoffice/trunk/main/scp2/source/python/file_python.scp
openoffice/trunk/main/scp2/source/python/module_python_mailmerge.scp
openoffice/trunk/main/scp2/source/python/profileitem_python.scp
openoffice/trunk/main/scp2/source/winexplorerext/file_winexplorerext.scp
openoffice/trunk/main/scp2/source/writer/folderitem_writer.scp
Modified: openoffice/trunk/main/scp2/inc/macros.inc
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/inc/macros.inc?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/inc/macros.inc (original)
+++ openoffice/trunk/main/scp2/inc/macros.inc Mon Apr 22 15:39:06 2013
@@ -114,11 +114,11 @@
#define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip))
#define CONFIGLANGFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
-#if defined(WNT) || defined(OS2)
+//#if defined(WNT) || defined(OS2)
#define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program
-#else
-#define SCP2_OOO_BIN_DIR gid_Dir_Program
-#endif
+//#else
+//#define SCP2_OOO_BIN_DIR gid_Dir_Program
+//#endif
#define BIN_FILE_BODY \
UnixRights = 555
@@ -532,7 +532,8 @@ End
// ---------------------------------------
#if defined(WNT) || defined(OS2)
-#define SCP2_URE_DL_DIR gid_Dir_Ure_Bin
+#define SCP2_URE_DL_DIR gid_Dir_Common_Ure
+//#define SCP2_URE_DL_DIR gid_Dir_Ure_Bin
#define SCP2_URE_DL_NORMAL(n) n ".dll"
#define SCP2_URE_DL_BARE(n) n ".dll"
#define SCP2_URE_DL_VER(n, v) n v ".dll"
Modified: openoffice/trunk/main/scp2/source/base/file_base.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/base/file_base.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/base/file_base.scp (original)
+++ openoffice/trunk/main/scp2/source/base/file_base.scp Mon Apr 22 15:39:06
2013
@@ -38,7 +38,7 @@ End
#if defined WNT
File gid_File_Exe_Odbcconfig
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = EXENAME(odbcconfig);
Styles = (PACKED);
End
Modified: openoffice/trunk/main/scp2/source/base/folderitem_base.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/base/folderitem_base.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/base/folderitem_base.scp (original)
+++ openoffice/trunk/main/scp2/source/base/folderitem_base.scp Mon Apr 22
15:39:06 2013
@@ -30,7 +30,8 @@ FolderItem gid_Folderitem_Sbase
FileID = gid_File_Exe_Sbase;
IconFile = gid_File_Exe_Sbase;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
+// WkDir = gid_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
Modified: openoffice/trunk/main/scp2/source/calc/folderitem_calc.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/calc/folderitem_calc.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/calc/folderitem_calc.scp (original)
+++ openoffice/trunk/main/scp2/source/calc/folderitem_calc.scp Mon Apr 22
15:39:06 2013
@@ -30,7 +30,8 @@ FolderItem gid_Folderitem_Scalc
FileID = gid_File_Exe_Scalc;
IconFile = gid_File_Exe_Scalc;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
+// WkDir = gid_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
Modified: openoffice/trunk/main/scp2/source/draw/folderitem_draw.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/draw/folderitem_draw.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/draw/folderitem_draw.scp (original)
+++ openoffice/trunk/main/scp2/source/draw/folderitem_draw.scp Mon Apr 22
15:39:06 2013
@@ -30,7 +30,8 @@ FolderItem gid_Folderitem_Sdraw
FileID = gid_File_Exe_Sdraw;
IconFile = gid_File_Exe_Sdraw;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
+// WkDir = gid_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
Modified: openoffice/trunk/main/scp2/source/impress/folderitem_impress.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/impress/folderitem_impress.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/impress/folderitem_impress.scp (original)
+++ openoffice/trunk/main/scp2/source/impress/folderitem_impress.scp Mon Apr 22
15:39:06 2013
@@ -30,7 +30,8 @@ FolderItem gid_Folderitem_Simpress
FileID = gid_File_Exe_Simpress;
IconFile = gid_File_Exe_Simpress;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
+// WkDir = gid_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
Modified: openoffice/trunk/main/scp2/source/kde/file_kde.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/kde/file_kde.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/kde/file_kde.scp (original)
+++ openoffice/trunk/main/scp2/source/kde/file_kde.scp Mon Apr 22 15:39:06 2013
@@ -35,7 +35,8 @@ End
File gid_File_Lib_Kde4be
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX));
End
#endif
Modified: openoffice/trunk/main/scp2/source/math/folderitem_math.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/math/folderitem_math.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/math/folderitem_math.scp (original)
+++ openoffice/trunk/main/scp2/source/math/folderitem_math.scp Mon Apr 22
15:39:06 2013
@@ -30,7 +30,8 @@ FolderItem gid_Folderitem_Smath
FileID = gid_File_Exe_Smath;
IconFile = gid_File_Exe_Smath;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
+// WkDir = gid_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
Modified: openoffice/trunk/main/scp2/source/onlineupdate/file_onlineupdate.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/onlineupdate/file_onlineupdate.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/onlineupdate/file_onlineupdate.scp
(original)
+++ openoffice/trunk/main/scp2/source/onlineupdate/file_onlineupdate.scp Mon
Apr 22 15:39:06 2013
@@ -39,7 +39,8 @@ End
#if defined LINUX || defined SOLARIS
File gid_File_Bin_UnpackUpdate
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = "unpack_update";
Styles = (PACKED);
End
Modified: openoffice/trunk/main/scp2/source/ooo/common_brand.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/common_brand.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/common_brand.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/common_brand.scp Mon Apr 22 15:39:06
2013
@@ -58,7 +58,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Bin_Unopkgexe,
gid_Brand_File_Bin_Unopkg,
gid_Brand_File_Bin_Msvcr71,
- gid_Brand_File_Bin_Libxml2,
+ // gid_Brand_File_Bin_Libxml2,
gid_Brand_File_Bmp_IntroAbout,
gid_Brand_File_Desktophelper_Txt,
gid_Brand_File_Images_Brand_Zip,
@@ -442,18 +442,18 @@ End
// problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to
// the OOo executables (where it takes precedence even over DLLs from the
// Windows system directory):
-#if defined WNT && !defined SYSTEM_LIBXML
-File gid_Brand_File_Bin_Libxml2
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
-#if defined _gcc3
- Name = SCP2_URE_DL_NORMAL("libxml2-2");
-#else
- Name = SCP2_URE_DL_NORMAL("libxml2");
-#endif
- Styles = (PACKED);
-End
-#endif
+//#if defined WNT && !defined SYSTEM_LIBXML
+//File gid_Brand_File_Bin_Libxml2
+// TXT_FILE_BODY;
+// Dir = gid_Brand_Dir_Program;
+//#if defined _gcc3
+// Name = SCP2_URE_DL_NORMAL("libxml2-2");
+//#else
+// Name = SCP2_URE_DL_NORMAL("libxml2");
+//#endif
+// Styles = (PACKED);
+//End
+//#endif
File gid_Brand_File_Bmp_IntroAbout
TXT_FILE_BODY;
Modified: openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp Mon Apr 22 15:39:06
2013
@@ -101,16 +101,16 @@ Directory gid_Dir_Ooo_Basis
End
#endif
-Directory gid_Dir_Program
-#if defined MACOSX
- ParentID = gid_Brand_Dir_Program;
-// ParentID = gid_Brand_Dir_BasisLink;
-#else
- ParentID = gid_Brand_Dir_Program;
-// ParentID = gid_Dir_Ooo_Basis;
-#endif
- DosName = "";
-End
+//Directory gid_Dir_Program
+//#if defined MACOSX
+// ParentID = gid_Brand_Dir_Program;
+//// ParentID = gid_Brand_Dir_BasisLink;
+//#else
+// ParentID = gid_Brand_Dir_Program;
+//// ParentID = gid_Dir_Ooo_Basis;
+//#endif
+// DosName = "";
+//End
#if defined MACOSX
Unixlink gid_Unixlink_Applications
@@ -123,18 +123,21 @@ End
#endif
Directory gid_Dir_Program_Remote
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_Program;
DosName = "remote";
End
Directory gid_Dir_Program_Local
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_Program;
DosName = "local";
End
Directory gid_Dir_Addin
Styles = (CREATE);
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_Program;
DosName = "addin";
End
@@ -144,29 +147,34 @@ Directory gid_Dir_Addin_Source
End
Directory gid_Dir_Filter
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_Program;
DosName = "filter";
End
Directory gid_Dir_Resource
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_Program;
DosName = "resource";
End
Directory gid_Dir_Httphome
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_Program;
DosName = "httphome";
End
Directory gid_Dir_Classes
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_Program;
DosName = "classes";
End
#ifdef WNT
Directory gid_Dir_Shellnew
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_Program;
DosName = "shellnew";
End
@@ -176,7 +184,8 @@ Directory gid_Dir_User
#if defined MACOSX
ParentID = gid_Dir_Bundle_Contents;
#else
- ParentID = gid_Dir_Ooo_Basis;
+ ParentID = gid_Dir_Brand_Root;
+// ParentID = gid_Dir_Ooo_Basis;
#endif
DosName = "presets";
End
@@ -345,17 +354,18 @@ Directory gid_Dir_Work
Styles = (WORKSTATION);
End
-Directory gid_Dir_Plugin
- ParentID = gid_Dir_Program;
- DosName = "plugin";
- Styles = (WORKSTATION, CREATE);
-End
+//Directory gid_Dir_Plugin
+// ParentID = gid_Dir_Program;
+// DosName = "plugin";
+// Styles = (WORKSTATION, CREATE);
+//End
Directory gid_Dir_Share
#if defined MACOSX
ParentID = gid_Dir_Bundle_Contents;
#else
- ParentID = gid_Dir_Ooo_Basis;
+ ParentID = gid_Dir_Brand_Root;
+// ParentID = gid_Dir_Ooo_Basis;
#endif
DosName = "share";
End
@@ -1250,7 +1260,8 @@ End
#ifndef MACOSX
Directory gid_Dir_Basis_Sdk
- ParentID = gid_Dir_Ooo_Basis;
+ ParentID = gid_Dir_Brand_Root;
+// ParentID = gid_Dir_Ooo_Basis;
DosName = "sdk";
End
#endif
@@ -1268,7 +1279,8 @@ Directory gid_Dir_Help
#if defined MACOSX
ParentID = gid_Dir_Bundle_Contents;
#else
- ParentID = gid_Dir_Ooo_Basis;
+ ParentID = gid_Dir_Brand_Root;
+// ParentID = gid_Dir_Ooo_Basis;
#endif
DosName = "help";
End
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=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Mon Apr 22
15:39:06 2013
@@ -117,7 +117,8 @@ File gid_File_Lib_Cli_Oootypes_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
Name = "cli_oootypes.dll";
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
Assemblyname = "cli_oootypes";
PublicKeyToken = "ce2cb7e279207b9e";
Version = "${CLI_OOOTYPES_NEW_VERSION}";
@@ -135,7 +136,8 @@ File gid_File_Lib_Policy_Cli_Oootypes_As
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
Name = "${CLI_OOOTYPES_POLICY_ASSEMBLY}.dll";
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
Assemblyname = "${CLI_OOOTYPES_POLICY_ASSEMBLY}";
PublicKeyToken = "ce2cb7e279207b9e";
Version = "${CLI_OOOTYPES_POLICY_VERSION}";
@@ -154,7 +156,8 @@ File gid_File_Lib_Policy_Cli_Oootypes_Co
TXT_FILE_BODY;
Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
Name = "cli_oootypes.config";
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
AssignComponent = gid_File_Lib_Policy_Cli_Oootypes_Assembly;
End
@@ -559,7 +562,8 @@ End
File gid_File_Lib_Fps_Kde4
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
End
#endif
@@ -957,7 +961,8 @@ STD_LIB_FILE(gid_File_Lib_Writerfilter,w
File gid_File_Lib_Mingwm10
BIN_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
Name = "mingwm10.dll";
End
@@ -970,7 +975,8 @@ End
File gid_File_Lib_Msvcr80
BIN_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
#ifndef _STLP_DEBUG
Name = "msvcr80.dll";
#else
@@ -987,7 +993,8 @@ End
File gid_File_Lib_Msvcp80
BIN_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
#ifndef _STLP_DEBUG
Name = "msvcp80.dll";
#else
@@ -1004,7 +1011,8 @@ End
File gid_File_Lib_Msvcm80
BIN_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
#ifndef _STLP_DEBUG
Name = "msvcm80.dll";
#else
@@ -1021,7 +1029,8 @@ End
File gid_File_Lib_Mingw_GccS
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
Name = MINGW_GCCDLL;
Styles = (PACKED);
End
@@ -1032,7 +1041,8 @@ End
File gid_File_Lib_Mingw_Stdcpp
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
Name = MINGW_GXXDLL;
Styles = (PACKED);
End
@@ -1047,7 +1057,8 @@ End
File gid_File_Msvcm80crt_Manifest
BIN_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
#ifndef _STLP_DEBUG
Name = "Microsoft.VC80.CRT.manifest";
#else
@@ -1190,7 +1201,8 @@ File gid_File_Lib_Vclplug_Kde4
Name = LIBNAME(vclplug_kde4);
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
End
#endif
#endif
Modified: openoffice/trunk/main/scp2/source/ooo/file_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_ooo.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_ooo.scp Mon Apr 22 15:39:06 2013
@@ -108,7 +108,8 @@ End
File gid_File_Bin_Pagein
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (PACKED);
Name = "pagein";
End
@@ -119,7 +120,8 @@ End
File gid_File_Bin_Open_Url
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = "open-url";
Styles = (PACKED);
End
@@ -130,28 +132,32 @@ End
File gid_File_Bin_Gnome_Open_Url
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = "gnome-open-url";
Styles = (PACKED);
End
File gid_File_Bin_Gnome_Open_Url_Bin
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = "gnome-open-url.bin";
Styles = (PACKED);
End
File gid_File_Bin_Kde_Open_Url
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = "kde-open-url";
Styles = (PACKED);
End
File gid_File_Bin_Cde_Open_Url
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = "cde-open-url";
Styles = (PACKED);
End
@@ -162,7 +168,8 @@ End
File gid_File_Bin_Uri_Encode
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = "uri-encode";
Styles = (PACKED);
End
@@ -171,7 +178,8 @@ End
File gid_File_Bin_Senddoc
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
#ifdef UNX
Name = "senddoc";
Styles = (PACKED);
@@ -185,7 +193,8 @@ End
File gid_File_Bin_Spadmin_Bin
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (PACKED);
Name = "spadmin.bin";
End
@@ -1127,7 +1136,8 @@ End
File gid_File_Rdb_Offapi
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (PACKED);
Name = "types.rdb";
// Name = "offapi.rdb";
@@ -1135,7 +1145,8 @@ End
File gid_File_Rdb_TypesVba
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (PACKED, OVERWRITE);
Name = "oovbaapi.rdb";
End
@@ -1241,7 +1252,8 @@ STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_
File gid_File_Txt_Pagein_Calc
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (PACKED);
Name = "pagein-calc";
End
@@ -1252,7 +1264,8 @@ End
File gid_File_Txt_Pagein_Common
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (PACKED);
Name = "pagein-common";
End
@@ -1263,7 +1276,8 @@ End
File gid_File_Txt_Pagein_Draw
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (PACKED);
Name = "pagein-draw";
End
@@ -1274,7 +1288,8 @@ End
File gid_File_Txt_Pagein_Impress
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (PACKED);
Name = "pagein-impress";
End
@@ -1285,7 +1300,8 @@ End
File gid_File_Txt_Pagein_Writer
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (PACKED);
Name = "pagein-writer";
End
@@ -1628,7 +1644,8 @@ End
File gid_File_Txt_Patchfiles
TXT_FILE_BODY;
Name = "patchlist.txt";
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (PACKED,PATCH,PATCH_ONLY,DONTRENAMEINPATCH);
End
#endif
@@ -1636,14 +1653,16 @@ End
File gid_Starregistry_Services_Rdb
TXT_FILE_BODY;
Name = "services.rdb";
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (PACKED);
End
#ifdef LINUX
File gid_File_Dat_Root3
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = "root3.dat";
Styles = (PACKED);
End
@@ -1652,7 +1671,8 @@ End
#ifdef LINUX
File gid_File_Dat_Root4
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = "root4.dat";
Styles = (PACKED);
End
@@ -1661,7 +1681,8 @@ End
#ifdef LINUX
File gid_File_Dat_Root5
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = "root5.dat";
Styles = (PACKED);
End
@@ -1734,7 +1755,8 @@ End
#if defined( BUILD_SPECIAL )
#if !defined( MACOSX )
File gid_File_Stclient_Wrapper
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
BIN_FILE_BODY;
#if defined ( WNT )
Name = "stclient_wrapper.exe";
Modified: openoffice/trunk/main/scp2/source/ooo/folderitem_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/folderitem_ooo.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/folderitem_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/folderitem_ooo.scp Mon Apr 22
15:39:06 2013
@@ -30,7 +30,8 @@ FolderItem gid_Folderitem_Soffice
FileID = gid_Brand_File_Bin_Soffice;
IconFile = gid_Brand_File_Bin_Soffice;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
+// WkDir = gid_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
@@ -44,7 +45,8 @@ FolderItem gid_Folderitem_Soffice_Deskto
IconFile = gid_Brand_File_Bin_Soffice;
IconID = 0;
ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
+// WkDir = gid_Dir_Program;
Parameter = "";
Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
Modified: openoffice/trunk/main/scp2/source/ooo/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/makefile.mk?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/trunk/main/scp2/source/ooo/makefile.mk Mon Apr 22 15:39:06 2013
@@ -350,7 +350,6 @@ PARFILES= \
ure_into_ooo.par \
ure_standalone.par \
common_brand.par \
- common_brand.par \
common_brand_readme.par \
ooo_brand.par
Modified: openoffice/trunk/main/scp2/source/ooo/profile_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/profile_ooo.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/profile_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/profile_ooo.scp Mon Apr 22 15:39:06
2013
@@ -30,14 +30,16 @@ Profile gid_Profile_Uno_Ini
#else
Name = "uno.ini";
#endif
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = (NETWORK);
End
Profile gid_Profile_Version_Ini_Basis
ModuleID = gid_Module_Root;
Name = PROFILENAME(version);
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Styles = ();
End
@@ -45,5 +47,6 @@ Profile gid_Profile_Fundamentalbasis_Ini
ModuleID = gid_Module_Root;
Name = PROFILENAME(fundamental);
// Name = PROFILENAME(fundamentalbasis);
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
End
Modified: openoffice/trunk/main/scp2/source/ooo/shortcut_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/shortcut_ooo.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/shortcut_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/shortcut_ooo.scp Mon Apr 22 15:39:06
2013
@@ -58,21 +58,36 @@ End
Shortcut gid_Shortcut_Lib_Graphite_0
FileID = gid_File_Lib_Graphite;
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
Name = STRING(CONCAT2(libgraphite,UNXSUFFIX));
Styles = (NETWORK,RELATIVE);
End
Shortcut gid_Shortcut_Lib_Graphite_1
FileID = gid_File_Lib_Graphite;
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3));
Styles = (NETWORK,RELATIVE);
End
Shortcut gid_Shortcut_Lib_Graphite_2
FileID = gid_File_Lib_Graphite;
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3.0));
Styles = (NETWORK,RELATIVE);
End
Modified: openoffice/trunk/main/scp2/source/ooo/starregistry_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/starregistry_ooo.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/starregistry_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/starregistry_ooo.scp Mon Apr 22
15:39:06 2013
@@ -25,6 +25,11 @@
StarRegistry gid_Starregistry_Services_Rdb
Name = "services.rdb";
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
End
Modified: openoffice/trunk/main/scp2/source/ooo/ure.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/ure.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/ure.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/ure.scp Mon Apr 22 15:39:06 2013
@@ -62,7 +62,8 @@ End
#if defined WNT
File gid_File_Exe_Uno
BIN_FILE_BODY;
- Dir = gid_Dir_Ure_Bin;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Ure_Bin;
Name = EXENAME(uno);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "C66A9E2B-B16D-46A9-B9EC-772D9D3837F5";
@@ -72,7 +73,12 @@ End
#if !defined(WNT) && !defined(OS2)
Shortcut gid_Shortcut_Exe_Uno
FileID = gid_File_Exe_StartupSh;
- Dir = gid_Dir_Ure_Bin;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Ure_Bin;
Name = EXENAME(uno);
Styles = (RELATIVE);
End
@@ -81,7 +87,8 @@ End
#if defined WNT
File gid_File_Exe_Regcomp
BIN_FILE_BODY;
- Dir = gid_Dir_Ure_Bin;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Ure_Bin;
Name = EXENAME(regcomp);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "D51FA672-7C24-4E24-A282-872C4BF690A1";
@@ -91,7 +98,12 @@ End
#ifndef WNT
Shortcut gid_Shortcut_Exe_Regcomp
FileID = gid_File_Exe_StartupSh;
- Dir = gid_Dir_Ure_Bin;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Ure_Bin;
Name = EXENAME(regcomp);
Styles = (RELATIVE);
End
@@ -99,7 +111,12 @@ End
File gid_File_Exe_Regmerge
BIN_FILE_BODY;
- Dir = gid_Dir_Ure_Bin;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Ure_Bin;
Name = EXENAME(regmerge);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "881BCC1D-BA4A-4527-9C7D-D89157C2D03B";
@@ -107,7 +124,12 @@ End
File gid_File_Exe_Regview
BIN_FILE_BODY;
- Dir = gid_Dir_Ure_Bin;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Ure_Bin;
Name = EXENAME(regview);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "DAB09DCD-8491-4DC8-B153-2BA81A830AC2";
@@ -116,7 +138,8 @@ End
#if !defined MACOSX && !defined WNT && defined SOLAR_JAVA && !defined OS2
File gid_File_Exe_Javaldx
BIN_FILE_BODY;
- Dir = gid_Dir_Ure_Bin;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Ure_Bin;
Name = EXENAME(javaldx);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1";
@@ -128,7 +151,12 @@ End
#if !defined(WNT) && !defined(OS2)
File gid_File_Exe_StartupSh
BIN_FILE_BODY;
- Dir = gid_Dir_Ure_Bin;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Ure_Bin;
Name = "/ure/startup.sh";
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "C86E816A-4EAE-47E9-BD1F-3E23C80F4EAE";
@@ -138,7 +166,12 @@ End
#if !defined(WNT) && !defined(OS2)
File gid_File_Exe_UnoBin
BIN_FILE_BODY;
- Dir = gid_Dir_Ure_Bin;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Ure_Bin;
Name = "uno.bin";
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "4AE33B3E-B33E-4BA4-AADC-8D7ED303FDE9";
@@ -148,7 +181,12 @@ End
#if !defined(WNT) && !defined(OS2)
File gid_File_Exe_RegcompBin
BIN_FILE_BODY;
- Dir = gid_Dir_Ure_Bin;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Ure_Bin;
Name = "regcomp.bin";
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "70FBE546-A228-455F-BCBB-716BF03AD5C6";
@@ -1105,21 +1143,24 @@ End
#if defined SOLAR_JAVA
File gid_File_Misc_JavavendorsXml
TXT_FILE_BODY;
- //Dir = gid_Dir_Ure_Misc;
- Dir = gid_Dir_Ure_Bin;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
Name = "javavendors.xml";
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "403FCCFE-545B-44F6-91D1-5C75F846E587";
End
#endif
-#if defined MACOSX
-Unixlink gid_Unixlink_Ure_Bin_Urelibs
- Dir = gid_Dir_Ure_Bin;
- Name = "urelibs";
- Target = "../lib";
-End
-#endif
+//#if defined MACOSX
+//Unixlink gid_Unixlink_Ure_Bin_Urelibs
+// Dir = gid_Dir_Ure_Bin;
+// Name = "urelibs";
+// Target = "../lib";
+//End
+//#endif
//Module
Modified: openoffice/trunk/main/scp2/source/python/file_python.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/python/file_python.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/python/file_python.scp (original)
+++ openoffice/trunk/main/scp2/source/python/file_python.scp Mon Apr 22
15:39:06 2013
@@ -32,13 +32,23 @@ File gid_File_Lib_Pyuno
#else
Name = "pyuno.pyd";
#endif
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
Styles = (PACKED);
End
File gid_File_Lib_Pythonloader
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
#ifdef UNX
Name = STRING(CONCAT2(pythonloader.uno,UNXSUFFIX));
#elif defined(OS2)
@@ -51,28 +61,44 @@ End
File gid_File_Py_Unohelper
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
Name = "unohelper.py";
Styles = (PACKED);
End
File gid_File_Py_Officehelper
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
Name = "officehelper.py";
Styles = (PACKED);
End
File gid_File_Py_Uno
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
Name = "uno.py";
Styles = (PACKED);
End
File gid_File_Py_Pythonloader
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
+// Dir = gid_Dir_Program;
Name = "pythonloader.py";
Styles = (PACKED);
End
@@ -80,7 +106,12 @@ End
#ifndef SYSTEM_PYTHON
File gid_File_Py_Python_Core
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
#ifdef MACOSX
Name = "OOoPython.framework.zip";
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
@@ -94,7 +125,8 @@ End
#ifndef MACOSX
File gid_File_Py_Python_Bin
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
Name = "python.bin";
Styles = (PACKED);
End
@@ -106,7 +138,12 @@ End
File gid_File_Py_Pythonscript
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
Name = "pythonscript.py";
Styles = (PACKED);
End
@@ -133,14 +170,20 @@ End
#ifndef MACOSX
File gid_File_Lib_Python_So
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Dir_Common_Ure;
+// Dir = gid_Dir_Program;
Name = STRING(PY_FULL_DLL_NAME);
Styles = (PACKED);
End
#else //MACOSX
//directory entries solely to be able to create the symlinks
Directory gid_Dir_PythonFramework
- ParentID = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// ParentID = gid_Dir_Program;
HostName = "OOoPython.framework";
End
@@ -287,14 +330,14 @@ Unixlink gid_Unixlink_Python_libpython
End
#endif //MACOSX
-#ifdef WNT
-File gid_File_Lib_Python_So_Brand // Fix for system-python-problem on windows
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = STRING(PY_FULL_DLL_NAME);
- Styles = (PACKED);
-End
-#endif
+//#ifdef WNT
+//File gid_File_Lib_Python_So_Brand // Fix for system-python-problem on windows
+// TXT_FILE_BODY;
+// Dir = gid_Brand_Dir_Program;
+// Name = STRING(PY_FULL_DLL_NAME);
+// Styles = (PACKED);
+//End
+//#endif
#endif
#ifdef UNX
@@ -303,7 +346,12 @@ End
File gid_File_Pyuno
TXT_FILE_BODY;
Name = "pyuno.so";
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
Styles = (PACKED);
End
Modified: openoffice/trunk/main/scp2/source/python/module_python_mailmerge.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/python/module_python_mailmerge.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/python/module_python_mailmerge.scp
(original)
+++ openoffice/trunk/main/scp2/source/python/module_python_mailmerge.scp Mon
Apr 22 15:39:06 2013
@@ -25,7 +25,12 @@
File gid_File_Pymailmerge
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
Name = "mailmerge.py";
Styles = (PACKED);
End
Modified: openoffice/trunk/main/scp2/source/python/profileitem_python.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/python/profileitem_python.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/python/profileitem_python.scp (original)
+++ openoffice/trunk/main/scp2/source/python/profileitem_python.scp Mon Apr 22
15:39:06 2013
@@ -31,7 +31,12 @@ Profile gid_Profile_Pythonloader_Uno_Ini
#else
Name = "pythonloader.uno.ini";
#endif
- Dir = gid_Dir_Program;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_Program;
+#else
+ Dir = gid_Dir_Common_Ure;
+#endif
+// Dir = gid_Dir_Program;
Styles = (NETWORK);
End
Modified:
openoffice/trunk/main/scp2/source/winexplorerext/file_winexplorerext.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/winexplorerext/file_winexplorerext.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/winexplorerext/file_winexplorerext.scp
(original)
+++ openoffice/trunk/main/scp2/source/winexplorerext/file_winexplorerext.scp
Mon Apr 22 15:39:06 2013
@@ -24,7 +24,13 @@
#include "macros.inc"
Directory gid_Dir_Shlxthdl
- ParentID = gid_Dir_Program;
+#if defined MACOSX
+ ParentID = gid_Brand_Dir_Program;
+#else
+ ParentID = gid_Dir_Common_Ure;
+#endif
+// ParentID = gid_Brand_Dir_Program;
+// ParentID = Gid_Dir_Program;
DosName = "shlxthdl";
End
Modified: openoffice/trunk/main/scp2/source/writer/folderitem_writer.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/writer/folderitem_writer.scp?rev=1470584&r1=1470583&r2=1470584&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/writer/folderitem_writer.scp (original)
+++ openoffice/trunk/main/scp2/source/writer/folderitem_writer.scp Mon Apr 22
15:39:06 2013
@@ -30,7 +30,8 @@ FolderItem gid_Folderitem_Swriter
FileID = gid_File_Exe_Swriter;
IconFile = gid_File_Exe_Swriter;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
+// WkDir = gid_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
