[Libreoffice-commits] core.git: 2 commits - sw/source

[Caolán McNamara]

 sw/source/uibase/ribbar/inputwin.cxx |   26 +++++++++++++++-----------
 sw/source/uibase/ribbar/inputwin.hrc |    3 ---
 sw/source/uibase/ribbar/inputwin.src |   16 +---------------
 3 files changed, 16 insertions(+), 29 deletions(-)

New commits:
commit facaeedfef4b63bc15beed303330a42e4c9b1406
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 11 16:16:38 2016 +0100

    de-src solo edits in writer formula bar
    
    Change-Id: Iba5406e1c4e573c198116baed10a9ad6d142a445

diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index ffec024..9a29eaf 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 3d84ae4..6f119d2 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 011cf34..0e00305 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
commit eece14a1be8da75544a587eefcfe8817e0c05fb0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 11 16:00:10 2016 +0100

    ED_FORMULA resource is unused
    
    Change-Id: I8f0184c585478c59bcf230bc06ba5ba21fb50400

diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index cd2347f..ffec024 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -54,6 +54,8 @@
 
 #include <IDocumentContentOperations.hxx>
 
+#define ED_FORMULA          3
+
 SFX_IMPL_POS_CHILDWINDOW_WITHID( SwInputChild, FN_EDIT_FORMULA, SFX_OBJECTBAR_OBJECT )
 
 SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher)
@@ -85,13 +87,13 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher)
         pView = pActiveView;
     pWrtShell = pView ? pView->GetWrtShellPtr() : nullptr;
 
-    InsertWindow( ED_POS, aPos.get(), ToolBoxItemBits::NONE, 0);
+    InsertWindow(ED_POS, aPos.get(), ToolBoxItemBits::NONE, 0);
     SetItemText(ED_POS, SW_RESSTR(STR_ACCESS_FORMULA_TYPE));
     aPos->SetAccessibleName(SW_RESSTR(STR_ACCESS_FORMULA_TYPE));
     SetAccessibleName(SW_RESSTR(STR_ACCESS_FORMULA_TOOLBAR));
     InsertSeparator ( 1 );
     InsertSeparator ();
-    InsertWindow( ED_FORMULA, aEdit.get());
+    InsertWindow(ED_FORMULA, aEdit.get());
     SetItemText(ED_FORMULA, SW_RESSTR(STR_ACCESS_FORMULA_TEXT));
     aEdit->SetAccessibleName(SW_RESSTR(STR_ACCESS_FORMULA_TEXT));
     SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
diff --git a/sw/source/uibase/ribbar/inputwin.hrc b/sw/source/uibase/ribbar/inputwin.hrc
index a361678..3d84ae4 100644
--- a/sw/source/uibase/ribbar/inputwin.hrc
+++ b/sw/source/uibase/ribbar/inputwin.hrc
@@ -51,7 +51,6 @@
 #define MN_POP_FUNC         31
 
 #define ED_POS              2
-#define ED_FORMULA          3
 
 #endif
 
diff --git a/sw/source/uibase/ribbar/inputwin.src b/sw/source/uibase/ribbar/inputwin.src
index 03ef36e..011cf34 100644
--- a/sw/source/uibase/ribbar/inputwin.src
+++ b/sw/source/uibase/ribbar/inputwin.src
@@ -63,14 +63,8 @@ ToolBox RID_TBX_FORMULA
         SVLook = TRUE ;
         Center = TRUE ;
     };
-    Edit ED_FORMULA
-    {
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Size = MAP_APPFONT ( 500 , 11 ) ;
-        SVLook = TRUE ;
-    };
 };
+
 Menu MN_CALC_POPUP
 {
     ItemList =