diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-28 16:30:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-30 15:43:39 +0000 |
| commit | 11d0c28601dc89c48e67a7b39ba82dd52e660334 (patch) | |
| tree | 75e0e9d83694637de1e3b95a25c66de911d381bc /svx/source/dialog | |
| parent | Updated core (diff) | |
| download | core-11d0c28601dc89c48e67a7b39ba82dd52e660334.tar.gz core-11d0c28601dc89c48e67a7b39ba82dd52e660334.zip | |
convert RID_SVXFLOAT_3D docking window to .ui
This is an epic dialog with lots of moving parts
Change-Id: I4e53580ac5b01f4a717d2fe594a18c8e83b45a6f
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/dlgctl3d.cxx | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 4711b30e64bf..ce4358124f81 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -41,8 +41,8 @@ using namespace com::sun::star; -Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, const ResId& rResId) -: Control(pParent, rResId), +Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle) +: Control(pParent, nStyle), mpModel(0), mpFmPage(0), mp3DView(0), @@ -57,20 +57,14 @@ Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, const ResId& rRes SetBackground(); } -Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle) -: Control(pParent, nStyle), - mpModel(0), - mpFmPage(0), - mp3DView(0), - mpScene(0), - mp3DObj(0), - mnObjectType(PREVIEW_OBJECTTYPE_SPHERE) +Size Svx3DPreviewControl::GetOptimalSize() const { - Construct(); + return LogicToPixel(Size(80, 100), MAP_APPFONT); +} - // do not paint background self, DrawingLayer paints this buffered and as page - SetControlBackground(); - SetBackground(); +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvx3DPreviewControl(vcl::Window *pParent, VclBuilder::stringmap &) +{ + return new Svx3DPreviewControl(pParent); } Svx3DPreviewControl::~Svx3DPreviewControl() @@ -952,19 +946,6 @@ basegfx::B3DVector Svx3DLightControl::GetLightDirection(sal_uInt32 nNum) const return basegfx::B3DVector(); } - - -SvxLightCtl3D::SvxLightCtl3D( vcl::Window* pParent, const ResId& rResId) -: Control(pParent, rResId), - maLightControl(this, 0), - maHorScroller(this, WB_HORZ | WB_DRAG), - maVerScroller(this, WB_VERT | WB_DRAG), - maSwitcher(this, 0) -{ - // init members - Init(); -} - SvxLightCtl3D::SvxLightCtl3D( vcl::Window* pParent) : Control(pParent, WB_BORDER | WB_TABSTOP), maLightControl(this, 0), @@ -986,7 +967,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLightCtl3D(vcl::Win return new SvxLightCtl3D(pParent); } - void SvxLightCtl3D::Init() { // #i58240# set HelpIDs for scrollbars and switcher |