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

[Oliver-Rainer Wittmann]

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

New commits:
commit 293bf865c55a10784b32ba1130b0ab5c23d7b22f
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Tue May 14 13:21:45 2013 +0000

    Resolves: #i122056# adding another Writer variant for sidebar context handling
    
    Patch by: Ariel
    Review by: Oliver
    (cherry picked from commit 4a87b75b86e4c932b5230cb7caecf6f00e40a096)
    
    Conflicts:
    	sfx2/inc/sfx2/sidebar/EnumContext.hxx
    
    Change-Id: I51cd1d63ddd23a0907f1781c46891b6f5c9870c5

diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx
index 819e837..b11f3bf 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -37,6 +37,7 @@ public:
         Application_WriterWeb,
         Application_WriterXML,
         Application_WriterForm,
+        Application_WriterReport,
         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 de7d7fa..6559912 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -83,6 +83,7 @@
                  com.sun.star.text.WebDocument
                  com.sun.star.xforms.XMLFormDocument
                  com.sun.star.sdb.FormDesign
+                 com.sun.star.sdb.TextReportDesign
                  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 ce1d743..514cd13 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -92,6 +92,8 @@ sal_Int32 EnumContext::GetCombinedContext_DI (void) const
         case Application_WriterGlobal:
         case Application_WriterWeb:
         case Application_WriterXML:
+        case Application_WriterForm:
+        case Application_WriterReport:
             return CombinedEnumContext(Application_WriterVariants, meContext);
 
         default:
@@ -158,6 +160,7 @@ void EnumContext::ProvideApplicationContainers (void)
         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.sdb.TextReportDesign"), EnumContext::Application_WriterReport);
         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 d65c9b4..eaf4bea 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -436,6 +436,7 @@ void ResourceManager::ReadContextList (
                 aApplications.push_back(EnumContext::Application_WriterWeb);
                 aApplications.push_back(EnumContext::Application_WriterXML);
                 aApplications.push_back(EnumContext::Application_WriterForm);
+                aApplications.push_back(EnumContext::Application_WriterReport);
             }
             else
             {