cli_ure/source/native/native_bootstrap.cxx | 8 +- odk/configure.pl | 3 odk/examples/DevelopersGuide/examples.html | 40 ++++++------- scp2/inc/macros.inc | 26 ++++---- scp2/source/ooo/installation_ooo.scp | 1 scp2/source/winexplorerext/registryitem_winexplorerext.scp | 12 +-- 6 files changed, 44 insertions(+), 46 deletions(-)
New commits: commit 797f19ffdaee125726d1db3d230f666093e4b5f8 Author: Andras Timar <ati...@suse.com> Date: Tue Jan 31 16:41:48 2012 +0100 use LibreOffice instead of OpenOffice.org in registry it may help to solve file association issues, especially when OpenOffice.org is/was also installed diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index c540495..0ceb511 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -356,7 +356,7 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \ - Name = STRING(CONCAT2(OpenOffice.org.,name)); \ + Name = STRING(CONCAT2(LibreOffice.,name)); \ Value = " "; \ End @@ -365,7 +365,7 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \ - Name = STRING(CONCAT2(OpenOffice.org.,name)); \ + Name = STRING(CONCAT2(LibreOffice.,name)); \ Value = " "; \ End @@ -374,7 +374,7 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = gid_Module_Root_Reg_##name; \ Subkey = STRING(CONCAT2(.,key)); \ - Value = STRING(CONCAT2(OpenOffice.org.,name)); \ + Value = STRING(CONCAT2(LibreOffice.,name)); \ ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \ End @@ -382,7 +382,7 @@ End RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT2(OpenOffice.org.,name)); \ + Subkey = STRING(CONCAT2(LibreOffice.,name)); \ REG_VALUE_LNG(disp_name) \ End @@ -390,7 +390,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \ + Subkey = STRING(CONCAT3(LibreOffice.,name,\DefaultIcon)); \ Value = "<progpath>\program\soffice.bin," STRING(icon_id); \ End @@ -398,7 +398,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell)); \ + Subkey = STRING(CONCAT3(LibreOffice.,name,\shell)); \ Value = STRING(default); \ End @@ -406,13 +406,13 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new)); \ + Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new)); \ REG_VALUE_LNG(NEW) \ End \ RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new\command)); \ + Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new\command)); \ Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \ End @@ -420,7 +420,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\open\command)); \ + Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\open\command)); \ Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \ End @@ -428,7 +428,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\print\command)); \ + Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\print\command)); \ Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \ End @@ -436,7 +436,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\printto\command)); \ + Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\printto\command)); \ Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \ End @@ -446,7 +446,7 @@ End ModuleID = modid; \ Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \ Name = STRING(CONCAT2(.,key)); \ - Value = STRING(CONCAT2(OpenOffice.org.,name)); \ + Value = STRING(CONCAT2(LibreOffice.,name)); \ Styles = (); \ End @@ -456,7 +456,7 @@ End ModuleID = modid; \ Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \ Name = STRING(CONCAT2(.,key)); \ - Value = STRING(CONCAT2(OpenOffice.org.,name)); \ + Value = STRING(CONCAT2(LibreOffice.,name)); \ Styles = (); \ End diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp index 78de789..c7def3e 100644 --- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp +++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp @@ -81,8 +81,8 @@ RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F ModuleID = gid_Module_Optional_Winexplorerext; Styles = (X64); Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"; - Value = "OpenOffice.org Column Handler"; - Val64 = "OpenOffice.org Column Handler"; + Value = "%PRODUCTNAME Column Handler"; + Val64 = "%PRODUCTNAME Column Handler"; End RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32 @@ -112,9 +112,7 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Root; Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; -// Better?: "OpenOffice.org Format Filter" -// old: Value = "opendocument.org Filter"; - Styles = (X64_ONLY); // Values: X64 + Styles = (X64_ONLY); // Values: X64 Value = "OpenDocument Format Filter"; Val64 = "OpenDocument Format Filter"; End @@ -142,9 +140,7 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Root; Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}"; -//? Better: "OpenOffice.org Persistent Handler" -// old: Value = "opendocument.org Persistent Handler"; - Styles = (X64); // Values: X64 + Styles = (X64); // Values: X64 Value = "OpenDocument Format Persistent Handler"; Val64 = "OpenDocument Format Persistent Handler"; End commit 3fedf4bc45b4c6c6e4a705049968b24f60e53df2 Author: Andras Timar <ati...@suse.com> Date: Tue Jan 31 16:35:20 2012 +0100 OpenOffice.org -> LibreOffice in comment diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx index 88c911a..145d6c0 100644 --- a/cli_ure/source/native/native_bootstrap.cxx +++ b/cli_ure/source/native/native_bootstrap.cxx @@ -129,10 +129,10 @@ void oneDirUp(LPTSTR io_path) /* Returns the path to the program folder of the brand layer, - for example c:/openoffice.org 3/program + for example c:/LibreOffice 3/program This path is either obtained from the environment variable UNO_PATH or the registry item - "Software\\OpenOffice.org\\UNO\\InstallPath" + "Software\\LibreOffice\\UNO\\InstallPath" either in HKEY_CURRENT_USER or HKEY_LOCAL_MACHINE The return value must be freed with delete[] */ @@ -319,8 +319,8 @@ namespace util Bootstrapping requires the existence of many libraries which are contained in an URE installation. To find and load these libraries the Windows - registry keys HKEY_CURRENT_USER\Software\OpenOffice.org\Layer\URE\1 - and HKEY_LOCAL_MACHINE\Software\OpenOffice.org\Layer\URE\1 are examined. + registry keys HKEY_CURRENT_USER\Software\LibreOffice\Layer\URE\1 + and HKEY_LOCAL_MACHINE\Software\LibreOffice\Layer\URE\1 are examined. These contain a named value UREINSTALLLOCATION which holds a path to the URE installation folder. */ commit d6aaa45d471dfb9c79b7bd0839d4a61262208ab3 Author: Andras Timar <ati...@suse.com> Date: Tue Jan 31 16:11:38 2012 +0100 remove unused VendorName diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp index 3fc27cb..fe2b9de 100644 --- a/scp2/source/ooo/installation_ooo.scp +++ b/scp2/source/ooo/installation_ooo.scp @@ -34,7 +34,6 @@ Installation gid_Installation_Ooo UserDirProductVersion = "${USERDIRPRODUCTVERSION}"; SxwFormatName = "OpenOffice.org"; SxwFormatVersion = "1.1"; - VendorName = "OpenOffice.org"; #ifdef WNT DefaultDestPath = "<winprogpath>\${PRODUCTNAME}${PRODUCTVERSION}"; #else commit eeaea2f994f2313f82d48bcc3c250141f5ec2956 Author: Andras Timar <ati...@suse.com> Date: Tue Jan 31 16:05:53 2012 +0100 replace OpenOffice.org name to LibreOffice diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index 1ae8efd..176ad26 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -115,7 +115,7 @@ Presentation Documents</a></td> <td class="content3"><img src="../../docs/images/arrow-1.gif"></td> <td><a href="#BasicandDialogs" - title="link to the Basic And Dialogs examples">OpenOffice.org %PRODUCT_RELEASE% Basic and + title="link to the Basic And Dialogs examples">LibreOffice %PRODUCT_RELEASE% Basic and Dialogs</a></td> </tr> <tr valign="top"> @@ -214,7 +214,7 @@ examples</a></td> href="./FirstSteps/FirstUnoContact.java" title="link to FirstSteps/FirstUnoContact.java">FirstUnoContact</a></td> <td class="cell80">Shows how to initialize UNO and -get a remote office service manager from a running OpenOffice.org %PRODUCT_RELEASE% in a +get a remote office service manager from a running LibreOffice %PRODUCT_RELEASE% in a different process space.</td> </tr> <tr> @@ -223,7 +223,7 @@ different process space.</td> href="./FirstSteps/FirstLoadComponent.java" title="link to FirstSteps/FirstLoadComponent.java">FirstLoadComponent</a></td> <td class="cell80">Demonstrates how to load a -component into OpenOffice.org %PRODUCT_RELEASE% by a Java application.</td> +component into LibreOffice %PRODUCT_RELEASE% by a Java application.</td> </tr> <tr> <td class="cell20"><img @@ -314,7 +314,7 @@ mechanism in C++.</td> href="./ProfUNO/InterprocessConn/ConnectionAwareClient.java" title="link to ProfUNO/InterprocessConn/ConnectionAwareClient/.java">ConnectionAwareClient</a></td> <td class="cell80">Implements a client which is aware -of losing connection to OpenOffice.org %PRODUCT_RELEASE%.</td> +of losing connection to LibreOffice %PRODUCT_RELEASE%.</td> </tr> <tr> <td class="cell20"><img @@ -322,7 +322,7 @@ of losing connection to OpenOffice.org %PRODUCT_RELEASE%.</td> href="./ProfUNO/InterprocessConn/UrlResolver.java" title="link to ProfUNO/InterProcessConn/UrlResolver.java">UrlResolver</a></td> <td class="cell80">Builds a connection to -OpenOffice.org %PRODUCT_RELEASE% using the URL given on the command line. This example +LibreOffice %PRODUCT_RELEASE% using the URL given on the command line. This example shows the usage of <a href="../../docs/common/ref/com/sun/star/bridge/XUnoUrlResolver.html" title="link to the reference documentation of com.sun.star.bridge.XUnoResolver"><code>XUnoUrlResolver</code></a>.</td> @@ -345,7 +345,7 @@ shows the usage of <a href="./ProfUNO/CppBinding/office_connect.cxx" title="link to ProfUNO/CppBinding/office_connect.java">office_connect.cxx</a></td> <td class="cell80">Builds a connection to -OpenOffice.org %PRODUCT_RELEASE% using C++.</td> +LibreOffice %PRODUCT_RELEASE% using C++.</td> </tr> <tr> <td class="cell20"><img @@ -706,7 +706,7 @@ for the image shrink component and instantiates it.</td> href="./Components/DialogComponent/DialogComponent.java" title="link to Components/DialogComponent/DialogComponent.java">DialogComponent.java</a></td> <td class="cell80">Implements a component accessing a dialog created - with the OpenOffice.org %PRODUCT_RELEASE% Basic IDE. The component provides methods that + with the LibreOffice %PRODUCT_RELEASE% Basic IDE. The component provides methods that can be bound to dialog respectively control events .</td> </tr> <tr> @@ -923,7 +923,7 @@ document component.</td> <td class="cell80">This is the main part of a demo application based on the framework APIs. It mainly shows the mechanisms to load, store and convert documents, as well as dispatch and dispatch -interception. It integrates windows from OpenOffice.org %PRODUCT_RELEASE% via system +interception. It integrates windows from LibreOffice %PRODUCT_RELEASE% via system window handle. This is the same mechanism as used by the OOoBean, but the OOoBean itself is not used here, just the JNI window handle access.</td> </tr> @@ -939,7 +939,7 @@ and it's actions.</td> href="./OfficeDev/DesktopEnvironment/FunctionHelper.java" title="link to OfficeDev/DesktopEnvironment/FunctionHelper.java">FunctionHelper</a></td> <td class="cell80">This helper comprises all -OpenOffice.org %PRODUCT_RELEASE% API calls. Thus it is possible to learn about these +LibreOffice %PRODUCT_RELEASE% API calls. Thus it is possible to learn about these aspects separately from the rest of the application example.</td> </tr> <tr> @@ -954,7 +954,7 @@ asynchronous events from UNO oneway calls.</td> href="./OfficeDev/DesktopEnvironment/IShutdownListener.java" title="link to OfficeDev/DesktopEnvironment/IShutdownListener.java">IShutdownListener</a></td> <td class="cell80">This is a listener interface to -clean up on shutdown of OpenOffice.org %PRODUCT_RELEASE%.</td> +clean up on shutdown of LibreOffice %PRODUCT_RELEASE%.</td> </tr> <tr> <td class="cell20"><a @@ -985,7 +985,7 @@ get the window handle of the Java window.</td> href="./OfficeDev/DesktopEnvironment/OfficeConnect.java" title=" link to OfficeDev/DesktopEnvironment/OfficeConnect.java">OfficeConnect</a></td> <td class="cell80">Builds the remote bridge to -OpenOffice.org %PRODUCT_RELEASE% and exports its UNO service manager for the Java side of +LibreOffice %PRODUCT_RELEASE% and exports its UNO service manager for the Java side of the application.</td> </tr> <tr> @@ -1016,7 +1016,7 @@ the application is registered as an event listener.</td> href="./OfficeDev/DesktopEnvironment/ViewContainer.java" title="link to OfficeDev/DesktopEnvironment/ViewContainer.java">ViewContainer</a></td> <td class="cell80">Performs a clean up on the Java -side on OpenOffice.org %PRODUCT_RELEASE% shutdown.</td> +side on LibreOffice %PRODUCT_RELEASE% shutdown.</td> </tr> </tbody> </table> @@ -1035,7 +1035,7 @@ side on OpenOffice.org %PRODUCT_RELEASE% shutdown.</td> href="./OfficeDev/OfficeConnect.java" title="link to OfficeDev/OfficeConnect.java">OfficeConnect</a></td> <td class="cell80">Builds the remote bridge to -OpenOffice.org %PRODUCT_RELEASE% and exports its UNO service manager to the Java side.</td> +LibreOffice %PRODUCT_RELEASE% and exports its UNO service manager to the Java side.</td> </tr> <tr> <td class="cell20"><img @@ -1091,7 +1091,7 @@ TerminateListener and shows the use of them in a running program.</td> href="../../docs/common/ref/com/sun/star/frame/XTerminateListener.html" title="link to the reference documentation of com.sun.star.frame.XTerminationListener"> <code>XTerminateListener</code></a>. It is called -when OpenOffice.org %PRODUCT_RELEASE% terminates.</td> +when LibreOffice %PRODUCT_RELEASE% terminates.</td> </tr> </tbody> </table> @@ -1157,7 +1157,7 @@ of formats.</td> href="./OfficeDev/Linguistic/LinguisticExamples.java" title="link to OfficeDev/Linguistic/LinguisticExamples.java">LinguisticExamples</a></td> <td class="cell80">A short example that uses most of -the functionality from the OpenOffice.org %PRODUCT_RELEASE% linguistic API.</td> +the functionality from the LibreOffice %PRODUCT_RELEASE% linguistic API.</td> </tr> <tr> <td class="cell20"><a @@ -1638,7 +1638,7 @@ URLs.</td> <td class="cell20"><a href="./Drawing/Helper.java" title="link to Drawing/Helper.java">Helper</a></td> <td class="cell80">Contains a helper class for the -other examples to connect to OpenOffice.org %PRODUCT_RELEASE% and open or create a drawing +other examples to connect to LibreOffice %PRODUCT_RELEASE% and open or create a drawing document.</td> </tr> <tr> @@ -1789,7 +1789,7 @@ is not implemented. To be more precise.</td> <td class="cell20"><a href="./Charts/Helper.java" title="link to Charts/Helper.java">Helper</a></td> <td class="cell80">Shows how to connect to -OpenOffice.org %PRODUCT_RELEASE% and create text, drawing or spreadsheet document. This +LibreOffice %PRODUCT_RELEASE% and create text, drawing or spreadsheet document. This class is used as a helper class for the other examples.</td> </tr> <tr> @@ -1844,7 +1844,7 @@ changes.</td> <tbody> <tr> <td colspan="2" class="head1"><a - name="BasicandDialogs">OpenOffice.org %PRODUCT_RELEASE% Basic and Dialogs examples</a></td> + name="BasicandDialogs">LibreOffice %PRODUCT_RELEASE% Basic and Dialogs examples</a></td> <td align="right"> <a href="#examples" title="link to the Developer's Guide examples overview"><img class="navigate" src="../../docs/images/nav_up.png"></a> <a @@ -1966,7 +1966,7 @@ the example. </td> href="./Database/CodeSamples.java" title="link to Database/CodeSamples.java">CodeSamples</a></td> <td class="cell80">Creates the connection to -OpenOffice.org %PRODUCT_RELEASE% and executes the code SalesMan samples for database API.</td> +LibreOffice %PRODUCT_RELEASE% and executes the code SalesMan samples for database API.</td> </tr> <tr> <td class="cell20"><img @@ -2649,7 +2649,7 @@ Management examples</a></td> href="./Config/ConfigExamples.java" title="link to Config/ConfigExamples.java">ConfigExamples</a></td> <td class="cell80">This example connects to a -OpenOffice.org %PRODUCT_RELEASE%, gets the configuration manager and accesses the +LibreOffice %PRODUCT_RELEASE%, gets the configuration manager and accesses the configuration in various ways.</td> </tr> </tbody> commit 60d053af86dc69535facb375992639e550d8f97b Author: Andras Timar <ati...@suse.com> Date: Tue Jan 31 16:02:11 2012 +0100 look for /Applications/LibreOffice.app on Mac diff --git a/odk/configure.pl b/odk/configure.pl index 533c881..4749238 100755 --- a/odk/configure.pl +++ b/odk/configure.pl @@ -620,6 +620,9 @@ sub searchprog sub searchMacOffice { + if (-d "/Applications/LibreOffice.app" ) { + return "/Applications/LibreOffice.app" + } if (-d "/Applications/OpenOffice.org.app" ) { return "/Applications/OpenOffice.org.app" } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits