summaryrefslogtreecommitdiff
path: root/unotools/source/misc
diff options
context:
space:
mode:
Diffstat (limited to 'unotools/source/misc')
-rw-r--r--unotools/source/misc/componentresmodule.cxx4
-rw-r--r--unotools/source/misc/eventlisteneradapter.cxx2
-rw-r--r--unotools/source/misc/fontcvt.cxx38
-rw-r--r--unotools/source/misc/fontdefs.cxx4
-rw-r--r--unotools/source/misc/mediadescriptor.cxx2
-rw-r--r--unotools/source/misc/syslocale.cxx8
6 files changed, 29 insertions, 29 deletions
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index bf45f21ea40f..ed8a3381ab97 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.cxx
@@ -43,7 +43,7 @@ namespace utl
public:
explicit OComponentResModuleImpl( const OString& _rResFilePrefix )
- :m_pResources( NULL )
+ :m_pResources( nullptr )
,m_bInitialized( false )
,m_sResFilePrefix( _rResFilePrefix )
{
@@ -65,7 +65,7 @@ namespace utl
void OComponentResModuleImpl::freeResManager()
{
- delete m_pResources, m_pResources = NULL;
+ delete m_pResources, m_pResources = nullptr;
m_bInitialized = false;
}
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index 08779571ca0c..c8f726b24ed3 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -106,7 +106,7 @@ namespace utl
{
stopAllComponentListening( );
delete m_pImpl;
- m_pImpl = NULL;
+ m_pImpl = nullptr;
}
void OEventListenerAdapter::stopComponentListening( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp )
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 59c34b25ef2e..f60d285763e2 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1311,35 +1311,35 @@ static const RecodeTable aStarSymbolRecodeTable[] =
{
// the first two entries must be StarMath and StarBats; do not reorder!
// reason: fgrep for FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS
- {"starbats", {aStarBatsTab, "StarSymbol", NULL}},
- {"starmath", {aStarMathTab, "StarSymbol", NULL}},
+ {"starbats", {aStarBatsTab, "StarSymbol", nullptr}},
+ {"starmath", {aStarMathTab, "StarSymbol", nullptr}},
- {"symbol", {aAdobeSymbolTab, "StarSymbol", NULL}},
- {"standardsymbols", {aAdobeSymbolTab, "StarSymbol", NULL}},
- {"standardsymbolsl",{aAdobeSymbolTab, "StarSymbol", NULL}},
+ {"symbol", {aAdobeSymbolTab, "StarSymbol", nullptr}},
+ {"standardsymbols", {aAdobeSymbolTab, "StarSymbol", nullptr}},
+ {"standardsymbolsl",{aAdobeSymbolTab, "StarSymbol", nullptr}},
- {"monotypesorts", {aMonotypeSortsTab, "StarSymbol", NULL}},
+ {"monotypesorts", {aMonotypeSortsTab, "StarSymbol", nullptr}},
// {"monotypesorts2", {aMonotypeSorts2Tab, "StarSymbol", NULL}}
- {"zapfdingbats", {aMonotypeSortsTab, "StarSymbol", NULL}}, //ZapfDingbats=MonotypeSorts-X?
- {"itczapfdingbats", {aMonotypeSortsTab, "StarSymbol", NULL}},
- {"dingbats", {aMonotypeSortsTab, "StarSymbol", NULL}},
-
- {"webdings", {aWebDingsTab, "StarSymbol", NULL}},
- {"wingdings", {aWingDingsTab, "StarSymbol", NULL}},
- {"wingdings2", {aWingDings2Tab, "StarSymbol", NULL}},
- {"wingdings3", {aWingDings3Tab, "StarSymbol", NULL}},
- {"mtextra", {aMTExtraTab, "StarSymbol", NULL}}
+ {"zapfdingbats", {aMonotypeSortsTab, "StarSymbol", nullptr}}, //ZapfDingbats=MonotypeSorts-X?
+ {"itczapfdingbats", {aMonotypeSortsTab, "StarSymbol", nullptr}},
+ {"dingbats", {aMonotypeSortsTab, "StarSymbol", nullptr}},
+
+ {"webdings", {aWebDingsTab, "StarSymbol", nullptr}},
+ {"wingdings", {aWingDingsTab, "StarSymbol", nullptr}},
+ {"wingdings2", {aWingDings2Tab, "StarSymbol", nullptr}},
+ {"wingdings3", {aWingDings3Tab, "StarSymbol", nullptr}},
+ {"mtextra", {aMTExtraTab, "StarSymbol", nullptr}}
};
static const RecodeTable aAppleSymbolRecodeTable[] = {
- {"symbol", {aAdobeSymbolToAppleSymbolTab, "AppleSymbol", NULL}}
+ {"symbol", {aAdobeSymbolToAppleSymbolTab, "AppleSymbol", nullptr}}
};
-static ConvertChar aImplStarSymbolCvt = { NULL, "StarBats", ImplStarSymbolToStarBats };
+static ConvertChar aImplStarSymbolCvt = { nullptr, "StarBats", ImplStarSymbolToStarBats };
const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, const OUString& rMapFontName )
{
- const ConvertChar* pCvt = NULL;
+ const ConvertChar* pCvt = nullptr;
// clean up and lowercase font name
OUString aOrgName( GetEnglishSearchFontName( rOrgFontName ) );
@@ -1382,7 +1382,7 @@ const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, con
FontToSubsFontConverter CreateFontToSubsFontConverter( const OUString& rOrgName, FontToSubsFontFlags nFlags )
{
- const ConvertChar* pCvt = NULL;
+ const ConvertChar* pCvt = nullptr;
OUString aName = GetEnglishSearchFontName( rOrgName );
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
index 81b402b8f619..94b6dbc85b57 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -317,7 +317,7 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
{ "hiraginokakugothicpron", aHiraginoKakuGothicProN },
{ "hiraginomarugothicpro", aHiraginoMaruGothicPro },
{ "hiraginomarugothicpron", aHiraginoMaruGothicProN },
-{ NULL, NULL },
+{ nullptr, nullptr },
};
OUString StripScriptFromName(const OUString& _aName)
@@ -531,7 +531,7 @@ OUString GetSubsFontName( const OUString& rName, SubsFontFlags nFlags )
{
for( int i = 0; i < 3; i++ )
{
- const ::std::vector< OUString >* pVector = NULL;
+ const ::std::vector< OUString >* pVector = nullptr;
switch( i )
{
case 0:
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index f59ed5413e66..41bb5b5d6eb2 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -707,7 +707,7 @@ bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFi
try
{
css::uno::Reference< css::ucb::XContentIdentifier > xContId(
- aContent.get().is() ? aContent.get()->getIdentifier() : 0 );
+ aContent.get().is() ? aContent.get()->getIdentifier() : nullptr );
if ( xContId.is() )
aScheme = xContId->getContentProviderScheme();
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index 8c15256b0ca9..303b31bedc46 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -33,7 +33,7 @@
using namespace osl;
using namespace com::sun::star;
-SvtSysLocale_Impl* SvtSysLocale::pImpl = NULL;
+SvtSysLocale_Impl* SvtSysLocale::pImpl = nullptr;
sal_Int32 SvtSysLocale::nRefCount = 0;
class SvtSysLocale_Impl : public utl::ConfigurationListener
@@ -53,7 +53,7 @@ private:
void setDateAcceptancePatternsConfig();
};
-SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(NULL)
+SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(nullptr)
{
pLocaleData = new LocaleDataWrapper( aSysLocaleOptions.GetRealLanguageTag() );
setDateAcceptancePatternsConfig();
@@ -127,14 +127,14 @@ SvtSysLocale::~SvtSysLocale()
if ( !--nRefCount )
{
delete pImpl;
- pImpl = NULL;
+ pImpl = nullptr;
}
}
// static
Mutex& SvtSysLocale::GetMutex()
{
- static Mutex* pMutex = NULL;
+ static Mutex* pMutex = nullptr;
if( !pMutex )
{
MutexGuard aGuard( Mutex::getGlobalMutex() );
generated by cgit (git 2.34.1) at 2024-07-17 23:42:32 +0000