Author: orw Date: Tue May 14 13:21:45 2013 New Revision: 1482326 URL: http://svn.apache.org/r1482326 Log: 122056: adding another Writer variant for sidebar context handling
Patch by: Ariel Review by: Oliver Modified: openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx Modified: openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs?rev=1482326&r1=1482325&r2=1482326&view=diff ============================================================================== --- openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs (original) +++ openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs Tue May 14 13:21:45 2013 @@ -88,6 +88,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 Modified: openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx?rev=1482326&r1=1482325&r2=1482326&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx (original) +++ openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx Tue May 14 13:21:45 2013 @@ -41,6 +41,7 @@ public: Application_WriterWeb, Application_WriterXML, Application_WriterForm, + Application_WriterReport, Application_Calc, Application_Draw, Application_Impress, Modified: openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx?rev=1482326&r1=1482325&r2=1482326&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx (original) +++ openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx Tue May 14 13:21:45 2013 @@ -98,6 +98,8 @@ sal_Int32 EnumContext::GetCombinedContex case Application_WriterGlobal: case Application_WriterWeb: case Application_WriterXML: + case Application_WriterForm: + case Application_WriterReport: return CombinedEnumContext(Application_WriterVariants, meContext); default: @@ -164,6 +166,7 @@ void EnumContext::ProvideApplicationCont 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); Modified: openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx?rev=1482326&r1=1482325&r2=1482326&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx (original) +++ openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx Tue May 14 13:21:45 2013 @@ -447,6 +447,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 {