Kaydet (Commit) 56019dcb authored tarafından Jan Holesovsky's avatar Jan Holesovsky

cleanup: We re-init this member all the time anyway.

Also kill some unused measuring.

Change-Id: I69521d36e4da4b50cd58f346f0adb0e5563c8bec
üst 6b50523f
...@@ -76,7 +76,6 @@ public: ...@@ -76,7 +76,6 @@ public:
class SwTbxAutoTextCtrl : public SfxToolBoxControl class SwTbxAutoTextCtrl : public SfxToolBoxControl
{ {
PopupMenu* pPopup; PopupMenu* pPopup;
SwView* pView;
void DelPopup(); void DelPopup();
public: public:
......
...@@ -49,8 +49,6 @@ ...@@ -49,8 +49,6 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
// Size check // Size check
#define NAVI_ENTRIES 20 #define NAVI_ENTRIES 20
#if NAVI_ENTRIES != NID_COUNT #if NAVI_ENTRIES != NID_COUNT
...@@ -164,8 +162,7 @@ SwTbxAutoTextCtrl::SwTbxAutoTextCtrl( ...@@ -164,8 +162,7 @@ SwTbxAutoTextCtrl::SwTbxAutoTextCtrl(
sal_uInt16 nId, sal_uInt16 nId,
ToolBox& rTbx ) : ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ), SfxToolBoxControl( nSlotId, nId, rTbx ),
pPopup(0), pPopup(0)
pView(0)
{ {
rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWN | rTbx.GetItemBits( nId ) ); rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWN | rTbx.GetItemBits( nId ) );
} }
...@@ -177,17 +174,9 @@ SwTbxAutoTextCtrl::~SwTbxAutoTextCtrl() ...@@ -177,17 +174,9 @@ SwTbxAutoTextCtrl::~SwTbxAutoTextCtrl()
SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow() SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
{ {
pView = ::GetActiveView(); SwView* pView = ::GetActiveView();
if(pView && !pView->GetDocShell()->IsReadOnly() && if(pView && !pView->GetDocShell()->IsReadOnly() &&
!pView->GetWrtShell().HasReadonlySel() ) !pView->GetWrtShell().HasReadonlySel() )
{
ToolBox& rBox = GetToolBox();
Rectangle aItemRect( rBox.GetItemRect( GetId() ) );
Point aPt(rBox.OutputToScreenPixel(aItemRect.TopLeft()));
aPt.X() += aItemRect.GetWidth()/2;
aPt.Y() += aItemRect.GetHeight()/2;
if(pView)
{ {
Link aLnk = LINK(this, SwTbxAutoTextCtrl, PopupHdl); Link aLnk = LINK(this, SwTbxAutoTextCtrl, PopupHdl);
...@@ -216,7 +205,7 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow() ...@@ -216,7 +205,7 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
} }
} }
} }
}
ToolBox* pToolBox = &GetToolBox(); ToolBox* pToolBox = &GetToolBox();
sal_uInt16 nId = GetId(); sal_uInt16 nId = GetId();
pToolBox->SetItemDown( nId, true ); pToolBox->SetItemDown( nId, true );
...@@ -256,7 +245,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu) ...@@ -256,7 +245,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
OUString sShortName = OUString sShortName =
pGlossaryList->GetBlockShortName(nBlock - 1, nId - (100 * nBlock) - 1); pGlossaryList->GetBlockShortName(nBlock - 1, nId - (100 * nBlock) - 1);
SwGlossaryHdl* pGlosHdl = pView->GetGlosHdl(); SwGlossaryHdl* pGlosHdl = ::GetActiveView()->GetGlosHdl();
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!"); OSL_ENSURE(pFact, "Dialog creation failed!");
::GlossarySetActGroup fnSetActGroup = pFact->SetGlossaryActGroupFunc(); ::GlossarySetActGroup fnSetActGroup = pFact->SetGlossaryActGroupFunc();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment