sw/inc/doc.hxx | 12 ++++++------
sw/inc/unochart.hxx | 2 +-
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 12 ++++++------
sw/qa/extras/uiwriter/uiwriter.cxx | 10 +++++-----
sw/source/core/doc/CntntIdxStore.cxx | 10 +++++-----
sw/source/core/doc/doc.cxx | 6 +++---
sw/source/core/doc/doccorr.cxx | 16 ++++++++--------
sw/source/core/doc/docnew.cxx | 2 +-
sw/source/core/frmedt/fews.cxx | 10 +++++-----
sw/source/core/inc/txtfrm.hxx | 2 +-
sw/source/core/unocore/unochart.cxx | 12 ++++++------
sw/source/filter/ww8/ww8atr.cxx | 2 +-
sw/source/uibase/app/docsh.cxx | 2 +-
swext/mediawiki/help/wiki.xhp | 1 -
swext/mediawiki/help/wikiaccount.xhp | 1 -
swext/mediawiki/help/wikiformats.xhp | 1 -
swext/mediawiki/help/wikisend.xhp | 1 -
swext/mediawiki/help/wikisettings.xhp | 1 -
xmlhelp/util/main_transform.xsl | 3 ---
19 files changed, 49 insertions(+), 57 deletions(-)
New commits:
commit f92c53f96dda175c971278a141a72dfd0e978466
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu Nov 12 09:51:46 2015 +0100
bin/rename-sw-abbreviations.sh run to fix few re-introduced abbrvtns.
Change-Id: I11d282c3be86feb57f5279220d84d8a121df0dbd
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index b13679c..52eae86 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1641,17 +1641,17 @@ public:
void dumpAsXml(struct _xmlTextWriter* = nullptr) const;
std::set<Color> GetDocColors();
- std::vector< std::weak_ptr<SwUnoCrsr> > mvUnoCrsrTbl;
+ std::vector< std::weak_ptr<SwUnoCrsr> > mvUnoCrsrTable;
// Remove expired UnoCrsr weak pointers the document keeps to notify about
document death.
- void cleanupUnoCrsrTbl()
+ void cleanupUnoCrsrTable()
{
// In most cases we'll remove most of the elements.
- std::vector< std::weak_ptr<SwUnoCrsr> > unoCrsrTbl;
- std::copy_if(mvUnoCrsrTbl.begin(), mvUnoCrsrTbl.end(),
- std::back_inserter(unoCrsrTbl),
+ std::vector< std::weak_ptr<SwUnoCrsr> > unoCrsrTable;
+ std::copy_if(mvUnoCrsrTable.begin(), mvUnoCrsrTable.end(),
+ std::back_inserter(unoCrsrTable),
[](const std::weak_ptr<SwUnoCrsr>& pWeakPtr) { return
!pWeakPtr.expired(); });
- std::swap(mvUnoCrsrTbl, unoCrsrTbl);
+ std::swap(mvUnoCrsrTable, unoCrsrTable);
}
private:
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 69adac5..09cb4f6 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -278,7 +278,7 @@ protected:
public:
SwChartDataSequence( SwChartDataProvider &rProvider,
- SwFrameFormat &rTblFmt,
+ SwFrameFormat &rTableFormat,
std::shared_ptr<SwUnoCrsr> pTableCursor );
virtual ~SwChartDataSequence();
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index c023257..5138377 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2887,12 +2887,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf91417, "tdf91417.docx")
DECLARE_OOXMLIMPORT_TEST(testTdf90810, "tdf90810short.docx")
{
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
- uno::Reference<text::XFootnotesSupplier> xFtnSupp(xTextDocument,
uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess>
xFtnIdxAcc(xFtnSupp->getFootnotes(), uno::UNO_QUERY);
- uno::Reference<text::XFootnote> xFtn(xFtnIdxAcc->getByIndex(0),
uno::UNO_QUERY);
- uno::Reference<text::XText> xFtnText(xFtn, uno::UNO_QUERY);
- rtl::OUString sFtnText = xFtnText->getString();
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(90),
static_cast<sal_Int32>(sFtnText.getLength()));
+ uno::Reference<text::XFootnotesSupplier> xFootnoteSupp(xTextDocument,
uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xFootnoteIdxAcc(xFootnoteSupp->getFootnotes(), uno::UNO_QUERY);
+ uno::Reference<text::XFootnote> xFootnote(xFootnoteIdxAcc->getByIndex(0),
uno::UNO_QUERY);
+ uno::Reference<text::XText> xFootnoteText(xFootnote, uno::UNO_QUERY);
+ rtl::OUString sFootnoteText = xFootnoteText->getString();
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(90),
static_cast<sal_Int32>(sFootnoteText.getLength()));
}
DECLARE_OOXMLIMPORT_TEST(testTdf89165, "tdf89165.docx")
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 3049531..aac00f0 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1171,17 +1171,17 @@ void SwUiWriterTest::testDeleteTableRedlines()
SwDoc* pDoc = createDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
SwInsertTableOptions TableOpt(tabopts::DEFAULT_BORDER, 0);
- const SwTable& rTbl = pWrtShell->InsertTable(TableOpt, 1, 3);
+ const SwTable& rTable = pWrtShell->InsertTable(TableOpt, 1, 3);
uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getColumns()->getCount());
uno::Sequence<beans::PropertyValue> aDescriptor;
-
SwUnoCursorHelper::makeTableCellRedline((*const_cast<SwTableBox*>(rTbl.GetTableBox("A1"))),
"TableCellInsert", aDescriptor);
-
SwUnoCursorHelper::makeTableCellRedline((*const_cast<SwTableBox*>(rTbl.GetTableBox("B1"))),
"TableCellInsert", aDescriptor);
-
SwUnoCursorHelper::makeTableCellRedline((*const_cast<SwTableBox*>(rTbl.GetTableBox("C1"))),
"TableCellInsert", aDescriptor);
+
SwUnoCursorHelper::makeTableCellRedline((*const_cast<SwTableBox*>(rTable.GetTableBox("A1"))),
"TableCellInsert", aDescriptor);
+
SwUnoCursorHelper::makeTableCellRedline((*const_cast<SwTableBox*>(rTable.GetTableBox("B1"))),
"TableCellInsert", aDescriptor);
+
SwUnoCursorHelper::makeTableCellRedline((*const_cast<SwTableBox*>(rTable.GetTableBox("C1"))),
"TableCellInsert", aDescriptor);
IDocumentRedlineAccess& rIDRA = pDoc->getIDocumentRedlineAccess();
SwExtraRedlineTable& rExtras = rIDRA.GetExtraRedlineTable();
- rExtras.DeleteAllTableRedlines(pDoc, rTbl, false, sal_uInt16(USHRT_MAX));
+ rExtras.DeleteAllTableRedlines(pDoc, rTable, false, sal_uInt16(USHRT_MAX));
CPPUNIT_ASSERT(rExtras.IsEmpty());
}
diff --git a/sw/source/core/doc/CntntIdxStore.cxx
b/sw/source/core/doc/CntntIdxStore.cxx
index c74b264..41b599f 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -378,8 +378,8 @@ void ContentIdxStoreImpl::RestoreFlys(SwDoc* pDoc,
updater_t& rUpdater, bool bAu
void ContentIdxStoreImpl::SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32
nContent)
{
- pDoc->cleanupUnoCrsrTbl();
- for (const auto& pWeakUnoCrsr : pDoc->mvUnoCrsrTbl)
+ pDoc->cleanupUnoCrsrTable();
+ for (const auto& pWeakUnoCrsr : pDoc->mvUnoCrsrTable)
{
auto pUnoCrsr(pWeakUnoCrsr.lock());
if(!pUnoCrsr)
@@ -388,10 +388,10 @@ void ContentIdxStoreImpl::SaveUnoCrsrs(SwDoc* pDoc,
sal_uLong nNode, sal_Int32 n
{
lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nContent, rPaM);
}
- const SwUnoTableCrsr* pUnoTblCrsr = dynamic_cast<const
SwUnoTableCrsr*>(pUnoCrsr.get());
- if( pUnoTblCrsr )
+ const SwUnoTableCrsr* pUnoTableCrsr = dynamic_cast<const
SwUnoTableCrsr*>(pUnoCrsr.get());
+ if( pUnoTableCrsr )
{
- for(SwPaM& rPaM :
(&(const_cast<SwUnoTableCrsr*>(pUnoTblCrsr))->GetSelRing())->GetRingContainer())
+ for(SwPaM& rPaM :
(&(const_cast<SwUnoTableCrsr*>(pUnoTableCrsr))->GetSelRing())->GetRingContainer())
{
lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nContent, rPaM);
}
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 38631b1..27b2f4b 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1680,15 +1680,15 @@ bool SwDoc::ContainsHiddenChars() const
return false;
}
-std::shared_ptr<SwUnoCrsr> SwDoc::CreateUnoCrsr( const SwPosition& rPos, bool
bTblCrsr )
+std::shared_ptr<SwUnoCrsr> SwDoc::CreateUnoCrsr( const SwPosition& rPos, bool
bTableCrsr )
{
std::shared_ptr<SwUnoCrsr> pNew;
- if( bTblCrsr )
+ if( bTableCrsr )
pNew = std::make_shared<SwUnoTableCrsr>(rPos);
else
pNew = std::make_shared<SwUnoCrsr>(rPos);
- mvUnoCrsrTbl.push_back( pNew );
+ mvUnoCrsrTable.push_back( pNew );
return pNew;
}
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 62df093..278d7f2 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -121,7 +121,7 @@ void PaMCorrAbs( const SwPaM& rRange,
}
}
- for(const auto& pWeakUnoCrsr : pDoc->mvUnoCrsrTbl)
+ for(const auto& pWeakUnoCrsr : pDoc->mvUnoCrsrTable)
{
auto pUnoCursor(pWeakUnoCrsr.lock());
if(!pUnoCursor)
@@ -142,11 +142,11 @@ void PaMCorrAbs( const SwPaM& rRange,
bChange |= lcl_PaMCorrAbs( rPaM, aStart, aEnd, aNewPos );
}
- SwUnoTableCrsr *const pUnoTblCrsr =
+ SwUnoTableCrsr *const pUnoTableCrsr =
dynamic_cast<SwUnoTableCrsr *>(pUnoCursor.get());
- if( pUnoTblCrsr )
+ if( pUnoTableCrsr )
{
- for(SwPaM& rPaM : (&pUnoTblCrsr->GetSelRing())->GetRingContainer())
+ for(SwPaM& rPaM :
(&pUnoTableCrsr->GetSelRing())->GetRingContainer())
{
bChange |=
lcl_PaMCorrAbs( rPaM, aStart, aEnd, aNewPos );
@@ -274,7 +274,7 @@ void PaMCorrRel( const SwNodeIndex &rOldNode,
}
}
- for(const auto& pWeakUnoCrsr : pDoc->mvUnoCrsrTbl)
+ for(const auto& pWeakUnoCrsr : pDoc->mvUnoCrsrTable)
{
auto pUnoCrsr(pWeakUnoCrsr.lock());
if(!pUnoCrsr)
@@ -284,11 +284,11 @@ void PaMCorrRel( const SwNodeIndex &rOldNode,
lcl_PaMCorrRel1( &rPaM, pOldNode, aNewPos, nCntIdx );
}
- SwUnoTableCrsr* pUnoTblCrsr =
+ SwUnoTableCrsr* pUnoTableCrsr =
dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr.get());
- if( pUnoTblCrsr )
+ if( pUnoTableCrsr )
{
- for(SwPaM& rPaM : (&pUnoTblCrsr->GetSelRing())->GetRingContainer())
+ for(SwPaM& rPaM :
(&pUnoTableCrsr->GetSelRing())->GetRingContainer())
{
lcl_PaMCorrRel1( &rPaM, pOldNode, aNewPos, nCntIdx );
}
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 72aa885..36d513a 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -426,7 +426,7 @@ SwDoc::~SwDoc()
getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteAndDestroyAll();
const sw::DocDisposingHint aHint;
- for(const auto& pWeakCursor : mvUnoCrsrTbl)
+ for(const auto& pWeakCursor : mvUnoCrsrTable)
{
auto pCursor(pWeakCursor.lock());
if(pCursor)
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index a5c0499..5c39c10 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -477,11 +477,11 @@ void SwFEShell::InsertLabel( const SwLabelType eType,
const OUString &rText, con
if (pFlyFormat && bInnerCntIsFly)
{
SwNodeIndex
aAnchIdx(*pFlyFormat->GetContent().GetContentIdx(), 1);
- SwTextNode *pTxtNode = aAnchIdx.GetNode().GetTextNode();
+ SwTextNode *pTextNode = aAnchIdx.GetNode().GetTextNode();
SwFormatAnchor aAnc(FLY_AS_CHAR);
- sal_Int32 nInsertPos = bBefore ? pTxtNode->Len() : 0;
- SwPosition aPos(*pTxtNode, nInsertPos);
+ sal_Int32 nInsertPos = bBefore ? pTextNode->Len() : 0;
+ SwPosition aPos(*pTextNode, nInsertPos);
aAnc.SetAnchor(&aPos);
@@ -493,8 +493,8 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const
OUString &rText, con
//put a hard-break after the graphic to keep it separated
//from the caption text if the outer frame is resized
- SwIndex aIdx(pTxtNode, bBefore ? nInsertPos : 1);
- pTxtNode->InsertText("\n", aIdx);
+ SwIndex aIdx(pTextNode, bBefore ? nInsertPos : 1);
+ pTextNode->InsertText("\n", aIdx);
}
}
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 79b4d78..b20d2d3 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -334,7 +334,7 @@ public:
* If the void* casts wrongly, it's its own fault!
* The void* must be checked for 0 in any case!
*
- * return true if the Portion associated with this SwTxtFrm was
+ * return true if the Portion associated with this SwTextFrm was
* potentially destroyed and replaced by Prepare
*/
virtual bool Prepare( const PrepareHint ePrep = PREP_CLEAR,
diff --git a/sw/source/core/unocore/unochart.cxx
b/sw/source/core/unocore/unochart.cxx
index a97ba36..f4d317c 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -366,7 +366,7 @@ static void GetTableByName( const SwDoc &rDoc, const
OUString &rTableName,
static void GetFormatAndCreateCursorFromRangeRep(
const SwDoc *pDoc,
const OUString &rRangeRepresentation, // must be a single range
(i.e. so called sub-range)
- SwFrameFormat **ppTblFmt, // will be set to the table format of
the table used in the range representation
+ SwFrameFormat **ppTableFormat, // will be set to the table
format of the table used in the range representation
std::shared_ptr<SwUnoCrsr>& rpUnoCrsr ) // will be set to cursor
spanning the cell range (cursor will be created!)
{
OUString aTableName; // table name
@@ -377,8 +377,8 @@ static void GetFormatAndCreateCursorFromRangeRep(
if (!bNamesFound)
{
- if (ppTblFmt)
- *ppTblFmt = nullptr;
+ if (ppTableFormat)
+ *ppTableFormat = nullptr;
rpUnoCrsr.reset();
}
else
@@ -386,12 +386,12 @@ static void GetFormatAndCreateCursorFromRangeRep(
SwFrameFormat *pTableFormat = nullptr;
// is the correct table format already provided?
- if (*ppTblFmt != nullptr && (*ppTblFmt)->GetName() == aTableName)
- pTableFormat = *ppTblFmt;
+ if (*ppTableFormat != nullptr && (*ppTableFormat)->GetName() ==
aTableName)
+ pTableFormat = *ppTableFormat;
else
GetTableByName( *pDoc, aTableName, &pTableFormat, nullptr );
- *ppTblFmt = pTableFormat;
+ *ppTableFormat = pTableFormat;
rpUnoCrsr.reset(); // default result in case of failure
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 86061fc..112a125 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3272,7 +3272,7 @@ void AttributeOutputBase::ParaNumRule( const
SwNumRuleItem& rNumRule )
}
}
-void WW8AttributeOutput::ParaNumRule_Impl(const SwTextNode* /*pTxtNd*/,
+void WW8AttributeOutput::ParaNumRule_Impl(const SwTextNode* /*pTextNd*/,
sal_Int32 const nLvl, sal_Int32 const nNumId)
{
// write sprmPIlvl and sprmPIlfo
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index a412f5a..4f3d186 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -516,7 +516,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
// Increase RSID
m_pDoc->setRsid( m_pDoc->getRsid() );
- m_pDoc->cleanupUnoCrsrTbl();
+ m_pDoc->cleanupUnoCrsrTable();
}
SetError( nErr ? nErr : nVBWarning, OSL_LOG_PREFIX );
commit eb95283d98fffb031070338ca0d9a966fcf98c07
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu Nov 12 09:50:56 2015 +0100
Killed the 'lastedited' element, it's useless, we have git.
Change-Id: I61a7f92843ef888f64eb5b97267ba30227d64d73
diff --git a/swext/mediawiki/help/wiki.xhp b/swext/mediawiki/help/wiki.xhp
index 9225a00..fe46c36 100644
--- a/swext/mediawiki/help/wiki.xhp
+++ b/swext/mediawiki/help/wiki.xhp
@@ -24,7 +24,6 @@
</topic>
<history>
<created date="2008-02-08T12:13:25"/>
-<lastedited date="2008-02-08T14:28:08"/>
</history>
</meta>
<body>
diff --git a/swext/mediawiki/help/wikiaccount.xhp
b/swext/mediawiki/help/wikiaccount.xhp
index f1f01ab..7e18bff 100644
--- a/swext/mediawiki/help/wikiaccount.xhp
+++ b/swext/mediawiki/help/wikiaccount.xhp
@@ -24,7 +24,6 @@
</topic>
<history>
<created date="2008-02-08T12:13:25"/>
-<lastedited date="2008-02-08T13:15:05"/>
</history>
</meta>
<body>
diff --git a/swext/mediawiki/help/wikiformats.xhp
b/swext/mediawiki/help/wikiformats.xhp
index f5e6ab73..9392f34 100644
--- a/swext/mediawiki/help/wikiformats.xhp
+++ b/swext/mediawiki/help/wikiformats.xhp
@@ -24,7 +24,6 @@
</topic>
<history>
<created date="2008-02-08T12:13:25"/>
-<lastedited date="2008-02-08T14:16:47"/>
</history>
</meta>
<body>
diff --git a/swext/mediawiki/help/wikisend.xhp
b/swext/mediawiki/help/wikisend.xhp
index 80907be..2ab82f1 100644
--- a/swext/mediawiki/help/wikisend.xhp
+++ b/swext/mediawiki/help/wikisend.xhp
@@ -24,7 +24,6 @@
</topic>
<history>
<created date="2008-02-08T12:13:25"/>
-<lastedited date="2008-02-08T13:36:25"/>
</history>
</meta>
<body>
diff --git a/swext/mediawiki/help/wikisettings.xhp
b/swext/mediawiki/help/wikisettings.xhp
index 11a3214..56e6ebb 100644
--- a/swext/mediawiki/help/wikisettings.xhp
+++ b/swext/mediawiki/help/wikisettings.xhp
@@ -24,7 +24,6 @@
</topic>
<history>
<created date="2008-02-08T12:13:25"/>
-<lastedited date="2008-02-08T12:53:38"/>
</history>
</meta>
<body>
diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl
index b30effe..f7260fe 100644
--- a/xmlhelp/util/main_transform.xsl
+++ b/xmlhelp/util/main_transform.xsl
@@ -256,9 +256,6 @@
<xsl:template match="item"><span class="{@type}"><xsl:apply-templates
/></span></xsl:template>
<xsl:template match="item" mode="embedded"><span
class="{@type}"><xsl:apply-templates /></span></xsl:template>
-<!-- LASTEDITED -->
-<xsl:template match="lastedited" />
-
<!-- LINK -->
<xsl:template match="link">
<xsl:choose> <!-- don't insert the heading link to itself -->
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
