[Libreoffice-commits] core.git: sw/source
Caolán McNamara
caolanm at redhat.com
Wed Sep 9 03:48:18 PDT 2015
sw/source/filter/ww8/fields.cxx | 2 +-
sw/source/filter/ww8/wrtww8.cxx | 2 +-
sw/source/filter/ww8/wrtww8gr.cxx | 3 +--
sw/source/filter/ww8/ww8graf.cxx | 6 +++---
sw/source/filter/ww8/ww8graf.hxx | 2 +-
sw/source/filter/ww8/ww8par.cxx | 4 +---
sw/source/filter/ww8/ww8par3.cxx | 5 ++---
sw/source/filter/ww8/ww8par6.cxx | 4 ++--
sw/source/filter/ww8/ww8scan.cxx | 2 +-
9 files changed, 13 insertions(+), 17 deletions(-)
New commits:
commit 2bff291ac88ad71f258316a299771b2543f856e4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 9 11:47:10 2015 +0100
no point in reminding me now, we shipped a while back
Change-Id: I728d4c0c6e271e3a97a95996f96ed43c00a3abc8
diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx
index 3363c29..e0d9764 100644
--- a/sw/source/filter/ww8/fields.cxx
+++ b/sw/source/filter/ww8/fields.cxx
@@ -132,7 +132,7 @@ namespace ww
size_t nIndex = static_cast<size_t>(eIndex);
if (nIndex >= sizeof(aFieldNames) / sizeof(aFieldNames[0]))
eIndex = eNONE;
- OSL_ENSURE(eIndex != eNONE, "Unknown WinWord Field, let cmc know");
+ OSL_ENSURE(eIndex != eNONE, "Unknown WinWord Field");
return aFieldNames[eIndex];
}
}
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 59f418d..7d69967 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2713,7 +2713,7 @@ void WW8Export::WriteFkpPlcUsw()
escher work from then on. Tricky to track down, some sort of late
binding trickery in MS where solely for first time initialization
the existence of an ObjectPool dir is necessary for triggering
- some magic. cmc
+ some magic.
*/
// avoid memory leak #i120098#, the unnamed obj will be released in destructor.
xEscherStg = GetWriter().GetStorage().OpenSotStorage(OUString(SL::aObjectPool),
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 12f3aeb..f9c3582 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -869,8 +869,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
}
break;
default:
- OSL_ENSURE(false,
- "Some inline export not implemented, remind cmc before we ship :-)");
+ OSL_ENSURE(false, "Some inline export not implemented");
break;
}
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index f6078e9..fb4e1d0 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1338,7 +1338,7 @@ SdrObject *SwWW8ImplReader::ReadGroup(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
SdrObject* SwWW8ImplReader::ReadGrafPrimitive(short& rLeft, SfxAllItemSet &rSet)
{
- // cmc: This whole archaic word 6 graphic import can probably be refactored
+ // This whole archaic word 6 graphic import can probably be refactored
// into an object hierarachy with a little effort.
SdrObject *pRet=0;
WW8_DPHEAD aHd; // Lese Draw-Primitive-Header
@@ -3112,8 +3112,8 @@ void SwWW8ImplReader::GrafikCtor() // Fuer SVDraw und VCControls und Escher
m_pMSDffManager = new SwMSDffManager(*this, m_bSkipImages);
m_pMSDffManager->SetModel(m_pDrawModel, 1440);
/*
- Now the dff manager always needs a controls // converter as well, but a
- control converter may still exist // without a dffmanager. cmc
+ Now the dff manager always needs a controls converter as well, but a
+ control converter may still exist without a dffmanager.
*/
m_pFormImpl = new SwMSConvertControls(m_pDocShell, m_pPaM);
diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx
index 41e0bbe..8af88cd 100644
--- a/sw/source/filter/ww8/ww8graf.hxx
+++ b/sw/source/filter/ww8/ww8graf.hxx
@@ -75,7 +75,7 @@ public:
const SvxMSDffShapeOrders *pShapeOrders);
void InsertTextLayerObject(SdrObject* pObject);
/*
- cmc: We should have separate ZOrder classes for 95- and 97+ and
+ We should have separate ZOrder classes for 95- and 97+ and
instantiate the appropriate one at run time.
*/
void InsertDrawingObject(SdrObject* pObj, short nWwHeight);
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0742005..e5645d0 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -554,8 +554,6 @@ sal_uInt32 SwMSDffManager::GetFilterFlags()
* I would like to override the default OLE importing to add a test
* and conversion of OCX controls from their native OLE type into our
* native nonOLE Form Control Objects.
- *
- * cmc
*/
// #i32596# - consider new parameter <_nCalledByGroup>
SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
@@ -5120,7 +5118,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
}
else // ordinary case
{
- if (m_bNewDoc && m_pStg && !pGloss) /*meaningless for a glossary, cmc*/
+ if (m_bNewDoc && m_pStg && !pGloss) /*meaningless for a glossary */
{
m_pDocShell->SetIsTemplate( m_pWwFib->fDot ); // point at tgc record
uno::Reference<document::XDocumentPropertiesSupplier> const
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 3db3492..54b4afe 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -89,7 +89,7 @@ using namespace sw::mark;
// UNO-Controls
-//cmc, OCX i.e. word 97 form controls
+// OCX i.e. word 97 form controls
eF_ResT SwWW8ImplReader::Read_F_OCX( WW8FieldDesc*, OUString& )
{
if( m_bObj && m_nPicLocFc )
@@ -2252,8 +2252,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
sal_uInt16 cbExtra = 0;
pDataStream->ReadUInt16( cbExtra );
- OSL_ENSURE(bAllOk,
- "Unknown formfield dropdown list structure. Report to cmc");
+ OSL_ENSURE(bAllOk, "Unknown formfield dropdown list structure");
if (!bAllOk) //Not as expected, don't risk it at all.
nNoStrings = 0;
const size_t nMinRecordSize = sizeof(sal_uInt16);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index fc54c76..a68c025c 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1016,7 +1016,7 @@ void wwSectionManager::CreateSep(const long nTextPos, bool /*bMustHaveBreak*/)
// 2pages in 1sheet hackery ?
// #i31806# but only swap if 2page in 1sheet is enabled.
// its not clear if dmOrientPage is the correct member to
- // decide on this but I am not about to 2nd guess cmc.
+ // decide on this.
if(mrReader.m_pWDop->doptypography.f2on1 &&
aNewSection.maSep.dmOrientPage == 2)
std::swap(aNewSection.maSep.dxaLeft, aNewSection.maSep.dxaRight);
@@ -3435,7 +3435,7 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode, FontFamily& reFamily,
if( 77 == pF->chs ) // Mac font in Mac Charset or
reCharSet = m_eTextCharSet; // translated to ANSI charset
else
- { // patch from cmc for #i52786#
+ {
// #i52786#, for word 67 we'll assume that ANSI is basically invalid,
// might be true for (above) mac as well, but would need a mac example
// that exercises this to be sure
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index ed1a83b..683b296 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -6740,7 +6740,7 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop )
nIdxOffset = 0;
/*
- cmc 23/02/2000: This dop.grpfIhdt has a bit set for each special
+ This dop.grpfIhdt has a bit set for each special
footnote *and endnote!!* separator,continuation separator, and
continuation notice entry, the documentation does not mention the
endnote separators, the documentation also gets the index numbers
More information about the Libreoffice-commits
mailing list