summaryrefslogtreecommitdiff
path: root/sw/source/filter/xml/xmltexti.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/xml/xmltexti.cxx')
-rw-r--r--sw/source/filter/xml/xmltexti.cxx94
1 files changed, 47 insertions, 47 deletions
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-24 00:41:30 +0000