diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-06 21:44:32 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-06 21:47:46 +0300 |
| commit | c872e3c432566811e7644e76d1359b91fb377144 (patch) | |
| tree | 4e16d8b201d08d645fdf9e2ab192422a4a0e4686 /svx | |
| parent | cd1d2b3e1b5802576414cf497a3d2b56e4b0eb70 (diff) | |
Extrusion controls should not allow tearoff
Change-Id: Ie4e2b42d3f261ded4f2c8778e6a099103d7d3663
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index b09e4355a6f6..aab9155340f0 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -62,8 +62,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow ) - : ToolbarMenu(rFrame, pParentWindow, - WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK) + : ToolbarMenu(rFrame, pParentWindow, WB_STDPOPUP) , mrController(rController) , maImgPerspective(SVX_RES(RID_SVXIMG_PERSPECTIVE)) , maImgParallel(SVX_RES(RID_SVXIMG_PARALLEL)) @@ -323,7 +322,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( svt::ToolboxController& rController, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow -) : ToolbarMenu( rFrame, pParentWindow, WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK) +) : ToolbarMenu( rFrame, pParentWindow, WB_STDPOPUP ) , mrController( rController ) , maImgDepth0(SVX_RES(RID_SVXIMG_DEPTH_0)) , maImgDepth1(SVX_RES(RID_SVXIMG_DEPTH_1)) @@ -530,7 +529,7 @@ static const char g_sExtrusionLightingIntensity[] = ".uno:ExtrusionLightingInten ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rController, const css::uno::Reference<css::frame::XFrame >& rFrame, vcl::Window* pParentWindow) - : ToolbarMenu(rFrame, pParentWindow, WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK) + : ToolbarMenu(rFrame, pParentWindow, WB_STDPOPUP) , mrController(rController) , maImgBright(SVX_RES(RID_SVXIMG_LIGHTING_BRIGHT)) , maImgNormal(SVX_RES(RID_SVXIMG_LIGHTING_NORMAL)) @@ -800,7 +799,7 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rController, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow) - : ToolbarMenu(rFrame, pParentWindow, WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK) + : ToolbarMenu(rFrame, pParentWindow, WB_STDPOPUP) , mrController(rController) , maImgSurface1(SVX_RES(RID_SVXIMG_WIRE_FRAME)) , maImgSurface2(SVX_RES(RID_SVXIMG_MATTE)) |