summaryrefslogtreecommitdiff
path: root/oox/source/ole
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source/ole')
-rw-r--r--oox/source/ole/axbinaryreader.cxx2
-rw-r--r--oox/source/ole/axbinarywriter.cxx2
-rw-r--r--oox/source/ole/axcontrol.cxx2
-rw-r--r--oox/source/ole/axcontrolfragment.cxx6
-rw-r--r--oox/source/ole/olehelper.cxx6
-rw-r--r--oox/source/ole/olestorage.cxx4
-rw-r--r--oox/source/ole/vbacontrol.cxx4
-rw-r--r--oox/source/ole/vbaexport.cxx10
-rw-r--r--oox/source/ole/vbainputstream.cxx2
-rw-r--r--oox/source/ole/vbaproject.cxx2
10 files changed, 20 insertions, 20 deletions
diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx
index 62835ee713a3..362a155cc5a7 100644
--- a/oox/source/ole/axbinaryreader.cxx
+++ b/oox/source/ole/axbinaryreader.cxx
@@ -61,7 +61,7 @@ void AxAlignedInputStream::seek( sal_Int64 nPos )
void AxAlignedInputStream::close()
{
- mpInStrm = 0;
+ mpInStrm = nullptr;
mbEof = true;
}
diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx
index 03d9e8684948..05ab3634e44e 100644
--- a/oox/source/ole/axbinarywriter.cxx
+++ b/oox/source/ole/axbinarywriter.cxx
@@ -51,7 +51,7 @@ void AxAlignedOutputStream::seek( sal_Int64 nPos )
void AxAlignedOutputStream::close()
{
- mpOutStrm = 0;
+ mpOutStrm = nullptr;
mbEof = true;
}
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 3abbef228239..f883cd61ee56 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -2636,7 +2636,7 @@ ControlModelBase* EmbeddedControl::createModelFromGuid( const OUString& rClassId
if( aClassId.equalsIgnoreAsciiCase( HTML_GUID_TEXTBOX ) ) return &createModel< HtmlTextBoxModel >();
mxModel.reset();
- return 0;
+ return nullptr;
}
OUString EmbeddedControl::getServiceName() const
diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx
index 0f6604c3e0d1..f538da8d28a3 100644
--- a/oox/source/ole/axcontrolfragment.cxx
+++ b/oox/source/ole/axcontrolfragment.cxx
@@ -57,7 +57,7 @@ ContextHandlerRef AxControlPropertyContext::onCreateContext( sal_Int32 nElement,
switch( mnPropId )
{
case XML_TOKEN_INVALID:
- return 0;
+ return nullptr;
case XML_Picture:
case XML_MouseIcon:
return this; // import picture path from ax:picture child element
@@ -79,7 +79,7 @@ ContextHandlerRef AxControlPropertyContext::onCreateContext( sal_Int32 nElement,
}
break;
}
- return 0;
+ return nullptr;
}
AxControlFragment::AxControlFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, EmbeddedControl& rControl ) :
@@ -138,7 +138,7 @@ ContextHandlerRef AxControlFragment::onCreateContext( sal_Int32 nElement, const
break;
}
}
- return 0;
+ return nullptr;
}
} // namespace ole
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index cf9bbed1fcfa..ed13efd1fb2f 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -333,7 +333,7 @@ Reference< css::frame::XFrame > lcl_getFrame( const Reference< css::frame::XMod
if ( rxModel.is() )
{
Reference< css::frame::XController > xController = rxModel->getCurrentController();
- xFrame = xController.is() ? xController->getFrame() : NULL;
+ xFrame = xController.is() ? xController->getFrame() : nullptr;
}
return xFrame;
}
@@ -362,12 +362,12 @@ public:
}
OUString getFullName() { return maFullName; }
OUString getTypeName() { return maTypeName; }
- bool isValid() { return mpModel != NULL; }
+ bool isValid() { return mpModel != nullptr; }
void exportName( const Reference< XOutputStream >& rxOut );
void exportCompObj( const Reference< XOutputStream >& rxOut );
void exportControl( const Reference< XOutputStream >& rxOut, const css::awt::Size& rSize );
};
-OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& rxDocModel, const Reference< XControlModel >& xCntrlModel ) : maControl( "Unknown" ), mpModel( NULL ), maGrfHelper( rxCtx, lcl_getFrame( rxDocModel ), StorageRef() ), mxDocModel( rxDocModel ), mxControlModel( xCntrlModel )
+OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& rxDocModel, const Reference< XControlModel >& xCntrlModel ) : maControl( "Unknown" ), mpModel( nullptr ), maGrfHelper( rxCtx, lcl_getFrame( rxDocModel ), StorageRef() ), mxDocModel( rxDocModel ), mxControlModel( xCntrlModel )
{
// try to get the guid
Reference< css::beans::XPropertySet > xProps( xCntrlModel, UNO_QUERY );
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index 9bba20551b7e..68935f944e6e 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -166,7 +166,7 @@ OleStorage::OleStorage( const Reference< XComponentContext >& rxContext,
const Reference< XInputStream >& rxInStream, bool bBaseStreamAccess ) :
StorageBase( rxInStream, bBaseStreamAccess ),
mxContext( rxContext ),
- mpParentStorage( 0 )
+ mpParentStorage( nullptr )
{
OSL_ENSURE( mxContext.is(), "OleStorage::OleStorage - missing component context" );
initStorage( rxInStream );
@@ -176,7 +176,7 @@ OleStorage::OleStorage( const Reference< XComponentContext >& rxContext,
const Reference< XStream >& rxOutStream, bool bBaseStreamAccess ) :
StorageBase( rxOutStream, bBaseStreamAccess ),
mxContext( rxContext ),
- mpParentStorage( 0 )
+ mpParentStorage( nullptr )
{
OSL_ENSURE( mxContext.is(), "OleStorage::OleStorage - missing component context" );
initStorage( rxOutStream );
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 82bc27d9606f..caeb02057a1b 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -282,7 +282,7 @@ ControlModelRef VbaSiteModel::createControlModel( const AxClassTable& rClassTabl
xCtrlModel->setAwtModelMode();
// check that container model matches container flag in site data
- bool bModelIsContainer = dynamic_cast< const AxContainerModelBase* >( xCtrlModel.get() ) != 0;
+ bool bModelIsContainer = dynamic_cast< const AxContainerModelBase* >( xCtrlModel.get() ) != nullptr;
bool bTypeMatch = bModelIsContainer == isContainer();
OSL_ENSURE( bTypeMatch, "VbaSiteModel::createControlModel - container type does not match container flag" );
if( !bTypeMatch )
@@ -667,7 +667,7 @@ void VbaFormControl::finalizeEmbeddedControls()
rLastGroup.insert( rLastGroup.end(), xControl->maControls.begin(), xControl->maControls.end() );
xControl->maControls.clear();
// check if last control of the group box is an option button
- bLastWasOptionButton = dynamic_cast< const AxOptionButtonModel* >( rLastGroup.back()->mxCtrlModel.get() ) != 0;
+ bLastWasOptionButton = dynamic_cast< const AxOptionButtonModel* >( rLastGroup.back()->mxCtrlModel.get() ) != nullptr;
}
}
}
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index a30c32c3113d..2cb2fea90133 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -104,7 +104,7 @@ OUString createGuidStringFromInt(sal_uInt8 nGuid[16])
OUString generateGUIDString()
{
sal_uInt8 nGuid[16];
- rtl_createUuid(nGuid, NULL, true);
+ rtl_createUuid(nGuid, nullptr, true);
return createGuidStringFromInt(nGuid);
}
@@ -113,7 +113,7 @@ OUString generateGUIDString()
VBACompressionChunk::VBACompressionChunk(SvStream& rCompressedStream, const sal_uInt8* pData, sal_Size nChunkSize)
: mrCompressedStream(rCompressedStream)
, mpUncompressedData(pData)
- , mpCompressedChunkStream(0)
+ , mpCompressedChunkStream(nullptr)
, mnChunkSize(nChunkSize)
, mnCompressedCurrent(0)
, mnCompressedEnd(0)
@@ -895,7 +895,7 @@ void exportPROJECTStream(SvStream& rStrm, css::uno::Reference<css::container::XN
aProtectedStream.WriteUInt32(0x00000000);
const sal_uInt8* pData = static_cast<const sal_uInt8*>(aProtectedStream.GetData());
sal_uInt8 nProjKey = VBAEncryption::calculateProjKey(aProjectID);
- VBAEncryption aProtectionState(pData, 4, rStrm, NULL, nProjKey);
+ VBAEncryption aProtectionState(pData, 4, rStrm, nullptr, nProjKey);
aProtectionState.write();
exportString(rStrm, "\"\r\n");
#else
@@ -908,7 +908,7 @@ void exportPROJECTStream(SvStream& rStrm, css::uno::Reference<css::container::XN
aProtectedStream.Seek(0);
aProtectedStream.WriteUInt8(0x00);
pData = static_cast<const sal_uInt8*>(aProtectedStream.GetData());
- VBAEncryption aProjectPassword(pData, 1, rStrm, NULL, nProjKey);
+ VBAEncryption aProjectPassword(pData, 1, rStrm, nullptr, nProjKey);
aProjectPassword.write();
exportString(rStrm, "\"\r\n");
#else
@@ -921,7 +921,7 @@ void exportPROJECTStream(SvStream& rStrm, css::uno::Reference<css::container::XN
aProtectedStream.Seek(0);
aProtectedStream.WriteUInt8(0xFF);
pData = static_cast<const sal_uInt8*>(aProtectedStream.GetData());
- VBAEncryption aVisibilityState(pData, 1, rStrm, NULL, nProjKey);
+ VBAEncryption aVisibilityState(pData, 1, rStrm, nullptr, nProjKey);
aVisibilityState.write();
exportString(rStrm, "\"\r\n\r\n");
#else
diff --git a/oox/source/ole/vbainputstream.cxx b/oox/source/ole/vbainputstream.cxx
index 06c1035604a4..65eb91c12e37 100644
--- a/oox/source/ole/vbainputstream.cxx
+++ b/oox/source/ole/vbainputstream.cxx
@@ -62,7 +62,7 @@ void VbaInputStream::seek( sal_Int64 )
void VbaInputStream::close()
{
- mpInStrm = 0;
+ mpInStrm = nullptr;
mbEof = true;
}
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index b492b7a12cdb..be65689b0d26 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -155,7 +155,7 @@ bool VbaProject::importVbaProject( StorageBase& rVbaPrjStrg )
if ( mxDocModel.is() )
{
Reference< css::frame::XController > xController = mxDocModel->getCurrentController();
- xFrame = xController.is() ? xController->getFrame() : NULL;
+ xFrame = xController.is() ? xController->getFrame() : nullptr;
}
StorageRef noStorage;
// if the GraphicHelper tries to use noStorage it will of course crash
generated by cgit (git 2.34.1) at 2024-07-15 10:46:38 +0000