Skip to content

C
core
Kaydet (Commit) 5f336095 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

SfxTabDialog: rename members missing their prefixes 

Change-Id: I6c739d4c64fb0b460e993f2a326a0acfec98b1c7
Reviewed-on: https://gerrit.libreoffice.org/23902Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 753c474b
Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 143 deletions
dbaccess/source/ui/dlg/UserAdminDlg.cxx
Dosyayı görüntüle @ 5f336095
...@@ -62,8 +62,8 @@ namespace dbaui ...@@ -62,8 +62,8 @@ namespace dbaui
m_pImpl->translateProperties(xDatasource, *_pItems); m_pImpl->translateProperties(xDatasource, *_pItems);
SetInputSet(_pItems); SetInputSet(_pItems);
// propagate this set as our new input set and reset the example set // propagate this set as our new input set and reset the example set
delete pExampleSet; delete m_pExampleSet;
pExampleSet = new SfxItemSet(*GetInputSetImpl()); m_pExampleSet = new SfxItemSet(*GetInputSetImpl());
AddTabPage("settings", OUserAdmin::Create, nullptr); AddTabPage("settings", OUserAdmin::Create, nullptr);
...@@ -90,7 +90,7 @@ namespace dbaui ...@@ -90,7 +90,7 @@ namespace dbaui
} }
SetInputSet(nullptr); SetInputSet(nullptr);
DELETEZ(pExampleSet); DELETEZ(m_pExampleSet);
SfxTabDialog::dispose(); SfxTabDialog::dispose();
} }
......
dbaccess/source/ui/dlg/advancedsettings.cxx
Dosyayı görüntüle @ 5f336095
...@@ -425,8 +425,8 @@ namespace dbaui ...@@ -425,8 +425,8 @@ namespace dbaui
m_pImpl->translateProperties(xDatasource, *_pItems); m_pImpl->translateProperties(xDatasource, *_pItems);
SetInputSet(_pItems); SetInputSet(_pItems);
// propagate this set as our new input set and reset the example set // propagate this set as our new input set and reset the example set
delete pExampleSet; delete m_pExampleSet;
pExampleSet = new SfxItemSet(*GetInputSetImpl()); m_pExampleSet = new SfxItemSet(*GetInputSetImpl());
const OUString eType = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*_pItems); const OUString eType = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*_pItems);
...@@ -457,7 +457,7 @@ namespace dbaui ...@@ -457,7 +457,7 @@ namespace dbaui
void AdvancedSettingsDialog::dispose() void AdvancedSettingsDialog::dispose()
{ {
SetInputSet(nullptr); SetInputSet(nullptr);
DELETEZ(pExampleSet); DELETEZ(m_pExampleSet);
SfxTabDialog::dispose(); SfxTabDialog::dispose();
} }
...@@ -475,8 +475,8 @@ namespace dbaui ...@@ -475,8 +475,8 @@ namespace dbaui
short nRet = SfxTabDialog::Execute(); short nRet = SfxTabDialog::Execute();
if ( nRet == RET_OK ) if ( nRet == RET_OK )
{ {
pExampleSet->Put(*GetOutputItemSet()); m_pExampleSet->Put(*GetOutputItemSet());
m_pImpl->saveChanges(*pExampleSet); m_pImpl->saveChanges(*m_pExampleSet);
} }
return nRet; return nRet;
} }
...@@ -496,12 +496,12 @@ namespace dbaui ...@@ -496,12 +496,12 @@ namespace dbaui
const SfxItemSet* AdvancedSettingsDialog::getOutputSet() const const SfxItemSet* AdvancedSettingsDialog::getOutputSet() const
{ {
return pExampleSet; return m_pExampleSet;
} }
SfxItemSet* AdvancedSettingsDialog::getWriteOutputSet() SfxItemSet* AdvancedSettingsDialog::getWriteOutputSet()
{ {
return pExampleSet; return m_pExampleSet;
} }
::std::pair< Reference< XConnection >, sal_Bool > AdvancedSettingsDialog::createConnection() ::std::pair< Reference< XConnection >, sal_Bool > AdvancedSettingsDialog::createConnection()
......
dbaccess/source/ui/dlg/dbadmin.cxx
Dosyayı görüntüle @ 5f336095
...@@ -72,7 +72,7 @@ ODbAdminDialog::~ODbAdminDialog() ...@@ -72,7 +72,7 @@ ODbAdminDialog::~ODbAdminDialog()
void ODbAdminDialog::dispose() void ODbAdminDialog::dispose()
{ {
SetInputSet(nullptr); SetInputSet(nullptr);
DELETEZ(pExampleSet); DELETEZ(m_pExampleSet);
SfxTabDialog::dispose(); SfxTabDialog::dispose();
} }
...@@ -195,14 +195,14 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou ...@@ -195,14 +195,14 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou
m_pImpl->translateProperties(_rxDatasource, *GetInputSetImpl()); m_pImpl->translateProperties(_rxDatasource, *GetInputSetImpl());
// reset the example set // reset the example set
delete pExampleSet; delete m_pExampleSet;
pExampleSet = new SfxItemSet(*GetInputSetImpl()); m_pExampleSet = new SfxItemSet(*GetInputSetImpl());
// special case: MySQL Native does not have the generic "advanced" page // special case: MySQL Native does not have the generic "advanced" page
const DbuTypeCollectionItem& rCollectionItem = dynamic_cast<const DbuTypeCollectionItem&>(*getOutputSet()->GetItem(DSID_TYPECOLLECTION)); const DbuTypeCollectionItem& rCollectionItem = dynamic_cast<const DbuTypeCollectionItem&>(*getOutputSet()->GetItem(DSID_TYPECOLLECTION));
::dbaccess::ODsnTypeCollection* pCollection = rCollectionItem.getCollection(); ::dbaccess::ODsnTypeCollection* pCollection = rCollectionItem.getCollection();
if ( pCollection->determineType(getDatasourceType( *pExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE ) if ( pCollection->determineType(getDatasourceType( *m_pExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE )
{ {
AddTabPage( PAGE_MYSQL_NATIVE, OUString( ModuleRes( STR_PAGETITLE_CONNECTION ) ), ODriversSettings::CreateMySQLNATIVE, nullptr ); AddTabPage( PAGE_MYSQL_NATIVE, OUString( ModuleRes( STR_PAGETITLE_CONNECTION ) ), ODriversSettings::CreateMySQLNATIVE, nullptr );
RemoveTabPage("advanced"); RemoveTabPage("advanced");
...@@ -241,7 +241,7 @@ ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges() ...@@ -241,7 +241,7 @@ ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges()
return AR_KEEP; return AR_KEEP;
} }
if ( !m_pImpl->saveChanges(*pExampleSet) ) if ( !m_pImpl->saveChanges(*m_pExampleSet) )
return AR_KEEP; return AR_KEEP;
if ( isUIEnabled() ) if ( isUIEnabled() )
...@@ -267,7 +267,7 @@ const SfxItemSet* ODbAdminDialog::getOutputSet() const ...@@ -267,7 +267,7 @@ const SfxItemSet* ODbAdminDialog::getOutputSet() const
SfxItemSet* ODbAdminDialog::getWriteOutputSet() SfxItemSet* ODbAdminDialog::getWriteOutputSet()
{ {
return pExampleSet; return m_pExampleSet;
} }
::std::pair< Reference<XConnection>,sal_Bool> ODbAdminDialog::createConnection() ::std::pair< Reference<XConnection>,sal_Bool> ODbAdminDialog::createConnection()
......
include/sfx2/tabdlg.hxx
Dosyayı görüntüle @ 5f336095
...@@ -78,13 +78,13 @@ friend class SfxTabDialogController; ...@@ -78,13 +78,13 @@ friend class SfxTabDialogController;
bool m_bOwnsResetBtn; bool m_bOwnsResetBtn;
bool m_bOwnsBaseFmtBtn; bool m_bOwnsBaseFmtBtn;
SfxItemSet* pSet; SfxItemSet* m_pSet;
SfxItemSet* pOutSet; SfxItemSet* m_pOutSet;
TabDlg_Impl* pImpl; TabDlg_Impl* m_pImpl;
sal_uInt16* pRanges; sal_uInt16* m_pRanges;
sal_uInt16 nAppPageId; sal_uInt16 m_nAppPageId;
bool bItemsReset; bool m_bItemsReset;
bool bStandardPushed; bool m_bStandardPushed;
DECL_DLLPRIVATE_LINK_TYPED(ActivatePageHdl, TabControl*, void ); DECL_DLLPRIVATE_LINK_TYPED(ActivatePageHdl, TabControl*, void );
DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl*, bool ); DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl*, bool );
...@@ -104,7 +104,7 @@ protected: ...@@ -104,7 +104,7 @@ protected:
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
VclPtr<VclButtonBox> m_pActionArea; VclPtr<VclButtonBox> m_pActionArea;
SfxItemSet* pExampleSet; SfxItemSet* m_pExampleSet;
SfxItemSet* GetInputSetImpl(); SfxItemSet* GetInputSetImpl();
SfxTabPage* GetTabPage( sal_uInt16 nPageId ) const; SfxTabPage* GetTabPage( sal_uInt16 nPageId ) const;
...@@ -146,11 +146,11 @@ public: ...@@ -146,11 +146,11 @@ public:
void SetCurPageId(sal_uInt16 nId) void SetCurPageId(sal_uInt16 nId)
{ {
nAppPageId = nId; m_nAppPageId = nId;
} }
void SetCurPageId(const OString& rName) void SetCurPageId(const OString& rName)
{ {
nAppPageId = m_pTabCtrl->GetPageId(rName); m_nAppPageId = m_pTabCtrl->GetPageId(rName);
} }
sal_uInt16 GetCurPageId() const sal_uInt16 GetCurPageId() const
{ {
...@@ -172,7 +172,7 @@ public: ...@@ -172,7 +172,7 @@ public:
// may provide local slots converted by Map // may provide local slots converted by Map
const sal_uInt16* GetInputRanges( const SfxItemPool& ); const sal_uInt16* GetInputRanges( const SfxItemPool& );
void SetInputSet( const SfxItemSet* pInSet ); void SetInputSet( const SfxItemSet* pInSet );
const SfxItemSet* GetOutputItemSet() const { return pOutSet; } const SfxItemSet* GetOutputItemSet() const { return m_pOutSet; }
const PushButton& GetOKButton() const { return *m_pOKBtn; } const PushButton& GetOKButton() const { return *m_pOKBtn; }
PushButton& GetOKButton() { return *m_pOKBtn; } PushButton& GetOKButton() { return *m_pOKBtn; }
...@@ -188,8 +188,8 @@ public: ...@@ -188,8 +188,8 @@ public:
void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override;
void Start(); void Start();
const SfxItemSet* GetExampleSet() const { return pExampleSet; } const SfxItemSet* GetExampleSet() const { return m_pExampleSet; }
SfxItemSet* GetExampleSet() { return pExampleSet; } SfxItemSet* GetExampleSet() { return m_pExampleSet; }
void SetApplyHandler(const Link<Button*,void>& _rHdl); void SetApplyHandler(const Link<Button*,void>& _rHdl);
......
sfx2/source/dialog/styledlg.cxx
Dosyayı görüntüle @ 5f336095
...@@ -62,8 +62,8 @@ SfxStyleDialog::SfxStyleDialog ...@@ -62,8 +62,8 @@ SfxStyleDialog::SfxStyleDialog
OUString sTxt = GetText() + ": " + rStyle.GetName(); OUString sTxt = GetText() + ": " + rStyle.GetName();
SetText( sTxt ); SetText( sTxt );
} }
delete pExampleSet; // in SfxTabDialog::Ctor() already created delete m_pExampleSet; // in SfxTabDialog::Ctor() already created
pExampleSet = &pStyle->GetItemSet(); m_pExampleSet = &pStyle->GetItemSet();
GetCancelButton().SetClickHdl( LINK(this, SfxStyleDialog, CancelHdl) ); GetCancelButton().SetClickHdl( LINK(this, SfxStyleDialog, CancelHdl) );
} }
...@@ -82,7 +82,7 @@ SfxStyleDialog::~SfxStyleDialog() ...@@ -82,7 +82,7 @@ SfxStyleDialog::~SfxStyleDialog()
void SfxStyleDialog::dispose() void SfxStyleDialog::dispose()
{ {
pExampleSet = nullptr; m_pExampleSet = nullptr;
pStyle = nullptr; pStyle = nullptr;
SfxTabDialog::dispose(); SfxTabDialog::dispose();
} }
...@@ -134,9 +134,9 @@ IMPL_LINK_NOARG_TYPED( SfxStyleDialog, CancelHdl, Button *, void ) ...@@ -134,9 +134,9 @@ IMPL_LINK_NOARG_TYPED( SfxStyleDialog, CancelHdl, Button *, void )
SfxItemState eState = pInSet->GetItemState( nWhich, false ); SfxItemState eState = pInSet->GetItemState( nWhich, false );
if ( SfxItemState::DEFAULT == eState ) if ( SfxItemState::DEFAULT == eState )
pExampleSet->ClearItem( nWhich ); m_pExampleSet->ClearItem( nWhich );
else else
pExampleSet->Put( pInSet->Get( nWhich ) ); m_pExampleSet->Put( pInSet->Get( nWhich ) );
nWhich = aIter.NextWhich(); nWhich = aIter.NextWhich();
} }
......
sfx2/source/dialog/tabdlg.cxx
Dosyayı görüntüle @ 5f336095
...@@ -321,13 +321,13 @@ SfxTabDialog::SfxTabDialog ...@@ -321,13 +321,13 @@ SfxTabDialog::SfxTabDialog
bool bEditFmt // when yes -> additional Button for standard bool bEditFmt // when yes -> additional Button for standard
) )
: TabDialog(pParent, rID, rUIXMLDescription) : TabDialog(pParent, rID, rUIXMLDescription)
, pSet(pItemSet ? new SfxItemSet(*pItemSet) : nullptr) , m_pSet(pItemSet ? new SfxItemSet(*pItemSet) : nullptr)
, pOutSet(nullptr) , m_pOutSet(nullptr)
, pRanges(nullptr) , m_pRanges(nullptr)
, nAppPageId(USHRT_MAX) , m_nAppPageId(USHRT_MAX)
, bItemsReset(false) , m_bItemsReset(false)
, bStandardPushed(false) , m_bStandardPushed(false)
, pExampleSet(nullptr) , m_pExampleSet(nullptr)
{ {
Init_Impl(bEditFmt); Init_Impl(bEditFmt);
} }
...@@ -342,7 +342,7 @@ void SfxTabDialog::dispose() ...@@ -342,7 +342,7 @@ void SfxTabDialog::dispose()
{ {
SavePosAndId(); SavePosAndId();
for ( SfxTabDlgData_Impl::const_iterator it = pImpl->aData.begin(); it != pImpl->aData.end(); ++it ) for ( SfxTabDlgData_Impl::const_iterator it = m_pImpl->aData.begin(); it != m_pImpl->aData.end(); ++it )
{ {
Data_Impl* pDataObject = *it; Data_Impl* pDataObject = *it;
...@@ -374,16 +374,16 @@ void SfxTabDialog::dispose() ...@@ -374,16 +374,16 @@ void SfxTabDialog::dispose()
pDataObject = nullptr; pDataObject = nullptr;
} }
delete pImpl; delete m_pImpl;
pImpl = nullptr; m_pImpl = nullptr;
delete pSet; delete m_pSet;
pSet = nullptr; m_pSet = nullptr;
delete pOutSet; delete m_pOutSet;
pOutSet = nullptr; m_pOutSet = nullptr;
delete pExampleSet; delete m_pExampleSet;
pExampleSet = nullptr; m_pExampleSet = nullptr;
delete [] pRanges; delete [] m_pRanges;
pRanges = nullptr; m_pRanges = nullptr;
if (m_bOwnsBaseFmtBtn) if (m_bOwnsBaseFmtBtn)
m_pBaseFmtBtn.disposeAndClear(); m_pBaseFmtBtn.disposeAndClear();
...@@ -419,7 +419,7 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag) ...@@ -419,7 +419,7 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag)
assert(m_pBox); assert(m_pBox);
m_pUIBuilder->get(m_pTabCtrl, "tabcontrol"); m_pUIBuilder->get(m_pTabCtrl, "tabcontrol");
pImpl = new TabDlg_Impl(m_pTabCtrl->GetPageCount()); m_pImpl = new TabDlg_Impl(m_pTabCtrl->GetPageCount());
m_pActionArea = get_action_area(); m_pActionArea = get_action_area();
assert(m_pActionArea); assert(m_pActionArea);
...@@ -446,7 +446,7 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag) ...@@ -446,7 +446,7 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag)
if (m_bOwnsResetBtn) if (m_bOwnsResetBtn)
m_pResetBtn = VclPtr<PushButton>::Create(m_pActionArea.get()); m_pResetBtn = VclPtr<PushButton>::Create(m_pActionArea.get());
else else
pImpl->bHideResetBtn = !m_pResetBtn->IsVisible(); m_pImpl->bHideResetBtn = !m_pResetBtn->IsVisible();
m_pBaseFmtBtn = m_pUIBuilder->get<PushButton>("standard"); m_pBaseFmtBtn = m_pUIBuilder->get<PushButton>("standard");
m_bOwnsBaseFmtBtn = m_pBaseFmtBtn == nullptr; m_bOwnsBaseFmtBtn = m_pBaseFmtBtn == nullptr;
...@@ -484,17 +484,17 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag) ...@@ -484,17 +484,17 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag)
m_pBaseFmtBtn->Show(); m_pBaseFmtBtn->Show();
} }
if ( pSet ) if ( m_pSet )
{ {
pExampleSet = new SfxItemSet( *pSet ); m_pExampleSet = new SfxItemSet( *m_pSet );
pOutSet = new SfxItemSet( *pSet->GetPool(), pSet->GetRanges() ); m_pOutSet = new SfxItemSet( *m_pSet->GetPool(), m_pSet->GetRanges() );
} }
} }
void SfxTabDialog::RemoveResetButton() void SfxTabDialog::RemoveResetButton()
{ {
m_pResetBtn->Hide(); m_pResetBtn->Hide();
pImpl->bHideResetBtn = true; m_pImpl->bHideResetBtn = true;
} }
void SfxTabDialog::RemoveStandardButton() void SfxTabDialog::RemoveStandardButton()
...@@ -522,7 +522,7 @@ void SfxTabDialog::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) ...@@ -522,7 +522,7 @@ void SfxTabDialog::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl )
void SfxTabDialog::Start() void SfxTabDialog::Start()
{ {
pImpl->bModal = false; m_pImpl->bModal = false;
Start_Impl(); Start_Impl();
Show(); Show();
...@@ -542,7 +542,7 @@ void SfxTabDialog::SetApplyHandler(const Link<Button*, void>& _rHdl) ...@@ -542,7 +542,7 @@ void SfxTabDialog::SetApplyHandler(const Link<Button*, void>& _rHdl)
void SfxTabDialog::Start_Impl() void SfxTabDialog::Start_Impl()
{ {
assert(pImpl->aData.size() == m_pTabCtrl->GetPageCount() assert(m_pImpl->aData.size() == m_pTabCtrl->GetPageCount()
&& "not all pages registered"); && "not all pages registered");
sal_uInt16 nActPage = m_pTabCtrl->GetPageId( 0 ); sal_uInt16 nActPage = m_pTabCtrl->GetPageId( 0 );
...@@ -555,8 +555,8 @@ void SfxTabDialog::Start_Impl() ...@@ -555,8 +555,8 @@ void SfxTabDialog::Start_Impl()
// initial TabPage from Program/Help/config // initial TabPage from Program/Help/config
nActPage = (sal_uInt16)aDlgOpt.GetPageID(); nActPage = (sal_uInt16)aDlgOpt.GetPageID();
if ( USHRT_MAX != nAppPageId ) if ( USHRT_MAX != m_nAppPageId )
nActPage = nAppPageId; nActPage = m_nAppPageId;
else else
{ {
sal_uInt16 nAutoTabPageId = SfxGetpApp()->Get_Impl()->nAutoTabPageId; sal_uInt16 nAutoTabPageId = SfxGetpApp()->Get_Impl()->nAutoTabPageId;
...@@ -567,8 +567,8 @@ void SfxTabDialog::Start_Impl() ...@@ -567,8 +567,8 @@ void SfxTabDialog::Start_Impl()
if ( TAB_PAGE_NOTFOUND == m_pTabCtrl->GetPagePos( nActPage ) ) if ( TAB_PAGE_NOTFOUND == m_pTabCtrl->GetPagePos( nActPage ) )
nActPage = m_pTabCtrl->GetPageId( 0 ); nActPage = m_pTabCtrl->GetPageId( 0 );
} }
else if ( USHRT_MAX != nAppPageId && TAB_PAGE_NOTFOUND != m_pTabCtrl->GetPagePos( nAppPageId ) ) else if ( USHRT_MAX != m_nAppPageId && TAB_PAGE_NOTFOUND != m_pTabCtrl->GetPagePos( m_nAppPageId ) )
nActPage = nAppPageId; nActPage = m_nAppPageId;
m_pTabCtrl->SetCurPageId( nActPage ); m_pTabCtrl->SetCurPageId( nActPage );
ActivatePageHdl( m_pTabCtrl ); ActivatePageHdl( m_pTabCtrl );
...@@ -592,7 +592,7 @@ sal_uInt16 SfxTabDialog::AddTabPage ...@@ -592,7 +592,7 @@ sal_uInt16 SfxTabDialog::AddTabPage
) )
{ {
sal_uInt16 nId = m_pTabCtrl->GetPageId(rName); sal_uInt16 nId = m_pTabCtrl->GetPageId(rName);
pImpl->aData.push_back( m_pImpl->aData.push_back(
new Data_Impl( nId, pCreateFunc, pRangesFunc, false/*bItemsOnDemand*/ ) ); new Data_Impl( nId, pCreateFunc, pRangesFunc, false/*bItemsOnDemand*/ ) );
return nId; return nId;
} }
...@@ -613,7 +613,7 @@ sal_uInt16 SfxTabDialog::AddTabPage ...@@ -613,7 +613,7 @@ sal_uInt16 SfxTabDialog::AddTabPage
assert(pCreateFunc); assert(pCreateFunc);
GetTabPageRanges pRangesFunc = pFact->GetTabPageRangesFunc(nPageCreateId); GetTabPageRanges pRangesFunc = pFact->GetTabPageRangesFunc(nPageCreateId);
sal_uInt16 nPageId = m_pTabCtrl->GetPageId(rName); sal_uInt16 nPageId = m_pTabCtrl->GetPageId(rName);
pImpl->aData.push_back(new Data_Impl(nPageId, pCreateFunc, pRangesFunc, false)); m_pImpl->aData.push_back(new Data_Impl(nPageId, pCreateFunc, pRangesFunc, false));
return nPageId; return nPageId;
} }
...@@ -637,7 +637,7 @@ void SfxTabDialog::AddTabPage ...@@ -637,7 +637,7 @@ void SfxTabDialog::AddTabPage
DBG_ASSERT( TAB_PAGE_NOTFOUND == m_pTabCtrl->GetPagePos( nId ), DBG_ASSERT( TAB_PAGE_NOTFOUND == m_pTabCtrl->GetPagePos( nId ),
"Double Page-Ids in the Tabpage" ); "Double Page-Ids in the Tabpage" );
m_pTabCtrl->InsertPage( nId, rRiderText, nPos ); m_pTabCtrl->InsertPage( nId, rRiderText, nPos );
pImpl->aData.push_back( m_pImpl->aData.push_back(
new Data_Impl( nId, pCreateFunc, pRangesFunc, false/*bItemsOnDemand*/ ) ); new Data_Impl( nId, pCreateFunc, pRangesFunc, false/*bItemsOnDemand*/ ) );
} }
...@@ -651,7 +651,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId ) ...@@ -651,7 +651,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
{ {
sal_uInt16 nPos = 0; sal_uInt16 nPos = 0;
m_pTabCtrl->RemovePage( nId ); m_pTabCtrl->RemovePage( nId );
Data_Impl* pDataObject = Find( pImpl->aData, nId, &nPos ); Data_Impl* pDataObject = Find( m_pImpl->aData, nId, &nPos );
if ( pDataObject ) if ( pDataObject )
{ {
...@@ -680,7 +680,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId ) ...@@ -680,7 +680,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
} }
delete pDataObject; delete pDataObject;
pImpl->aData.erase( pImpl->aData.begin() + nPos ); m_pImpl->aData.erase( m_pImpl->aData.begin() + nPos );
} }
else else
{ {
...@@ -720,7 +720,7 @@ SfxItemSet* SfxTabDialog::GetInputSetImpl() ...@@ -720,7 +720,7 @@ SfxItemSet* SfxTabDialog::GetInputSetImpl()
*/ */
{ {
return pSet; return m_pSet;
} }
...@@ -733,7 +733,7 @@ SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const ...@@ -733,7 +733,7 @@ SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const
{ {
sal_uInt16 nPos = 0; sal_uInt16 nPos = 0;
Data_Impl* pDataObject = Find( pImpl->aData, nPageId, &nPos ); Data_Impl* pDataObject = Find( m_pImpl->aData, nPageId, &nPos );
if ( pDataObject ) if ( pDataObject )
return pDataObject->pTabPage; return pDataObject->pTabPage;
...@@ -771,16 +771,16 @@ short SfxTabDialog::Ok() ...@@ -771,16 +771,16 @@ short SfxTabDialog::Ok()
{ {
SavePosAndId(); //See fdo#38828 "Apply" resetting window position SavePosAndId(); //See fdo#38828 "Apply" resetting window position
if ( !pOutSet ) if ( !m_pOutSet )
{ {
if ( !pExampleSet && pSet ) if ( !m_pExampleSet && m_pSet )
pOutSet = pSet->Clone( false ); // without Items m_pOutSet = m_pSet->Clone( false ); // without Items
else if ( pExampleSet ) else if ( m_pExampleSet )
pOutSet = new SfxItemSet( *pExampleSet ); m_pOutSet = new SfxItemSet( *m_pExampleSet );
} }
bool bModified = false; bool bModified = false;
for ( SfxTabDlgData_Impl::const_iterator it = pImpl->aData.begin(); it != pImpl->aData.end(); ++it ) for ( SfxTabDlgData_Impl::const_iterator it = m_pImpl->aData.begin(); it != m_pImpl->aData.end(); ++it )
{ {
Data_Impl* pDataObject = *it; Data_Impl* pDataObject = *it;
SfxTabPage* pTabPage = pDataObject->pTabPage; SfxTabPage* pTabPage = pDataObject->pTabPage;
...@@ -793,25 +793,25 @@ short SfxTabDialog::Ok() ...@@ -793,25 +793,25 @@ short SfxTabDialog::Ok()
rSet.ClearItem(); rSet.ClearItem();
bModified |= pTabPage->FillItemSet( &rSet ); bModified |= pTabPage->FillItemSet( &rSet );
} }
else if ( pSet && !pTabPage->HasExchangeSupport() ) else if ( m_pSet && !pTabPage->HasExchangeSupport() )
{ {
SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); SfxItemSet aTmp( *m_pSet->GetPool(), m_pSet->GetRanges() );
if ( pTabPage->FillItemSet( &aTmp ) ) if ( pTabPage->FillItemSet( &aTmp ) )
{ {
bModified = true; bModified = true;
if (pExampleSet) if (m_pExampleSet)
pExampleSet->Put( aTmp ); m_pExampleSet->Put( aTmp );
pOutSet->Put( aTmp ); m_pOutSet->Put( aTmp );
} }
} }
} }
} }
if ( pImpl->bModified || ( pOutSet && pOutSet->Count() > 0 ) ) if ( m_pImpl->bModified || ( m_pOutSet && m_pOutSet->Count() > 0 ) )
bModified = true; bModified = true;
if (bStandardPushed) if (m_bStandardPushed)
bModified = true; bModified = true;
return bModified ? RET_OK : RET_CANCEL; return bModified ? RET_OK : RET_CANCEL;
} }
...@@ -863,7 +863,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, OkHdl, Button*, void) ...@@ -863,7 +863,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, OkHdl, Button*, void)
{ {
if (PrepareLeaveCurrentPage()) if (PrepareLeaveCurrentPage())
{ {
if ( pImpl->bModal ) if ( m_pImpl->bModal )
EndDialog( Ok() ); EndDialog( Ok() );
else else
{ {
...@@ -902,9 +902,9 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() ...@@ -902,9 +902,9 @@ bool SfxTabDialog::PrepareLeaveCurrentPage()
if ( pPage ) if ( pPage )
{ {
int nRet = SfxTabPage::LEAVE_PAGE; int nRet = SfxTabPage::LEAVE_PAGE;
if ( pSet ) if ( m_pSet )
{ {
SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); SfxItemSet aTmp( *m_pSet->GetPool(), m_pSet->GetRanges() );
if ( pPage->HasExchangeSupport() ) if ( pPage->HasExchangeSupport() )
nRet = pPage->DeactivatePage( &aTmp ); nRet = pPage->DeactivatePage( &aTmp );
...@@ -914,8 +914,8 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() ...@@ -914,8 +914,8 @@ bool SfxTabDialog::PrepareLeaveCurrentPage()
if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE
&& aTmp.Count() ) && aTmp.Count() )
{ {
pExampleSet->Put( aTmp ); m_pExampleSet->Put( aTmp );
pOutSet->Put( aTmp ); m_pOutSet->Put( aTmp );
} }
} }
else else
...@@ -962,7 +962,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) ...@@ -962,7 +962,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void)
{ {
const sal_uInt16 nId = m_pTabCtrl->GetCurPageId(); const sal_uInt16 nId = m_pTabCtrl->GetCurPageId();
Data_Impl* pDataObject = Find( pImpl->aData, nId ); Data_Impl* pDataObject = Find( m_pImpl->aData, nId );
DBG_ASSERT( pDataObject, "Id not known" ); DBG_ASSERT( pDataObject, "Id not known" );
if ( pDataObject->bOnDemand ) if ( pDataObject->bOnDemand )
...@@ -972,7 +972,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) ...@@ -972,7 +972,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void)
pDataObject->pTabPage->Reset( pItemSet ); pDataObject->pTabPage->Reset( pItemSet );
} }
else else
pDataObject->pTabPage->Reset( pSet ); pDataObject->pTabPage->Reset( m_pSet );
} }
...@@ -986,20 +986,20 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) ...@@ -986,20 +986,20 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void)
*/ */
{ {
bStandardPushed = true; m_bStandardPushed = true;
const sal_uInt16 nId = m_pTabCtrl->GetCurPageId(); const sal_uInt16 nId = m_pTabCtrl->GetCurPageId();
Data_Impl* pDataObject = Find( pImpl->aData, nId ); Data_Impl* pDataObject = Find( m_pImpl->aData, nId );
DBG_ASSERT( pDataObject, "Id not known" ); DBG_ASSERT( pDataObject, "Id not known" );
if ( pDataObject->fnGetRanges ) if ( pDataObject->fnGetRanges )
{ {
if ( !pExampleSet ) if ( !m_pExampleSet )
pExampleSet = new SfxItemSet( *pSet ); m_pExampleSet = new SfxItemSet( *m_pSet );
const SfxItemPool* pPool = pSet->GetPool(); const SfxItemPool* pPool = m_pSet->GetPool();
const sal_uInt16* pTmpRanges = (pDataObject->fnGetRanges)(); const sal_uInt16* pTmpRanges = (pDataObject->fnGetRanges)();
SfxItemSet aTmpSet( *pExampleSet ); SfxItemSet aTmpSet( *m_pExampleSet );
while ( *pTmpRanges ) while ( *pTmpRanges )
{ {
...@@ -1009,11 +1009,11 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) ...@@ -1009,11 +1009,11 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void)
{ {
// Range which two identical values -> only set one Item // Range which two identical values -> only set one Item
sal_uInt16 nWh = pPool->GetWhich( *pTmpRanges ); sal_uInt16 nWh = pPool->GetWhich( *pTmpRanges );
pExampleSet->ClearItem( nWh ); m_pExampleSet->ClearItem( nWh );
aTmpSet.ClearItem( nWh ); aTmpSet.ClearItem( nWh );
// At the Outset of InvalidateItem, // At the Outset of InvalidateItem,
// so that the change takes effect // so that the change takes effect
pOutSet->InvalidateItem( nWh ); m_pOutSet->InvalidateItem( nWh );
} }
else else
{ {
...@@ -1033,11 +1033,11 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) ...@@ -1033,11 +1033,11 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void)
{ {
// Iterate over the Range and set the Items // Iterate over the Range and set the Items
sal_uInt16 nWh = pPool->GetWhich( nTmp ); sal_uInt16 nWh = pPool->GetWhich( nTmp );
pExampleSet->ClearItem( nWh ); m_pExampleSet->ClearItem( nWh );
aTmpSet.ClearItem( nWh ); aTmpSet.ClearItem( nWh );
// At the Outset of InvalidateItem, // At the Outset of InvalidateItem,
// so that the change takes effect // so that the change takes effect
pOutSet->InvalidateItem( nWh ); m_pOutSet->InvalidateItem( nWh );
nTmp++; nTmp++;
} }
} }
...@@ -1066,12 +1066,12 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) ...@@ -1066,12 +1066,12 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
{ {
sal_uInt16 nId = pTabCtrl->GetCurPageId(); sal_uInt16 nId = pTabCtrl->GetCurPageId();
DBG_ASSERT( pImpl->aData.size(), "no Pages registered" ); DBG_ASSERT( m_pImpl->aData.size(), "no Pages registered" );
SfxGetpApp(); SfxGetpApp();
// Tab Page schon da? // Tab Page schon da?
VclPtr<SfxTabPage> pTabPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId )); VclPtr<SfxTabPage> pTabPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId ));
Data_Impl* pDataObject = Find( pImpl->aData, nId ); Data_Impl* pDataObject = Find( m_pImpl->aData, nId );
//UUUU fallback to 1st page when requested one does not exist //UUUU fallback to 1st page when requested one does not exist
if(!pDataObject && pTabCtrl->GetPageCount()) if(!pDataObject && pTabCtrl->GetPageCount())
...@@ -1079,7 +1079,7 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) ...@@ -1079,7 +1079,7 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
pTabCtrl->SetCurPageId(pTabCtrl->GetPageId(0)); pTabCtrl->SetCurPageId(pTabCtrl->GetPageId(0));
nId = pTabCtrl->GetCurPageId(); nId = pTabCtrl->GetCurPageId();
pTabPage = dynamic_cast< SfxTabPage* >(pTabCtrl->GetTabPage(nId)); pTabPage = dynamic_cast< SfxTabPage* >(pTabCtrl->GetTabPage(nId));
pDataObject = Find(pImpl->aData, nId); pDataObject = Find(m_pImpl->aData, nId);
} }
if (!pDataObject) if (!pDataObject)
...@@ -1093,12 +1093,12 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) ...@@ -1093,12 +1093,12 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
{ {
const SfxItemSet* pTmpSet = nullptr; const SfxItemSet* pTmpSet = nullptr;
if ( pSet ) if ( m_pSet )
{ {
if ( bItemsReset && pSet->GetParent() ) if ( m_bItemsReset && m_pSet->GetParent() )
pTmpSet = pSet->GetParent(); pTmpSet = m_pSet->GetParent();
else else
pTmpSet = pSet; pTmpSet = m_pSet;
} }
if ( pTmpSet && !pDataObject->bOnDemand ) if ( pTmpSet && !pDataObject->bOnDemand )
...@@ -1137,18 +1137,18 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) ...@@ -1137,18 +1137,18 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
if ( pDataObject->bOnDemand ) if ( pDataObject->bOnDemand )
pTabPage->Reset( &pTabPage->GetItemSet() ); pTabPage->Reset( &pTabPage->GetItemSet() );
else else
pTabPage->Reset( pSet ); pTabPage->Reset( m_pSet );
pTabCtrl->SetTabPage( nId, pTabPage ); pTabCtrl->SetTabPage( nId, pTabPage );
} }
else if ( pDataObject->bRefresh ) else if ( pDataObject->bRefresh )
pTabPage->Reset( pSet ); pTabPage->Reset( m_pSet );
pDataObject->bRefresh = false; pDataObject->bRefresh = false;
if ( pExampleSet ) if ( m_pExampleSet )
pTabPage->ActivatePage( *pExampleSet ); pTabPage->ActivatePage( *m_pExampleSet );
if ( pTabPage->IsReadOnly() || pImpl->bHideResetBtn ) if ( pTabPage->IsReadOnly() || m_pImpl->bHideResetBtn )
m_pResetBtn->Hide(); m_pResetBtn->Hide();
else else
m_pResetBtn->Show(); m_pResetBtn->Show();
...@@ -1174,7 +1174,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) ...@@ -1174,7 +1174,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool )
if (!pPage) if (!pPage)
return false; return false;
#ifdef DBG_UTIL #ifdef DBG_UTIL
Data_Impl* pDataObject = Find( pImpl->aData, pTabCtrl->GetCurPageId() ); Data_Impl* pDataObject = Find( m_pImpl->aData, pTabCtrl->GetCurPageId() );
DBG_ASSERT( pDataObject, "no Data structure for current page" ); DBG_ASSERT( pDataObject, "no Data structure for current page" );
if ( pPage->HasExchangeSupport() && pDataObject->bOnDemand ) if ( pPage->HasExchangeSupport() && pDataObject->bOnDemand )
{ {
...@@ -1184,12 +1184,12 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) ...@@ -1184,12 +1184,12 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool )
int nRet = SfxTabPage::LEAVE_PAGE; int nRet = SfxTabPage::LEAVE_PAGE;
if ( !pExampleSet && pPage->HasExchangeSupport() && pSet ) if ( !m_pExampleSet && pPage->HasExchangeSupport() && m_pSet )
pExampleSet = new SfxItemSet( *pSet->GetPool(), pSet->GetRanges() ); m_pExampleSet = new SfxItemSet( *m_pSet->GetPool(), m_pSet->GetRanges() );
if ( pSet ) if ( m_pSet )
{ {
SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); SfxItemSet aTmp( *m_pSet->GetPool(), m_pSet->GetRanges() );
if ( pPage->HasExchangeSupport() ) if ( pPage->HasExchangeSupport() )
nRet = pPage->DeactivatePage( &aTmp ); nRet = pPage->DeactivatePage( &aTmp );
...@@ -1198,21 +1198,21 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) ...@@ -1198,21 +1198,21 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool )
if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE && if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE &&
aTmp.Count() ) aTmp.Count() )
{ {
pExampleSet->Put( aTmp ); m_pExampleSet->Put( aTmp );
pOutSet->Put( aTmp ); m_pOutSet->Put( aTmp );
} }
} }
else else
{ {
if ( pPage->HasExchangeSupport() ) //!!! if ( pPage->HasExchangeSupport() ) //!!!
{ {
if ( !pExampleSet ) if ( !m_pExampleSet )
{ {
SfxItemPool* pPool = pPage->GetItemSet().GetPool(); SfxItemPool* pPool = pPage->GetItemSet().GetPool();
pExampleSet = m_pExampleSet =
new SfxItemSet( *pPool, GetInputRanges( *pPool ) ); new SfxItemSet( *pPool, GetInputRanges( *pPool ) );
} }
nRet = pPage->DeactivatePage( pExampleSet ); nRet = pPage->DeactivatePage( m_pExampleSet );
} }
else else
nRet = pPage->DeactivatePage( nullptr ); nRet = pPage->DeactivatePage( nullptr );
...@@ -1223,7 +1223,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) ...@@ -1223,7 +1223,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool )
RefreshInputSet(); RefreshInputSet();
// Flag all Pages as to be initialized as new // Flag all Pages as to be initialized as new
for ( SfxTabDlgData_Impl::const_iterator it = pImpl->aData.begin(); it != pImpl->aData.end(); ++it ) for ( SfxTabDlgData_Impl::const_iterator it = m_pImpl->aData.begin(); it != m_pImpl->aData.end(); ++it )
{ {
Data_Impl* pObj = *it; Data_Impl* pObj = *it;
...@@ -1274,17 +1274,17 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) ...@@ -1274,17 +1274,17 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
*/ */
{ {
if ( pSet ) if ( m_pSet )
{ {
SAL_WARN( "sfx.dialog", "Set already exists!" ); SAL_WARN( "sfx.dialog", "Set already exists!" );
return pSet->GetRanges(); return m_pSet->GetRanges();
} }
if ( pRanges ) if ( m_pRanges )
return pRanges; return m_pRanges;
std::vector<sal_uInt16> aUS; std::vector<sal_uInt16> aUS;
for ( SfxTabDlgData_Impl::const_iterator it = pImpl->aData.begin(); it != pImpl->aData.end(); ++it ) for ( SfxTabDlgData_Impl::const_iterator it = m_pImpl->aData.begin(); it != m_pImpl->aData.end(); ++it )
{ {
Data_Impl* pDataObject = *it; Data_Impl* pDataObject = *it;
...@@ -1313,10 +1313,10 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) ...@@ -1313,10 +1313,10 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
std::sort( aUS.begin(), aUS.end() ); std::sort( aUS.begin(), aUS.end() );
} }
pRanges = new sal_uInt16[aUS.size() + 1]; m_pRanges = new sal_uInt16[aUS.size() + 1];
std::copy( aUS.begin(), aUS.end(), pRanges ); std::copy( aUS.begin(), aUS.end(), m_pRanges );
pRanges[aUS.size()] = 0; m_pRanges[aUS.size()] = 0;
return pRanges; return m_pRanges;
} }
...@@ -1328,14 +1328,14 @@ void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet ) ...@@ -1328,14 +1328,14 @@ void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet )
*/ */
{ {
bool bSet = ( pSet != nullptr ); bool bSet = ( m_pSet != nullptr );
delete pSet; delete m_pSet;
pSet = pInSet ? new SfxItemSet(*pInSet) : nullptr; m_pSet = pInSet ? new SfxItemSet(*pInSet) : nullptr;
if (!bSet && !pExampleSet && !pOutSet && pSet) if (!bSet && !m_pExampleSet && !m_pOutSet && m_pSet)
{ {
pExampleSet = new SfxItemSet( *pSet ); m_pExampleSet = new SfxItemSet( *m_pSet );
pOutSet = new SfxItemSet( *pSet->GetPool(), pSet->GetRanges() ); m_pOutSet = new SfxItemSet( *m_pSet->GetPool(), m_pSet->GetRanges() );
} }
} }
......
sw/source/ui/envelp/label1.cxx
Dosyayı görüntüle @ 5f336095
...@@ -162,8 +162,8 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, ...@@ -162,8 +162,8 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
if ( !aMakes.empty() ) if ( !aMakes.empty() )
_ReplaceGroup( aMakes[nLstGroup] ); _ReplaceGroup( aMakes[nLstGroup] );
if (pExampleSet) if (m_pExampleSet)
pExampleSet->Put(aItem); m_pExampleSet->Put(aItem);
} }
SwLabDlg::~SwLabDlg() SwLabDlg::~SwLabDlg()
......
sw/source/ui/fmtui/tmpdlg.cxx
Dosyayı görüntüle @ 5f336095
...@@ -334,7 +334,7 @@ short SwTemplateDlg::Ok() ...@@ -334,7 +334,7 @@ short SwTemplateDlg::Ok()
if( RET_OK == nRet ) if( RET_OK == nRet )
{ {
const SfxPoolItem *pOutItem, *pExItem; const SfxPoolItem *pOutItem, *pExItem;
if( SfxItemState::SET == pExampleSet->GetItemState( if( SfxItemState::SET == m_pExampleSet->GetItemState(
SID_ATTR_NUMBERING_RULE, false, &pExItem ) && SID_ATTR_NUMBERING_RULE, false, &pExItem ) &&
( !GetOutputItemSet() || ( !GetOutputItemSet() ||
SfxItemState::SET != GetOutputItemSet()->GetItemState( SfxItemState::SET != GetOutputItemSet()->GetItemState(
......
sw/source/ui/misc/num.cxx
Dosyayı görüntüle @ 5f336095
...@@ -1025,7 +1025,7 @@ void SwSvxNumBulletTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) ...@@ -1025,7 +1025,7 @@ void SwSvxNumBulletTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage)
short SwSvxNumBulletTabDialog::Ok() short SwSvxNumBulletTabDialog::Ok()
{ {
short nRet = SfxTabDialog::Ok(); short nRet = SfxTabDialog::Ok();
pExampleSet->ClearItem(SID_PARAM_NUM_PRESET); m_pExampleSet->ClearItem(SID_PARAM_NUM_PRESET);
return nRet; return nRet;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment