sc/source/ui/unoobj/exceldetect.cxx | 18 +++++++++---------
sc/uiconfig/scalc/ui/sidebarcellappearance.ui | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit f4006967e815a6dbe701dac5e83b4dc74e63a708
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Wed Apr 9 01:57:15 2014 +0300
related: fdo#67104 correct the tooltip
This option points to the per-sheet setting, not to the global one.
Change-Id: I79dbd727e0ff12eb906f243f82f4906762918d26
diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
index cdf59e1..893a748 100644
--- a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
+++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
@@ -215,7 +215,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Show the grid
lines of the cells in the entire spreadsheet.</property>
+ <property name="tooltip_text" translatable="yes">Show the grid
lines of the cells.</property>
<property name="action_name">.uno:ToggleSheetGrid</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
commit d7a713fe6b65961b9683eae576f1766633f1f2e2
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Wed Apr 9 01:37:37 2014 +0300
Write MediaDescriptor back
Otherwise setting the filter name has no effect.
Change-Id: I333c8d2be66537a2c83b2aa3e40cdef61a5ac970
diff --git a/sc/source/ui/unoobj/exceldetect.cxx
b/sc/source/ui/unoobj/exceldetect.cxx
index 985482d..525d2ac 100644
--- a/sc/source/ui/unoobj/exceldetect.cxx
+++ b/sc/source/ui/unoobj/exceldetect.cxx
@@ -145,41 +145,41 @@ OUString ScExcelBiffDetect::detect(
uno::Sequence<beans::PropertyValue>& lDescri
return OUString();
aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= isTemplate(aType) ?
OUString("MS Excel 97 Vorlage/Template") : OUString("MS Excel 97");
- return aType;
}
- if (aType == "calc_MS_Excel_95" || aType ==
"calc_MS_Excel_95_VorlageTemplate")
+ else if (aType == "calc_MS_Excel_95" || aType ==
"calc_MS_Excel_95_VorlageTemplate")
{
// See if this stream is a Excel 95 (BIFF5) stream.
if (!hasStream(xInStream, "Book"))
return OUString();
aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= isTemplate(aType) ?
OUString("MS Excel 95 Vorlage/Template") : OUString("MS Excel 95");
- return aType;
}
- if (aType == "calc_MS_Excel_5095" || aType ==
"calc_MS_Excel_5095_VorlageTemplate")
+ else if (aType == "calc_MS_Excel_5095" || aType ==
"calc_MS_Excel_5095_VorlageTemplate")
{
// See if this stream is a Excel 5.0/95 stream.
if (!hasStream(xInStream, "Book"))
return OUString();
aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= isTemplate(aType) ?
OUString("MS Excel 5.0/95 Vorlage/Template") : OUString("MS Excel 5.0/95");
- return aType;
}
- if (aType == "calc_MS_Excel_40" || aType ==
"calc_MS_Excel_40_VorlageTemplate")
+ else if (aType == "calc_MS_Excel_40" || aType ==
"calc_MS_Excel_40_VorlageTemplate")
{
// See if this stream is a Excel 4.0 stream.
if (!isExcel40(xInStream))
return OUString();
aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= isTemplate(aType) ?
OUString("MS Excel 4.0 Vorlage/Template") : OUString("MS Excel 4.0");
- return aType;
}
- // failed!
- return OUString();
+ else
+ // Nothing to detect.
+ return OUString();
+
+ aMediaDesc >> lDescriptor;
+ return aType;
}
uno::Sequence<OUString>
ScExcelBiffDetect::impl_getStaticSupportedServiceNames()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
