diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-11 23:18:39 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-11 23:35:17 -0400 |
commit | d1ce7aaa5ac3c8cd851826d6164db93a9a486609 (patch) | |
tree | ef369dfce2a3627a7932303a4ccddd3a4bcafa29 | |
parent | b9640634d0cf698dba1c07d9c89a6246360df792 (diff) |
Re-organize the data members of SvTreeListBox.
Change-Id: Iefe8182dc20f22fa65299d9253fba3830cd1a9c5
-rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/treelistbox.hxx | 112 |
2 files changed, 55 insertions, 59 deletions
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 534c178a51e9..8637efa62936 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1081,7 +1081,7 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) { ImplShowTargetEmphasis( pTargetEntry, sal_False ); } - else if( !nDragDropMode ) + else if( !GetDragDropMode() ) { SAL_WARN( "sc.ui", "SdPageObjsTLB::AcceptDrop(): no target" ); } diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx index cc6663781ab3..0ab9a32a3f41 100644 --- a/svtools/inc/svtools/treelistbox.hxx +++ b/svtools/inc/svtools/treelistbox.hxx @@ -313,7 +313,61 @@ class SVT_DLLPUBLIC SvTreeListBox ,public ::vcl::ISearchableStringList { friend class SvLBoxEntry; + friend class SvImpLBox; + friend class ImpLBSelEng; + friend class TreeControlPeer; + SvLBox_Impl* pLBoxImpl; + SvImpLBox* pImp; + Link aCheckButtonHdl; + Link aScrolledHdl; + Link aExpandedHdl; + Link aExpandingHdl; + Link aSelectHdl; + Link aDeselectHdl; + + Accelerator aInpEditAcc; + Image aPrevInsertedExpBmp; + Image aPrevInsertedColBmp; + Image aCurInsertedExpBmp; + Image aCurInsertedColBmp; + + short nContextBmpWidthMax; + short nEntryHeight; + short nEntryHeightOffs; + short nIndent; + short nFocusWidth; + sal_uInt16 nFirstSelTab; + sal_uInt16 nLastSelTab; + sal_uInt16 aContextBmpMode; + + long mnCheckboxItemWidth; + + SvLBoxEntry* pHdlEntry; + SvLBoxItem* pHdlItem; + + DragDropMode nDragDropMode; + DragDropMode nOldDragMode; + SelectionMode eSelMode; + sal_Int8 nDragOptions; + + SvLBoxEntry* pEdEntry; + SvLBoxItem* pEdItem; + +protected: + Link aDoubleClickHdl; + SvLBoxEntry* pTargetEntry; + SvLBoxButtonData* pCheckButtonData; + std::vector<SvLBoxTab*> aTabs; + sal_uInt16 nTreeFlags; + sal_uInt16 nImpFlags; + // Move/CopySelection: Position des aktuellen Eintrags in Selektionsliste + sal_uInt16 nCurEntrySelPos; + +private: + void SetBaseModel(SvLBoxTreeList* pNewModel); + + DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * ); DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, void * ); // Handler, der von TreeList zum Clonen eines Entries aufgerufen wird DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvListEntry* ); @@ -328,32 +382,8 @@ class SVT_DLLPUBLIC SvTreeListBox SVT_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB ); DECL_DLLPRIVATE_STATIC_LINK( SvTreeListBox, DragFinishHdl_Impl, sal_Int8* ); - DragDropMode nOldDragMode; - -private: - void SetBaseModel(SvLBoxTreeList* pNewModel); - protected: - Link aExpandedHdl; - Link aExpandingHdl; - Link aSelectHdl; - Link aDeselectHdl; - Link aDoubleClickHdl; - SvLBoxEntry* pHdlEntry; - SvLBoxItem* pHdlItem; - SvLBoxEntry* pTargetEntry; - - SvLBox_Impl* pLBoxImpl; - - sal_uInt16 nImpFlags; - // Move/CopySelection: Position des aktuellen Eintrags in Selektionsliste - sal_uInt16 nCurEntrySelPos; - - DragDropMode nDragDropMode; - SelectionMode eSelMode; - sal_Int8 nDragOptions; - sal_Bool CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 ); void ImplShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool bShow); void EnableSelectionAsDropTarget( sal_Bool bEnable = sal_True, @@ -600,33 +630,6 @@ protected: using SvListView::Select; using SvListView::SelectAll; -// boundary ----- former SvTreeListBox ends here. - - friend class SvImpLBox; - friend class ImpLBSelEng; - friend class TreeControlPeer; - - SvImpLBox* pImp; - Link aCheckButtonHdl; - Link aScrolledHdl; - Accelerator aInpEditAcc; - Image aPrevInsertedExpBmp; - Image aPrevInsertedColBmp; - Image aCurInsertedExpBmp; - Image aCurInsertedColBmp; - - short nContextBmpWidthMax; - sal_uInt16 nFirstSelTab, nLastSelTab; - short nEntryHeight; - short nEntryHeightOffs; - short nIndent; - short nFocusWidth; - sal_uInt16 aContextBmpMode; - - long mnCheckboxItemWidth; - - DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * ); - SVT_DLLPRIVATE short GetHeightOffset( const Image& rBmp, Size& rLogicSize); SVT_DLLPRIVATE short GetHeightOffset( const Font& rFont, Size& rLogicSize); @@ -645,11 +648,6 @@ protected: SVT_DLLPRIVATE void ImplInitStyle(); protected: - SvLBoxButtonData* pCheckButtonData; - sal_uInt16 nTreeFlags; - - SvLBoxEntry* pEdEntry; - SvLBoxItem* pEdItem; void EditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem, const Selection& ); @@ -657,8 +655,6 @@ protected: void EditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem, const Point& rMousePos ); - std::vector<SvLBoxTab*> aTabs; - // berechnet abhaengig von TreeList-Style & Bitmap-Groessen // alle Tabulatoren neu; wird beim Einfuegen/Austauschen von // Bitmaps, beim Wechsel des Models usw. automatisch gerufen |