summaryrefslogtreecommitdiff
path: root/sw/source/filter/xml
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/xml')
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx12
-rw-r--r--sw/source/filter/xml/xmlimp.cxx58
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx16
-rw-r--r--sw/source/filter/xml/xmltble.cxx26
-rw-r--r--sw/source/filter/xml/xmltbli.cxx56
-rw-r--r--sw/source/filter/xml/xmltexte.cxx6
-rw-r--r--sw/source/filter/xml/xmltexti.cxx94
7 files changed, 134 insertions, 134 deletions
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index c556a4da7983..4f5be35d9724 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -1069,32 +1069,32 @@ bool SvXMLExportItemMapper::QueryXMLValue(
case RES_FRM_SIZE:
{
- const SwFormatFrmSize& rFrmSize = dynamic_cast<const SwFormatFrmSize&>(rItem);
+ const SwFormatFrameSize& rFrameSize = dynamic_cast<const SwFormatFrameSize&>(rItem);
bool bOutHeight = false;
switch( nMemberId )
{
case MID_FRMSIZE_REL_WIDTH:
- if (rFrmSize.GetWidthPercent())
+ if (rFrameSize.GetWidthPercent())
{
::sax::Converter::convertPercent(
- aOut, rFrmSize.GetWidthPercent() );
+ aOut, rFrameSize.GetWidthPercent() );
bOk = true;
}
break;
case MID_FRMSIZE_MIN_HEIGHT:
- if( ATT_MIN_SIZE == rFrmSize.GetHeightSizeType() )
+ if( ATT_MIN_SIZE == rFrameSize.GetHeightSizeType() )
bOutHeight = true;
break;
case MID_FRMSIZE_FIX_HEIGHT:
- if( ATT_FIX_SIZE == rFrmSize.GetHeightSizeType() )
+ if( ATT_FIX_SIZE == rFrameSize.GetHeightSizeType() )
bOutHeight = true;
break;
}
if( bOutHeight )
{
- rUnitConverter.convertMeasureToXML(aOut, rFrmSize.GetHeight());
+ rUnitConverter.convertMeasureToXML(aOut, rFrameSize.GetHeight());
bOk = true;
}
}
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 195bafd7d760..127726796d06 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -480,14 +480,14 @@ sal_Int64 SAL_CALL SwXMLImport::getSomething( const Sequence< sal_Int8 >& rId )
static OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCursor >& rTextCursor )
{
- Reference<XUnoTunnel> xCrsrTunnel( rTextCursor, UNO_QUERY );
- OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
- if( !xCrsrTunnel.is() )
+ Reference<XUnoTunnel> xCursorTunnel( rTextCursor, UNO_QUERY );
+ OSL_ENSURE( xCursorTunnel.is(), "missing XUnoTunnel for Cursor" );
+ if( !xCursorTunnel.is() )
return nullptr;
- OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper *>(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
- return pTextCrsr;
+ OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper *>(
+ sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
+ OSL_ENSURE( pTextCursor, "SwXTextCursor missing" );
+ return pTextCursor;
}
void SwXMLImport::startDocument()
@@ -588,7 +588,7 @@ void SwXMLImport::startDocument()
// We also might change into the insert mode later, so we have to make
// sure to first set the insert mode and then create the text import
// helper. Otherwise it won't have the insert flag set!
- OTextCursorHelper *pTextCrsr = nullptr;
+ OTextCursorHelper *pTextCursor = nullptr;
Reference < XTextCursor > xTextCursor;
if( HasTextImport() )
xTextCursor = GetTextImport()->GetCursor();
@@ -597,16 +597,16 @@ void SwXMLImport::startDocument()
Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY );
Reference < XText > xText = xTextDoc->getText();
xTextCursor = xText->createTextCursor();
- SwCrsrShell *pCrsrSh = nullptr;
+ SwCursorShell *pCursorSh = nullptr;
SwDoc *pDoc = nullptr;
if( SvXMLImportFlags::ALL == getImportFlags() )
{
- pTextCrsr = lcl_xml_GetSwXTextCursor( xTextCursor );
- OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
- if( !pTextCrsr )
+ pTextCursor = lcl_xml_GetSwXTextCursor( xTextCursor );
+ OSL_ENSURE( pTextCursor, "SwXTextCursor missing" );
+ if( !pTextCursor )
return;
- pDoc = pTextCrsr->GetDoc();
+ pDoc = pTextCursor->GetDoc();
OSL_ENSURE( pDoc, "SwDoc missing" );
if( !pDoc )
return;
@@ -615,16 +615,16 @@ void SwXMLImport::startDocument()
// a document. We then have to insert at the current edit shell's
// cursor position. That not quite clean code, but there is no other
// way currently.
- pCrsrSh = pDoc->GetEditShell();
+ pCursorSh = pDoc->GetEditShell();
}
- if( pCrsrSh )
+ if( pCursorSh )
{
const uno::Reference<text::XTextRange> xInsertTextRange(
SwXTextRange::CreateXTextRange(
- *pDoc, *pCrsrSh->GetCrsr()->GetPoint(), nullptr ) );
+ *pDoc, *pCursorSh->GetCursor()->GetPoint(), nullptr ) );
setTextInsertMode( xInsertTextRange );
xTextCursor = GetTextImport()->GetCursor();
- pTextCrsr = nullptr;
+ pTextCursor = nullptr;
}
else
GetTextImport()->SetCursor( xTextCursor );
@@ -633,13 +633,13 @@ void SwXMLImport::startDocument()
if( (!(getImportFlags() & (SvXMLImportFlags::CONTENT|SvXMLImportFlags::MASTERSTYLES))))
return;
- if( !pTextCrsr )
- pTextCrsr = lcl_xml_GetSwXTextCursor( xTextCursor );
- OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
- if( !pTextCrsr )
+ if( !pTextCursor )
+ pTextCursor = lcl_xml_GetSwXTextCursor( xTextCursor );
+ OSL_ENSURE( pTextCursor, "SwXTextCursor missing" );
+ if( !pTextCursor )
return;
- SwDoc *pDoc = pTextCrsr->GetDoc();
+ SwDoc *pDoc = pTextCursor->GetDoc();
OSL_ENSURE( pDoc, "SwDoc missing" );
if( !pDoc )
return;
@@ -656,7 +656,7 @@ void SwXMLImport::startDocument()
m_pSttNdIdx = new SwNodeIndex( pDoc->GetNodes() );
if( IsInsertMode() )
{
- SwPaM *pPaM = pTextCrsr->GetPaM();
+ SwPaM *pPaM = pTextCursor->GetPaM();
const SwPosition* pPos = pPaM->GetPoint();
// Split once and remember the node that has been splitted.
@@ -725,13 +725,13 @@ void SwXMLImport::endDocument()
SwDoc *pDoc = nullptr;
if( (getImportFlags() & SvXMLImportFlags::CONTENT) && !IsStylesOnlyMode() )
{
- Reference<XUnoTunnel> xCrsrTunnel( GetTextImport()->GetCursor(),
+ Reference<XUnoTunnel> xCursorTunnel( GetTextImport()->GetCursor(),
UNO_QUERY);
- assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
- OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper *>(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- assert(pTextCrsr && "SwXTextCursor missing");
- SwPaM *pPaM = pTextCrsr->GetPaM();
+ assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor");
+ OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper *>(
+ sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
+ assert(pTextCursor && "SwXTextCursor missing");
+ SwPaM *pPaM = pTextCursor->GetPaM();
if( IsInsertMode() && m_pSttNdIdx->GetIndex() )
{
// If we are in insert mode, join the splitted node that is in front
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 2a0d155f9f93..0e28509b7edd 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -845,12 +845,12 @@ bool SvXMLImportItemMapper::PutXMLValue(
case RES_FRM_SIZE:
{
- SwFormatFrmSize& rFrmSize = dynamic_cast<SwFormatFrmSize&>(rItem);
+ SwFormatFrameSize& rFrameSize = dynamic_cast<SwFormatFrameSize&>(rItem);
bool bSetHeight = false;
bool bSetWidth = false;
bool bSetSizeType = false;
- SwFrmSize eSizeType = ATT_VAR_SIZE;
+ SwFrameSize eSizeType = ATT_VAR_SIZE;
sal_Int32 nMin = MINLAY;
switch( nMemberId )
@@ -866,7 +866,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
else if( nValue > 100 )
nValue = 100;
- rFrmSize.SetWidthPercent( (sal_Int8)nValue );
+ rFrameSize.SetWidthPercent( (sal_Int8)nValue );
}
}
break;
@@ -901,8 +901,8 @@ bool SvXMLImportItemMapper::PutXMLValue(
else if( nValue > USHRT_MAX )
nValue = USHRT_MAX;
- rFrmSize.SetWidth( (sal_uInt16)nValue );
- rFrmSize.SetHeightSizeType( ATT_VAR_SIZE );
+ rFrameSize.SetWidth( (sal_uInt16)nValue );
+ rFrameSize.SetHeightSizeType( ATT_VAR_SIZE );
bOk = true;
}
}
@@ -917,11 +917,11 @@ bool SvXMLImportItemMapper::PutXMLValue(
if( bOk )
{
if( bSetWidth )
- rFrmSize.SetWidth( (sal_uInt16)nValue );
+ rFrameSize.SetWidth( (sal_uInt16)nValue );
if( bSetHeight )
- rFrmSize.SetHeight( (sal_uInt16)nValue );
+ rFrameSize.SetHeight( (sal_uInt16)nValue );
if( bSetSizeType )
- rFrmSize.SetHeightSizeType( eSizeType );
+ rFrameSize.SetHeightSizeType( eSizeType );
}
}
}
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 1852787fb193..227ea830d9b2 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -191,14 +191,14 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat,
const OUString& rNamePrefix,
sal_uInt32 nLine )
{
- const SwFormatFrmSize *pFrmSize = nullptr;
+ const SwFormatFrameSize *pFrameSize = nullptr;
const SwFormatRowSplit* pRowSplit = nullptr;
const SvxBrushItem *pBrush = nullptr;
const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
const SfxPoolItem *pItem;
if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, false, &pItem ) )
- pFrmSize = static_cast<const SwFormatFrmSize *>(pItem);
+ pFrameSize = static_cast<const SwFormatFrameSize *>(pItem);
if( SfxItemState::SET == rItemSet.GetItemState( RES_ROW_SPLIT, false, &pItem ) )
pRowSplit = static_cast<const SwFormatRowSplit *>(pItem);
@@ -207,7 +207,7 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat,
pBrush = static_cast<const SvxBrushItem *>(pItem);
// empty styles have not to be exported
- if( !pFrmSize && !pBrush && !pRowSplit )
+ if( !pFrameSize && !pBrush && !pRowSplit )
return false;
// order is: -/brush, size/-, size/brush
@@ -215,7 +215,7 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat,
SwXMLFrameFormats_Impl::iterator i;
for( i = aFormatList.begin(); i < aFormatList.end(); ++i )
{
- const SwFormatFrmSize *pTestFrmSize = nullptr;
+ const SwFormatFrameSize *pTestFrameSize = nullptr;
const SwFormatRowSplit* pTestRowSplit = nullptr;
const SvxBrushItem *pTestBrush = nullptr;
const SwFrameFormat *pTestFormat = *i;
@@ -223,14 +223,14 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat,
if( SfxItemState::SET == rTestSet.GetItemState( RES_FRM_SIZE, false,
&pItem ) )
{
- if( !pFrmSize )
+ if( !pFrameSize )
break;
- pTestFrmSize = static_cast<const SwFormatFrmSize *>(pItem);
+ pTestFrameSize = static_cast<const SwFormatFrameSize *>(pItem);
}
else
{
- if( pFrmSize )
+ if( pFrameSize )
continue;
}
@@ -262,9 +262,9 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat,
continue;
}
- if( pFrmSize &&
- ( pFrmSize->GetHeightSizeType() != pTestFrmSize->GetHeightSizeType() ||
- pFrmSize->GetHeight() != pTestFrmSize->GetHeight() ) )
+ if( pFrameSize &&
+ ( pFrameSize->GetHeightSizeType() != pTestFrameSize->GetHeightSizeType() ||
+ pFrameSize->GetHeight() != pTestFrameSize->GetHeight() ) )
continue;
if( pBrush && (*pBrush != *pTestBrush) )
@@ -701,11 +701,11 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTableNd )
if( pTableFormat )
{
sal_Int16 eTabHoriOri = pTableFormat->GetHoriOrient().GetHoriOrient();
- const SwFormatFrmSize& rFrmSize = pTableFormat->GetFrmSize();
+ const SwFormatFrameSize& rFrameSize = pTableFormat->GetFrameSize();
- sal_uInt32 nAbsWidth = rFrmSize.GetSize().Width();
+ sal_uInt32 nAbsWidth = rFrameSize.GetSize().Width();
sal_uInt32 nBaseWidth = 0UL;
- sal_Int8 nPrcWidth = rFrmSize.GetWidthPercent();
+ sal_Int8 nPrcWidth = rFrameSize.GetWidthPercent();
bool bFixAbsWidth = nPrcWidth != 0 || /*text::*/HoriOrientation::NONE == eTabHoriOri
|| /*text::*/HoriOrientation::FULL == eTabHoriOri;
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 8cb7e491f4cf..a5ec78a33e5f 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -691,26 +691,26 @@ void SwXMLTableCellContext_Impl::EndElement()
xSrcTextCursor->gotoEnd( sal_True );
// Until we have an API for copying we have to use the core.
- Reference<XUnoTunnel> xSrcCrsrTunnel( xSrcTextCursor, UNO_QUERY);
- assert(xSrcCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
- OTextCursorHelper *pSrcTextCrsr = reinterpret_cast< OTextCursorHelper * >(
- sal::static_int_cast< sal_IntPtr >( xSrcCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- assert(pSrcTextCrsr && "SwXTextCursor missing");
- SwDoc *pDoc = pSrcTextCrsr->GetDoc();
- const SwPaM *pSrcPaM = pSrcTextCrsr->GetPaM();
+ Reference<XUnoTunnel> xSrcCursorTunnel( xSrcTextCursor, UNO_QUERY);
+ assert(xSrcCursorTunnel.is() && "missing XUnoTunnel for Cursor");
+ OTextCursorHelper *pSrcTextCursor = reinterpret_cast< OTextCursorHelper * >(
+ sal::static_int_cast< sal_IntPtr >( xSrcCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
+ assert(pSrcTextCursor && "SwXTextCursor missing");
+ SwDoc *pDoc = pSrcTextCursor->GetDoc();
+ const SwPaM *pSrcPaM = pSrcTextCursor->GetPaM();
while( nColRepeat > 1 && GetTable()->IsInsertCellPossible() )
{
_InsertContent();
- Reference<XUnoTunnel> xDstCrsrTunnel(
+ Reference<XUnoTunnel> xDstCursorTunnel(
GetImport().GetTextImport()->GetCursor(), UNO_QUERY);
- assert(xDstCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
- OTextCursorHelper *pDstTextCrsr = reinterpret_cast< OTextCursorHelper * >(
- sal::static_int_cast< sal_IntPtr >( xDstCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )) );
- assert(pDstTextCrsr && "SwXTextCursor missing");
+ assert(xDstCursorTunnel.is() && "missing XUnoTunnel for Cursor");
+ OTextCursorHelper *pDstTextCursor = reinterpret_cast< OTextCursorHelper * >(
+ sal::static_int_cast< sal_IntPtr >( xDstCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )) );
+ assert(pDstTextCursor && "SwXTextCursor missing");
SwPaM aSrcPaM(*pSrcPaM->GetMark(), *pSrcPaM->GetPoint());
- SwPosition aDstPos( *pDstTextCrsr->GetPaM()->GetPoint() );
+ SwPosition aDstPos( *pDstTextCursor->GetPaM()->GetPoint() );
pDoc->getIDocumentContentOperations().CopyRange( aSrcPaM, aDstPos, /*bCopyAll=*/false, /*bCheckPos=*/true );
nColRepeat--;
@@ -801,7 +801,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
SfxItemState::SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, false,
&pItem ) )
{
- const SwFormatFrmSize *pSize = static_cast<const SwFormatFrmSize *>(pItem);
+ const SwFormatFrameSize *pSize = static_cast<const SwFormatFrameSize *>(pItem);
nWidth = pSize->GetWidth();
bRelWidth = ATT_VAR_SIZE == pSize->GetHeightSizeType();
}
@@ -1921,7 +1921,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper,
pFrameFormat->ResetAllFormatAttr(); // #i73790# - method renamed
pFrameFormat->SetFormatAttr( aFillOrder );
- pFrameFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nColWidth ) );
+ pFrameFormat->SetFormatAttr( SwFormatFrameSize( ATT_VAR_SIZE, nColWidth ) );
SwTableLines& rLines = pBox->GetTabLines();
bool bSplitted = false;
@@ -2168,7 +2168,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
if (! bModifyLocked)
pBoxFormat2->UnlockModify();
- pBoxFormat2->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nColWidth ) );
+ pBoxFormat2->SetFormatAttr( SwFormatFrameSize( ATT_VAR_SIZE, nColWidth ) );
return pBox;
}
@@ -2702,10 +2702,10 @@ void SwXMLTableContext::MakeTable()
bSetHoriOrient = true;
}
- const SwFormatFrmSize *pSize = nullptr;
+ const SwFormatFrameSize *pSize = nullptr;
if( SfxItemState::SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, false,
&pItem ) )
- pSize = static_cast<const SwFormatFrmSize *>(pItem);
+ pSize = static_cast<const SwFormatFrameSize *>(pItem);
switch( eHoriOrient )
{
@@ -2776,7 +2776,7 @@ void SwXMLTableContext::MakeTable()
// This must be after the call to _MakeTable, because nWidth might be
// changed there.
pFrameFormat->LockModify();
- SwFormatFrmSize aSize( ATT_VAR_SIZE, m_nWidth );
+ SwFormatFrameSize aSize( ATT_VAR_SIZE, m_nWidth );
aSize.SetWidthPercent( nPrcWidth );
pFrameFormat->SetFormatAttr( aSize );
pFrameFormat->UnlockModify();
@@ -2806,9 +2806,9 @@ void SwXMLTableContext::MakeTable()
// ??? this is always false: root frame is only created in SwViewShell::Init
if( m_pTableNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() )
{
- m_pTableNode->DelFrms();
+ m_pTableNode->DelFrames();
SwNodeIndex aIdx( *m_pTableNode->EndOfSectionNode(), 1 );
- m_pTableNode->MakeFrms( &aIdx );
+ m_pTableNode->MakeFrames( &aIdx );
}
}
@@ -2840,17 +2840,17 @@ const SwStartNode *SwXMLTableContext::InsertTableSection(
->InsertTableSection(pPrevSttNd, pStringValueStyleName);
const SwStartNode *pStNd;
- Reference<XUnoTunnel> xCrsrTunnel( GetImport().GetTextImport()->GetCursor(),
+ Reference<XUnoTunnel> xCursorTunnel( GetImport().GetTextImport()->GetCursor(),
UNO_QUERY);
- OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
- OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
+ OSL_ENSURE( xCursorTunnel.is(), "missing XUnoTunnel for Cursor" );
+ OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >(
+ sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
+ OSL_ENSURE( pTextCursor, "SwXTextCursor missing" );
if( m_bFirstSection )
{
// The Cursor already is in the first section
- pStNd = pTextCrsr->GetPaM()->GetNode().FindTableBoxStartNode();
+ pStNd = pTextCursor->GetPaM()->GetNode().FindTableBoxStartNode();
m_bFirstSection = false;
GetImport().GetTextImport()->SetStyleAndAttrs( GetImport(),
GetImport().GetTextImport()->GetCursor(), "Standard", true );
@@ -2861,7 +2861,7 @@ const SwStartNode *SwXMLTableContext::InsertTableSection(
const SwEndNode *pEndNd = pPrevSttNd ? pPrevSttNd->EndOfSectionNode()
: m_pTableNode->EndOfSectionNode();
// #i78921# - make code robust
- OSL_ENSURE( pDoc, "<SwXMLTableContext::InsertTableSection(..)> - no <pDoc> at <SwXTextCursor> instance - <SwXTextCurosr> doesn't seem to be registered at a <SwUnoCrsr> instance." );
+ OSL_ENSURE( pDoc, "<SwXMLTableContext::InsertTableSection(..)> - no <pDoc> at <SwXTextCursor> instance - <SwXTextCurosr> doesn't seem to be registered at a <SwUnoCursor> instance." );
if ( !pDoc )
{
pDoc = const_cast<SwDoc*>(pEndNd->GetDoc());
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index d310886bb0bd..b6e3f4f11586 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -68,10 +68,10 @@ enum SvEmbeddedObjectTypes
SwNoTextNode *SwXMLTextParagraphExport::GetNoTextNode(
const Reference < XPropertySet >& rPropSet )
{
- Reference<XUnoTunnel> xCrsrTunnel( rPropSet, UNO_QUERY );
- assert(xCrsrTunnel.is() && "missing XUnoTunnel for embedded");
+ Reference<XUnoTunnel> xCursorTunnel( rPropSet, UNO_QUERY );
+ assert(xCursorTunnel.is() && "missing XUnoTunnel for embedded");
SwXFrame *pFrame = reinterpret_cast< SwXFrame * >(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( SwXFrame::getUnoTunnelId() )));
+ sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( SwXFrame::getUnoTunnelId() )));
assert(pFrame && "SwXFrame missing");
SwFrameFormat *pFrameFormat = pFrame->GetFrameFormat();
const SwFormatContent& rContent = pFrameFormat->GetContent();
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 7f7a3481ac9d..a57a910aee9b 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -105,7 +105,7 @@ static void lcl_putHeightAndWidth ( SfxItemSet &rItemSet,
nHeight = convertMm100ToTwip( nHeight );
if( nHeight < MINFLY )
nHeight = MINFLY;
- rItemSet.Put( SwFormatFrmSize( ATT_FIX_SIZE, nWidth, nHeight ) );
+ rItemSet.Put( SwFormatFrameSize( ATT_FIX_SIZE, nWidth, nHeight ) );
}
SwFormatAnchor aAnchor( FLY_AT_CHAR );
@@ -183,15 +183,15 @@ SvXMLImportContext *SwXMLTextImportHelper::CreateTableChildContext(
bool SwXMLTextImportHelper::IsInHeaderFooter() const
{
- uno::Reference<XUnoTunnel> xCrsrTunnel(
+ uno::Reference<XUnoTunnel> xCursorTunnel(
const_cast<SwXMLTextImportHelper *>(this)->GetCursor(), UNO_QUERY );
- assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
- OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- SAL_WARN_IF(!pTextCrsr, "sw.uno", "SwXTextCursor missing");
- SwDoc *pDoc = pTextCrsr ? pTextCrsr->GetDoc() : nullptr;
+ assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor");
+ OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >(
+ sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
+ SAL_WARN_IF(!pTextCursor, "sw.uno", "SwXTextCursor missing");
+ SwDoc *pDoc = pTextCursor ? pTextCursor->GetDoc() : nullptr;
- return pDoc && pDoc->IsInHeaderFooter( pTextCrsr->GetPaM()->GetPoint()->nNode );
+ return pDoc && pDoc->IsInHeaderFooter( pTextCursor->GetPaM()->GetPoint()->nNode );
}
static SwOLENode *lcl_GetOLENode( const SwFrameFormat *pFrameFormat )
@@ -228,11 +228,11 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
if( aObjName.isEmpty() )
return xPropSet;
- uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
- assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
- OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- SAL_WARN_IF(!pTextCrsr, "sw.uno", "SwXTextCursor missing");
+ uno::Reference<XUnoTunnel> xCursorTunnel( GetCursor(), UNO_QUERY );
+ assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor");
+ OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >(
+ sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
+ SAL_WARN_IF(!pTextCursor, "sw.uno", "SwXTextCursor missing");
SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport );
SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -286,9 +286,9 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
lcl_setObjectVisualArea( xObj, nAspect, aTwipSize, MAP_TWIP );
}
- if( pTextCrsr )
+ if( pTextCursor )
{
- pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(),
+ pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(),
::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
&aItemSet,
nullptr,
@@ -342,9 +342,9 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
// the correct aspect will be set later
// TODO/LATER: Actually it should be set here
- if( pTextCrsr )
+ if( pTextCursor )
{
- pFrameFormat = pDoc->getIDocumentContentOperations().InsertOLE( *pTextCrsr->GetPaM(), aName, embed::Aspects::MSOLE_CONTENT, &aItemSet, nullptr, nullptr );
+ pFrameFormat = pDoc->getIDocumentContentOperations().InsertOLE( *pTextCursor->GetPaM(), aName, embed::Aspects::MSOLE_CONTENT, &aItemSet, nullptr, nullptr );
pOLENd = lcl_GetOLENode( pFrameFormat );
}
aObjName = aName;
@@ -542,11 +542,11 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
uno::Reference < XPropertySet > xPropSet;
- uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
- assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
- OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
+ uno::Reference<XUnoTunnel> xCursorTunnel( GetCursor(), UNO_QUERY );
+ assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor");
+ OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >(
+ sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
+ OSL_ENSURE( pTextCursor, "SwXTextCursor missing" );
SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport );
SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -593,7 +593,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
uno::UNO_QUERY_THROW );
{
- SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(),
+ SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(),
::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
&aItemSet,
nullptr,
@@ -630,12 +630,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
SolarMutexGuard aGuard;
uno::Reference < XPropertySet > xPropSet;
- uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
- assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
- OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
- SwDoc *pDoc = pTextCrsr->GetDoc();
+ uno::Reference<XUnoTunnel> xCursorTunnel( GetCursor(), UNO_QUERY );
+ assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor");
+ OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >(
+ sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
+ OSL_ENSURE( pTextCursor, "SwXTextCursor missing" );
+ SwDoc *pDoc = pTextCursor->GetDoc();
SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
RES_FRMATR_END );
@@ -655,7 +655,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
Size( nWidth, nHeight ),
MAP_100TH_MM );
- SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(),
+ SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(),
::svt::EmbeddedObjectRef( aAppletImpl.GetApplet(), embed::Aspects::MSOLE_CONTENT ),
&aAppletImpl.GetItemSet(),
nullptr,
@@ -677,12 +677,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
sal_Int32 nWidth, sal_Int32 nHeight )
{
uno::Reference < XPropertySet > xPropSet;
- uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
- assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
- OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
- SwDoc *pDoc = pTextCrsr->GetDoc();
+ uno::Reference<XUnoTunnel> xCursorTunnel( GetCursor(), UNO_QUERY );
+ assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor");
+ OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >(
+ sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
+ OSL_ENSURE( pTextCursor, "SwXTextCursor missing" );
+ SwDoc *pDoc = pTextCursor->GetDoc();
SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
RES_FRMATR_END );
@@ -730,7 +730,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
makeAny( OUString( rMimeType ) ) );
}
- SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(),
+ SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(),
::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
&aItemSet,
nullptr,
@@ -760,12 +760,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
SolarMutexGuard aGuard;
uno::Reference < XPropertySet > xPropSet;
- uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
- assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
- OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
- SwDoc *pDoc = pTextCrsr->GetDoc();
+ uno::Reference<XUnoTunnel> xCursorTunnel( GetCursor(), UNO_QUERY );
+ assert(xCursorTunnel.is() && "missing XUnoTunnel for Cursor");
+ OTextCursorHelper *pTextCursor = reinterpret_cast< OTextCursorHelper * >(
+ sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
+ OSL_ENSURE( pTextCursor, "SwXTextCursor missing" );
+ SwDoc *pDoc = pTextCursor->GetDoc();
SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
RES_FRMATR_END );
@@ -883,7 +883,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
makeAny( sal_Int32( aMargin.Height() ) ) );
}
- SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(),
+ SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCursor->GetPaM(),
::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
&aItemSet,
nullptr,
@@ -912,10 +912,10 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
// this method will modify the document directly -> lock SolarMutex
SolarMutexGuard aGuard;
- uno::Reference<XUnoTunnel> xCrsrTunnel( rPropSet, UNO_QUERY );
- assert(xCrsrTunnel.is() && "missing XUnoTunnel for embedded");
+ uno::Reference<XUnoTunnel> xCursorTunnel( rPropSet, UNO_QUERY );
+ assert(xCursorTunnel.is() && "missing XUnoTunnel for embedded");
SwXFrame *pFrame = reinterpret_cast< SwXFrame * >(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( SwXFrame::getUnoTunnelId() )));
+ sal::static_int_cast< sal_IntPtr >( xCursorTunnel->getSomething( SwXFrame::getUnoTunnelId() )));
OSL_ENSURE( pFrame, "SwXFrame missing" );
SwFrameFormat *pFrameFormat = pFrame->GetFrameFormat();
const SwFormatContent& rContent = pFrameFormat->GetContent();
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 12:27:23 +0000