[Libreoffice-commits] .: sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 2 08:54:11 PDT 2012
sw/source/ui/envelp/envfmt.cxx | 24 ++++++++++++------------
sw/source/ui/envelp/envfmt.hxx | 3 +--
sw/source/ui/envelp/envlop1.cxx | 14 +++++++-------
sw/source/ui/envelp/envprt.cxx | 4 ++--
sw/source/ui/envelp/envprt.hxx | 3 +--
sw/source/ui/envelp/label1.cxx | 30 +++++++++++++++---------------
sw/source/ui/envelp/labfmt.cxx | 12 ++++++------
sw/source/ui/envelp/labfmt.hxx | 3 +--
sw/source/ui/envelp/labprt.cxx | 4 ++--
sw/source/ui/envelp/labprt.hxx | 3 +--
sw/source/ui/envelp/swuilabimp.hxx | 3 +--
sw/source/ui/inc/envlop.hxx | 3 +--
sw/source/ui/index/cnttab.cxx | 6 ------
13 files changed, 50 insertions(+), 62 deletions(-)
New commits:
commit 238e5c5bd379fd98cb877be62984e5c32222be9f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 2 16:52:41 2012 +0100
various rather mad uses of GetParent()->GetParent()
Change-Id: I0f0d5771d82c7a577ef86ce5ab1ca10a0aaeb89a
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 12d5e4a..4e5f2be 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -268,7 +268,7 @@ IMPL_LINK_INLINE_START( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
}
else
{
- FillItem(GetParent()->aEnvItem);
+ FillItem(GetParentSwEnvDlg()->aEnvItem);
SetMinMax();
aPreview.Invalidate();
}
@@ -278,7 +278,7 @@ IMPL_LINK_INLINE_END( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
{
- SwWrtShell* pSh = GetParent()->pSh;
+ SwWrtShell* pSh = GetParentSwEnvDlg()->pSh;
OSL_ENSURE(pSh, "Shell missing");
// determine collection-ptr
@@ -314,7 +314,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
SwAbstractDialogFactory* pFact = swui::GetFactory();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- SfxAbstractTabDialog* pDlg = pFact->CreateSwCharDlg( GetParent(), pSh->GetView(), aTmpSet, DLG_CHAR ,&pColl->GetName() );
+ SfxAbstractTabDialog* pDlg = pFact->CreateSwCharDlg( GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_CHAR ,&pColl->GetName() );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if (pDlg->Execute() == RET_OK)
{
@@ -362,7 +362,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
// set BoxInfo
::PrepareBoxInfo( aTmpSet, *pSh );
- SwParaDlg *pDlg = new SwParaDlg(GetParent(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &pColl->GetName());
+ SwParaDlg *pDlg = new SwParaDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &pColl->GetName());
if ( pDlg->Execute() == RET_OK )
{
@@ -398,7 +398,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, sal_Bool bSender)
{
- SfxItemSet *&pAddrSet = bSender ? GetParent()->pSenderSet : GetParent()->pAddresseeSet;
+ SfxItemSet *&pAddrSet = bSender ? GetParentSwEnvDlg()->pSenderSet : GetParentSwEnvDlg()->pAddresseeSet;
if (!pAddrSet)
{
@@ -424,7 +424,7 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, sal_Bool bSender)
pVec.insert(pVec.end(), aVec.begin(), aVec.end());
sal_uInt16 *pNewRanges = ::lcl_convertListToRanges(pVec);
- pAddrSet = new SfxItemSet(GetParent()->pSh->GetView().GetCurShell()->GetPool(),
+ pAddrSet = new SfxItemSet(GetParentSwEnvDlg()->pSh->GetView().GetCurShell()->GetPool(),
pNewRanges);
pAddrSet->Put(pColl->GetAttrSet());
delete[] pNewRanges;
@@ -470,7 +470,7 @@ IMPL_LINK_NOARG(SwEnvFmtPage, FormatHdl)
SetMinMax();
- FillItem(GetParent()->aEnvItem);
+ FillItem(GetParentSwEnvDlg()->aEnvItem);
aPreview.Invalidate();
return 0;
}
@@ -520,7 +520,7 @@ SfxTabPage* SwEnvFmtPage::Create(Window* pParent, const SfxItemSet& rSet)
void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet)
{
SfxItemSet aSet(rSet);
- aSet.Put(GetParent()->aEnvItem);
+ aSet.Put(GetParentSwEnvDlg()->aEnvItem);
Reset(aSet);
}
@@ -557,8 +557,8 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem)
sal_Bool SwEnvFmtPage::FillItemSet(SfxItemSet& rSet)
{
- FillItem(GetParent()->aEnvItem);
- rSet.Put(GetParent()->aEnvItem);
+ FillItem(GetParentSwEnvDlg()->aEnvItem);
+ rSet.Put(GetParentSwEnvDlg()->aEnvItem);
return sal_True;
}
@@ -582,8 +582,8 @@ void SwEnvFmtPage::Reset(const SfxItemSet& rSet)
SetFldVal(aSizeHeightField , Min(rItem.lWidth, rItem.lHeight));
SetMinMax();
- DELETEZ(GetParent()->pSenderSet);
- DELETEZ(GetParent()->pAddresseeSet);
+ DELETEZ(GetParentSwEnvDlg()->pSenderSet);
+ DELETEZ(GetParentSwEnvDlg()->pAddresseeSet);
}
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index de614b8..789d862 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -80,8 +80,7 @@ class SwEnvFmtPage : public SfxTabPage
SfxItemSet *GetCollItemSet(SwTxtFmtColl* pColl, sal_Bool bSender);
- using Window::GetParent;
- SwEnvDlg *GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();}
+ SwEnvDlg *GetParentSwEnvDlg() {return (SwEnvDlg*) GetParentDialog();}
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 5a397b7..dc9b393 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -81,7 +81,7 @@ void SwEnvPreview::Paint(const Rectangle &)
const StyleSettings& rSettings = GetSettings().GetStyleSettings();
const SwEnvItem& rItem =
- ((SwEnvDlg*) GetParent()->GetParent()->GetParent())->aEnvItem;
+ ((SwEnvDlg*) GetParentDialog())->aEnvItem;
sal_uInt16 nPageW = (sal_uInt16) Max(rItem.lWidth, rItem.lHeight),
nPageH = (sal_uInt16) Min(rItem.lWidth, rItem.lHeight);
@@ -220,7 +220,7 @@ SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet) :
{
FreeResource();
SetExchangeSupport();
- pSh = GetParent()->pSh;
+ pSh = GetParentSwEnvDlg()->pSh;
// Install handlers
aDatabaseLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl ));
@@ -279,7 +279,7 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl)
IMPL_LINK_NOARG(SwEnvPage, SenderHdl)
{
const sal_Bool bEnable = aSenderBox.IsChecked();
- GetParent()->aEnvItem.bSend = bEnable;
+ GetParentSwEnvDlg()->aEnvItem.bSend = bEnable;
aSenderEdit.Enable(bEnable);
if ( bEnable )
{
@@ -324,13 +324,13 @@ SfxTabPage* SwEnvPage::Create(Window* pParent, const SfxItemSet& rSet)
void SwEnvPage::ActivatePage(const SfxItemSet& rSet)
{
SfxItemSet aSet(rSet);
- aSet.Put(GetParent()->aEnvItem);
+ aSet.Put(GetParentSwEnvDlg()->aEnvItem);
Reset(aSet);
}
int SwEnvPage::DeactivatePage(SfxItemSet* _pSet)
{
- FillItem(GetParent()->aEnvItem);
+ FillItem(GetParentSwEnvDlg()->aEnvItem);
if( _pSet )
FillItemSet(*_pSet);
return SfxTabPage::LEAVE_PAGE;
@@ -345,8 +345,8 @@ void SwEnvPage::FillItem(SwEnvItem& rItem)
sal_Bool SwEnvPage::FillItemSet(SfxItemSet& rSet)
{
- FillItem(GetParent()->aEnvItem);
- rSet.Put(GetParent()->aEnvItem);
+ FillItem(GetParentSwEnvDlg()->aEnvItem);
+ rSet.Put(GetParentSwEnvDlg()->aEnvItem);
return sal_True;
}
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index dd4127a..b9dbebe 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -174,8 +174,8 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem)
sal_Bool SwEnvPrtPage::FillItemSet(SfxItemSet& rSet)
{
- FillItem(GetParent()->aEnvItem);
- rSet.Put(GetParent()->aEnvItem);
+ FillItem(GetParentSwEnvDlg()->aEnvItem);
+ rSet.Put(GetParentSwEnvDlg()->aEnvItem);
return sal_True;
}
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 4dd2912..357a46e 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -69,8 +69,7 @@ class SwEnvPrtPage : public SfxTabPage
DECL_LINK(AlignHdl, void *);
DECL_LINK( ButtonHdl, Button * );
- using Window::GetParent;
- SwEnvDlg* GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();}
+ SwEnvDlg* GetParentSwEnvDlg() {return (SwEnvDlg*) GetParentDialog();}
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 473e7e7..6f878e6 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -280,10 +280,10 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) :
size_t nLstGroup = 0;
- const sal_uInt16 nCount = (sal_uInt16)GetParent()->Makes().size();
+ const sal_uInt16 nCount = (sal_uInt16)GetParentSwLabDlg()->Makes().size();
for(size_t i = 0; i < nCount; ++i)
{
- rtl::OUString& rStr = GetParent()->Makes()[i];
+ rtl::OUString& rStr = GetParentSwLabDlg()->Makes()[i];
aMakeBox.InsertEntry( rStr );
if ( rStr == aItem.aLstMake)
@@ -364,7 +364,7 @@ IMPL_LINK( SwLabPage, DatabaseHdl, ListBox *, pListBox )
{
sActDBName = aDatabaseLB.GetSelectEntry();
- WaitObject aObj( GetParent() );
+ WaitObject aObj( GetParentSwLabDlg() );
if (pListBox == &aDatabaseLB)
GetNewDBMgr()->GetTableNames(&aTableLB, sActDBName);
@@ -401,32 +401,32 @@ IMPL_LINK_NOARG_INLINE_END(SwLabPage, PageHdl)
IMPL_LINK_NOARG(SwLabPage, MakeHdl)
{
- WaitObject aWait( GetParent() );
+ WaitObject aWait( GetParentSwLabDlg() );
aTypeBox.Clear();
aHiddenSortTypeBox.Clear();
- GetParent()->TypeIds().clear();
+ GetParentSwLabDlg()->TypeIds().clear();
const String aMake = aMakeBox.GetSelectEntry();
- GetParent()->ReplaceGroup( aMake );
+ GetParentSwLabDlg()->ReplaceGroup( aMake );
aItem.aLstMake = aMake;
const sal_Bool bCont = aContButton.IsChecked();
- const sal_uInt16 nCount = GetParent()->Recs().size();
+ const sal_uInt16 nCount = GetParentSwLabDlg()->Recs().size();
sal_uInt16 nLstType = 0;
const String sCustom(SW_RES(STR_CUSTOM));
//insert the entries into the sorted list box
for ( sal_uInt16 i = 0; i < nCount; ++i )
{
- const String aType ( GetParent()->Recs()[i]->aType );
+ const String aType ( GetParentSwLabDlg()->Recs()[i]->aType );
sal_Bool bInsert = sal_False;
- if ( GetParent()->Recs()[i]->aType == sCustom )
+ if ( GetParentSwLabDlg()->Recs()[i]->aType == sCustom )
{
bInsert = sal_True;
aTypeBox.InsertEntry(aType );
}
- else if ( GetParent()->Recs()[i]->bCont == bCont )
+ else if ( GetParentSwLabDlg()->Recs()[i]->bCont == bCont )
{
if ( aHiddenSortTypeBox.GetEntryPos(aType) == LISTBOX_ENTRY_NOTFOUND )
{
@@ -436,9 +436,9 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl)
}
if(bInsert)
{
- GetParent()->TypeIds().push_back(i);
+ GetParentSwLabDlg()->TypeIds().push_back(i);
if ( !nLstType && aType == String(aItem.aLstType) )
- nLstType = GetParent()->TypeIds().size();
+ nLstType = GetParentSwLabDlg()->TypeIds().size();
}
}
for(sal_uInt16 nEntry = 0; nEntry < aHiddenSortTypeBox.GetEntryCount(); nEntry++)
@@ -496,7 +496,7 @@ SwLabRec* SwLabPage::GetSelectedEntryPos()
{
String sSelEntry(aTypeBox.GetSelectEntry());
- return GetParent()->GetRecord(sSelEntry, aContButton.IsChecked());
+ return GetParentSwLabDlg()->GetRecord(sSelEntry, aContButton.IsChecked());
}
void SwLabPage::InitDatabaseBox()
@@ -573,7 +573,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet)
aAddrBox .Check ( aItem.bAddr );
aWritingEdit.SetText ( aWriting );
- for(std::vector<rtl::OUString>::const_iterator i = GetParent()->Makes().begin(); i != GetParent()->Makes().end(); ++i)
+ for(std::vector<rtl::OUString>::const_iterator i = GetParentSwLabDlg()->Makes().begin(); i != GetParentSwLabDlg()->Makes().end(); ++i)
{
if(aMakeBox.GetEntryPos(String(*i)) == LISTBOX_ENTRY_NOTFOUND)
aMakeBox.InsertEntry(*i);
@@ -586,7 +586,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet)
aItem.aType = sType;
//#102806# a newly added make may not be in the type ListBox already
if (aTypeBox.GetEntryPos(String(aItem.aType)) == LISTBOX_ENTRY_NOTFOUND && !aItem.aMake.isEmpty())
- GetParent()->UpdateGroup( aItem.aMake );
+ GetParentSwLabDlg()->UpdateGroup( aItem.aMake );
if (aTypeBox.GetEntryPos(String(aItem.aType)) != LISTBOX_ENTRY_NOTFOUND)
{
aTypeBox.SelectEntry(aItem.aType);
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 139823a..5a8e835 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -510,7 +510,7 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem)
{
rItem.aMake = rItem.aType = SW_RESSTR(STR_CUSTOM);
- SwLabRec& rRec = *GetParent()->Recs()[0];
+ SwLabRec& rRec = *GetParentSwLabDlg()->Recs()[0];
rItem.lHDist = rRec.lHDist = static_cast< long >(GETFLDVAL(aHDistField ));
rItem.lVDist = rRec.lVDist = static_cast< long >(GETFLDVAL(aVDistField ));
rItem.lWidth = rRec.lWidth = static_cast< long >(GETFLDVAL(aWidthField ));
@@ -535,7 +535,7 @@ sal_Bool SwLabFmtPage::FillItemSet(SfxItemSet& rSet)
void SwLabFmtPage::Reset(const SfxItemSet& )
{
// Initialise fields
- GetParent()->GetLabItem(aItem);
+ GetParentSwLabDlg()->GetLabItem(aItem);
aHDistField .SetMax(100 * aItem.lHDist , FUNIT_TWIP);
aVDistField .SetMax(100 * aItem.lVDist , FUNIT_TWIP);
@@ -585,8 +585,8 @@ IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl)
if(pSaveDlg->GetLabel(aItem))
{
bModified = sal_False;
- const Sequence<OUString>& rMan = GetParent()->GetLabelsConfig().GetManufacturers();
- std::vector<rtl::OUString>& rMakes(GetParent()->Makes());
+ const Sequence<OUString>& rMan = GetParentSwLabDlg()->GetLabelsConfig().GetManufacturers();
+ std::vector<rtl::OUString>& rMakes(GetParentSwLabDlg()->Makes());
if(rMakes.size() < (sal_uInt16)rMan.getLength())
{
rMakes.clear();
@@ -626,7 +626,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) :
aMakeCB.SetModifyHdl(aLk);
aTypeED.SetModifyHdl(aLk);
- SwLabelConfig& rCfg = pLabPage->GetParent()->GetLabelsConfig();
+ SwLabelConfig& rCfg = pLabPage->GetParentSwLabDlg()->GetLabelsConfig();
const Sequence<OUString>& rMan = rCfg.GetManufacturers();
const OUString* pMan = rMan.getConstArray();
for(sal_Int32 i = 0; i < rMan.getLength(); i++)
@@ -635,7 +635,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) :
IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl)
{
- SwLabelConfig& rCfg = pLabPage->GetParent()->GetLabelsConfig();
+ SwLabelConfig& rCfg = pLabPage->GetParentSwLabDlg()->GetLabelsConfig();
String sMake(aMakeCB.GetText());
String sType(aTypeED.GetText());
if(rCfg.HasLabel(sMake, sType))
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index d31bf82..d15e99a 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -132,7 +132,6 @@ class SwLabFmtPage : public SfxTabPage
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
- using Window::GetParent;
public:
@@ -144,7 +143,7 @@ public:
virtual sal_Bool FillItemSet(SfxItemSet& rSet);
virtual void Reset(const SfxItemSet& rSet);
- SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();}
+ SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*)GetParentDialog();}
};
class SwSaveLabelDlg : public ModalDialog
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 07cd90e..343fec9 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -142,7 +142,7 @@ void SwLabPrtPage::FillItem(SwLabItem& rItem)
sal_Bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet)
{
SwLabItem aItem;
- GetParent()->GetLabItem(aItem);
+ GetParentSwLabDlg()->GetLabItem(aItem);
FillItem(aItem);
rSet.Put(aItem);
@@ -152,7 +152,7 @@ sal_Bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet)
void SwLabPrtPage::Reset(const SfxItemSet& )
{
SwLabItem aItem;
- GetParent()->GetLabItem(aItem);
+ GetParentSwLabDlg()->GetLabItem(aItem);
aColField.SetValue (aItem.nCol);
aRowField.SetValue (aItem.nRow);
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 23f163d..d016b0e 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -62,8 +62,7 @@ class SwLabPrtPage : public SfxTabPage
DECL_LINK( CountHdl, Button * );
- using Window::GetParent;
- SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();}
+ SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*)GetParentDialog();}
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 006555b..60adf57 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -76,7 +76,6 @@ class SwLabPage : public SfxTabPage
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
- using Window::GetParent;
public:
@@ -88,7 +87,7 @@ public:
virtual sal_Bool FillItemSet(SfxItemSet& rSet);
virtual void Reset(const SfxItemSet& rSet);
- SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();}
+ SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*) GetParentDialog();}
void SetToBusinessCard();
diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx
index 50dd3dd..657548e 100644
--- a/sw/source/ui/inc/envlop.hxx
+++ b/sw/source/ui/inc/envlop.hxx
@@ -115,8 +115,7 @@ class SwEnvPage : public SfxTabPage
void InitDatabaseBox();
- using Window::GetParent;
- SwEnvDlg* GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();}
+ SwEnvDlg* GetParentSwEnvDlg() {return (SwEnvDlg*)GetParentDialog();}
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index f9c7db8..1bf5c7a 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3425,12 +3425,6 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
pCtrl = *(aControlList.rbegin());
aRightScrollWin.Enable((pCtrl->GetPosPixel().X() + pCtrl->GetSizePixel().Width()) > nSpace);
-
-#if OSL_DEBUG_LEVEL > 1
- sMessage.AppendAscii("Move: ");
- sMessage += String::CreateFromInt32(nMove);
- GetParent()->GetParent()->GetParent()->SetText(sMessage);
-#endif
}
return 0;
More information about the Libreoffice-commits
mailing list