diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-06-07 00:05:08 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:22:04 +0200 |
commit | a66ce8fd33530d7db197f2615b6539f54b9242d8 (patch) | |
tree | 915ddba77624bc1271a98411ee63b4a2f8bffbf7 | |
parent | Apply new VclPtr clang plugin to catch potential problems. (diff) | |
download | core-a66ce8fd33530d7db197f2615b6539f54b9242d8.tar.gz core-a66ce8fd33530d7db197f2615b6539f54b9242d8.zip |
gcc4.6: remove trigraph sequences '<::'
Change-Id: Iaea3121fbc4e826b5d1f76b052c21b4dcf18df70
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/bibload.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/dlg/sddlgfact.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/dialog/taskpane.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/unoiface.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index bdb662dd57ad..56c0071b0ee3 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -193,7 +193,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindo ,m_aTBPreview(VclPtr<ToolBox>::Create(this,WB_TABSTOP) ) ,m_aBorder(VclPtr<Window>::Create(this,WB_BORDER | WB_READONLY)) ,m_aPreview(VclPtr<OPreviewWindow>::Create(m_aBorder.get())) - ,m_aDocumentInfo(VclPtr<::svtools::ODocumentInfoPreview>::Create(m_aBorder.get(), WB_LEFT | WB_VSCROLL | WB_READONLY) ) + ,m_aDocumentInfo(VclPtr< ::svtools::ODocumentInfoPreview >::Create(m_aBorder.get(), WB_LEFT | WB_VSCROLL | WB_READONLY) ) ,m_ePreviewMode(_ePreviewMode) { diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index db810db9b134..7099618bf613 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -276,11 +276,11 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUSt VclPtrInstance<BibBookContainer> pMyWindow( pParent ); pMyWindow->Show(); - VclPtrInstance<::bib::BibView> pView( pMyWindow, m_pDatMan, WB_VSCROLL | WB_HSCROLL | WB_3DLOOK ); + VclPtrInstance< ::bib::BibView > pView( pMyWindow, m_pDatMan, WB_VSCROLL | WB_HSCROLL | WB_3DLOOK ); pView->Show(); m_pDatMan->SetView( pView ); - VclPtrInstance<::bib::BibBeamer> pBeamer( pMyWindow, m_pDatMan ); + VclPtrInstance< ::bib::BibBeamer > pBeamer( pMyWindow, m_pDatMan ); pBeamer->Show(); pMyWindow->createTopFrame(pBeamer); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 2da799145ff3..1326b71828d1 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -378,7 +378,7 @@ VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( sal_uLong nSumActionCount, sal_uLong nObjCount ) { - return new SdVclAbstractDialog_Impl( VclPtr<::sd::BreakDlg>::Create( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) ); + return new SdVclAbstractDialog_Impl( VclPtr< ::sd::BreakDlg >::Create( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) ); } AbstractCopyDlg * SdAbstractDialogFactory_Impl::CreateCopyDlg( @@ -386,7 +386,7 @@ AbstractCopyDlg * SdAbstractDialogFactory_Impl::CreateCopyDlg( const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) { - return new AbstractCopyDlg_Impl( VclPtr<::sd::CopyDlg>::Create( pWindow, rInAttrs, pColTab, pView ) ); + return new AbstractCopyDlg_Impl( VclPtr< ::sd::CopyDlg >::Create( pWindow, rInAttrs, pColTab, pView ) ); } AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ) @@ -436,12 +436,12 @@ AbstractSdInsertPagesObjsDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPages AbstractMorphDlg * SdAbstractDialogFactory_Impl::CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) { - return new AbstractMorphDlg_Impl( VclPtr<::sd::MorphDlg>::Create( pParent, pObj1, pObj2 ) ); + return new AbstractMorphDlg_Impl( VclPtr< ::sd::MorphDlg >::Create( pParent, pObj1, pObj2 ) ); } SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { - return new AbstractBulletDialog_Impl( VclPtr<::sd::OutlineBulletDlg>::Create( pParent, pAttr, pView ) ); + return new AbstractBulletDialog_Impl( VclPtr< ::sd::OutlineBulletDlg >::Create( pParent, pAttr, pView ) ); } SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( vcl::Window* pParent, const SfxItemSet* pAttr ) @@ -457,7 +457,7 @@ AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentatio VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateRemoteDialog( vcl::Window* pWindow ) { - return new SdVclAbstractDialog_Impl( VclPtr<::sd::RemoteDialog>::Create( pWindow ) ); + return new SdVclAbstractDialog_Impl( VclPtr< ::sd::RemoteDialog >::Create( pWindow ) ); } SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SdResId& DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) @@ -514,18 +514,18 @@ CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsSnapTabPageCreatorFunc() VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) { - return new SdVclAbstractDialog_Impl( VclPtr<::sd::MasterLayoutDialog>::Create( pParent, pDoc, pCurrentPage )); + return new SdVclAbstractDialog_Impl( VclPtr< ::sd::MasterLayoutDialog >::Create( pParent, pDoc, pCurrentPage )); } AbstractHeaderFooterDialog* SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( sd::ViewShell* pViewShell, vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) { - return new AbstractHeaderFooterDialog_Impl( VclPtr<::sd::HeaderFooterDialog>::Create( pViewShell, pParent, pDoc, pCurrentPage )); + return new AbstractHeaderFooterDialog_Impl( VclPtr< ::sd::HeaderFooterDialog >::Create( pViewShell, pParent, pDoc, pCurrentPage )); } VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog( vcl::Window* pWindow, SdDrawDocument* pDoc ) { - return new SdVclAbstractDialog_Impl( VclPtr<::sd::SdPhotoAlbumDialog>::Create( pWindow, pDoc ) ); + return new SdVclAbstractDialog_Impl( VclPtr< ::sd::SdPhotoAlbumDialog >::Create( pWindow, pDoc ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 2039b5d6104f..5c963d947024 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -518,7 +518,7 @@ namespace sfx2 :m_rAntiImpl( i_rAntiImpl ) ,m_sModuleIdentifier( lcl_identifyModule( i_rDocumentFrame ) ) ,m_xFrame( i_rDocumentFrame ) - ,m_aPanelDeck( VclPtr<::svt::ToolPanelDeck>::Create(i_rAntiImpl) ) + ,m_aPanelDeck( VclPtr< ::svt::ToolPanelDeck >::Create(i_rAntiImpl) ) { m_aPanelDeck->Show(); OnResize(); diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 55d0a483ca0d..43a6ad6992a1 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -118,7 +118,7 @@ SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const :: } else if (aServiceName.equalsIgnoreAsciiCase("roadmap") ) { - pWindow = VclPtr<::svt::ORoadmap>::Create( pParent, WB_TABSTOP ); + pWindow = VclPtr< ::svt::ORoadmap >::Create( pParent, WB_TABSTOP ); *ppNewComp = new SVTXRoadmap; } else if ( aServiceName.equalsIgnoreAsciiCase( "ProgressBar" ) ) @@ -157,7 +157,7 @@ SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const :: { if ( pParent ) { - pWindow = VclPtr<::svt::table::TableControl>::Create(pParent, nWinBits); + pWindow = VclPtr< ::svt::table::TableControl >::Create(pParent, nWinBits); *ppNewComp = new SVTXGridControl; } else diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 95140fd09cdd..d383e97f1c63 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -3864,7 +3864,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pB BrowserMode::AUTO_VSCROLL| BrowserMode::HIDECURSOR ) , aCellEdit(VclPtr<Edit>::Create(&GetDataWindow(), 0)) - , aCellCheckBox(VclPtr<::svt::CheckBoxControl>::Create(&GetDataWindow())) + , aCellCheckBox(VclPtr< ::svt::CheckBoxControl >::Create(&GetDataWindow())) , nCurrentRow(0) , bModified(false) { |