summaryrefslogtreecommitdiff
path: root/sfx2/sdi/docslots.sdi
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-09-20 17:10:31 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-09-21 14:39:02 +0200
commit39e75be271667d156044d7641ff2347b9f8a513c (patch)
treed507c28ce3f2ad1052c0db623ee2c6cda15c2cf0 /sfx2/sdi/docslots.sdi
parent917bcea4b4660c516bb18691e4f8ee60313804ef (diff)
EPUB export: add uno command to bypass options dialog
Similarly how this is possible with PDF. The toolbar button is hidden by default in Writer, though. Change-Id: Iaf3b61ac2160578f7eaabd194ce8932792575c29 Reviewed-on: https://gerrit.libreoffice.org/42554 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sfx2/sdi/docslots.sdi')
-rw-r--r--sfx2/sdi/docslots.sdi5
1 files changed, 5 insertions, 0 deletions
diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi
index 04039af5728a..a6da56c2488d 100644
--- a/sfx2/sdi/docslots.sdi
+++ b/sfx2/sdi/docslots.sdi
@@ -239,6 +239,11 @@ shell SfxObjectShell
ExecMethod = ExecFile_Impl ;
StateMethod = GetState_Impl ;
]
+ SID_DIRECTEXPORTDOCASEPUB
+ [
+ ExecMethod = ExecFile_Impl ;
+ StateMethod = GetState_Impl ;
+ ]
SID_SIGNATURE
[
ExecMethod = ExecFile_Impl;
generated by cgit (git 2.34.1) at 2025-02-15 18:09:38 +0000
idth: 5.4%;'/> -rw-r--r--sw/source/core/crsr/crstrvl.cxx8
-rw-r--r--sw/source/core/crsr/findtxt.cxx30
-rw-r--r--sw/source/core/doc/doc.cxx26
-rw-r--r--sw/source/core/doc/docedt.cxx4
-rw-r--r--sw/source/core/doc/docfld.cxx66
-rw-r--r--sw/source/core/doc/doctxm.cxx2
-rw-r--r--sw/source/core/docnode/nodedump.cxx10
-rw-r--r--sw/source/core/docnode/nodes.cxx9
-rw-r--r--sw/source/core/edit/edattr.cxx2
-rw-r--r--sw/source/core/edit/edfld.cxx8
-rw-r--r--sw/source/core/edit/edfldexp.cxx10
-rw-r--r--sw/source/core/fields/authfld.cxx4
-rw-r--r--sw/source/core/fields/cellfml.cxx2
-rw-r--r--sw/source/core/fields/dbfld.cxx22
-rw-r--r--sw/source/core/fields/docufld.cxx18
-rw-r--r--sw/source/core/fields/expfld.cxx12
-rw-r--r--sw/source/core/fields/fldlst.cxx16
-rw-r--r--sw/source/core/fields/reffld.cxx26
-rw-r--r--sw/source/core/fields/tblcalc.cxx2
-rw-r--r--sw/source/core/frmedt/fefly1.cxx2
-rw-r--r--sw/source/core/frmedt/tblsel.cxx3
-rw-r--r--sw/source/core/inc/docfld.hxx2
-rw-r--r--sw/source/core/inc/wrong.hxx8
-rw-r--r--sw/source/core/layout/atrfrm.cxx36
-rw-r--r--sw/source/core/layout/trvlfrm.cxx2
-rw-r--r--sw/source/core/table/swtable.cxx2
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx6
-rw-r--r--sw/source/core/text/inftxt.cxx2
-rw-r--r--sw/source/core/text/itratr.cxx4
-rw-r--r--sw/source/core/text/txtfld.cxx4
-rw-r--r--sw/source/core/tox/txmsrt.cxx17
-rw-r--r--sw/source/core/txtnode/atrfld.cxx74
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx20
-rw-r--r--sw/source/core/txtnode/thints.cxx29
-rw-r--r--sw/source/core/undo/SwUndoField.cxx9
-rw-r--r--sw/source/core/undo/rolbck.cxx12
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx2
-rw-r--r--sw/source/core/unocore/unofield.cxx12
-rw-r--r--sw/source/core/unocore/unoportenum.cxx4
-rw-r--r--sw/source/core/view/vprint.cxx9
-rw-r--r--sw/source/filter/ascii/ascatr.cxx4
-rw-r--r--sw/source/filter/html/htmlatr.cxx2
-rw-r--r--sw/source/filter/html/htmlfld.cxx3
-rw-r--r--sw/source/filter/html/htmlfldw.cxx2
-rw-r--r--sw/source/filter/html/swhtml.cxx5
-rw-r--r--sw/source/filter/html/wrthtml.cxx4
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx10
-rw-r--r--sw/source/filter/ww8/ww8par.cxx4
-rw-r--r--sw/source/ui/docvw/AnnotationWin.cxx10
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx6
-rw-r--r--sw/source/ui/fldui/fldpage.cxx2
-rw-r--r--sw/source/ui/shells/textfld.cxx2
-rw-r--r--sw/source/ui/utlui/content.cxx4
56 files changed, 313 insertions, 303 deletions
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index f18d31a7fd53..67ace36dc7fe 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -76,8 +76,14 @@ public:
virtual bool GetInfo( SfxPoolItem& rInfo ) const;
- const SwField *GetFld() const { return pField; }
- SwField *GetFld() { return pField; }
+ const SwField* GetField() const
+ {
+ return pField;
+ }
+ SwField* GetField()
+ {
+ return pField;
+ }
/**
Sets current field.
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index cfa278e337cc..eeba841afd45 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -109,7 +109,7 @@ public:
inline const SwFmtCharFmt &GetCharFmt() const;
inline const SwFmtAutoFmt &GetAutoFmt() const;
- inline const SwFmtFld &GetFld() const;
+ inline const SwFmtFld &GetFmtFld() const;
inline const SwFmtFtn &GetFtn() const;
inline const SwFmtFlyCnt &GetFlyCnt() const;
inline const SwTOXMark &GetTOXMark() const;
@@ -180,7 +180,7 @@ inline const SwFmtAutoFmt& SwTxtAttr::GetAutoFmt() const
return (const SwFmtAutoFmt&)(*m_pAttr);
}
-inline const SwFmtFld& SwTxtAttr::GetFld() const
+inline const SwFmtFld& SwTxtAttr::GetFmtFld() const
{
assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_FIELD );
return (const SwFmtFld&)(*m_pAttr);
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index c0498d497ca6..f52012564369 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -502,15 +502,15 @@ void _InitCore()
aAttrTab[ RES_CHRATR_DUMMY2 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_CHRATR_DUMMY2 );
aAttrTab[ RES_CHRATR_DUMMY3 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_CHRATR_DUMMY3 );
- aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] = new SwFmtAutoFmt;
- aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] = new SwFmtINetFmt( OUString(), OUString() );
aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] = new SwFmtRefMark( aEmptyOUStr );
aAttrTab[ RES_TXTATR_TOXMARK - POOLATTR_BEGIN ] = new SwTOXMark;
+ aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_META);
+ aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_METAFIELD);
+ aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] = new SwFmtAutoFmt;
+ aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] = new SwFmtINetFmt( OUString(), OUString() );
aAttrTab[ RES_TXTATR_CHARFMT- POOLATTR_BEGIN ] = new SwFmtCharFmt( 0 );
aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] = new SwFmtRuby( aEmptyOUStr );
aAttrTab[ RES_TXTATR_UNKNOWN_CONTAINER - POOLATTR_BEGIN ] = new SvXMLAttrContainerItem( RES_TXTATR_UNKNOWN_CONTAINER );
- aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_META);
- aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_METAFIELD);
aAttrTab[ RES_TXTATR_FIELD- POOLATTR_BEGIN ] = new SwFmtFld;
aAttrTab[ RES_TXTATR_FLYCNT - POOLATTR_BEGIN ] = new SwFmtFlyCnt( 0 );
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index a512e39867fa..3fc909caa02b 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -614,9 +614,9 @@ static void lcl_MakeFldLst( _SetGetExpFlds& rLst, const SwFieldType& rFldType,
bool bSubType = nSubType != USHRT_MAX;
for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
if( 0 != ( pTxtFld = pFmtFld->GetTxtFld() ) &&
- ( !bChkInpFlag || ((SwSetExpField*)pTxtFld->GetFld().GetFld())
+ ( !bChkInpFlag || ((SwSetExpField*)pTxtFld->GetFmtFld().GetField())
->GetInputFlag() ) &&
- (!bSubType || (pFmtFld->GetFld()->GetSubType()
+ (!bSubType || (pFmtFld->GetField()->GetSubType()
& 0xff ) == nSubType ))
{
SwCntntFrm* pCFrm;
@@ -1099,7 +1099,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
pTxtAttr = pTxtNd->GetTxtAttrForCharAt(
aPos.nContent.GetIndex(), RES_TXTATR_FIELD );
const SwField* pFld = pTxtAttr
- ? pTxtAttr->GetFld().GetFld()
+ ? pTxtAttr->GetFmtFld().GetField()
: 0;
if( SwContentAtPos::SW_CLICKFIELD & rCntntAtPos.eCntntAtPos &&
pFld && !pFld->HasClickHdl() )
@@ -1520,7 +1520,7 @@ const SwPostItField* SwCrsrShell::GetPostItFieldAtCursor() const
{
SwTxtAttr* pTxtAttr = pTxtNd->GetTxtAttrForCharAt(
pCursorPos->nContent.GetIndex(), RES_TXTATR_FIELD );
- const SwField* pFld = pTxtAttr ? pTxtAttr->GetFld().GetFld() : 0;
+ const SwField* pFld = pTxtAttr ? pTxtAttr->GetFmtFld().GetField() : 0;
if ( pFld && pFld->Which()== RES_POSTITFLD )
{
pPostItFld = static_cast<const SwPostItField*>(pFld);
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 6f322796e224..d38a5aa04b14 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -111,13 +111,13 @@ lcl_CleanStr(const SwTxtNode& rNd, xub_StrLen const nStart, xub_StrLen& rEnd,
const SwTxtAttr* pHt = (*pHts)[n];
if ( pHt->HasDummyChar() && (nStt >= nStart) )
{
- switch( pHt->Which() )
+ switch( pHt->Which() )
{
case RES_TXTATR_FLYCNT:
case RES_TXTATR_FTN:
- case RES_TXTATR_FIELD:
+ case RES_TXTATR_FIELD:
case RES_TXTATR_REFMARK:
- case RES_TXTATR_TOXMARK:
+ case RES_TXTATR_TOXMARK:
case RES_TXTATR_META:
case RES_TXTATR_METAFIELD:
{
@@ -130,24 +130,24 @@ lcl_CleanStr(const SwTxtNode& rNd, xub_StrLen const nStart, xub_StrLen& rEnd,
// end (might be normal 0x7f).
bool bEmpty = RES_TXTATR_FIELD != pHt->Which() ||
(static_cast<SwTxtFld const*>(pHt)
- ->GetFld().GetFld()->ExpandField(true).isEmpty());
+ ->GetFmtFld().GetField()->ExpandField(true).isEmpty());
if ( bEmpty && nStart == nAkt )
- {
+ {
rArr.push_back( nAkt );
--rEnd;
buf.remove(nAkt, 1);
- }
+ }
else
- {
+ {
if ( bEmpty )
aReplaced.push_back( nAkt );
buf[nAkt] = '\x7f';
}
- }
- break;
- default:
- OSL_FAIL( "unknown case in lcl_CleanStr" );
+ }
break;
+ default:
+ OSL_FAIL( "unknown case in lcl_CleanStr" );
+ break;
}
}
++n;
@@ -188,7 +188,7 @@ xub_StrLen GetPostIt(xub_StrLen aCount,const SwpHints *pHts)
aIndex++;
const SwTxtAttr* pTxtAttr = (*pHts)[i];
if ( (pTxtAttr->Which()==RES_TXTATR_FIELD) &&
- (pTxtAttr->GetFld().GetFld()->Which()==RES_POSTITFLD))
+ (pTxtAttr->GetFmtFld().GetField()->Which()==RES_POSTITFLD))
{
aCount--;
if (!aCount)
@@ -201,7 +201,7 @@ xub_StrLen GetPostIt(xub_StrLen aCount,const SwpHints *pHts)
{
const SwTxtAttr* pTxtAttr = (*pHts)[i];
if ( (pTxtAttr->Which()==RES_TXTATR_FIELD) &&
- (pTxtAttr->GetFld().GetFld()->Which()==RES_POSTITFLD))
+ (pTxtAttr->GetFmtFld().GetField()->Which()==RES_POSTITFLD))
break;
else
aIndex++;
@@ -271,7 +271,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
xub_StrLen aPos = *(*pHts)[i]->GetStart();
const SwTxtAttr* pTxtAttr = (*pHts)[i];
if ( (pTxtAttr->Which()==RES_TXTATR_FIELD) &&
- (pTxtAttr->GetFld().GetFld()->Which()==RES_POSTITFLD))
+ (pTxtAttr->GetFmtFld().GetField()->Which()==RES_POSTITFLD))
{
if ( (aPos >= nStart) && (aPos <= nEnd) )
aNumberPostits++;
@@ -356,7 +356,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
if ( (bSrchForward && (GetPostIt(aLoop + aIgnore,pHts) < pHts->Count()) ) || ( !bSrchForward && (aLoop!=0) ))
{
const SwTxtAttr* pTxtAttr = bSrchForward ? (*pHts)[GetPostIt(aLoop+aIgnore,pHts)] : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)];
- if ( pPostItMgr && pPostItMgr->SearchReplace(((SwTxtFld*)pTxtAttr)->GetFld(),rSearchOpt,bSrchForward) )
+ if ( pPostItMgr && pPostItMgr->SearchReplace(((SwTxtFld*)pTxtAttr)->GetFmtFld(),rSearchOpt,bSrchForward) )
{
bFound = true ;
break;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index f580a1c46224..98992d69525a 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1149,7 +1149,7 @@ struct _PostItFld : public _SetGetExpFld
SwPostItField* GetPostIt() const
{
- return (SwPostItField*) GetFld()->GetFld().GetFld();
+ return (SwPostItField*) GetTxtFld()->GetFmtFld().GetField();
}
};
@@ -1165,7 +1165,7 @@ sal_uInt16 _PostItFld::GetPageNo(
//but the PostIt's first occurrence in the selected area.
rVirtPgNo = 0;
sal_uInt16 nPos = GetCntnt();
- SwIterator<SwTxtFrm,SwTxtNode> aIter( GetFld()->GetTxtNode() );
+ SwIterator<SwTxtFrm,SwTxtNode> aIter( GetTxtFld()->GetTxtNode() );
for( SwTxtFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
{
if( pFrm->GetOfst() > nPos ||
@@ -1293,7 +1293,7 @@ void SwDoc::CalculatePagesForPrinting(
bool bIsPDFExport,
sal_Int32 nDocPageCount )
{
- const sal_Int32 nContent = rOptions.getIntValue( "PrintContent", 0 );
+ const sal_Int64 nContent = rOptions.getIntValue( "PrintContent", 0 );
const bool bPrintSelection = nContent == 2;
// properties to take into account when calcualting the set of pages
@@ -1522,7 +1522,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
// 0 -> print all pages (default if aPageRange is empty)
// 1 -> print range according to PageRange
// 2 -> print selection
- const sal_Int32 nContent = rOptions.getIntValue( "PrintContent", 0 );
+ const sal_Int64 nContent = rOptions.getIntValue( "PrintContent", 0 );
if (nContent == 1)
aPageRange = rOptions.getStringValue( "PageRange", OUString() );
if (aPageRange.isEmpty()) // empty string -> print all
@@ -1599,7 +1599,9 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
}
// make sure that all pages are in correct order
- sal_uInt16 nSPg = 0, nEPg = aVec.size(), nStep = 1;
+ sal_uInt16 nSPg = 0;
+ sal_uInt32 nEPg = aVec.size();
+ sal_uInt16 nStep = 1;
if ( 0 == (nEPg & 1 )) // there are no uneven ones!
--nEPg;
@@ -1690,7 +1692,7 @@ bool SwDoc::IncrementalDocStatCalculate(long nChars, bool bFields)
if (pFmtFld->IsFldInDoc())
{
SwPostItField const * const pField(
- static_cast<SwPostItField const*>(pFmtFld->GetFld()));
+ static_cast<SwPostItField const*>(pFmtFld->GetField()));
mpDocStat->nAllPara += pField->GetNumberOfParagraphs();
}
}
@@ -1834,8 +1836,8 @@ sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
const SfxPoolItem* pItem;
const SwTxtRefMark* pTxtRef;
- sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
- sal_uInt32 nCount = 0;
+ const sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
+ sal_uInt16 nCount = 0;
for( sal_uInt32 n = 0; n < nMaxItems; ++n )
if( 0 != (pItem = GetAttrPool().GetItem2( RES_TXTATR_REFMARK, n )) &&
0 != (pTxtRef = ((SwFmtRefMark*)pItem)->GetTxtRefMark()) &&
@@ -1846,7 +1848,7 @@ sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
OUString pTmp(((SwFmtRefMark*)pItem)->GetRefName());
pNames->insert(pNames->begin() + nCount, pTmp);
}
- nCount ++;
+ ++nCount;
}
return nCount;
@@ -2406,8 +2408,8 @@ bool SwDoc::ConvertFieldsToText()
if (!bSkip)
{
bool bInHeaderFooter = IsInHeaderFooter(SwNodeIndex(*pTxtFld->GetpTxtNode()));
- const SwFmtFld& rFmtFld = pTxtFld->GetFld();
- const SwField* pField = rFmtFld.GetFld();
+ const SwFmtFld& rFmtFld = pTxtFld->GetFmtFld();
+ const SwField* pField = rFmtFld.GetField();
//#i55595# some fields have to be excluded in headers/footers
sal_uInt16 nWhich = pField->GetTyp()->Which();
@@ -2631,7 +2633,7 @@ SwField * SwDoc::GetField(const SwPosition & rPos)
{
SwTxtFld * const pAttr = GetTxtFld(rPos);
- return (pAttr) ? const_cast<SwField *>( pAttr->GetFld().GetFld() ) : 0;
+ return (pAttr) ? const_cast<SwField *>( pAttr->GetFmtFld().GetField() ) : 0;
}
SwTxtFld * SwDoc::GetTxtFld(const SwPosition & rPos)
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 15792b089700..261b28d5ec05 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1617,9 +1617,9 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
if (pTxtNd->GetTxt()[nIndex] == CH_TXTATR_INWORD)
{
SwTxtAttr* pTxtAttr = pTxtNd->GetTxtAttrForCharAt(nIndex, RES_TXTATR_FIELD);
- if (pTxtAttr && pTxtAttr->GetFld().GetFld()->Which() == RES_POSTITFLD)
+ if (pTxtAttr && pTxtAttr->GetFmtFld().GetField()->Which() == RES_POSTITFLD)
{
- const SwPostItField* pField = dynamic_cast<const SwPostItField*>(pTxtAttr->GetFld().GetFld());
+ const SwPostItField* pField = dynamic_cast<const SwPostItField*>(pTxtAttr->GetFmtFld().GetField());
IDocumentMarkAccess::const_iterator_t ppMark = getIDocumentMarkAccess()->findMark(pField->GetName());
if (ppMark != getIDocumentMarkAccess()->getMarksEnd())
getIDocumentMarkAccess()->deleteMark(ppMark);
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 43850ed366dc..68cfd8d78058 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -417,7 +417,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
{
if( pFmtFld->GetTxtFld() )
{
- SwTblField* pFld = (SwTblField*)pFmtFld->GetFld();
+ SwTblField* pFld = (SwTblField*)pFmtFld->GetField();
if( pUpdtFld )
{
@@ -502,7 +502,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
// mba: do we really need this "optimization"? Is it still valid?
SwTblField* pFld;
if( !pFmtFld->GetTxtFld() || (nsSwExtendedSubType::SUB_CMD &
- (pFld = (SwTblField*)pFmtFld->GetFld())->GetSubType() ))
+ (pFld = (SwTblField*)pFmtFld->GetField())->GetSubType() ))
continue;
// needs to be recalculated
@@ -1013,11 +1013,11 @@ static OUString lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
static void lcl_CalcFld( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpFld& rSGEFld,
SwNewDBMgr* pMgr )
{
- const SwTxtFld* pTxtFld = rSGEFld.GetFld();
+ const SwTxtFld* pTxtFld = rSGEFld.GetTxtFld();
if( !pTxtFld )
return ;
- const SwField* pFld = pTxtFld->GetFld().GetFld();
+ const SwField* pFld = pTxtFld->GetFmtFld().GetField();
const sal_uInt16 nFldWhich = pFld->GetTyp()->Which();
if( RES_SETEXPFLD == nFldWhich )
@@ -1129,11 +1129,11 @@ void SwDoc::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblSize,
for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
{
- const SwTxtFld* pTxtFld = (*it)->GetFld();
+ const SwTxtFld* pTxtFld = (*it)->GetTxtFld();
if( !pTxtFld )
continue;
- const SwField* pFld = pTxtFld->GetFld().GetFld();
+ const SwField* pFld = pTxtFld->GetFmtFld().GetField();
switch( pFld->GetTyp()->Which() )
{
case RES_SETEXPFLD:
@@ -1302,15 +1302,15 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
continue;
}
- SwTxtFld* pTxtFld = (SwTxtFld*)(*it)->GetFld();
+ SwTxtFld* pTxtFld = (SwTxtFld*)(*it)->GetTxtFld();
if( !pTxtFld )
{
OSL_ENSURE( !this, "what's wrong now'" );
continue;
}
- SwFmtFld* pFmtFld = (SwFmtFld*)&pTxtFld->GetFld();
- SwField* pFld = pFmtFld->GetFld();
+ SwFmtFld* pFmtFld = (SwFmtFld*)&pTxtFld->GetFmtFld();
+ const SwField* pFld = pFmtFld->GetField();
switch( nWhich = pFld->GetTyp()->Which() )
{
@@ -1626,11 +1626,9 @@ const SwDBData& SwDoc::GetDBDesc()
if(pFld->IsFldInDoc())
{
if(RES_DBFLD == nWhich)
- maDBData =
- (static_cast < SwDBFieldType * > (pFld->GetFld()->GetTyp()))
- ->GetDBData();
+ maDBData = (static_cast < SwDBFieldType * > (pFld->GetField()->GetTyp()))->GetDBData();
else
- maDBData = (static_cast < SwDBNameInfField* > (pFld->GetFld()))->GetRealDBData();
+ maDBData = (static_cast < SwDBNameInfField* > (pFld->GetField()))->GetRealDBData();
break;
}
}
@@ -1699,7 +1697,7 @@ void SwDoc::GetAllUsedDB( std::vector<OUString>& rDBNameList,
if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
continue;
- const SwField* pFld = pFmtFld->GetFld();
+ const SwField* pFld = pFmtFld->GetField();
switch( pFld->GetTyp()->Which() )
{
case RES_DBFLD:
@@ -1849,7 +1847,7 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames,
if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
continue;
- SwField* pFld = pFmtFld->GetFld();
+ SwField* pFld = pFmtFld->GetField();
bool bExpand = false;
switch( pFld->GetTyp()->Which() )
@@ -2002,18 +2000,18 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
{
SwFieldType* pFldType = GetSysFldType( aTypes[ nStt ] );
SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
- for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
+ for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
{
- if( pFld && pFld->GetTxtFld() )
+ if( pFmtFld && pFmtFld->GetTxtFld() )
{
bool bChgd = false;
switch( aTypes[ nStt ] )
{
case RES_DOCINFOFLD:
- if( ((SwDocInfoField*)pFld->GetFld())->IsFixed() )
+ if( ((SwDocInfoField*)pFmtFld->GetField())->IsFixed() )
{
bChgd = true;
- SwDocInfoField* pDocInfFld = (SwDocInfoField*)pFld->GetFld();
+ SwDocInfoField* pDocInfFld = (SwDocInfoField*)pFmtFld->GetField();
pDocInfFld->SetExpansion( ((SwDocInfoFieldType*)
pDocInfFld->GetTyp())->Expand(
pDocInfFld->GetSubType(),
@@ -2024,10 +2022,10 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
break;
case RES_AUTHORFLD:
- if( ((SwAuthorField*)pFld->GetFld())->IsFixed() )
+ if( ((SwAuthorField*)pFmtFld->GetField())->IsFixed() )
{
bChgd = true;
- SwAuthorField* pAuthorFld = (SwAuthorField*)pFld->GetFld();
+ SwAuthorField* pAuthorFld = (SwAuthorField*)pFmtFld->GetField();
pAuthorFld->SetExpansion( ((SwAuthorFieldType*)
pAuthorFld->GetTyp())->Expand(
pAuthorFld->GetFormat() ) );
@@ -2035,10 +2033,10 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
break;
case RES_EXTUSERFLD:
- if( ((SwExtUserField*)pFld->GetFld())->IsFixed() )
+ if( ((SwExtUserField*)pFmtFld->GetField())->IsFixed() )
{
bChgd = true;
- SwExtUserField* pExtUserFld = (SwExtUserField*)pFld->GetFld();
+ SwExtUserField* pExtUserFld = (SwExtUserField*)pFmtFld->GetField();
pExtUserFld->SetExpansion( ((SwExtUserFieldType*)
pExtUserFld->GetTyp())->Expand(
pExtUserFld->GetSubType(),
@@ -2047,20 +2045,20 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
break;
case RES_DATETIMEFLD:
- if( ((SwDateTimeField*)pFld->GetFld())->IsFixed() )
+ if( ((SwDateTimeField*)pFmtFld->GetField())->IsFixed() )
{
bChgd = true;
- ((SwDateTimeField*)pFld->GetFld())->SetDateTime(
+ ((SwDateTimeField*)pFmtFld->GetField())->SetDateTime(
DateTime(Date(nDate), Time(nTime)) );
}
break;
case RES_FILENAMEFLD:
- if( ((SwFileNameField*)pFld->GetFld())->IsFixed() )
+ if( ((SwFileNameField*)pFmtFld->GetField())->IsFixed() )
{
bChgd = true;
SwFileNameField* pFileNameFld =
- (SwFileNameField*)pFld->GetFld();
+ (SwFileNameField*)pFmtFld->GetField();
pFileNameFld->SetExpansion( ((SwFileNameFieldType*)
pFileNameFld->GetTyp())->Expand(
pFileNameFld->GetFormat() ) );
@@ -2070,7 +2068,7 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
// Trigger formatting
if( bChgd )
- pFld->ModifyNotification( 0, 0 );
+ pFmtFld->ModifyNotification( 0, 0 );
}
}
}
@@ -2142,7 +2140,7 @@ void SwDoc::ChangeAuthorityData( const SwAuthEntry* pNewData )
void SwDocUpdtFld::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld )
{
- sal_uInt16 nWhich = rFld.GetFld().GetFld()->GetTyp()->Which();
+ const sal_uInt16 nWhich = rFld.GetFmtFld().GetField()->GetTyp()->Which();
switch( nWhich )
{
case RES_DBFLD:
@@ -2274,7 +2272,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
continue;
OUString sFormula;
- const SwField* pFld = pFmtFld->GetFld();
+ const SwField* pFld = pFmtFld->GetField();
switch( nWhich = pFld->GetTyp()->Which() )
{
case RES_DBSETNUMBERFLD:
@@ -2408,12 +2406,12 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, sal_uInt16 nFldWhich )
// always set the BodyTxtFlag in GetExp or DB fields
if( RES_GETEXPFLD == nFldWhich )
{
- SwGetExpField* pGetFld = (SwGetExpField*)rTFld.GetFld().GetFld();
+ SwGetExpField* pGetFld = (SwGetExpField*)rTFld.GetFmtFld().GetField();
pGetFld->ChgBodyTxtFlag( bIsInBody );
}
else if( RES_DBFLD == nFldWhich )
{
- SwDBField* pDBFld = (SwDBField*)rTFld.GetFld().GetFld();
+ SwDBField* pDBFld = (SwDBField*)rTFld.GetFmtFld().GetField();
pDBFld->ChgBodyTxtFlag( bIsInBody );
}
@@ -2554,8 +2552,8 @@ bool SwDoc::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
bool bTblSelBreak = false;
- SwFmtFld * pDstFmtFld = (SwFmtFld*)&pDstTxtFld->GetFld();
- SwField * pDstFld = pDstFmtFld->GetFld();
+ SwFmtFld * pDstFmtFld = (SwFmtFld*)&pDstTxtFld->GetFmtFld();
+ SwField * pDstFld = pDstFmtFld->GetField();
sal_uInt16 nFldWhich = rSrcFld.GetTyp()->Which();
SwNodeIndex aTblNdIdx(pDstTxtFld->GetTxtNode());
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 94a2f8afc521..ec8409fe2651 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1273,7 +1273,7 @@ void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode )
( !IsFromChapter() ||
::lcl_FindChapterNode( rTxtNode, 0 ) == pOwnChapterNode ) )
{
- const SwSetExpField* pSeqField = dynamic_cast< const SwSetExpField* >( pFmtFld->GetFld() );
+ const SwSetExpField* pSeqField = dynamic_cast< const SwSetExpField* >( pFmtFld->GetField() );
OUString sName = GetSequenceName();
sName += OUString( cSequenceMarkSeparator );
sName += OUString::number( pSeqField->GetSeqNumber() );
diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx