You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/02/01 09:46:35 UTC
svn commit: r1441343 [13/35] - in /openoffice/branches/ia2: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/
extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/
extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Modified: openoffice/branches/ia2/main/extras/source/palettes/standard.sog
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/palettes/standard.sog?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extras/source/palettes/standard.sog (original)
+++ openoffice/branches/ia2/main/extras/source/palettes/standard.sog Fri Feb 1 08:46:00 2013
@@ -1,19 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<office:gradient-table xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script">
- <draw:gradient draw:name="Gradient 1" draw:style="linear" draw:start-color="#000000" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
- <draw:gradient draw:name="Gradient 2" draw:style="axial" draw:start-color="#000080" draw:end-color="#800000" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300" draw:border="10%"/>
- <draw:gradient draw:name="Gradient 3" draw:style="radial" draw:cx="30%" draw:cy="30%" draw:start-color="#800000" draw:end-color="#ffff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="20%"/>
- <draw:gradient draw:name="Gradient 4" draw:style="ellipsoid" draw:cx="40%" draw:cy="40%" draw:start-color="#ffff00" draw:end-color="#008000" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="900" draw:border="30%"/>
- <draw:gradient draw:name="Gradient 5" draw:style="square" draw:cx="50%" draw:cy="50%" draw:start-color="#008000" draw:end-color="#800080" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="1200" draw:border="40%"/>
- <draw:gradient draw:name="Gradient 6" draw:style="rectangular" draw:cx="60%" draw:cy="60%" draw:start-color="#800080" draw:end-color="#ffff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="1900" draw:border="50%"/>
- <draw:gradient draw:name="Linear blue/white" draw:style="linear" draw:start-color="#000080" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="0%"/>
- <draw:gradient draw:name="Radial green/black" draw:style="radial" draw:cx="35%" draw:cy="30%" draw:start-color="#008000" draw:end-color="#000000" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="30%"/>
- <draw:gradient draw:name="Rectangular red/white" draw:style="rectangular" draw:cx="50%" draw:cy="50%" draw:start-color="#ff0000" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="5%"/>
- <draw:gradient draw:name="Square yellow/white" draw:style="square" draw:cx="50%" draw:cy="50%" draw:start-color="#e6ff00" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="2700" draw:border="0%"/>
- <draw:gradient draw:name="Linear magenta/green" draw:style="linear" draw:start-color="#6b0094" draw:end-color="#00ff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="150" draw:border="25%"/>
- <draw:gradient draw:name="Linear yellow/brown" draw:style="linear" draw:start-color="#ffff66" draw:end-color="#996633" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="45%"/>
- <draw:gradient draw:name="Radial red/yellow" draw:style="radial" draw:cx="50%" draw:cy="50%" draw:start-color="#ff3333" draw:end-color="#e6ff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="0%"/>
- <draw:gradient draw:name="Ellipsoid blue grey/light blue" draw:style="ellipsoid" draw:cx="50%" draw:cy="50%" draw:start-color="#e6e6ff" draw:end-color="#0000ff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
- <draw:gradient draw:name="Axial light red/white" draw:style="axial" draw:start-color="#ff0000" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="50%"/>
+ <!-- #121511# new entries derived from Symphony, moved gray gradients to the front -->
+ <draw:gradient draw:name="Gray Gradient 1" draw:style="linear" draw:start-color="#1c1c1c" draw:end-color="#cccccc" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
+ <draw:gradient draw:name="Gray Gradient 2" draw:style="linear" draw:start-color="#eeeeee" draw:end-color="#999999" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="30%"/>
+ <draw:gradient draw:name="Gray Gradient 3" draw:style="linear" draw:start-color="#dddddd" draw:end-color="#808080" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
+ <draw:gradient draw:name="Yellow Gradient 1" draw:style="Radial" draw:cx="10%" draw:cy="10%" draw:start-color="#ffff66" draw:end-color="#ffffcc" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
+ <draw:gradient draw:name="Yellow Gradient 2" draw:style="Linear" draw:start-color="#ffff00" draw:end-color="#ccff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="900" draw:border="0%"/>
+ <draw:gradient draw:name="Yellow Gradient 3" draw:style="Linear" draw:start-color="#ffff66" draw:end-color="#ffcc00" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
+ <draw:gradient draw:name="Orange Gradient 1" draw:style="linear" draw:start-color="#ffcc00" draw:end-color="#ff6600" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="1800" draw:border="0%"/>
+ <draw:gradient draw:name="Orange Gradient 2" draw:style="Radial" draw:cx="30%" draw:cy="30%" draw:start-color="#ff6600" draw:end-color="#ffff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="5%"/>
+ <draw:gradient draw:name="Red Gradient 1" draw:style="Linear" draw:start-color="#ff3333" draw:end-color="#990000" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
+ <draw:gradient draw:name="Red Gradient 2" draw:style="Linear" draw:start-color="#ff0000" draw:end-color="#cc0000" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="900" draw:border="0%"/>
+ <draw:gradient draw:name="Pink Gradient" draw:style="square" draw:cx="50%" draw:cy="50%" draw:start-color="#ff00ff" draw:end-color="#ffccff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="1350" draw:border="15%"/>
+ <draw:gradient draw:name="Sky" draw:style="linear" draw:start-color="#990099" draw:end-color="#3333ff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="150" draw:border="0%"/>
+ <draw:gradient draw:name="Cyan Gradient" draw:style="radial" draw:start-color="#00cccc" draw:end-color="#99ffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
+ <draw:gradient draw:name="Blue Gradient 1" draw:style="radial" draw:cx="50%" draw:cy="85%" draw:start-color="#ccccff" draw:end-color="#9999ff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="1350" draw:border="0%"/>
+ <draw:gradient draw:name="Blue Gradient 2" draw:style="linear" draw:start-color="#3399ff" draw:end-color="#006699" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="900" draw:border="0%"/>
+ <draw:gradient draw:name="Blue Gradient 3" draw:style="linear" draw:start-color="#3333ff" draw:end-color="#333366" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
+ <draw:gradient draw:name="Purple Pipe" draw:style="axial" draw:start-color="#9933ff" draw:end-color="#9933ff" draw:start-intensity="100%" draw:end-intensity="20%" draw:angle="150" draw:border="0%"/>
+ <draw:gradient draw:name="Night" draw:style="linear" draw:start-color="#339999" draw:end-color="#660033" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300" draw:border="10%"/>
+ <draw:gradient draw:name="Green Gradient 1" draw:style="linear" draw:start-color="#00cc33" draw:end-color="#009933" draw:start-intensity="100%" draw:end-intensity="85%" draw:angle="0" draw:border="0%"/>
+ <draw:gradient draw:name="Green Gradient 2" draw:style="linear" draw:start-color="#99ff33" draw:end-color="#66cc00" draw:start-intensity="100%" draw:end-intensity="85%" draw:angle="900" draw:border="0%"/>
+ <draw:gradient draw:name="Green Gradient 3" draw:style="linear" draw:start-color="#ccff66" draw:end-color="#336600" draw:start-intensity="100%" draw:end-intensity="85%" draw:angle="900" draw:border="40%"/>
+
+ <!-- #121511# the old gradients (slightly reordered) -->
+ <!-- useful old gradients -->
+ <draw:gradient draw:name="Gradient 1" draw:style="linear" draw:start-color="#000000" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
+ <draw:gradient draw:name="Gradient 3" draw:style="radial" draw:cx="30%" draw:cy="30%" draw:start-color="#800000" draw:end-color="#ffff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="20%"/>
+ <draw:gradient draw:name="Linear blue/white" draw:style="linear" draw:start-color="#000080" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="0%"/>
+ <draw:gradient draw:name="Linear yellow/brown" draw:style="linear" draw:start-color="#ffff66" draw:end-color="#996633" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="45%"/>
+ <draw:gradient draw:name="Radial red/yellow" draw:style="radial" draw:cx="50%" draw:cy="50%" draw:start-color="#ff3333" draw:end-color="#e6ff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="0%"/>
+ <draw:gradient draw:name="Axial light red/white" draw:style="axial" draw:start-color="#ff0000" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="50%"/>
+
+ <!-- not so useful old gradients (candidates for removal) -->
+ <draw:gradient draw:name="Gradient 2" draw:style="axial" draw:start-color="#000080" draw:end-color="#800000" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300" draw:border="10%"/>
+ <draw:gradient draw:name="Gradient 4" draw:style="ellipsoid" draw:cx="40%" draw:cy="40%" draw:start-color="#ffff00" draw:end-color="#008000" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="900" draw:border="30%"/>
+ <draw:gradient draw:name="Gradient 5" draw:style="square" draw:cx="50%" draw:cy="50%" draw:start-color="#008000" draw:end-color="#800080" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="1200" draw:border="40%"/>
+ <draw:gradient draw:name="Gradient 6" draw:style="rectangular" draw:cx="60%" draw:cy="60%" draw:start-color="#800080" draw:end-color="#ffff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="1900" draw:border="50%"/>
+ <draw:gradient draw:name="Radial green/black" draw:style="radial" draw:cx="35%" draw:cy="30%" draw:start-color="#008000" draw:end-color="#000000" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="30%"/>
+ <draw:gradient draw:name="Rectangular red/white" draw:style="rectangular" draw:cx="50%" draw:cy="50%" draw:start-color="#ff0000" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="5%"/>
+ <draw:gradient draw:name="Square yellow/white" draw:style="square" draw:cx="50%" draw:cy="50%" draw:start-color="#e6ff00" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="2700" draw:border="0%"/>
+ <draw:gradient draw:name="Linear magenta/green" draw:style="linear" draw:start-color="#6b0094" draw:end-color="#00ff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="150" draw:border="25%"/>
+ <draw:gradient draw:name="Ellipsoid blue grey/light blue" draw:style="ellipsoid" draw:cx="50%" draw:cy="50%" draw:start-color="#e6e6ff" draw:end-color="#0000ff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
</office:gradient-table>
\ No newline at end of file
Modified: openoffice/branches/ia2/main/filter/qa/complex/filter/detection/typeDetection/Helper.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/qa/complex/filter/detection/typeDetection/Helper.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/qa/complex/filter/detection/typeDetection/Helper.java (original)
+++ openoffice/branches/ia2/main/filter/qa/complex/filter/detection/typeDetection/Helper.java Fri Feb 1 08:46:00 2013
@@ -309,7 +309,7 @@ public class Helper {
* @param propNames String Array of propertie names
* @param values Objecr Array of propertie values
* @return <code>PropertyValue[]<code>
- * @see com.sun.star.benas.PropertyValue
+ * @see com.sun.star.beans.PropertyValue
* @see com.sun.star.document.MediaDescriptor
*/
public PropertyValue[] createMediaDescriptor(String[] propNames, Object[] values) {
@@ -436,4 +436,4 @@ class FileAliasNotFoundException extends
public FileAliasNotFoundException(String fileAlias){
super("Could not get '"+fileAlias +"'");
}
-}
\ No newline at end of file
+}
Modified: openoffice/branches/ia2/main/filter/source/config/cache/constant.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/cache/constant.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/cache/constant.hxx (original)
+++ openoffice/branches/ia2/main/filter/source/config/cache/constant.hxx Fri Feb 1 08:46:00 2013
@@ -193,7 +193,7 @@ extern rtl::OUString pFilterStrings[];
/** @short some default values.
*/
#define DEFAULT_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("en-US")
-#define DEFAULT_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("OpenOffice")
+#define DEFAULT_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("OpenOffice.org XML")
#define DEFAULT_FORMATVERSION _FILTER_CONFIG_FROM_ASCII_("1.0")
/** @short used for the queries of the FilterFactory service.
Modified: openoffice/branches/ia2/main/filter/source/config/cache/filtercache.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/cache/filtercache.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/cache/filtercache.cxx (original)
+++ openoffice/branches/ia2/main/filter/source/config/cache/filtercache.cxx Fri Feb 1 08:46:00 2013
@@ -120,8 +120,9 @@ FilterCache* FilterCache::clone() const
pClone->m_lURLPattern2Types = m_lURLPattern2Types;
pClone->m_sActLocale = m_sActLocale;
- pClone->m_sFormatName = m_sFormatName;
- pClone->m_sFormatVersion = m_sFormatVersion;
+ pClone->m_sProductName = m_sProductName;
+ pClone->m_sOOoXMLFormatName = m_sOOoXMLFormatName;
+ pClone->m_sOOoXMLFormatVersion = m_sOOoXMLFormatVersion;
pClone->m_eFillState = m_eFillState;
@@ -178,8 +179,9 @@ void FilterCache::takeOver(const FilterC
m_lChangedContentHandlers.clear();
m_sActLocale = rClone.m_sActLocale;
- m_sFormatName = rClone.m_sFormatName;
- m_sFormatVersion = rClone.m_sFormatVersion;
+ m_sProductName = rClone.m_sProductName;
+ m_sOOoXMLFormatName = rClone.m_sOOoXMLFormatName;
+ m_sOOoXMLFormatVersion = rClone.m_sOOoXMLFormatVersion;
m_eFillState = rClone.m_eFillState;
@@ -242,21 +244,20 @@ void FilterCache::load(EFillState eRequi
m_sActLocale = DEFAULT_OFFICELOCALE;
}
- impl_getDirectCFGValue(CFGDIRECTKEY_FORMATNAME) >>= m_sFormatName;
- if (!m_sFormatName.getLength())
- impl_getDirectCFGValue(CFGDIRECTKEY_PRODUCTNAME) >>= m_sFormatName;
+ impl_getDirectCFGValue(CFGDIRECTKEY_PRODUCTNAME) >>= m_sProductName;
- if (!m_sFormatName.getLength())
+ impl_getDirectCFGValue(CFGDIRECTKEY_FORMATNAME) >>= m_sOOoXMLFormatName;
+ if (!m_sOOoXMLFormatName.getLength())
{
_FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format name => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATNAME));
- m_sFormatName = DEFAULT_FORMATNAME;
+ m_sOOoXMLFormatName = DEFAULT_FORMATNAME;
}
- impl_getDirectCFGValue(CFGDIRECTKEY_FORMATVERSION) >>= m_sFormatVersion;
- if (!m_sFormatVersion.getLength())
+ impl_getDirectCFGValue(CFGDIRECTKEY_FORMATVERSION) >>= m_sOOoXMLFormatVersion;
+ if (!m_sOOoXMLFormatVersion.getLength())
{
_FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format version => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATVERSION));
- m_sFormatVersion = DEFAULT_FORMATVERSION;
+ m_sOOoXMLFormatVersion = DEFAULT_FORMATVERSION;
}
// Support the old configuration support. Read it only one times during office runtime!
@@ -1663,13 +1664,15 @@ void FilterCache::impl_readPatchUINames(
CacheItem& rItem)
throw(css::uno::Exception)
{
- static ::rtl::OUString FORMATNAME_VAR = ::rtl::OUString::createFromAscii("%productname%" );
- static ::rtl::OUString FORMATVERSION_VAR = ::rtl::OUString::createFromAscii("%formatversion%");
+ static ::rtl::OUString PRODUCTNAME_VAR = ::rtl::OUString::createFromAscii("%productname%");
+ static ::rtl::OUString FORMATNAME_VAR = ::rtl::OUString::createFromAscii("%oooxmlformatname%" );
+ static ::rtl::OUString FORMATVERSION_VAR = ::rtl::OUString::createFromAscii("%oooxmlformatversion%");
// SAFE -> ----------------------------------
::osl::ResettableMutexGuard aLock(m_aLock);
- ::rtl::OUString sFormatName = m_sFormatName ;
- ::rtl::OUString sFormatVersion = m_sFormatVersion;
+ ::rtl::OUString sProductName = m_sProductName;
+ ::rtl::OUString sFormatName = m_sOOoXMLFormatName;
+ ::rtl::OUString sFormatVersion = m_sOOoXMLFormatVersion;
::rtl::OUString sActLocale = m_sActLocale ;
aLock.clear();
// <- SAFE ----------------------------------
@@ -1683,7 +1686,7 @@ void FilterCache::impl_readPatchUINames(
::comphelper::SequenceAsVector< ::rtl::OUString >::const_iterator pLocale ;
::comphelper::SequenceAsHashMap lUINames;
- // patch %PRODUCTNAME and %FORMATNAME
+ // patch %productname%, %oooxmlformatname% and %oooxmlformatversion%
for ( pLocale = lLocales.begin();
pLocale != lLocales.end() ;
++pLocale )
@@ -1694,13 +1697,20 @@ void FilterCache::impl_readPatchUINames(
xUIName->getByName(sLocale) >>= sValue;
// replace %productname%
- sal_Int32 nIndex = sValue.indexOf(FORMATNAME_VAR);
+ sal_Int32 nIndex = sValue.indexOf(PRODUCTNAME_VAR);
+ while(nIndex != -1)
+ {
+ sValue = sValue.replaceAt(nIndex, PRODUCTNAME_VAR.getLength(), sProductName);
+ nIndex = sValue.indexOf(PRODUCTNAME_VAR, nIndex);
+ }
+ // replace %oooxmlformatname%
+ nIndex = sValue.indexOf(FORMATNAME_VAR);
while(nIndex != -1)
{
sValue = sValue.replaceAt(nIndex, FORMATNAME_VAR.getLength(), sFormatName);
nIndex = sValue.indexOf(FORMATNAME_VAR, nIndex);
}
- // replace %formatversion%
+ // replace %oooxmlformatversion%
nIndex = sValue.indexOf(FORMATVERSION_VAR);
while(nIndex != -1)
{
Modified: openoffice/branches/ia2/main/filter/source/config/cache/filtercache.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/cache/filtercache.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/cache/filtercache.hxx (original)
+++ openoffice/branches/ia2/main/filter/source/config/cache/filtercache.hxx Fri Feb 1 08:46:00 2013
@@ -236,13 +236,15 @@ class FilterCache : public BaseLock
used to work with localized configuration values. */
::rtl::OUString m_sActLocale;
+ ::rtl::OUString m_sProductName;
+
//---------------------------------------
/** TODO */
- ::rtl::OUString m_sFormatName;
+ ::rtl::OUString m_sOOoXMLFormatName;
//---------------------------------------
/** TODO */
- ::rtl::OUString m_sFormatVersion;
+ ::rtl::OUString m_sOOoXMLFormatVersion;
//---------------------------------------
/** @short contains status, which cache items/properties
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Calc)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Spreadsheet</value>
- <value xml:lang="x-translate">%productname% %formatversion% Spreadsheet</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Spreadsheet</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Spreadsheet</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Chart)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Chart</value>
- <value xml:lang="x-translate">%productname% %formatversion% Chart</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Chart</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Chart</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Draw)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Drawing</value>
- <value xml:lang="x-translate">%productname% %formatversion% Drawing</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Impress)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Presentation</value>
- <value xml:lang="x-translate">%productname% %formatversion% Presentation</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Presentation</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Presentation</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Math)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Formula</value>
- <value xml:lang="x-translate">%productname% %formatversion% Formula</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Formula</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Formula</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="StarOffice XML (Writer)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document</value>
- <value xml:lang="x-translate">%productname% %formatversion% Text Document</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="calc_StarOffice_XML_Calc_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Spreadsheet Template</value>
- <value xml:lang="x-translate">%productname% %formatversion% Spreadsheet Template</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Spreadsheet Template</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Spreadsheet Template</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="draw_StarOffice_XML_Draw_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Drawing Template</value>
- <value xml:lang="x-translate">%productname% %formatversion% Drawing Template</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing Template</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing Template</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="impress_StarOffice_XML_Draw">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Drawing (%productname% Impress)</value>
- <value xml:lang="x-translate">%productname% %formatversion% Drawing (%productname% Impress)</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing (%productname% Impress)</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing (%productname% Impress)</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="impress_StarOffice_XML_Impress_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Presentation Template</value>
- <value xml:lang="x-translate">%productname% %formatversion% Presentation Template</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Presentation Template</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Presentation Template</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="writer_StarOffice_XML_Writer_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document Template</value>
- <value xml:lang="x-translate">%productname% %formatversion% Text Document Template</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document Template</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document Template</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="writer_globaldocument_StarOffice_XML_Writer_GlobalDocument">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Master Document</value>
- <value xml:lang="x-translate">%productname% %formatversion% Master Document</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Master Document</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Master Document</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="writer_globaldocument_StarOffice_XML_Writer">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document</value>
- <value xml:lang="x-translate">%productname% %formatversion% Text Document</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="writer_web_StarOffice_XML_Writer_Web_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% HTML Template</value>
- <value xml:lang="x-translate">%productname% %formatversion% HTML Template</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% HTML Template</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% HTML Template</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
<node oor:name="writer_web_StarOffice_XML_Writer">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document (%productname% Writer/Web)</value>
- <value xml:lang="x-translate">%productname% %formatversion% Text Document (%productname% Writer/Web)</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document (%productname% Writer/Web)</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document (%productname% Writer/Web)</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu Fri Feb 1 08:46:00 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Draw)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Zeichnung</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Zeichnung</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Draw 6.0</value></prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu Fri Feb 1 08:46:00 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Impress)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Präsentation</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Präsentation</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Impress 6.0</value></prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu Fri Feb 1 08:46:00 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Math)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Formel</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Formel</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Math 6.0</value></prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu Fri Feb 1 08:46:00 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>Lotus 1-2-3 1.0 (DOS) (StarWriter)</value></prop>
<prop oor:name="UIName">
- <value>Lotus 1-2-3 1.0 (DOS) (%productname% %formatversion% Writer)</value>
+ <value>Lotus 1-2-3 1.0 (DOS) (%productname% Writer)</value>
</prop>
<prop oor:name="ClipboardFormat"/>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu Fri Feb 1 08:46:00 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>Lotus 1-2-3 1.0 (WIN) (StarWriter)</value></prop>
<prop oor:name="UIName">
- <value>Lotus 1-2-3 1.0 (WIN) (%productname% %formatversion% Writer)</value>
+ <value>Lotus 1-2-3 1.0 (WIN) (%productname% Writer)</value>
</prop>
<prop oor:name="ClipboardFormat"/>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu Fri Feb 1 08:46:00 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Writer)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Textdokument</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Textdokument</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Writer 6.0</value></prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu Fri Feb 1 08:46:00 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarWriter 3.0</value></prop>
<prop oor:name="UIName">
- <value>StarWriter 3.0 (%productname% %formatversion% Globaldokument)</value>
+ <value>StarWriter 3.0 (%productname% Globaldokument)</value>
</prop>
<prop oor:name="ClipboardFormat"><value>StarWriter 3.0</value></prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu Fri Feb 1 08:46:00 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarWriter 4.0</value></prop>
<prop oor:name="UIName">
- <value>StarWriter 4.0 (%productname% %formatversion% Globaldokument)</value>
+ <value>StarWriter 4.0 (%productname% Globaldokument)</value>
</prop>
<prop oor:name="ClipboardFormat"><value>StarWriter 4.0</value></prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu Fri Feb 1 08:46:00 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarWriter 5.0</value></prop>
<prop oor:name="UIName">
- <value>StarWriter 5.0 (%productname% %formatversion% Globaldokument)</value>
+ <value>StarWriter 5.0 (%productname% Globaldokument)</value>
</prop>
<prop oor:name="ClipboardFormat"><value>StarWriter 5.0</value></prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/graphicfilter/eos2met/eos2met.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/graphicfilter/eos2met/eos2met.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/graphicfilter/eos2met/eos2met.cxx (original)
+++ openoffice/branches/ia2/main/filter/source/graphicfilter/eos2met/eos2met.cxx Fri Feb 1 08:46:00 2013
@@ -19,13 +19,10 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_filter.hxx"
#include <svtools/fltcall.hxx>
-
#include <math.h>
#include <tools/stream.hxx>
#include <tools/bigint.hxx>
@@ -42,6 +39,7 @@
#include <vcl/msgbox.hxx>
#include <svl/solar.hrc>
#include <vcl/gdimetafiletools.hxx>
+#include <vcl/dibtools.hxx>
// -----------------------------Feld-Typen-------------------------------
@@ -569,7 +567,7 @@ void METWriter::WriteImageObject(const B
WriteFieldId(nActBitmapId);
// Windows-BMP-Datei erzeugen:
- aTemp << rBitmap;
+ WriteDIB(rBitmap, aTemp, false, true);
// Header der Windows-BMP-Datei einlesen:
aTemp.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
Modified: openoffice/branches/ia2/main/filter/source/graphicfilter/ios2met/ios2met.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/graphicfilter/ios2met/ios2met.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/graphicfilter/ios2met/ios2met.cxx (original)
+++ openoffice/branches/ia2/main/filter/source/graphicfilter/ios2met/ios2met.cxx Fri Feb 1 08:46:00 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_filter.hxx"
@@ -29,7 +27,7 @@
#include <vcl/virdev.hxx>
#include <vcl/lineinfo.hxx>
#include <svtools/fltcall.hxx>
-
+#include <vcl/dibtools.hxx>
#include <math.h>
// MT: NOOLDSV, someone should change the code...
@@ -2392,7 +2390,7 @@ void OS2METReader::ReadField(sal_uInt16
}
pBitmapList->pBMP->Seek(0);
- pBitmapList->aBitmap.Read( *( pBitmapList->pBMP ), sal_False );
+ ReadDIB(pBitmapList->aBitmap, *(pBitmapList->pBMP), false);
if (pBitmapList->pBMP->GetError()!=0) {
pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
Modified: openoffice/branches/ia2/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/msfilter/msdffimp.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/msfilter/msdffimp.cxx (original)
+++ openoffice/branches/ia2/main/filter/source/msfilter/msdffimp.cxx Fri Feb 1 08:46:00 2013
@@ -140,6 +140,7 @@ using namespace vos;
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/drawing/ProjectionMode.hpp>
#include "svx/EnhancedCustomShape2d.hxx"
+#include <vcl/dibtools.hxx>
using namespace ::com::sun::star ;
using namespace ::com::sun::star::drawing;
@@ -6650,7 +6651,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect(
if( ( nInst & 0xFFFE ) == 0x7A8 )
{ // DIBs direkt holen
Bitmap aNew;
- if( aNew.Read( *pGrStream, sal_False ) )
+ if( ReadDIB(aNew, *pGrStream, false) )
{
rData = Graphic( aNew );
nRes = GRFILTER_OK;
Modified: openoffice/branches/ia2/main/forms/source/component/Columns.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/forms/source/component/Columns.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/forms/source/component/Columns.cxx (original)
+++ openoffice/branches/ia2/main/forms/source/component/Columns.cxx Fri Feb 1 08:46:00 2013
@@ -116,7 +116,7 @@ sal_Int32 getColumnTypeByModelName(const
: aModelName.copy(aCompatibleModelPrefix.getLength());
const StringSequence& rColumnTypes = getColumnTypes();
- nTypeId = ::detail::findPos(aColumnType, rColumnTypes);
+ nTypeId = ::forms_detail::findPos(aColumnType, rColumnTypes);
}
return nTypeId;
}
Modified: openoffice/branches/ia2/main/forms/source/component/Grid.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/forms/source/component/Grid.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/forms/source/component/Grid.cxx (original)
+++ openoffice/branches/ia2/main/forms/source/component/Grid.cxx Fri Feb 1 08:46:00 2013
@@ -374,7 +374,7 @@ void OGridControlModel::removeSelectionC
Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const ::rtl::OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
const Sequence< ::rtl::OUString >& rColumnTypes = frm::getColumnTypes();
- return createColumn( detail::findPos( ColumnType, rColumnTypes ) );
+ return createColumn( forms_detail::findPos( ColumnType, rColumnTypes ) );
}
//------------------------------------------------------------------------------
Modified: openoffice/branches/ia2/main/forms/source/component/ImageControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/forms/source/component/ImageControl.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/forms/source/component/ImageControl.cxx (original)
+++ openoffice/branches/ia2/main/forms/source/component/ImageControl.cxx Fri Feb 1 08:46:00 2013
@@ -925,7 +925,7 @@ void OImageControlControl::mousePressed(
if ( impl_isEmptyGraphics_nothrow() )
xMenu->enableItem( ID_CLEAR_GRAPHICS, sal_False );
- awt::Rectangle aRect( e.X, e.Y, 0, 0 );
+ awt::Point aPos( e.X, e.Y );
if ( ( e.X < 0 ) || ( e.Y < 0 ) )
{ // context menu triggered by keyboard
// position it in the center of the control
@@ -935,12 +935,12 @@ void OImageControlControl::mousePressed(
if ( xWindow.is() )
{
awt::Rectangle aPosSize = xWindow->getPosSize();
- aRect.X = aPosSize.Width / 2;
- aRect.Y = aPosSize.Height / 2;
+ aPos.X = aPosSize.Width / 2;
+ aPos.Y = aPosSize.Height / 2;
}
}
- const sal_Int16 nResult = xMenu->execute( xWindowPeer, aRect, PopupMenuDirection::EXECUTE_DEFAULT );
+ const sal_Int16 nResult = xMenu->execute( xWindowPeer, aPos, PopupMenuDirection::EXECUTE_DEFAULT );
switch ( nResult )
{
Modified: openoffice/branches/ia2/main/forms/source/component/findpos.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/forms/source/component/findpos.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/forms/source/component/findpos.cxx (original)
+++ openoffice/branches/ia2/main/forms/source/component/findpos.cxx Fri Feb 1 08:46:00 2013
@@ -35,7 +35,7 @@
#include <algorithm>
-namespace detail {
+namespace forms_detail {
sal_Int32 findPos(
const ::rtl::OUString& aStr,
Modified: openoffice/branches/ia2/main/forms/source/component/findpos.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/forms/source/component/findpos.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/forms/source/component/findpos.hxx (original)
+++ openoffice/branches/ia2/main/forms/source/component/findpos.hxx Fri Feb 1 08:46:00 2013
@@ -30,7 +30,7 @@
namespace rtl { class OUString; }
-namespace detail {
+namespace forms_detail {
sal_Int32 findPos(
const ::rtl::OUString& aStr,
Modified: openoffice/branches/ia2/main/fpicker/source/office/iodlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/fpicker/source/office/iodlg.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/fpicker/source/office/iodlg.cxx (original)
+++ openoffice/branches/ia2/main/fpicker/source/office/iodlg.cxx Fri Feb 1 08:46:00 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_fpicker.hxx"
@@ -97,6 +95,7 @@
#include "fpinteraction.hxx"
#include <osl/process.h>
#include <comphelper/interaction.hxx>
+#include <vcl/dibtools.hxx>
#include <algorithm>
#include <functional>
@@ -3123,7 +3122,7 @@ void SvtFileDialog::setImage( sal_Int16
SvMemoryStream aData( aBmpSequence.getArray(),
aBmpSequence.getLength(),
STREAM_READ );
- aData >> aBmp;
+ ReadDIB(aBmp, aData, true);
_pPrevBmp->SetBitmap( aBmp );
}
Modified: openoffice/branches/ia2/main/framework/inc/classes/filtercachedata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/classes/filtercachedata.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/classes/filtercachedata.hxx (original)
+++ openoffice/branches/ia2/main/framework/inc/classes/filtercachedata.hxx Fri Feb 1 08:46:00 2013
@@ -84,12 +84,6 @@ namespace framework{
#define CFG_ENCODING_OPEN DECLARE_ASCII("[\'" ) /// used to start encoding of set names
#define CFG_ENCODING_CLOSE DECLARE_ASCII("\']" ) /// used to finish encoding of set names
-#define PRODUCTNAME_VARIABLE DECLARE_ASCII("%productname%")
-#define PRODUCTNAME_VARLENGTH 13
-#define PRODUCTNAME_FALLBACK DECLARE_ASCII("StarOffice" ) /// fallback, if configuration can't give us current set product name ...
-#define FORMATVERSION_VARIABLE DECLARE_ASCII("%formatversion%" )
-#define FORMATVERSION_VARLENGTH 15
-#define FORMATVERSION_FALLBACK DECLARE_ASCII("6.0/7" )
//*****************************************************************************************************************
// We know some default values ...
Modified: openoffice/branches/ia2/main/framework/inc/dispatch/mailtodispatcher.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/dispatch/mailtodispatcher.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/dispatch/mailtodispatcher.hxx (original)
+++ openoffice/branches/ia2/main/framework/inc/dispatch/mailtodispatcher.hxx Fri Feb 1 08:46:00 2013
@@ -93,15 +93,13 @@ class MailToDispatcher : // interfaces
{
/* member */
private:
-
- /// reference to global uno service manager which had created us
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
/* interface */
public:
// ctor/dtor
- MailToDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
+ MailToDispatcher( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~MailToDispatcher( );
// XInterface, XTypeProvider, XServiceInfo
Modified: openoffice/branches/ia2/main/framework/inc/dispatch/systemexec.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/dispatch/systemexec.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/dispatch/systemexec.hxx (original)
+++ openoffice/branches/ia2/main/framework/inc/dispatch/systemexec.hxx Fri Feb 1 08:46:00 2013
@@ -93,15 +93,13 @@ class SystemExec : // interfaces
{
/* member */
private:
-
- /// reference to global uno service manager which had created us
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
/* interface */
public:
// ctor/dtor
- SystemExec( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
+ SystemExec( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~SystemExec( );
// XInterface, XTypeProvider, XServiceInfo
Modified: openoffice/branches/ia2/main/framework/inc/framework/addonsoptions.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/framework/addonsoptions.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/framework/addonsoptions.hxx (original)
+++ openoffice/branches/ia2/main/framework/inc/framework/addonsoptions.hxx Fri Feb 1 08:46:00 2013
@@ -279,6 +279,13 @@ class FWE_DLLPUBLIC AddonsOptions
const ::rtl::OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
+ /**
+ * @short Gets the UI name of a single addon toolbar
+ * @return The UI name of the toolbar as specified in the Addons.xcu configuration
+ * @onerror Returns an empty string
+ */
+ const ::rtl::OUString GetAddonsToolbarUIName( sal_uInt32 nIndex ) const;
+
/*-****************************************************************************************************//**
@short Retrieves all available merge instructions for the Office menu bar
@descr -
Modified: openoffice/branches/ia2/main/framework/inc/pch/precompiled_framework.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/pch/precompiled_framework.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/pch/precompiled_framework.hxx (original)
+++ openoffice/branches/ia2/main/framework/inc/pch/precompiled_framework.hxx Fri Feb 1 08:46:00 2013
@@ -222,7 +222,7 @@
#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
#include "com/sun/star/sync2/BadPartnershipException.hpp"
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
-#include "com/sun/star/system/XSystemShellExecute.hpp"
+#include "com/sun/star/system/SystemShellExecute.hpp"
#include "com/sun/star/task/ErrorCodeRequest.hpp"
#include "com/sun/star/task/XAsyncJob.hpp"
#include "com/sun/star/task/XInteractionAbort.hpp"
Modified: openoffice/branches/ia2/main/framework/inc/services.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/services.h?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/services.h (original)
+++ openoffice/branches/ia2/main/framework/inc/services.h Fri Feb 1 08:46:00 2013
@@ -72,7 +72,6 @@ namespace framework{
#define SERVICENAME_JOB DECLARE_ASCII("com.sun.star.task.Job" )
#define SERVICENAME_DISPATCHRECORDERSUPPLIER DECLARE_ASCII("com.sun.star.frame.DispatchRecorderSupplier" )
#define SERVICENAME_DISPATCHRECORDER DECLARE_ASCII("com.sun.star.frame.DispatchRecorder" )
-#define SERVICENAME_SYSTEMSHELLEXECUTE DECLARE_ASCII("com.sun.star.system.SystemShellExecute" )
#define SERVICENAME_PROTOCOLHANDLER DECLARE_ASCII("com.sun.star.frame.ProtocolHandler" )
#define SERVICENAME_SUBSTITUTEPATHVARIABLES DECLARE_ASCII("com.sun.star.util.PathSubstitution" )
#define SERVICENAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.util.PathSettings" )
Modified: openoffice/branches/ia2/main/framework/inc/uielement/controlmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/uielement/controlmenucontroller.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/uielement/controlmenucontroller.hxx (original)
+++ openoffice/branches/ia2/main/framework/inc/uielement/controlmenucontroller.hxx Fri Feb 1 08:46:00 2013
@@ -77,7 +77,7 @@ namespace framework
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
// XMenuListener
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
Modified: openoffice/branches/ia2/main/framework/inc/uielement/fontmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/uielement/fontmenucontroller.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/uielement/fontmenucontroller.hxx (original)
+++ openoffice/branches/ia2/main/framework/inc/uielement/fontmenucontroller.hxx Fri Feb 1 08:46:00 2013
@@ -71,7 +71,7 @@ namespace framework
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
// XMenuListener
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
Modified: openoffice/branches/ia2/main/framework/inc/uielement/newmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/uielement/newmenucontroller.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/uielement/newmenucontroller.hxx (original)
+++ openoffice/branches/ia2/main/framework/inc/uielement/newmenucontroller.hxx Fri Feb 1 08:46:00 2013
@@ -86,8 +86,8 @@ namespace framework
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
// XMenuListener
- virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
Modified: openoffice/branches/ia2/main/framework/inc/uielement/recentfilesmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/uielement/recentfilesmenucontroller.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/uielement/recentfilesmenucontroller.hxx (original)
+++ openoffice/branches/ia2/main/framework/inc/uielement/recentfilesmenucontroller.hxx Fri Feb 1 08:46:00 2013
@@ -51,8 +51,8 @@ namespace framework
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
// XMenuListener
- virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XDispatchProvider
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException );
Modified: openoffice/branches/ia2/main/framework/inc/uielement/toolbarsmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/uielement/toolbarsmenucontroller.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/uielement/toolbarsmenucontroller.hxx (original)
+++ openoffice/branches/ia2/main/framework/inc/uielement/toolbarsmenucontroller.hxx Fri Feb 1 08:46:00 2013
@@ -81,8 +81,8 @@ namespace framework
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
// XMenuListener
- virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
Modified: openoffice/branches/ia2/main/framework/qa/complex/XUserInputInterception/EventTest.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/qa/complex/XUserInputInterception/EventTest.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/qa/complex/XUserInputInterception/EventTest.java (original)
+++ openoffice/branches/ia2/main/framework/qa/complex/XUserInputInterception/EventTest.java Fri Feb 1 08:46:00 2013
@@ -314,7 +314,7 @@ public class EventTest {
* <CODE>m_keyReleased</CODE> are <CODE>TRUE</CODE>
* @param xUII the XUserInputInterception
* @param xModel the XModel of a document
- * @see EventTest.MyKeyHander
+ * @see EventTest.MyKeyHandler
* @see EventTest.EventTrigger
*/
private void checkKeyListener(XUserInputInterception xUII, XModel xModel) {
@@ -620,4 +620,4 @@ public class EventTest {
private static final OfficeConnection connection = new OfficeConnection();
-}
\ No newline at end of file
+}
Modified: openoffice/branches/ia2/main/framework/qa/complex/api_internal/api.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/qa/complex/api_internal/api.lst?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/qa/complex/api_internal/api.lst (original)
+++ openoffice/branches/ia2/main/framework/qa/complex/api_internal/api.lst Fri Feb 1 08:46:00 2013
@@ -2,7 +2,6 @@ job1=cached.CachedContentResultSetFactor
job2=cached.CachedContentResultSetStubFactory
job3=cached.CachedDynamicResultSetFactory
job4=cached.CachedDynamicResultSetStubFactory
-job5=cmdmail.SimpleCommandMail
job6=corereflection.uno.CoreReflection
job7=dbaccess.DBContentLoader
job8=dbaccess.OCommandDefinition
@@ -64,7 +63,6 @@ job63=mcnttype.MimeContentTypeFactory
job64=namingservice.uno.NamingService
job65=nestedreg.uno.NestedRegistry
job66=proxyfac.uno.ProxyFactory
-job67=proxyset.SOffice52ProxySettings
job68=regtypeprov.uno.RegistryTypeDescriptionProvider
job69=remotebridge.uno.various
job70=sc.AccessibleEditableTextPara_HeaderFooter
Modified: openoffice/branches/ia2/main/framework/qa/complex/api_internal/worksforme.sce
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/qa/complex/api_internal/worksforme.sce?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/qa/complex/api_internal/worksforme.sce (original)
+++ openoffice/branches/ia2/main/framework/qa/complex/api_internal/worksforme.sce Fri Feb 1 08:46:00 2013
@@ -18,9 +18,7 @@
# under the License.
#
# *************************************************************
-job=cmdmail.SimpleCommandMail
job=fileacc.SimpleFileAccess
-job=proxyset.SOffice52ProxySettings
job=sc.ScCellFieldObj
job=sc.ScCellFieldsObj
job=sc.XMLImporter
Modified: openoffice/branches/ia2/main/framework/qa/complex/framework/autosave/Protocol.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/qa/complex/framework/autosave/Protocol.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/qa/complex/framework/autosave/Protocol.java (original)
+++ openoffice/branches/ia2/main/framework/qa/complex/framework/autosave/Protocol.java Fri Feb 1 08:46:00 2013
@@ -531,7 +531,7 @@ public class Protocol extends JComponent
* @param sMessage
* the pure message
*
- * @see log(type,message)
+ * @see #log(int, String)
*/
public synchronized void log( /*IN*/ String sMessage )
{
@@ -761,8 +761,8 @@ public class Protocol extends JComponent
*
* @return A string, which includes the whole header.
*
- * @see finish()
- * @see generateHTMLFooter()
+ * @see #finish()
+ * @see #impl_generateHTMLFooter()
*/
private String impl_generateHTMLHeader()
{
@@ -791,7 +791,7 @@ public class Protocol extends JComponent
* @param sOut
* used to generate the log output there.
*
- * @param lProps/aProp
+ * @param lProps
* represent the property(array) to be logged.
*/
private void impl_logPropertyArray( /*OUT*/ StringBuffer sOut ,
Modified: openoffice/branches/ia2/main/framework/qa/complex/framework/recovery/RecoveryTest.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/qa/complex/framework/recovery/RecoveryTest.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/qa/complex/framework/recovery/RecoveryTest.java (original)
+++ openoffice/branches/ia2/main/framework/qa/complex/framework/recovery/RecoveryTest.java Fri Feb 1 08:46:00 2013
@@ -532,7 +532,7 @@ public class RecoveryTest extends Comple
/**
* This function uses accessibility to handle the dialog "Are you sure".
- * It cklick "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE>
+ * It click "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE>
* @param yes If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button
* "No".
*/
@@ -551,8 +551,8 @@ public class RecoveryTest extends Comple
/**
* This function uses accessibility to handle the dialog "Are you sure".
- * It cklick "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE>
- * @param yes If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button
+ * It click "Yes" or "No", depending on the value of the parameter <CODE>Yes</CODE>
+ * @param saveDocuments If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button
* "No".
*/
private void handleSaveDocumentsDialog(boolean saveDocuments)
Modified: openoffice/branches/ia2/main/framework/qa/complex/framework/recovery/RecoveryTools.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/qa/complex/framework/recovery/RecoveryTools.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/qa/complex/framework/recovery/RecoveryTools.java (original)
+++ openoffice/branches/ia2/main/framework/qa/complex/framework/recovery/RecoveryTools.java Fri Feb 1 08:46:00 2013
@@ -147,7 +147,6 @@ public class RecoveryTools {
/**
* remove the content of the user backup folder and removes the Recovery.xcu. This
* was done from the Office via XSimpleFileAccess
- * @param xMSF a <CODE>XMultiServiceFactory</CODE> to get <CODE>XSimpleFileAccess</CODE>
* @throws com.sun.star.io.IOException the exception was thrown if something goes wrong.
*/
public void cleanRecoveryData()
@@ -359,4 +358,4 @@ public class RecoveryTools {
}
-}
\ No newline at end of file
+}
Modified: openoffice/branches/ia2/main/framework/source/dispatch/mailtodispatcher.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/dispatch/mailtodispatcher.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/dispatch/mailtodispatcher.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/dispatch/mailtodispatcher.cxx Fri Feb 1 08:46:00 2013
@@ -35,7 +35,7 @@
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/frame/DispatchResultState.hpp>
@@ -84,10 +84,10 @@ DEFINE_XTYPEPROVIDER_5(MailToDispatcher
css::frame::XNotifyingDispatch,
css::frame::XDispatch )
-DEFINE_XSERVICEINFO_MULTISERVICE(MailToDispatcher ,
- ::cppu::OWeakObject ,
- SERVICENAME_PROTOCOLHANDLER ,
- IMPLEMENTATIONNAME_MAILTODISPATCHER)
+DEFINE_XSERVICEINFO_MULTISERVICE_2(MailToDispatcher ,
+ ::cppu::OWeakObject ,
+ SERVICENAME_PROTOCOLHANDLER ,
+ IMPLEMENTATIONNAME_MAILTODISPATCHER)
DEFINE_INIT_SERVICE(MailToDispatcher,
{
@@ -105,17 +105,17 @@ DEFINE_INIT_SERVICE(MailToDispatcher,
@short standard ctor
@descr These initialize a new instance of ths class with needed informations for work.
- @param xFactory
- reference to uno servicemanager for creation of new services
+ @param xContext
+ reference to uno component context
@modified 30.04.2002 14:10, as96863
*/
-MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
+MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::uno::XComponentContext >& xContext )
// Init baseclasses first
: ThreadHelpBase( &Application::GetSolarMutex() )
, OWeakObject ( )
// Init member
- , m_xFactory ( xFactory )
+ , m_xContext ( xContext )
{
}
@@ -129,7 +129,7 @@ MailToDispatcher::MailToDispatcher( cons
*/
MailToDispatcher::~MailToDispatcher()
{
- m_xFactory = NULL;
+ m_xContext = NULL;
}
//_________________________________________________________________________________________________________________
@@ -266,13 +266,14 @@ sal_Bool MailToDispatcher::implts_dispat
{
sal_Bool bSuccess = sal_False;
- css::uno::Reference< css::lang::XMultiServiceFactory > xFactory;
+ css::uno::Reference< css::uno::XComponentContext > xContext;
/* SAFE */{
ReadGuard aReadLock( m_aLock );
- xFactory = m_xFactory;
+ xContext = m_xContext;
/* SAFE */}
- css::uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute( xFactory->createInstance(SERVICENAME_SYSTEMSHELLEXECUTE), css::uno::UNO_QUERY );
+ css::uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
+ css::system::SystemShellExecute::create( xContext ) );
if (xSystemShellExecute.is())
{
try
Modified: openoffice/branches/ia2/main/framework/source/dispatch/systemexec.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/dispatch/systemexec.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/dispatch/systemexec.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/dispatch/systemexec.cxx Fri Feb 1 08:46:00 2013
@@ -35,7 +35,7 @@
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/util/XStringSubstitution.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/frame/DispatchResultState.hpp>
@@ -85,10 +85,10 @@ DEFINE_XTYPEPROVIDER_5(SystemExec
css::frame::XNotifyingDispatch,
css::frame::XDispatch )
-DEFINE_XSERVICEINFO_MULTISERVICE(SystemExec ,
- ::cppu::OWeakObject ,
- SERVICENAME_PROTOCOLHANDLER ,
- IMPLEMENTATIONNAME_SYSTEMEXEC)
+DEFINE_XSERVICEINFO_MULTISERVICE_2(SystemExec ,
+ ::cppu::OWeakObject ,
+ SERVICENAME_PROTOCOLHANDLER ,
+ IMPLEMENTATIONNAME_SYSTEMEXEC)
DEFINE_INIT_SERVICE(SystemExec,
{
@@ -102,12 +102,12 @@ DEFINE_INIT_SERVICE(SystemExec,
//_________________________________________________________________________________________________________________
-SystemExec::SystemExec( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
+SystemExec::SystemExec( const css::uno::Reference< css::uno::XComponentContext >& xContext )
// Init baseclasses first
: ThreadHelpBase( &Application::GetSolarMutex() )
, OWeakObject ( )
// Init member
- , m_xFactory ( xFactory )
+ , m_xContext ( xContext )
{
}
@@ -115,7 +115,7 @@ SystemExec::SystemExec( const css::uno::
SystemExec::~SystemExec()
{
- m_xFactory = NULL;
+ m_xContext = NULL;
}
//_________________________________________________________________________________________________________________
@@ -171,7 +171,7 @@ void SAL_CALL SystemExec::dispatchWithNo
// SAFE ->
ReadGuard aReadLock(m_aLock);
- css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = m_xFactory;
+ css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext;
aReadLock.unlock();
// <- SAFE
@@ -180,14 +180,14 @@ void SAL_CALL SystemExec::dispatchWithNo
try
{
css::uno::Reference< css::util::XStringSubstitution > xPathSubst(
- xFactory->createInstance(SERVICENAME_SUBSTITUTEPATHVARIABLES),
+ xContext->getServiceManager()->createInstanceWithContext(
+ SERVICENAME_SUBSTITUTEPATHVARIABLES, xContext),
css::uno::UNO_QUERY_THROW);
::rtl::OUString sSystemURL = xPathSubst->substituteVariables(sSystemURLWithVariables, sal_True); // sal_True force an exception if unknown variables exists !
css::uno::Reference< css::system::XSystemShellExecute > xShell(
- xFactory->createInstance(SERVICENAME_SYSTEMSHELLEXECUTE),
- css::uno::UNO_QUERY_THROW);
+ css::system::SystemShellExecute::create(xContext));
xShell->execute(sSystemURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS);
impl_notifyResultListener(xListener, css::frame::DispatchResultState::SUCCESS);