[Libreoffice-commits] core.git: Branch 'feature/sidebar' - include/sfx2 officecfg/registry sfx2/source

[Andre Fischer]

 include/sfx2/sidebar/EnumContext.hxx                           |    1 +
 officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs |    1 +
 sfx2/source/sidebar/EnumContext.cxx                            |    1 +
 sfx2/source/sidebar/ResourceManager.cxx                        |    1 +
 4 files changed, 4 insertions(+)

New commits:
commit 6d23bd36c57fe877e3ae55f022de3f9492e56f94
Author: Andre Fischer <af at apache.org>
Date:   Tue Apr 30 11:36:12 2013 +0000

    Related: #i122056# Added another Writer variant to sidebar...
    
    context handling.
    
    (cherry picked from commit 542f0ff097c0e3eb71a1ad19f6d46a9860e754d9)
    
    Conflicts:
    	sfx2/inc/sfx2/sidebar/EnumContext.hxx
    
    Change-Id: Ib88f75d3dfdba5c14c2d3c747e90eecd00e6f249

diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx
index cad942e..819e837 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -36,6 +36,7 @@ public:
         Application_WriterGlobal,
         Application_WriterWeb,
         Application_WriterXML,
+        Application_WriterForm,
         Application_Calc,
         Application_Draw,
         Application_Impress,
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
index 8d096b3..de7d7fa 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -82,6 +82,7 @@
                  com.sun.star.text.GlobalDocument
                  com.sun.star.text.WebDocument
                  com.sun.star.xforms.XMLFormDocument
+                 com.sun.star.sdb.FormDesign
                  com.sun.star.sheet.SpreadsheetDocument
                  com.sun.star.presentation.PresentationDocument
                  com.sun.star.drawing.DrawingDocument
diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx
index acc5340..ce1d743 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -157,6 +157,7 @@ void EnumContext::ProvideApplicationContainers (void)
         AddEntry(A2S("com.sun.star.text.GlobalDocument"), EnumContext::Application_WriterGlobal);
         AddEntry(A2S("com.sun.star.text.WebDocument"), EnumContext::Application_WriterWeb);
         AddEntry(A2S("com.sun.star.xforms.XMLFormDocument"), EnumContext::Application_WriterXML);
+        AddEntry(A2S("com.sun.star.sdb.FormDesign"), EnumContext::Application_WriterForm);
         AddEntry(A2S("com.sun.star.sheet.SpreadsheetDocument"), EnumContext::Application_Calc);
         AddEntry(A2S("com.sun.star.drawing.DrawingDocument"), EnumContext::Application_Draw);
         AddEntry(A2S("com.sun.star.presentation.PresentationDocument"), EnumContext::Application_Impress);
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 725471a..26d6e4d 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -435,6 +435,7 @@ void ResourceManager::ReadContextList (
                 aApplications.push_back(EnumContext::Application_WriterGlobal);
                 aApplications.push_back(EnumContext::Application_WriterWeb);
                 aApplications.push_back(EnumContext::Application_WriterXML);
+                aApplications.push_back(EnumContext::Application_WriterForm);
             }
             else
             {