summaryrefslogtreecommitdiff
path: root/filter/source/xsltdialog
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:15:32 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:25 +0100
commit3cdda9af2c12a9ae2a1f0bdf8ca898f1f5c69bfb (patch)
treeba25525cbc9661509d8f01e93164e0febb8a0894 /filter/source/xsltdialog
parent7702e3128768f1b4b8a1ee9e87e397887e151af4 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I61e494952df8cc40fff3ccad0936adf06035dbeb
Diffstat (limited to 'filter/source/xsltdialog')
-rw-r--r--filter/source/xsltdialog/typedetectionexport.cxx2
-rw-r--r--filter/source/xsltdialog/typedetectionimport.cxx6
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx10
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx8
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx8
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.hxx2
8 files changed, 20 insertions, 20 deletions
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 0c5133f79991..eef44cf08101 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -234,7 +234,7 @@ void TypeDetectionExporter::addProperty( Reference< XWriter > xHandler, const OU
xHandler->ignorableWhitespace ( sWhiteSpace );
xHandler->startElement( sProp, xAttrList );
- xAttrList = NULL;
+ xAttrList = nullptr;
xHandler->ignorableWhitespace ( sWhiteSpace );
xHandler->startElement( sValue,xAttrList );
xHandler->characters( rValue );
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index 1efd61d9c9e6..8c19851a15d8 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -137,7 +137,7 @@ Node* TypeDetectionImporter::findTypeNode( const OUString& rType )
return (*aIter);
}
- return NULL;
+ return nullptr;
}
filter_info_impl* TypeDetectionImporter::createFilterForNode( Node * pNode )
@@ -185,7 +185,7 @@ filter_info_impl* TypeDetectionImporter::createFilterForNode( Node * pNode )
bool bOk = true;
- if( pTypeNode == NULL )
+ if( pTypeNode == nullptr )
bOk = false;
if( pFilter->maFilterName.isEmpty() )
@@ -212,7 +212,7 @@ filter_info_impl* TypeDetectionImporter::createFilterForNode( Node * pNode )
if( !bOk )
{
delete pFilter;
- pFilter = NULL;
+ pFilter = nullptr;
}
return pFilter;
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index c8d36a723fdb..89cd8385cd8e 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -114,7 +114,7 @@ private:
namespace
{
- static ResMgr* pXSLTResMgr = NULL;
+ static ResMgr* pXSLTResMgr = nullptr;
}
ResMgr* getXSLTDialogResMgr()
@@ -125,7 +125,7 @@ ResMgr* getXSLTDialogResMgr()
XMLFilterDialogComponent::XMLFilterDialogComponent( const css::uno::Reference< XComponentContext >& rxContext ) :
OComponentHelper( maMutex ),
mxContext( rxContext ),
- mpDialog( NULL )
+ mpDialog( nullptr )
{
Reference< XDesktop2 > xDesktop = Desktop::create( rxContext );
Reference< XTerminateListener > xListener( this );
@@ -271,7 +271,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing()
if (pXSLTResMgr)
{
delete pXSLTResMgr;
- pXSLTResMgr = NULL;
+ pXSLTResMgr = nullptr;
}
}
@@ -319,7 +319,7 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute( ) throw(RuntimeException,
{
::SolarMutexGuard aGuard;
- if( NULL == pXSLTResMgr )
+ if( nullptr == pXSLTResMgr )
{
pXSLTResMgr = ResMgr::CreateResMgr( "xsltdlg", Application::GetSettings().GetUILanguageTag() );
}
@@ -365,7 +365,7 @@ extern "C"
SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltdlg_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
- void * pRet = 0;
+ void * pRet = nullptr;
if( pServiceManager )
{
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index f5e506b4e49b..4d3e83573083 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -186,9 +186,9 @@ void XMLFilterSettingsDialog::updateStates()
{
SvTreeListEntry* pSelectedEntry = m_pFilterListBox->FirstSelected();
- bool bHasSelection = pSelectedEntry != NULL;
+ bool bHasSelection = pSelectedEntry != nullptr;
- bool bMultiSelection = bHasSelection && (m_pFilterListBox->NextSelected( pSelectedEntry ) != NULL );
+ bool bMultiSelection = bHasSelection && (m_pFilterListBox->NextSelected( pSelectedEntry ) != nullptr );
bool bIsReadonly = false;
bool bIsDefault = false;
if(pSelectedEntry)
@@ -448,7 +448,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
}
}
- filter_info_impl* pFilterEntry( NULL );
+ filter_info_impl* pFilterEntry( nullptr );
if( bOk )
{
@@ -1286,7 +1286,7 @@ const application_info_impl* getApplicationInfo( const OUString& rServiceName )
return (*aIter);
}
}
- return NULL;
+ return nullptr;
}
OUString getApplicationUIName( const OUString& rServiceName )
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 6b4e8d238cd9..5d700704444b 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -115,7 +115,7 @@ private:
void initFilterList();
void disposeFilterList();
- bool insertOrEdit( filter_info_impl* pNewInfo, const filter_info_impl* pOldInfo = NULL );
+ bool insertOrEdit( filter_info_impl* pNewInfo, const filter_info_impl* pOldInfo = nullptr );
OUString createUniqueFilterName( const OUString& rUIName );
OUString createUniqueTypeName( const OUString& rTypeName );
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 0d39fdd42aca..9f9c3e785e5a 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -97,7 +97,7 @@ bool XMLFilterTabDialog::onOk()
sal_uInt16 nErrorPage = 0;
sal_uInt16 nErrorId = 0;
- vcl::Window* pFocusWindow = NULL;
+ vcl::Window* pFocusWindow = nullptr;
OUString aReplace1;
OUString aReplace2;
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 2071a134ed20..3aac59642e8b 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -137,7 +137,7 @@ XMLFilterTestDialog::XMLFilterTestDialog(vcl::Window* pParent,
const Reference<XComponentContext>& rxContext)
: ModalDialog(pParent, "TestXMLFilterDialog", "filter/ui/testxmlfilter.ui")
, mxContext(rxContext)
- , m_pFilterInfo(NULL)
+ , m_pFilterInfo(nullptr)
{
get(m_pExport, "export");
get(m_pFTExportXSLTFile, "exportxsltfile");
@@ -278,7 +278,7 @@ void XMLFilterTestDialog::updateCurrentDocumentButtonState( Reference< XComponen
void XMLFilterTestDialog::initDialog()
{
DBG_ASSERT( m_pFilterInfo, "i need a filter I can test!" );
- if( NULL == m_pFilterInfo )
+ if( nullptr == m_pFilterInfo )
return;
OUString aTitle( m_sDialogTitle );
@@ -417,7 +417,7 @@ void XMLFilterTestDialog::onExportBrowse()
m_sExportRecentFile = aDlg.GetPath();
Reference< XDesktop2 > xLoader = Desktop::create( mxContext );
- Reference< XInteractionHandler2 > xInter = InteractionHandler::createWithParent(mxContext, 0);
+ Reference< XInteractionHandler2 > xInter = InteractionHandler::createWithParent(mxContext, nullptr);
OUString aFrame( "_default" );
Sequence< PropertyValue > aArguments(1);
aArguments[0].Name = "InteractionHandler";
@@ -599,7 +599,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
try
{
Reference< XDesktop2 > xLoader = Desktop::create( mxContext );
- Reference< XInteractionHandler2 > xInter = InteractionHandler::createWithParent(mxContext, 0);
+ Reference< XInteractionHandler2 > xInter = InteractionHandler::createWithParent(mxContext, nullptr);
OUString aFrame( "_default" );
Sequence< PropertyValue > aArguments(2);
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index c5ee4201e52b..09998d0d58ac 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -41,7 +41,7 @@ public:
void test( const filter_info_impl& rFilterInfo );
- void updateCurrentDocumentButtonState( css::uno::Reference< css::lang::XComponent > * pRef = NULL );
+ void updateCurrentDocumentButtonState( css::uno::Reference< css::lang::XComponent > * pRef = nullptr );
private:
DECL_LINK_TYPED(ClickHdl_Impl, Button *, void );