[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 15 commits - connectivity/source icon-themes/industrial icon-themes/sifr icon-themes/tango sd/qa svx/inc svx/source swext/mediawiki sw/qa sw/source vcl/unx writerfilter/source
Caolán McNamara
caolanm at redhat.com
Tue Apr 28 01:01:57 PDT 2015
connectivity/source/commontools/FValue.cxx | 5 +
icon-themes/industrial/cmd/lc_line_diagonal.png |binary
icon-themes/industrial/cmd/lc_linearrowsquare.png |binary
icon-themes/industrial/cmd/sc_linesquarearrow.png |binary
icon-themes/sifr/cmd/lc_linearrowsquare.png |binary
icon-themes/tango/cmd/sc_zoommode.png |binary
icon-themes/tango/cmd/sc_zoommode.xcf.bz2 |binary
icon-themes/tango/links.txt | 4 -
sd/qa/unit/import-tests.cxx | 1
svx/inc/getallcharpropids.hxx | 35 +++++++++
svx/source/svdraw/svdedtv1.cxx | 1
svx/source/table/cell.cxx | 3
sw/qa/extras/rtfexport/data/tdf80708.rtf | 15 ++++
sw/qa/extras/rtfexport/rtfexport.cxx | 11 ++
sw/source/core/access/acccontext.cxx | 9 --
sw/source/core/doc/docredln.cxx | 23 +++---
sw/source/core/edit/eddel.cxx | 2
sw/source/core/edit/edglss.cxx | 5 +
sw/source/filter/ww8/rtfattributeoutput.cxx | 2
swext/mediawiki/src/filter/odt2mediawiki.xsl | 67 +++++++++++++++---
vcl/unx/gtk/a11y/atktextattributes.cxx | 2
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 7 +
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 48 ++++++------
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 48 ++++++------
25 files changed, 207 insertions(+), 83 deletions(-)
New commits:
commit 58c90a24c8862de144de5c9bb58b71d97afddecc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 24 16:41:34 2015 +0100
Related: rhbz#1215060 pass std::exceptions through
Change-Id: Ifb3431a50f92b95dfc1e851f9584533271e69324
Reviewed-on: https://gerrit.libreoffice.org/15519
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 6f03fdc..b51ae35 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -203,7 +203,7 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
void OOXMLFastContextHandler::lcl_startFastElement
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
OOXMLFactory::getInstance()->startAction(this, Element);
if( Element == (NMSP_dmlWordDr|XML_positionV) )
@@ -215,7 +215,7 @@ void OOXMLFastContextHandler::lcl_startFastElement
void OOXMLFastContextHandler::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
OOXMLFactory::getInstance()->endAction(this, Element);
}
@@ -245,7 +245,7 @@ uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandler::lcl_createFastChildContext
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
return OOXMLFactory::getInstance()->createFastChildContext(this, Element);
}
@@ -270,7 +270,7 @@ void SAL_CALL OOXMLFastContextHandler::characters
void OOXMLFastContextHandler::lcl_characters
(const OUString & rString)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (!m_bDiscardChildren)
OOXMLFactory::getInstance()->characters(this, rString);
@@ -992,7 +992,7 @@ OOXMLFastContextHandlerProperties::~OOXMLFastContextHandlerProperties()
void OOXMLFastContextHandlerProperties::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
endAction(Element);
@@ -1136,7 +1136,7 @@ OOXMLFastContextHandlerPropertyTable::~OOXMLFastContextHandlerPropertyTable()
void OOXMLFastContextHandlerPropertyTable::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
OOXMLPropertySet::Pointer_t pPropSet(mpPropertySet->clone());
OOXMLTableImpl::ValuePointer_t pTmpVal
@@ -1177,7 +1177,7 @@ OOXMLValue::Pointer_t OOXMLFastContextHandlerValue::getValue() const
void OOXMLFastContextHandlerValue::lcl_endFastElement
(Token_t Element)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
sendPropertyToParent();
@@ -1248,7 +1248,7 @@ OOXMLFastContextHandlerTable::createFastChildContext
void OOXMLFastContextHandlerTable::lcl_endFastElement
(Token_t /*Element*/)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
addCurrentChild();
@@ -1300,7 +1300,7 @@ OOXMLFastContextHandlerXNote::~OOXMLFastContextHandlerXNote()
void OOXMLFastContextHandlerXNote::lcl_startFastElement
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
mbForwardEventsSaved = isForwardEvents();
@@ -1315,7 +1315,7 @@ void OOXMLFastContextHandlerXNote::lcl_startFastElement
void OOXMLFastContextHandlerXNote::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
endAction(Element);
@@ -1524,7 +1524,7 @@ OOXMLFastContextHandlerTextTable::~OOXMLFastContextHandlerTextTable()
void OOXMLFastContextHandlerTextTable::lcl_startFastElement
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
mpParserState->startTable();
mnTableDepth++;
@@ -1543,7 +1543,7 @@ void OOXMLFastContextHandlerTextTable::lcl_startFastElement
void OOXMLFastContextHandlerTextTable::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
endAction(Element);
@@ -1593,7 +1593,7 @@ OOXMLFastContextHandlerShape::~OOXMLFastContextHandlerShape()
void OOXMLFastContextHandlerShape::lcl_startFastElement
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
startAction(Element);
@@ -1649,7 +1649,7 @@ void OOXMLFastContextHandlerShape::sendShape( Token_t Element )
void OOXMLFastContextHandlerShape::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mrShapeContext.is())
{
@@ -1678,7 +1678,7 @@ uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandlerShape::lcl_createFastChildContext
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference< xml::sax::XFastContextHandler > xContextHandler;
@@ -1750,7 +1750,7 @@ OOXMLFastContextHandlerShape::createUnknownChildContext
void OOXMLFastContextHandlerShape::lcl_characters
(const OUString & aChars)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mrShapeContext.is())
mrShapeContext->characters(aChars);
@@ -1842,7 +1842,7 @@ void OOXMLFastContextHandlerWrapper::addToken( Token_t Token )
void OOXMLFastContextHandlerWrapper::lcl_startFastElement
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mxContext.is())
mxContext->startFastElement(Element, Attribs);
@@ -1850,7 +1850,7 @@ void OOXMLFastContextHandlerWrapper::lcl_startFastElement
void OOXMLFastContextHandlerWrapper::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mxContext.is())
mxContext->endFastElement(Element);
@@ -1860,7 +1860,7 @@ uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference< xml::sax::XFastContextHandler > xResult;
@@ -1894,7 +1894,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
void OOXMLFastContextHandlerWrapper::lcl_characters
(const OUString & aChars)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mxContext.is())
mxContext->characters(aChars);
@@ -2029,14 +2029,14 @@ OOXMLFastContextHandlerLinear::OOXMLFastContextHandlerLinear(OOXMLFastContextHan
void OOXMLFastContextHandlerLinear::lcl_startFastElement(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList >& Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
buffer.appendOpeningTag( Element, Attribs );
++depthCount;
}
void OOXMLFastContextHandlerLinear::lcl_endFastElement(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
buffer.appendClosingTag( Element );
if( --depthCount == 0 )
@@ -2046,7 +2046,7 @@ void OOXMLFastContextHandlerLinear::lcl_endFastElement(Token_t Element)
uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandlerLinear::lcl_createFastChildContext(Token_t,
const uno::Reference< xml::sax::XFastAttributeList >&)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference< xml::sax::XFastContextHandler > xContextHandler;
xContextHandler.set( this );
@@ -2054,7 +2054,7 @@ OOXMLFastContextHandlerLinear::lcl_createFastChildContext(Token_t,
}
void OOXMLFastContextHandlerLinear::lcl_characters(const OUString& aChars)
- throw (uno::RuntimeException, xml::sax::SAXException)
+ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
buffer.appendCharacters( aChars );
}
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 33ea6e0..291a644 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -220,16 +220,16 @@ protected:
unsigned int mnTableDepth;
virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException);
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException);
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException);
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
virtual void lcl_characters(const OUString & aChars)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException);
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
void startAction(Token_t Element);
void endAction(Token_t Element);
@@ -307,7 +307,7 @@ protected:
OOXMLPropertySet::Pointer_t mpPropertySet;
virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual void setParent(OOXMLFastContextHandler * pParent) SAL_OVERRIDE;
private:
@@ -326,7 +326,7 @@ protected:
OOXMLTableImpl mTable;
virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
};
class OOXMLFastContextHandlerValue :
@@ -341,7 +341,7 @@ public:
virtual OOXMLValue::Pointer_t getValue() const SAL_OVERRIDE;
virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual std::string getType() const SAL_OVERRIDE { return "Value"; }
@@ -371,7 +371,7 @@ protected:
css::uno::Reference<css::xml::sax::XFastContextHandler> mCurrentChild;
virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return TABLE; }
@@ -398,10 +398,10 @@ private:
sal_Int32 mnMyXNoteType;
virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return STREAM; }
};
@@ -447,10 +447,10 @@ public:
protected:
virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
};
class OOXMLFastContextHandlerShape: public OOXMLFastContextHandlerProperties
@@ -489,16 +489,16 @@ protected:
ShapeContextRef mrShapeContext;
virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual void lcl_characters(const OUString & aChars)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
};
@@ -542,16 +542,16 @@ public:
protected:
virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual void lcl_characters(const OUString & aChars)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual void setId(Id nId) SAL_OVERRIDE;
virtual Id getId() const SAL_OVERRIDE;
@@ -601,15 +601,15 @@ protected:
virtual void process() = 0;
virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void lcl_endFastElement(Token_t Element) throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ virtual void lcl_endFastElement(Token_t Element) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element,
const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void lcl_characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
+ virtual void lcl_characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
// should be private, but not much point in making deep copies of it
oox::formulaimport::XmlStreamBuilder buffer;
commit 05c651fba77886546036b3c97e21c319f696619b
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Sat Apr 25 19:34:58 2015 +0200
tdf#90614 oups... I was too eager in replacing getAny() with makeAny()
also handle the SQLNULL case
Conflicts:
connectivity/source/commontools/FValue.cxx
Change-Id: Ie7fffd6b46ed8b3dfa7231928f55743f71d2ea98
Reviewed-on: https://gerrit.libreoffice.org/15530
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index cc53d24..8248fd7 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -886,6 +886,9 @@ Any ORowSetValue::makeAny() const
{
switch(getTypeKind())
{
+ case DataType::SQLNULL:
+ assert(rValue == Any());
+ break;
case DataType::CHAR:
case DataType::VARCHAR:
case DataType::DECIMAL:
@@ -965,7 +968,7 @@ Any ORowSetValue::makeAny() const
break;
default:
SAL_WARN( "connectivity.commontools","ORowSetValue::makeAny(): UNSPUPPORTED TYPE!");
- rValue = makeAny();
+ rValue = getAny();
break;
}
}
commit 1694530a8e15565d8df4d430c01c85a5aedf9dbc
Author: Robert Antoni Buj Gelonch <robert.buj at gmail.com>
Date: Thu Apr 23 17:59:14 2015 +0200
tdf#75360 tdf#90474 line breaks in exporting to mediawiki
Change-Id: I1a5276600cf0dd00d02f6278c49dd16f51131130
Reviewed-on: https://gerrit.libreoffice.org/15496
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 44646b1..7198a1f 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -285,6 +285,7 @@
<text> </text>
<value-of select="$token"/>
<value-of select="$NL"/>
+ <value-of select="$NL"/>
</if>
</template>
@@ -293,6 +294,7 @@
<apply-templates/>
<text> ==</text>
<value-of select="$NL"/>
+ <value-of select="$NL"/>
</template>
<!--
@@ -579,7 +581,7 @@
== Paragraphs ==
-->
- <template match="text:p[string-length(.) > 0]">
+ <template match="text:p">
<variable name="style">
<call-template name="mk-style-set">
<with-param name="node" select="."/>
@@ -627,7 +629,7 @@
-->
<choose>
<when test="boolean(ancestor::text:list-item)">
- <text><br/> </text>
+ <text><br/></text>
</when>
<when test="$code">
<variable name="style-right">
@@ -665,12 +667,13 @@
</otherwise>
</choose>
</when>
- <when test="boolean(./following-sibling::*[1]/self::text:h) or boolean(./following-sibling::*[1]/self::table:table) or boolean(./following-sibling::*[1]/self::text:bibliography)">
+ <when test="boolean(./following::*[1]/self::text:h) or boolean(./following::*[1]/self::table:table) or boolean(./following::*[1]/self::text:bibliography)">
<!-- Newline before following heading or table. -->
<value-of select="$NL"/>
<value-of select="$NL"/>
</when>
- <when test="./following-sibling::*[1]/self::text:list and not(ancestor::text:list-item)">
+ <when test="not(./following-sibling::*[1]) and name(./following::*[1])='text:p' and ancestor::text:list-item">
+ <!-- End of the list -->
<value-of select="$NL"/>
<value-of select="$NL"/>
</when>
commit f2dd216f3bd3414b12b30e4ce39b7b72baaf7554
Author: Robert Antoni Buj Gelonch <robert.buj at gmail.com>
Date: Fri Apr 24 12:19:51 2015 +0200
tdf#75019 bookmarks in exporting to mediawiki
Change-Id: Ia20fea0a7c265aedb11e0018c321395ee874fd1e
Reviewed-on: https://gerrit.libreoffice.org/15507
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 1205536..44646b1 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -514,12 +514,37 @@
<variable name="link-ref" select="@xlink:href"/>
<choose>
<when test="string-length($link-ref) > 0">
- <variable name="link-label" select="string(.)"/>
- <text>[</text>
- <value-of select="$link-ref"/>
- <text> </text>
- <value-of select="$link-label"/>
- <text>]</text>
+ <choose>
+ <when test="starts-with($link-ref, '#')">
+ <text>[[</text>
+ <choose>
+ <when test="contains($link-ref, '_')">
+ <value-of select="translate($link-ref,'_','')"/>
+ </when>
+ <otherwise>
+ <value-of select="$link-ref"/>
+ </otherwise>
+ </choose>
+ <text>|</text>
+ <choose>
+ <when test="text:tab and ancestor::text:index-body">
+ <value-of select="node()[1]"/>
+ </when>
+ <otherwise>
+ <value-of select="string(.)"/>
+ </otherwise>
+ </choose>
+ <text>]]</text>
+ </when>
+
+ <otherwise>
+ <text>[</text>
+ <value-of select="$link-ref"/>
+ <text> </text>
+ <value-of select="string(.)"/>
+ <text>]</text>
+ </otherwise>
+ </choose>
</when>
<otherwise>
@@ -891,6 +916,25 @@
<!-- TODO: Output an anchor. -->
</template>
+ <template match="text:bookmark-start">
+ <if test="boolean(@text:name)">
+ <variable name="bookmark">
+ <choose>
+ <when test="contains(@text:name,'_')">
+ <value-of select="translate(@text:name,'_','')"/>
+ </when>
+ <otherwise>
+ <value-of select="@text:name"/>
+ </otherwise>
+ </choose>
+ </variable>
+ <text>{{anchor|</text>
+ <value-of select="$bookmark"/>
+ <text>}} </text>
+ </if>
+ <apply-templates/>
+ </template>
+
<!--
== Plain text ==
-->
commit 929bca0797ae344b0fca337508a6b1e313b6f613
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Mar 5 12:23:46 2015 +0100
Actually execute testPDFImportSkipImages
(cherry picked from commit b8ca219893a6e14bfea3cec5522532c144ad2fa6)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: Ie3dda6d7ea24031eadf86801867a94f95c11310e
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 7103e3f..024801b 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -130,6 +130,7 @@ public:
CPPUNIT_TEST(testBnc862510_6);
CPPUNIT_TEST(testBnc862510_7);
CPPUNIT_TEST(testPDFImport);
+ CPPUNIT_TEST(testPDFImportSkipImages);
CPPUNIT_TEST(testBnc910045);
CPPUNIT_TEST_SUITE_END();
commit 7c40a11a13fd969c8bcb7d7d0683e46a7ea1f4c9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Feb 19 08:54:09 2015 +0100
loplugin:externandnotdefined
Change-Id: I94271681ea4ec7617eaf706fb443ebb9d1b0bc15
(cherry picked from commit cb3518f331a99ff9a3187286e9e2b695df1c0292)
diff --git a/svx/inc/getallcharpropids.hxx b/svx/inc/getallcharpropids.hxx
new file mode 100644
index 0000000..c52d41b
--- /dev/null
+++ b/svx/inc/getallcharpropids.hxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SVX_INC_GETALLCHARPROPIDS_HXX
+#define INCLUDED_SVX_INC_GETALLCHARPROPIDS_HXX
+
+#include <sal/config.h>
+
+#include <vector>
+
+#include <sal/types.h>
+
+class SfxItemSet;
+
+std::vector<sal_uInt16> GetAllCharPropIds(const SfxItemSet& rSet);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 62c4cff..4a3cb0f 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -28,6 +28,7 @@
#include <tools/bigint.hxx>
#include <vcl/msgbox.hxx>
+#include "getallcharpropids.hxx"
#include "svdglob.hxx"
#include "svx/svditer.hxx"
#include "svx/svdstr.hrc"
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 3468283..595f90a 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -42,6 +42,7 @@
#include "svx/unoshtxt.hxx"
#include "svx/svdmodel.hxx"
+#include "getallcharpropids.hxx"
#include "tableundo.hxx"
#include "cell.hxx"
#include "svx/unoshprp.hxx"
@@ -139,8 +140,6 @@ SdrText* CellTextProvider::getText(sal_Int32 nIndex) const
}
-extern std::vector<sal_uInt16> GetAllCharPropIds(const SfxItemSet& rSet);
-
namespace sdr
{
namespace properties
commit 2ed645118617cb3adc9c150ff7bb8f55553f507b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Feb 5 15:29:22 2015 +0100
-Werror,-Wformat-security
Change-Id: I62ff8a172a9c4f361ef5fcb6d60bd9fd2e959c2d
(cherry picked from commit b8cf9b3359195f4f9f7e92f5db224a91cf994306)
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index bc286d0..ec09a2b 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -1235,7 +1235,7 @@ attribute_set_new_from_extended_attributes(
pSet = attribute_set_prepend( pSet,
atk_text_attribute_register( sPropertyName.getStr() ),
- g_strdup_printf( sPropertyValue.getStr() ) );
+ g_strdup_printf( "%s", sPropertyValue.getStr() ) );
}
while ( nIndex >= 0 && nIndex < sExtendedAttrs.getLength() );
commit 94d596de9758a5f12e5b3ff064e79c297fc93907
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Apr 24 23:31:06 2015 +0200
sw: fix SwAccessibleParagraph crash on delete
It happens that SwAccessibleParagraph::getCharacterBounds() is called
from ATK with a clearly invalid pPortionData member; the SwTxtNode has
no text but there are portions.
This is because after a deletion both a POS_CHANGED and a
INVALID_CONTENT event are created for the same SwAccessibleParagraph,
and they are merged into one POS_CHANGED event by
SwAccessibleMap::AppendEvent(), but
SwAccessibleContext::InvalidatePosOrSize() returns early if the
paragraph happens to not be visible, skipping the invalidation.
(regression from 76c549eb01dcb7b5bf28a271ce00e386f3d388ba, which
removed a Dispose() call; not sure if the Dispose() is needed here)
Change-Id: I985e9a439ee6c7024963eace876186f2247b9e03
(cherry picked from commit 104ed86c382b73505b477bf3024982dd27823023)
Reviewed-on: https://gerrit.libreoffice.org/15534
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 8021c19..9a09055 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1167,12 +1167,9 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
FireVisibleDataEvent();
}
- if( !bIsNewShowingState &&
- SwAccessibleChild( GetParent() ).IsVisibleChildrenOnly() )
- {
- return;
- }
-
+ // note: InvalidatePosOrSize must call _InvalidateContent so that
+ // SwAccessibleParagraph updates its portions, or dispose it
+ // (see accmap.cxx: INVALID_CONTENT is contained in POS_CHANGED)
_InvalidateContent( true );
}
commit 4ddbe7216f16253c319ba8e68aa40babcb0f5c81
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Apr 25 21:25:00 2015 +0200
rhbz#1205072: sw: resource mangement SNAFU caused by SwPaM copy ctor
SwPaM copy ctor has the surprising habit of linking the new one into the
old one's Ring. If you copy a shell cursor, *this* epic fail happens:
==948== Thread 6 SelectionManager:
==948== Invalid free() / delete / delete[] / realloc()
==948== at 0x4A07CE9: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==948== by 0x222F542B: SwPaM::operator delete(void*, unsigned long) (in /libreoffice-4-3/instdir/program/libswlo.so)
==948== by 0x2239E20E: SwPaM::~SwPaM() (pam.cxx:422)
==948== by 0x22368630: CheckRange(SwCursor*) (crsrsh.cxx:111)
==948== by 0x2236DECC: SwCrsrShell::UpdateCrsr(unsigned short, bool) (crsrsh.cxx:1397)
==948== by 0x22369113: SwCrsrShell::EndAction(bool) (crsrsh.cxx:290)
==948== by 0x2268971F: SwEditShell::EndAllAction() (edws.cxx:87)
==948== by 0x2262BEF3: SwBaseLink::DataChanged(rtl::OUString const&, com::sun::star::uno::Any const&) (swbaslnk.cxx:274)
==948== by 0x2262C78E: SwBaseLink::SwapIn(bool, bool) (swbaslnk.cxx:411)
==948== by 0x227102EC: SwGrfNode::SwapIn(bool) (ndgrf.cxx:539)
==948== by 0x227121BC: SwGrfNode::MakeCopy(SwDoc*, SwNodeIndex const&) const (ndgrf.cxx:999)
==948== by 0x22610E4D: SwNodes::_CopyNodes(SwNodeRange const&, SwNodeIndex const&, bool, bool) const (nodes.cxx:1862)
==948== by 0x225B98E0: SwDoc::CopyWithFlyInFly(SwNodeRange const&, int, SwNodeIndex const&, SwPaM const*, bool, bool, bool) const (ndcopy.cxx:1336)
==948== by 0x224AC1FF: SwDoc::CopyLayoutFmt(SwFrmFmt const&, SwFmtAnchor const&, bool, bool) (doclay.cxx:446)
==948== by 0x2294D2D4: SwTxtFlyCnt::CopyFlyFmt(SwDoc*) (atrflyin.cxx:130)
==948== by 0x229A5B96: MakeTxtAttr(SwDoc&, SfxPoolItem&, int, int, CopyOrNew_t, SwTxtNode*) (thints.cxx:1060)
==948== by 0x229A64E6: SwTxtNode::InsertItem(SfxPoolItem&, int, int, unsigned short) (thints.cxx:1224)
==948== by 0x2298E536: SwTxtNode::CopyText(SwTxtNode*, SwIndex const&, SwIndex const&, int, bool) (ndtxt.cxx:1773)
==948== by 0x2298DC08: SwTxtNode::CopyText(SwTxtNode*, SwIndex const&, int, bool) (ndtxt.cxx:1555)
==948== by 0x225B4C9D: SwTxtNode::MakeCopy(SwDoc*, SwNodeIndex const&) const (ndcopy.cxx:286)
==948== by 0x22610E4D: SwNodes::_CopyNodes(SwNodeRange const&, SwNodeIndex const&, bool, bool) const (nodes.cxx:1862)
==948== by 0x223EF3C2: SwNodes::_Copy(SwNodeRange const&, SwNodeIndex const&, bool) const (ndarr.hxx:182)
==948== by 0x225B5D8D: SwTableNode::MakeCopy(SwDoc*, SwNodeIndex const&) const (ndcopy.cxx:475)
==948== by 0x22610ACA: SwNodes::_CopyNodes(SwNodeRange const&, SwNodeIndex const&, bool, bool) const (nodes.cxx:1790)
==948== by 0x223EF3C2: SwNodes::_Copy(SwNodeRange const&, SwNodeIndex const&, bool) const (ndarr.hxx:182)
==948== by 0x225CA663: SwSectionNode::MakeCopy(SwDoc*, SwNodeIndex const&) const (ndsect.cxx:1270)
==948== by 0x22610BFC: SwNodes::_CopyNodes(SwNodeRange const&, SwNodeIndex const&, bool, bool) const (nodes.cxx:1817)
==948== by 0x223EF3C2: SwNodes::_Copy(SwNodeRange const&, SwNodeIndex const&, bool) const (ndarr.hxx:182)
==948== by 0x225CA663: SwSectionNode::MakeCopy(SwDoc*, SwNodeIndex const&) const (ndsect.cxx:1270)
==948== by 0x22610BFC: SwNodes::_CopyNodes(SwNodeRange const&, SwNodeIndex const&, bool, bool) const (nodes.cxx:1817)
==948== by 0x223EF3C2: SwNodes::_Copy(SwNodeRange const&, SwNodeIndex const&, bool) const (ndarr.hxx:182)
==948== by 0x225CA663: SwSectionNode::MakeCopy(SwDoc*, SwNodeIndex const&) const (ndsect.cxx:1270)
==948== by 0x22610BFC: SwNodes::_CopyNodes(SwNodeRange const&, SwNodeIndex const&, bool, bool) const (nodes.cxx:1817)
==948== by 0x225B98E0: SwDoc::CopyWithFlyInFly(SwNodeRange const&, int, SwNodeIndex const&, SwPaM const*, bool, bool, bool) const (ndcopy.cxx:1336)
==948== by 0x225B8F15: SwDoc::CopyImpl(SwPaM&, SwPosition&, bool, bool, SwPaM*) const (ndcopy.cxx:1239)
==948== by 0x225B6EE0: SwDoc::CopyRange(SwPaM&, SwPosition&, bool) const (ndcopy.cxx:707)
==948== by 0x22667E69: SwEditShell::_CopySelToDoc(SwDoc*, SwNodeIndex*) (edglss.cxx:244)
==948== by 0x226C8400: SwFEShell::Copy(SwDoc*, rtl::OUString const*) (fecopy.cxx:214)
==948== by 0x22DBF72B: (anonymous namespace)::lclOverWriteDoc(SwWrtShell&, SwDoc&) (swdtflvr.cxx:373)
==948== by 0x22DBFBC6: SwTransferable::GetData(com::sun::star::datatransfer::DataFlavor const&, rtl::OUString const&) (swdtflvr.cxx:439)
==948== by 0x7CB36C7: TransferableHelper::getTransferData2(com::sun::star::datatransfer::DataFlavor const&, rtl::OUString const&) (transfer.cxx:332)
==948== by 0x7CB34B5: TransferableHelper::getTransferData(com::sun::star::datatransfer::DataFlavor const&) (transfer.cxx:306)
==948== by 0x17A7E949: x11::SelectionManager::convertData(com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> const&, unsigned long, unsigned long, int&, com::sun::star::uno::Sequence<signed char>&) (X11_selection.cxx:655)
==948== by 0x17A823CA: x11::SelectionManager::sendData(x11::SelectionAdaptor*, unsigned long, unsigned long, unsigned long, unsigned long) (X11_selection.cxx:1503)
==948== by 0x17A82E03: x11::SelectionManager::handleSelectionRequest(XSelectionRequestEvent&) (X11_selection.cxx:1729)
==948== by 0x17A8A08A: x11::SelectionManager::handleXEvent(_XEvent&) (X11_selection.cxx:3574)
==948== Address 0x21e31a60 is on thread 6's stack
==948== in frame #40, created by SwEditShell::_CopySelToDoc(SwDoc*, SwNodeIndex*) (edglss.cxx:158)
(regression from 49505336a629a75f4fb48bbe0c532b402e857ed4)
(cherry picked from commit c55599fd0e7198773087c6433031f7119aaaca36)
Conflicts:
sw/source/core/edit/edglss.cxx
Change-Id: I3d0a288a83b4719dda7977b4898dea656ea67388
Reviewed-on: https://gerrit.libreoffice.org/15533
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 789c4c4..5bedb7e 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -95,7 +95,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
if (bSelectAll)
{
assert(dynamic_cast<SwShellCrsr*>(&rPam)); // must be corrected pam
- pNewPam.reset(new SwPaM(rPam));
+ pNewPam.reset(new SwPaM(*rPam.GetMark(), *rPam.GetPoint()));
// Selection starts at the first para of the first cell, but we
// want to delete the table node before the first cell as well.
pNewPam->Start()->nNode = pNewPam->Start()->nNode.GetNode().FindTableNode()->GetIndex();
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index bf7c347..81b709a 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -237,12 +237,15 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
// Make a copy, so that in case we need to adjust the selection
// for the purpose of copying, our shell cursor is not touched.
// (Otherwise we would have to restore it.)
- SwPaM aPaM(*PCURCRSR);
+ SwPaM aPaM(*PCURCRSR->GetMark(), *PCURCRSR->GetPoint());
if (bSelectAll)
+ {
// Selection starts at the first para of the first cell,
// but we want to copy the table and the start node before
// the first cell as well.
aPaM.Start()->nNode = aPaM.Start()->nNode.GetNode().FindTableNode()->GetIndex();
+ aPaM.Start()->nContent.Assign(nullptr, 0);
+ }
bRet = GetDoc()->getIDocumentContentOperations().CopyRange( aPaM, aPos, false ) || bRet;
}
commit ab4c5eff87c0349b9ed72098e6cc8f5c08798e1a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 24 11:01:50 2015 +0100
Resolves: tdf#73211 gtk checkboxes need erase afer toggling
because an unchecked checkbox can have a smaller paint area
than a checked checkbox. This has always bugged me
(cherry picked from commit d194074aa34e3724dd9b93fbc81bf2ba793cd37a)
Conflicts:
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
Change-Id: Iac0f075089611b47c381863a9655445d732bfddc
Reviewed-on: https://gerrit.libreoffice.org/15508
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 2c6036b..828f5aa 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -538,6 +538,8 @@ void GtkData::initNWF( void )
pSVData->maNWFData.mnMenuFormatBorderX = xthickness + horizontal_padding;
pSVData->maNWFData.mnMenuFormatBorderY = ythickness + vertical_padding;
+ pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+
if( SalGetDesktopEnvironment() == "KDE" )
{
// #i97196# ensure a widget exists and the style engine was loaded
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 0bb0c34..9d11e5e 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1470,7 +1470,12 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
return false;
}
-void GtkData::initNWF() {}
+void GtkData::initNWF()
+{
+ ImplSVData* pSVData = ImplGetSVData();
+ pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+}
+
void GtkData::deInitNWF() {}
void GtkSalGraphics::getStyleContext(GtkStyleContext** style, GtkWidget* widget)
commit d05a6685b6a10975d70b7912d00acfab87f7fcce
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Apr 20 16:38:32 2015 +0200
tdf#80708 RTF export: fix unexpected table row break
Regression from commit 1f77a5e8d5bf8a7f1b7bd7206996d2b2efc59462
(n#203704 fix RTF export table output for subtables, 2012-02-08), the
problem is that RtfAttributeOutput::StartTableRow() has two callers
depending on if it's the first or a later row, but the m_bTableRowEnded
flag storing if that method is called is only set in one case.
Fix the problem by moving the update of the flag to the method itself.
(cherry picked from commit 5e2708a5a8cad3c2f4578742264610abab677395)
Conflicts:
sw/qa/extras/rtfexport/rtfexport.cxx
Change-Id: Ieae1fb53f9528fc74d037d2fd783b3979b17cab8
Reviewed-on: https://gerrit.libreoffice.org/15506
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/qa/extras/rtfexport/data/tdf80708.rtf b/sw/qa/extras/rtfexport/data/tdf80708.rtf
new file mode 100644
index 0000000..30b6174
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf80708.rtf
@@ -0,0 +1,15 @@
+{\rtf1
+\pard\plain
+{first table}
+\par \trowd\trql\trleft-108\ltrrow\trrh-374\trkeep\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrl\brdrhair\brdrcf1\cellx296\clbrdrl\brdrhair\brdrcf1\clbrdrr\brdrhair\brdrcf1\cellx702\pard\plain
+{A1}
+\cell\pard\plain \s0\ql
+{A2}
+\cell\row\pard\pard\plain \s42\ql
+{\rtlch \ltrch\loch\lang2067 second table}
+\par \trowd\trql\trleft-108\ltrrow\trrh-561\trkeep\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrl\brdrhair\brdrcf1\cellx296\clbrdrl\brdrhair\brdrcf1\clbrdrr\brdrhair\brdrcf1\cellx702\pard\plain \s0\ql
+{A1}
+\cell\pard\plain \s0\ql
+{A2}
+\cell\row\pard\pard\plain\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index bbd969d..2a13b4b 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -18,6 +18,7 @@
#include <com/sun/star/table/ShadowFormat.hpp>
#include <com/sun/star/text/FontEmphasis.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
+#include <com/sun/star/text/TableColumnSeparator.hpp>
#include <com/sun/star/text/TextContentAnchorType.hpp>
#include <com/sun/star/text/XFootnotesSupplier.hpp>
#include <com/sun/star/text/XPageCursor.hpp>
@@ -858,6 +859,16 @@ DECLARE_RTFEXPORT_TEST(testTdf88583, "tdf88583.odt")
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0x00cc00), getProperty<sal_Int32>(getParagraph(1), "FillColor"));
}
+DECLARE_RTFEXPORT_TEST(testTdf80708, "tdf80708.rtf")
+{
+ uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess> xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+ uno::Reference<text::XTextTable> xTable(xTables->getByIndex(1), uno::UNO_QUERY);
+ uno::Reference<table::XTableRows> xTableRows(xTable->getRows(), uno::UNO_QUERY);
+ // This was 2, i.e. the second table had 3 cols, now 2 as expected.
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), getProperty< uno::Sequence<text::TableColumnSeparator> >(xTableRows->getByIndex(0), "TableColumnSeparators").getLength());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 84b031a..7071e7b 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -245,7 +245,6 @@ void RtfAttributeOutput::StartParagraph(ww8::WW8TableNodeInfo::Pointer_t pTextNo
// In case of subtables, we may not get the first cell.
if (pDeepInner && (pDeepInner->getCell() == 0 || m_bTableRowEnded))
{
- m_bTableRowEnded = false;
StartTableRow(pDeepInner);
}
@@ -882,6 +881,7 @@ void RtfAttributeOutput::StartTableRow(ww8::WW8TableNodeInfoInner::Pointer_t pTa
{
sal_uInt32 nCurrentDepth = pTableTextNodeInfoInner->getDepth();
SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", (depth is " << nCurrentDepth << ")");
+ m_bTableRowEnded = false;
TableDefinition(pTableTextNodeInfoInner);
commit eb56518c576e13243e6a8ab35bf7679ac559bace
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Apr 22 14:28:38 2015 +0200
rhbz#1198848: sw: delete *all* table redlines to fix DOCX import crash
SwExtraRedlineTbl::DeleteAllTableRedlines() increments its position even
when deleting the current element from the vector.
Change-Id: Ie827a7b66fa9690bbabaf53204e9ec77247239f2
(cherry picked from commit 28764d7ed5df874c2bfbc6025a97968e08cf2315)
Reviewed-on: https://gerrit.libreoffice.org/15480
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 91a2b58..bdec038 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -121,7 +121,7 @@ bool SwExtraRedlineTbl::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTab
*/
}
- for(sal_uInt16 nCurRedlinePos = 0; nCurRedlinePos < GetSize(); ++nCurRedlinePos )
+ for (sal_uInt16 nCurRedlinePos = 0; nCurRedlinePos < GetSize(); )
{
SwExtraRedline* pExtraRedline = GetRedline(nCurRedlinePos);
const SwTableCellRedline* pTableCellRedline = dynamic_cast<const SwTableCellRedline*>(pExtraRedline);
@@ -136,11 +136,13 @@ bool SwExtraRedlineTbl::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTab
sal_uInt16 nRedlineType = aRedlineData.GetType();
// Check if this redline object type should be deleted
- if( USHRT_MAX != nRedlineTypeToDelete && nRedlineTypeToDelete != nRedlineType )
- continue;
+ if (USHRT_MAX == nRedlineTypeToDelete || nRedlineTypeToDelete == nRedlineType)
+ {
- DeleteAndDestroy( nCurRedlinePos );
- bChg = true;
+ DeleteAndDestroy( nCurRedlinePos );
+ bChg = true;
+ continue; // don't increment position after delete
+ }
}
}
else
@@ -158,14 +160,17 @@ bool SwExtraRedlineTbl::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTab
sal_uInt16 nRedlineType = aRedlineData.GetType();
// Check if this redline object type should be deleted
- if( USHRT_MAX != nRedlineTypeToDelete && nRedlineTypeToDelete != nRedlineType )
- continue;
+ if (USHRT_MAX == nRedlineTypeToDelete || nRedlineTypeToDelete == nRedlineType)
- DeleteAndDestroy( nCurRedlinePos );
- bChg = true;
+ {
+ DeleteAndDestroy( nCurRedlinePos );
+ bChg = true;
+ continue; // don't increment position after delete
+ }
}
}
}
+ ++nCurRedlinePos;
}
if( bChg )
commit b345e8e485e60cf1f82361901caf097a311ec310
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Sun Apr 19 01:40:20 2015 +0400
TANGO: Fix links.txt entry for default icon of curves split button
Change-Id: I84a2581429b1453a5e2ba896402dc6b687cad0c4
Reviewed-on: https://gerrit.libreoffice.org/15379
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
(cherry picked from commit e1929061783b9d0276a51ee5f1979cf62f434c5c)
Reviewed-on: https://gerrit.libreoffice.org/15407
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 5d8acc9..63ca513 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -162,7 +162,7 @@ cmd/lc_starshapes.png cmd/lc_starshapes.star5.png
cmd/lc_symbolshapes.png cmd/lc_symbolshapes.smiley.png
cmd/lc_ellipsetoolbox.png cmd/lc_basicshapes.ellipse.png
cmd/lc_rectangletoolbox.png cmd/lc_basicshapes.rectangle.png
-cmd/lc_linetoolbox.png cmd/lc_freeline.png
+cmd/lc_linetoolbox.png cmd/lc_freeline_unfilled.png
cmd/lc_texttoolbox.png cmd/lc_text.png
cmd/lc_inserttoolbox.png cmd/lc_drawchart.png
cmd/lc_objects3dtoolbox.png cmd/lc_cube.png
@@ -178,7 +178,7 @@ cmd/sc_starshapes.png cmd/sc_starshapes.star5.png
cmd/sc_symbolshapes.png cmd/sc_symbolshapes.smiley.png
cmd/sc_ellipsetoolbox.png cmd/sc_basicshapes.ellipse.png
cmd/sc_rectangletoolbox.png cmd/sc_basicshapes.rectangle.png
-cmd/sc_linetoolbox.png cmd/sc_freeline.png
+cmd/sc_linetoolbox.png cmd/sc_freeline_unfilled.png
cmd/sc_texttoolbox.png cmd/sc_text.png
cmd/sc_inserttoolbox.png cmd/sc_drawchart.png
cmd/sc_objects3dtoolbox.png cmd/sc_cube.png
commit df89789157059f7e8db365382567bf9f822a54b4
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Thu Apr 23 07:52:05 2015 +0400
TANGO: Add small zoom & pan icon
Change-Id: I975229f968f6dc21af197eaa23c47df2fae73622
Reviewed-on: https://gerrit.libreoffice.org/15490
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit 47ef118421364e8f3e5135538e7aeff218495d23)
Reviewed-on: https://gerrit.libreoffice.org/15493
diff --git a/icon-themes/tango/cmd/sc_zoommode.png b/icon-themes/tango/cmd/sc_zoommode.png
new file mode 100644
index 0000000..f6b32d6
Binary files /dev/null and b/icon-themes/tango/cmd/sc_zoommode.png differ
diff --git a/icon-themes/tango/cmd/sc_zoommode.xcf.bz2 b/icon-themes/tango/cmd/sc_zoommode.xcf.bz2
new file mode 100644
index 0000000..18d70b1
Binary files /dev/null and b/icon-themes/tango/cmd/sc_zoommode.xcf.bz2 differ
commit dc7ba512e262e0e4a2652ec0a50194e469232756
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Thu Apr 23 18:49:59 2015 +0400
ICONS: Fix some line icons in industrial and sifr
Change-Id: Idee7c33929a92dad83517a9af5cc360ebc6e2034
Reviewed-on: https://gerrit.libreoffice.org/15499
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/icon-themes/industrial/cmd/lc_line_diagonal.png b/icon-themes/industrial/cmd/lc_line_diagonal.png
index ccfa1b4..cb3df7f 100644
Binary files a/icon-themes/industrial/cmd/lc_line_diagonal.png and b/icon-themes/industrial/cmd/lc_line_diagonal.png differ
diff --git a/icon-themes/industrial/cmd/lc_linearrowsquare.png b/icon-themes/industrial/cmd/lc_linearrowsquare.png
index 9499554..91f18b3 100644
Binary files a/icon-themes/industrial/cmd/lc_linearrowsquare.png and b/icon-themes/industrial/cmd/lc_linearrowsquare.png differ
diff --git a/icon-themes/industrial/cmd/sc_linesquarearrow.png b/icon-themes/industrial/cmd/sc_linesquarearrow.png
index 4ee640e..68b3780 100644
Binary files a/icon-themes/industrial/cmd/sc_linesquarearrow.png and b/icon-themes/industrial/cmd/sc_linesquarearrow.png differ
diff --git a/icon-themes/sifr/cmd/lc_linearrowsquare.png b/icon-themes/sifr/cmd/lc_linearrowsquare.png
index 535b36b..43a6be9 100644
Binary files a/icon-themes/sifr/cmd/lc_linearrowsquare.png and b/icon-themes/sifr/cmd/lc_linearrowsquare.png differ
More information about the Libreoffice-commits
mailing list