summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/source/core/doc/docchart.cxx4
-rw-r--r--sw/source/core/doc/docedt.cxx2
-rw-r--r--sw/source/core/doc/docsort.cxx2
-rw-r--r--sw/source/core/doc/textboxhelper.cxx2
-rw-r--r--sw/source/core/docnode/node.cxx2
-rw-r--r--sw/source/core/draw/dcontact.cxx2
-rw-r--r--sw/source/core/layout/frmtool.cxx4
-rw-r--r--sw/source/core/unocore/unochart.cxx2
-rw-r--r--sw/source/core/unocore/unostyle.cxx2
-rw-r--r--sw/source/core/unocore/unotbl.cxx2
-rw-r--r--sw/source/core/unocore/unotext.cxx2
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx2
-rw-r--r--sw/source/filter/html/swhtml.cxx2
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx2
-rw-r--r--sw/source/uibase/app/docstyle.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx2
16 files changed, 18 insertions, 18 deletions
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 196fda16d6b7..1b48a928c886 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -95,7 +95,7 @@ void SwDoc::DoUpdateAllCharts()
{
SwTable* pTmpTbl;
const SwTableNode* pTblNd;
- SwFrmFmt* pFmt = rTblFmts[ n ];
+ const SwFrmFmt* pFmt = rTblFmts[ n ];
if( 0 != ( pTmpTbl = SwTable::FindTable( pFmt ) ) &&
0 != ( pTblNd = pTmpTbl->GetTableNode() ) &&
@@ -149,7 +149,7 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
bool bNameFound = rNewName.isEmpty();
if( !bNameFound )
{
- SwFrmFmt* pFmt;
+ const SwFrmFmt* pFmt;
const SwFrmFmts& rTbl = *GetTblFrmFmts();
for( sal_uInt16 i = rTbl.size(); i; )
if( !( pFmt = rTbl[ --i ] )->IsDefault() &&
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 456740a84c78..50e8e2f9f6b5 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -88,7 +88,7 @@ void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr )
SwFrmFmts& rFmts = *rRg.aStart.GetNode().GetDoc()->GetSpzFrmFmts();
for( sal_uInt16 n = 0; n < rFmts.size(); ++n )
{
- SwFrmFmt *const pFmt = static_cast<SwFrmFmt*>(rFmts[n]);
+ SwFrmFmt *const pFmt = rFmts[n];
SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
if (pAPos &&
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index a335a290c2d4..6475c34b7452 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -298,7 +298,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
// Set index to the Selection's start
for ( sal_uInt16 n = 0; n < GetSpzFrmFmts()->size(); ++n )
{
- SwFrmFmt *const pFmt = static_cast<SwFrmFmt*>((*GetSpzFrmFmts())[n]);
+ const SwFrmFmt *const pFmt = (*GetSpzFrmFmts())[n];
SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index e106ddbf59ae..e48160f7363d 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -527,7 +527,7 @@ void SwTextBoxHelper::saveLinks(const SwFrmFmts& rFormats, std::map<const SwFrmF
{
for (size_t i = 0; i < rFormats.size(); ++i)
{
- SwFrmFmt* pFmt = rFormats[i];
+ const SwFrmFmt* pFmt = rFormats[i];
if (pFmt->Which() != RES_DRAWFRMFMT)
continue;
if (SwFrmFmt* pTextBox = findTextBox(pFmt))
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index ee5a6214dcc3..ee2c7be0dde0 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -515,7 +515,7 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
for( n = 0; n < rFmts.size(); ++n )
{
- SwFrmFmt* pFrmFmt = rFmts[ n ];
+ const SwFrmFmt* pFrmFmt = rFmts[ n ];
const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
if( rCntnt.GetCntntIdx() &&
&rCntnt.GetCntntIdx()->GetNode() == (SwNode*)pSttNd )
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index fc85ef5221aa..aa99a18b0242 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -636,7 +636,7 @@ void SwDrawContact::GetTextObjectsFromFmt( std::list<SdrTextObj*>& rTextObjects,
{
for( sal_Int32 n=0; n<(sal_Int32)pDoc->GetSpzFrmFmts()->size(); n++ )
{
- SwFrmFmt* pFly = (*pDoc->GetSpzFrmFmts())[n];
+ const SwFrmFmt* pFly = (*pDoc->GetSpzFrmFmts())[n];
if( pFly->IsA( TYPE(SwDrawFrmFmt) ) )
{
SwDrawContact* pContact = SwIterator<SwDrawContact,SwFrmFmt>::FirstElement(*pFly);
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index a2cda52ee635..8d92e4fa594f 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1074,7 +1074,7 @@ void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex,
}
}
-static bool lcl_ObjConnected( SwFrmFmt *pFmt, const SwFrm* pSib )
+static bool lcl_ObjConnected( const SwFrmFmt *pFmt, const SwFrm* pSib )
{
if ( RES_FLYFRMFMT == pFmt->Which() )
{
@@ -1101,7 +1101,7 @@ static bool lcl_ObjConnected( SwFrmFmt *pFmt, const SwFrm* pSib )
OD 23.06.2003 #108784#
*/
-static bool lcl_InHeaderOrFooter( SwFrmFmt& _rFmt )
+static bool lcl_InHeaderOrFooter( const SwFrmFmt& _rFmt )
{
bool bRetVal = false;
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 24347981b2e5..cec7d220a206 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -123,7 +123,7 @@ void SwChartLockController_Helper::LockUnlockAllCharts( bool bLock )
{
SwTable* pTmpTbl;
const SwTableNode* pTblNd;
- SwFrmFmt* pFmt = rTblFmts[ n ];
+ const SwFrmFmt* pFmt = rTblFmts[ n ];
if( 0 != ( pTmpTbl = SwTable::FindTable( pFmt ) ) &&
0 != ( pTblNd = pTmpTbl->GetTableNode() ) &&
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 710150628680..cb9417c2575c 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -512,7 +512,7 @@ static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
const size_t nArrLen = rDoc.GetFrmFmts()->size();
for( size_t i = 0; i < nArrLen; ++i )
{
- SwFrmFmt* pFmt = (*rDoc.GetFrmFmts())[ i ];
+ const SwFrmFmt* pFmt = (*rDoc.GetFrmFmts())[ i ];
if(pFmt->IsDefault() || pFmt->IsAuto())
continue;
if ( IsPoolUserFmt ( pFmt->GetPoolFmtId() ) )
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 73ac3eef3619..87f0b63ce1a6 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3626,7 +3626,7 @@ void SwXTextTable::setName(const OUString& rName) throw( uno::RuntimeException,
if(pFmt)
{
const OUString aOldName( pFmt->GetName() );
- SwFrmFmt* pTmpFmt;
+ const SwFrmFmt* pTmpFmt;
const SwFrmFmts* pTbl = pFmt->GetDoc()->GetTblFrmFmts();
for( size_t i = pTbl->size(); i; )
if( !( pTmpFmt = (*pTbl)[ --i ] )->IsDefault() &&
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index f0c5f4447040..ae73060fd560 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1665,7 +1665,7 @@ SwXText::convertToTextFrame(
std::set<OUString> aAnchoredFrames;
for (size_t i = 0; i < m_pImpl->m_pDoc->GetSpzFrmFmts()->size(); ++i)
{
- SwFrmFmt* pFrmFmt = (*m_pImpl->m_pDoc->GetSpzFrmFmts())[i];
+ const SwFrmFmt* pFrmFmt = (*m_pImpl->m_pDoc->GetSpzFrmFmts())[i];
const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
if (FLY_AT_PARA == rAnchor.GetAnchorId() &&
aStartPam.Start()->nNode.GetIndex() <= rAnchor.GetCntntAnchor()->nNode.GetIndex() &&
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 015a156c8b6b..e8cae7477a7a 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -136,7 +136,7 @@ sal_uLong SwASCWriter::WriteStream()
{
// Print the frame's content.
// It is always at position 0!
- SwFrmFmt* pFmt = (*pDoc->GetSpzFrmFmts())[ 0 ];
+ const SwFrmFmt* pFmt = (*pDoc->GetSpzFrmFmts())[ 0 ];
const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
if( pIdx )
{
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 3b3bfdfc4d8d..6be26620b558 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -4481,7 +4481,7 @@ bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
bool bFound = false;
for ( sal_uInt16 i=0; i<rFrmFmtTbl.size(); i++ )
{
- SwFrmFmt *const pFmt = rFrmFmtTbl[i];
+ const SwFrmFmt *const pFmt = rFrmFmtTbl[i];
SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
// Ein Rahmen wurde gefunden, wenn
// - er absatzgebunden ist, und
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 5312c8985edb..ff27a37ab9c1 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -59,7 +59,7 @@ bool WW8Glossary::HasBareGraphicEnd(SwDoc *pDoc,SwNodeIndex &rIdx)
bool bRet=false;
for( sal_uInt16 nCnt = pDoc->GetSpzFrmFmts()->size(); nCnt; )
{
- SwFrmFmt* pFrmFmt = (*pDoc->GetSpzFrmFmts())[ --nCnt ];
+ const SwFrmFmt* pFrmFmt = (*pDoc->GetSpzFrmFmts())[ --nCnt ];
if ( RES_FLYFRMFMT != pFrmFmt->Which() &&
RES_DRAWFRMFMT != pFrmFmt->Which() )
continue;
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 520bba8b01bc..cbccde4bd3e9 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -2825,7 +2825,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
const sal_uInt16 nArrLen = rDoc.GetFrmFmts()->size();
for( sal_uInt16 i = 0; i < nArrLen; i++ )
{
- SwFrmFmt* pFmt = (*rDoc.GetFrmFmts())[ i ];
+ const SwFrmFmt* pFmt = (*rDoc.GetFrmFmts())[ i ];
bool bUsed = bIsSearchUsed && ( bOrganizer || rDoc.IsUsed(*pFmt));
if( ( !bSearchHidden && pFmt->IsHidden( ) && !bUsed ) || pFmt->IsDefault() || pFmt->IsAuto() )
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index be0c94bec581..894e2a086583 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -318,7 +318,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
const size_t nArrLen = pDoc->GetFrmFmts()->size();
for( size_t i = 0; i < nArrLen; ++i )
{
- SwFrmFmt* pFmt = (*pDoc->GetFrmFmts())[ i ];
+ const SwFrmFmt* pFmt = (*pDoc->GetFrmFmts())[ i ];
if(pFmt->IsDefault() || pFmt->IsAuto())
continue;
aFormats.push_back(pFmt->GetName());
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 22:01:44 +0000