[Libreoffice-commits] core.git: 4 commits - filter/source sc/source sw/source
Caolán McNamara
caolanm at redhat.com
Fri Nov 28 02:16:29 PST 2014
filter/source/config/fragments/filters/MS_Excel_97.xcu | 2 +-
filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu | 2 +-
filter/source/config/fragments/filters/MS_PowerPoint_97.xcu | 2 +-
filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu | 2 +-
filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu | 2 +-
filter/source/config/fragments/filters/MS_Word_2007_XML.xcu | 2 +-
filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu | 2 +-
filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu | 2 +-
filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu | 2 +-
filter/source/config/fragments/filters/MS_Word_97.xcu | 2 +-
filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu | 2 +-
filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu | 2 +-
filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu | 2 +-
filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu | 2 +-
filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu | 2 +-
filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu | 2 +-
filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu | 2 +-
filter/source/config/fragments/types/MS_Excel_2007_XML.xcu | 2 +-
filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu | 2 +-
filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu | 2 +-
filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu | 2 +-
filter/source/config/fragments/types/MS_PowerPoint_2007_XML_Template.xcu | 2 +-
filter/source/config/fragments/types/calc_MS_Excel_97.xcu | 2 +-
filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu | 2 +-
filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu | 2 +-
filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu | 2 +-
filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu | 2 +-
filter/source/config/fragments/types/writer_MS_Word_97.xcu | 2 +-
sc/source/core/data/column3.cxx | 3 +++
sw/source/core/text/inftxt.cxx | 2 +-
30 files changed, 32 insertions(+), 29 deletions(-)
New commits:
commit 1e514c8da8e37fc3cb26af6ddaf95a3ed8093a41
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 28 10:09:23 2014 +0000
test rows for validity
Change-Id: I501c1c18df96b5b2ad628e86cfb724a541d5c4b6
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 803bd35..4ddbabc 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -101,6 +101,9 @@ struct DirtyCellInterpreter
void ScColumn::InterpretDirtyCells( SCROW nRow1, SCROW nRow2 )
{
+ if (!ValidRow(nRow1) || !ValidRow(nRow2) || nRow1 > nRow2)
+ return;
+
DirtyCellInterpreter aFunc;
sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aFunc);
}
commit 2b2566972305cbbd177fcc3bedd23dc368661d53
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 28 09:54:07 2014 +0000
fix higher debug level build
Change-Id: I97ff0a97eed8723b6fb5cec9f11027bf6ee7c7d0
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index d476ee9..32f5b2a 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -461,7 +461,7 @@ void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPain
pSmartTags = NULL;
#if OSL_DEBUG_LEVEL > 1
- pBrushItem = static_cast<SvxBrushItem*>(-1);
+ pBrushItem = reinterpret_cast<SvxBrushItem*>(-1);
#else
pBrushItem = 0;
#endif
commit 3ce91fbac411b1278d0ed964af4bf6f9a00bea1f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 27 15:55:57 2014 +0000
2007/2010/2013->2007-2013
Change-Id: Ide300badd03e52394212eaa2ac457d6d5c1ee90f
diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu
index 5a49b99..a295ae3 100644
--- a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu
@@ -21,7 +21,7 @@
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
<prop oor:name="UserData"><value>OXML</value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Word 2007/2010/2013 XML</value>
+ <value xml:lang="en-US">Microsoft Word 2007-2013 XML</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_MS_Word_2007</value></prop>
diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu
index 3d62b4b..92f3a92 100644
--- a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu
@@ -20,7 +20,7 @@
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
<prop oor:name="UserData"><value>OXML</value></prop>
- <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Word 2007/2010/2013 XML Template</value></prop>
+ <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Word 2007-2013 XML Template</value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_MS_Word_2007_Template</value></prop>
<prop oor:name="TemplateName"/>
diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu
index d1e8b48..5400bf4 100644
--- a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="MS Word 2007 XML Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Word 2007/2010/2013 XML Template</value>
+ <value xml:lang="en-US">Microsoft Word 2007-2013 XML Template</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu
index 42e7d84..923aecd 100644
--- a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="MS Word 2007 XML">
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Word 2007/2010/2013 XML</value>
+ <value xml:lang="en-US">Microsoft Word 2007-2013 XML</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu
index b2a6d60..5250662 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="Calc MS Excel 2007 XML Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Excel 2007/2010/2013 XML Template</value>
+ <value xml:lang="en-US">Microsoft Excel 2007-2013 XML Template</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu
index 29e4f06..070952a 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="Calc MS Excel 2007 XML">
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Excel 2007/2010/2013 XML</value>
+ <value xml:lang="en-US">Microsoft Excel 2007-2013 XML</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
index 28cd1e4..70b4493 100644
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
+++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
@@ -20,7 +20,7 @@
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"/>
- <prop oor:name="UIName"><value xml:lang="en-US">Microsoft PowerPoint 2007/2010/2013 XML AutoPlay</value></prop>
+ <prop oor:name="UIName"><value xml:lang="en-US">Microsoft PowerPoint 2007-2013 XML AutoPlay</value></prop>
<prop oor:name="FileFormatVersion"/>
<prop oor:name="Type"><value>MS PowerPoint 2007 XML AutoPlay</value></prop>
<prop oor:name="TemplateName"/>
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
index 522b028..a47d540 100644
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
@@ -20,7 +20,7 @@
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"/>
- <prop oor:name="UIName"><value xml:lang="en-US">Microsoft PowerPoint 2007/2010/2013 XML Template</value></prop>
+ <prop oor:name="UIName"><value xml:lang="en-US">Microsoft PowerPoint 2007-2013 XML Template</value></prop>
<prop oor:name="FileFormatVersion"/>
<prop oor:name="Type"><value>MS PowerPoint 2007 XML Template</value></prop>
<prop oor:name="TemplateName"/>
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu
index 2ea8efa..2c354f3 100644
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="Impress MS PowerPoint 2007 XML Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft PowerPoint 2007/2010/2013 XML Template</value>
+ <value xml:lang="en-US">Microsoft PowerPoint 2007-2013 XML Template</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu
index 2387094..af94961 100644
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu
+++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="Impress MS PowerPoint 2007 XML">
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft PowerPoint 2007/2010/2013 XML</value>
+ <value xml:lang="en-US">Microsoft PowerPoint 2007-2013 XML</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu b/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu
index d0e4d5a..42819b8 100644
--- a/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu
+++ b/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu
@@ -22,6 +22,6 @@
<prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</value></prop>
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>Calc MS Excel 2007 XML</value></prop>
- <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Excel 2007/2010/2013 XML</value></prop>
+ <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Excel 2007-2013 XML</value></prop>
<prop oor:name="ClipboardFormat"/>
</node>
diff --git a/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu b/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu
index 4289c76..e57194e 100644
--- a/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu
@@ -22,6 +22,6 @@
<prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.spreadsheetml.template</value></prop>
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>Calc MS Excel 2007 XML Template</value></prop>
- <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Excel 2007/2010/2013 XML Template</value></prop>
+ <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Excel 2007-2013 XML Template</value></prop>
<prop oor:name="ClipboardFormat"/>
</node>
diff --git a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu
index f37cf73..b709d6b 100644
--- a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu
+++ b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu
@@ -22,6 +22,6 @@
<prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.presentationml.presentation</value></prop>
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>Impress MS PowerPoint 2007 XML</value></prop>
- <prop oor:name="UIName"><value xml:lang="en-US">Microsoft PowerPoint 2007/2010/2013 XML</value></prop>
+ <prop oor:name="UIName"><value xml:lang="en-US">Microsoft PowerPoint 2007-2013 XML</value></prop>
<prop oor:name="ClipboardFormat"/>
</node>
diff --git a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu
index e9edf38..b75b75a 100644
--- a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu
+++ b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu
@@ -22,6 +22,6 @@
<prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.presentationml.slideshow</value></prop>
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>Impress MS PowerPoint 2007 XML AutoPlay</value></prop>
- <prop oor:name="UIName"><value xml:lang="en-US">Microsoft PowerPoint 2007/2010/2013 XML</value></prop>
+ <prop oor:name="UIName"><value xml:lang="en-US">Microsoft PowerPoint 2007-2013 XML</value></prop>
<prop oor:name="ClipboardFormat"/>
</node>
diff --git a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_Template.xcu b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_Template.xcu
index fe5ed8a..0502b67 100644
--- a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_Template.xcu
@@ -22,6 +22,6 @@
<prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.presentationml.template</value></prop>
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>Impress MS PowerPoint 2007 XML Template</value></prop>
- <prop oor:name="UIName"><value xml:lang="en-US">Microsoft PowerPoint 2007/2010/2013 XML Template</value></prop>
+ <prop oor:name="UIName"><value xml:lang="en-US">Microsoft PowerPoint 2007-2013 XML Template</value></prop>
<prop oor:name="ClipboardFormat"/>
</node>
diff --git a/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu b/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu
index 911ab43..9e21ef5 100644
--- a/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu
+++ b/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu
@@ -22,6 +22,6 @@
<prop oor:name="MediaType"><value>application/msword</value></prop>
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>MS Word 2007 XML</value></prop>
- <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Word 2007/2010/2013 XML</value></prop>
+ <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Word 2007-2013 XML</value></prop>
<prop oor:name="ClipboardFormat"><value>MSWordDoc</value></prop>
</node>
diff --git a/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu b/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu
index fb315f5..d0e639a6 100644
--- a/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu
@@ -22,6 +22,6 @@
<prop oor:name="MediaType"><value>application/msword</value></prop>
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>MS Word 2007 XML Template</value></prop>
- <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Word 2007/2010/2013 XML Template</value></prop>
+ <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Word 2007-2013 XML Template</value></prop>
<prop oor:name="ClipboardFormat"><value>MSWordDoc</value></prop>
</node>
commit 8a22eaa73846e2e0bd75edb1d86c8d74799c757a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 27 15:52:18 2014 +0000
97/2000/XP/2003->97-2003
Change-Id: I8ceaed177af64cb79bc6429ecad817f49cadeea2
diff --git a/filter/source/config/fragments/filters/MS_Excel_97.xcu b/filter/source/config/fragments/filters/MS_Excel_97.xcu
index 44fdacd..48a65cd 100644
--- a/filter/source/config/fragments/filters/MS_Excel_97.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_97.xcu
@@ -21,7 +21,7 @@
<prop oor:name="FilterService"/>
<prop oor:name="UserData"/>
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Excel 97/2000/XP/2003</value>
+ <value xml:lang="en-US">Microsoft Excel 97-2003</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>calc_MS_Excel_97</value></prop>
diff --git a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu
index c376257..14c5a75 100644
--- a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="MS Excel 97 Vorlage/Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Excel 97/2000/XP/2003 Template</value>
+ <value xml:lang="en-US">Microsoft Excel 97-2003 Template</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu
index 629d681..45df95d 100644
--- a/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu
+++ b/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu
@@ -21,7 +21,7 @@
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value>sdfilt</value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft PowerPoint 97/2000/XP/2003</value>
+ <value xml:lang="en-US">Microsoft PowerPoint 97-2003</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>impress_MS_PowerPoint_97</value></prop>
diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu
index 5927c55..6b65513 100644
--- a/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu
+++ b/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu
@@ -21,7 +21,7 @@
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value>sdfilt</value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft PowerPoint 97/2000/XP/2003 AutoPlay</value>
+ <value xml:lang="en-US">Microsoft PowerPoint 97-2003 AutoPlay</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>impress_MS_PowerPoint_97_AutoPlay</value></prop>
diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu
index 11797ca..e1c2eca 100644
--- a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu
+++ b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="MS PowerPoint 97 Vorlage">
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft PowerPoint 97/2000/XP/2003 Template</value>
+ <value xml:lang="en-US">Microsoft PowerPoint 97-2003 Template</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/MS_Word_97.xcu b/filter/source/config/fragments/filters/MS_Word_97.xcu
index 45e5ec1..e06e432b 100644
--- a/filter/source/config/fragments/filters/MS_Word_97.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_97.xcu
@@ -21,7 +21,7 @@
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value>CWW8</value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Word 97/2000/XP/2003</value>
+ <value xml:lang="en-US">Microsoft Word 97-2003</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_MS_Word_97</value></prop>
diff --git a/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu b/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu
index 58bddd4..92cc0b5 100644
--- a/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="MS Word 97 Vorlage">
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Word 97/2000/XP/2003 Template</value>
+ <value xml:lang="en-US">Microsoft Word 97-2003 Template</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/types/calc_MS_Excel_97.xcu b/filter/source/config/fragments/types/calc_MS_Excel_97.xcu
index 79d7fc3..3005279 100644
--- a/filter/source/config/fragments/types/calc_MS_Excel_97.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Excel_97.xcu
@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>MS Excel 97</value></prop>
<prop oor:name="UIName">
- <value>Microsoft Excel 97/2000/XP/2003</value>
+ <value>Microsoft Excel 97-2003</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Biff8</value></prop>
</node>
diff --git a/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu b/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu
index 5903584..f7766f4 100644
--- a/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu
+++ b/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu
@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>MS PowerPoint 97</value></prop>
<prop oor:name="UIName">
- <value>Microsoft PowerPoint 97/2000/XP/2003</value>
+ <value>Microsoft PowerPoint 97-2003</value>
</prop>
<prop oor:name="ClipboardFormat"/>
</node>
diff --git a/filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu b/filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu
index c464065..ecda5d7 100644
--- a/filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu
+++ b/filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu
@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>MS PowerPoint 97 AutoPlay</value></prop>
<prop oor:name="UIName">
- <value>Microsoft PowerPoint 97/2000/XP/2003</value>
+ <value>Microsoft PowerPoint 97-2003</value>
</prop>
<prop oor:name="ClipboardFormat"/>
</node>
diff --git a/filter/source/config/fragments/types/writer_MS_Word_97.xcu b/filter/source/config/fragments/types/writer_MS_Word_97.xcu
index 054ef95..c8e06f9 100644
--- a/filter/source/config/fragments/types/writer_MS_Word_97.xcu
+++ b/filter/source/config/fragments/types/writer_MS_Word_97.xcu
@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>MS Word 97</value></prop>
<prop oor:name="UIName">
- <value>Microsoft Word 97/2000/XP/2003</value>
+ <value>Microsoft Word 97-2003</value>
</prop>
<prop oor:name="ClipboardFormat"><value>MSWordDoc</value></prop>
</node>
More information about the Libreoffice-commits
mailing list