summaryrefslogtreecommitdiff
path: root/sw/source/uibase/uno
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/uno')
-rw-r--r--sw/source/uibase/uno/SwXDocumentSettings.cxx8
-rw-r--r--sw/source/uibase/uno/unoatxt.cxx22
-rw-r--r--sw/source/uibase/uno/unomod.cxx4
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx152
-rw-r--r--sw/source/uibase/uno/unotxvw.cxx38
5 files changed, 112 insertions, 112 deletions
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index f57cf50171c7..7d513d4767f5 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -342,7 +342,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
case HANDLE_FIELD_AUTO_UPDATE:
{
bool bUpdateField = *static_cast<sal_Bool const *>(rValue.getValue());
- SwFldUpdateFlags nFlag = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
+ SwFieldUpdateFlags nFlag = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
mpDoc->getIDocumentSettingAccess().setFieldUpdateFlags( bUpdateField ?
nFlag == AUTOUPD_FIELD_AND_CHARTS ?
AUTOUPD_FIELD_AND_CHARTS :
@@ -353,7 +353,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
case HANDLE_CHART_AUTO_UPDATE:
{
bool bUpdateChart = *static_cast<sal_Bool const *>(rValue.getValue());
- SwFldUpdateFlags nFlag = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
+ SwFieldUpdateFlags nFlag = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
mpDoc->getIDocumentSettingAccess().setFieldUpdateFlags( (nFlag == AUTOUPD_FIELD_ONLY || nFlag == AUTOUPD_FIELD_AND_CHARTS ) ?
bUpdateChart ?
AUTOUPD_FIELD_AND_CHARTS :
@@ -896,13 +896,13 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
break;
case HANDLE_FIELD_AUTO_UPDATE:
{
- SwFldUpdateFlags nFlags = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
+ SwFieldUpdateFlags nFlags = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
rValue <<= nFlags == AUTOUPD_FIELD_ONLY || nFlags == AUTOUPD_FIELD_AND_CHARTS;
}
break;
case HANDLE_CHART_AUTO_UPDATE:
{
- SwFldUpdateFlags nFlags = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
+ SwFieldUpdateFlags nFlags = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
rValue <<= nFlags == AUTOUPD_FIELD_AND_CHARTS;
}
break;
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index c0490a2a39cf..35e1042485b5 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -307,11 +307,11 @@ static bool lcl_CopySelToDoc( SwDoc* pInsDoc, OTextCursorHelper* pxCursor, SwXTe
SwNodes& rNds = pInsDoc->GetNodes();
SwNodeIndex aIdx( rNds.GetEndOfContent(), -1 );
- SwCntntNode * pNd = aIdx.GetNode().GetCntntNode();
+ SwContentNode * pNd = aIdx.GetNode().GetContentNode();
SwPosition aPos(aIdx, SwIndex(pNd, (pNd) ? pNd->Len() : 0));
bool bRet = false;
- pInsDoc->getIDocumentFieldsAccess().LockExpFlds();
+ pInsDoc->getIDocumentFieldsAccess().LockExpFields();
{
SwDoc *const pDoc((pxCursor) ? pxCursor->GetDoc() : pxRange->GetDoc());
SwPaM aPam(pDoc->GetNodes());
@@ -331,9 +331,9 @@ static bool lcl_CopySelToDoc( SwDoc* pInsDoc, OTextCursorHelper* pxCursor, SwXTe
bRet = pDoc->getIDocumentContentOperations().CopyRange( *pPam, aPos, /*bCopyAll=*/false, /*bCheckPos=*/true ) || bRet;
}
- pInsDoc->getIDocumentFieldsAccess().UnlockExpFlds();
- if( !pInsDoc->getIDocumentFieldsAccess().IsExpFldsLocked() )
- pInsDoc->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+ pInsDoc->getIDocumentFieldsAccess().UnlockExpFields();
+ if( !pInsDoc->getIDocumentFieldsAccess().IsExpFieldsLocked() )
+ pInsDoc->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
return bRet;
}
@@ -364,13 +364,13 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const
OTextCursorHelper::getUnoTunnelId()));
}
- OUString sOnlyTxt;
- OUString* pOnlyTxt = 0;
+ OUString sOnlyText;
+ OUString* pOnlyText = 0;
bool bNoAttr = !pxCursor && !pxRange;
if(bNoAttr)
{
- sOnlyTxt = OUString(xTextRange->getString());
- pOnlyTxt = &sOnlyTxt;
+ sOnlyText = OUString(xTextRange->getString());
+ pOnlyText = &sOnlyText;
}
const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
@@ -387,8 +387,8 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const
pGlosGroup->SetBaseURL( OUString() );
sal_uInt16 nRet = USHRT_MAX;
- if( pOnlyTxt )
- nRet = pGlosGroup->PutText( sShortName, sLongName, *pOnlyTxt );
+ if( pOnlyText )
+ nRet = pGlosGroup->PutText( sShortName, sLongName, *pOnlyText );
else
{
pGlosGroup->ClearDoc();
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 5812d728102e..483c2a40e5f5 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -604,7 +604,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
case HANDLE_VIEWSET_GRAPHICS : mpViewOption->SetGraphic(bVal);break;
case HANDLE_VIEWSET_TABLES : mpViewOption->SetTable(bVal); break;
case HANDLE_VIEWSET_DRAWINGS : mpViewOption->SetDraw(bVal); break;
- case HANDLE_VIEWSET_FIELD_COMMANDS : mpViewOption->SetFldName(bVal); break;
+ case HANDLE_VIEWSET_FIELD_COMMANDS : mpViewOption->SetFieldName(bVal); break;
case HANDLE_VIEWSET_ANNOTATIONS : mpViewOption->SetPostIts(bVal); break;
case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : SwViewOption::SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, true); break;
case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: mpViewOption->SetViewMetaChars( bVal ); break;
@@ -834,7 +834,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
case HANDLE_VIEWSET_GRAPHICS : bBoolVal = mpConstViewOption->IsGraphic();break;
case HANDLE_VIEWSET_TABLES : bBoolVal = mpConstViewOption->IsTable(); break;
case HANDLE_VIEWSET_DRAWINGS : bBoolVal = mpConstViewOption->IsDraw(); break;
- case HANDLE_VIEWSET_FIELD_COMMANDS : bBoolVal = mpConstViewOption->IsFldName(); break;
+ case HANDLE_VIEWSET_FIELD_COMMANDS : bBoolVal = mpConstViewOption->IsFieldName(); break;
case HANDLE_VIEWSET_ANNOTATIONS : bBoolVal = mpConstViewOption->IsPostIts(); break;
case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : bBoolVal = SwViewOption::IsFieldShadings(); break;
case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: bBoolVal = mpConstViewOption->IsViewMetaChars(); break;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index a3ea47da95aa..8a61199b9688 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -200,15 +200,15 @@ static SwPrintUIOptions * lcl_GetPrintUIOptions(
return new SwPrintUIOptions( nCurrentPage, bWebDoc, bSwSrcView, bHasSelection, bHasPostIts, rPrintData );
}
-static SwTxtFmtColl *lcl_GetParaStyle(const OUString& rCollName, SwDoc* pDoc)
+static SwTextFormatColl *lcl_GetParaStyle(const OUString& rCollName, SwDoc* pDoc)
{
- SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName( rCollName );
+ SwTextFormatColl* pColl = pDoc->FindTextFormatCollByName( rCollName );
if( !pColl )
{
const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(
rCollName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
if( USHRT_MAX != nId )
- pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nId );
+ pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nId );
}
return pColl;
}
@@ -271,9 +271,9 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI
return nRet;
GetNumberFormatter();
- if (!xNumFmtAgg.is()) // may happen if not valid or no SwDoc
+ if (!xNumFormatAgg.is()) // may happen if not valid or no SwDoc
return 0;
- Any aNumTunnel = xNumFmtAgg->queryAggregation(cppu::UnoType<XUnoTunnel>::get());
+ Any aNumTunnel = xNumFormatAgg->queryAggregation(cppu::UnoType<XUnoTunnel>::get());
Reference<XUnoTunnel> xNumTunnel;
aNumTunnel >>= xNumTunnel;
return (xNumTunnel.is()) ? xNumTunnel->getSomething(rId) : 0;
@@ -306,8 +306,8 @@ Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(Run
&& rType != cppu::UnoType<com::sun::star::awt::XWindow>::get())
{
GetNumberFormatter();
- if(xNumFmtAgg.is())
- aRet = xNumFmtAgg->queryAggregation(rType);
+ if(xNumFormatAgg.is())
+ aRet = xNumFormatAgg->queryAggregation(rType);
}
return aRet;
}
@@ -334,10 +334,10 @@ Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() throw(RuntimeExceptio
Sequence< uno::Type > aNumTypes;
GetNumberFormatter();
- if(xNumFmtAgg.is())
+ if(xNumFormatAgg.is())
{
const uno::Type& rProvType = cppu::UnoType<XTypeProvider>::get();
- Any aNumProv = xNumFmtAgg->queryAggregation(rProvType);
+ Any aNumProv = xNumFormatAgg->queryAggregation(rProvType);
Reference<XTypeProvider> xNumProv;
if(aNumProv >>= xNumProv)
{
@@ -411,11 +411,11 @@ SwXTextDocument::SwXTextDocument(SwDocShell* pShell)
SwXTextDocument::~SwXTextDocument()
{
InitNewDoc();
- if(xNumFmtAgg.is())
+ if(xNumFormatAgg.is())
{
Reference< XInterface > x0;
- xNumFmtAgg->setDelegator(x0);
- xNumFmtAgg = 0;
+ xNumFormatAgg->setDelegator(x0);
+ xNumFormatAgg = 0;
}
delete m_pPrintUIOptions;
if (m_pRenderData && m_pRenderData->IsViewOptionAdjust())
@@ -442,33 +442,33 @@ void SwXTextDocument::GetNumberFormatter()
{
if(IsValid())
{
- if(!xNumFmtAgg.is())
+ if(!xNumFormatAgg.is())
{
if ( pDocShell->GetDoc() )
{
- SvNumberFormatsSupplierObj* pNumFmt = new SvNumberFormatsSupplierObj(
+ SvNumberFormatsSupplierObj* pNumFormat = new SvNumberFormatsSupplierObj(
pDocShell->GetDoc()->GetNumberFormatter( true ));
- Reference< util::XNumberFormatsSupplier > xTmp = pNumFmt;
- xNumFmtAgg = Reference< XAggregation >(xTmp, UNO_QUERY);
+ Reference< util::XNumberFormatsSupplier > xTmp = pNumFormat;
+ xNumFormatAgg = Reference< XAggregation >(xTmp, UNO_QUERY);
}
- if(xNumFmtAgg.is())
- xNumFmtAgg->setDelegator((cppu::OWeakObject*)(SwXTextDocumentBaseClass*)this);
+ if(xNumFormatAgg.is())
+ xNumFormatAgg->setDelegator((cppu::OWeakObject*)(SwXTextDocumentBaseClass*)this);
}
else
{
const uno::Type& rTunnelType = cppu::UnoType<XUnoTunnel>::get();
- Any aNumTunnel = xNumFmtAgg->queryAggregation(rTunnelType);
- SvNumberFormatsSupplierObj* pNumFmt = 0;
+ Any aNumTunnel = xNumFormatAgg->queryAggregation(rTunnelType);
+ SvNumberFormatsSupplierObj* pNumFormat = 0;
Reference< XUnoTunnel > xNumTunnel;
if(aNumTunnel >>= xNumTunnel)
{
- pNumFmt = reinterpret_cast<SvNumberFormatsSupplierObj*>(
+ pNumFormat = reinterpret_cast<SvNumberFormatsSupplierObj*>(
xNumTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId()));
}
- OSL_ENSURE(pNumFmt, "No number formatter available");
- if (pNumFmt && !pNumFmt->GetNumberFormatter())
- pNumFmt->SetNumberFormatter(pDocShell->GetDoc()->GetNumberFormatter( true ));
+ OSL_ENSURE(pNumFormat, "No number formatter available");
+ if (pNumFormat && !pNumFormat->GetNumberFormatter())
+ pNumFormat->SetNumberFormatter(pDocShell->GetDoc()->GetNumberFormatter( true ));
}
}
}
@@ -774,8 +774,8 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
}
else if(pSearch->bStyles)
{
- SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
- SwTxtFmtColl *pReplaceColl = lcl_GetParaStyle(pSearch->sReplaceText, pUnoCrsr->GetDoc());
+ SwTextFormatColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
+ SwTextFormatColl *pReplaceColl = lcl_GetParaStyle(pSearch->sReplaceText, pUnoCrsr->GetDoc());
bool bCancel;
nResult = pUnoCrsr->Find( *pSearchColl,
@@ -904,9 +904,9 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
}
else if(pSearch->bStyles)
{
- SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
+ SwTextFormatColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
//pSearch->sReplaceText
- SwTxtFmtColl *pReplaceColl = 0;
+ SwTextFormatColl *pReplaceColl = 0;
bool bCancel;
nResult = (sal_Int32)pUnoCrsr->Find( *pSearchColl,
eStart, eEnd, bCancel,
@@ -1054,11 +1054,11 @@ static OUString lcl_CreateOutlineString( size_t nIndex,
const SwOutlineNodes& rOutlineNodes, const SwNumRule* pOutlRule)
{
OUString sEntry;
- const SwTxtNode * pTxtNd = rOutlineNodes[ nIndex ]->GetTxtNode();
- SwNumberTree::tNumberVector aNumVector = pTxtNd->GetNumberVector();
- if( pOutlRule && pTxtNd->GetNumRule())
+ const SwTextNode * pTextNd = rOutlineNodes[ nIndex ]->GetTextNode();
+ SwNumberTree::tNumberVector aNumVector = pTextNd->GetNumberVector();
+ if( pOutlRule && pTextNd->GetNumRule())
for( sal_Int8 nLevel = 0;
- nLevel <= pTxtNd->GetActualListLevel();
+ nLevel <= pTextNd->GetActualListLevel();
nLevel++ )
{
long nVal = aNumVector[nLevel];
@@ -1068,7 +1068,7 @@ static OUString lcl_CreateOutlineString( size_t nIndex,
sEntry += ".";
}
sEntry += rOutlineNodes[ nIndex ]->
- GetTxtNode()->GetExpandTxt( 0, -1, false );
+ GetTextNode()->GetExpandText( 0, -1, false );
return sEntry;
}
@@ -1392,19 +1392,19 @@ Reference< drawing::XDrawPage > SwXTextDocument::getDrawPage() throw( RuntimeEx
void SwXTextDocument::Invalidate()
{
bObjectValid = false;
- if(xNumFmtAgg.is())
+ if(xNumFormatAgg.is())
{
const uno::Type& rTunnelType = cppu::UnoType<XUnoTunnel>::get();
- Any aNumTunnel = xNumFmtAgg->queryAggregation(rTunnelType);
- SvNumberFormatsSupplierObj* pNumFmt = 0;
+ Any aNumTunnel = xNumFormatAgg->queryAggregation(rTunnelType);
+ SvNumberFormatsSupplierObj* pNumFormat = 0;
Reference< XUnoTunnel > xNumTunnel;
if(aNumTunnel >>= xNumTunnel)
{
- pNumFmt = reinterpret_cast<SvNumberFormatsSupplierObj*>(
+ pNumFormat = reinterpret_cast<SvNumberFormatsSupplierObj*>(
xNumTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId()));
- pNumFmt->SetNumberFormatter(0);
+ pNumFormat->SetNumberFormatter(0);
}
- OSL_ENSURE(pNumFmt, "No number formatter available");
+ OSL_ENSURE(pNumFormat, "No number formatter available");
}
InitNewDoc();
pDocShell = 0;
@@ -1425,8 +1425,8 @@ void SwXTextDocument::InitNewDoc()
// first invalidate all collections, then delete references and Set to zero
if(pxXTextTables)
{
- XNameAccess* pTbls = pxXTextTables->get();
- static_cast<SwXTextTables*>(pTbls)->Invalidate();
+ XNameAccess* pTables = pxXTextTables->get();
+ static_cast<SwXTextTables*>(pTables)->Invalidate();
delete pxXTextTables;
pxXTextTables = 0;
}
@@ -1461,21 +1461,21 @@ void SwXTextDocument::InitNewDoc()
pBodyText = 0;
}
- if(xNumFmtAgg.is())
+ if(xNumFormatAgg.is())
{
const uno::Type& rTunnelType = cppu::UnoType<XUnoTunnel>::get();
- Any aNumTunnel = xNumFmtAgg->queryAggregation(rTunnelType);
- SvNumberFormatsSupplierObj* pNumFmt = 0;
+ Any aNumTunnel = xNumFormatAgg->queryAggregation(rTunnelType);
+ SvNumberFormatsSupplierObj* pNumFormat = 0;
Reference< XUnoTunnel > xNumTunnel;
if(aNumTunnel >>= xNumTunnel)
{
- pNumFmt = reinterpret_cast<SvNumberFormatsSupplierObj*>(
+ pNumFormat = reinterpret_cast<SvNumberFormatsSupplierObj*>(
xNumTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId()));
}
- OSL_ENSURE(pNumFmt, "No number formatter available");
- if (pNumFmt)
- pNumFmt->SetNumberFormatter(0);
+ OSL_ENSURE(pNumFormat, "No number formatter available");
+ if (pNumFormat)
+ pNumFormat->SetNumberFormatter(0);
}
if(pxXTextFieldTypes)
@@ -1523,16 +1523,16 @@ void SwXTextDocument::InitNewDoc()
if(pxXFootnotes)
{
- XIndexAccess* pFtn = pxXFootnotes->get();
- static_cast<SwXFootnotes*>(pFtn)->Invalidate();
+ XIndexAccess* pFootnote = pxXFootnotes->get();
+ static_cast<SwXFootnotes*>(pFootnote)->Invalidate();
delete pxXFootnotes;
pxXFootnotes = 0;
}
if(pxXEndnotes)
{
- XIndexAccess* pFtn = pxXEndnotes->get();
- static_cast<SwXFootnotes*>(pFtn)->Invalidate();
+ XIndexAccess* pFootnote = pxXEndnotes->get();
+ static_cast<SwXFootnotes*>(pFootnote)->Invalidate();
delete pxXEndnotes;
pxXEndnotes = 0;
}
@@ -2602,7 +2602,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
}
// #122919# Force field update before PDF export
- pViewShell->SwViewShell::UpdateFlds(true);
+ pViewShell->SwViewShell::UpdateFields(true);
if( bStateChanged )
pRenderDocShell->EnableSetModified( true );
@@ -3342,10 +3342,10 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
//USER STYLES
- const SwCharFmts *pFmts = pDoc->GetCharFmts();
- for(size_t i = 0; i < pFmts->size(); ++i)
+ const SwCharFormats *pFormats = pDoc->GetCharFormats();
+ for(size_t i = 0; i < pFormats->size(); ++i)
{
- const SwAttrSet &rAttrSet = (*pFmts)[i]->GetAttrSet();
+ const SwAttrSet &rAttrSet = (*pFormats)[i]->GetAttrSet();
LanguageType nLang = LANGUAGE_DONTKNOW;
if (bLatin)
{
@@ -3367,7 +3367,7 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
}
}
- const SwTxtFmtColls *pColls = pDoc->GetTxtFmtColls();
+ const SwTextFormatColls *pColls = pDoc->GetTextFormatColls();
for (size_t i = 0; i < pColls->size(); ++i)
{
const SwAttrSet &rAttrSet = (*pColls)[i]->GetAttrSet();
@@ -3533,49 +3533,49 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
{
sSuffix += "table";
- Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
+ Reference< XNameAccess > xTables = new SwXLinkNameAccessWrapper(
pxDoc->getTextTables(), sToCompare, sSuffix );
- Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
+ Reference< XPropertySet > xRet(xTables, UNO_QUERY);
aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
}
else if(sToCompare == sFrames)
{
sSuffix += "frame";
- Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
+ Reference< XNameAccess > xTables = new SwXLinkNameAccessWrapper(
pxDoc->getTextFrames(), sToCompare, sSuffix );
- Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
+ Reference< XPropertySet > xRet(xTables, UNO_QUERY);
aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
}
else if(sToCompare == sSections)
{
sSuffix += "region";
- Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
+ Reference< XNameAccess > xTables = new SwXLinkNameAccessWrapper(
pxDoc->getTextSections(), sToCompare, sSuffix );
- Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
+ Reference< XPropertySet > xRet(xTables, UNO_QUERY);
aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
}
else if(sToCompare == sGraphics)
{
sSuffix += "graphic";
- Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
+ Reference< XNameAccess > xTables = new SwXLinkNameAccessWrapper(
pxDoc->getGraphicObjects(), sToCompare, sSuffix );
- Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
+ Reference< XPropertySet > xRet(xTables, UNO_QUERY);
aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
}
else if(sToCompare == sOLEs)
{
sSuffix += "ole";
- Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
+ Reference< XNameAccess > xTables = new SwXLinkNameAccessWrapper(
pxDoc->getEmbeddedObjects(), sToCompare, sSuffix );
- Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
+ Reference< XPropertySet > xRet(xTables, UNO_QUERY);
aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
}
else if(sToCompare == sOutlines)
{
sSuffix += "outline";
- Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
+ Reference< XNameAccess > xTables = new SwXLinkNameAccessWrapper(
*pxDoc, sToCompare, sSuffix );
- Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
+ Reference< XPropertySet > xRet(xTables, UNO_QUERY);
aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
}
else if(sToCompare == sBookmarks)
@@ -4119,12 +4119,12 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions)
// to avoid unnecessary reformatting the view options related to the content
// below should only change if necessary, that is if respective content is present
const bool bContainsHiddenChars = m_pShell->GetDoc()->ContainsHiddenChars();
- const SwFieldType* pFldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENTXTFLD );
- const bool bContainsHiddenFields = pFldType && pFldType->HasWriterListeners();
- pFldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENPARAFLD );
- const bool bContainsHiddenParagraphs = pFldType && pFldType->HasWriterListeners();
- pFldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_JUMPEDITFLD );
- const bool bContainsPlaceHolders = pFldType && pFldType->HasWriterListeners();
+ const SwFieldType* pFieldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENTXTFLD );
+ const bool bContainsHiddenFields = pFieldType && pFieldType->HasWriterListeners();
+ pFieldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENPARAFLD );
+ const bool bContainsHiddenParagraphs = pFieldType && pFieldType->HasWriterListeners();
+ pFieldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_JUMPEDITFLD );
+ const bool bContainsPlaceHolders = pFieldType && pFieldType->HasWriterListeners();
const bool bContainsFields = m_pShell->IsAnyFieldInDoc();
SwViewOption aRenderViewOptions( m_aOldViewOptions );
@@ -4156,7 +4156,7 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions)
}
if (bContainsFields)
- aRenderViewOptions.SetFldName( false );
+ aRenderViewOptions.SetFieldName( false );
// we need to set this flag in order to get to see the visible effect of
// some of the above settings (needed for correct rendering)
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 3a2820f18d1c..b81fd2ecc647 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -338,8 +338,8 @@ uno::Any SwXTextView::getSelection()
{
if(rSh.GetTableCrsr())
{
- OSL_ENSURE(rSh.GetTableFmt(), "not a table format?");
- uno::Reference< text::XTextTableCursor > xCrsr = new SwXTextTableCursor(*rSh.GetTableFmt(),
+ OSL_ENSURE(rSh.GetTableFormat(), "not a table format?");
+ uno::Reference< text::XTextTableCursor > xCrsr = new SwXTextTableCursor(*rSh.GetTableFormat(),
rSh.GetTableCrsr());
aRef = uno::Reference< uno::XInterface > (xCrsr, uno::UNO_QUERY);
break;
@@ -358,31 +358,31 @@ uno::Any SwXTextView::getSelection()
break;
case SHELL_MODE_FRAME :
{
- SwFrmFmt *const pFmt = rSh.GetFlyFrmFmt();
- if (pFmt)
+ SwFrameFormat *const pFormat = rSh.GetFlyFrameFormat();
+ if (pFormat)
{
aRef = SwXTextFrame::CreateXTextFrame(
- *pFmt->GetDoc(), pFmt);
+ *pFormat->GetDoc(), pFormat);
}
}
break;
case SHELL_MODE_GRAPHIC :
{
- SwFrmFmt *const pFmt = rSh.GetFlyFrmFmt();
- if (pFmt)
+ SwFrameFormat *const pFormat = rSh.GetFlyFrameFormat();
+ if (pFormat)
{
aRef = SwXTextGraphicObject::CreateXTextGraphicObject(
- *pFmt->GetDoc(), pFmt);
+ *pFormat->GetDoc(), pFormat);
}
}
break;
case SHELL_MODE_OBJECT :
{
- SwFrmFmt *const pFmt = rSh.GetFlyFrmFmt();
- if (pFmt)
+ SwFrameFormat *const pFormat = rSh.GetFlyFrameFormat();
+ if (pFormat)
{
aRef = SwXTextEmbeddedObject::CreateXTextEmbeddedObject(
- *pFmt->GetDoc(), pFmt);
+ *pFormat->GetDoc(), pFormat);
}
}
break;
@@ -550,7 +550,7 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto
const SwRubyListEntry* pEntry = &aList[n];
const OUString& rEntryText = pEntry->GetText();
- const SwFmtRuby& rAttr = pEntry->GetRubyAttr();
+ const SwFormatRuby& rAttr = pEntry->GetRubyAttr();
pRet[n].realloc(5);
PropertyValue* pValues = pRet[n].getArray();
@@ -559,7 +559,7 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto
pValues[1].Name = UNO_NAME_RUBY_TEXT;
pValues[1].Value <<= rAttr.GetText();
pValues[2].Name = UNO_NAME_RUBY_CHAR_STYLE_NAME;
- SwStyleNameMapper::FillProgName(rAttr.GetCharFmtName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
+ SwStyleNameMapper::FillProgName(rAttr.GetCharFormatName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
pValues[2].Value <<= aString;
pValues[3].Name = UNO_NAME_RUBY_ADJUST;
pValues[3].Value <<= (sal_Int16)rAttr.GetAdjustment();
@@ -616,8 +616,8 @@ void SAL_CALL SwXTextView::setRubyList(
: SwStyleNameMapper::GetPoolIdFromUIName(sName,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
- pEntry->GetRubyAttr().SetCharFmtName( sName );
- pEntry->GetRubyAttr().SetCharFmtId( nPoolId );
+ pEntry->GetRubyAttr().SetCharFormatName( sName );
+ pEntry->GetRubyAttr().SetCharFormatId( nPoolId );
}
}
else if(pProperties[nProp].Name == UNO_NAME_RUBY_ADJUST)
@@ -916,7 +916,7 @@ awt::Point SwXTextViewCursor::getPosition() throw( uno::RuntimeException, std::e
const SwWrtShell& rSh = m_pView->GetWrtShell();
const SwRect aCharRect(rSh.GetCharRect());
- const SwFrmFmt& rMaster = rSh.GetPageDesc( rSh.GetCurPageDesc() ).GetMaster();
+ const SwFrameFormat& rMaster = rSh.GetPageDesc( rSh.GetCurPageDesc() ).GetMaster();
const SvxULSpaceItem& rUL = rMaster.GetULSpace();
const long nY = aCharRect.Top() - (rUL.GetUpper() + DOCUMENTBORDER);
@@ -1113,9 +1113,9 @@ void SwXTextViewCursor::gotoRange(
pSrcNode = &aPam.GetNode();
}
}
- else if (pPara && pPara->GetTxtNode())
+ else if (pPara && pPara->GetTextNode())
{
- pSrcNode = pPara->GetTxtNode();
+ pSrcNode = pPara->GetTextNode();
}
const SwStartNode* pTmp = pSrcNode ? pSrcNode->FindSttNodeByType(eSearchNodeType) : 0;
@@ -1494,7 +1494,7 @@ void SwXTextViewCursor::setPropertyValue( const OUString& rPropertyName, const
SwWrtShell& rSh = m_pView->GetWrtShell();
SwPaM* pShellCrsr = rSh.GetCrsr();
SwNode& rNode = pShellCrsr->GetNode();
- if (rNode.IsTxtNode())
+ if (rNode.IsTextNode())
{
SwUnoCursorHelper::SetPropertyValue(
*pShellCrsr, *m_pPropSet, rPropertyName, aValue );
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 14:08:14 +0000