embeddedobj/test/Container1/EmbedContApp.java | 2 -
filter/source/msfilter/msdffimp.cxx | 2 -
framework/source/inc/loadenv/loadenv.hxx | 4 +--
sal/qa/rtl/process/rtl_Process.cxx | 2 -
setup_native/scripts/admin.pl | 2 -
solenv/bin/modules/installer/ziplist.pm | 2 -
sw/qa/extras/rtfimport/data/fdo85889-mac.rtf | 3 ++
sw/qa/extras/rtfimport/data/fdo85889-pc.rtf | 3 ++
sw/qa/extras/rtfimport/data/fdo85889-pca.rtf | 3 ++
sw/qa/extras/rtfimport/rtfimport.cxx | 26 +++++++++++++++++++++++++
sw/source/uibase/app/docstyle.cxx | 2 -
vcl/source/fontsubset/ttcr.cxx | 2 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 12 +++++++++++
13 files changed, 56 insertions(+), 9 deletions(-)
New commits:
commit 4730af6a2435dfe35f598f12a4b3884bba40c006
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Nov 24 12:48:08 2014 +0100
typo: unknown
Change-Id: If89443c1668ca01c826c8fc353b20097c7da7bf4
diff --git a/embeddedobj/test/Container1/EmbedContApp.java
b/embeddedobj/test/Container1/EmbedContApp.java
index b2a7d04..157296d 100644
--- a/embeddedobj/test/Container1/EmbedContApp.java
+++ b/embeddedobj/test/Container1/EmbedContApp.java
@@ -755,7 +755,7 @@ public class EmbedContApp extends Applet
}
else
{
- System.out.println( "Unknoun action is requested: " +
aAction.m_nID + "\n" );
+ System.out.println( "Unknown action is requested: " +
aAction.m_nID + "\n" );
}
}
}
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 679c40a..0defb0a 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2221,7 +2221,7 @@ void
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
case 0x0:
{
//It is msopathEscapeExtension which is
transformed into LINETO.
- //If issue happens, I think this part can
be comment so that it will be taken as unknow command.
+ //If issue happens, I think this part can
be comment so that it will be taken as unknown command.
//When export, origin data will be export
without any change.
nCommand =
EnhancedCustomShapeSegmentCommand::LINETO;
if ( !nCnt )
diff --git a/framework/source/inc/loadenv/loadenv.hxx
b/framework/source/inc/loadenv/loadenv.hxx
index 3bf66fff..a65134c 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -256,14 +256,14 @@ public:
@param eContentType
classify the given content.
- This value is set to a default value "UNKNWON_CONTENT", which
force
+ This value is set to a default value "UNKNOWN_CONTENT", which
force
an internal check, if this content is loadable or not.
But may this check was already made by the caller of this
method and
passing this information to this LoadEnv instance can suppress
this
might expensive check.
That can be useful in case this information is needed outside
too,
to decide if its necessary to create some resources for this
load
- request ... or to reject the request imidiatly if it seems to
be not
+ request ... or to reject the request immediately if it seems
to be not
loadable in general.
@throw A LoadEnvException e.g. if another load operation is till in
progress
diff --git a/sal/qa/rtl/process/rtl_Process.cxx
b/sal/qa/rtl/process/rtl_Process.cxx
index 0bd9c70..6640eed 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -132,7 +132,7 @@ public:
// );
oslProcessInfo* pInfo = new oslProcessInfo;
//please pay attention to initial the Size to sizeof(oslProcessInfo), or
else
- //you will get unknow error when call osl_getProcessInfo
+ //you will get unknown error when call osl_getProcessInfo
pInfo->Size = sizeof(oslProcessInfo);
osl_error = osl_getProcessInfo( hProcess, osl_Process_EXITCODE, pInfo );
CPPUNIT_ASSERT_MESSAGE
diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl
index 2003f6b..351c28f 100644
--- a/setup_native/scripts/admin.pl
+++ b/setup_native/scripts/admin.pl
@@ -87,7 +87,7 @@ sub getparameter
else
{
print "\n**********************************************\n";
- print "Error: Unknows parameter: $param";
+ print "Error: Unknown parameter: $param";
print "\n**********************************************\n";
usage();
exit(-1);
diff --git a/solenv/bin/modules/installer/ziplist.pm
b/solenv/bin/modules/installer/ziplist.pm
index b4867a8..9f31455 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -193,7 +193,7 @@ sub analyze_settings_block
next;
}
- # complete blocks of unknows strings are not recorded
+ # complete blocks of unknown strings are not recorded
if ((!($line =~ /^\s*\Q$installer::globals::build\E\s*$/i)) &&
(!($line =~ /^\s*\bSettings\b\s*$/i)) &&
diff --git a/sw/source/uibase/app/docstyle.cxx
b/sw/source/uibase/app/docstyle.cxx
index cbccde4..92c8dab 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1163,7 +1163,7 @@ bool SwDocStyleSheet::SetFollow( const OUString& rStr)
case SFX_STYLE_FAMILY_PSEUDO:
break;
default:
- OSL_ENSURE(false, "unknwown style family");
+ OSL_ENSURE(false, "unknown style family");
}
return true;
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index 272ad1c..1f019cf 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -1119,7 +1119,7 @@ int GetRawData(TrueTypeTable *_this, sal_uInt8 **ptr,
sal_uInt32 *len, sal_uInt3
}
}
- assert(!"Unknwon TrueType table.\n");
+ assert(!"Unknown TrueType table.\n");
return TTCR_UNKNOWN;
}
commit 31ef2b6396e2ebec10f84f21dfdee645690f5e62
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Nov 24 11:33:17 2014 +0100
fdo#85889 handle pc, pca and mac rtf keywords in writerfilter
Change-Id: Ic54f2233a37562bdc516e440af0b4b7973f56342
diff --git a/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf
b/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf
new file mode 100644
index 0000000..8056d47
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf
@@ -0,0 +1,3 @@
+{\rtf1\mac \deff0{\fonttbl{\f0\fmodern Helvetica;}}
+\pard\f0\fs20 \'f1\'f2\'f3\par
+}
diff --git a/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf
b/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf
new file mode 100644
index 0000000..a3b9d27
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf
@@ -0,0 +1,3 @@
+{\rtf1\pc \deff0{\fonttbl{\f0\fmodern Helvetica;}}
+\pard\f0\fs20 \'f1\'f2\'f3\par
+}
diff --git a/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf
b/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf
new file mode 100644
index 0000000..34eeb18
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf
@@ -0,0 +1,3 @@
+{\rtf1\pca \deff0{\fonttbl{\f0\fmodern Helvetica;}}
+\pard\f0\fs20 \'f1\'f2\'f3\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index b89472a..e07e6aa 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2181,6 +2181,32 @@ DECLARE_RTFIMPORT_TEST(testChtOutlineNumberingRtf,
"chtoutline.rtf")
CPPUNIT_ASSERT_EQUAL(OUString(aExpectedPrefix,SAL_N_ELEMENTS(aExpectedPrefix)),
aPrefix);
CPPUNIT_ASSERT_EQUAL(OUString(aExpectedSuffix,SAL_N_ELEMENTS(aExpectedSuffix)),
aSuffix);
}
+
+DECLARE_RTFIMPORT_TEST(testFdo85889pc, "fdo85889-pc.rtf")
+{
+ uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1);
+
+ OUString aExpected("\xc2\xb1\xe2\x89\xa5\xe2\x89\xa4", 8,
RTL_TEXTENCODING_UTF8);
+ CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
+}
+
+DECLARE_RTFIMPORT_TEST(testFdo85889pca, "fdo85889-pca.rtf")
+{
+ uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1);
+
+ OUString aExpected("\xc2\xb1\xe2\x80\xc2\xbe", 6, RTL_TEXTENCODING_UTF8);
+ CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
+}
+
+DECLARE_RTFIMPORT_TEST(testFdo85889mac, "fdo85889-mac.rtf")
+{
+ uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1);
+
+ OUString aExpected("\xc3\x92\xc3\x9a\xc3\x9b", 6, RTL_TEXTENCODING_UTF8);
+ CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
+}
+
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a998351..fe4c870 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2913,6 +2913,18 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_ANSI:
m_aStates.top().nCurrentEncoding = RTL_TEXTENCODING_MS_1252;
break;
+ case RTF_MAC:
+ m_nCurrentEncoding = RTL_TEXTENCODING_APPLE_ROMAN;
+ m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
+ break;
+ case RTF_PC:
+ m_nCurrentEncoding = RTL_TEXTENCODING_IBM_437;
+ m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
+ break;
+ case RTF_PCA:
+ m_nCurrentEncoding = RTL_TEXTENCODING_IBM_850;
+ m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
+ break;
case RTF_PLAIN:
{
m_aStates.top().aCharacterSprms = getDefaultState().aCharacterSprms;
commit e92d1cda143deaf4ae97c17c04e6c30eb6dc417b
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Nov 24 10:39:20 2014 +0100
chmod -x fdo44984.rtf
Change-Id: I9b395629b9b90d12cdb7afa68d5eb79ef938648f
diff --git a/sw/qa/extras/rtfimport/data/fdo44984.rtf
b/sw/qa/extras/rtfimport/data/fdo44984.rtf
old mode 100755
new mode 100644
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
