summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/html/htmldrawreader.cxx2
-rw-r--r--sw/source/filter/html/htmlform.cxx2
-rw-r--r--sw/source/filter/html/htmlforw.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx2
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx16
-rw-r--r--sw/source/filter/ww8/ww8par.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.hxx3
11 files changed, 18 insertions, 23 deletions
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index 61b69da31619..7a25f7a44fa7 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -358,7 +358,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// #i52858# - method name changed
SwDrawModel* pModel = m_pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
SdrPage* pPg = pModel->GetPage( 0 );
- m_pMarquee = SdrObjFactory::MakeNewObject( SdrInventor,
+ m_pMarquee = SdrObjFactory::MakeNewObject( SdrInventor::Default,
OBJ_TEXT, pPg, pModel );
if( !m_pMarquee )
return;
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 0dceef8cc4de..532efa47ea09 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -685,7 +685,7 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha
// Schauen, ob es ein SdrObject dafuer gibt
const SdrObject *pObj = pFrameFormat ? pFrameFormat->FindSdrObject() : nullptr;
OSL_ENSURE( pObj, "SdrObject nicht gefunden" );
- OSL_ENSURE( pObj && FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" );
+ OSL_ENSURE( pObj && SdrInventor::FmForm == pObj->GetObjInventor(), "falscher Inventor" );
const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : nullptr;
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 6250b987b451..f0de3f6e2dcc 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -628,7 +628,7 @@ const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrameFormat& rFormat
// Schauen, ob es ein SdrObject dafuer gibt
const SdrObject *pObj = rFormat.FindSdrObject();
- if( !pObj || FmFormInventor != pObj->GetObjInventor() )
+ if( !pObj || SdrInventor::FmForm != pObj->GetObjInventor() )
return nullptr;
const SdrUnoObj& rFormObj = dynamic_cast<const SdrUnoObj&>(*pObj);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2aea2cc1ee54..7830a3260126 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4580,7 +4580,7 @@ void DocxAttributeOutput::WritePostponedMath(const SwOLENode* pPostponedMath)
void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
{
- if (!pObject || pObject->GetObjInventor() != FmFormInventor)
+ if (!pObject || pObject->GetObjInventor() != SdrInventor::FmForm)
return;
SdrUnoObj *pFormObj = const_cast<SdrUnoObj*>(dynamic_cast< const SdrUnoObj*>(pObject));
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index fc362a9474d1..699ad22fde26 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1957,7 +1957,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi
m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_FIELD);
m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST);
- if (pObject && pObject->GetObjInventor() == FmFormInventor)
+ if (pObject && pObject->GetObjInventor() == SdrInventor::FmForm)
{
if (const SdrUnoObj* pFormObj = dynamic_cast< const SdrUnoObj*>(pObject))
{
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 1d47d51daa83..4c1ef187430d 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -247,7 +247,7 @@ namespace ww8
default:
if (const SdrObject* pObj = rFormat.FindRealSdrObject())
{
- if (pObj->GetObjInventor() == FmFormInventor)
+ if (pObj->GetObjInventor() == SdrInventor::FmForm)
meWriterType = eFormControl;
else
meWriterType = eDrawing;
@@ -372,7 +372,7 @@ namespace sw
void SetLayer::SetObjectLayer(SdrObject &rObject, Layer eLayer) const
{
- if (FmFormInventor == rObject.GetObjInventor())
+ if (SdrInventor::FmForm == rObject.GetObjInventor())
rObject.SetLayer(mnFormLayer);
else
{
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 24c2583314d0..9fc44252d0d6 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -366,7 +366,7 @@ namespace
bool WW8Export::MiserableFormFieldExportHack(const SwFrameFormat& rFrameFormat)
{
const SdrObject *pObject = rFrameFormat.FindRealSdrObject();
- if (!pObject || pObject->GetObjInventor() != FmFormInventor)
+ if (!pObject || pObject->GetObjInventor() != SdrInventor::FmForm)
return false;
const SdrUnoObj *pFormObj = dynamic_cast< const SdrUnoObj* >(pObject);
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 3c0a4a32df3f..0b139cf3ac2d 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2041,7 +2041,7 @@ bool WW8_WrPlcSubDoc::WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp,
{
// is it an writer or sdr - textbox?
const SdrObject& rObj = *static_cast<SdrObject const *>(aContent[ i ]);
- if (rObj.GetObjInventor() == FmFormInventor)
+ if (rObj.GetObjInventor() == SdrInventor::FmForm)
{
sal_uInt8 nOldTyp = rWrt.m_nTextTyp;
rWrt.m_nTextTyp = nTTyp;
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 35059e45b998..09e6dfd3f893 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2626,20 +2626,16 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
for (sal_uInt16 i = 0; i < nCount; i++ )
{
SdrObjUserData* pData = pObject->GetUserData( i );
- if( pData && pData->GetInventor() == SW_DRAWLAYER
+ if( pData && pData->GetInventor() == SdrInventor::ScOrSwDraw
&& pData->GetId() == SW_UD_IMAPDATA)
{
SwMacroInfo* macInf = dynamic_cast<SwMacroInfo*>(pData);
- if( macInf )// && macInf->GetShapeId() == pF->nSpId)
+ if( macInf && macInf->GetShapeId() == pF->nSpId )
{
- sal_Int32 nShapeId = macInf->GetShapeId();
- if ( nShapeId == pF->nSpId )
- {
- lnName = macInf->GetHlink();
- aObjName = macInf->GetName();
- aTarFrame = macInf->GetTarFrame();
- break;
- }
+ lnName = macInf->GetHlink();
+ aObjName = macInf->GetName();
+ aTarFrame = macInf->GetTarFrame();
+ break;
}
}
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 045cf7353279..10094cf44931 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -165,7 +165,7 @@ SwMacroInfo* GetMacroInfo( SdrObject* pObj, bool bCreate ) // static
for( sal_uInt16 i = 0; i < nCount; i++ )
{
SdrObjUserData* pData = pObj->GetUserData( i );
- if( pData && pData->GetInventor() == SW_DRAWLAYER
+ if( pData && pData->GetInventor() == SdrInventor::ScOrSwDraw
&& pData->GetId() == SW_UD_IMAPDATA)
{
return dynamic_cast<SwMacroInfo*>(pData);
@@ -6503,7 +6503,7 @@ namespace sw
}
SwMacroInfo::SwMacroInfo()
- : SdrObjUserData( SW_DRAWLAYER, SW_UD_IMAPDATA )
+ : SdrObjUserData( SdrInventor::ScOrSwDraw, SW_UD_IMAPDATA )
, mnShapeId(-1)
{
}
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 7d9dd965277d..dd7e397796c1 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -27,8 +27,6 @@
#include <fltshell.hxx>
#include <svx/svdobj.hxx>
-#define SW_DRAWLAYER 0x30334353
-#define SW_UD_IMAPDATA 2
#include <vector>
#include <stack>
@@ -54,6 +52,7 @@
#include <editeng/lrspitem.hxx>
#include <oox/ole/olehelper.hxx>
+#define SW_UD_IMAPDATA 2
class SwDoc;
class SwPaM;
generated by cgit (git 2.34.1) at 2024-08-21 16:27:03 +0000