diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-11 16:16:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-11 16:17:48 +0100 |
| commit | facaeedfef4b63bc15beed303330a42e4c9b1406 (patch) | |
| tree | f15e7f825bac231c914b20463f2254f3c3f79f3d /sw | |
| parent | eece14a1be8da75544a587eefcfe8817e0c05fb0 (diff) | |
de-src solo edits in writer formula bar
Change-Id: Iba5406e1c4e573c198116baed10a9ad6d142a445
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/ribbar/inputwin.cxx | 20 | ||||
| -rw-r--r-- | sw/source/uibase/ribbar/inputwin.hrc | 2 | ||||
| -rw-r--r-- | sw/source/uibase/ribbar/inputwin.src | 8 |
3 files changed, 11 insertions, 19 deletions
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index ffec024beb67..9a29eaf9b22a 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -54,19 +54,20 @@ #include <IDocumentContentOperations.hxx> +#define ED_POS 2 #define ED_FORMULA 3 SFX_IMPL_POS_CHILDWINDOW_WITHID( SwInputChild, FN_EDIT_FORMULA, SFX_OBJECTBAR_OBJECT ) SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher) - : ToolBox( pParent , SW_RES( RID_TBX_FORMULA )), - aPos( VclPtr<Edit>::Create(this, SW_RES(ED_POS))), - aEdit( VclPtr<InputEdit>::Create(this, WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION)), - aPopMenu( SW_RES(MN_CALC_POPUP)), - pMgr(nullptr), - pWrtShell(nullptr), - pView(nullptr), - aAktTableName(aEmptyOUStr) + : ToolBox(pParent, SW_RES(RID_TBX_FORMULA)) + , aPos(VclPtr<Edit>::Create(this, WB_3DLOOK|WB_CENTER|WB_BORDER|WB_READONLY)) + , aEdit(VclPtr<InputEdit>::Create(this, WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION)) + , aPopMenu(SW_RES(MN_CALC_POPUP)) + , pMgr(nullptr) + , pWrtShell(nullptr) + , pView(nullptr) + , aAktTableName(aEmptyOUStr) , m_bDoesUndo(true) , m_bResetUndo(false) , m_bCallUndo(false) @@ -76,7 +77,8 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher) FreeResource(); - aEdit->SetSizePixel( aEdit->CalcMinimumSize() ); + aEdit->SetSizePixel(aEdit->CalcMinimumSize()); + aPos->SetSizePixel(aPos->LogicToPixel(Size(45, 11), MapMode(MapUnit::MapAppFont))); SfxImageManager* pManager = SfxImageManager::GetImageManager( *SW_MOD() ); pManager->RegisterToolBox(this); diff --git a/sw/source/uibase/ribbar/inputwin.hrc b/sw/source/uibase/ribbar/inputwin.hrc index 3d84ae4d2a26..6f119d25e27b 100644 --- a/sw/source/uibase/ribbar/inputwin.hrc +++ b/sw/source/uibase/ribbar/inputwin.hrc @@ -50,8 +50,6 @@ #define MN_POP_STATISTICS 30 #define MN_POP_FUNC 31 -#define ED_POS 2 - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/ribbar/inputwin.src b/sw/source/uibase/ribbar/inputwin.src index 011cf347555c..0e00305cbd79 100644 --- a/sw/source/uibase/ribbar/inputwin.src +++ b/sw/source/uibase/ribbar/inputwin.src @@ -55,14 +55,6 @@ ToolBox RID_TBX_FORMULA Text [ en-US ] = "Apply" ; }; }; - Edit ED_POS - { - Border = TRUE ; - Size = MAP_APPFONT ( 45 , 11 ) ; - ReadOnly = TRUE ; - SVLook = TRUE ; - Center = TRUE ; - }; }; Menu MN_CALC_POPUP |