summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/swg/SwXMLBlockImport.cxx4
-rw-r--r--sw/source/filter/xml/xmlimp.cxx30
-rw-r--r--sw/source/filter/xml/xmlimp.hxx2
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx2
-rw-r--r--sw/source/uibase/config/StoredChapterNumbering.cxx2
5 files changed, 20 insertions, 20 deletions
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index dcc69095a5e0..69e93c553926 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -349,7 +349,7 @@ SwXMLTextBlockParContext::~SwXMLTextBlockParContext ( void )
SwXMLBlockListImport::SwXMLBlockListImport(
const uno::Reference< uno::XComponentContext > xContext,
SwXMLTextBlocks &rBlocks )
-: SvXMLImport( xContext, "", 0 ),
+: SvXMLImport( xContext, "", SvXMLImportFlags::NONE ),
rBlockList (rBlocks)
{
}
@@ -373,7 +373,7 @@ SwXMLTextBlockImport::SwXMLTextBlockImport(
SwXMLTextBlocks &rBlocks,
OUString & rNewText,
bool bNewTextOnly )
-: SvXMLImport(xContext, "", IMPORT_ALL ),
+: SvXMLImport(xContext, "", SvXMLImportFlags::ALL ),
rBlockList ( rBlocks ),
bTextOnly ( bNewTextOnly ),
m_rText ( rNewText )
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index ae2cbc3e4798..dfd3266064eb 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -404,7 +404,7 @@ SvXMLImportContext *SwXMLImport::CreateContext(
SwXMLImport::SwXMLImport(
const uno::Reference< uno::XComponentContext > xContext,
- OUString const & implementationName, sal_uInt16 nImportFlags)
+ OUString const & implementationName, SvXMLImportFlags nImportFlags)
: SvXMLImport( xContext, implementationName, nImportFlags ),
pSttNdIdx( 0 ),
pTableItemMapper( 0 ),
@@ -607,7 +607,7 @@ void SwXMLImport::startDocument()
xTextCursor = xText->createTextCursor();
SwCrsrShell *pCrsrSh = 0;
SwDoc *pDoc = 0;
- if( IMPORT_ALL == getImportFlags() )
+ if( SvXMLImportFlags::ALL == getImportFlags() )
{
pTxtCrsr = lcl_xml_GetSwXTextCursor( xTextCursor );
OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
@@ -638,7 +638,7 @@ void SwXMLImport::startDocument()
GetTextImport()->SetCursor( xTextCursor );
}
- if( (getImportFlags() & (IMPORT_CONTENT|IMPORT_MASTERSTYLES)) == 0 )
+ if( (!(getImportFlags() & (SvXMLImportFlags::CONTENT|SvXMLImportFlags::MASTERSTYLES))))
return;
if( !pTxtCrsr )
@@ -652,7 +652,7 @@ void SwXMLImport::startDocument()
if( !pDoc )
return;
- if( (getImportFlags() & IMPORT_CONTENT) != 0 && !IsStylesOnlyMode() )
+ if( (getImportFlags() & SvXMLImportFlags::CONTENT) && !IsStylesOnlyMode() )
{
pSttNdIdx = new SwNodeIndex( pDoc->GetNodes() );
if( IsInsertMode() )
@@ -724,7 +724,7 @@ void SwXMLImport::endDocument( void )
ClearShapeImport();
SwDoc *pDoc = 0;
- if( (getImportFlags() & IMPORT_CONTENT) != 0 && !IsStylesOnlyMode() )
+ if( (getImportFlags() & SvXMLImportFlags::CONTENT) && !IsStylesOnlyMode() )
{
Reference<XUnoTunnel> xCrsrTunnel( GetTextImport()->GetCursor(),
UNO_QUERY);
@@ -852,8 +852,8 @@ void SwXMLImport::endDocument( void )
GetTextImport()->RedlineAdjustStartNodeCursor( false );
- if( (getImportFlags() & IMPORT_CONTENT) != 0 ||
- ((getImportFlags() & IMPORT_MASTERSTYLES) != 0 && IsStylesOnlyMode()) )
+ if( (getImportFlags() & SvXMLImportFlags::CONTENT) ||
+ ((getImportFlags() & SvXMLImportFlags::MASTERSTYLES) && IsStylesOnlyMode()) )
{
// pDoc might be 0. In this case UpdateTxtCollCondition is looking
// for it itself.
@@ -868,7 +868,7 @@ void SwXMLImport::endDocument( void )
// SJ: #i49801# -> now permitting repaints
if ( pDoc )
{
- if( (getImportFlags() == IMPORT_ALL ) )
+ if( (getImportFlags() == SvXMLImportFlags::ALL ) )
{
// Notify math objects. If we are in the package filter this will
// be done by the filter object itself
@@ -1507,7 +1507,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImport_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- return (cppu::OWeakObject*)new SwXMLImport( comphelper::getComponentContext(rSMgr), SwXMLImport_getImplementationName(), IMPORT_ALL );
+ return (cppu::OWeakObject*)new SwXMLImport( comphelper::getComponentContext(rSMgr), SwXMLImport_getImplementationName(), SvXMLImportFlags::ALL );
}
OUString SAL_CALL SwXMLImportStyles_getImplementationName() throw()
@@ -1531,8 +1531,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance(
return (cppu::OWeakObject*)new SwXMLImport(
comphelper::getComponentContext(rSMgr),
SwXMLImportStyles_getImplementationName(),
- IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES |
- IMPORT_FONTDECLS );
+ SvXMLImportFlags::STYLES | SvXMLImportFlags::MASTERSTYLES | SvXMLImportFlags::AUTOSTYLES |
+ SvXMLImportFlags::FONTDECLS );
}
OUString SAL_CALL SwXMLImportContent_getImplementationName() throw()
@@ -1556,8 +1556,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance(
return (cppu::OWeakObject*)new SwXMLImport(
comphelper::getComponentContext(rSMgr),
SwXMLImportContent_getImplementationName(),
- IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS |
- IMPORT_FONTDECLS );
+ SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::CONTENT | SvXMLImportFlags::SCRIPTS |
+ SvXMLImportFlags::FONTDECLS );
}
OUString SAL_CALL SwXMLImportMeta_getImplementationName() throw()
@@ -1578,7 +1578,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportMeta_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- return (cppu::OWeakObject*)new SwXMLImport( comphelper::getComponentContext(rSMgr), SwXMLImportMeta_getImplementationName(), IMPORT_META );
+ return (cppu::OWeakObject*)new SwXMLImport( comphelper::getComponentContext(rSMgr), SwXMLImportMeta_getImplementationName(), SvXMLImportFlags::META );
}
OUString SAL_CALL SwXMLImportSettings_getImplementationName() throw()
@@ -1599,7 +1599,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportSettings_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- return (cppu::OWeakObject*)new SwXMLImport( comphelper::getComponentContext(rSMgr), SwXMLImportSettings_getImplementationName(), IMPORT_SETTINGS );
+ return (cppu::OWeakObject*)new SwXMLImport( comphelper::getComponentContext(rSMgr), SwXMLImportSettings_getImplementationName(), SvXMLImportFlags::SETTINGS );
}
SwDoc* SwImport::GetDocFromXMLImport( SvXMLImport& rImport )
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 1b7a3d469d20..2e04a0a4a9e2 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -109,7 +109,7 @@ protected:
public:
SwXMLImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
- OUString const & implementationName, sal_uInt16 nImportFlags);
+ OUString const & implementationName, SvXMLImportFlags nImportFlags);
virtual ~SwXMLImport() throw();
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 77e48f829774..ef4d17cf5010 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -58,7 +58,7 @@ SvXMLImportContext *SwXMLImport::CreateMetaContext(
{
SvXMLImportContext *pContext = 0;
- if (getImportFlags() & IMPORT_META)
+ if (getImportFlags() & SvXMLImportFlags::META)
{
uno::Reference<document::XDocumentProperties> const xDocProps(
GetDocumentProperties());
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index 646676ca1e70..6f3a8e8ef3a9 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -390,7 +390,7 @@ public:
StoredChapterNumberingImport(
uno::Reference<uno::XComponentContext> const& xContext,
SwChapterNumRules & rNumRules)
- : SvXMLImport(xContext, "sw::StoredChapterNumberingImport", IMPORT_ALL)
+ : SvXMLImport(xContext, "sw::StoredChapterNumberingImport", SvXMLImportFlags::ALL)
, m_rNumRules(rNumRules)
{
}
generated by cgit (git 2.34.1) at 2024-06-09 12:28:28 +0000