[Libreoffice-commits] .: sw/source
Lubos Lunak
llunak at kemper.freedesktop.org
Tue Jun 28 05:32:32 PDT 2011
sw/source/filter/xml/xmlimp.cxx | 20 --------------------
1 file changed, 20 deletions(-)
New commits:
commit 2e557ce9d340244a6af92bcff683e56888a7da6d
Author: LuboÅ¡ LuÅák <l.lunak at suse.cz>
Date: Tue Jun 28 14:31:16 2011 +0200
fix incorrect merge
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index d0c6b2e..a2463a6 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1442,26 +1442,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
OUString( RTL_CONSTASCII_USTRINGPARAM("SmallCapsPercentage66") ), makeAny( true ) );
}
- // Old LO versions had 66 as the value for small caps percentage, later changed to 80.
- // In order to keep backwards compatibility, SmallCapsPercentage66 option is written to .odt
- // files, and the default for new documents is 'false'. Files without this option
- // are considered to be old files, so set the compatibility option too.
- if ( !bSmallCapsPercentage66 )
- {
- xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("SmallCapsPercentage66") ), makeAny( true ) );
- }
-
- // Old LO versions had 66 as the value for small caps percentage, later changed to 80.
- // In order to keep backwards compatibility, SmallCapsPercentage66 option is written to .odt
- // files, and the default for new documents is 'false'. Files without this option
- // are considered to be old files, so set the compatibility option too.
- if ( !bSmallCapsPercentage66 )
- {
- xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("SmallCapsPercentage66") ), makeAny( true ) );
- }
-
Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY );
Reference < XText > xText = xTextDoc->getText();
Reference<XUnoTunnel> xTextTunnel( xText, UNO_QUERY);
More information about the Libreoffice-commits
mailing list