Attachment #32956 for bug #58206

View | Details | Raw Unified | Return to bug 58206
Collapse All | Expand All




        return null;
    }


    /**
     * Scan the master slides for the first slide layout with the given name.
     *
     * @param name  The layout name (case-insensitive). Cannot be null.
     *
     * @return the first layout found or null on failure
     */
    public XSLFSlideLayout findLayout(String name)
    {
        for (XSLFSlideMaster master : getSlideMasters())
        {
            XSLFSlideLayout layout = master.getLayout(name);
            if (layout != null)
            {
                return layout;
            }
        }
        return null;
    }


    public XSLFTableStyles getTableStyles(){
        return _tableStyles;
    }

Lines 108-113 import org.openxmlformats.schemas.presentationml.x2006.main.SldMasterDocument; Link Here

(-)a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java (-1 / +20 lines)
108	return getLayouts().values().toArray(new XSLFSlideLayout[_layouts.size()]);	108	return getLayouts().values().toArray(new XSLFSlideLayout[_layouts.size()]);
109	}	109	}
110		110
		111	/**
		112	* Get the slide layout by type.
		113	*
		114	* @param type The layout type. Cannot be null.
		115	*
		116	* @return the layout found or null on failure
		117	*/
111	public XSLFSlideLayout getLayout(SlideLayout type){	118	public XSLFSlideLayout getLayout(SlideLayout type){
112	for(XSLFSlideLayout layout : getLayouts().values()){	119	for(XSLFSlideLayout layout : getLayouts().values()){
113	if(layout.getType() == type) {	120	if(layout.getType() == type) {
Lines 117-122 import org.openxmlformats.schemas.presentationml.x2006.main.SldMasterDocument; Link Here
117	return null;	124	return null;
118	}	125	}
119		126
		127	/**
		128	* Get the slide layout by name.
		129	*
		130	* @param name The layout name (case-insensitive). Cannot be null.
		131	*
		132	* @return the layout found or null on failure
		133	*/
		134	public XSLFSlideLayout getLayout(String name)
		135	{
		136	return getLayouts().get(name.toLowerCase());
		137	}
		138
		139
120	@Override	140	@Override
121	public XSLFTheme getTheme(){	141	public XSLFTheme getTheme(){
122	if(_theme == null){	142	if(_theme == null){
123	-

Return to bug 58206

Lines 476-481 public class XMLSlideShow extends POIXMLDocument implements SlideShow { Link Here

(-)a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java (+22 lines)
476	return null;	476	return null;
477	}	477	}
478		478
		479
		480	/**
		481	* Scan the master slides for the first slide layout with the given name.
		482	*
		483	* @param name The layout name (case-insensitive). Cannot be null.
		484	*
		485	* @return the first layout found or null on failure
		486	*/
		487	public XSLFSlideLayout findLayout(String name)
		488	{
		489	for (XSLFSlideMaster master : getSlideMasters())
		490	{
		491	XSLFSlideLayout layout = master.getLayout(name);
		492	if (layout != null)
		493	{
		494	return layout;
		495	}
		496	}
		497	return null;
		498	}
		499
		500
479	public XSLFTableStyles getTableStyles(){	501	public XSLFTableStyles getTableStyles(){
480	return _tableStyles;	502	return _tableStyles;
481	}	503	}