diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2009-12-08 17:33:39 +0100 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2009-12-08 17:33:39 +0100 |
| commit | dada72080460ab3a1bf4228a38454339b1d5f204 (patch) | |
| tree | c9d9fc732e58f1e7ebab52a2452510ca01310030 /sd/source/ui/app/layoutctrl.cxx | |
| parent | f0efe6abc4156df0834f8e6953a8bcee9ead9506 (diff) | |
renaissance01: #i107213# more work on layout popup
Diffstat (limited to 'sd/source/ui/app/layoutctrl.cxx')
| -rw-r--r-- | sd/source/ui/app/layoutctrl.cxx | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/sd/source/ui/app/layoutctrl.cxx b/sd/source/ui/app/layoutctrl.cxx index 41e71f3066ff..71069cadab8f 100644 --- a/sd/source/ui/app/layoutctrl.cxx +++ b/sd/source/ui/app/layoutctrl.cxx @@ -52,6 +52,7 @@ #include <svx/toolbarmenu.hxx> +#include "layoutdialog.hxx" #include "sdresid.hxx" #include "res_bmp.hrc" #include "strings.hrc" @@ -116,6 +117,8 @@ public: SdLayoutControl::SdLayoutControl( USHORT _nSlotId, USHORT _nId, ToolBox& rTbx ) : SfxToolBoxControl( _nSlotId, _nId, rTbx ) { + rTbx.SetItemBits( _nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( _nId ) ); + rTbx.Invalidate(); } // ----------------------------------------------------------------------- @@ -147,18 +150,29 @@ SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const SfxPopupWindow* SdLayoutControl::CreatePopupWindow() { - ToolBox& rTbx = GetToolBox(); - SdLayoutDialogContent* pWin = new SdLayoutDialogContent( GetId(), m_xFrame, &rTbx ); -// pWin->StartPopupMode( &rTbx, FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_NOKEYCLOSE ); - pWin->EnableDocking(true); + OUString sResourceName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/dockingwindow/" ) ); + sResourceName += OUString::valueOf( static_cast<sal_Int32>(GetId()) ); + createAndPositionSubToolBar( sResourceName ); +/* + SfxPopupWindow* pWin = 0; - Window::GetDockingManager()->StartPopupMode( &rTbx, pWin ); -// SetPopupWindow( pWin ); -// return pWin; + ToolBox& rTbx = GetToolBox(); + SfxViewFrame* pViewFrame = SfxViewFrame::Current(); + if( pViewFrame ) + { + pWin = sd::LayoutDialogChildWindow::createChildWindow( *pViewFrame, &rTbx ); + if( pWin ) + { + pWin->EnableDocking(true); + Window::GetDockingManager()->StartPopupMode( &rTbx, pWin ); + } + } + SetPopupWindow( pWin ); + */ return 0; } -#ifdef 0 +#if 0 // ----------------------------------------------------------------------- struct snewfoil_value_info |