diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:28 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:50 +0100 |
commit | 6cd7bf2043146a630925a2e49336f02c802f707a (patch) | |
tree | 786cecd8ab993e25cda497d45b68007050c30d61 /svx/source/unodialogs | |
parent | 28f4bee7bd7378141d8569186162e1a3166eb012 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
Diffstat (limited to 'svx/source/unodialogs')
4 files changed, 23 insertions, 23 deletions
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 333ec3a46301..054e5fdc2cac 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -51,10 +51,10 @@ using namespace ::com::sun::star::uno; DictionaryList::DictionaryList(SvSimpleTableContainer& rParent, WinBits nBits) : SvSimpleTable(rParent, nBits) - , m_xDictionary(0) - , m_pED_Term(0) - , m_pED_Mapping(0) - , m_pLB_Property(0) + , m_xDictionary(nullptr) + , m_pED_Term(nullptr) + , m_pED_Mapping(nullptr) + , m_pLB_Property(nullptr) , m_aToBeDeleted() , m_nSortColumnIndex(0) { @@ -187,7 +187,7 @@ void DictionaryList::refillFromDictionary( sal_Int32 nTextConversionOptions ) DictionaryEntry* DictionaryList::getFirstSelectedEntry() const { - DictionaryEntry* pRet=0; + DictionaryEntry* pRet=nullptr; for( sal_Int32 nN=GetRowCount(); nN--; ) { if( IsRowSelected( nN ) ) @@ -201,7 +201,7 @@ DictionaryEntry* DictionaryList::getFirstSelectedEntry() const DictionaryEntry* DictionaryList::getEntryOnPos( sal_Int32 nPos ) const { - DictionaryEntry* pEntry=0; + DictionaryEntry* pEntry=nullptr; SvTreeListEntry* pLBEntry = GetEntryOnPos( nPos ); if(pLBEntry) pEntry = static_cast<DictionaryEntry*>(pLBEntry->GetUserData()); @@ -216,12 +216,12 @@ DictionaryEntry* DictionaryList::getTermEntry( const OUString& rTerm ) const if( pE && rTerm.equals( pE->m_aTerm ) ) return pE; } - return 0; + return nullptr; } bool DictionaryList::hasTerm( const OUString& rTerm ) const { - return getTermEntry(rTerm) !=0 ; + return getTermEntry(rTerm) !=nullptr ; } void DictionaryList::addEntry( const OUString& rTerm, const OUString& rMapping @@ -303,7 +303,7 @@ sal_Int32 DictionaryList::ColumnCompare( SvTreeListEntry* pLeft, SvTreeListEntry SvLBoxItem* pLeftItem = getItemAtColumn( pLeft, m_nSortColumnIndex ); SvLBoxItem* pRightItem = getItemAtColumn( pRight, m_nSortColumnIndex ); - if(pLeftItem != NULL && pRightItem != NULL) + if(pLeftItem != nullptr && pRightItem != nullptr) { sal_uInt16 nLeftKind = pLeftItem->GetType(); sal_uInt16 nRightKind = pRightItem->GetType(); @@ -326,7 +326,7 @@ sal_Int32 DictionaryList::ColumnCompare( SvTreeListEntry* pLeft, SvTreeListEntry SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 nColumn ) const { - SvLBoxItem* pItem = NULL; + SvLBoxItem* pItem = nullptr; if( pEntry ) { sal_uInt16 nCount = pEntry->ItemCount(); @@ -444,7 +444,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent ) : ModalDialog(pParent, "ChineseDictionaryDialog", "svx/ui/chinesedictionary.ui") , m_nTextConversionOptions(i18n::TextConversionOption::NONE) - , m_xContext(0) + , m_xContext(nullptr) { get(m_pRB_To_Simplified, "tradtosimple"); get(m_pRB_To_Traditional, "simpletotrad"); @@ -476,8 +476,8 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent ) m_pLB_Property->SetDropDownLineCount( m_pLB_Property->GetEntryCount() ); m_pLB_Property->SelectEntryPos(0); - Reference< linguistic2::XConversionDictionary > xDictionary_To_Simplified(0); - Reference< linguistic2::XConversionDictionary > xDictionary_To_Traditional(0); + Reference< linguistic2::XConversionDictionary > xDictionary_To_Simplified(nullptr); + Reference< linguistic2::XConversionDictionary > xDictionary_To_Traditional(nullptr); //get dictionaries { if(!m_xContext.is()) @@ -560,7 +560,7 @@ ChineseDictionaryDialog::~ChineseDictionaryDialog() void ChineseDictionaryDialog::dispose() { - m_xContext=0; + m_xContext=nullptr; m_pCT_DictionaryToSimplified.disposeAndClear(); m_pCT_DictionaryToTraditional.disposeAndClear(); m_pRB_To_Simplified.clear(); @@ -602,7 +602,7 @@ IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, DirectionHdl, Button*, void) void ChineseDictionaryDialog::updateAfterDirectionChange() { - Reference< linguistic2::XConversionDictionary > xDictionary(0); + Reference< linguistic2::XConversionDictionary > xDictionary(nullptr); if( m_pRB_To_Simplified->IsChecked() ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index 701171279d37..bd26f4373d54 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -37,8 +37,8 @@ using namespace ::com::sun::star; ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( const uno::Reference< uno::XComponentContext >& xContext ) : m_xCC( xContext ) - , m_xParentWindow( 0 ) - , m_pDialog( 0 ) + , m_xParentWindow( nullptr ) + , m_pDialog( nullptr ) , m_bDisposed(false) , m_bInDispose(false) , m_aContainerMutex() @@ -128,7 +128,7 @@ sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeExc if( !m_pDialog ) { - vcl::Window* pParent = NULL; + vcl::Window* pParent = nullptr; if( m_xParentWindow.is() ) { VCLXWindow* pImplementation = VCLXWindow::GetImplementation(m_xParentWindow); @@ -160,7 +160,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeExcepti m_bInDispose = true; impl_DeleteDialog(); - m_xParentWindow = 0; + m_xParentWindow = nullptr; m_bDisposed = true; aEvt.Source = static_cast< XComponent * >( this ); @@ -190,7 +190,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Refe uno::Reference< beans::XPropertySetInfo > SAL_CALL ChineseTranslation_UnoDialog::getPropertySetInfo( ) throw (uno::RuntimeException, std::exception) { - return 0; + return nullptr; } void SAL_CALL ChineseTranslation_UnoDialog::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index a1ab685c7c0f..62ada096b75b 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno; ChineseTranslationDialog::ChineseTranslationDialog( vcl::Window* pParent ) : ModalDialog(pParent, "ChineseConversionDialog", "svx/ui/chineseconversiondialog.ui") - , m_pDictionaryDialog(0) + , m_pDictionaryDialog(nullptr) { get(m_pBP_OK, "ok"); get(m_pPB_Editterms, "editterms"); diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index 4d0c17f04929..de6d3f6df754 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -27,10 +27,10 @@ static const struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetran , ::textconversiondlgs::ChineseTranslation_UnoDialog::getImplementationName_Static , ::textconversiondlgs::ChineseTranslation_UnoDialog::getSupportedServiceNames_Static , ::cppu::createSingleComponentFactory - , 0 + , nullptr , 0 } - ,{ 0, 0, 0, 0, 0, 0 } + ,{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; // component exports |