summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svx/xmleohlp.hxx5
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx8
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx4
-rw-r--r--sc/source/ui/unoobj/servuno.cxx4
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx4
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx4
-rw-r--r--svx/source/xml/xmleohlp.cxx20
-rw-r--r--svx/source/xml/xmlexport.cxx4
-rw-r--r--sw/source/filter/xml/swxml.cxx2
-rw-r--r--sw/source/filter/xml/wrtxml.cxx2
-rw-r--r--sw/source/filter/xml/xmlexp.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx2
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx2
13 files changed, 31 insertions, 32 deletions
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index bd8cb9bd55d2..eb39c5e48971 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -29,10 +29,9 @@
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <svx/svxdllapi.h>
-enum SvXMLEmbeddedObjectHelperMode
+enum class SvXMLEmbeddedObjectHelperMode
{
- EMBEDDEDOBJECTHELPER_MODE_READ = 0,
- EMBEDDEDOBJECTHELPER_MODE_WRITE = 1
+ Read, Write
};
namespace comphelper { class IEmbeddedHelper; }
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index bcddf7924392..d77a7dfb58ba 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1345,7 +1345,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
SvXMLGraphicHelper* pGraphicHelper = SvXMLGraphicHelper::Create(_xStorageToSaveTo,SvXMLGraphicHelperMode::Write);
xGrfResolver = pGraphicHelper;
pGraphicHelper->release();
- SvXMLEmbeddedObjectHelper* pEmbeddedObjectHelper = SvXMLEmbeddedObjectHelper::Create( _xStorageToSaveTo,*this, EMBEDDEDOBJECTHELPER_MODE_WRITE );
+ SvXMLEmbeddedObjectHelper* pEmbeddedObjectHelper = SvXMLEmbeddedObjectHelper::Create( _xStorageToSaveTo,*this, SvXMLEmbeddedObjectHelperMode::Write );
xObjectResolver = pEmbeddedObjectHelper;
pEmbeddedObjectHelper->release();
@@ -2068,7 +2068,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWith
aValue.Value >>= xStorage;
}
m_pImpl->m_pObjectContainer->SwitchPersistence(xStorage);
- xRet = static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( xStorage,*this, EMBEDDEDOBJECTHELPER_MODE_READ ));
+ xRet = static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( xStorage,*this, SvXMLEmbeddedObjectHelperMode::Read ));
}
return xRet;
}
@@ -2155,9 +2155,9 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
return m_pImpl->m_xMarkerTable;
}
else if ( aServiceSpecifier == "com.sun.star.document.ImportEmbeddedObjectResolver" )
- return static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( m_pImpl->m_xStorage,*this, EMBEDDEDOBJECTHELPER_MODE_READ ));
+ return static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( m_pImpl->m_xStorage,*this, SvXMLEmbeddedObjectHelperMode::Read ));
else if ( aServiceSpecifier == "com.sun.star.document.ExportEmbeddedObjectResolver" )
- return static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( m_pImpl->m_xStorage,*this, EMBEDDEDOBJECTHELPER_MODE_WRITE ));
+ return static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( m_pImpl->m_xStorage,*this, SvXMLEmbeddedObjectHelperMode::Write ));
else if ( aServiceSpecifier == "com.sun.star.document.ImportGraphicObjectResolver" )
{
SvXMLGraphicHelper* pGraphicHelper = SvXMLGraphicHelper::Create(m_pImpl->m_xStorage,SvXMLGraphicHelperMode::Write);
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 2fad242e551c..7bf97823bf59 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -443,7 +443,7 @@ bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode& rError )
pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Read );
xGrfContainer = pGraphicHelper;
- pObjectHelper = SvXMLEmbeddedObjectHelper::Create(xStorage, mrDocShell, EMBEDDEDOBJECTHELPER_MODE_READ, false);
+ pObjectHelper = SvXMLEmbeddedObjectHelper::Create(xStorage, mrDocShell, SvXMLEmbeddedObjectHelperMode::Read, false);
xObjectResolver = pObjectHelper;
}
uno::Sequence<uno::Any> aStylesArgs(4);
@@ -863,7 +863,7 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly)
if( pObjSh )
{
- pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *pObjSh, EMBEDDEDOBJECTHELPER_MODE_WRITE, false );
+ pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *pObjSh, SvXMLEmbeddedObjectHelperMode::Write, false );
xObjectResolver = pObjectHelper;
}
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 62e9c3dbe710..c27c493640d2 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -492,11 +492,11 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
break;
case Type::EXPORT_EOR:
if (pDocShell)
- xRet.set(static_cast<cppu::OWeakObject *>(new SvXMLEmbeddedObjectHelper( *pDocShell, EMBEDDEDOBJECTHELPER_MODE_WRITE )));
+ xRet.set(static_cast<cppu::OWeakObject *>(new SvXMLEmbeddedObjectHelper( *pDocShell, SvXMLEmbeddedObjectHelperMode::Write )));
break;
case Type::IMPORT_EOR:
if (pDocShell)
- xRet.set(static_cast<cppu::OWeakObject *>(new SvXMLEmbeddedObjectHelper( *pDocShell, EMBEDDEDOBJECTHELPER_MODE_READ )));
+ xRet.set(static_cast<cppu::OWeakObject *>(new SvXMLEmbeddedObjectHelper( *pDocShell, SvXMLEmbeddedObjectHelperMode::Read )));
break;
case Type::VALBIND:
case Type::LISTCELLBIND:
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 4a8c7550d640..343a9243fedc 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -563,7 +563,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
xGraphicResolver = pGraphicHelper;
pObjectHelper = SvXMLEmbeddedObjectHelper::Create(
xStorage, *pDoc->GetPersist(),
- EMBEDDEDOBJECTHELPER_MODE_READ,
+ SvXMLEmbeddedObjectHelperMode::Read,
false );
xObjectResolver = pObjectHelper;
}
@@ -886,7 +886,7 @@ bool SdXMLFilter::Export()
// create helper for graphic and ole export if we have a storage
if( xStorage.is() )
{
- pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *mrDocShell.GetDoc()->GetPersist(), EMBEDDEDOBJECTHELPER_MODE_WRITE, false );
+ pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *mrDocShell.GetDoc()->GetPersist(), SvXMLEmbeddedObjectHelperMode::Write, false );
xObjectResolver = pObjectHelper;
pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Write, false );
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index d3e409fa2c2c..0f14dfbdbd1a 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -960,7 +960,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create(
if( nullptr == pPersist )
throw lang::DisposedException();
- return static_cast<cppu::OWeakObject *>(new SvXMLEmbeddedObjectHelper( *pPersist, EMBEDDEDOBJECTHELPER_MODE_WRITE ));
+ return static_cast<cppu::OWeakObject *>(new SvXMLEmbeddedObjectHelper( *pPersist, SvXMLEmbeddedObjectHelperMode::Write ));
}
if( aServiceSpecifier == "com.sun.star.document.ImportEmbeddedObjectResolver" )
@@ -969,7 +969,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create(
if( nullptr == pPersist )
throw lang::DisposedException();
- return static_cast<cppu::OWeakObject *>(new SvXMLEmbeddedObjectHelper( *pPersist, EMBEDDEDOBJECTHELPER_MODE_READ ));
+ return static_cast<cppu::OWeakObject *>(new SvXMLEmbeddedObjectHelper( *pPersist, SvXMLEmbeddedObjectHelperMode::Read ));
}
uno::Reference< uno::XInterface > xRet;
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 7067da149f2a..cd5fc113c771 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -139,7 +139,7 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() :
maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ),
maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ),
mpDocPersist( nullptr ),
- meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ),
+ meCreateMode( SvXMLEmbeddedObjectHelperMode::Read ),
mpStreamMap( nullptr )
{
}
@@ -149,7 +149,7 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper( ::comphelper::IEmbeddedHel
maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ),
maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ),
mpDocPersist( nullptr ),
- meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ),
+ meCreateMode( SvXMLEmbeddedObjectHelperMode::Read ),
mpStreamMap( nullptr )
{
Init( nullptr, rDocPersist, eCreateMode );
@@ -340,7 +340,7 @@ uno::Reference < embed::XStorage > const & SvXMLEmbeddedObjectHelper::ImplGetCon
{
if( mxContainerStorage.is() &&
!maCurContainerStorageName.isEmpty() &&
- EMBEDDEDOBJECTHELPER_MODE_WRITE == meCreateMode )
+ SvXMLEmbeddedObjectHelperMode::Write == meCreateMode )
{
uno::Reference < embed::XTransactedObject > xTrans( mxContainerStorage, uno::UNO_QUERY );
if ( xTrans.is() )
@@ -349,7 +349,7 @@ uno::Reference < embed::XStorage > const & SvXMLEmbeddedObjectHelper::ImplGetCon
if( !rStorageName.isEmpty() && mxRootStorage.is() )
{
- sal_Int32 nMode = EMBEDDEDOBJECTHELPER_MODE_WRITE == meCreateMode
+ sal_Int32 nMode = SvXMLEmbeddedObjectHelperMode::Write == meCreateMode
? ::embed::ElementModes::READWRITE
: ::embed::ElementModes::READ;
mxContainerStorage = mxRootStorage->openStorageElement( rStorageName,
@@ -455,10 +455,10 @@ OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL(
OUString aContainerStorageName, aObjectStorageName;
if( !ImplGetStorageNames( rURLStr, aContainerStorageName,
aObjectStorageName,
- EMBEDDEDOBJECTHELPER_MODE_WRITE == meCreateMode ) )
+ SvXMLEmbeddedObjectHelperMode::Write == meCreateMode ) )
return sRetURL;
- if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode )
+ if( SvXMLEmbeddedObjectHelperMode::Read == meCreateMode )
{
OutputStorageWrapper_Impl *pOut = nullptr;
SvXMLEmbeddedObjectHelper_Impl::iterator aIter;
@@ -635,7 +635,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName(
{
MutexGuard aGuard( maMutex );
Any aRet;
- if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode )
+ if( SvXMLEmbeddedObjectHelperMode::Read == meCreateMode )
{
Reference < XOutputStream > xStrm;
if( mpStreamMap )
@@ -739,7 +739,7 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr
throw (RuntimeException, std::exception)
{
MutexGuard aGuard( maMutex );
- if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode )
+ if( SvXMLEmbeddedObjectHelperMode::Read == meCreateMode )
{
return true;
}
@@ -762,7 +762,7 @@ Type SAL_CALL SvXMLEmbeddedObjectHelper::getElementType()
throw (RuntimeException, std::exception)
{
MutexGuard aGuard( maMutex );
- if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode )
+ if( SvXMLEmbeddedObjectHelperMode::Read == meCreateMode )
return cppu::UnoType<XOutputStream>::get();
else
return cppu::UnoType<XInputStream>::get();
@@ -772,7 +772,7 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasElements()
throw (RuntimeException, std::exception)
{
MutexGuard aGuard( maMutex );
- if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode )
+ if( SvXMLEmbeddedObjectHelperMode::Read == meCreateMode )
{
return true;
}
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 820b545b2ced..0d827a29b6c7 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -76,7 +76,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt
::comphelper::IEmbeddedHelper *pPersist = pModel->GetPersist();
if( pPersist )
{
- pObjectHelper = SvXMLEmbeddedObjectHelper::Create( *pPersist, EMBEDDEDOBJECTHELPER_MODE_WRITE );
+ pObjectHelper = SvXMLEmbeddedObjectHelper::Create( *pPersist, SvXMLEmbeddedObjectHelperMode::Write );
xObjectResolver = pObjectHelper;
}
@@ -184,7 +184,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr
{
pObjectHelper = SvXMLEmbeddedObjectHelper::Create(
*pPersist,
- EMBEDDEDOBJECTHELPER_MODE_READ );
+ SvXMLEmbeddedObjectHelperMode::Read );
xObjectResolver = pObjectHelper;
}
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index b13cc9b2f1df..8343a1c4aa60 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -528,7 +528,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
{
pObjectHelper = SvXMLEmbeddedObjectHelper::Create(
xStorage, *pPersist,
- EMBEDDEDOBJECTHELPER_MODE_READ,
+ SvXMLEmbeddedObjectHelperMode::Read,
false );
xObjectResolver = pObjectHelper;
}
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 97a114182beb..64926cfbe805 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -96,7 +96,7 @@ sal_uInt32 SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >&
{
pObjectHelper = SvXMLEmbeddedObjectHelper::Create(
xStg, *pPersist,
- EMBEDDEDOBJECTHELPER_MODE_WRITE,
+ SvXMLEmbeddedObjectHelperMode::Write,
false );
xObjectResolver = pObjectHelper;
}
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 2a6d460079c3..55acbceee1c0 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -262,7 +262,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
{
pEmbeddedResolver = SvXMLEmbeddedObjectHelper::Create(
*pPersist,
- EMBEDDEDOBJECTHELPER_MODE_WRITE );
+ SvXMLEmbeddedObjectHelperMode::Write );
Reference< XEmbeddedObjectResolver > xEmbeddedResolver( pEmbeddedResolver );
SetEmbeddedResolver( xEmbeddedResolver );
}
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 1d5f5fb090fa..261d671410c6 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -700,7 +700,7 @@ void SwXMLImport::startDocument()
{
m_pEmbeddedResolver = SvXMLEmbeddedObjectHelper::Create(
*pPersist,
- EMBEDDEDOBJECTHELPER_MODE_READ );
+ SvXMLEmbeddedObjectHelperMode::Read );
Reference< document::XEmbeddedObjectResolver > xEmbeddedResolver( m_pEmbeddedResolver );
SetEmbeddedResolver( xEmbeddedResolver );
}
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 2aab84f0eec9..20a4d1a3c994 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1663,7 +1663,7 @@ css::uno::Reference<css::uno::XInterface> SwXTextDocument::create(
{
return static_cast<cppu::OWeakObject *>(
new SvXMLEmbeddedObjectHelper(
- *pDocShell, EMBEDDEDOBJECTHELPER_MODE_READ));
+ *pDocShell, SvXMLEmbeddedObjectHelperMode::Read));
}
if (rServiceName == "com.sun.star.text.DocumentSettings")
{
generated by cgit (git 2.34.1) at 2024-05-04 16:50:05 +0000