You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/01/17 12:06:20 UTC
svn commit: r1434615 [7/11] - in /openoffice/branches/alg/clibboard: ./
ext_libraries/apr-util/ ext_libraries/apr/ extras/l10n/source/eu/ main/
main/boost/ main/canvas/source/cairo/ main/cli_ure/source/basetypes/
main/cli_ure/source/native/ main/cli_ur...
Modified: openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx (original)
+++ openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx Thu Jan 17 11:06:13 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,110 +7,56 @@
* 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.
- *
+ *
*************************************************************/
-
-
-#include <cppuhelper/factory.hxx>
-
#include "MyProtocolHandler.h"
-#include "MyListener.h"
-namespace css = ::com::sun::star;
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
-#if 0
-static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >& xRegistryKey ,
- const char* pImplementationName,
- const char* pServiceName )
+namespace framework
{
- ::rtl::OUStringBuffer sKey(256);
- sKey.append (::rtl::OUString::createFromAscii(pImplementationName));
- sKey.appendAscii("/UNO/SERVICES/");
- sKey.append (::rtl::OUString::createFromAscii(pServiceName));
-
- xRegistryKey->createKey(sKey.makeStringAndClear());
+ namespace complex_toolbar_controls
+ {
+ static ::cppu::ImplementationEntry const s_impl_entries[] =
+ {
+ {
+ MyProtocolHandler_createInstance,
+ MyProtocolHandler_getImplementationName,
+ MyProtocolHandler_getSupportedServiceNames,
+ ::cppu::createSingleComponentFactory,
+ 0,
+ 0
+ },
+ { 0, 0, 0, 0, 0, 0 }
+ };
+ }
}
-#endif
extern "C"
{
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvTypeName,
- uno_Environment** ppEnv )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-#if 0
-/**
- * This method not longer necessary since OOo 3.4 where the component registration was
- * was changed to passive component registration. For more details see
- * http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
- */
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* pServiceManager,
- void* pRegistryKey )
-{
- if (!pRegistryKey)
- return sal_False;
-
- try
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+ const sal_Char **ppEnvTypeName, uno_Environment ** )
{
- css::uno::Reference< css::registry::XRegistryKey > xKey(reinterpret_cast< css::registry::XRegistryKey* >(pRegistryKey), css::uno::UNO_QUERY);
-
- writeInfo( xKey, MYLISTENER_IMPLEMENTATIONNAME , MYLISTENER_SERVICENAME );
- writeInfo( xKey, MYPROTOCOLHANDLER_IMPLEMENTATIONNAME, MYPROTOCOLHANDLER_SERVICENAME );
-
- return sal_True;
+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- catch(const css::registry::InvalidRegistryException&)
- { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); }
-
- return sal_False;
-}
-#endif
-
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName ,
- void* pServiceManager,
- void* pRegistryKey )
-{
- if ( !pServiceManager || !pImplName )
- return 0;
- css::uno::Reference< css::lang::XSingleServiceFactory > xFactory ;
- css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR (reinterpret_cast< css::lang::XMultiServiceFactory* >(pServiceManager), css::uno::UNO_QUERY);
- ::rtl::OUString sImplName = ::rtl::OUString::createFromAscii(pImplName);
-
- if (sImplName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MYLISTENER_IMPLEMENTATIONNAME ) ) )
- {
- css::uno::Sequence< ::rtl::OUString > lNames(1);
- lNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MYLISTENER_IMPLEMENTATIONNAME ) );
- xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyListener::st_createInstance, lNames);
- }
- else
- if (sImplName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MYPROTOCOLHANDLER_IMPLEMENTATIONNAME ) ) )
- {
- css::uno::Sequence< ::rtl::OUString > lNames(1);
- lNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MYPROTOCOLHANDLER_SERVICENAME ) );
- xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyProtocolHandler_createInstance, lNames);
- }
-
- if (!xFactory.is())
- return 0;
-
- xFactory->acquire();
- return xFactory.get();
+ SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+ const sal_Char *pImplName, void *pServiceManager, void *pRegistryKey )
+ {
+ return ::cppu::component_getFactoryHelper( pImplName,
+ pServiceManager,
+ pRegistryKey ,
+ framework::complex_toolbar_controls::s_impl_entries );
+ }
}
-
-} // extern C
Modified: openoffice/branches/alg/clibboard/main/odk/examples/cpp/custompanel/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/examples/cpp/custompanel/description.xml?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/examples/cpp/custompanel/description.xml (original)
+++ openoffice/branches/alg/clibboard/main/odk/examples/cpp/custompanel/description.xml Thu Jan 17 11:06:13 2013
@@ -31,6 +31,6 @@
<name>Custom Tool Panel Example</name>
</display-name>
<dependencies>
- <OpenOffice.org-minimal-version value="3.4" d:name="OpenOffice.org 3.4"/>
+ <OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice 3.4"/>
</dependencies>
</description>
Modified: openoffice/branches/alg/clibboard/main/odk/examples/java/Inspector/Addons.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/examples/java/Inspector/Addons.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/examples/java/Inspector/Addons.xcu (original)
+++ openoffice/branches/alg/clibboard/main/odk/examples/java/Inspector/Addons.xcu Thu Jan 17 11:06:13 2013
@@ -1,27 +1,6 @@
-<!--***********************************************************
- *
- * 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.
- *
- ***********************************************************-->
-
<?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
@@ -29,36 +8,41 @@
* 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.
- *
+ *
***********************************************************-->
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office">
- <node oor:name="AddonUI">
- <node oor:name="OfficeToolBar">
- <node oor:name="org.openoffice.Office.addon.Inspector" oor:op="replace">
- <node oor:name="toolBar_Inspector" oor:op="replace">
- <prop oor:name="URL" oor:type="xs:string">
- <value>org.openoffice.Office.addon.Inspector:inspect</value>
- </prop>
- <prop oor:name="Title" oor:type="xs:string">
- <value xml:lang="en-US">Object Inspector</value>
- </prop>
- <prop oor:name="Target" oor:type="xs:string">
- <value>_self</value>
- </prop>
- <prop oor:name="Context" oor:type="xs:string">
- <value></value>
- </prop>
- </node>
- </node>
- </node>
- </node>
+ <node oor:name="AddonUI">
+ <node oor:name="OfficeToolBar">
+ <node oor:name="org.openoffice.Office.addon.Inspector" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Object Inspector</value>
+ </prop>
+ <node oor:name="ToolBarItems">
+ <node oor:name="toolBar_Inspector" oor:op="replace">
+ <prop oor:name="URL" oor:type="xs:string">
+ <value>org.openoffice.Office.addon.Inspector:inspect</value>
+ </prop>
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Object Inspector</value>
+ </prop>
+ <prop oor:name="Target" oor:type="xs:string">
+ <value>_self</value>
+ </prop>
+ <prop oor:name="Context" oor:type="xs:string">
+ <value></value>
+ </prop>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
</oor:component-data>
Modified: openoffice/branches/alg/clibboard/main/odk/examples/java/Inspector/Inspector.java
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/examples/java/Inspector/Inspector.java?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/examples/java/Inspector/Inspector.java (original)
+++ openoffice/branches/alg/clibboard/main/odk/examples/java/Inspector/Inspector.java Thu Jan 17 11:06:13 2013
@@ -178,7 +178,7 @@ public class Inspector{
try {
Object oToolkit = m_xComponentContext.getServiceManager().createInstanceWithContext("com.sun.star.awt.Toolkit", m_xComponentContext);
XMessageBoxFactory xMessageBoxFactory = (XMessageBoxFactory) UnoRuntime.queryInterface(XMessageBoxFactory.class, oToolkit);
- XMessageBox xMessageBox = xMessageBoxFactory.createMessageBox(_xWindowPeer, aRectangle, com.sun.star.awt.MessageBoxType.ERRORBOX, com.sun.star.awt.MessageBoxButtons.BUTTONS_OK, _sTitle, _sMessage);
+ XMessageBox xMessageBox = xMessageBoxFactory.createMessageBox(_xWindowPeer, com.sun.star.awt.MessageBoxType.ERRORBOX, com.sun.star.awt.MessageBoxButtons.BUTTONS_OK, _sTitle, _sMessage);
XComponent xComponent = (XComponent) UnoRuntime.queryInterface(XComponent.class, xMessageBox);
if (xMessageBox != null){
short nResult = xMessageBox.execute();
Modified: openoffice/branches/alg/clibboard/main/odk/pack/copying/dk.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/pack/copying/dk.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/pack/copying/dk.mk (original)
+++ openoffice/branches/alg/clibboard/main/odk/pack/copying/dk.mk Thu Jan 17 11:06:13 2013
@@ -19,7 +19,7 @@
#
#**************************************************************
-# OpenOffice.org @@RELEASE@@ SDK dependent settings
+# Apache OpenOffice @@RELEASE@@ SDK dependent settings
SDKVERSION=@@RELEASE@@
BUILDID=@@BUILDID@@
SCM_REVISION=@@SCMREVISION@@
\ No newline at end of file
Modified: openoffice/branches/alg/clibboard/main/odk/pack/copying/idl_chapter_refs.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/pack/copying/idl_chapter_refs.txt?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/pack/copying/idl_chapter_refs.txt (original)
+++ openoffice/branches/alg/clibboard/main/odk/pack/copying/idl_chapter_refs.txt Thu Jan 17 11:06:13 2013
@@ -6547,8 +6547,8 @@ com.sun.star.task.JobExecutor
TOPIC:
com.sun.star.task.JobExecutor
-LINK:Documentation/DevGuide/Database/Data_Sources_in_OpenOffice.org_API#DatabaseContext
-DESCR:Database - Data Sources in OpenOffice.org API - DatabaseContext
+LINK:Documentation/DevGuide/Database/Data_Sources_in_Apache_OpenOffice_API#DatabaseContext
+DESCR:Database - Data Sources in Apache OpenOffice API - DatabaseContext
REF:
com.sun.star.sdb.Connection
com.sun.star.sdb.DatabaseContext
@@ -7510,8 +7510,8 @@ com.sun.star.table.CellAddress
com.sun.star.sheet.XSheetAnnotationAnchor
TOPIC:
-LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_OpenOffice.org
-DESCR:OfficeDev - Frame-Controller-Model Paradigm in OpenOffice.org
+LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_Apache_OpenOffice
+DESCR:OfficeDev - Frame-Controller-Model Paradigm in Apache OpenOffice
REF:
TOPIC:
com.sun.star.frame.XController
Modified: openoffice/branches/alg/clibboard/main/odk/setsdkenv_unix
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/setsdkenv_unix?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/setsdkenv_unix (original)
+++ openoffice/branches/alg/clibboard/main/odk/setsdkenv_unix Thu Jan 17 11:06:13 2013
@@ -30,7 +30,7 @@ if [ "$OSTYPE" = "Darwin" ]
then
OO_SDK_NAME=`basename $OO_SDK_HOME`
else
- OO_SDK_NAME=openoffice.org${OOVERSION}_sdk
+ OO_SDK_NAME=apacheopenoffice${OOVERSION}_sdk
fi
export OO_SDK_HOME
Modified: openoffice/branches/alg/clibboard/main/odk/setsdkenv_unix.sh.in
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/setsdkenv_unix.sh.in?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/branches/alg/clibboard/main/odk/setsdkenv_unix.sh.in Thu Jan 17 11:06:13 2013
@@ -29,16 +29,16 @@ OO_SDK_NAME=@OO_SDK_NAME@
export OO_SDK_NAME
# Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/openoffice.org/basis3.0/sdk
+# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis3.0/sdk
OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory.
-# Example: OFFICE_HOME=/opt/openoffice.org3
+# Example: OFFICE_HOME=/opt/apacheopenoffice3
OFFICE_HOME='@OFFICE_HOME@'
OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
# URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/openoffice.org/ure
+# Example: OO_SDK_URE_HOME=/opt/apacheopenoffice/ure
OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
export OO_SDK_URE_HOME
@@ -78,7 +78,7 @@ OO_SDK_OUTPUT_DIR=@OO_SDK_OUTPUT_DIR@
SDK_AUTO_DEPLOYMENT=@SDK_AUTO_DEPLOYMENT@
export SDK_AUTO_DEPLOYMENT
-# Check installation path for the OpenOffice Development Kit.
+# Check installation path for the Apache OpenOffice Development Kit.
if [ -z "${OO_SDK_HOME}" ]
then
echo Error: Please insert a correct value for the variable OO_SDK_HOME.
Modified: openoffice/branches/alg/clibboard/main/odk/setsdkenv_windows.template
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/setsdkenv_windows.template?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/setsdkenv_windows.template (original)
+++ openoffice/branches/alg/clibboard/main/odk/setsdkenv_windows.template Thu Jan 17 11:06:13 2013
@@ -23,22 +23,22 @@ REM This script sets all enviroment vari
REM are necessary for building the examples of the Office Development Kit.
REM The Script was developed for the operating systems Windows.
REM The SDK name
-REM Example: set OO_SDK_NAME=openoffice3.0_sdk
-set OO_SDK_NAME=openoffice.org3.0_sdk
+REM Example: set OO_SDK_NAME=apacheopenoffice3.0_sdk
+set OO_SDK_NAME=apacheopenoffice3.0_sdk
REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice.org\Basic 3.0\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 3.0\sdk
set OO_SDK_HOME=
REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org 3
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 3
set OFFICE_HOME=
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org\Basis 3.0
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 3.0
set OFFICE_BASE_HOME=
REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice.org\URE
+REM Example: set OO_SDK_URE_HOME=C:\Program Files\Apache OpenOffice\URE
set OO_SDK_URE_HOME=
REM Directory of the make command.
@@ -73,7 +73,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Pro
set OO_SDK_JAVA_HOME=
REM Special output directory
-REM Example: set OO_SDK_OUT=C:\openoffice.org3.0_sdk
+REM Example: set OO_SDK_OUT=C:\apacheopenoffice3.0_sdk
set OO_SDK_OUT=
REM Automatic deployment
Modified: openoffice/branches/alg/clibboard/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java (original)
+++ openoffice/branches/alg/clibboard/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java Thu Jan 17 11:06:13 2013
@@ -188,7 +188,7 @@ final class InstallationFinder {
*/
private static String getPathFromWindowsRegistry() {
- final String SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath";
+ final String SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
String path = null;
Modified: openoffice/branches/alg/clibboard/main/odk/source/unoapploader/win/unoapploader.c
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/source/unoapploader/win/unoapploader.c?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/source/unoapploader/win/unoapploader.c (original)
+++ openoffice/branches/alg/clibboard/main/odk/source/unoapploader/win/unoapploader.c Thu Jan 17 11:06:13 2013
@@ -61,7 +61,7 @@ void closeErrorFile();
* environment variable to the program directory of the UNO installation.
* If no installation is specified by the user, the default installation on
* the system will be taken. The default installation is read from the
- * default value of the key "Software\OpenOffice.org\UNO\InstallPath" from the
+ * default value of the key "Software\Apache OpenOffice\UNO\InstallPath" from the
* root key HKEY_CURRENT_USER in the Windows Registry. If this key is missing,
* the key is read from the root key HKEY_LOCAL_MACHINE.</p>
*/
Modified: openoffice/branches/alg/clibboard/main/odk/util/makefile.pmk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/odk/util/makefile.pmk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/odk/util/makefile.pmk (original)
+++ openoffice/branches/alg/clibboard/main/odk/util/makefile.pmk Thu Jan 17 11:06:13 2013
@@ -23,8 +23,8 @@
# used for sdk common files
PRODUCT_RELEASE=3.5
-OFFICENAME=OpenOffice.org
-SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk
+OFFICENAME=Apache OpenOffice
+SDKDIRNAME=apacheopenoffice$(PRODUCT_RELEASE)_sdk
OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK
IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API"
Modified: openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecute.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecute.idl?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecute.idl (original)
+++ openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecute.idl Thu Jan 17 11:06:13 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,66 +7,37 @@
* 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.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_system_SystemShellExecute_idl__
#define __com_sun_star_system_SystemShellExecute_idl__
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
-#include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-//=============================================================================
+#include <com/sun/star/system/XSystemShellExecute.idl>
module com { module sun { module star { module system {
-//=============================================================================
-
- published interface XSystemShellExecute;
-
-//=============================================================================
-/** Specifies a system executer service. Such a service makes it possible
- to execute an arbitrary system command.
+published interface XSystemShellExecute;
- @see com::sun::star::system::XSystemShellExecute
+/** Specifies a system executer service. Such a service makes it possible
+ to execute an arbitrary system command.
*/
-
-published service SystemShellExecute
+published service SystemShellExecute : XSystemShellExecute
{
- //-------------------------------------------------------------------------
- /** Provides access to a <type>XSystemShellExecute</type> interface.
- */
- interface XSystemShellExecute;
-
- //-------------------------------------------------------------------------
- /** Service should always support this interface.
- */
- interface com::sun::star::lang::XServiceInfo;
-
- //-------------------------------------------------------------------------
- /** Service should always support this interface.
- */
- interface com::sun::star::lang::XTypeProvider;
+ /** service constructor
+ */
+ create();
};
-//=============================================================================
-
}; }; }; };
#endif
Modified: openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecuteException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecuteException.idl?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecuteException.idl (original)
+++ openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecuteException.idl Thu Jan 17 11:06:13 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,52 +7,40 @@
* 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.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_system_SystemShellExecuteException_idl__
#define __com_sun_star_system_SystemShellExecuteException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-
-//=============================================================================
module com { module sun { module star { module system {
-//=============================================================================
-/** May be thrown in cases of errors executing a command using the <type>SystemShellExecute</type> service.
- <member scope="com::sun::star::uno">Exception::Message</member> may contain a
- system error message, but it is not mandatory.
- The member PosixError specifies a POSIX conforming error code or -1 for
- unknown errors.
+/** May be thrown in cases of errors executing a command using the
+ <type>SystemShellExecute</type> service.
+
+ <p><member scope="com::sun::star::uno">Exception::Message</member> may
+ contain a system error message, but it is not mandatory.</p>
+ <p>The member <member>PosixError</member> specifies a POSIX conforming error
+ code or -1 for unknown errors.</p>
*/
published exception SystemShellExecuteException: com::sun::star::uno::Exception
{
- //=========================================================================
- /** A Posix conforming error code or -1 for unknown errors.
- */
- long PosixError;
+ /** A Posix conforming error code or -1 for unknown errors.
+ */
+ long PosixError;
};
-//=============================================================================
-
}; }; }; };
-/*=============================================================================
-
-
-=============================================================================*/
#endif
Modified: openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecuteFlags.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecuteFlags.idl?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecuteFlags.idl (original)
+++ openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecuteFlags.idl Thu Jan 17 11:06:13 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,45 +7,36 @@
* 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.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_system_SystemShellExecuteFlags_idl__
#define __com_sun_star_system_SystemShellExecuteFlags_idl__
-
module com { module sun { module star { module system {
-//=============================================================================
-/** Different settings for the <type>SystemShellExecute</type> service.
+/** Different settings for the <type>SystemShellExecute</type> service.
*/
-
published constants SystemShellExecuteFlags
{
- //---------------------------------------------------------------------
- /** Uses the default settings for executing commands.
- */
- const long DEFAULTS = 0;
-
- //---------------------------------------------------------------------
- /** Prevents the display of system error message boxes if the
- method <member scope="com::sun::star::system">XSystemShellExecute::execute()</member> fails.
- */
- const long NO_SYSTEM_ERROR_MESSAGE = 1;
-};
-
-//=============================================================================
+ /** Uses the default settings for executing commands.
+ */
+ const long DEFAULTS = 0;
+
+ /** Prevents the display of system error message boxes if the
+ method <member scope="com::sun::star::system">XSystemShellExecute::execute()</member> fails.
+ */
+ const long NO_SYSTEM_ERROR_MESSAGE = 1;
+};
}; }; }; };
Modified: openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XSystemShellExecute.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XSystemShellExecute.idl?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XSystemShellExecute.idl (original)
+++ openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XSystemShellExecute.idl Thu Jan 17 11:06:13 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,84 +7,63 @@
* 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.
- *
+ *
*************************************************************/
-
-
#ifndef __com_sun_star_system_XSystemShellExecute_idl__
#define __com_sun_star_system_XSystemShellExecute_idl__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_system_SystemShellExecuteException_idl__
#include <com/sun/star/system/SystemShellExecuteException.idl>
-#endif
-
-//=============================================================================
module com { module sun { module star { module system {
-//=============================================================================
/** Specifies an interface for executing a system command.
*/
-
-
-published interface XSystemShellExecute: com::sun::star::uno::XInterface
+published interface XSystemShellExecute
{
- //-------------------------------------------------------------------------
- /** Executes an abitrary system command.
-
- @param aCommand
- Specifies the command to execute. This may be an executable file or a
- document which is registered with an application on a specific platform,
- so that the platform knows what application to launch for that document.
- If the command specifies a path to an executable, etc, this has to be
- a system specific path.
-
- @param aParameter
- Specifies a list of space separated parameters. The method does not
- validate the given parameters, but only passes it as a parameter to the
- specified command.
-
- @param nFlags
- Specifies different flags to control the execution of this method, for example,
- avoid showing system error messages, in case of failures, etc.
-
- @throws com::sun::star::lang::IllegalArgumentException
- when the specified flags are wrong or exclude each other.
-.
- @throws com::sun::star::sys::SystemExecuteException
- in the case of errors when trying to executed the specified command.
-
- @see com::sun::star::system::SystemShellExecuteFlags
- */
- void execute( [in] string aCommand, [in] string aParameter, [in] long nFlags )
- raises( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::system::SystemShellExecuteException );
-};
+ /** Executes an abitrary system command.
-//=============================================================================
+ @param aCommand
+ Specifies the command to execute.
+ <p>This may be an executable file or a document which is registered with
+ an application on a specific platform, so that the platform knows what
+ application to launch for that document.</p>
+ <p>If the command specifies a path to an executable, etc, this has to be
+ a system specific path.</p>
+
+ @param aParameter
+ Specifies a list of space separated parameters.
+ <p>The method does not validate the given parameters, but only passes it
+ as a parameter to the specified command.</p>
+
+ @param nFlags
+ A combination of <type>SystemShellExecuteFlags</type> specifying different
+ flags to control the execution of this method.
+
+ @throws com::sun::star::lang::IllegalArgumentException
+ when the specified flags are wrong or exclude each other.
+
+ @throws com::sun::star::sys::SystemExecuteException
+ in the case of errors when trying to executed the specified command.
+ */
+ void execute( [in] string sCommand,
+ [in] string sParameter,
+ [in] long nFlags )
+ raises( ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::system::SystemShellExecuteException );
+};
}; }; }; };
#endif
-
Modified: openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/makefile.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/makefile.mk (original)
+++ openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/makefile.mk Thu Jan 17 11:06:13 2013
@@ -34,17 +34,15 @@ PACKAGE=com$/sun$/star$/system
# ------------------------------------------------------------------------
IDLFILES=\
+ MailClientFlags.idl\
+ SystemMailProvider.idl\
SystemShellExecute.idl\
SystemShellExecuteException.idl\
SystemShellExecuteFlags.idl\
+ XMailClient.idl\
+ XMailMessage.idl\
+ XSystemMailProvider.idl\
XSystemShellExecute.idl\
- SimpleMailClientFlags.idl\
- XSimpleMailMessage.idl\
- XSimpleMailMessage2.idl\
- XSimpleMailClient.idl\
- XSimpleMailClientSupplier.idl\
- SimpleCommandMail.idl \
- SimpleSystemMail.idl\
# ------------------------------------------------------------------
Modified: openoffice/branches/alg/clibboard/main/offapi/type_reference/types.rdb
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/offapi/type_reference/types.rdb?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/alg/clibboard/main/officecfg/registry/data/org/openoffice/Setup.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/officecfg/registry/data/org/openoffice/Setup.xcu?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/officecfg/registry/data/org/openoffice/Setup.xcu (original)
+++ openoffice/branches/alg/clibboard/main/officecfg/registry/data/org/openoffice/Setup.xcu Thu Jan 17 11:06:13 2013
@@ -41,10 +41,10 @@
<value >${PRODUCTEXTENSION}</value>
</prop>
<prop oor:name="ooXMLFileFormatVersion" install:module="brand">
- <value >${FILEFORMATVERSION}</value>
+ <value >${OOOXMLFILEFORMATVERSION}</value>
</prop>
<prop oor:name="ooXMLFileFormatName" install:module="brand">
- <value >${FILEFORMATNAME}</value>
+ <value >${OOOXMLFILEFORMATNAME}</value>
</prop>
<prop oor:name="ooOpenSourceContext" install:module="brand">
<value >${OPENSOURCE}</value>
Modified: openoffice/branches/alg/clibboard/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs (original)
+++ openoffice/branches/alg/clibboard/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs Thu Jan 17 11:06:13 2013
@@ -157,6 +157,22 @@
</info>
</set>
</group>
+ <group oor:name="ToolBar">
+ <info>
+ <desc>Contains the structure of a toolbar.</desc>
+ </info>
+ <prop oor:name="Title" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>A localized string used as the toolbar title.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <set oor:name="ToolBarItems" oor:node-type="ToolBarItem">
+ <info>
+ <desc>Contains a list of sets of toolbar items that are part of add-on toolbars.</desc>
+ </info>
+ </set>
+ </group>
<group oor:name="ToolBarItem">
<info>
<desc>Describes a toolbar item representing a function of of an external component. The name must be unique and should be written using a package-scheme like org.openoffice.external.applicationexecuter to minimize name clashes.</desc>
@@ -400,10 +416,10 @@
<desc>Contains a list of menu merging instructions of different add-ons.</desc>
</info>
</set>
- <set oor:name="OfficeToolBar" oor:node-type="ToolBarItems">
- <info>
- <desc>Contains a list of sets of toolbar items that are part of add-on toolbars.</desc>
- </info>
+ <set oor:name="OfficeToolBar" oor:node-type="ToolBar">
+ <info>
+ <desc>Contains a lists of addon toolbars.</desc>
+ </info>
</set>
<set oor:name="OfficeToolbarMerging" oor:node-type="MergeToolBarItems">
<info>
Modified: openoffice/branches/alg/clibboard/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs (original)
+++ openoffice/branches/alg/clibboard/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs Thu Jan 17 11:06:13 2013
@@ -4826,6 +4826,11 @@
<desc>KeyRight</desc>
</info>
</enumeration>
+ <enumeration oor:value="1282"> <!-- 0x502 -->
+ <info>
+ <desc>KeyTab</desc>
+ </info>
+ </enumeration>
<enumeration oor:value="1284"> <!-- 0x504 -->
<info>
<desc>KeySpace</desc>
Modified: openoffice/branches/alg/clibboard/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/postprocess/packcomponents/makefile.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/alg/clibboard/main/postprocess/packcomponents/makefile.mk Thu Jan 17 11:06:13 2013
@@ -311,7 +311,7 @@ my_components += \
fps \
ftransl \
java_uno_accessbridge \
- smplmail \
+ sysmail \
sysdtrans \
wininetbe1
.END
Modified: openoffice/branches/alg/clibboard/main/postprocess/rebase/coffbase.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/postprocess/rebase/coffbase.txt?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/postprocess/rebase/coffbase.txt (original)
+++ openoffice/branches/alg/clibboard/main/postprocess/rebase/coffbase.txt Thu Jan 17 11:06:13 2013
@@ -253,7 +253,7 @@ slideshow.uno.dll 0x000000005ec60000 0x0
slideshowtestmi.dll 0x000000005e8b0000 0x003a0000
smdmi.dll 0x000000005e890000 0x00010000
smmi.dll 0x000000005e7f0000 0x00090000
-smplmail.uno.dll 0x000000005e7d0000 0x00010000
+sysmail.uno.dll 0x000000005e7d0000 0x00010000
sn_tools.dll 0x000000005e7a0000 0x00020000
so_activex.dll 0x000000005e770000 0x00020000
socomp.dll 0x000000005e750000 0x00010000
Modified: openoffice/branches/alg/clibboard/main/postprocess/rebase/no_rebase.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/postprocess/rebase/no_rebase.txt?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/postprocess/rebase/no_rebase.txt (original)
+++ openoffice/branches/alg/clibboard/main/postprocess/rebase/no_rebase.txt Thu Jan 17 11:06:13 2013
@@ -31,3 +31,5 @@ msvcr80.dll
msvcr90d.dll
msvcr90.dll
msvcr100.dll
+msvcr100d.dll
+dbghelp.dll
Modified: openoffice/branches/alg/clibboard/main/readlicense_oo/docs/readme/readme.xrm
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/readlicense_oo/docs/readme/readme.xrm?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/readlicense_oo/docs/readme/readme.xrm (original)
+++ openoffice/branches/alg/clibboard/main/readlicense_oo/docs/readme/readme.xrm Thu Jan 17 11:06:13 2013
@@ -39,13 +39,13 @@
<h1 id="Welcome" xml:lang="en-US">${PRODUCTNAME} ${PRODUCTVERSION} ReadMe</h1>
<p id="LatestUpdates" xml:lang="en-US">For latest updates to this readme file, see <a href="http://www.openoffice.org/welcome/readme.html">http://www.openoffice.org/welcome/readme.html</a></p>
<p id="A6" xml:lang="en-US">This file contains important information about this program. Please read this information very carefully before starting work.</p>
- <p id="A7" xml:lang="en-US">The OpenOffice.org Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.openoffice.org/about_us/introduction.html">http://www.openoffice.org/about_us/introduction.html</a></p>
- <p id="A9" xml:lang="en-US">Also read the sections below about getting involved in the OpenOffice.org project.</p>
+ <p id="A7" xml:lang="en-US">The Apache OpenOffice Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.openoffice.org/about_us/introduction.html">http://www.openoffice.org/about_us/introduction.html</a></p>
+ <p id="A9" xml:lang="en-US">Also read the sections below about getting involved in the Apache OpenOffice project.</p>
<h3 id="A10" xml:lang="en-US">Is ${PRODUCTNAME} really free for any user? </h3>
<p id="A11" xml:lang="en-US">${PRODUCTNAME} is free for use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as many computers as you like, and use it for any purpose you like (including commercial, government, public administration and educational use). For further details see the license text delivered together with ${PRODUCTNAME} or <a href="http://www.openoffice.org/license.html">http://www.openoffice.org/license.html</a></p>
<h3 id="A12" xml:lang="en-US">Why is ${PRODUCTNAME} free for any user?</h3>
<p id="A13" xml:lang="en-US">You can use this copy of ${PRODUCTNAME} today free of charge because individual contributors and corporate sponsors have designed, developed, tested, translated, documented, supported, marketed, and helped in many other ways to make ${PRODUCTNAME} what it is today - the world's leading open-source office software.</p>
- <p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure OpenOffice.org continues into the future, please consider contributing to the project - see <a href="http://contributing.openoffice.org">http://contributing.openoffice.org</a> for details. Everyone has a contribution to make.</p>
+ <p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure Apache OpenOffice continues into the future, please consider contributing to the project - see <a href="http://contributing.openoffice.org">http://contributing.openoffice.org</a> for details. Everyone has a contribution to make.</p>
</div>
<div id="Installation">
@@ -266,7 +266,7 @@
<div id="UserSupport">
<h2 id="support" xml:lang="en-US">User Support</h2>
- <p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://user.services.openoffice.org">http://user.services.openoffice.org</a> or search the archives of the 'users@openoffice.org' mailing list at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a>. Alternatively, you can send in your questions to <a href="mailto:users@openoffice.org">users@openoffice.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists">http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists</a>.</p>
+ <p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://user.services.openoffice.org">http://user.services.openoffice.org</a> or search the archives of the 'users@openoffice.apache.org' mailing list at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a>. Alternatively, you can send in your questions to <a href="mailto:users@openoffice.apache.org">users@openoffice.apache.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists">http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists</a>.</p>
<p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://wiki.services.openoffice.org/wiki/Documentation/FAQ">http://wiki.services.openoffice.org/wiki/Documentation/FAQ.</a></p>
</div>
@@ -302,13 +302,13 @@
</ul>
<h3 xml:lang="en-US">Joining the Project</h3>
<p id="joining" xml:lang="en-US">You can make major contributions to this important open source project even if you have limited software design or coding experience. Yes, you!</p>
- <p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a> you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The OpenOffice.org Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p>
+ <p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a> you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The Apache OpenOffice Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p>
<p id="joining3" xml:lang="en-US">You can help by joining the marktig mailig list ooo-marketing@incubator.apache.org or visit the Marketing Communications & Information Network on <a href="http://marketing.openoffice.org">http://marketing.openoffice.org</a> where you can provide point communication contact with press, media, government agencies, consultants, schools, Linux Users Groups and developers in your country and local community.</p>
</div>
<div id="Credits">
<p id="credits" xml:lang="en-US">We hope you enjoy working with the new ${PRODUCTNAME} ${PRODUCTVERSION} and will join us online.</p>
- <p id="credits2" xml:lang="en-US">The OpenOffice.org Community</p>
+ <p id="credits2" xml:lang="en-US">The Apache OpenOffice Community</p>
</div>
<div id="ModifiedSourceCode">
Modified: openoffice/branches/alg/clibboard/main/sal/osl/unx/file.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sal/osl/unx/file.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sal/osl/unx/file.cxx (original)
+++ openoffice/branches/alg/clibboard/main/sal/osl/unx/file.cxx Thu Jan 17 11:06:13 2013
@@ -348,7 +348,7 @@ oslFileError FileHandle_Impl::readAt (
if (!(m_state & STATE_READABLE))
return osl_File_E_BADF;
-#if defined(LINUX) || defined(SOLARIS)
+#if defined(LINUX) || defined(SOLARIS) || defined(FREEBSD) || defined(MACOSX)
ssize_t nBytes = ::pread (m_fd, pBuffer, nBytesRequested, nOffset);
if ((-1 == nBytes) && (EOVERFLOW == errno))
@@ -362,7 +362,7 @@ oslFileError FileHandle_Impl::readAt (
if (-1 == nBytes)
return oslTranslateFileError (OSL_FET_ERROR, errno);
-#else /* !(LINUX || SOLARIS) */
+#else /* no pread(2) ! */
if (nOffset != m_offset)
{
@@ -376,7 +376,7 @@ oslFileError FileHandle_Impl::readAt (
return oslTranslateFileError (OSL_FET_ERROR, errno);
m_offset += nBytes;
-#endif /* !(LINUX || SOLARIS) */
+#endif /* no pread(2) ! */
OSL_FILE_TRACE("FileHandle_Impl::readAt(%d, %lld, %ld)", m_fd, nOffset, nBytes);
*pBytesRead = nBytes;
@@ -397,13 +397,13 @@ oslFileError FileHandle_Impl::writeAt (
if (!(m_state & STATE_WRITEABLE))
return osl_File_E_BADF;
-#if defined(LINUX) || defined(SOLARIS)
+#if defined(LINUX) || defined(SOLARIS) || defined(FREEBSD) || defined(MACOSX)
ssize_t nBytes = ::pwrite (m_fd, pBuffer, nBytesToWrite, nOffset);
if (-1 == nBytes)
return oslTranslateFileError (OSL_FET_ERROR, errno);
-#else /* !(LINUX || SOLARIS) */
+#else /* no pwrite(2) ! */
if (nOffset != m_offset)
{
@@ -417,7 +417,7 @@ oslFileError FileHandle_Impl::writeAt (
return oslTranslateFileError (OSL_FET_ERROR, errno);
m_offset += nBytes;
-#endif /* !(LINUX || SOLARIS) */
+#endif /* no pwrite(2) ! */
OSL_FILE_TRACE("FileHandle_Impl::writeAt(%d, %lld, %ld)", m_fd, nOffset, nBytes);
m_size = std::max (m_size, sal::static_int_cast< sal_uInt64 >(nOffset + nBytes));
Modified: openoffice/branches/alg/clibboard/main/sc/source/ui/vba/vbawindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sc/source/ui/vba/vbawindow.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sc/source/ui/vba/vbawindow.cxx (original)
+++ openoffice/branches/alg/clibboard/main/sc/source/ui/vba/vbawindow.cxx Thu Jan 17 11:06:13 2013
@@ -310,7 +310,7 @@ ScVbaWindow::ScrollWorkbookTabs( const u
uno::Any SAL_CALL
ScVbaWindow::getCaption() throw (uno::RuntimeException)
{
- static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice.org Calc" ) );
+ static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - Apache OpenOffice Calc" ) );
static sal_Int32 nCrudLen = sCrud.getLength();
rtl::OUString sTitle;
Modified: openoffice/branches/alg/clibboard/main/sc/xml/ScXMLExport.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sc/xml/ScXMLExport.xml?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sc/xml/ScXMLExport.xml (original)
+++ openoffice/branches/alg/clibboard/main/sc/xml/ScXMLExport.xml Thu Jan 17 11:06:13 2013
@@ -39,11 +39,11 @@
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
<reference-docu xlink:href="http://xml.openoffice.org/"
- xlink:title="general OpenOffice.org xml information" />
+ xlink:title="general OpenOffice.org XML information" />
<reference-docu xlink:title="XML File Format Specification (draft)"
xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
<reference-docu xlink:href="http://xml.openoffice.org/filter/"
- xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
</component-description>
<component-description>
@@ -57,11 +57,11 @@
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
<reference-docu xlink:href="http://xml.openoffice.org/"
- xlink:title="general OpenOffice.org xml information" />
+ xlink:title="general OpenOffice.org XML information" />
<reference-docu xlink:title="XML File Format Specification (draft)"
xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
<reference-docu xlink:href="http://xml.openoffice.org/filter/"
- xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
</component-description>
<component-description>
@@ -75,11 +75,11 @@
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
<reference-docu xlink:href="http://xml.openoffice.org/"
- xlink:title="general OpenOffice.org xml information" />
+ xlink:title="general OpenOffice.org XML information" />
<reference-docu xlink:title="XML File Format Specification (draft)"
xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
<reference-docu xlink:href="http://xml.openoffice.org/filter/"
- xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
</component-description>
<component-description>
@@ -93,11 +93,11 @@
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
<reference-docu xlink:href="http://xml.openoffice.org/"
- xlink:title="general OpenOffice.org xml information" />
+ xlink:title="general OpenOffice.org XML information" />
<reference-docu xlink:title="XML File Format Specification (draft)"
xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
<reference-docu xlink:href="http://xml.openoffice.org/filter/"
- xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
</component-description>
<component-description>
@@ -111,11 +111,11 @@
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
<reference-docu xlink:href="http://xml.openoffice.org/"
- xlink:title="general OpenOffice.org xml information" />
+ xlink:title="general OpenOffice.org XML information" />
<reference-docu xlink:title="XML File Format Specification (draft)"
xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
<reference-docu xlink:href="http://xml.openoffice.org/filter/"
- xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
</component-description>
<project-build-dependency>cppu</project-build-dependency>
<project-build-dependency>cppuhelper</project-build-dependency>
Modified: openoffice/branches/alg/clibboard/main/sc/xml/ScXMLImport.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sc/xml/ScXMLImport.xml?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sc/xml/ScXMLImport.xml (original)
+++ openoffice/branches/alg/clibboard/main/sc/xml/ScXMLImport.xml Thu Jan 17 11:06:13 2013
@@ -39,11 +39,11 @@
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
<reference-docu xlink:href="http://xml.openoffice.org/"
- xlink:title="general OpenOffice.org xml information" />
+ xlink:title="general OpenOffice.org XML information" />
<reference-docu xlink:title="XML File Format Specification (draft)"
xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
<reference-docu xlink:href="http://xml.openoffice.org/filter/"
- xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
</component-description>
<component-description>
@@ -57,11 +57,11 @@
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
<reference-docu xlink:href="http://xml.openoffice.org/"
- xlink:title="general OpenOffice.org xml information" />
+ xlink:title="general OpenOffice.org XML information" />
<reference-docu xlink:title="XML File Format Specification (draft)"
xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
<reference-docu xlink:href="http://xml.openoffice.org/filter/"
- xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
</component-description>
<component-description>
@@ -75,11 +75,11 @@
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
<reference-docu xlink:href="http://xml.openoffice.org/"
- xlink:title="general OpenOffice.org xml information" />
+ xlink:title="general OpenOffice.org XML information" />
<reference-docu xlink:title="XML File Format Specification (draft)"
xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
<reference-docu xlink:href="http://xml.openoffice.org/filter/"
- xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
</component-description>
<component-description>
@@ -93,11 +93,11 @@
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
<reference-docu xlink:href="http://xml.openoffice.org/"
- xlink:title="general OpenOffice.org xml information" />
+ xlink:title="general OpenOffice.org XML information" />
<reference-docu xlink:title="XML File Format Specification (draft)"
xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
<reference-docu xlink:href="http://xml.openoffice.org/filter/"
- xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
</component-description>
<component-description>
@@ -111,11 +111,11 @@
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
<reference-docu xlink:href="http://xml.openoffice.org/"
- xlink:title="general OpenOffice.org xml information" />
+ xlink:title="general OpenOffice.org XML information" />
<reference-docu xlink:title="XML File Format Specification (draft)"
xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
<reference-docu xlink:href="http://xml.openoffice.org/filter/"
- xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
</component-description>
<project-build-dependency>cppu</project-build-dependency>
<project-build-dependency>cppuhelper</project-build-dependency>
Modified: openoffice/branches/alg/clibboard/main/scp2/inc/macros.inc
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/inc/macros.inc?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/inc/macros.inc (original)
+++ openoffice/branches/alg/clibboard/main/scp2/inc/macros.inc Thu Jan 17 11:06:13 2013
@@ -386,7 +386,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
- Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+ Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
Value = " "; \
End
@@ -395,7 +395,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
- Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+ Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
Value = " "; \
End
@@ -404,7 +404,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(Apache OpenOffice.,name)); \
ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
End
@@ -412,7 +412,7 @@ End
RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT2(OpenOffice.org.,name)); \
+ Subkey = STRING(CONCAT2(Apache OpenOffice.,name)); \
REG_VALUE_LNG(disp_name) \
End
@@ -420,7 +420,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(Apache OpenOffice.,name,\DefaultIcon)); \
Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
End
@@ -428,7 +428,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(Apache OpenOffice.,name,\shell)); \
Value = STRING(default); \
End
@@ -436,13 +436,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(Apache OpenOffice.,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(Apache OpenOffice.,name,\shell\new\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \
End
@@ -450,7 +450,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(Apache OpenOffice.,name,\shell\open\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \
End
@@ -458,7 +458,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(Apache OpenOffice.,name,\shell\print\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \
End
@@ -466,7 +466,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(Apache OpenOffice.,name,\shell\printto\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
End
@@ -476,7 +476,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(Apache OpenOffice.,name)); \
Styles = (); \
End
@@ -486,7 +486,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(Apache OpenOffice.,name)); \
Styles = (); \
End
Modified: openoffice/branches/alg/clibboard/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/source/ooo/file_library_ooo.scp?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/alg/clibboard/main/scp2/source/ooo/file_library_ooo.scp Thu Jan 17 11:06:13 2013
@@ -1375,7 +1375,7 @@ File gid_File_Lib_Smplmail
TXT_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
- Name = "smplmail.uno.dll";
+ Name = "sysmail.uno.dll";
End
#endif
Modified: openoffice/branches/alg/clibboard/main/scp2/source/ooo/installation_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/source/ooo/installation_ooo.scp?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/source/ooo/installation_ooo.scp (original)
+++ openoffice/branches/alg/clibboard/main/scp2/source/ooo/installation_ooo.scp Thu Jan 17 11:06:13 2013
@@ -30,9 +30,9 @@ Installation gid_Installation_Ooo
OOoBaseVersion = "${OOOBASEVERSION}";
UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
JavaVersion = "${JAVAVERSION}";
- SxwFormatName = "OpenOffice.org";
- SxwFormatVersion = "1.1";
- VendorName = "OpenOffice.org";
+ SxwFormatName = "OpenOffice.org XML";
+ SxwFormatVersion = "1.0";
+ VendorName = "Apache OpenOffice";
#ifdef WNT
DefaultDestPath = "<winprogpath>\${PRODUCTNAME}${PRODUCTVERSION}";
#else
Modified: openoffice/branches/alg/clibboard/main/scp2/source/ooo/module_langpack.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/source/ooo/module_langpack.ulf?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/source/ooo/module_langpack.ulf (original)
+++ openoffice/branches/alg/clibboard/main/scp2/source/ooo/module_langpack.ulf Thu Jan 17 11:06:13 2013
@@ -710,3 +710,9 @@ en-US = "Asturian"
[STR_DESC_MODULE_LANGPACK_AST]
en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GD]
+en-US = "Gaelic (Scotland)"
+
+[STR_DESC_MODULE_LANGPACK_GD]
+en-US = "Installs Gaelic (Scotland) support in %PRODUCTNAME %PRODUCTVERSION"
Modified: openoffice/branches/alg/clibboard/main/scp2/source/ooo/registryitem_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/source/ooo/registryitem_ooo.scp?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/source/ooo/registryitem_ooo.scp (original)
+++ openoffice/branches/alg/clibboard/main/scp2/source/ooo/registryitem_ooo.scp Thu Jan 17 11:06:13 2013
@@ -218,7 +218,7 @@ RegistryItem gid_Regitem_Software_Micros
ModuleID = gid_Module_Root;
Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
Name = "Publisher";
- Value = "Sun Microsystems, Inc. for the OpenOffice.org-Community";
+ Value = "Apache OpenOffice project community";
End
RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring
@@ -247,7 +247,7 @@ End
RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION";
+ Subkey = "Software\Apache OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";
ModuleID = gid_Module_Root;
Name = "Path";
Value = "<progpath>\program\soffice.exe";
@@ -273,7 +273,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "INSTALLLOCATION";
Value = "[INSTALLLOCATION]";
@@ -318,7 +318,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[INSTALLLOCATION]";
@@ -345,7 +345,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[INSTALLLOCATION]Basis\\";
@@ -354,7 +354,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[INSTALLLOCATION]Basis\\";
@@ -381,7 +381,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[INSTALLLOCATION]URE\\";
@@ -390,7 +390,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[INSTALLLOCATION]URE\\";
@@ -513,14 +513,14 @@ End
RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+ Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
ModuleID = gid_Module_Root;
Value = "<progpath>\program";
End
RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+ Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
ModuleID = gid_Module_Root;
Name = "%PRODUCTNAME %PRODUCTVERSION";
Value = "<progpath>\program";
Modified: openoffice/branches/alg/clibboard/main/scp2/source/ooo/registryitem_ooo.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/source/ooo/registryitem_ooo.ulf?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/source/ooo/registryitem_ooo.ulf (original)
+++ openoffice/branches/alg/clibboard/main/scp2/source/ooo/registryitem_ooo.ulf Thu Jan 17 11:06:13 2013
@@ -28,10 +28,10 @@ en-US = "&New"
en-US = "&Install"
[STR_REG_VAL_SO60_CONFIGFILE]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
+en-US = "OpenOffice.org 1.1 Configuration File"
[STR_REG_VAL_SO50_TEMPLATE_OOO]
en-US = "StarOffice 5.0 Template"
[STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
-en-US = "OpenOffice.org"
+en-US = "office productivity suite based on Apache OpenOffice project"
Modified: openoffice/branches/alg/clibboard/main/scp2/source/ooo/ure.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/source/ooo/ure.scp?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/source/ooo/ure.scp (original)
+++ openoffice/branches/alg/clibboard/main/scp2/source/ooo/ure.scp Thu Jan 17 11:06:13 2013
@@ -1316,7 +1316,7 @@ End
RegistryItem gid_Regitem_Path
ModuleID = gid_Module_Root;
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
+ Subkey = "Software\Apache OpenOffice\%PRODUCTNAME";
Name = "Path";
Value = "[INSTALLLOCATION]";
End
Modified: openoffice/branches/alg/clibboard/main/scp2/source/ooo/ure_standalone.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/source/ooo/ure_standalone.scp?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/source/ooo/ure_standalone.scp (original)
+++ openoffice/branches/alg/clibboard/main/scp2/source/ooo/ure_standalone.scp Thu Jan 17 11:06:13 2013
@@ -38,9 +38,9 @@ End
Directory gid_Dir_Ooo_Openofficeorg
ParentID = PREDEFINED_PROGDIR;
#ifdef WNT
- HostName = "OpenOffice.org";
+ HostName = "Apache OpenOffice";
#else
- HostName = "openoffice.org";
+ HostName = "apacheopenoffice";
#endif
Styles = (ISINSTALLLOCATION);
End
Modified: openoffice/branches/alg/clibboard/main/scp2/source/quickstart/registryitem_quickstart.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/source/quickstart/registryitem_quickstart.scp?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/source/quickstart/registryitem_quickstart.scp (original)
+++ openoffice/branches/alg/clibboard/main/scp2/source/quickstart/registryitem_quickstart.scp Thu Jan 17 11:06:13 2013
@@ -25,7 +25,7 @@
RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org";
+ Subkey = "Software\Apache OpenOffice";
ModuleID = gid_Module_Optional_Quickstart;
Name = "QuickStarterInstalled";
Value = "1";
Modified: openoffice/branches/alg/clibboard/main/scp2/source/sdkoo/sdkoo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/source/sdkoo/sdkoo.scp?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/source/sdkoo/sdkoo.scp (original)
+++ openoffice/branches/alg/clibboard/main/scp2/source/sdkoo/sdkoo.scp Thu Jan 17 11:06:13 2013
@@ -53,22 +53,14 @@ End
#ifndef WNT
Directory gid_Dir_Ooo_Openofficeorg_Sdk
ParentID = PREDEFINED_PROGDIR;
- #ifdef WNT
- HostName = "${BASISROOTNAME}";
- #else
HostName = "${UNIXBASISROOTNAME}";
- #endif
End
#endif
#ifndef WNT
Directory gid_Dir_Ooo_Basis_Sdk
ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
- #ifdef WNT
- HostName = "Basis ${OOOBASEVERSION}";
- #else
HostName = "basis${OOOBASEVERSION}";
- #endif
Styles = (BASISDIRECTORY);
End
#endif
@@ -78,8 +70,7 @@ End
Directory gid_Dir_Basis_Sdk
#if defined MACOSX
ParentID = PREDEFINED_PROGDIR;
- // DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
- DosName = "OpenOffice.org_SDK";
+ DosName = "Apache_OpenOffice_SDK";
#else
#if defined WNT
ParentID = gid_Dir_Sdkoo_Root;
Modified: openoffice/branches/alg/clibboard/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp (original)
+++ openoffice/branches/alg/clibboard/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp Thu Jan 17 11:06:13 2013
@@ -77,8 +77,8 @@ RegistryItem gid_Regitem_Folder_shellex_
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 = "Apache OpenOffice Column Handler";
+ Val64 = "Apache OpenOffice Column Handler";
End
RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
@@ -108,8 +108,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_
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
Value = "OpenDocument Format Filter";
Val64 = "OpenDocument Format Filter";
@@ -138,8 +136,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_
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
Value = "OpenDocument Format Persistent Handler";
Val64 = "OpenDocument Format Persistent Handler";
Modified: openoffice/branches/alg/clibboard/main/scp2/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/scp2/util/makefile.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/scp2/util/makefile.mk (original)
+++ openoffice/branches/alg/clibboard/main/scp2/util/makefile.mk Thu Jan 17 11:06:13 2013
@@ -187,7 +187,7 @@ SCP1FILES += \
.ENDIF
# ------------------------------------------------------------------------
-# OpenOffice.org with JRE
+# Apache OpenOffice with JRE
SCP2LINK_PRODUCT_TYPE=osl
SCP2TARGET = setup_osljre