[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sc/inc sc/sdi sc/source

Thu May 9 10:54:46 PDT 2013

sc/inc/sc.hrc                 |    5 +++--
 sc/sdi/cellsh.sdi             |    1 +
 sc/sdi/scalc.sdi              |   26 ++++++++++++++++++++++++++
 sc/source/ui/view/cellsh3.cxx |    4 ++++
 4 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit 24887fee58356ee46f8b31e727b5c1602b3971a7
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Thu Apr 25 13:01:39 2013 +0000

    Resolves: #i122141# introduce missing Char Font dialog Slot
    
    for opening Character Font dialog for Text property panel in Calc
    
    (cherry picked from commit 2ec379f0bc8af50ead792677b1f69c61d6903cf3)
    
    Change-Id: I07e7affe744efe151c8701e096fde01a52c2d7e0

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 18407cf..77882db 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -658,8 +658,9 @@
 
 // Sidebar -------------------------------------------------------------
 
-#define SID_SCGRIDSHOW          (SC_SIDEBAR_PROPERTY_BEGIN+1)
-#define SID_NUMBER_TYPE_FORMAT  (SC_SIDEBAR_PROPERTY_BEGIN+2)
+#define SID_PROPERTY_PANEL_CELLTEXT_DLG (SC_SIDEBAR_PROPERTY_BEGIN+0)
+#define SID_SCGRIDSHOW                  (SC_SIDEBAR_PROPERTY_BEGIN+1)
+#define SID_NUMBER_TYPE_FORMAT          (SC_SIDEBAR_PROPERTY_BEGIN+2)
 
 // resources
 
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 4f9fe32..b889801 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -87,6 +87,7 @@ interface CellSelection
     SID_SELECT_SCENARIO     [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
     FID_CELL_FORMAT         [ ExecMethod = Execute; StateMethod = GetBlockState; ]
     SID_ENABLE_HYPHENATION  [ ExecMethod = Execute; StateMethod = GetBlockState; ]
+    SID_PROPERTY_PANEL_CELLTEXT_DLG [ ExecMethod = Execute;]
     SID_CELL_FORMAT_BORDER  [ ExecMethod = Execute; ]
     SID_CHAR_DLG_EFFECT     [ ExecMethod = Execute; ]
     FID_ROW_HEIGHT          [ ExecMethod = Execute; StateMethod = GetState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 8945ecb..c9999fe 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -3495,6 +3495,32 @@ SfxVoidItem Hyphenate SID_ENABLE_HYPHENATION
 ]
 
 //--------------------------------------------------------------------------
+
+SfxVoidItem CellTextDlg SID_PROPERTY_PANEL_CELLTEXT_DLG
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Asynchron;
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_OPTIONS;
+]
+
+//--------------------------------------------------------------------------
 SfxVoidItem InputLineBlock FID_INPUTLINE_BLOCK
 ()
 [
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 81c58f6..5830838 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -357,6 +357,10 @@ void ScCellShell::Execute( SfxRequest& rReq )
             pTabViewShell->ExecuteCellFormatDlg(rReq, "alignment");
             break;
 
+        case SID_PROPERTY_PANEL_CELLTEXT_DLG:
+            pTabViewShell->ExecuteCellFormatDlg( rReq, "font" );
+            break;
+
         case SID_CELL_FORMAT_BORDER:
             pTabViewShell->ExecuteCellFormatDlg( rReq, "borders" );
             break;
