summaryrefslogtreecommitdiff
path: root/sw/source/core/doc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/doc')
-rw-r--r--sw/source/core/doc/docdesc.cxx14
-rw-r--r--sw/source/core/doc/docnew.cxx2
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index c0cae8e809c3..184ae52cc8a7 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -824,7 +824,7 @@ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, )
return 0;
}
-static SwPageDesc* lcl_FindPageDesc( SwPageDescs *maPageDescs, const OUString & rName, sal_uInt16* pPos )
+static SwPageDesc* lcl_FindPageDescByName( SwPageDescs *maPageDescs, const OUString & rName, sal_uInt16* pPos )
{
SwPageDescs::const_iterator it = maPageDescs->find( rName );
SwPageDesc* res = NULL;
@@ -838,21 +838,21 @@ static SwPageDesc* lcl_FindPageDesc( SwPageDescs *maPageDescs, const OUString &
return res;
}
-SwPageDesc* SwDoc::FindPageDesc( const OUString & rName, sal_uInt16* pPos )
+SwPageDesc* SwDoc::FindPageDescByName( const OUString & rName, sal_uInt16* pPos )
{
- return lcl_FindPageDesc( &maPageDescs, rName, pPos );
+ return lcl_FindPageDescByName( &maPageDescs, rName, pPos );
}
-SwPageDesc* SwDoc::FindPageDesc( const OUString & rName, sal_uInt16* pPos ) const
+SwPageDesc* SwDoc::FindPageDescByName( const OUString & rName, sal_uInt16* pPos ) const
{
- return lcl_FindPageDesc( const_cast <SwPageDescs *>( &maPageDescs ), rName, pPos );
+ return lcl_FindPageDescByName( const_cast <SwPageDescs *>( &maPageDescs ), rName, pPos );
}
void SwDoc::DelPageDesc( const String & rName, bool bBroadcast )
{
sal_uInt16 nI;
- if (FindPageDesc(rName, &nI))
+ if (FindPageDescByName(rName, &nI))
DelPageDesc(nI, bBroadcast);
}
@@ -860,7 +860,7 @@ void SwDoc::ChgPageDesc( const String & rName, const SwPageDesc & rDesc)
{
sal_uInt16 nI;
- if (FindPageDesc(rName, &nI))
+ if (FindPageDescByName(rName, &nI))
ChgPageDesc(nI, rDesc);
}
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 6fee0c3f2587..d5841dd1c259 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -853,7 +853,7 @@ void SwDoc::ClearDoc()
// remove the dummy pagedesc from the array and delete all the old ones
sal_uInt16 nDummyPgDsc = 0;
- if (FindPageDesc(pDummyPgDsc->GetName(), &nDummyPgDsc))
+ if (FindPageDescByName(pDummyPgDsc->GetName(), &nDummyPgDsc))
maPageDescs.erase(maPageDescs.begin() + nDummyPgDsc);
// remove the dummy pagedec from the array and delete all the old ones