[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 5 commits - sc/source starmath/source sw/qa sw/source
Caolán McNamara
caolanm at redhat.com
Tue Jan 27 01:44:36 PST 2015
sc/source/ui/cctrl/checklistmenu.cxx | 3
sc/source/ui/dbgui/tpsort.cxx | 2
starmath/source/node.cxx | 2
sw/qa/core/data/html/pass/fdo87601-1.html | 100 ++++++++++++++++++++++++++++++
sw/source/filter/html/swhtml.cxx | 2
sw/source/filter/xml/xmltexti.cxx | 18 +++--
6 files changed, 116 insertions(+), 11 deletions(-)
New commits:
commit 27aee569d57815acf564b6e47e55caefbb164f8c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 20 16:17:07 2015 +0000
Resolves: fdo#84943 make fodt non crashy like odt for formulas inside shapes
where odt checks for a null pTxtCrsr and skips the object and fodt
just ploughed ahead. i.e. make fodt equally useless as odt (fdo#84942)
(cherry picked from commit 4345a3de0e5a600685fef5dc9fa422fe6849a0a3)
Conflicts:
sw/source/filter/xml/xmltexti.cxx
Change-Id: I915cc1f7c065ea83377e895a932636c82698cf1f
Reviewed-on: https://gerrit.libreoffice.org/14058
Tested-by: Michael Stahl <mstahl at redhat.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index fb968ac..8ae40ff 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -235,7 +235,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
+ SAL_WARN_IF(!pTxtCrsr, "sw.uno", "SwXTextCursor missing");
SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport );
SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -289,12 +289,16 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
lcl_setObjectVisualArea( xObj, nAspect, aTwipSize, MAP_TWIP );
}
- pFrmFmt = pDoc->Insert( *pTxtCrsr->GetPaM(),
- ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
- &aItemSet,
- NULL,
- NULL );
- pOLENd = lcl_GetOLENode( pFrmFmt );
+ if( pTxtCrsr )
+ {
+ pFrmFmt = pDoc->Insert( *pTxtCrsr->GetPaM(),
+ ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
+ &aItemSet,
+ NULL,
+ NULL );
+ pOLENd = lcl_GetOLENode( pFrmFmt );
+ }
+
if( pOLENd )
aObjName = pOLENd->GetOLEObj().GetCurrentPersistName();
}
commit c9054070ffc9223d05c3f4903179e3e3fd409b17
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 21 15:25:03 2015 +0000
Resolves: fdo#87601 specific html doc hangs on load
Change-Id: I67f472d72efe123b533d4d94be0084986c0e8349
(cherry picked from commit 6acd5c45c764d81aea1539e66adbfadb51df0aa3)
Reviewed-on: https://gerrit.libreoffice.org/14081
Tested-by: Michael Stahl <mstahl at redhat.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/qa/core/data/html/pass/fdo87601-1.html b/sw/qa/core/data/html/pass/fdo87601-1.html
new file mode 100644
index 0000000..b33f11c
--- /dev/null
+++ b/sw/qa/core/data/html/pass/fdo87601-1.html
@@ -0,0 +1,100 @@
+
+ <html xmlns:v="urn:schemas-microsoft-com:vml"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:w="urn:schemas-microsoft-com:office:word"
+ xmlns:m="http://schemas.microsoft.com/office/2006/01/omml"
+ xmlns="http://www.w3.org/TR/REC-html40">
+ <head>
+ <meta http-equiv=Content-Type content="text/html; charset=utf-8">
+ <style>
+ v\:* {behavior:url(#default#VML);}
+ o\:* {behavior:url(#default#VML);}
+ w\:* {behavior:url(#default#VML);}
+ .shape {behavior:url(#default#VML);}
+ </style>
+ <style>
+ @page
+ {
+ mso-page-orientation: portrait;
+ size:21cm 29.7cm; margin:1cm 1cm 1cm 1cm;
+ }
+ @page Section1 {
+ mso-header-margin:.5in;
+ mso-footer-margin:.5in;
+ mso-header: h1;
+ mso-footer: f1;
+ mso-bidi-font:Arial;
+ }
+ div.Section1 { page:Section1; }
+ table {
+ border-spacing: 0;
+ border-collapse: collapse;
+ font-size: 10.0pt;
+ }
+ td
+ {
+ border: 1px solid #000;
+ font-size:10.0pt;
+ font-family:Verdana,sans-serif;
+ margin-bottom:0.000cm;
+ vertical-align:top;
+ }
+ p.MsoFooter, li.MsoFooter, div.MsoFooter
+ {
+ margin:0in;
+ margin-bottom:.0001pt;
+ mso-pagination:widow-orphan;
+ tab-stops:center 3.0in right 6.0in;
+ font-size:10.0pt;
+ }
+ </style>
+ <xml>
+ <w:WordDocument>
+ <w:View>Print</w:View>
+ <w:Zoom>100</w:Zoom>
+ <w:DoNotOptimizeForBrowsertc2ms/>
+ </w:WordDocument>
+ </xml>
+ </head>
+ <body style="width:21.001cm;">
+ <div class="Section1">
+ <br>
+ <br>
+ <h1 style="mso-element:header;font-size:24.0pt;font-weight:normal;font-family:Verdana,sans-serif;color:#f00;" id="h1">
+ <p class="MsoHeader">
+ Your bug here
+ </p>
+ </h1>
+ <br>
+ <table width="700" cellpadding="6" style="border-collapse:collapse;">
+ <tr>
+ <td width="200" border="1" style="font-weight:bold;">x</td>
+ <td width="500" style="font-weight:bold;">x</td>
+ </tr>
+ <tr>
+ <td style="font-weight:bold;">x</td>
+ <td style="font-weight:bold;">x</td>
+ </tr>
+ <tr>
+ <td style="font-weight:bold;">x</td>
+ <td style="font-weight:bold;">x</td>
+ </tr>
+ <tr>
+ <td style="font-weight:bold;">x</td>
+ <td style="font-weight:bold;">x</td>
+ </tr>
+ </table>
+ <br>
+ <table width="700" cellpadding="6" style="border:1px solid #bbb; border-collapse:collapse;">
+<tr><td width="50" style="border-bottom:1px solid #bbb;"></td><td width="110" style="border:1px solid #fff; border-bottom:1px solid #bbb;"></td><td width="540" style="border:1px solid #fff;border-bottom:1px solid #bbb;"></td></tr>
+ <tr>
+ <td width="50" style="border:1px solid #bbb;vertical-align:top;text-align:center;font-weight:bold;color:#666;">x</td>
+ <td width="110" style="border:1px solid #bbb;vertical-align:top;text-align:center;font-weight:bold;color:#666;">x</td>
+ <td width="540" style="border:1px solid #bbb;vertical-align:top;text-align:center;font-weight:bold;color:#666;">x</td>
+ </tr>
+ <tr><td style="border:1px solid #bbb;vertical-align:top;" width="50">x</td><td style="border:1px solid #bbb;vertical-align:top;" width="110">x</td><td style="border:1px solid #bbb;vertical-align:top;" width="540">x</td></tr>
+<tr><td style="border:1px solid #bbb;vertical-align:top;" width="50">x</td><td style="border:1px solid #bbb;vertical-align:top;" width="110">x</td><td style="border:1px solid #bbb;vertical-align:top;" width="540">x</td></tr>
+<tr><td style="border:1px solid #bbb;vertical-align:top;" width="50">x</td><td style="border:1px solid #bbb;vertical-align:top;" width="110">x</td><td style="border:1px solid #bbb;vertical-align:top;" width="540">x</td></tr>
+</table> </div>
+ </body>
+ </html>
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 9778840..7f3b91c 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -3072,7 +3072,7 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
rText, pAttr->GetSttCnt() );
sal_Int32 nScriptEnd = g_pBreakIt->GetBreakIter()
->endOfScript( rText, pAttr->GetSttCnt(), nScriptTxt );
- while( nScriptEnd < nEndCnt )
+ while (nScriptEnd < nEndCnt && nScriptEnd != -1)
{
if( nScriptItem == nScriptTxt )
{
commit 383ac15d458f717fd95f1b7f3dcb8c6af1aca904
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 23 14:42:28 2015 +0000
Resolves: fdo#88735 crash after calling sort after subtotal removal
Change-Id: Ia30271426ea47b7bf5af85d16591a02e6d52b3d9
(cherry picked from commit 0442cd217645aa4fdd924e4c2e4f90a77f1fbbad)
Reviewed-on: https://gerrit.libreoffice.org/14140
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 16bf179..9c49296 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -166,7 +166,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
FillFieldLists(0);
// ListBox selection:
- if ( aSortData.maKeyState[0].bDoSort )
+ if (!aSortData.maKeyState.empty() && aSortData.maKeyState[0].bDoSort)
{
// Make sure that the all sort keys are reset
for ( sal_uInt16 i=nSortKeyCount; i<aSortData.GetSortKeyCount(); i++ )
commit f8f1fda8b2b7a57d7f4dcbcd1052be391a527493
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 24 20:37:36 2015 +0000
Resolves: tdf#81124 crash on setting autofilter on column with no content
Change-Id: Id53e589789144d892427a8a4ec1af1926aa97b52
(cherry picked from commit 3a5fa612b4afb72b5f91877a5c52e25c7604ae1a)
Reviewed-on: https://gerrit.libreoffice.org/14159
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 5986ea5..32fa9e4 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1097,6 +1097,8 @@ void ScCheckListMenuWindow::selectCurrentMemberOnly(bool bSet)
{
setAllMemberState(!bSet);
SvTreeListEntry* pEntry = maChecks.GetCurEntry();
+ if (!pEntry)
+ return;
maChecks.CheckEntry(pEntry, bSet );
}
@@ -1492,7 +1494,6 @@ void ScCheckListBox::KeyInput( const KeyEvent& rKEvt )
if ( rKey.GetCode() == KEY_RETURN || rKey.GetCode() == KEY_SPACE )
{
SvTreeListEntry* pEntry = GetCurEntry();
-
if ( pEntry )
{
sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
commit 3d5c6146bb8778c0c3512d9eda45434fa3b2067e
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Jan 27 12:33:02 2015 +0900
Fix a single quote slipped in
See void SmNodeToTextVisitor::Visit( SmFontNode* pNode ) for comparison.
Change-Id: Id7e58fef3b715ef2a4bcb4e1a1d390aadf917b5f
Reviewed-on: https://gerrit.libreoffice.org/14193
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 9efb04dfbf70e123da1755adcede8199eabf0d9a)
Reviewed-on: https://gerrit.libreoffice.org/14198
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 819bc5e..b31d517 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2086,7 +2086,7 @@ void SmFontNode::CreateTextFromNode(OUString &rText)
rText += "-";
break;
case FNTSIZ_MULTIPLY:
- rText += "*'";
+ rText += "*";
break;
case FNTSIZ_DIVIDE:
rText += "/";
More information about the Libreoffice-commits
mailing list