| PanelFactory.cxx (7a32b0c8) | PanelFactory.cxx (5d65efa0) |
|---|---|
| 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 111 unchanged lines hidden (view full) --- 120 if (pBindings == NULL) 121 throw RuntimeException( 122 A2S("PanelFactory::createUIElement called without SfxBindings"), 123 NULL); 124 125 if (rsResourceURL.endsWithAsciiL("/TextPropertyPanel", strlen("/TextPropertyPanel"))) 126 { 127 TextPropertyPanel* pPanel = TextPropertyPanel::Create(pParentWindow, xFrame, pBindings); | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 111 unchanged lines hidden (view full) --- 120 if (pBindings == NULL) 121 throw RuntimeException( 122 A2S("PanelFactory::createUIElement called without SfxBindings"), 123 NULL); 124 125 if (rsResourceURL.endsWithAsciiL("/TextPropertyPanel", strlen("/TextPropertyPanel"))) 126 { 127 TextPropertyPanel* pPanel = TextPropertyPanel::Create(pParentWindow, xFrame, pBindings); |
| 128 pPanel->Show(); 129 pPanel->GetParent()->Show(); | |
| 130 xElement = sfx2::sidebar::SidebarPanelBase::Create( 131 rsResourceURL, 132 xFrame, 133 pPanel, 134 ::boost::bind(&TextPropertyPanel::ShowMenu, pPanel)); 135 } | 128 xElement = sfx2::sidebar::SidebarPanelBase::Create( 129 rsResourceURL, 130 xFrame, 131 pPanel, 132 ::boost::bind(&TextPropertyPanel::ShowMenu, pPanel)); 133 } |
| 136 137 if (rsResourceURL.endsWithAsciiL("/AreaPropertyPanel", strlen("/AreaPropertyPanel"))) | 134 else if (rsResourceURL.endsWithAsciiL("/AreaPropertyPanel", strlen("/AreaPropertyPanel"))) |
| 138 { 139 AreaPropertyPanel* pPanel = AreaPropertyPanel::Create(pParentWindow, xFrame, pBindings); 140 xElement = sfx2::sidebar::SidebarPanelBase::Create( 141 rsResourceURL, 142 xFrame, | 135 { 136 AreaPropertyPanel* pPanel = AreaPropertyPanel::Create(pParentWindow, xFrame, pBindings); 137 xElement = sfx2::sidebar::SidebarPanelBase::Create( 138 rsResourceURL, 139 xFrame, |
| 143 pPanel); | 140 pPanel, 141 ::boost::function<void(void)>()); |
| 144 } 145 146 return xElement; 147} 148 149 150 151} } // end of namespace svx::sidebar | 142 } 143 144 return xElement; 145} 146 147 148 149} } // end of namespace svx::sidebar |