diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-10 15:09:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-11 15:32:14 +0100 |
| commit | 33603a582bdd173a8e85c78bb0e8ef82874b8e59 (patch) | |
| tree | 863593b5516b61ca37122ea566087bea8744e830 /sc/source | |
| parent | 51e5e4970bda753faf7403cbf3c68ded3ed7a71f (diff) | |
convert writer navigator to .ui format
Change-Id: I83f834ea050372362b50de61753c2b3e33c67778
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/inc/content.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/navipi/content.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/navipi/navipi.cxx | 18 |
3 files changed, 11 insertions, 13 deletions
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 4c60d15b2712..4a673c79997a 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -129,6 +129,7 @@ public: void SetNavigatorDlgFlag(bool isInNavigateDlg){ bisInNavigatoeDlg=isInNavigateDlg;}; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual Size GetOptimalSize() const override; void InitWindowBits( bool bButtons ); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index b309d592a017..fd5bb59af9d4 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -134,6 +134,11 @@ ScContentTree::ScContentTree(vcl::Window* pParent, ScNavigatorDlg* pNavigatorDlg pTmpEntry= nullptr; } +Size ScContentTree::GetOptimalSize() const +{ + return LogicToPixel(Size(110, 100), MapUnit::MapAppFont); +} + ScContentTree::~ScContentTree() { disposeOnce(); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 2443250c133a..e3782a5010c0 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -83,11 +83,7 @@ ColumnEdit::~ColumnEdit() disposeOnce(); } -VCL_BUILDER_DECL_FACTORY(ColumnEdit) -{ - (void)rMap; - rRet = VclPtr<ColumnEdit>::Create(pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT); -} +VCL_BUILDER_FACTORY_ARGS(ColumnEdit, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT) bool ColumnEdit::Notify( NotifyEvent& rNEvt ) { @@ -264,11 +260,7 @@ RowEdit::~RowEdit() disposeOnce(); } -VCL_BUILDER_DECL_FACTORY(RowEdit) -{ - (void)rMap; - rRet = VclPtr<RowEdit>::Create(pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT); -} +VCL_BUILDER_FACTORY_ARGS(RowEdit, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT) bool RowEdit::Notify( NotifyEvent& rNEvt ) { @@ -417,9 +409,9 @@ void ScNavigatorDlg::UpdateButtons() aTbxCmd->SetItemImage(nDragModeId, Image(ScResId(nImageId))); } -ScNavigatorSettings::ScNavigatorSettings() : - mnRootSelected( ScContentId::ROOT ), - mnChildSelected( SC_CONTENT_NOCHILD ) +ScNavigatorSettings::ScNavigatorSettings() + : mnRootSelected(ScContentId::ROOT) + , mnChildSelected(SC_CONTENT_NOCHILD) { } |