Kaydet (Commit) 2a2d3841 authored tarafından Oliver-Rainer Wittmann's avatar Oliver-Rainer Wittmann Kaydeden (comit) Michael Meeks

Resolves: #i122056# adding another Writer variant for sidebar context handling

Patch by: Ariel
Review by: Oliver
(cherry picked from commit 4a87b75b)

Conflicts:
	sfx2/inc/sfx2/sidebar/EnumContext.hxx

Change-Id: I51cd1d63ddd23a0907f1781c46891b6f5c9870c5
üst 5a6c03ad
...@@ -37,6 +37,7 @@ public: ...@@ -37,6 +37,7 @@ public:
Application_WriterWeb, Application_WriterWeb,
Application_WriterXML, Application_WriterXML,
Application_WriterForm, Application_WriterForm,
Application_WriterReport,
Application_Calc, Application_Calc,
Application_Draw, Application_Draw,
Application_Impress, Application_Impress,
......
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
com.sun.star.text.WebDocument com.sun.star.text.WebDocument
com.sun.star.xforms.XMLFormDocument com.sun.star.xforms.XMLFormDocument
com.sun.star.sdb.FormDesign com.sun.star.sdb.FormDesign
com.sun.star.sdb.TextReportDesign
com.sun.star.sheet.SpreadsheetDocument com.sun.star.sheet.SpreadsheetDocument
com.sun.star.presentation.PresentationDocument com.sun.star.presentation.PresentationDocument
com.sun.star.drawing.DrawingDocument com.sun.star.drawing.DrawingDocument
......
...@@ -92,6 +92,8 @@ sal_Int32 EnumContext::GetCombinedContext_DI (void) const ...@@ -92,6 +92,8 @@ sal_Int32 EnumContext::GetCombinedContext_DI (void) const
case Application_WriterGlobal: case Application_WriterGlobal:
case Application_WriterWeb: case Application_WriterWeb:
case Application_WriterXML: case Application_WriterXML:
case Application_WriterForm:
case Application_WriterReport:
return CombinedEnumContext(Application_WriterVariants, meContext); return CombinedEnumContext(Application_WriterVariants, meContext);
default: default:
...@@ -158,6 +160,7 @@ void EnumContext::ProvideApplicationContainers (void) ...@@ -158,6 +160,7 @@ void EnumContext::ProvideApplicationContainers (void)
AddEntry(A2S("com.sun.star.text.WebDocument"), EnumContext::Application_WriterWeb); 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.xforms.XMLFormDocument"), EnumContext::Application_WriterXML);
AddEntry(A2S("com.sun.star.sdb.FormDesign"), EnumContext::Application_WriterForm); 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.sheet.SpreadsheetDocument"), EnumContext::Application_Calc);
AddEntry(A2S("com.sun.star.drawing.DrawingDocument"), EnumContext::Application_Draw); AddEntry(A2S("com.sun.star.drawing.DrawingDocument"), EnumContext::Application_Draw);
AddEntry(A2S("com.sun.star.presentation.PresentationDocument"), EnumContext::Application_Impress); AddEntry(A2S("com.sun.star.presentation.PresentationDocument"), EnumContext::Application_Impress);
......
...@@ -436,6 +436,7 @@ void ResourceManager::ReadContextList ( ...@@ -436,6 +436,7 @@ void ResourceManager::ReadContextList (
aApplications.push_back(EnumContext::Application_WriterWeb); aApplications.push_back(EnumContext::Application_WriterWeb);
aApplications.push_back(EnumContext::Application_WriterXML); aApplications.push_back(EnumContext::Application_WriterXML);
aApplications.push_back(EnumContext::Application_WriterForm); aApplications.push_back(EnumContext::Application_WriterForm);
aApplications.push_back(EnumContext::Application_WriterReport);
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment