[Libreoffice-commits] core.git: 4 commits - sw/inc sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Nov 9 22:49:22 PST 2015
sw/inc/SwStyleNameMapper.hxx | 68 +--
sw/inc/tblafmt.hxx | 162 +++----
sw/source/core/bastyp/init.cxx | 66 +--
sw/source/core/doc/SwStyleNameMapper.cxx | 210 +++++-----
sw/source/core/doc/tblafmt.cxx | 398 +++++++++----------
sw/source/uibase/inc/conttree.hxx | 96 ++--
sw/source/uibase/inc/navipi.hxx | 84 ++--
sw/source/uibase/utlui/content.cxx | 646 +++++++++++++++----------------
sw/source/uibase/utlui/glbltree.cxx | 10
sw/source/uibase/utlui/navipi.cxx | 574 +++++++++++++--------------
10 files changed, 1157 insertions(+), 1157 deletions(-)
New commits:
commit b2831b5bb26ae8cbb2b1796f390e1b1b90eb4202
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Nov 10 07:48:22 2015 +0100
sw: prefix members of SwNavigationPI
Change-Id: I801c9c93921719955431716c6e56e79eed529800
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index b2d07e8..5d74116 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -57,45 +57,45 @@ class SwNavigationPI : public vcl::Window,
friend class SwContentTree;
friend class SwGlobalTree;
- VclPtr<SwNavHelpToolBox> aContentToolBox;
- VclPtr<SwHelpToolBox> aGlobalToolBox;
- ImageList aContentImageList;
- VclPtr<SwContentTree> aContentTree;
- VclPtr<SwGlobalTree> aGlobalTree;
- VclPtr<ListBox> aDocListBox;
- Idle aPageChgIdle;
- OUString sContentFileName;
- OUString aContextArr[3];
- OUString aStatusArr[4];
- Point aBoxBottomLeft; // Pos when Box is at bottom
-
- SfxObjectShellLock *pxObjectShell;
- SwView *pContentView;
- SwWrtShell *pContentWrtShell;
- SwView *pActContView;
- SwView *pCreateView;
- VclPtr<SfxPopupWindow> pPopupWindow;
- VclPtr<SfxPopupWindow> pFloatingWindow;
-
- SfxChildWindowContext* pContextWin;
-
- SwNavigationConfig *pConfig;
- SfxBindings &rBindings;
-
- long nDocLBIniHeight;
- long nWishWidth;
- sal_uInt16 nAutoMarkIdx;
- RegionMode nRegionMode; // 0 - URL, 1 - region with link 2 - region without link
- short nZoomIn;
- short nZoomOutInit;
- short nZoomOut;
-
- bool bSmallMode : 1;
- bool bIsZoomedIn : 1;
- bool bPageCtrlsVisible : 1;
- bool bGlobalMode : 1;
-
- bool _IsZoomedIn() const {return bIsZoomedIn;}
+ VclPtr<SwNavHelpToolBox> m_aContentToolBox;
+ VclPtr<SwHelpToolBox> m_aGlobalToolBox;
+ ImageList m_aContentImageList;
+ VclPtr<SwContentTree> m_aContentTree;
+ VclPtr<SwGlobalTree> m_aGlobalTree;
+ VclPtr<ListBox> m_aDocListBox;
+ Idle m_aPageChgIdle;
+ OUString m_sContentFileName;
+ OUString m_aContextArr[3];
+ OUString m_aStatusArr[4];
+ Point m_aBoxBottomLeft; // Pos when Box is at bottom
+
+ SfxObjectShellLock *m_pxObjectShell;
+ SwView *m_pContentView;
+ SwWrtShell *m_pContentWrtShell;
+ SwView *m_pActContView;
+ SwView *m_pCreateView;
+ VclPtr<SfxPopupWindow> m_pPopupWindow;
+ VclPtr<SfxPopupWindow> m_pFloatingWindow;
+
+ SfxChildWindowContext* m_pContextWin;
+
+ SwNavigationConfig *m_pConfig;
+ SfxBindings &m_rBindings;
+
+ long m_nDocLBIniHeight;
+ long m_nWishWidth;
+ sal_uInt16 m_nAutoMarkIdx;
+ RegionMode m_nRegionMode; // 0 - URL, 1 - region with link 2 - region without link
+ short m_nZoomIn;
+ short m_nZoomOutInit;
+ short m_nZoomOut;
+
+ bool m_bSmallMode : 1;
+ bool m_bIsZoomedIn : 1;
+ bool m_bPageCtrlsVisible : 1;
+ bool m_bGlobalMode : 1;
+
+ bool _IsZoomedIn() const {return m_bIsZoomedIn;}
void _ZoomOut();
void _ZoomIn();
@@ -132,7 +132,7 @@ protected:
NumEditAction& GetPageEdit();
bool ToggleTree();
- void SetGlobalMode(bool bSet) {bGlobalMode = bSet;}
+ void SetGlobalMode(bool bSet) {m_bGlobalMode = bSet;}
public:
@@ -151,14 +151,14 @@ public:
static OUString CreateDropFileName( TransferableDataHelper& rData );
static OUString CleanEntry(const OUString& rEntry);
- RegionMode GetRegionDropMode() const {return nRegionMode;}
+ RegionMode GetRegionDropMode() const {return m_nRegionMode;}
void SetRegionDropMode(RegionMode nNewMode);
sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
bool IsGlobalDoc() const;
- bool IsGlobalMode() const {return bGlobalMode;}
+ bool IsGlobalMode() const {return m_bGlobalMode;}
SwView* GetCreateView() const;
void CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, vcl::Window *pParent);
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 0fe792d..88c84a7 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1598,11 +1598,11 @@ void SwContentTree::Display( bool bActive )
m_bIsLastReadOnly = bReadOnly;
bool bDisable = pShell == 0 || bReadOnly;
SwNavigationPI* pNavi = GetParentWindow();
- pNavi->aContentToolBox->EnableItem(FN_ITEM_UP , !bDisable);
- pNavi->aContentToolBox->EnableItem(FN_ITEM_DOWN, !bDisable);
- pNavi->aContentToolBox->EnableItem(FN_ITEM_LEFT, !bDisable);
- pNavi->aContentToolBox->EnableItem(FN_ITEM_RIGHT, !bDisable);
- pNavi->aContentToolBox->EnableItem(FN_SELECT_SET_AUTO_BOOKMARK, !bDisable);
+ pNavi->m_aContentToolBox->EnableItem(FN_ITEM_UP , !bDisable);
+ pNavi->m_aContentToolBox->EnableItem(FN_ITEM_DOWN, !bDisable);
+ pNavi->m_aContentToolBox->EnableItem(FN_ITEM_LEFT, !bDisable);
+ pNavi->m_aContentToolBox->EnableItem(FN_ITEM_RIGHT, !bDisable);
+ pNavi->m_aContentToolBox->EnableItem(FN_SELECT_SET_AUTO_BOOKMARK, !bDisable);
}
if(pShell)
{
@@ -1927,7 +1927,7 @@ bool SwContentTree::ToggleToRoot()
}
}
m_pConfig->SetRootType( m_nRootType );
- GetParentWindow()->aContentToolBox->CheckItem(FN_SHOW_ROOT, m_bIsRoot);
+ GetParentWindow()->m_aContentToolBox->CheckItem(FN_SHOW_ROOT, m_bIsRoot);
return m_bIsRoot;
}
@@ -3048,10 +3048,10 @@ bool SwContentTree::Select( SvTreeListEntry* pEntry, bool bSelect )
}
}
SwNavigationPI* pNavi = GetParentWindow();
- pNavi->aContentToolBox->EnableItem(FN_ITEM_UP , bEnable);
- pNavi->aContentToolBox->EnableItem(FN_ITEM_DOWN, bEnable);
- pNavi->aContentToolBox->EnableItem(FN_ITEM_LEFT, bEnable);
- pNavi->aContentToolBox->EnableItem(FN_ITEM_RIGHT,bEnable);
+ pNavi->m_aContentToolBox->EnableItem(FN_ITEM_UP , bEnable);
+ pNavi->m_aContentToolBox->EnableItem(FN_ITEM_DOWN, bEnable);
+ pNavi->m_aContentToolBox->EnableItem(FN_ITEM_LEFT, bEnable);
+ pNavi->m_aContentToolBox->EnableItem(FN_ITEM_RIGHT,bEnable);
return SvTreeListBox::Select(pEntry, bSelect);
}
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 1c43dd4..d9b6ade 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -516,12 +516,12 @@ void SwGlobalTree::SelectHdl()
SwNavigationPI* pNavi = GetParentWindow();
bool bReadonly = !pActiveShell ||
pActiveShell->GetView().GetDocShell()->IsReadOnly();
- pNavi->aGlobalToolBox->EnableItem(FN_GLOBAL_EDIT, nSelCount == 1 && !bReadonly);
- pNavi->aGlobalToolBox->EnableItem(FN_GLOBAL_OPEN, nSelCount <= 1 && !bReadonly);
- pNavi->aGlobalToolBox->EnableItem(FN_GLOBAL_UPDATE, GetEntryCount() > 0 && !bReadonly);
- pNavi->aGlobalToolBox->EnableItem(FN_ITEM_UP,
+ pNavi->m_aGlobalToolBox->EnableItem(FN_GLOBAL_EDIT, nSelCount == 1 && !bReadonly);
+ pNavi->m_aGlobalToolBox->EnableItem(FN_GLOBAL_OPEN, nSelCount <= 1 && !bReadonly);
+ pNavi->m_aGlobalToolBox->EnableItem(FN_GLOBAL_UPDATE, GetEntryCount() > 0 && !bReadonly);
+ pNavi->m_aGlobalToolBox->EnableItem(FN_ITEM_UP,
nSelCount == 1 && nAbsPos && !bReadonly);
- pNavi->aGlobalToolBox->EnableItem(FN_ITEM_DOWN,
+ pNavi->m_aGlobalToolBox->EnableItem(FN_ITEM_DOWN,
nSelCount == 1 && nAbsPos < GetEntryCount() - 1 && !bReadonly);
}
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index b4997d0..8f29a40 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -136,13 +136,13 @@ IMPL_LINK_TYPED( SwNavigationPI, DocListBoxSelectHdl, ListBox&, rBox, void )
if(!pView)
{
nEntryIdx == 0 ?
- aContentTree->ShowHiddenShell():
- aContentTree->ShowActualView();
+ m_aContentTree->ShowHiddenShell():
+ m_aContentTree->ShowActualView();
}
else
{
- aContentTree->SetConstantShell(pView->GetWrtShellPtr());
+ m_aContentTree->SetConstantShell(pView->GetWrtShellPtr());
}
}
@@ -151,26 +151,26 @@ IMPL_LINK_TYPED( SwNavigationPI, DocListBoxSelectHdl, ListBox&, rBox, void )
void SwNavigationPI::FillBox()
{
- if(pContentWrtShell)
+ if(m_pContentWrtShell)
{
- aContentTree->SetHiddenShell( pContentWrtShell );
- aContentTree->Display( false );
+ m_aContentTree->SetHiddenShell( m_pContentWrtShell );
+ m_aContentTree->Display( false );
}
else
{
SwView *pView = GetCreateView();
if(!pView)
{
- aContentTree->SetActiveShell(0);
+ m_aContentTree->SetActiveShell(0);
}
- else if( pView != pActContView)
+ else if( pView != m_pActContView)
{
SwWrtShell* pWrtShell = pView->GetWrtShellPtr();
- aContentTree->SetActiveShell(pWrtShell);
+ m_aContentTree->SetActiveShell(pWrtShell);
}
else
- aContentTree->Display( true );
- pActContView = pView;
+ m_aContentTree->Display( true );
+ m_pActContView = pView;
}
}
@@ -222,12 +222,12 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void )
break;
case FN_SHOW_ROOT:
{
- aContentTree->ToggleToRoot();
+ m_aContentTree->ToggleToRoot();
}
break;
case FN_SHOW_CONTENT_BOX:
case FN_SELECT_CONTENT:
- if(pContextWin!=NULL && pContextWin->GetFloatingWindow()!=NULL)
+ if(m_pContextWin!=NULL && m_pContextWin->GetFloatingWindow()!=NULL)
{
if(_IsZoomedIn() )
{
@@ -305,15 +305,15 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void )
case FN_GLOBAL_EDIT:
{
if(IsGlobalMode())
- aGlobalTree->ExecCommand(nCurrItemId);
+ m_aGlobalTree->ExecCommand(nCurrItemId);
else
- aContentTree->ExecCommand(nCurrItemId, bOutlineWithChildren);
+ m_aContentTree->ExecCommand(nCurrItemId, bOutlineWithChildren);
}
break;
case FN_GLOBAL_SWITCH:
{
ToggleTree();
- pConfig->SetGlobalActive(IsGlobalMode());
+ m_pConfig->SetGlobalActive(IsGlobalMode());
}
break;
case FN_GLOBAL_SAVE_CONTENT:
@@ -342,7 +342,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox, void )
case FN_GLOBAL_UPDATE:
case FN_GLOBAL_OPEN:
{
- aGlobalTree->TbxMenuHdl(nCurrItemId, pBox);
+ m_aGlobalTree->TbxMenuHdl(nCurrItemId, pBox);
}
break;
}
@@ -370,10 +370,10 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void )
std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
for (sal_uInt16 i = 0; i <= static_cast<sal_uInt16>(RegionMode::EMBEDDED); i++)
{
- pMenu->InsertItem( i + 1, aContextArr[i] );
+ pMenu->InsertItem( i + 1, m_aContextArr[i] );
pMenu->SetHelpId(i + 1, aHIDs[i]);
}
- pMenu->CheckItem( static_cast<int>(nRegionMode) + 1 );
+ pMenu->CheckItem( static_cast<int>(m_nRegionMode) + 1 );
pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl));
pBox->SetItemDown( nCurrItemId, true );
pMenu->Execute( pBox,
@@ -393,7 +393,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void )
pMenu->InsertItem( i, OUString::number(i - 100) );
pMenu->SetHelpId( i, HID_NAVI_OUTLINES );
}
- pMenu->CheckItem( aContentTree->GetOutlineLevel() + 100 );
+ pMenu->CheckItem( m_aContentTree->GetOutlineLevel() + 100 );
pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl));
pBox->SetItemDown( nCurrItemId, true );
pMenu->Execute( pBox,
@@ -430,7 +430,7 @@ void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, bool bSetFocus
Rectangle aRect(rRect);
Point aT1 = aRect.TopLeft();
- aT1 = pPopup->GetParent()->OutputToScreenPixel(pPopup->GetParent()->AbsoluteScreenToOutputPixel(aContentToolBox->OutputToAbsoluteScreenPixel(aT1)));
+ aT1 = pPopup->GetParent()->OutputToScreenPixel(pPopup->GetParent()->AbsoluteScreenToOutputPixel(m_aContentToolBox->OutputToAbsoluteScreenPixel(aT1)));
aRect.SetPos(aT1);
pPopup->StartPopupMode(aRect, FloatWinPopupFlags::Right|FloatWinPopupFlags::AllowTearOff);
SetPopupWindow( pPopup );
@@ -459,11 +459,11 @@ IMPL_LINK_TYPED( SwNavigationPI, EditAction, NumEditAction&, rEdit, void )
SwView *pView = GetCreateView();
if (pView)
{
- if(aPageChgIdle.IsActive())
- aPageChgIdle.Stop();
- pCreateView->GetWrtShell().GotoPage((sal_uInt16)rEdit.GetValue(), true);
- pCreateView->GetEditWin().GrabFocus();
- pCreateView->GetViewFrame()->GetBindings().Invalidate(FN_STAT_PAGE);
+ if(m_aPageChgIdle.IsActive())
+ m_aPageChgIdle.Stop();
+ m_pCreateView->GetWrtShell().GotoPage((sal_uInt16)rEdit.GetValue(), true);
+ m_pCreateView->GetEditWin().GrabFocus();
+ m_pCreateView->GetViewFrame()->GetBindings().Invalidate(FN_STAT_PAGE);
}
}
@@ -503,18 +503,18 @@ void SwNavigationPI::MakeMark()
// nAutoMarkIdx rotates through the available MarkNames
// this assumes that IDocumentMarkAccess generates Names in ascending order
if(vNavMarkNames.size() == MAX_MARKS)
- pMarkAccess->deleteMark(pMarkAccess->findMark(vNavMarkNames[nAutoMarkIdx]));
+ pMarkAccess->deleteMark(pMarkAccess->findMark(vNavMarkNames[m_nAutoMarkIdx]));
rSh.SetBookmark(vcl::KeyCode(), OUString(), OUString(), IDocumentMarkAccess::MarkType::NAVIGATOR_REMINDER);
- SwView::SetActMark( nAutoMarkIdx );
+ SwView::SetActMark( m_nAutoMarkIdx );
- if(++nAutoMarkIdx == MAX_MARKS)
- nAutoMarkIdx = 0;
+ if(++m_nAutoMarkIdx == MAX_MARKS)
+ m_nAutoMarkIdx = 0;
}
void SwNavigationPI::GotoPage()
{
- if (pContextWin && pContextWin->GetFloatingWindow() && pContextWin->GetFloatingWindow()->IsRollUp())
+ if (m_pContextWin && m_pContextWin->GetFloatingWindow() && m_pContextWin->GetFloatingWindow()->IsRollUp())
_ZoomIn();
if(IsGlobalMode())
ToggleTree();
@@ -526,59 +526,59 @@ void SwNavigationPI::_ZoomOut()
{
if (_IsZoomedIn())
{
- FloatingWindow* pFloat = pContextWin!=NULL ? pContextWin->GetFloatingWindow() : NULL;
- bIsZoomedIn = false;
+ FloatingWindow* pFloat = m_pContextWin!=NULL ? m_pContextWin->GetFloatingWindow() : NULL;
+ m_bIsZoomedIn = false;
Size aSz(GetOutputSizePixel());
- aSz.Height() = nZoomOut;
+ aSz.Height() = m_nZoomOut;
Size aMinOutSizePixel = static_cast<SfxDockingWindow*>(GetParent())->GetMinOutputSizePixel();
static_cast<SfxDockingWindow*>(GetParent())->SetMinOutputSizePixel(Size(
- aMinOutSizePixel.Width(),nZoomOutInit));
+ aMinOutSizePixel.Width(),m_nZoomOutInit));
if (pFloat != NULL)
pFloat->SetOutputSizePixel(aSz);
FillBox();
if(IsGlobalMode())
{
- aGlobalTree->ShowTree();
+ m_aGlobalTree->ShowTree();
}
else
{
- aContentTree->ShowTree();
- aDocListBox->Show();
+ m_aContentTree->ShowTree();
+ m_aDocListBox->Show();
}
- SvTreeListEntry* pFirst = aContentTree->FirstSelected();
+ SvTreeListEntry* pFirst = m_aContentTree->FirstSelected();
if(pFirst)
- aContentTree->Select(pFirst); // Enable toolbox
- pConfig->SetSmall( false );
- aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX);
+ m_aContentTree->Select(pFirst); // Enable toolbox
+ m_pConfig->SetSmall( false );
+ m_aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX);
}
}
void SwNavigationPI::_ZoomIn()
{
- if (pContextWin != NULL)
+ if (m_pContextWin != NULL)
{
- FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
+ FloatingWindow* pFloat = m_pContextWin->GetFloatingWindow();
if (pFloat &&
- (!_IsZoomedIn() || ( pContextWin->GetFloatingWindow()->IsRollUp())))
+ (!_IsZoomedIn() || ( m_pContextWin->GetFloatingWindow()->IsRollUp())))
{
- aContentTree->HideTree();
- aDocListBox->Hide();
- aGlobalTree->HideTree();
- bIsZoomedIn = true;
+ m_aContentTree->HideTree();
+ m_aDocListBox->Hide();
+ m_aGlobalTree->HideTree();
+ m_bIsZoomedIn = true;
Size aSz(GetOutputSizePixel());
- if( aSz.Height() > nZoomIn )
- nZoomOut = ( short ) aSz.Height();
+ if( aSz.Height() > m_nZoomIn )
+ m_nZoomOut = ( short ) aSz.Height();
- aSz.Height() = nZoomIn;
+ aSz.Height() = m_nZoomIn;
Size aMinOutSizePixel = static_cast<SfxDockingWindow*>(GetParent())->GetMinOutputSizePixel();
static_cast<SfxDockingWindow*>(GetParent())->SetMinOutputSizePixel(Size(
aMinOutSizePixel.Width(), aSz.Height()));
pFloat->SetOutputSizePixel(aSz);
- SvTreeListEntry* pFirst = aContentTree->FirstSelected();
+ SvTreeListEntry* pFirst = m_aContentTree->FirstSelected();
if(pFirst)
- aContentTree->Select(pFirst); // Enable toolbox
- pConfig->SetSmall( true );
- aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX, false);
+ m_aContentTree->Select(pFirst); // Enable toolbox
+ m_pConfig->SetSmall( true );
+ m_aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX, false);
}
}
}
@@ -599,8 +599,8 @@ void SwNavigationPI::Resize()
if( pFloat)
{
aNewSize = pFloat->GetOutputSizePixel();
- aMinOutSizePixel.Width() = nWishWidth;
- aMinOutSizePixel.Height() = _IsZoomedIn() ? nZoomIn : nZoomOutInit;
+ aMinOutSizePixel.Width() = m_nWishWidth;
+ aMinOutSizePixel.Height() = _IsZoomedIn() ? m_nZoomIn : m_nZoomOutInit;
}
else
{
@@ -610,25 +610,25 @@ void SwNavigationPI::Resize()
pDockingParent->SetMinOutputSizePixel(aMinOutSizePixel);
}
- const Point aPos = aContentTree->GetPosPixel();
- Point aLBPos = aDocListBox->GetPosPixel();
+ const Point aPos = m_aContentTree->GetPosPixel();
+ Point aLBPos = m_aDocListBox->GetPosPixel();
long nDist = aPos.X();
- aNewSize.Height() -= (aPos.Y() + aPos.X() + nDocLBIniHeight + nDist);
+ aNewSize.Height() -= (aPos.Y() + aPos.X() + m_nDocLBIniHeight + nDist);
aNewSize.Width() -= 2 * nDist;
aLBPos.Y() = aPos.Y() + aNewSize.Height() + nDist;
- aDocListBox->Show(!aGlobalTree->IsVisible() && aLBPos.Y() > aPos.Y() );
+ m_aDocListBox->Show(!m_aGlobalTree->IsVisible() && aLBPos.Y() > aPos.Y() );
- Size aDocLBSz = aDocListBox->GetSizePixel();
+ Size aDocLBSz = m_aDocListBox->GetSizePixel();
aDocLBSz.Width() = aNewSize.Width();
if(aNewSize.Height() < 0)
aDocLBSz.Height() = 0;
else
- aDocLBSz.Height() = nDocLBIniHeight;
- aContentTree->SetSizePixel(aNewSize);
+ aDocLBSz.Height() = m_nDocLBIniHeight;
+ m_aContentTree->SetSizePixel(aNewSize);
// GlobalTree starts on to the top and goes all the way down.
- aNewSize.Height() += (nDist + nDocLBIniHeight + aPos.Y() - aGlobalTree->GetPosPixel().Y());
- aGlobalTree->SetSizePixel(aNewSize);
- aDocListBox->setPosSizePixel( aLBPos.X(), aLBPos.Y(),
+ aNewSize.Height() += (nDist + m_nDocLBIniHeight + aPos.Y() - m_aGlobalTree->GetPosPixel().Y());
+ m_aGlobalTree->SetSizePixel(aNewSize);
+ m_aDocListBox->setPosSizePixel( aLBPos.X(), aLBPos.Y(),
aDocLBSz.Width(), aDocLBSz.Height(),
PosSizeFlags::X|PosSizeFlags::Y|PosSizeFlags::Width);
}
@@ -641,102 +641,102 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
Window( pParent, SW_RES(DLG_NAVIGATION_PI)),
SfxControllerItem( SID_DOCFULLNAME, *_pBindings ),
- aContentToolBox(VclPtr<SwNavHelpToolBox>::Create(this, SW_RES(TB_CONTENT))),
- aGlobalToolBox(VclPtr<SwHelpToolBox>::Create(this, SW_RES(TB_GLOBAL))),
- aContentImageList(SW_RES(IL_CONTENT)),
- aContentTree(VclPtr<SwContentTree>::Create(this, SW_RES(TL_CONTENT))),
- aGlobalTree(VclPtr<SwGlobalTree>::Create(this, SW_RES(TL_GLOBAL))),
- aDocListBox(VclPtr<ListBox>::Create(this, SW_RES(LB_DOCS))),
-
- pxObjectShell(0),
- pContentView(0),
- pContentWrtShell(0),
- pActContView(0),
- pCreateView(0),
- pPopupWindow(0),
- pFloatingWindow(0),
-
- pContextWin(pCw),
-
- pConfig(SW_MOD()->GetNavigationConfig()),
- rBindings(*_pBindings),
-
- nWishWidth(0),
- nAutoMarkIdx(1),
- nRegionMode(RegionMode::NONE),
-
- bSmallMode(false),
- bIsZoomedIn(false),
- bPageCtrlsVisible(false),
- bGlobalMode(false)
+ m_aContentToolBox(VclPtr<SwNavHelpToolBox>::Create(this, SW_RES(TB_CONTENT))),
+ m_aGlobalToolBox(VclPtr<SwHelpToolBox>::Create(this, SW_RES(TB_GLOBAL))),
+ m_aContentImageList(SW_RES(IL_CONTENT)),
+ m_aContentTree(VclPtr<SwContentTree>::Create(this, SW_RES(TL_CONTENT))),
+ m_aGlobalTree(VclPtr<SwGlobalTree>::Create(this, SW_RES(TL_GLOBAL))),
+ m_aDocListBox(VclPtr<ListBox>::Create(this, SW_RES(LB_DOCS))),
+
+ m_pxObjectShell(0),
+ m_pContentView(0),
+ m_pContentWrtShell(0),
+ m_pActContView(0),
+ m_pCreateView(0),
+ m_pPopupWindow(0),
+ m_pFloatingWindow(0),
+
+ m_pContextWin(pCw),
+
+ m_pConfig(SW_MOD()->GetNavigationConfig()),
+ m_rBindings(*_pBindings),
+
+ m_nWishWidth(0),
+ m_nAutoMarkIdx(1),
+ m_nRegionMode(RegionMode::NONE),
+
+ m_bSmallMode(false),
+ m_bIsZoomedIn(false),
+ m_bPageCtrlsVisible(false),
+ m_bGlobalMode(false)
{
GetCreateView();
InitImageList();
- aContentToolBox->SetHelpId(HID_NAVIGATOR_TOOLBOX );
- aGlobalToolBox->SetHelpId(HID_NAVIGATOR_GLOBAL_TOOLBOX);
- aDocListBox->SetHelpId(HID_NAVIGATOR_LISTBOX );
- aDocListBox->SetDropDownLineCount(9);
+ m_aContentToolBox->SetHelpId(HID_NAVIGATOR_TOOLBOX );
+ m_aGlobalToolBox->SetHelpId(HID_NAVIGATOR_GLOBAL_TOOLBOX);
+ m_aDocListBox->SetHelpId(HID_NAVIGATOR_LISTBOX );
+ m_aDocListBox->SetDropDownLineCount(9);
- nDocLBIniHeight = aDocListBox->GetSizePixel().Height();
- nZoomOutInit = nZoomOut = Resource::ReadShortRes();
+ m_nDocLBIniHeight = m_aDocListBox->GetSizePixel().Height();
+ m_nZoomOutInit = m_nZoomOut = Resource::ReadShortRes();
// Insert the numeric field in the toolbox.
VclPtr<NumEditAction> pEdit = VclPtr<NumEditAction>::Create(
- aContentToolBox.get(), SW_RES(NF_PAGE ));
+ m_aContentToolBox.get(), SW_RES(NF_PAGE ));
pEdit->SetActionHdl(LINK(this, SwNavigationPI, EditAction));
pEdit->SetGetFocusHdl(LINK(this, SwNavigationPI, EditGetFocus));
pEdit->SetAccessibleName(pEdit->GetQuickHelpText());
pEdit->SetUpHdl(LINK(this, SwNavigationPI, PageEditModifyHdl));
pEdit->SetDownHdl(LINK(this, SwNavigationPI, PageEditModifyHdl));
- bPageCtrlsVisible = true;
+ m_bPageCtrlsVisible = true;
// Double separators are not allowed, so you have to
// determine the suitable size differently.
- Rectangle aFirstRect = aContentToolBox->GetItemRect(FN_SELECT_FOOTNOTE);
- Rectangle aSecondRect = aContentToolBox->GetItemRect(FN_SELECT_HEADER);
+ Rectangle aFirstRect = m_aContentToolBox->GetItemRect(FN_SELECT_FOOTNOTE);
+ Rectangle aSecondRect = m_aContentToolBox->GetItemRect(FN_SELECT_HEADER);
Size aItemWinSize( aFirstRect.Left() - aSecondRect.Left(),
aFirstRect.Bottom() - aFirstRect.Top() );
Size aOptimalSize(pEdit->get_preferred_size());
aItemWinSize.Width() = std::max(aItemWinSize.Width(), aOptimalSize.Width());
pEdit->SetSizePixel(aItemWinSize);
- aContentToolBox->InsertSeparator(4);
- aContentToolBox->InsertWindow( FN_PAGENUMBER, pEdit, ToolBoxItemBits::NONE, 4);
- aContentToolBox->InsertSeparator(4);
- aContentToolBox->SetHelpId(FN_PAGENUMBER, HID_NAVI_TBX16);
- aContentToolBox->ShowItem( FN_PAGENUMBER );
+ m_aContentToolBox->InsertSeparator(4);
+ m_aContentToolBox->InsertWindow( FN_PAGENUMBER, pEdit, ToolBoxItemBits::NONE, 4);
+ m_aContentToolBox->InsertSeparator(4);
+ m_aContentToolBox->SetHelpId(FN_PAGENUMBER, HID_NAVI_TBX16);
+ m_aContentToolBox->ShowItem( FN_PAGENUMBER );
for( sal_uInt16 i = 0; i <= static_cast<sal_uInt16>(RegionMode::EMBEDDED); i++ )
{
- aContextArr[i] = SW_RESSTR(STR_HYPERLINK + i);
- aStatusArr[i] = SW_RESSTR(STR_STATUS_FIRST + i);
+ m_aContextArr[i] = SW_RESSTR(STR_HYPERLINK + i);
+ m_aStatusArr[i] = SW_RESSTR(STR_STATUS_FIRST + i);
}
- aStatusArr[3] = SW_RESSTR(STR_ACTIVE_VIEW);
+ m_aStatusArr[3] = SW_RESSTR(STR_ACTIVE_VIEW);
FreeResource();
const Size& rOutSize = GetOutputSizePixel();
- nZoomIn = (short)rOutSize.Height();
+ m_nZoomIn = (short)rOutSize.Height();
// Make sure the toolbox has a size that fits all its contents
- Size aContentToolboxSize( aContentToolBox->CalcWindowSizePixel() );
- aContentToolBox->SetOutputSizePixel( aContentToolboxSize );
+ Size aContentToolboxSize( m_aContentToolBox->CalcWindowSizePixel() );
+ m_aContentToolBox->SetOutputSizePixel( aContentToolboxSize );
// position listbox below toolbar and add some space
- long nListboxYPos = aContentToolBox->GetPosPixel().Y() + aContentToolboxSize.Height() + 4;
+ long nListboxYPos = m_aContentToolBox->GetPosPixel().Y() + aContentToolboxSize.Height() + 4;
// The left and right margins around the toolboxes should be equal.
- nWishWidth = aContentToolboxSize.Width();
- nWishWidth += 2 * aContentToolBox->GetPosPixel().X();
+ m_nWishWidth = aContentToolboxSize.Width();
+ m_nWishWidth += 2 * m_aContentToolBox->GetPosPixel().X();
DockingWindow* pDockingParent = dynamic_cast<DockingWindow*>(pParent);
if (pDockingParent != NULL)
{
FloatingWindow* pFloat = pDockingParent->GetFloatingWindow();
- Size aMinSize(pFloat ? nWishWidth : 0, pFloat ? nZoomOutInit : 0);
+ Size aMinSize(pFloat ? m_nWishWidth : 0, pFloat ? m_nZoomOutInit : 0);
pDockingParent->SetMinOutputSizePixel(aMinSize);
- SetOutputSizePixel( Size( nWishWidth, nZoomOutInit));
+ SetOutputSizePixel( Size( m_nWishWidth, m_nZoomOutInit));
SfxDockingWindow* pSfxDockingParent = dynamic_cast<SfxDockingWindow*>(pParent);
if (pSfxDockingParent != NULL)
@@ -754,84 +754,84 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
}
}
- aContentTree->setPosSizePixel( 0, nListboxYPos, 0, 0, PosSizeFlags::Y );
- aContentTree->SetStyle( aContentTree->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
+ m_aContentTree->setPosSizePixel( 0, nListboxYPos, 0, 0, PosSizeFlags::Y );
+ m_aContentTree->SetStyle( m_aContentTree->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
- aContentTree->SetSpaceBetweenEntries(3);
- aContentTree->SetSelectionMode( SINGLE_SELECTION );
- aContentTree->SetDragDropMode( DragDropMode::CTRL_MOVE |
+ m_aContentTree->SetSpaceBetweenEntries(3);
+ m_aContentTree->SetSelectionMode( SINGLE_SELECTION );
+ m_aContentTree->SetDragDropMode( DragDropMode::CTRL_MOVE |
DragDropMode::CTRL_COPY |
DragDropMode::ENABLE_TOP );
- aContentTree->EnableAsyncDrag(true);
- aContentTree->ShowTree();
- aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX);
+ m_aContentTree->EnableAsyncDrag(true);
+ m_aContentTree->ShowTree();
+ m_aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX);
// TreeListBox for global document
- aGlobalTree->setPosSizePixel( 0, nListboxYPos, 0, 0, PosSizeFlags::Y );
- aGlobalTree->SetSelectionMode( MULTIPLE_SELECTION );
- aGlobalTree->SetStyle( aGlobalTree->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
+ m_aGlobalTree->setPosSizePixel( 0, nListboxYPos, 0, 0, PosSizeFlags::Y );
+ m_aGlobalTree->SetSelectionMode( MULTIPLE_SELECTION );
+ m_aGlobalTree->SetStyle( m_aGlobalTree->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
WB_CLIPCHILDREN|WB_HSCROLL );
- Size aGlblSize(aGlobalToolBox->CalcWindowSizePixel());
- aGlobalToolBox->SetSizePixel(aGlblSize);
+ Size aGlblSize(m_aGlobalToolBox->CalcWindowSizePixel());
+ m_aGlobalToolBox->SetSizePixel(aGlblSize);
// Handler
Link<ToolBox *, void> aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl);
- aContentToolBox->SetSelectHdl( aLk );
- aGlobalToolBox->SetSelectHdl( aLk );
- aDocListBox->SetSelectHdl(LINK(this, SwNavigationPI,
+ m_aContentToolBox->SetSelectHdl( aLk );
+ m_aGlobalToolBox->SetSelectHdl( aLk );
+ m_aDocListBox->SetSelectHdl(LINK(this, SwNavigationPI,
DocListBoxSelectHdl));
- aContentToolBox->SetClickHdl( LINK(this, SwNavigationPI, ToolBoxClickHdl) );
- aContentToolBox->SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) );
- aGlobalToolBox->SetClickHdl( LINK(this, SwNavigationPI, ToolBoxClickHdl) );
- aGlobalToolBox->SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) );
- aGlobalToolBox->CheckItem(FN_GLOBAL_SWITCH);
+ m_aContentToolBox->SetClickHdl( LINK(this, SwNavigationPI, ToolBoxClickHdl) );
+ m_aContentToolBox->SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) );
+ m_aGlobalToolBox->SetClickHdl( LINK(this, SwNavigationPI, ToolBoxClickHdl) );
+ m_aGlobalToolBox->SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) );
+ m_aGlobalToolBox->CheckItem(FN_GLOBAL_SWITCH);
vcl::Font aFont(GetFont());
aFont.SetWeight(WEIGHT_NORMAL);
GetPageEdit().SetFont(aFont);
- aFont = aContentTree->GetFont();
+ aFont = m_aContentTree->GetFont();
aFont.SetWeight(WEIGHT_NORMAL);
- aContentTree->SetFont(aFont);
- aGlobalTree->SetFont(aFont);
+ m_aContentTree->SetFont(aFont);
+ m_aGlobalTree->SetFont(aFont);
StartListening(*SfxGetpApp());
- if ( pCreateView )
- StartListening(*pCreateView);
+ if ( m_pCreateView )
+ StartListening(*m_pCreateView);
SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD());
- pImgMan->RegisterToolBox(aContentToolBox.get(), SfxToolboxFlags::CHANGEOUTSTYLE);
- pImgMan->RegisterToolBox(aGlobalToolBox.get(), SfxToolboxFlags::CHANGEOUTSTYLE);
+ pImgMan->RegisterToolBox(m_aContentToolBox.get(), SfxToolboxFlags::CHANGEOUTSTYLE);
+ pImgMan->RegisterToolBox(m_aGlobalToolBox.get(), SfxToolboxFlags::CHANGEOUTSTYLE);
- aContentToolBox->SetItemBits( FN_CREATE_NAVIGATION, aContentToolBox->GetItemBits( FN_CREATE_NAVIGATION ) | ToolBoxItemBits::DROPDOWNONLY );
- aContentToolBox->SetItemBits( FN_DROP_REGION, aContentToolBox->GetItemBits( FN_DROP_REGION ) | ToolBoxItemBits::DROPDOWNONLY );
- aContentToolBox->SetItemBits( FN_OUTLINE_LEVEL, aContentToolBox->GetItemBits( FN_OUTLINE_LEVEL ) | ToolBoxItemBits::DROPDOWNONLY );
+ m_aContentToolBox->SetItemBits( FN_CREATE_NAVIGATION, m_aContentToolBox->GetItemBits( FN_CREATE_NAVIGATION ) | ToolBoxItemBits::DROPDOWNONLY );
+ m_aContentToolBox->SetItemBits( FN_DROP_REGION, m_aContentToolBox->GetItemBits( FN_DROP_REGION ) | ToolBoxItemBits::DROPDOWNONLY );
+ m_aContentToolBox->SetItemBits( FN_OUTLINE_LEVEL, m_aContentToolBox->GetItemBits( FN_OUTLINE_LEVEL ) | ToolBoxItemBits::DROPDOWNONLY );
if(IsGlobalDoc())
{
SwView *pActView = GetCreateView();
- aGlobalToolBox->CheckItem(FN_GLOBAL_SAVE_CONTENT,
+ m_aGlobalToolBox->CheckItem(FN_GLOBAL_SAVE_CONTENT,
pActView->GetWrtShellPtr()->IsGlblDocSaveLinks());
- if(pConfig->IsGlobalActive())
+ if(m_pConfig->IsGlobalActive())
ToggleTree();
- aGlobalTree->GrabFocus();
+ m_aGlobalTree->GrabFocus();
}
else
- aContentTree->GrabFocus();
+ m_aContentTree->GrabFocus();
UsePage(0);
- aPageChgIdle.SetIdleHdl(LINK(this, SwNavigationPI, ChangePageHdl));
- aPageChgIdle.SetPriority(SchedulerPriority::LOWEST);
+ m_aPageChgIdle.SetIdleHdl(LINK(this, SwNavigationPI, ChangePageHdl));
+ m_aPageChgIdle.SetPriority(SchedulerPriority::LOWEST);
- aContentTree->SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_CONTENT));
- aGlobalTree->SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_GLOBAL));
- aDocListBox->SetAccessibleName(aStatusArr[3]);
+ m_aContentTree->SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_CONTENT));
+ m_aGlobalTree->SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_GLOBAL));
+ m_aDocListBox->SetAccessibleName(m_aStatusArr[3]);
- if (pContextWin == NULL)
+ if (m_pContextWin == NULL)
{
// When the context window is missing then the navigator is
// displayed in the sidebar. While the navigator could change
// its size, the sidebar can not, and the navigator would just
// waste space. Therefore hide this button.
- aContentToolBox->RemoveItem(aContentToolBox->GetItemPos(FN_SHOW_CONTENT_BOX));
+ m_aContentToolBox->RemoveItem(m_aContentToolBox->GetItemPos(FN_SHOW_CONTENT_BOX));
}
}
@@ -853,29 +853,29 @@ void SwNavigationPI::dispose()
EndListening(*SfxGetpApp());
SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD());
- pImgMan->ReleaseToolBox(aContentToolBox.get());
- pImgMan->ReleaseToolBox(aGlobalToolBox.get());
- aContentToolBox->GetItemWindow(FN_PAGENUMBER)->disposeOnce();
- aContentToolBox->Clear();
- if(pxObjectShell)
+ pImgMan->ReleaseToolBox(m_aContentToolBox.get());
+ pImgMan->ReleaseToolBox(m_aGlobalToolBox.get());
+ m_aContentToolBox->GetItemWindow(FN_PAGENUMBER)->disposeOnce();
+ m_aContentToolBox->Clear();
+ if(m_pxObjectShell)
{
- if(pxObjectShell->Is())
- (*pxObjectShell)->DoClose();
- delete pxObjectShell;
+ if(m_pxObjectShell->Is())
+ (*m_pxObjectShell)->DoClose();
+ delete m_pxObjectShell;
}
if ( IsBound() )
- rBindings.Release(*this);
+ m_rBindings.Release(*this);
- pFloatingWindow.disposeAndClear();
- pPopupWindow.disposeAndClear();
- aDocListBox.disposeAndClear();
- aGlobalTree.disposeAndClear();
- aContentTree.disposeAndClear();
- aGlobalToolBox.disposeAndClear();
- aContentToolBox.disposeAndClear();
+ m_pFloatingWindow.disposeAndClear();
+ m_pPopupWindow.disposeAndClear();
+ m_aDocListBox.disposeAndClear();
+ m_aGlobalTree.disposeAndClear();
+ m_aContentTree.disposeAndClear();
+ m_aGlobalToolBox.disposeAndClear();
+ m_aContentToolBox.disposeAndClear();
- aPageChgIdle.Stop();
+ m_aPageChgIdle.Stop();
::SfxControllerItem::dispose();
@@ -884,35 +884,35 @@ void SwNavigationPI::dispose()
void SwNavigationPI::SetPopupWindow( SfxPopupWindow* pWindow )
{
- pPopupWindow = pWindow;
- pPopupWindow->SetPopupModeEndHdl( LINK( this, SwNavigationPI, PopupModeEndHdl ));
- pPopupWindow->SetDeleteLink_Impl( LINK( this, SwNavigationPI, ClosePopupWindow ));
+ m_pPopupWindow = pWindow;
+ m_pPopupWindow->SetPopupModeEndHdl( LINK( this, SwNavigationPI, PopupModeEndHdl ));
+ m_pPopupWindow->SetDeleteLink_Impl( LINK( this, SwNavigationPI, ClosePopupWindow ));
}
IMPL_LINK_NOARG_TYPED(SwNavigationPI, PopupModeEndHdl, FloatingWindow*, void)
{
- if ( pPopupWindow->IsVisible() )
+ if ( m_pPopupWindow->IsVisible() )
{
// Replace floating window with popup window and destroy
// floating window instance.
- pFloatingWindow.disposeAndClear();
- pFloatingWindow = pPopupWindow;
- pPopupWindow = 0;
+ m_pFloatingWindow.disposeAndClear();
+ m_pFloatingWindow = m_pPopupWindow;
+ m_pPopupWindow = 0;
}
else
{
// Popup window has been closed by the user. No replacement, instance
// will destroy itself.
- pPopupWindow = 0;
+ m_pPopupWindow = 0;
}
}
IMPL_LINK_TYPED( SwNavigationPI, ClosePopupWindow, SfxPopupWindow *, pWindow, void )
{
- if ( pWindow == pFloatingWindow )
- pFloatingWindow = 0;
+ if ( pWindow == m_pFloatingWindow )
+ m_pFloatingWindow = 0;
else
- pPopupWindow = 0;
+ m_pPopupWindow = 0;
}
void SwNavigationPI::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
@@ -924,22 +924,22 @@ void SwNavigationPI::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
if(pActView)
{
SwWrtShell* pWrtShell = pActView->GetWrtShellPtr();
- aContentTree->SetActiveShell(pWrtShell);
+ m_aContentTree->SetActiveShell(pWrtShell);
bool bGlobal = IsGlobalDoc();
- aContentToolBox->EnableItem(FN_GLOBAL_SWITCH, bGlobal);
+ m_aContentToolBox->EnableItem(FN_GLOBAL_SWITCH, bGlobal);
if( (!bGlobal && IsGlobalMode()) ||
- (!IsGlobalMode() && pConfig->IsGlobalActive()) )
+ (!IsGlobalMode() && m_pConfig->IsGlobalActive()) )
{
ToggleTree();
}
if(bGlobal)
{
- aGlobalToolBox->CheckItem(FN_GLOBAL_SAVE_CONTENT, pWrtShell->IsGlblDocSaveLinks());
+ m_aGlobalToolBox->CheckItem(FN_GLOBAL_SAVE_CONTENT, pWrtShell->IsGlblDocSaveLinks());
}
}
else
{
- aContentTree->SetActiveShell(0);
+ m_aContentTree->SetActiveShell(0);
}
UpdateListBox();
}
@@ -949,27 +949,27 @@ void SwNavigationPI::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
NumEditAction& SwNavigationPI::GetPageEdit()
{
- return *static_cast<NumEditAction*>(aContentToolBox->GetItemWindow(FN_PAGENUMBER));
+ return *static_cast<NumEditAction*>(m_aContentToolBox->GetItemWindow(FN_PAGENUMBER));
}
// Notification on modified DocInfo
void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint )
{
- if(&rBrdc == pCreateView)
+ if(&rBrdc == m_pCreateView)
{
if(dynamic_cast<const SfxSimpleHint*>(&rHint) && static_cast<const SfxSimpleHint&>(rHint).GetId() == SFX_HINT_DYING)
{
- pCreateView = 0;
+ m_pCreateView = 0;
}
}
else
{
if(dynamic_cast<const SfxEventHint*>(&rHint))
{
- if( pxObjectShell &&
+ if( m_pxObjectShell &&
static_cast<const SfxEventHint&>( rHint).GetEventId() == SFX_EVENT_CLOSEAPP)
{
- DELETEZ(pxObjectShell);
+ DELETEZ(m_pxObjectShell);
}
else if(static_cast<const SfxEventHint&>( rHint).GetEventId() == SFX_EVENT_OPENDOC)
{
@@ -978,15 +978,15 @@ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint )
if(pActView)
{
SwWrtShell* pWrtShell = pActView->GetWrtShellPtr();
- aContentTree->SetActiveShell(pWrtShell);
- if(aGlobalTree->IsVisible())
+ m_aContentTree->SetActiveShell(pWrtShell);
+ if(m_aGlobalTree->IsVisible())
{
- if(aGlobalTree->Update( false ))
- aGlobalTree->Display();
+ if(m_aGlobalTree->Update( false ))
+ m_aGlobalTree->Display();
else
// If no update is needed, then paint at least,
// because of the red entries for the broken links.
- aGlobalTree->Invalidate();
+ m_aGlobalTree->Invalidate();
}
}
}
@@ -1002,24 +1002,24 @@ IMPL_LINK_TYPED( SwNavigationPI, MenuSelectHdl, Menu *, pMenu, bool )
if(nMenuId < 100)
SetRegionDropMode( static_cast<RegionMode>(--nMenuId));
else
- aContentTree->SetOutlineLevel( static_cast< sal_uInt8 >(nMenuId - 100) );
+ m_aContentTree->SetOutlineLevel( static_cast< sal_uInt8 >(nMenuId - 100) );
}
return false;
}
void SwNavigationPI::UpdateListBox()
{
- aDocListBox->SetUpdateMode(false);
- aDocListBox->Clear();
+ m_aDocListBox->SetUpdateMode(false);
+ m_aDocListBox->Clear();
SwView *pActView = GetCreateView();
bool bDisable = pActView == 0;
SwView *pView = SwModule::GetFirstView();
sal_Int32 nCount = 0;
sal_Int32 nAct = 0;
sal_Int32 nConstPos = 0;
- const SwView* pConstView = aContentTree->IsConstantView() &&
- aContentTree->GetActiveWrtShell() ?
- &aContentTree->GetActiveWrtShell()->GetView():
+ const SwView* pConstView = m_aContentTree->IsConstantView() &&
+ m_aContentTree->GetActiveWrtShell() ?
+ &m_aContentTree->GetActiveWrtShell()->GetView():
0;
while (pView)
{
@@ -1032,12 +1032,12 @@ void SwNavigationPI::UpdateListBox()
if (pView == pActView)
{
nAct = nCount;
- sEntry += aStatusArr[STR_ACTIVE - STR_STATUS_FIRST];
+ sEntry += m_aStatusArr[STR_ACTIVE - STR_STATUS_FIRST];
}
else
- sEntry += aStatusArr[STR_INACTIVE - STR_STATUS_FIRST];
+ sEntry += m_aStatusArr[STR_INACTIVE - STR_STATUS_FIRST];
sEntry += ")";
- aDocListBox->InsertEntry(sEntry);
+ m_aDocListBox->InsertEntry(sEntry);
if (pConstView && pView == pConstView)
nConstPos = nCount;
@@ -1046,33 +1046,33 @@ void SwNavigationPI::UpdateListBox()
}
pView = SwModule::GetNextView(pView);
}
- aDocListBox->InsertEntry(aStatusArr[3]); // "Active Window"
+ m_aDocListBox->InsertEntry(m_aStatusArr[3]); // "Active Window"
nCount++;
- if(aContentTree->GetHiddenWrtShell())
+ if(m_aContentTree->GetHiddenWrtShell())
{
- OUString sEntry = aContentTree->GetHiddenWrtShell()->GetView().
+ OUString sEntry = m_aContentTree->GetHiddenWrtShell()->GetView().
GetDocShell()->GetTitle();
sEntry += " (";
- sEntry += aStatusArr[STR_HIDDEN - STR_STATUS_FIRST];
+ sEntry += m_aStatusArr[STR_HIDDEN - STR_STATUS_FIRST];
sEntry += ")";
- aDocListBox->InsertEntry(sEntry);
+ m_aDocListBox->InsertEntry(sEntry);
bDisable = false;
}
- if(aContentTree->IsActiveView())
+ if(m_aContentTree->IsActiveView())
{
//Either the name of the current Document or "Active Document".
- aDocListBox->SelectEntryPos( pActView ? nAct : --nCount );
+ m_aDocListBox->SelectEntryPos( pActView ? nAct : --nCount );
}
- else if(aContentTree->IsHiddenView())
+ else if(m_aContentTree->IsHiddenView())
{
- aDocListBox->SelectEntryPos(nCount);
+ m_aDocListBox->SelectEntryPos(nCount);
}
else
- aDocListBox->SelectEntryPos(nConstPos);
+ m_aDocListBox->SelectEntryPos(nConstPos);
- aDocListBox->Enable( !bDisable );
- aDocListBox->SetUpdateMode(true);
+ m_aDocListBox->Enable( !bDisable );
+ m_aDocListBox->SetUpdateMode(true);
}
IMPL_LINK_TYPED(SwNavigationPI, DoneLink, SfxPoolItem *, pItem, void)
@@ -1083,16 +1083,16 @@ IMPL_LINK_TYPED(SwNavigationPI, DoneLink, SfxPoolItem *, pItem, void)
SfxViewFrame* pFrame = pFrameItem->GetFrame();
if(pFrame)
{
- aContentTree->Clear();
- pContentView = dynamic_cast<SwView*>( pFrame->GetViewShell() );
- OSL_ENSURE(pContentView, "no SwView");
- if(pContentView)
- pContentWrtShell = pContentView->GetWrtShellPtr();
+ m_aContentTree->Clear();
+ m_pContentView = dynamic_cast<SwView*>( pFrame->GetViewShell() );
+ OSL_ENSURE(m_pContentView, "no SwView");
+ if(m_pContentView)
+ m_pContentWrtShell = m_pContentView->GetWrtShellPtr();
else
- pContentWrtShell = 0;
- pxObjectShell = new SfxObjectShellLock(pFrame->GetObjectShell());
+ m_pContentWrtShell = 0;
+ m_pxObjectShell = new SfxObjectShellLock(pFrame->GetObjectShell());
FillBox();
- aContentTree->Update();
+ m_aContentTree->Update();
}
}
}
@@ -1133,14 +1133,14 @@ OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
sal_Int8 SwNavigationPI::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
{
return ( !SwContentTree::IsInDrag() &&
- ( aContentTree->IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) ||
- aContentTree->IsDropFormatSupported( SotClipboardFormatId::STRING ) ||
- aContentTree->IsDropFormatSupported( SotClipboardFormatId::SOLK ) ||
- aContentTree->IsDropFormatSupported( SotClipboardFormatId::NETSCAPE_BOOKMARK )||
- aContentTree->IsDropFormatSupported( SotClipboardFormatId::FILECONTENT ) ||
- aContentTree->IsDropFormatSupported( SotClipboardFormatId::FILEGRPDESCRIPTOR ) ||
- aContentTree->IsDropFormatSupported( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) ||
- aContentTree->IsDropFormatSupported( SotClipboardFormatId::FILENAME )))
+ ( m_aContentTree->IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) ||
+ m_aContentTree->IsDropFormatSupported( SotClipboardFormatId::STRING ) ||
+ m_aContentTree->IsDropFormatSupported( SotClipboardFormatId::SOLK ) ||
+ m_aContentTree->IsDropFormatSupported( SotClipboardFormatId::NETSCAPE_BOOKMARK )||
+ m_aContentTree->IsDropFormatSupported( SotClipboardFormatId::FILECONTENT ) ||
+ m_aContentTree->IsDropFormatSupported( SotClipboardFormatId::FILEGRPDESCRIPTOR ) ||
+ m_aContentTree->IsDropFormatSupported( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) ||
+ m_aContentTree->IsDropFormatSupported( SotClipboardFormatId::FILENAME )))
? DND_ACTION_COPY
: DND_ACTION_NONE;
}
@@ -1164,16 +1164,16 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt )
if (-1 != sFileName.indexOf('#'))
return nRet;
- if ((sContentFileName.isEmpty() || sContentFileName != sFileName))
+ if ((m_sContentFileName.isEmpty() || m_sContentFileName != sFileName))
{
nRet = rEvt.mnAction;
sFileName = comphelper::string::stripEnd(sFileName, 0);
- sContentFileName = sFileName;
- if(pxObjectShell)
+ m_sContentFileName = sFileName;
+ if(m_pxObjectShell)
{
- aContentTree->SetHiddenShell( 0 );
- (*pxObjectShell)->DoClose();
- DELETEZ( pxObjectShell);
+ m_aContentTree->SetHiddenShell( 0 );
+ (*m_pxObjectShell)->DoClose();
+ DELETEZ( m_pxObjectShell);
}
SfxStringItem aFileItem(SID_FILE_NAME, sFileName );
SfxStringItem aOptionsItem( SID_OPTIONS, OUString("HRC") );
@@ -1188,18 +1188,18 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt )
void SwNavigationPI::SetRegionDropMode(RegionMode nNewMode)
{
- nRegionMode = nNewMode;
- pConfig->SetRegionMode( nRegionMode );
+ m_nRegionMode = nNewMode;
+ m_pConfig->SetRegionMode( m_nRegionMode );
sal_uInt16 nDropId = FN_DROP_REGION;
- if(nRegionMode == RegionMode::LINK)
+ if(m_nRegionMode == RegionMode::LINK)
nDropId = FN_DROP_REGION_LINK;
- else if(nRegionMode == RegionMode::EMBEDDED)
+ else if(m_nRegionMode == RegionMode::EMBEDDED)
nDropId = FN_DROP_REGION_COPY;
- ImageList& rImgLst = aContentImageList;
+ ImageList& rImgLst = m_aContentImageList;
- aContentToolBox->SetItemImage( FN_DROP_REGION, rImgLst.GetImage(nDropId));
+ m_aContentToolBox->SetItemImage( FN_DROP_REGION, rImgLst.GetImage(nDropId));
}
bool SwNavigationPI::ToggleTree()
@@ -1211,23 +1211,23 @@ bool SwNavigationPI::ToggleTree()
SetUpdateMode(false);
if(_IsZoomedIn())
_ZoomOut();
- aGlobalTree->ShowTree();
- aGlobalToolBox->Show();
- aContentTree->HideTree();
- aContentToolBox->Hide();
- aDocListBox->Hide();
+ m_aGlobalTree->ShowTree();
+ m_aGlobalToolBox->Show();
+ m_aContentTree->HideTree();
+ m_aContentToolBox->Hide();
+ m_aDocListBox->Hide();
SetGlobalMode(true);
SetUpdateMode(true);
}
else
{
- aGlobalTree->HideTree();
- aGlobalToolBox->Hide();
+ m_aGlobalTree->HideTree();
+ m_aGlobalToolBox->Hide();
if(!_IsZoomedIn())
{
- aContentTree->ShowTree();
- aContentToolBox->Show();
- aDocListBox->Show();
+ m_aContentTree->ShowTree();
+ m_aContentToolBox->Show();
+ m_aDocListBox->Show();
}
bRet = false;
SetGlobalMode(false);
@@ -1258,28 +1258,28 @@ IMPL_LINK_NOARG_TYPED(SwNavigationPI, ChangePageHdl, Idle *, void)
IMPL_LINK_NOARG_TYPED(SwNavigationPI, PageEditModifyHdl, SpinField&, void)
{
- if(aPageChgIdle.IsActive())
- aPageChgIdle.Stop();
- aPageChgIdle.Start();
+ if(m_aPageChgIdle.IsActive())
+ m_aPageChgIdle.Stop();
+ m_aPageChgIdle.Start();
}
SwView* SwNavigationPI::GetCreateView() const
{
- if(!pCreateView)
+ if(!m_pCreateView)
{
SwView* pView = SwModule::GetFirstView();
while(pView)
{
- if(&pView->GetViewFrame()->GetBindings() == &rBindings)
+ if(&pView->GetViewFrame()->GetBindings() == &m_rBindings)
{
- const_cast<SwNavigationPI*>(this)->pCreateView = pView;
- const_cast<SwNavigationPI*>(this)->StartListening(*pCreateView);
+ const_cast<SwNavigationPI*>(this)->m_pCreateView = pView;
+ const_cast<SwNavigationPI*>(this)->StartListening(*m_pCreateView);
break;
}
pView = SwModule::GetNextView(pView);
}
}
- return pCreateView;
+ return m_pCreateView;
}
SwNavigationChild::SwNavigationChild( vcl::Window* pParent,
@@ -1297,10 +1297,10 @@ SwNavigationChild::SwNavigationChild( vcl::Window* pParent,
const ContentTypeId nRootType = pNaviConfig->GetRootType();
if( nRootType != ContentTypeId::UNKNOWN )
{
- pNavi->aContentTree->SetRootType(nRootType);
- pNavi->aContentToolBox->CheckItem(FN_SHOW_ROOT);
+ pNavi->m_aContentTree->SetRootType(nRootType);
+ pNavi->m_aContentToolBox->CheckItem(FN_SHOW_ROOT);
}
- pNavi->aContentTree->SetOutlineLevel( static_cast< sal_uInt8 >( pNaviConfig->GetOutlineLevel() ) );
+ pNavi->m_aContentTree->SetOutlineLevel( static_cast< sal_uInt8 >( pNaviConfig->GetOutlineLevel() ) );
pNavi->SetRegionDropMode( pNaviConfig->GetRegionMode() );
if(GetFloatingWindow() && pNaviConfig->IsSmall())
@@ -1325,21 +1325,21 @@ void SwNavigationPI::DataChanged( const DataChangedEvent& rDCEvt )
void SwNavigationPI::InitImageList()
{
- ImageList& rImgLst = aContentImageList;
- for( sal_uInt16 k = 0; k < aContentToolBox->GetItemCount(); k++)
- aContentToolBox->SetItemImage(aContentToolBox->GetItemId(k),
- rImgLst.GetImage(aContentToolBox->GetItemId(k)));
+ ImageList& rImgLst = m_aContentImageList;
+ for( sal_uInt16 k = 0; k < m_aContentToolBox->GetItemCount(); k++)
+ m_aContentToolBox->SetItemImage(m_aContentToolBox->GetItemId(k),
+ rImgLst.GetImage(m_aContentToolBox->GetItemId(k)));
- for( sal_uInt16 k = 0; k < aGlobalToolBox->GetItemCount(); k++)
- aGlobalToolBox->SetItemImage(aGlobalToolBox->GetItemId(k),
- rImgLst.GetImage(aGlobalToolBox->GetItemId(k)));
+ for( sal_uInt16 k = 0; k < m_aGlobalToolBox->GetItemCount(); k++)
+ m_aGlobalToolBox->SetItemImage(m_aGlobalToolBox->GetItemId(k),
+ rImgLst.GetImage(m_aGlobalToolBox->GetItemId(k)));
sal_uInt16 nDropId = FN_DROP_REGION;
- if(nRegionMode == RegionMode::LINK)
+ if(m_nRegionMode == RegionMode::LINK)
nDropId = FN_DROP_REGION_LINK;
- else if(nRegionMode == RegionMode::EMBEDDED)
+ else if(m_nRegionMode == RegionMode::EMBEDDED)
nDropId = FN_DROP_REGION_COPY;
- aContentToolBox->SetItemImage( FN_DROP_REGION,
+ m_aContentToolBox->SetItemImage( FN_DROP_REGION,
rImgLst.GetImage(nDropId));
}
commit ea10e890041e36727709260cadb18bb8f543b4c1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Nov 10 07:47:32 2015 +0100
sw: prefix members of SwStyleNameMapper
Change-Id: I374caad0258624e9794993a01ab39c60fbb65a1a
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 0f55905..14852be 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -82,41 +82,41 @@ class SwStyleNameMapper
protected:
// UI Name tables
- static ::std::vector<OUString> *pTextUINameArray,
- *pListsUINameArray,
- *pExtraUINameArray,
- *pRegisterUINameArray,
- *pDocUINameArray,
- *pHTMLUINameArray,
- *pFrameFormatUINameArray,
- *pChrFormatUINameArray,
- *pHTMLChrFormatUINameArray,
- *pPageDescUINameArray,
- *pNumRuleUINameArray,
+ static ::std::vector<OUString> *m_pTextUINameArray,
+ *m_pListsUINameArray,
+ *m_pExtraUINameArray,
+ *m_pRegisterUINameArray,
+ *m_pDocUINameArray,
+ *m_pHTMLUINameArray,
+ *m_pFrameFormatUINameArray,
+ *m_pChrFormatUINameArray,
+ *m_pHTMLChrFormatUINameArray,
+ *m_pPageDescUINameArray,
+ *m_pNumRuleUINameArray,
// Programmatic Name tables
- *pTextProgNameArray,
- *pListsProgNameArray,
- *pExtraProgNameArray,
- *pRegisterProgNameArray,
- *pDocProgNameArray,
- *pHTMLProgNameArray,
- *pFrameFormatProgNameArray,
- *pChrFormatProgNameArray,
- *pHTMLChrFormatProgNameArray,
- *pPageDescProgNameArray,
- *pNumRuleProgNameArray;
-
- static NameToIdHash *pParaUIMap,
- *pCharUIMap,
- *pPageUIMap,
- *pFrameUIMap,
- *pNumRuleUIMap,
-
- *pParaProgMap,
- *pCharProgMap,
- *pPageProgMap,
- *pFrameProgMap,
- *pNumRuleProgMap;
+ *m_pTextProgNameArray,
+ *m_pListsProgNameArray,
+ *m_pExtraProgNameArray,
+ *m_pRegisterProgNameArray,
+ *m_pDocProgNameArray,
+ *m_pHTMLProgNameArray,
+ *m_pFrameFormatProgNameArray,
+ *m_pChrFormatProgNameArray,
+ *m_pHTMLChrFormatProgNameArray,
+ *m_pPageDescProgNameArray,
+ *m_pNumRuleProgNameArray;
+
+ static NameToIdHash *m_pParaUIMap,
+ *m_pCharUIMap,
+ *m_pPageUIMap,
+ *m_pFrameUIMap,
+ *m_pNumRuleUIMap,
+
+ *m_pParaProgMap,
+ *m_pCharProgMap,
+ *m_pPageProgMap,
+ *m_pFrameProgMap,
+ *m_pNumRuleProgMap;
static void fillNameFromId(sal_uInt16 nId, OUString &rName, bool bProgName);
static const OUString& getNameFromId(sal_uInt16 nId, const OUString &rName,
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 3a304f1..c5e5cb9 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -780,43 +780,43 @@ void _FinitCore()
#endif
delete SwDoc::mpACmpltWords;
- delete SwStyleNameMapper::pTextUINameArray;
- delete SwStyleNameMapper::pListsUINameArray;
- delete SwStyleNameMapper::pExtraUINameArray;
- delete SwStyleNameMapper::pRegisterUINameArray;
- delete SwStyleNameMapper::pDocUINameArray;
- delete SwStyleNameMapper::pHTMLUINameArray;
- delete SwStyleNameMapper::pFrameFormatUINameArray;
- delete SwStyleNameMapper::pChrFormatUINameArray;
- delete SwStyleNameMapper::pHTMLChrFormatUINameArray;
- delete SwStyleNameMapper::pPageDescUINameArray;
- delete SwStyleNameMapper::pNumRuleUINameArray;
+ delete SwStyleNameMapper::m_pTextUINameArray;
+ delete SwStyleNameMapper::m_pListsUINameArray;
+ delete SwStyleNameMapper::m_pExtraUINameArray;
+ delete SwStyleNameMapper::m_pRegisterUINameArray;
+ delete SwStyleNameMapper::m_pDocUINameArray;
+ delete SwStyleNameMapper::m_pHTMLUINameArray;
+ delete SwStyleNameMapper::m_pFrameFormatUINameArray;
+ delete SwStyleNameMapper::m_pChrFormatUINameArray;
+ delete SwStyleNameMapper::m_pHTMLChrFormatUINameArray;
+ delete SwStyleNameMapper::m_pPageDescUINameArray;
+ delete SwStyleNameMapper::m_pNumRuleUINameArray;
// Delete programmatic name arrays also
- delete SwStyleNameMapper::pTextProgNameArray;
- delete SwStyleNameMapper::pListsProgNameArray;
- delete SwStyleNameMapper::pExtraProgNameArray;
- delete SwStyleNameMapper::pRegisterProgNameArray;
- delete SwStyleNameMapper::pDocProgNameArray;
- delete SwStyleNameMapper::pHTMLProgNameArray;
- delete SwStyleNameMapper::pFrameFormatProgNameArray;
- delete SwStyleNameMapper::pChrFormatProgNameArray;
- delete SwStyleNameMapper::pHTMLChrFormatProgNameArray;
- delete SwStyleNameMapper::pPageDescProgNameArray;
- delete SwStyleNameMapper::pNumRuleProgNameArray;
+ delete SwStyleNameMapper::m_pTextProgNameArray;
+ delete SwStyleNameMapper::m_pListsProgNameArray;
+ delete SwStyleNameMapper::m_pExtraProgNameArray;
+ delete SwStyleNameMapper::m_pRegisterProgNameArray;
+ delete SwStyleNameMapper::m_pDocProgNameArray;
+ delete SwStyleNameMapper::m_pHTMLProgNameArray;
+ delete SwStyleNameMapper::m_pFrameFormatProgNameArray;
+ delete SwStyleNameMapper::m_pChrFormatProgNameArray;
+ delete SwStyleNameMapper::m_pHTMLChrFormatProgNameArray;
+ delete SwStyleNameMapper::m_pPageDescProgNameArray;
+ delete SwStyleNameMapper::m_pNumRuleProgNameArray;
// And finally, any hash tables that we used
- delete SwStyleNameMapper::pParaUIMap;
- delete SwStyleNameMapper::pCharUIMap;
- delete SwStyleNameMapper::pPageUIMap;
- delete SwStyleNameMapper::pFrameUIMap;
- delete SwStyleNameMapper::pNumRuleUIMap;
-
- delete SwStyleNameMapper::pParaProgMap;
- delete SwStyleNameMapper::pCharProgMap;
- delete SwStyleNameMapper::pPageProgMap;
- delete SwStyleNameMapper::pFrameProgMap;
- delete SwStyleNameMapper::pNumRuleProgMap;
+ delete SwStyleNameMapper::m_pParaUIMap;
+ delete SwStyleNameMapper::m_pCharUIMap;
+ delete SwStyleNameMapper::m_pPageUIMap;
+ delete SwStyleNameMapper::m_pFrameUIMap;
+ delete SwStyleNameMapper::m_pNumRuleUIMap;
+
+ delete SwStyleNameMapper::m_pParaProgMap;
+ delete SwStyleNameMapper::m_pCharProgMap;
+ delete SwStyleNameMapper::m_pPageProgMap;
+ delete SwStyleNameMapper::m_pFrameProgMap;
+ delete SwStyleNameMapper::m_pNumRuleProgMap;
// delete all default attributes
for( sal_uInt16 n = 0; n < POOLATTR_END - POOLATTR_BEGIN; n++ )
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 43db6ab..f5ba753 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -31,42 +31,42 @@
extern ResMgr* pSwResMgr;
// Initialise UI names to 0
-::std::vector<OUString> *SwStyleNameMapper::pTextUINameArray = 0,
- *SwStyleNameMapper::pListsUINameArray = 0,
- *SwStyleNameMapper::pExtraUINameArray = 0,
- *SwStyleNameMapper::pRegisterUINameArray = 0,
- *SwStyleNameMapper::pDocUINameArray = 0,
- *SwStyleNameMapper::pHTMLUINameArray = 0,
- *SwStyleNameMapper::pFrameFormatUINameArray = 0,
- *SwStyleNameMapper::pChrFormatUINameArray = 0,
- *SwStyleNameMapper::pHTMLChrFormatUINameArray = 0,
- *SwStyleNameMapper::pPageDescUINameArray = 0,
- *SwStyleNameMapper::pNumRuleUINameArray = 0,
+::std::vector<OUString> *SwStyleNameMapper::m_pTextUINameArray = 0,
+ *SwStyleNameMapper::m_pListsUINameArray = 0,
+ *SwStyleNameMapper::m_pExtraUINameArray = 0,
+ *SwStyleNameMapper::m_pRegisterUINameArray = 0,
+ *SwStyleNameMapper::m_pDocUINameArray = 0,
+ *SwStyleNameMapper::m_pHTMLUINameArray = 0,
+ *SwStyleNameMapper::m_pFrameFormatUINameArray = 0,
+ *SwStyleNameMapper::m_pChrFormatUINameArray = 0,
+ *SwStyleNameMapper::m_pHTMLChrFormatUINameArray = 0,
+ *SwStyleNameMapper::m_pPageDescUINameArray = 0,
+ *SwStyleNameMapper::m_pNumRuleUINameArray = 0,
// Initialise programmatic names to 0
- *SwStyleNameMapper::pTextProgNameArray = 0,
- *SwStyleNameMapper::pListsProgNameArray = 0,
- *SwStyleNameMapper::pExtraProgNameArray = 0,
- *SwStyleNameMapper::pRegisterProgNameArray = 0,
- *SwStyleNameMapper::pDocProgNameArray = 0,
- *SwStyleNameMapper::pHTMLProgNameArray = 0,
- *SwStyleNameMapper::pFrameFormatProgNameArray = 0,
- *SwStyleNameMapper::pChrFormatProgNameArray = 0,
- *SwStyleNameMapper::pHTMLChrFormatProgNameArray = 0,
- *SwStyleNameMapper::pPageDescProgNameArray = 0,
- *SwStyleNameMapper::pNumRuleProgNameArray = 0;
-
-NameToIdHash *SwStyleNameMapper::pParaUIMap = 0,
- *SwStyleNameMapper::pCharUIMap = 0,
- *SwStyleNameMapper::pPageUIMap = 0,
- *SwStyleNameMapper::pFrameUIMap = 0,
- *SwStyleNameMapper::pNumRuleUIMap = 0,
-
- *SwStyleNameMapper::pParaProgMap = 0,
- *SwStyleNameMapper::pCharProgMap = 0,
- *SwStyleNameMapper::pPageProgMap = 0,
- *SwStyleNameMapper::pFrameProgMap = 0,
- *SwStyleNameMapper::pNumRuleProgMap = 0;
+ *SwStyleNameMapper::m_pTextProgNameArray = 0,
+ *SwStyleNameMapper::m_pListsProgNameArray = 0,
+ *SwStyleNameMapper::m_pExtraProgNameArray = 0,
+ *SwStyleNameMapper::m_pRegisterProgNameArray = 0,
+ *SwStyleNameMapper::m_pDocProgNameArray = 0,
+ *SwStyleNameMapper::m_pHTMLProgNameArray = 0,
+ *SwStyleNameMapper::m_pFrameFormatProgNameArray = 0,
+ *SwStyleNameMapper::m_pChrFormatProgNameArray = 0,
+ *SwStyleNameMapper::m_pHTMLChrFormatProgNameArray = 0,
+ *SwStyleNameMapper::m_pPageDescProgNameArray = 0,
+ *SwStyleNameMapper::m_pNumRuleProgNameArray = 0;
+
+NameToIdHash *SwStyleNameMapper::m_pParaUIMap = 0,
+ *SwStyleNameMapper::m_pCharUIMap = 0,
+ *SwStyleNameMapper::m_pPageUIMap = 0,
+ *SwStyleNameMapper::m_pFrameUIMap = 0,
+ *SwStyleNameMapper::m_pNumRuleUIMap = 0,
+
+ *SwStyleNameMapper::m_pParaProgMap = 0,
+ *SwStyleNameMapper::m_pCharProgMap = 0,
+ *SwStyleNameMapper::m_pPageProgMap = 0,
+ *SwStyleNameMapper::m_pFrameProgMap = 0,
+ *SwStyleNameMapper::m_pNumRuleProgMap = 0;
// SwTableEntry so we can pass the length to the String CTOR
struct SwTableEntry
@@ -435,7 +435,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
//fall-through
case nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL:
{
- pHashPointer = bProgName ? &pParaProgMap : &pParaUIMap;
+ pHashPointer = bProgName ? &m_pParaProgMap : &m_pParaUIMap;
vIndexes.push_back( boost::make_tuple(RES_POOLCOLL_TEXT_BEGIN, RES_POOLCOLL_TEXT_END, bProgName ? &GetTextProgNameArray : &GetTextUINameArray) );
vIndexes.push_back( boost::make_tuple(RES_POOLCOLL_LISTS_BEGIN, RES_POOLCOLL_LISTS_END, bProgName ? &GetListsProgNameArray : &GetListsUINameArray) );
vIndexes.push_back( boost::make_tuple(RES_POOLCOLL_EXTRA_BEGIN, RES_POOLCOLL_EXTRA_END, bProgName ? &GetExtraProgNameArray : &GetExtraUINameArray) );
@@ -446,26 +446,26 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
break;
case nsSwGetPoolIdFromName::GET_POOLID_CHRFMT:
{
- pHashPointer = bProgName ? &pCharProgMap : &pCharUIMap;
+ pHashPointer = bProgName ? &m_pCharProgMap : &m_pCharUIMap;
vIndexes.push_back( boost::make_tuple(RES_POOLCHR_NORMAL_BEGIN, RES_POOLCHR_NORMAL_END, bProgName ? &GetChrFormatProgNameArray : &GetChrFormatUINameArray) );
vIndexes.push_back( boost::make_tuple(RES_POOLCHR_HTML_BEGIN, RES_POOLCHR_HTML_END, bProgName ? &GetHTMLChrFormatProgNameArray : &GetHTMLChrFormatUINameArray) );
}
break;
case nsSwGetPoolIdFromName::GET_POOLID_FRMFMT:
{
- pHashPointer = bProgName ? &pFrameProgMap : &pFrameUIMap;
+ pHashPointer = bProgName ? &m_pFrameProgMap : &m_pFrameUIMap;
vIndexes.push_back( boost::make_tuple(RES_POOLFRM_BEGIN, RES_POOLFRM_END, bProgName ? &GetFrameFormatProgNameArray : &GetFrameFormatUINameArray) );
}
break;
case nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC:
{
- pHashPointer = bProgName ? &pPageProgMap : &pPageUIMap;
+ pHashPointer = bProgName ? &m_pPageProgMap : &m_pPageUIMap;
vIndexes.push_back( boost::make_tuple(RES_POOLPAGE_BEGIN, RES_POOLPAGE_END, bProgName ? &GetPageDescProgNameArray : &GetPageDescUINameArray) );
}
break;
case nsSwGetPoolIdFromName::GET_POOLID_NUMRULE:
{
- pHashPointer = bProgName ? &pNumRuleProgMap : &pNumRuleUIMap;
+ pHashPointer = bProgName ? &m_pNumRuleProgMap : &m_pNumRuleUIMap;
vIndexes.push_back( boost::make_tuple(RES_POOLNUMRULE_BEGIN, RES_POOLNUMRULE_END, bProgName ? &GetNumRuleProgNameArray : &GetNumRuleUINameArray) );
}
break;
@@ -723,178 +723,178 @@ sal_uInt16 SwStyleNameMapper::GetPoolIdFromProgName(
const ::std::vector<OUString>& SwStyleNameMapper::GetTextUINameArray()
{
- if (!pTextUINameArray)
- pTextUINameArray = lcl_NewUINameArray( RC_POOLCOLL_TEXT_BEGIN,
+ if (!m_pTextUINameArray)
+ m_pTextUINameArray = lcl_NewUINameArray( RC_POOLCOLL_TEXT_BEGIN,
RC_POOLCOLL_TEXT_BEGIN + (RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN) );
- return *pTextUINameArray;
+ return *m_pTextUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetListsUINameArray()
{
- if (!pListsUINameArray)
- pListsUINameArray = lcl_NewUINameArray( RC_POOLCOLL_LISTS_BEGIN,
+ if (!m_pListsUINameArray)
+ m_pListsUINameArray = lcl_NewUINameArray( RC_POOLCOLL_LISTS_BEGIN,
RC_POOLCOLL_LISTS_BEGIN + (RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN) );
- return *pListsUINameArray;
+ return *m_pListsUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetExtraUINameArray()
{
- if (!pExtraUINameArray)
- pExtraUINameArray = lcl_NewUINameArray( RC_POOLCOLL_EXTRA_BEGIN,
+ if (!m_pExtraUINameArray)
+ m_pExtraUINameArray = lcl_NewUINameArray( RC_POOLCOLL_EXTRA_BEGIN,
RC_POOLCOLL_EXTRA_BEGIN + (RES_POOLCOLL_EXTRA_END - RES_POOLCOLL_EXTRA_BEGIN) );
- return *pExtraUINameArray;
+ return *m_pExtraUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetRegisterUINameArray()
{
- if (!pRegisterUINameArray)
- pRegisterUINameArray = lcl_NewUINameArray( RC_POOLCOLL_REGISTER_BEGIN,
+ if (!m_pRegisterUINameArray)
+ m_pRegisterUINameArray = lcl_NewUINameArray( RC_POOLCOLL_REGISTER_BEGIN,
RC_POOLCOLL_REGISTER_BEGIN + (RES_POOLCOLL_REGISTER_END - RES_POOLCOLL_REGISTER_BEGIN) );
- return *pRegisterUINameArray;
+ return *m_pRegisterUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetDocUINameArray()
{
- if (!pDocUINameArray)
- pDocUINameArray = lcl_NewUINameArray( RC_POOLCOLL_DOC_BEGIN,
+ if (!m_pDocUINameArray)
+ m_pDocUINameArray = lcl_NewUINameArray( RC_POOLCOLL_DOC_BEGIN,
RC_POOLCOLL_DOC_BEGIN + (RES_POOLCOLL_DOC_END - RES_POOLCOLL_DOC_BEGIN) );
- return *pDocUINameArray;
+ return *m_pDocUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray()
{
- if (!pHTMLUINameArray)
- pHTMLUINameArray = lcl_NewUINameArray( RC_POOLCOLL_HTML_BEGIN,
+ if (!m_pHTMLUINameArray)
+ m_pHTMLUINameArray = lcl_NewUINameArray( RC_POOLCOLL_HTML_BEGIN,
RC_POOLCOLL_HTML_BEGIN + (RES_POOLCOLL_HTML_END - RES_POOLCOLL_HTML_BEGIN) );
- return *pHTMLUINameArray;
+ return *m_pHTMLUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatUINameArray()
{
- if (!pFrameFormatUINameArray)
- pFrameFormatUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN,
+ if (!m_pFrameFormatUINameArray)
+ m_pFrameFormatUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN,
RC_POOLFRMFMT_BEGIN + (RES_POOLFRM_END - RES_POOLFRM_BEGIN) );
- return *pFrameFormatUINameArray;
+ return *m_pFrameFormatUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatUINameArray()
{
- if (!pChrFormatUINameArray)
- pChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN,
+ if (!m_pChrFormatUINameArray)
+ m_pChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN,
RC_POOLCHRFMT_BEGIN + (RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN) );
- return *pChrFormatUINameArray;
+ return *m_pChrFormatUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatUINameArray()
{
- if (!pHTMLChrFormatUINameArray)
- pHTMLChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN,
+ if (!m_pHTMLChrFormatUINameArray)
+ m_pHTMLChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN,
RC_POOLCHRFMT_HTML_BEGIN + (RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN) );
- return *pHTMLChrFormatUINameArray;
+ return *m_pHTMLChrFormatUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray()
{
- if (!pPageDescUINameArray)
- pPageDescUINameArray = lcl_NewUINameArray( RC_POOLPAGEDESC_BEGIN,
+ if (!m_pPageDescUINameArray)
+ m_pPageDescUINameArray = lcl_NewUINameArray( RC_POOLPAGEDESC_BEGIN,
RC_POOLPAGEDESC_BEGIN + (RES_POOLPAGE_END - RES_POOLPAGE_BEGIN) );
- return *pPageDescUINameArray;
+ return *m_pPageDescUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetNumRuleUINameArray()
{
- if (!pNumRuleUINameArray)
- pNumRuleUINameArray = lcl_NewUINameArray( RC_POOLNUMRULE_BEGIN,
+ if (!m_pNumRuleUINameArray)
+ m_pNumRuleUINameArray = lcl_NewUINameArray( RC_POOLNUMRULE_BEGIN,
RC_POOLNUMRULE_BEGIN + (RES_POOLNUMRULE_END - RES_POOLNUMRULE_BEGIN) );
- return *pNumRuleUINameArray;
+ return *m_pNumRuleUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetTextProgNameArray()
{
- if (!pTextProgNameArray)
- pTextProgNameArray = lcl_NewProgNameArray(TextProgNameTable,
+ if (!m_pTextProgNameArray)
+ m_pTextProgNameArray = lcl_NewProgNameArray(TextProgNameTable,
sizeof ( TextProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pTextProgNameArray;
+ return *m_pTextProgNameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetListsProgNameArray()
{
- if (!pListsProgNameArray)
- pListsProgNameArray = lcl_NewProgNameArray( ListsProgNameTable,
+ if (!m_pListsProgNameArray)
+ m_pListsProgNameArray = lcl_NewProgNameArray( ListsProgNameTable,
sizeof ( ListsProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pListsProgNameArray;
+ return *m_pListsProgNameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetExtraProgNameArray()
{
- if (!pExtraProgNameArray)
- pExtraProgNameArray = lcl_NewProgNameArray( ExtraProgNameTable,
+ if (!m_pExtraProgNameArray)
+ m_pExtraProgNameArray = lcl_NewProgNameArray( ExtraProgNameTable,
sizeof ( ExtraProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pExtraProgNameArray;
+ return *m_pExtraProgNameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetRegisterProgNameArray()
{
- if (!pRegisterProgNameArray)
- pRegisterProgNameArray = lcl_NewProgNameArray( RegisterProgNameTable,
+ if (!m_pRegisterProgNameArray)
+ m_pRegisterProgNameArray = lcl_NewProgNameArray( RegisterProgNameTable,
sizeof ( RegisterProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pRegisterProgNameArray;
+ return *m_pRegisterProgNameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetDocProgNameArray()
{
- if (!pDocProgNameArray)
- pDocProgNameArray = lcl_NewProgNameArray( DocProgNameTable,
+ if (!m_pDocProgNameArray)
+ m_pDocProgNameArray = lcl_NewProgNameArray( DocProgNameTable,
sizeof ( DocProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pDocProgNameArray;
+ return *m_pDocProgNameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLProgNameArray()
{
- if (!pHTMLProgNameArray)
- pHTMLProgNameArray = lcl_NewProgNameArray( HTMLProgNameTable,
+ if (!m_pHTMLProgNameArray)
+ m_pHTMLProgNameArray = lcl_NewProgNameArray( HTMLProgNameTable,
sizeof ( HTMLProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pHTMLProgNameArray;
+ return *m_pHTMLProgNameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatProgNameArray()
{
- if (!pFrameFormatProgNameArray)
- pFrameFormatProgNameArray = lcl_NewProgNameArray( FrameFormatProgNameTable,
+ if (!m_pFrameFormatProgNameArray)
+ m_pFrameFormatProgNameArray = lcl_NewProgNameArray( FrameFormatProgNameTable,
sizeof ( FrameFormatProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pFrameFormatProgNameArray;
+ return *m_pFrameFormatProgNameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatProgNameArray()
{
- if (!pChrFormatProgNameArray)
- pChrFormatProgNameArray = lcl_NewProgNameArray( ChrFormatProgNameTable,
+ if (!m_pChrFormatProgNameArray)
+ m_pChrFormatProgNameArray = lcl_NewProgNameArray( ChrFormatProgNameTable,
sizeof ( ChrFormatProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pChrFormatProgNameArray;
+ return *m_pChrFormatProgNameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatProgNameArray()
{
- if (!pHTMLChrFormatProgNameArray)
- pHTMLChrFormatProgNameArray = lcl_NewProgNameArray( HTMLChrFormatProgNameTable,
+ if (!m_pHTMLChrFormatProgNameArray)
+ m_pHTMLChrFormatProgNameArray = lcl_NewProgNameArray( HTMLChrFormatProgNameTable,
sizeof ( HTMLChrFormatProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pHTMLChrFormatProgNameArray;
+ return *m_pHTMLChrFormatProgNameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescProgNameArray()
{
- if (!pPageDescProgNameArray)
- pPageDescProgNameArray = lcl_NewProgNameArray( PageDescProgNameTable,
+ if (!m_pPageDescProgNameArray)
+ m_pPageDescProgNameArray = lcl_NewProgNameArray( PageDescProgNameTable,
sizeof ( PageDescProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pPageDescProgNameArray;
+ return *m_pPageDescProgNameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetNumRuleProgNameArray()
{
- if (!pNumRuleProgNameArray)
- pNumRuleProgNameArray = lcl_NewProgNameArray( NumRuleProgNameTable,
+ if (!m_pNumRuleProgNameArray)
+ m_pNumRuleProgNameArray = lcl_NewProgNameArray( NumRuleProgNameTable,
sizeof ( NumRuleProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pNumRuleProgNameArray;
+ return *m_pNumRuleProgNameArray;
}
const OUString
commit 338b6a64c2b93dd3424b7924c5c6347b7231732e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Nov 10 07:46:28 2015 +0100
sw: prefix members of SwBoxAutoFormat
Change-Id: I9849dcd31dae2e5db9ce3178640d2bf605b78238
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 500e2ca..f08a5cd 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -66,49 +66,49 @@ class SwBoxAutoFormat
{
// common attributes of Calc and Writer
// --- from 641 on: CJK and CTL font settings
- SvxFontItem aFont;
- SvxFontHeightItem aHeight;
- SvxWeightItem aWeight;
- SvxPostureItem aPosture;
-
- SvxFontItem aCJKFont;
- SvxFontHeightItem aCJKHeight;
- SvxWeightItem aCJKWeight;
- SvxPostureItem aCJKPosture;
-
- SvxFontItem aCTLFont;
- SvxFontHeightItem aCTLHeight;
- SvxWeightItem aCTLWeight;
- SvxPostureItem aCTLPosture;
-
- SvxUnderlineItem aUnderline;
- SvxOverlineItem aOverline;
- SvxCrossedOutItem aCrossedOut;
- SvxContourItem aContour;
- SvxShadowedItem aShadowed;
- SvxColorItem aColor;
- SvxBoxItem aBox;
- SvxLineItem aTLBR;
- SvxLineItem aBLTR;
- SvxBrushItem aBackground;
+ SvxFontItem m_aFont;
+ SvxFontHeightItem m_aHeight;
+ SvxWeightItem m_aWeight;
+ SvxPostureItem m_aPosture;
+
+ SvxFontItem m_aCJKFont;
+ SvxFontHeightItem m_aCJKHeight;
+ SvxWeightItem m_aCJKWeight;
+ SvxPostureItem m_aCJKPosture;
+
+ SvxFontItem m_aCTLFont;
+ SvxFontHeightItem m_aCTLHeight;
+ SvxWeightItem m_aCTLWeight;
+ SvxPostureItem m_aCTLPosture;
+
+ SvxUnderlineItem m_aUnderline;
+ SvxOverlineItem m_aOverline;
+ SvxCrossedOutItem m_aCrossedOut;
+ SvxContourItem m_aContour;
+ SvxShadowedItem m_aShadowed;
+ SvxColorItem m_aColor;
+ SvxBoxItem m_aBox;
+ SvxLineItem m_aTLBR;
+ SvxLineItem m_aBLTR;
+ SvxBrushItem m_aBackground;
// Writer specific
- SvxAdjustItem aAdjust;
+ SvxAdjustItem m_aAdjust;
SvxFrameDirectionItem m_aTextOrientation;
SwFormatVertOrient m_aVerticalAlignment;
// Calc specific
- SvxHorJustifyItem aHorJustify;
- SvxVerJustifyItem aVerJustify;
- SfxBoolItem aStacked;
- SvxMarginItem aMargin;
- SfxBoolItem aLinebreak;
- SfxInt32Item aRotateAngle;
- SvxRotateModeItem aRotateMode;
+ SvxHorJustifyItem m_aHorJustify;
+ SvxVerJustifyItem m_aVerJustify;
+ SfxBoolItem m_aStacked;
+ SvxMarginItem m_aMargin;
+ SfxBoolItem m_aLinebreak;
+ SfxInt32Item m_aRotateAngle;
+ SvxRotateModeItem m_aRotateMode;
// number format
- OUString sNumFormatString;
- LanguageType eSysLanguage, eNumFormatLanguage;
+ OUString m_sNumFormatString;
+ LanguageType m_eSysLanguage, m_eNumFormatLanguage;
public:
SwBoxAutoFormat();
@@ -119,63 +119,63 @@ public:
SwBoxAutoFormat& operator=( const SwBoxAutoFormat& rNew );
// The get-methods.
- const SvxFontItem &GetFont() const { return aFont; }
- const SvxFontHeightItem &GetHeight() const { return aHeight; }
- const SvxWeightItem &GetWeight() const { return aWeight; }
- const SvxPostureItem &GetPosture() const { return aPosture; }
- const SvxFontItem &GetCJKFont() const { return aCJKFont; }
- const SvxFontHeightItem &GetCJKHeight() const { return aCJKHeight; }
- const SvxWeightItem &GetCJKWeight() const { return aCJKWeight; }
- const SvxPostureItem &GetCJKPosture() const { return aCJKPosture; }
- const SvxFontItem &GetCTLFont() const { return aCTLFont; }
- const SvxFontHeightItem &GetCTLHeight() const { return aCTLHeight; }
- const SvxWeightItem &GetCTLWeight() const { return aCTLWeight; }
- const SvxPostureItem &GetCTLPosture() const { return aCTLPosture; }
- const SvxUnderlineItem &GetUnderline() const { return aUnderline; }
- const SvxOverlineItem &GetOverline() const { return aOverline; }
- const SvxCrossedOutItem &GetCrossedOut() const { return aCrossedOut; }
- const SvxContourItem &GetContour() const { return aContour; }
- const SvxShadowedItem &GetShadowed() const { return aShadowed; }
- const SvxColorItem &GetColor() const { return aColor; }
- const SvxAdjustItem &GetAdjust() const { return aAdjust; }
+ const SvxFontItem &GetFont() const { return m_aFont; }
+ const SvxFontHeightItem &GetHeight() const { return m_aHeight; }
+ const SvxWeightItem &GetWeight() const { return m_aWeight; }
+ const SvxPostureItem &GetPosture() const { return m_aPosture; }
+ const SvxFontItem &GetCJKFont() const { return m_aCJKFont; }
+ const SvxFontHeightItem &GetCJKHeight() const { return m_aCJKHeight; }
+ const SvxWeightItem &GetCJKWeight() const { return m_aCJKWeight; }
+ const SvxPostureItem &GetCJKPosture() const { return m_aCJKPosture; }
+ const SvxFontItem &GetCTLFont() const { return m_aCTLFont; }
+ const SvxFontHeightItem &GetCTLHeight() const { return m_aCTLHeight; }
+ const SvxWeightItem &GetCTLWeight() const { return m_aCTLWeight; }
+ const SvxPostureItem &GetCTLPosture() const { return m_aCTLPosture; }
+ const SvxUnderlineItem &GetUnderline() const { return m_aUnderline; }
+ const SvxOverlineItem &GetOverline() const { return m_aOverline; }
+ const SvxCrossedOutItem &GetCrossedOut() const { return m_aCrossedOut; }
+ const SvxContourItem &GetContour() const { return m_aContour; }
+ const SvxShadowedItem &GetShadowed() const { return m_aShadowed; }
+ const SvxColorItem &GetColor() const { return m_aColor; }
+ const SvxAdjustItem &GetAdjust() const { return m_aAdjust; }
const SvxFrameDirectionItem& GetTextOrientation() const { return m_aTextOrientation; }
const SwFormatVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; }
- const SvxBoxItem &GetBox() const { return aBox; }
- const SvxBrushItem &GetBackground() const { return aBackground; }
+ const SvxBoxItem &GetBox() const { return m_aBox; }
+ const SvxBrushItem &GetBackground() const { return m_aBackground; }
void GetValueFormat( OUString& rFormat, LanguageType& rLng, LanguageType& rSys ) const
- { rFormat = sNumFormatString; rLng = eNumFormatLanguage; rSys = eSysLanguage; }
+ { rFormat = m_sNumFormatString; rLng = m_eNumFormatLanguage; rSys = m_eSysLanguage; }
// The set-methods.
- void SetFont( const SvxFontItem& rNew ) { aFont = rNew; }
- void SetHeight( const SvxFontHeightItem& rNew ) { aHeight = rNew; }
- void SetWeight( const SvxWeightItem& rNew ) { aWeight = rNew; }
- void SetPosture( const SvxPostureItem& rNew ) { aPosture = rNew; }
- void SetCJKFont( const SvxFontItem& rNew ) { aCJKFont = rNew; }
- void SetCJKHeight( const SvxFontHeightItem& rNew ) { aCJKHeight = rNew; }
- void SetCJKWeight( const SvxWeightItem& rNew ) { aCJKWeight = rNew; }
- void SetCJKPosture( const SvxPostureItem& rNew ) { aCJKPosture = rNew; }
- void SetCTLFont( const SvxFontItem& rNew ) { aCTLFont = rNew; }
- void SetCTLHeight( const SvxFontHeightItem& rNew ) { aCTLHeight = rNew; }
- void SetCTLWeight( const SvxWeightItem& rNew ) { aCTLWeight = rNew; }
- void SetCTLPosture( const SvxPostureItem& rNew ) { aCTLPosture = rNew; }
- void SetUnderline( const SvxUnderlineItem& rNew ) { aUnderline = rNew; }
- void SetOverline( const SvxOverlineItem& rNew ) { aOverline = rNew; }
- void SetCrossedOut( const SvxCrossedOutItem& rNew ) { aCrossedOut = rNew; }
- void SetContour( const SvxContourItem& rNew ) { aContour = rNew; }
- void SetShadowed( const SvxShadowedItem& rNew ) { aShadowed = rNew; }
- void SetColor( const SvxColorItem& rNew ) { aColor = rNew; }
+ void SetFont( const SvxFontItem& rNew ) { m_aFont = rNew; }
+ void SetHeight( const SvxFontHeightItem& rNew ) { m_aHeight = rNew; }
+ void SetWeight( const SvxWeightItem& rNew ) { m_aWeight = rNew; }
+ void SetPosture( const SvxPostureItem& rNew ) { m_aPosture = rNew; }
+ void SetCJKFont( const SvxFontItem& rNew ) { m_aCJKFont = rNew; }
+ void SetCJKHeight( const SvxFontHeightItem& rNew ) { m_aCJKHeight = rNew; }
+ void SetCJKWeight( const SvxWeightItem& rNew ) { m_aCJKWeight = rNew; }
+ void SetCJKPosture( const SvxPostureItem& rNew ) { m_aCJKPosture = rNew; }
+ void SetCTLFont( const SvxFontItem& rNew ) { m_aCTLFont = rNew; }
+ void SetCTLHeight( const SvxFontHeightItem& rNew ) { m_aCTLHeight = rNew; }
+ void SetCTLWeight( const SvxWeightItem& rNew ) { m_aCTLWeight = rNew; }
+ void SetCTLPosture( const SvxPostureItem& rNew ) { m_aCTLPosture = rNew; }
+ void SetUnderline( const SvxUnderlineItem& rNew ) { m_aUnderline = rNew; }
+ void SetOverline( const SvxOverlineItem& rNew ) { m_aOverline = rNew; }
+ void SetCrossedOut( const SvxCrossedOutItem& rNew ) { m_aCrossedOut = rNew; }
+ void SetContour( const SvxContourItem& rNew ) { m_aContour = rNew; }
+ void SetShadowed( const SvxShadowedItem& rNew ) { m_aShadowed = rNew; }
+ void SetColor( const SvxColorItem& rNew ) { m_aColor = rNew; }
void SetAdjust( const SvxAdjustItem& rNew )
{
- aAdjust.SetAdjust( rNew.GetAdjust() );
- aAdjust.SetOneWord( rNew.GetOneWord() );
- aAdjust.SetLastBlock( rNew.GetLastBlock() );
+ m_aAdjust.SetAdjust( rNew.GetAdjust() );
+ m_aAdjust.SetOneWord( rNew.GetOneWord() );
+ m_aAdjust.SetLastBlock( rNew.GetLastBlock() );
}
void SetTextOrientation(const SvxFrameDirectionItem& rNew) { m_aTextOrientation = rNew; }
void SetVerticalAlignment(const SwFormatVertOrient& rNew) { m_aVerticalAlignment = rNew; }
- void SetBox( const SvxBoxItem& rNew ) { aBox = rNew; }
- void SetBackground( const SvxBrushItem& rNew ) { aBackground = rNew; }
+ void SetBox( const SvxBoxItem& rNew ) { m_aBox = rNew; }
+ void SetBackground( const SvxBrushItem& rNew ) { m_aBackground = rNew; }
void SetValueFormat( const OUString& rFormat, LanguageType eLng, LanguageType eSys )
- { sNumFormatString = rFormat; eNumFormatLanguage = eLng; eSysLanguage = eSys; }
+ { m_sNumFormatString = rFormat; m_eNumFormatLanguage = eLng; m_eSysLanguage = eSys; }
bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer );
bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const;
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index c910dc6..37c0639 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -262,86 +262,86 @@ void SwAfVersions::Load( SvStream& rStream, sal_uInt16 nVer )
}
SwBoxAutoFormat::SwBoxAutoFormat()
- : aFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_FONT )) ),
- aHeight( 240, 100, RES_CHRATR_FONTSIZE ),
- aWeight( WEIGHT_NORMAL, RES_CHRATR_WEIGHT ),
- aPosture( ITALIC_NONE, RES_CHRATR_POSTURE ),
-
- aCJKFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_CJK_FONT )) ),
- aCJKHeight( 240, 100, RES_CHRATR_CJK_FONTSIZE ),
- aCJKWeight( WEIGHT_NORMAL, RES_CHRATR_CJK_WEIGHT ),
- aCJKPosture( ITALIC_NONE, RES_CHRATR_CJK_POSTURE ),
-
- aCTLFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_CTL_FONT )) ),
- aCTLHeight( 240, 100, RES_CHRATR_CTL_FONTSIZE ),
- aCTLWeight( WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT ),
- aCTLPosture( ITALIC_NONE, RES_CHRATR_CTL_POSTURE ),
-
- aUnderline( UNDERLINE_NONE, RES_CHRATR_UNDERLINE ),
- aOverline( UNDERLINE_NONE, RES_CHRATR_OVERLINE ),
- aCrossedOut( STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ),
- aContour( false, RES_CHRATR_CONTOUR ),
- aShadowed( false, RES_CHRATR_SHADOWED ),
- aColor( RES_CHRATR_COLOR ),
- aBox( RES_BOX ),
- aTLBR( 0 ),
- aBLTR( 0 ),
- aBackground( RES_BACKGROUND ),
- aAdjust( SVX_ADJUST_LEFT, RES_PARATR_ADJUST ),
+ : m_aFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_FONT )) ),
+ m_aHeight( 240, 100, RES_CHRATR_FONTSIZE ),
+ m_aWeight( WEIGHT_NORMAL, RES_CHRATR_WEIGHT ),
+ m_aPosture( ITALIC_NONE, RES_CHRATR_POSTURE ),
+
+ m_aCJKFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_CJK_FONT )) ),
+ m_aCJKHeight( 240, 100, RES_CHRATR_CJK_FONTSIZE ),
+ m_aCJKWeight( WEIGHT_NORMAL, RES_CHRATR_CJK_WEIGHT ),
+ m_aCJKPosture( ITALIC_NONE, RES_CHRATR_CJK_POSTURE ),
+
+ m_aCTLFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_CTL_FONT )) ),
+ m_aCTLHeight( 240, 100, RES_CHRATR_CTL_FONTSIZE ),
+ m_aCTLWeight( WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT ),
+ m_aCTLPosture( ITALIC_NONE, RES_CHRATR_CTL_POSTURE ),
+
+ m_aUnderline( UNDERLINE_NONE, RES_CHRATR_UNDERLINE ),
+ m_aOverline( UNDERLINE_NONE, RES_CHRATR_OVERLINE ),
+ m_aCrossedOut( STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ),
+ m_aContour( false, RES_CHRATR_CONTOUR ),
+ m_aShadowed( false, RES_CHRATR_SHADOWED ),
+ m_aColor( RES_CHRATR_COLOR ),
+ m_aBox( RES_BOX ),
+ m_aTLBR( 0 ),
+ m_aBLTR( 0 ),
+ m_aBackground( RES_BACKGROUND ),
+ m_aAdjust( SVX_ADJUST_LEFT, RES_PARATR_ADJUST ),
m_aTextOrientation(FRMDIR_ENVIRONMENT, RES_FRAMEDIR),
m_aVerticalAlignment(0, css::text::VertOrientation::NONE, css::text::RelOrientation::FRAME),
- aHorJustify( SVX_HOR_JUSTIFY_STANDARD, 0),
- aVerJustify( SVX_VER_JUSTIFY_STANDARD, 0),
- aStacked( 0 ),
- aMargin( 0 ),
- aLinebreak( 0 ),
- aRotateAngle( 0 ),
+ m_aHorJustify( SVX_HOR_JUSTIFY_STANDARD, 0),
+ m_aVerJustify( SVX_VER_JUSTIFY_STANDARD, 0),
+ m_aStacked( 0 ),
+ m_aMargin( 0 ),
+ m_aLinebreak( 0 ),
+ m_aRotateAngle( 0 ),
// FIXME - add attribute IDs for the diagonal line items
// aTLBR( RES_... ),
// aBLTR( RES_... ),
- aRotateMode( SVX_ROTATE_MODE_STANDARD, 0 )
+ m_aRotateMode( SVX_ROTATE_MODE_STANDARD, 0 )
{
- eSysLanguage = eNumFormatLanguage = ::GetAppLanguage();
- aBox.SetDistance( 55 );
+ m_eSysLanguage = m_eNumFormatLanguage = ::GetAppLanguage();
+ m_aBox.SetDistance( 55 );
}
SwBoxAutoFormat::SwBoxAutoFormat( const SwBoxAutoFormat& rNew )
- : aFont( rNew.aFont ),
- aHeight( rNew.aHeight ),
- aWeight( rNew.aWeight ),
- aPosture( rNew.aPosture ),
- aCJKFont( rNew.aCJKFont ),
- aCJKHeight( rNew.aCJKHeight ),
- aCJKWeight( rNew.aCJKWeight ),
- aCJKPosture( rNew.aCJKPosture ),
- aCTLFont( rNew.aCTLFont ),
- aCTLHeight( rNew.aCTLHeight ),
- aCTLWeight( rNew.aCTLWeight ),
- aCTLPosture( rNew.aCTLPosture ),
- aUnderline( rNew.aUnderline ),
- aOverline( rNew.aOverline ),
- aCrossedOut( rNew.aCrossedOut ),
- aContour( rNew.aContour ),
- aShadowed( rNew.aShadowed ),
- aColor( rNew.aColor ),
- aBox( rNew.aBox ),
- aTLBR( rNew.aTLBR ),
- aBLTR( rNew.aBLTR ),
- aBackground( rNew.aBackground ),
- aAdjust( rNew.aAdjust ),
+ : m_aFont( rNew.m_aFont ),
+ m_aHeight( rNew.m_aHeight ),
+ m_aWeight( rNew.m_aWeight ),
+ m_aPosture( rNew.m_aPosture ),
+ m_aCJKFont( rNew.m_aCJKFont ),
+ m_aCJKHeight( rNew.m_aCJKHeight ),
+ m_aCJKWeight( rNew.m_aCJKWeight ),
+ m_aCJKPosture( rNew.m_aCJKPosture ),
+ m_aCTLFont( rNew.m_aCTLFont ),
+ m_aCTLHeight( rNew.m_aCTLHeight ),
+ m_aCTLWeight( rNew.m_aCTLWeight ),
+ m_aCTLPosture( rNew.m_aCTLPosture ),
+ m_aUnderline( rNew.m_aUnderline ),
+ m_aOverline( rNew.m_aOverline ),
+ m_aCrossedOut( rNew.m_aCrossedOut ),
+ m_aContour( rNew.m_aContour ),
+ m_aShadowed( rNew.m_aShadowed ),
+ m_aColor( rNew.m_aColor ),
+ m_aBox( rNew.m_aBox ),
+ m_aTLBR( rNew.m_aTLBR ),
+ m_aBLTR( rNew.m_aBLTR ),
+ m_aBackground( rNew.m_aBackground ),
+ m_aAdjust( rNew.m_aAdjust ),
m_aTextOrientation(rNew.m_aTextOrientation),
m_aVerticalAlignment(rNew.m_aVerticalAlignment),
- aHorJustify( rNew.aHorJustify ),
- aVerJustify( rNew.aVerJustify ),
- aStacked( rNew.aStacked ),
- aMargin( rNew.aMargin ),
- aLinebreak( rNew.aLinebreak ),
- aRotateAngle( rNew.aRotateAngle ),
- aRotateMode( rNew.aRotateMode ),
- sNumFormatString( rNew.sNumFormatString ),
- eSysLanguage( rNew.eSysLanguage ),
- eNumFormatLanguage( rNew.eNumFormatLanguage )
+ m_aHorJustify( rNew.m_aHorJustify ),
+ m_aVerJustify( rNew.m_aVerJustify ),
+ m_aStacked( rNew.m_aStacked ),
+ m_aMargin( rNew.m_aMargin ),
+ m_aLinebreak( rNew.m_aLinebreak ),
+ m_aRotateAngle( rNew.m_aRotateAngle ),
+ m_aRotateMode( rNew.m_aRotateMode ),
+ m_sNumFormatString( rNew.m_sNumFormatString ),
+ m_eSysLanguage( rNew.m_eSysLanguage ),
+ m_eNumFormatLanguage( rNew.m_eNumFormatLanguage )
{
}
@@ -351,43 +351,43 @@ SwBoxAutoFormat::~SwBoxAutoFormat()
SwBoxAutoFormat& SwBoxAutoFormat::operator=( const SwBoxAutoFormat& rNew )
{
- aFont = rNew.aFont;
- aHeight = rNew.aHeight;
- aWeight = rNew.aWeight;
- aPosture = rNew.aPosture;
- aCJKFont = rNew.aCJKFont;
- aCJKHeight = rNew.aCJKHeight;
- aCJKWeight = rNew.aCJKWeight;
- aCJKPosture = rNew.aCJKPosture;
- aCTLFont = rNew.aCTLFont;
- aCTLHeight = rNew.aCTLHeight;
- aCTLWeight = rNew.aCTLWeight;
- aCTLPosture = rNew.aCTLPosture;
- aUnderline = rNew.aUnderline;
- aOverline = rNew.aOverline;
- aCrossedOut = rNew.aCrossedOut;
- aContour = rNew.aContour;
- aShadowed = rNew.aShadowed;
- aColor = rNew.aColor;
- SetAdjust( rNew.aAdjust );
+ m_aFont = rNew.m_aFont;
+ m_aHeight = rNew.m_aHeight;
+ m_aWeight = rNew.m_aWeight;
+ m_aPosture = rNew.m_aPosture;
+ m_aCJKFont = rNew.m_aCJKFont;
+ m_aCJKHeight = rNew.m_aCJKHeight;
+ m_aCJKWeight = rNew.m_aCJKWeight;
+ m_aCJKPosture = rNew.m_aCJKPosture;
+ m_aCTLFont = rNew.m_aCTLFont;
+ m_aCTLHeight = rNew.m_aCTLHeight;
+ m_aCTLWeight = rNew.m_aCTLWeight;
+ m_aCTLPosture = rNew.m_aCTLPosture;
+ m_aUnderline = rNew.m_aUnderline;
+ m_aOverline = rNew.m_aOverline;
+ m_aCrossedOut = rNew.m_aCrossedOut;
+ m_aContour = rNew.m_aContour;
+ m_aShadowed = rNew.m_aShadowed;
+ m_aColor = rNew.m_aColor;
+ SetAdjust( rNew.m_aAdjust );
m_aTextOrientation = rNew.m_aTextOrientation;
m_aVerticalAlignment = rNew.m_aVerticalAlignment;
- aBox = rNew.aBox;
- aTLBR = rNew.aTLBR;
- aBLTR = rNew.aBLTR;
- aBackground = rNew.aBackground;
-
- aHorJustify = rNew.aHorJustify;
- aVerJustify = rNew.aVerJustify;
- aStacked.SetValue( rNew.aStacked.GetValue() );
- aMargin = rNew.aMargin;
- aLinebreak.SetValue( rNew.aLinebreak.GetValue() );
- aRotateAngle.SetValue( rNew.aRotateAngle.GetValue() );
- aRotateMode.SetValue( rNew.aRotateMode.GetValue() );
-
- sNumFormatString = rNew.sNumFormatString;
- eSysLanguage = rNew.eSysLanguage;
- eNumFormatLanguage = rNew.eNumFormatLanguage;
+ m_aBox = rNew.m_aBox;
+ m_aTLBR = rNew.m_aTLBR;
+ m_aBLTR = rNew.m_aBLTR;
+ m_aBackground = rNew.m_aBackground;
+
+ m_aHorJustify = rNew.m_aHorJustify;
+ m_aVerJustify = rNew.m_aVerJustify;
+ m_aStacked.SetValue( rNew.m_aStacked.GetValue() );
+ m_aMargin = rNew.m_aMargin;
+ m_aLinebreak.SetValue( rNew.m_aLinebreak.GetValue() );
+ m_aRotateAngle.SetValue( rNew.m_aRotateAngle.GetValue() );
+ m_aRotateMode.SetValue( rNew.m_aRotateMode.GetValue() );
+
+ m_sNumFormatString = rNew.m_sNumFormatString;
+ m_eSysLanguage = rNew.m_eSysLanguage;
+ m_eNumFormatLanguage = rNew.m_eNumFormatLanguage;
return *this;
}
@@ -402,48 +402,48 @@ bool SwBoxAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions, sa
SfxPoolItem* pNew;
SvxOrientationItem aOrientation( SVX_ORIENTATION_STANDARD, 0);
- READ( aFont, SvxFontItem , rVersions.nFontVersion)
+ READ( m_aFont, SvxFontItem , rVersions.nFontVersion)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list