You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/01/10 11:10:59 UTC
svn commit: r1431253 [4/4] - in /openoffice/trunk/main:
cli_ure/source/basetypes/ cli_ure/source/native/ cli_ure/source/ure/
cli_ure/unotypes/ cppuhelper/source/ desktop/util/
desktop/win32/source/applauncher/ooo/ filter/source/config/cache/
filter/sou...
Modified: openoffice/trunk/main/vcl/source/window/toolbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/window/toolbox.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/window/toolbox.cxx (original)
+++ openoffice/trunk/main/vcl/source/window/toolbox.cxx Thu Jan 10 10:10:56 2013
@@ -6302,7 +6302,7 @@ void ToolBox::ImplDisableFlatButtons()
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
- "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+ "Software\\Apache OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType = 0;
Modified: openoffice/trunk/main/xmerge/source/activesync/XMergeFilter.cpp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/activesync/XMergeFilter.cpp?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/activesync/XMergeFilter.cpp (original)
+++ openoffice/trunk/main/xmerge/source/activesync/XMergeFilter.cpp Thu Jan 10 10:10:56 2013
@@ -38,8 +38,8 @@
const LPTSTR CXMergeFilter::m_pszPSWExportCLSID = _T("{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}");
const LPTSTR CXMergeFilter::m_pszPSWExportExt = _T("sxw");
-const LPTSTR CXMergeFilter::m_pszPSWExportDesc = _T("OpenOffice.org Writer XML Document");
-const LPTSTR CXMergeFilter::m_pszPSWExportShortDesc = _T("OpenOffice.org Writer");
+const LPTSTR CXMergeFilter::m_pszPSWExportDesc = _T("OpenOffice.org XML Writer Document");
+const LPTSTR CXMergeFilter::m_pszPSWExportShortDesc = _T("OpenOffice.org XML Writer");
const LPTSTR CXMergeFilter::m_pszPSWImportCLSID = _T("{CB43F086-838D-4FA4-B5F6-3406B9A57439}");
const LPTSTR CXMergeFilter::m_pszPSWImportExt = _T("psw");
@@ -48,8 +48,8 @@ const LPTSTR CXMergeFilter::m_pszPSWImpo
const LPTSTR CXMergeFilter::m_pszPXLExportCLSID = _T("{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}");
const LPTSTR CXMergeFilter::m_pszPXLExportExt = _T("sxc");
-const LPTSTR CXMergeFilter::m_pszPXLExportDesc = _T("OpenOffice.org Calc XML Document");
-const LPTSTR CXMergeFilter::m_pszPXLExportShortDesc = _T("OpenOffice.org Calc");
+const LPTSTR CXMergeFilter::m_pszPXLExportDesc = _T("OpenOffice.org XML Calc Document");
+const LPTSTR CXMergeFilter::m_pszPXLExportShortDesc = _T("OpenOffice.org XML Calc");
const LPTSTR CXMergeFilter::m_pszPXLImportCLSID = _T("{43887C67-4D5D-4127-BAAC-87A288494C7C}");
const LPTSTR CXMergeFilter::m_pszPXLImportExt = _T("pxl");
@@ -237,7 +237,7 @@ STDMETHODIMP CXMergeFilter::NextConvertF
}
}
- // Get the StarOffice/OpenOffice class directory
+ // Get the Apache OpenOffice class directory
if (m_szClasspath == NULL)
{
m_szClasspath = GetXMergeClassPath();
Modified: openoffice/trunk/main/xmerge/source/aportisdoc/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/aportisdoc/converter.xml?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/aportisdoc/converter.xml (original)
+++ openoffice/trunk/main/xmerge/source/aportisdoc/converter.xml Thu Jan 10 10:10:56 2013
@@ -29,7 +29,7 @@
<converter-description>
StarWriter XML to/from AportisDoc conversion
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/trunk/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html (original)
+++ openoffice/trunk/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html Thu Jan 10 10:10:56 2013
@@ -163,7 +163,7 @@ then passed back to the client via the <
<tt><text:change*></tt> [Not implemented yet]</p>
<p>Change tracking elements are not supported yet on the current
- OpenOffice XML filters, will have to watch out on this. The text
+ OpenOffice.org XML filters, will have to watch out on this. The text
within these elements have to be interpreted properly during the
conversion process.</p>
</li>
Modified: openoffice/trunk/main/xmerge/source/htmlsoff/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/htmlsoff/converter.xml?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/htmlsoff/converter.xml (original)
+++ openoffice/trunk/main/xmerge/source/htmlsoff/converter.xml Thu Jan 10 10:10:56 2013
@@ -30,7 +30,7 @@
<converter-description>
Converter which performs xslt transformations
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/trunk/main/xmerge/source/htmlsoff/package.html
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/htmlsoff/package.html?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/htmlsoff/package.html (original)
+++ openoffice/trunk/main/xmerge/source/htmlsoff/package.html Thu Jan 10 10:10:56 2013
@@ -38,8 +38,8 @@ Transformation</B></FONT></FONT></P>
of one or more XSLT style sheets, which are used in the
DocumentSerializer and DocumentDeserializer, to perform the actual
translations. The location of these stylesheets is extracted from the {@link org.openoffice.xmerge.util.registry.ConverterInfo ConverterInfo} data structure, and are specified using the optional converter-xslt-serialize and converter-xsltdeserialize tags in a plugins converter.xml file. Please refer to the SDK document for more information about how to implement a Plugin Configuration XML File for a specific plugin.
-A sample OpenOffice to Html stylesheet and Html to
-Openffice stylesheet, has been provided as a sample implementation.
+A sample OpenOffice.org XML to Html stylesheet and Html to
+Openffice.org XML stylesheet, has been provided as a sample implementation.
The converter also makes use of an XsltPlugin.properties file, which may be edited by the user to provide MIME-TYPE to file extension mappings. This file is used by the {@link org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl getDeviceFileExtension} method.
</p>
Modified: openoffice/trunk/main/xmerge/source/minicalc/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/minicalc/converter.xml?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/minicalc/converter.xml (original)
+++ openoffice/trunk/main/xmerge/source/minicalc/converter.xml Thu Jan 10 10:10:56 2013
@@ -29,7 +29,7 @@
<converter-description>
StarCalc XML to/from Minicalc 6.4 conversion
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.sxc.minicalc.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/trunk/main/xmerge/source/pexcel/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pexcel/converter.xml?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/pexcel/converter.xml (original)
+++ openoffice/trunk/main/xmerge/source/pexcel/converter.xml Thu Jan 10 10:10:56 2013
@@ -29,7 +29,7 @@
<converter-description>
StarCalc XML to/from Pocket Excel 2.0 conversion
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.sxc.pexcel.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/trunk/main/xmerge/source/pocketword/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pocketword/converter.xml?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/pocketword/converter.xml (original)
+++ openoffice/trunk/main/xmerge/source/pocketword/converter.xml Thu Jan 10 10:10:56 2013
@@ -30,10 +30,10 @@
Pocket Word
</converter-display-name>
<converter-description>
- OpenOffice Writer XML to/from Pocket Word conversion.
+ OpenOffice.org XML Writer to/from Pocket Word conversion.
</converter-description>
<converter-vendor>
- OpenOffice.org
+ Apache OpenOffice
</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl
Modified: openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java (original)
+++ openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java Thu Jan 10 10:10:56 2013
@@ -53,7 +53,7 @@ import org.w3c.dom.Element;
* org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl
* PluginFactoryImpl}.</p>
*
- * <p>This converts a Pocket Word file to an OpenOffice Writer XML DOM.</p>
+ * <p>This converts a Pocket Word file to an OpenOffice.org XML Writer DOM.</p>
*
* @author Mark Murnane
* @version 1.1
@@ -94,7 +94,7 @@ public final class DocumentDeserializerI
/**
* <p>Convert the data passed into the <code>DocumentDeserializer</code>
- * constructor into the OpenOffice Writer <code>Document</code>
+ * constructor into the OpenOffice.org XML Writer <code>Document</code>
* format.</p>
*
* <p>This method may or may not be thread-safe. It is expected
@@ -120,7 +120,7 @@ public final class DocumentDeserializerI
}
catch (Exception e) {
e.printStackTrace();
- throw new ConvertException("Error building OpenOffice Writer DOM: "
+ throw new ConvertException("Error building OpenOffice.org XML Writer DOM: "
+ e.toString());
}
Modified: openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java (original)
+++ openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java Thu Jan 10 10:10:56 2013
@@ -48,7 +48,7 @@ import java.io.IOException;
* org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl
* PluginFactoryImpl}.</p>
*
- * <p>This converts an OpenOffice Writer XML files to a Pocket Word file<.</p>
+ * <p>This converts an OpenOffice.org XML Writer files to a Pocket Word file<.</p>
*
* @author Mark Murnane
* @version 1.1
Modified: openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java (original)
+++ openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java Thu Jan 10 10:10:56 2013
@@ -69,7 +69,7 @@ public final class PluginFactoryImpl ext
/**
* <p>The <code>DocumentSerializer</code> is used to convert
- * from the OpenOffice Writer <code>Document</code> format
+ * from the OpenOffice.org XML Writer <code>Document</code> format
* to the Pocket Word <code>Document</code> format.</p>
*
* <p>The <code>ConvertData</code> object is passed along to the
@@ -92,7 +92,7 @@ public final class PluginFactoryImpl ext
/**
* The <code>DocumentDeserializer</code> is used to convert
* from the Pocket Word <code>Document</code> format to
- * the OpenOffice Writer <code>Document</code> format.</p>
+ * the OpenOffice.org XML Writer <code>Document</code> format.</p>
*
* The <code>ConvertData</code> object is passed along to the
* created <code>DocumentDeserializer</code> via its constructor.
Modified: openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java (original)
+++ openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java Thu Jan 10 10:10:56 2013
@@ -41,7 +41,7 @@ import java.util.Vector;
* <p>Class representing a Pocket Word Document.</p>
*
* <p><code>PocketWordDocument</code> is used to create new Pocket Word documents
- * and to read existing data to allow for conversion to OpenOffice Writer
+ * and to read existing data to allow for conversion to OpenOffice.org XML Writer
* format.</p>
*
* @author Mark Murnane
Modified: openoffice/trunk/main/xmerge/source/wordsmith/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/wordsmith/converter.xml?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/wordsmith/converter.xml (original)
+++ openoffice/trunk/main/xmerge/source/wordsmith/converter.xml Thu Jan 10 10:10:56 2013
@@ -27,7 +27,7 @@
<converter-description>
StarWriter XML to/from WordSmith conversion
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.sxw.wordsmith.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/trunk/main/xmerge/source/xmerge/build.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/xmerge/build.xml?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/xmerge/build.xml (original)
+++ openoffice/trunk/main/xmerge/source/xmerge/build.xml Thu Jan 10 10:10:56 2013
@@ -64,8 +64,8 @@
includes="**/*.properties" />
<manifest>
<attribute name="Main-Class" value="org.openoffice.xmerge.test.Driver"/>
- <attribute name="Specification-Title" value="OpenOffice XMerge Framework"/>
- <attribute name="Specification-Vendor" value="OpenOffice.org"/>
+ <attribute name="Specification-Title" value="Apache OpenOffice XMerge Framework"/>
+ <attribute name="Specification-Vendor" value="Apache OpenOffice"/>
<attribute name="Specification-Version" value="0.6.0"/>
<attribute name="Implementation-Version" value="#IMPL-VERSION#"/>
<attribute name="Class-Path" value="xml-apis.jar xercesImpl.jar serializer.jar"/>
Modified: openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java (original)
+++ openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java Thu Jan 10 10:10:56 2013
@@ -369,7 +369,7 @@ public class DOMDocument
/**
* <p>Creates a new DOM <code>Document</code> containing minimum
- * OpenOffice XML tags.</p>
+ * OpenOffice.org XML tags.</p>
*
* <p>This method uses the subclass
* <code>getOfficeClassAttribute</code> method to get the
Modified: openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java (original)
+++ openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java Thu Jan 10 10:10:56 2013
@@ -1022,7 +1022,7 @@ public abstract class OfficeDocument
/**
* <p>Creates a new DOM <code>Document</code> containing minimum
- * OpenOffice XML tags.</p>
+ * OpenOffice.org XML tags.</p>
*
* <p>This method uses the subclass
* <code>getOfficeClassAttribute</code> method to get the
@@ -1061,7 +1061,7 @@ public abstract class OfficeDocument
/**
* <p>Creates a new DOM <code>Document</code> containing minimum
- * OpenOffice XML tags.</p>
+ * OpenOffice.org XML tags.</p>
*
* <p>This method uses the subclass
* <code>getOfficeClassAttribute</code> method to get the
Modified: openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java (original)
+++ openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java Thu Jan 10 10:10:56 2013
@@ -43,7 +43,7 @@ public class OfficeUtil implements Offic
/**
* <p>Method to replace whitespace character within text with appropriate
- * OpenOffice tags.</p>
+ * OpenOffice.org XML tags.</p>
*
* @param text The text to parse for whitespace.
*
Modified: openoffice/trunk/main/xmerge/util/build.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/util/build.xml?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/util/build.xml (original)
+++ openoffice/trunk/main/xmerge/util/build.xml Thu Jan 10 10:10:56 2013
@@ -53,8 +53,8 @@
nodeprecated="true"
nodeprecatedlist="true"
use="true"
- Doctitle="OpenOffice XMerge API"
- windowtitle="OpenOffice XMerge API"
+ Doctitle="Apache OpenOffice XMerge API"
+ windowtitle="Apache OpenOffice XMerge API"
classpathref="classpath">
<fileset dir="../source/bridge" defaultexcludes="yes">
<include name="**/*.java"/>
Modified: openoffice/trunk/main/xmerge/util/xmerge.mf
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/util/xmerge.mf?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmerge/util/xmerge.mf (original)
+++ openoffice/trunk/main/xmerge/util/xmerge.mf Thu Jan 10 10:10:56 2013
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Main-Class: org.openoffice.xmerge.test.Driver
Class-Path: xml-apis.jar xercesImpl.jar serializer.jar
-Specification-Title: OpenOffice XMerge Framework
-Specification-Vendor: OpenOffice.org
+Specification-Title: Apache OpenOffice XMerge Framework
+Specification-Vendor: Apache OpenOffice
Specification-Version: 0.6.0
Implementation-Version: #IMPL-VERSION#
Modified: openoffice/trunk/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src (original)
+++ openoffice/trunk/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src Thu Jan 10 10:10:56 2013
@@ -200,7 +200,7 @@ ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT
Buttons = WB_OK ;
DefButton = WB_DEF_OK ;
Message [ en-US ] =
- "This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. "
+ "This document contains signatures in ODF 1.1 format. "
"Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. "
"Thus no signatures can be added or removed to this document.\n\n"
"Save document in ODF 1.2 format and add all desired signatures again.";
Modified: openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx (original)
+++ openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx Thu Jan 10 10:10:56 2013
@@ -87,7 +87,7 @@ using ::rtl::OString;
#define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.NSSInitializer_NssImpl"
-#define ROOT_CERTS "Root Certs for OpenOffice.org"
+#define ROOT_CERTS "Root Certs for Apache OpenOffice"
extern "C" void nsscrypto_finalize();