diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 10 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 11 |
2 files changed, 9 insertions, 12 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index c866edd2ed45..6068eeae789c 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1165,11 +1165,11 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( vcl::Window* pParent, SetText( aTitle ); // Property Pages - m_nDocInfoId = AddTabPage("general", SfxDocumentPage::Create, nullptr); - AddTabPage("description", SfxDocumentDescPage::Create, nullptr); - AddTabPage("customprops", SfxCustomPropertiesPage::Create, nullptr); - AddTabPage("cmisprops", SfxCmisPropertiesPage::Create, nullptr); - AddTabPage("security", SfxSecurityPage::Create, nullptr); + m_nDocInfoId = AddTabPage("general", SfxDocumentPage::Create); + AddTabPage("description", SfxDocumentDescPage::Create); + AddTabPage("customprops", SfxCustomPropertiesPage::Create); + AddTabPage("cmisprops", SfxCmisPropertiesPage::Create); + AddTabPage("security", SfxSecurityPage::Create); } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 386a24d14d5a..be6132434c54 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -379,9 +379,8 @@ SfxTabDialog::SfxTabDialog ( vcl::Window* pParent, // Parent Window const OUString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path - const SfxItemSet* pItemSet, // Itemset with the data; + const SfxItemSet* pItemSet // Itemset with the data; // can be NULL, when Pages are onDemand - bool bEditFmt // when yes -> additional Button for standard ) : TabDialog(pParent, rID, rUIXMLDescription) , m_pSet(pItemSet ? new SfxItemSet(*pItemSet) : nullptr) @@ -389,7 +388,7 @@ SfxTabDialog::SfxTabDialog , m_bStandardPushed(false) , m_pExampleSet(nullptr) { - Init_Impl(bEditFmt); + Init_Impl(/*bEditFmt*/false); sal_uInt16 nPageCount = m_pTabCtrl->GetPageCount(); for (sal_uInt16 nPage = 0; nPage < nPageCount; ++nPage) @@ -622,13 +621,11 @@ void SfxTabDialog::Start_Impl() sal_uInt16 SfxTabDialog::AddTabPage ( const OString &rName, // Page ID - CreateTabPage pCreateFunc, // Pointer to the Factory Method - GetTabPageRanges pRangesFunc // Pointer to the Method for querying - // Ranges onDemand + CreateTabPage pCreateFunc // Pointer to the Factory Method ) { sal_uInt16 nId = m_pTabCtrl->GetPageId(rName); - m_pImpl->aData.push_back(new Data_Impl(nId, rName, pCreateFunc, pRangesFunc)); + m_pImpl->aData.push_back(new Data_Impl(nId, rName, pCreateFunc, nullptr)); return nId; } |