[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - sw/qa sw/source xmloff/source
sw/qa/extras/odfimport/data/PageBackground.odt |binary
sw/qa/extras/odfimport/odfimport.cxx | 11
sw/source/core/unocore/unomap.cxx | 66 +
xmloff/source/style/PageMasterStyleMap.cxx |1
4 files changed, 78 insertions(+)
New commits:
commit 53cd20e94d7cd2a72bf82d0dc8ed71fc5140e938
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 14 14:35:44 2015 +0200
xmloff: add back the presumably accidentally removed FootnoteLineStyle
(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)
Change-Id: I67ec4516ff431efd47451ff07fc261ba32e80385
(cherry picked from commit ea8db4ad8e1c75c3ab2f31fea4e061600231f9d1)
Reviewed-on: https://gerrit.libreoffice.org/15306
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx
b/xmloff/source/style/PageMasterStyleMap.cxx
index 16dac27..da1308b 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -153,6 +153,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
PLMAP( FootnoteLineRelativeWidth, XML_NAMESPACE_STYLE,XML__EMPTY,
XML_TYPE_PERCENT8|MID_FLAG_SPECIAL_ITEM,CTF_PM_FTN_LINE_WIDTH ),
PLMAP( FootnoteLineTextDistance, XML_NAMESPACE_STYLE,XML__EMPTY,
XML_TYPE_MEASURE|MID_FLAG_SPECIAL_ITEM,CTF_PM_FTN_LINE_DISTANCE ),
PLMAP( FootnoteLineWeight,XML_NAMESPACE_STYLE,
XML_FOOTNOTE_SEP,XML_TYPE_MEASURE16|MID_FLAG_ELEMENT_ITEM,
CTF_PM_FTN_LINE_WEIGHT ),
+PLMAP( FootnoteLineStyle, XML_NAMESPACE_STYLE,XML_EMPTY,
XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ),
//
//Index 92: Section for 'header-style' own section, all members *have*
to use CTF_PM_HEADERFLAG in the context entry (the 5th one)
commit d2c490fb9f4b2b6b63b82c4ba26df9a3672f9d55
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 14 10:37:01 2015 +0200
tdf#88337 tdf#89193: sw: add missing SwXPageStyle properties
Add the fill style properties so background images etc. are not lost.
(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)
Change-Id: I517350eec2f32e4b4bb80427666aad23a31d666a
(cherry picked from commit 65a56636a68451d15499a37c2d5bd9efb71b1279)
Reviewed-on: https://gerrit.libreoffice.org/15305
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/odfimport/data/PageBackground.odt
b/sw/qa/extras/odfimport/data/PageBackground.odt
new file mode 100644
index 000..dbb1082
Binary files /dev/null and b/sw/qa/extras/odfimport/data/PageBackground.odt
differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index c0534d7..a4de654 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -11,6 +11,8 @@
#if !defined(WNT)
#include com/sun/star/awt/FontWeight.hpp
+#include com/sun/star/drawing/FillStyle.hpp
+#include com/sun/star/drawing/BitmapMode.hpp
#include com/sun/star/style/PageStyleLayout.hpp
#include com/sun/star/table/XCell.hpp
#include com/sun/star/table/BorderLine.hpp
@@ -306,6 +308,15 @@ DECLARE_ODFIMPORT_TEST(testFdo79269_header,
fdo79269_header.odt)
CPPUNIT_ASSERT_EQUAL(OUString(second), xFooter-getString());
}
+DECLARE_ODFIMPORT_TEST(testPageBackground, PageBackground.odt)
+{
+uno::Referencebeans::XPropertySet
xPropertySet(getStyles(PageStyles)-getByName(Default Style),
uno::UNO_QUERY);
+// The background image was lost
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP,
getPropertydrawing::FillStyle(xPropertySet, FillStyle));
+CPPUNIT_ASSERT_EQUAL(OUString(Sky), getPropertyOUString(xPropertySet,
FillBitmapName));
+CPPUNIT_ASSERT_EQUAL(drawing::BitmapMode_REPEAT,
getPropertydrawing::BitmapMode(xPropertySet, FillBitmapMode));
+}
+
DECLARE_ODFIMPORT_TEST(testFdo56272, fdo56272.odt)
{
uno::Referencedrawing::XShape xShape = getShape(1);
diff --git a/sw/source/core/unocore/unomap.cxx
b/sw/source/core/unocore/unomap.cxx
index cb7cdf0..540f4b5 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -1070,6 +1070,72 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ OUString(UNO_NAME_GRID_SNAP_TO_CHARS), RES_TEXTGRID,
cppu::UnoTypebool::get(), PROPERTY_NONE, MID_GRID_SNAPTOCHARS},
{ OUString(UNO_NAME_GRID_STANDARD_PAGE_MODE),
RES_TEXTGRID, cppu::UnoTypebool::get(), PROPERTY_NONE,
MID_GRID_STANDARD_MODE},
{ OUString(UNO_NAME_HIDDEN), FN_UNO_HIDDEN,
cppu::UnoTypebool::get(), PROPERTY_NONE, 0},
+
+// added FillProperties for SW, same as
FILL_PROPERTIES in svx
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - sw/qa sw/source
sw/qa/extras/htmlexport/data/tdf76291.odt |binary
sw/qa/extras/htmlexport/htmlexport.cxx|9 +
sw/source/filter/html/wrthtml.cxx |4 +++-
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit fafd6cd4f784e5b65548af699bc25502f10a4b8d
Author: Vasily Melenchuk vasily.melenc...@cib.de
Date: Thu Feb 5 11:57:13 2015 +
tdf#76291 unit test for html export href encoding
Change-Id: I273af8b570adfcb7bfb784495bc31d2f4f1ee00b
Reviewed-on: https://gerrit.libreoffice.org/14333
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 675e1fe198298702ced8eab02a7df5164d66a8f0)
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/sw/qa/extras/htmlexport/data/tdf76291.odt
b/sw/qa/extras/htmlexport/data/tdf76291.odt
new file mode 100644
index 000..68588c8
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/tdf76291.odt differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index d8c673c..aaa43d6 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -233,6 +233,15 @@
DECLARE_HTMLEXPORT_TEST(testExportCheckboxRadioButtonState, checkbox-radiobutto
assertXPathNoAttribute(pDoc, /html/body/form/p[4]/input, checked);
}
+DECLARE_HTMLEXPORT_TEST(testExportUrlEncoding, tdf76291.odt)
+{
+htmlDocPtr pDoc = parseHtml(maTempFile);
+CPPUNIT_ASSERT(pDoc);
+
+// Test URI encoded hyperlink with Chinese characters
+assertXPath(pDoc, /html/body/p/a, href,
http://www.youtube.com/results?search_query=%E7%B2%B5%E8%AA%9Emvsm=12;);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 4327b7882c38005d89b07e76814705d1c53f3161
Author: Vasily Melenchuk vasily.melenc...@cib.de
Date: Tue Jan 27 16:18:24 2015 +
tdf#76291 write encoded URL as href in html output
INetURLObject class is used to create correctly encoded URL
Change-Id: Icc9e71e848fd8a0b487f74232b9ad3e7ddde50b4
Signed-off-by: Stephan Bergmann sberg...@redhat.com
(cherry picked from commit 0706b5756e06b7773a78e3046a47efc2c81d92b1)
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index f9d60e5..26b8ab6 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -81,6 +81,7 @@
#include IDocumentSettingAccess.hxx
#include IDocumentStylePoolAccess.hxx
#include xmloff/odffields.hxx
+#include tools/urlobj.hxx
#define MAX_INDENT_LEVEL 20
@@ -1197,7 +1198,8 @@ OUString SwHTMLWriter::convertHyperlinkHRefValue(const
OUString rURL)
}
}
}
-return URIHelper::simpleNormalizedMakeRelative(GetBaseURL(), sURL);
+INetURLObject aURL( sURL );
+return URIHelper::simpleNormalizedMakeRelative( GetBaseURL(),
aURL.GetMainURL( INetURLObject::NO_DECODE ) );
}
void SwHTMLWriter::OutHyperlinkHRefValue( const OUString rURL )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo84685.rtf |7 ++
sw/qa/extras/rtfimport/rtfimport.cxx | 20 +++
writerfilter/source/rtftok/rtfcontrolwords.hxx |2 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 26 +
4 files changed, 55 insertions(+)
New commits:
commit 6631b46dfb894ff8f2bbb09c92f1786c756ee352
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 16 23:45:15 2014 +0100
(related fdo#84685): writerfilter: RTF import: support \tc TOC entry
Change-Id: Icda252e1f092707728d3a24df50fba7080e759bb
(cherry picked from commit 1dd1dfc152c7cbeb374fe4f38b08c6af9cef2c06)
diff --git a/sw/qa/extras/rtfimport/data/fdo84685.rtf
b/sw/qa/extras/rtfimport/data/fdo84685.rtf
index 431dbd3..af73b1a 100644
--- a/sw/qa/extras/rtfimport/data/fdo84685.rtf
+++ b/sw/qa/extras/rtfimport/data/fdo84685.rtf
@@ -2,4 +2,6 @@
\pard
{\v {\xe {\v {\f0\fs20 Key the 1st Some text
\par
+{\v {\tc {\v {\f0\fs20 foo Some text
+\par
}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index fafb2b0..e6a3619 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2092,6 +2092,14 @@ DECLARE_RTFIMPORT_TEST(testFdo84685, fdo84685.rtf)
DocumentIndexMark));
CPPUNIT_ASSERT(xMark.is());
CPPUNIT_ASSERT_EQUAL(OUString(Key the 1st), getPropertyOUString(xMark,
PrimaryKey));
+// let's test toc entry too
+uno::Referencetext::XDocumentIndexMark xTOCMark(
+getPropertyuno::Referencetext::XDocumentIndexMark(
+getRun(getParagraph(2), 1),
+DocumentIndexMark));
+CPPUNIT_ASSERT(xTOCMark.is());
+uno::Referencelang::XServiceInfo xTOCSI(xTOCMark, uno::UNO_QUERY);
+
CPPUNIT_ASSERT(xTOCSI-supportsService(com.sun.star.text.ContentIndexMark));
}
DECLARE_RTFIMPORT_TEST(testFdo83204, fdo83204.rtf)
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx
b/writerfilter/source/rtftok/rtfcontrolwords.hxx
index ac45593..f2f8ad5 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx
@@ -150,6 +150,7 @@ enum RTFDestinationState
DESTINATION_SHAPEGROUP,
DESTINATION_FOOTNOTESEPARATOR,
DESTINATION_INDEXENTRY,
+DESTINATION_TOCENTRY,
};
enum RTFKeyword
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 68fcbfd..1ae1986 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1262,6 +1262,7 @@ void RTFDocumentImpl::text(OUString rString)
case DESTINATION_MTYPE:
case DESTINATION_MGROW:
case DESTINATION_INDEXENTRY:
+case DESTINATION_TOCENTRY:
m_aStates.top().pDestinationText-append(rString);
break;
default:
@@ -1735,6 +1736,10 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
case RTF_XE:
m_aStates.top().nDestinationState = DESTINATION_INDEXENTRY;
break;
+case RTF_TC:
+case RTF_TCN:
+m_aStates.top().nDestinationState = DESTINATION_TOCENTRY;
+break;
case RTF_REVTBL:
m_aStates.top().nDestinationState = DESTINATION_REVISIONTABLE;
break;
@@ -5203,12 +5208,15 @@ int RTFDocumentImpl::popState()
}
break;
case DESTINATION_INDEXENTRY:
+case DESTINATION_TOCENTRY:
{
if (m_aStates.top().aDestinationText !=
m_aStates.top().pDestinationText)
break; // not for nested group
OUString str(m_aStates.top().pDestinationText-makeStringAndClear());
// dmapper expects this as a field, so let's fake something...
-str = XE \ + str.replaceAll(\, \\\) + \;
+OUString const field(
+(DESTINATION_INDEXENTRY == aState.nDestinationState) ? XE :
TC);
+str = field + \ + str.replaceAll(\, \\\) + \;
singleChar(0x13);
Mapper().utext(reinterpret_castsal_uInt8 const*(str.getStr()),
str.getLength());
singleChar(0x14);
commit 6b2cb891eb415f94ad54237e6e8c42acef513f45
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 16 23:17:28 2014 +0100
fdo#84685: writerfilter: RTF import: support \xe index entry
Change-Id: Ia957541a5997961aa86b2eb8537ebd29d3092691
(cherry picked from commit f14e6e06b9e3c82c267649d63512a3538e5ee2f5)
diff --git a/sw/qa/extras/rtfimport/data/fdo84685.rtf
b/sw/qa/extras/rtfimport/data/fdo84685.rtf
new file mode 100644
index 000..431dbd3
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo84685.rtf
@@ -0,0 +1,5 @@
+{\rtf1\ansi\ansicpg1252\uc1
+\pard
+{\v {\xe {\v {\f0\fs20 Key the 1st Some text
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 61a3864..fafb2b0 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -32,6 +32,7 @@
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - sw/qa writerfilter/source
sw/qa/extras/rtfexport/data/fdo82006.rtf |4 ++
sw/qa/extras/rtfexport/data/num-override-start.rtf | 29 +
sw/qa/extras/rtfexport/rtfexport.cxx | 15 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 ++-
4 files changed, 57 insertions(+), 1 deletion(-)
New commits:
commit 85086306939b6bebb8cf549966942f2e5a244388
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sat Nov 22 20:08:42 2014 +0100
fdo#82006 RTF filter: import \sbauto and \saauto
Change-Id: Iabff543c8191fc86dceb9274ea1552f60d73dabd
(cherry picked from commit bb77fd64f9219f1b8f990f5041d81cfddd021213)
diff --git a/sw/qa/extras/rtfexport/data/fdo82006.rtf
b/sw/qa/extras/rtfexport/data/fdo82006.rtf
new file mode 100644
index 000..0f5ee43
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo82006.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+\pard\plain
+\ql \sb100\sa100\sbauto1\saauto1 hello\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index c4118c6..221618d 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -843,6 +843,14 @@ DECLARE_RTFEXPORT_TEST(testNumOverrideStart,
num-override-start.rtf)
CPPUNIT_ASSERT_EQUAL(sal_Int16(1),
comphelper::SequenceAsHashMap(xRules-getByIndex(0))[StartWith].getsal_Int16());
CPPUNIT_ASSERT_EQUAL(sal_Int16(3),
comphelper::SequenceAsHashMap(xRules-getByIndex(1))[StartWith].getsal_Int16());
}
+
+DECLARE_RTFEXPORT_TEST(testFdo82006, fdo82006.rtf)
+{
+// These were 176 (100 twips), as \sbauto and \sbbefore were ignored.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(280)),
getPropertysal_Int32(getParagraph(0), ParaTopMargin));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(280)),
getPropertysal_Int32(getParagraph(0), ParaBottomMargin));
+}
+
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 84b689f..5e69009 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4881,6 +4881,14 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword,
bool bParam, int nParam
NS_ooxml::LN_trackchange, NS_ooxml::LN_token,
pValue);
}
break;
+case RTF_SBAUTO:
+lcl_putNestedAttribute(m_aStates.top().aParagraphSprms,
+ NS_ooxml::LN_CT_PPrBase_spacing,
NS_ooxml::LN_CT_Spacing_beforeAutospacing, pBoolValue, OVERWRITE_YES);
+break;
+case RTF_SAAUTO:
+lcl_putNestedAttribute(m_aStates.top().aParagraphSprms,
+ NS_ooxml::LN_CT_PPrBase_spacing,
NS_ooxml::LN_CT_Spacing_afterAutospacing, pBoolValue, OVERWRITE_YES);
+break;
default:
{
SAL_INFO(writerfilter, TODO handle toggle '
lcl_RtfToString(nKeyword) ');
commit d1c8f2a1228e187a4c353c1f414667be0248dfd8
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sat Nov 22 12:34:06 2014 +0100
RTF import: fix handling of multiple \lfolevel control words
Change-Id: I242853d491c2ef83f192486fa6fe5a3407700047
(cherry picked from commit 74249cb6f4f52b7c10ebaa92f943920f6f94aaf4)
diff --git a/sw/qa/extras/rtfexport/data/num-override-start.rtf
b/sw/qa/extras/rtfexport/data/num-override-start.rtf
new file mode 100644
index 000..aa1a2d4
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/num-override-start.rtf
@@ -0,0 +1,29 @@
+{\rtf1
+{\*\listtable
+{\list\listtemplateid-1627985480
+{\listlevel\levelnfc0
+\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'02\'00.;}
+{\levelnumbers\'01;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \s15\fi-360\li720\lin720 }
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levellegal\levelspace0\levelindent0
+{\leveltext\'03\'00.\'01;}
+{\levelnumbers\'01\'03;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0 \fi-360\li360\lin360 }
+{\listname ;}
+\listid94861222}
+}
+{\*\listoverridetable
+{\listoverride\listid94861222\listoverridecount2
+{\lfolevel\listoverridestartat\levelstartat1}
+{\lfolevel\listoverridestartat\levelstartat3}
+\ls1}
+}
+\pard\plain \ltrpar\s16\ql
\fi-360\li360\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin360\itap0\pararsid16599941
\rtlch\fcs1 \ab\af0\afs24\alang1025 \ltrch\fcs0
+\b\fs28\lang3082\langfe3082\cgrid\langnp3082\langfenp3082
+{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0
\fs20\lang2057\langfe3082\langnp2057\insrsid16599941 This should be 1.3}
+{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0
+\fs20\lang2057\langfe3082\langnp2057\insrsid14181417\charrsid16599941
+\par }
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 12fbfd1..c4118c6 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -836,6
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - sw/qa
sw/qa/extras/rtfexport/rtfexport.cxx |2 +-
sw/qa/extras/ww8export/ww8export.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fa83f3c4636d5dd754f064116900e596dffdb912
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 21 14:18:14 2014 +0100
WaE: âisNumberâ [-Werror=maybe-uninitialized]
Change-Id: I307af9b8619db00afaef378df60352c06eb1e4c9
(cherry picked from commit 04b3a3c801bc452f659048a816829300d6b2a16f)
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 019c87b..f55967e 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -31,7 +31,7 @@ public:
protected:
bool CjkNumberedListTestHelper(sal_Int16 nValue)
{
-bool isNumber;
+bool isNumber = false;
uno::Referencetext::XTextRange xPara(getParagraph(1));
uno::Reference beans::XPropertySet properties( xPara,
uno::UNO_QUERY);
properties-getPropertyValue(NumberingIsNumber) = isNumber;
commit 45a7a1a44d263d0e61a8251a7587b1dbc1b535dd
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 21 14:12:05 2014 +0100
WaE: âisNumberâ [-Werror=maybe-uninitialized]
Change-Id: I5a46eb90749965193d2965740d85a1a2eb1ce641
(cherry picked from commit 7171f7920ee2e8d31f51d27eab86305ecf14626e)
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 593f01e..12fbfd1 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -54,7 +54,7 @@ public:
bool CjkNumberedListTestHelper(sal_Int16 rValue)
{
-sal_Bool isNumber;
+sal_Bool isNumber = false;
uno::Referencetext::XTextRange xPara(getParagraph(1));
uno::Referencebeans::XPropertySet properties(xPara, uno::UNO_QUERY);
properties-getPropertyValue(NumberingIsNumber) = isNumber;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
