[Libreoffice-commits] .: 3 commits - sw/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jun 21 01:14:32 PDT 2011
sw/source/filter/ww8/ww8par.cxx | 9 ++++++++-
sw/source/filter/ww8/ww8par3.cxx | 6 ++++--
sw/source/ui/dbui/mailmergechildwindow.cxx | 4 ++--
3 files changed, 14 insertions(+), 5 deletions(-)
New commits:
commit 8cec16375775f444ac2a0f039687e5305425bbb0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 20 23:43:32 2011 +0100
Resolves: #i105349# protect against missing insertion position
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index e05b1aa..392efe7 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1768,10 +1768,12 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
if (pLstManager) // sind die Listendeklarationen gelesen?
{
- std::vector<sal_uInt8> aParaSprms;
SwTxtNode* pTxtNd = pPaM->GetNode()->GetTxtNode();
- OSL_ENSURE(pTxtNd, "Kein Text-Node an PaM-Position");
+ OSL_ENSURE(pTxtNd, "No Text-Node at PaM-Position");
+ if (!pTxtNd)
+ return;
+ std::vector<sal_uInt8> aParaSprms;
const SwNumRule* pRule = bSetAttr ?
pLstManager->GetNumRuleForActivation( nActLFO, nActLevel,
aParaSprms, pTxtNd) : 0;
commit 4ce50d13c2a0053d48a57ad031e150a880f50e5b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 20 22:40:55 2011 +0100
handle insertion point failure
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 90b2871..4c457d5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2884,7 +2884,14 @@ void SwWW8ImplReader::simpleAddTextToParagraph(const String& rAddString)
<< ::std::endl;
}
#endif
- const SwTxtNode* pNd = pPaM->GetCntntNode()->GetTxtNode();
+
+ const SwCntntNode *pCntNd = pPaM->GetCntntNode();
+ const SwTxtNode* pNd = pCntNd ? pCntNd->GetTxtNode() : NULL;
+
+ OSL_ENSURE(pNd, "What the hell, where's my text node");
+
+ if (!pNd)
+ return;
if ((pNd->GetTxt().Len() + rAddString.Len()) < STRING_MAXLEN-1)
{
commit 52d65d1bb75f35f89c2c2589cc94eb88ced0e5ae
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 20 22:05:55 2011 +0100
adapt to new api
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index fcf0fa5..6c850c9 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -115,10 +115,10 @@ IMPL_LINK( SwMailMergeChildWin, BackHdl, ToolBox *, EMPTYARG )
return 0;
}
-void SwMailMergeChildWin::FillInfo(SfxChildWinInfo& rInfo) const
+void SwMailMergeChildWin::FillInfo(SfxChildWinInfo& rInfo) const
{
SfxFloatingWindow::FillInfo(rInfo);
- rInfo.aWinState.Erase();
+ rInfo.aWinState = rtl::OString();
rInfo.bVisible = sal_False;
}
More information about the Libreoffice-commits
mailing list