Attachment #69229 for issue #111311

View | Details | Raw Unified | Return to issue 111311
Collapse All | Expand All

Lines 2112-2117 css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNam Link Here

(-)filter/source/config/cache/filtercache.cxx (+6 lines)
2112	if ((nFlags & FLAGVAL_OWN ) == FLAGVAL_OWN ) lFlagNames.push_back(FLAGNAME_OWN );	2112	if ((nFlags & FLAGVAL_OWN ) == FLAGVAL_OWN ) lFlagNames.push_back(FLAGNAME_OWN );
2113	if ((nFlags & FLAGVAL_PACKED ) == FLAGVAL_PACKED ) lFlagNames.push_back(FLAGNAME_PACKED );	2113	if ((nFlags & FLAGVAL_PACKED ) == FLAGVAL_PACKED ) lFlagNames.push_back(FLAGNAME_PACKED );
2114	if ((nFlags & FLAGVAL_PREFERRED ) == FLAGVAL_PREFERRED ) lFlagNames.push_back(FLAGNAME_PREFERRED );	2114	if ((nFlags & FLAGVAL_PREFERRED ) == FLAGVAL_PREFERRED ) lFlagNames.push_back(FLAGNAME_PREFERRED );
		2115	if ((nFlags & FLAGVAL_STARTPRESENTATION) == FLAGVAL_STARTPRESENTATION) lFlagNames.push_back(FLAGNAME_STARTPRESENTATION);
2115	if ((nFlags & FLAGVAL_READONLY ) == FLAGVAL_READONLY ) lFlagNames.push_back(FLAGNAME_READONLY );	2116	if ((nFlags & FLAGVAL_READONLY ) == FLAGVAL_READONLY ) lFlagNames.push_back(FLAGNAME_READONLY );
2116	if ((nFlags & FLAGVAL_SILENTEXPORT ) == FLAGVAL_SILENTEXPORT ) lFlagNames.push_back(FLAGNAME_SILENTEXPORT );	2117	if ((nFlags & FLAGVAL_SILENTEXPORT ) == FLAGVAL_SILENTEXPORT ) lFlagNames.push_back(FLAGNAME_SILENTEXPORT );
2117	if ((nFlags & FLAGVAL_SUPPORTSSELECTION) == FLAGVAL_SUPPORTSSELECTION) lFlagNames.push_back(FLAGNAME_SUPPORTSSELECTION);	2118	if ((nFlags & FLAGVAL_SUPPORTSSELECTION) == FLAGVAL_SUPPORTSSELECTION) lFlagNames.push_back(FLAGNAME_SUPPORTSSELECTION);
Lines 2210-2215 sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< Link Here
2210	nField \|= FLAGVAL_PREFERRED;	2211	nField \|= FLAGVAL_PREFERRED;
2211	continue;	2212	continue;
2212	}	2213	}
		2214	if (pNames[i].equals(FLAGNAME_STARTPRESENTATION))
		2215	{
		2216	nField \|= FLAGVAL_STARTPRESENTATION;
		2217	continue;
		2218	}
2213	if (pNames[i].equals(FLAGNAME_READONLY))	2219	if (pNames[i].equals(FLAGNAME_READONLY))
2214	{	2220	{
2215	nField \|= FLAGVAL_READONLY;	2221	nField \|= FLAGVAL_READONLY;




T4_IMPRESS = \
    draw_StarOffice_XML_Draw \
    impress_MS_PowerPoint_97 \
    impress_MS_PowerPoint_97_AutoPlay \
    impress_MS_PowerPoint_97_Vorlage \
    impress_StarOffice_XML_Impress \
    impress_StarOffice_XML_Impress_Template \

    impress8_template\
    draw8\
    MS_PowerPoint_2007_XML\
    MS_PowerPoint_2007_XML_AutoPlay\
    MS_PowerPoint_2007_XML_Template

# -----------------------------------------------
# count = 20
F4_IMPRESS = \
    MS_PowerPoint_97 \
    MS_PowerPoint_97_AutoPlay \
    MS_PowerPoint_97_Vorlage \
    impress_StarOffice_XML_Draw \
    StarOffice_XML__Impress_ \

    impress8_template\
    impress8_draw\
    impress_MS_PowerPoint_2007_XML\
    impress_MS_PowerPoint_2007_XML_AutoPlay\
    impress_MS_PowerPoint_2007_XML_Template

# -----------------------------------------------




	<node oor:name="MS PowerPoint 97 AutoPlay" oor:op="replace">
		<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN STARTPRESENTATION</value></prop>
		<prop oor:name="UIComponent"/>
		<prop oor:name="FilterService"/>
		<prop oor:name="UserData"><value>sdfilt</value></prop>
		<prop oor:name="UIName">
			<value xml:lang="x-default">Microsoft PowerPoint 97/2000/XP</value>
		</prop>
		<prop oor:name="FileFormatVersion"><value>0</value></prop>
		<prop oor:name="Type"><value>impress_MS_PowerPoint_97_AutoPlay</value></prop>
		<prop oor:name="TemplateName"/>
		<prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
	</node>

Line 0 Link Here

(-)filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu (+10 lines)
	1	<node oor:name="Impress MS PowerPoint 2007 XML AutoPlay" oor:op="replace">
	2	<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED STARTPRESENTATION</value></prop>
	3	<prop oor:name="UIComponent"/>
	4	<prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
	5	<prop oor:name="UserData"/>
	6	<prop oor:name="FileFormatVersion"/>
	7	<prop oor:name="Type"><value>MS PowerPoint 2007 XML AutoPlay</value></prop>
	8	<prop oor:name="TemplateName"/>
	9	<prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
	10	</node>

Line 0 Link Here

(-)filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu (+10 lines)
	1	<node oor:name="MS PowerPoint 2007 XML AutoPlay" oor:op="replace" >
	2	<prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
	3	<prop oor:name="URLPattern"/>
	4	<prop oor:name="Extensions"><value>ppsx</value></prop>
	5	<prop oor:name="MediaType"/>
	6	<prop oor:name="Preferred"><value>true</value></prop>
	7	<prop oor:name="PreferredFilter"><value>Impress MS PowerPoint 2007 XML AutoPlay</value></prop>
	8	<prop oor:name="UIName"><value xml:lang="x-default">Microsoft PowerPoint 2007 XML</value></prop>
	9	<prop oor:name="ClipboardFormat"/>
	10	</node>

Lines 1-7 Link Here

(-)filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu (-1 / +1 lines)
1	<node oor:name="impress_MS_PowerPoint_97" oor:op="replace" >	1	<node oor:name="impress_MS_PowerPoint_97" oor:op="replace" >
2	<prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>	2	<prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
3	<prop oor:name="URLPattern"/>	3	<prop oor:name="URLPattern"/>
4	<prop oor:name="Extensions"><value>ppt pps</value></prop>	4	<prop oor:name="Extensions"><value>ppt</value></prop>
5	<prop oor:name="MediaType"><value>application/vnd.ms-powerpoint</value></prop>	5	<prop oor:name="MediaType"><value>application/vnd.ms-powerpoint</value></prop>
6	<prop oor:name="Preferred"><value>false</value></prop>	6	<prop oor:name="Preferred"><value>false</value></prop>
7	<prop oor:name="PreferredFilter"><value>MS PowerPoint 97</value></prop>	7	<prop oor:name="PreferredFilter"><value>MS PowerPoint 97</value></prop>




	<node oor:name="impress_MS_PowerPoint_97_AutoPlay" oor:op="replace" >
		<prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
		<prop oor:name="URLPattern"/>
		<prop oor:name="Extensions"><value>pps</value></prop>
		<prop oor:name="MediaType"><value>application/vnd.ms-powerpoint</value></prop>
		<prop oor:name="Preferred"><value>false</value></prop>
		<prop oor:name="PreferredFilter"><value>MS PowerPoint 97 AutoPlay</value></prop>
		<prop oor:name="UIName">
			<value>Microsoft PowerPoint 97/2000/XP</value>
		</prop>
		<prop oor:name="ClipboardFormat"/>
	</node>




#define FILTERFLAGNAME_SILENTEXPORT                         DECLARE_ASCII("SilentExport"     )  // x
#define FILTERFLAGNAME_BROWSERPREFERED                      DECLARE_ASCII("BrowserPrefered"  )  // deprecated
#define FILTERFLAGNAME_PREFERED                             DECLARE_ASCII("Prefered"         )  // x
#define FILTERFLAGNAME_STARTPRESENTATION                    DECLARE_ASCII("StartPresentation")  // x

#define	FILTERFLAG_IMPORT									0x00000001L		// 1
#define	FILTERFLAG_EXPORT									0x00000002L		// 2

#define	FILTERFLAG_BROWSERPREFERED							0x00400000L		// 4194304
//FREE! ... 0x00800000L
#define	FILTERFLAG_PREFERED									0x10000000L		// 268435456
#define FILTERFLAG_STARTPRESENTATION                        0x20000000L

class FlagCheck
{

        nCheck &= ~FILTERFLAG_SILENTEXPORT;
        nCheck &= ~FILTERFLAG_BROWSERPREFERED;
        nCheck &= ~FILTERFLAG_PREFERED;
        nCheck &= ~FILTERFLAG_STARTPRESENTATION;
        return(nCheck == 0);
    }


Lines 92-97 const ::rtl::OUString Filter::FLAGNAME_PACKED = ::rtl Link Here

(-)framework/source/constant/filter.cxx (+2 lines)
92	const ::rtl::OUString Filter::FLAGNAME_SILENTEXPORT = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SilentExport" ));	92	const ::rtl::OUString Filter::FLAGNAME_SILENTEXPORT = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SilentExport" ));
93	const ::rtl::OUString Filter::FLAGNAME_BROWSERPREFERED = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BrowserPrefered" ));	93	const ::rtl::OUString Filter::FLAGNAME_BROWSERPREFERED = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BrowserPrefered" ));
94	const ::rtl::OUString Filter::FLAGNAME_PREFERED = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prefered" ));	94	const ::rtl::OUString Filter::FLAGNAME_PREFERED = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prefered" ));
		95	const ::rtl::OUString Filter::FLAGNAME_STARTPRESENTATION = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartPresentation"));
95		96
96	const sal_Int32 Filter::FLAGVALUE_IMPORT = 0x00000001L; // 1	97	const sal_Int32 Filter::FLAGVALUE_IMPORT = 0x00000001L; // 1
97	const sal_Int32 Filter::FLAGVALUE_EXPORT = 0x00000002L; // 2	98	const sal_Int32 Filter::FLAGVALUE_EXPORT = 0x00000002L; // 2
Lines 117-122 const sal_Int32 Filter::FLAGVALUE_PACKED = 0x001 Link Here
117	const sal_Int32 Filter::FLAGVALUE_SILENTEXPORT = 0x00200000L; // 2097152	118	const sal_Int32 Filter::FLAGVALUE_SILENTEXPORT = 0x00200000L; // 2097152
118	const sal_Int32 Filter::FLAGVALUE_BROWSERPREFERED = 0x00400000L; // 4194304	119	const sal_Int32 Filter::FLAGVALUE_BROWSERPREFERED = 0x00400000L; // 4194304
119	const sal_Int32 Filter::FLAGVALUE_PREFERED = 0x10000000L; // 268435456	120	const sal_Int32 Filter::FLAGVALUE_PREFERED = 0x10000000L; // 268435456
		121	const sal_Int32 Filter::FLAGVALUE_STARTPRESENTATION = 0x20000000L;
120		122
121	} // namespace constant	123	} // namespace constant
122	} // namespace framework	124	} // namespace framework

Lines 94-99 struct Filter Link Here

(-)framework/source/inc/constant/filter.hxx (+2 lines)
94	static const ::rtl::OUString FLAGNAME_SILENTEXPORT;	94	static const ::rtl::OUString FLAGNAME_SILENTEXPORT;
95	static const ::rtl::OUString FLAGNAME_BROWSERPREFERED;	95	static const ::rtl::OUString FLAGNAME_BROWSERPREFERED;
96	static const ::rtl::OUString FLAGNAME_PREFERED;	96	static const ::rtl::OUString FLAGNAME_PREFERED;
		97	static const ::rtl::OUString FLAGNAME_STARTPRESENTATION;
97		98
98	static const sal_Int32 FLAGVALUE_IMPORT;	99	static const sal_Int32 FLAGVALUE_IMPORT;
99	static const sal_Int32 FLAGVALUE_EXPORT;	100	static const sal_Int32 FLAGVALUE_EXPORT;
Lines 120-125 struct Filter Link Here
120	static const sal_Int32 FLAGVALUE_BROWSERPREFERED;	121	static const sal_Int32 FLAGVALUE_BROWSERPREFERED;
121	//FREE! ... 0x00800000L	122	//FREE! ... 0x00800000L
122	static const sal_Int32 FLAGVALUE_PREFERED;	123	static const sal_Int32 FLAGVALUE_PREFERED;
		124	static const sal_Int32 FLAGVALUE_STARTPRESENTATION;
123		125
124	};	126	};
125		127

Lines 247-252 OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& r Link Here

(-)oox/source/core/filterdetect.cxx (+4 lines)
247	rContentType.equalsAscii( "application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml" ) )	247	rContentType.equalsAscii( "application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml" ) )
248	return CREATE_OUSTRING( "MS PowerPoint 2007 XML" );	248	return CREATE_OUSTRING( "MS PowerPoint 2007 XML" );
249		249
		250	if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml" ) \|\|
		251	rContentType.equalsAscii( "application/vnd.ms-powerpoint.slideshow.macroEnabled.main+xml" ) )
		252	return CREATE_OUSTRING( "MS PowerPoint 2007 XML AutoPlay" );
		253
250	if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml" ) \|\|	254	if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml" ) \|\|
251	rContentType.equalsAscii( "application/vnd.ms-powerpoint.template.macroEnabled.main+xml" ) )	255	rContentType.equalsAscii( "application/vnd.ms-powerpoint.template.macroEnabled.main+xml" ) )
252	return CREATE_OUSTRING( "MS PowerPoint 2007 XML Template" );	256	return CREATE_OUSTRING( "MS PowerPoint 2007 XML Template" );

Lines 45-50 static const String pPreviewName( RTL_CONSTASCII_USTRINGPARAM( "StarDrawTemplate Link Here

(-)sd/inc/strmname.h (+1 lines)
45	// PowerPoint-Filter	45	// PowerPoint-Filter
46	static const String pFilterPowerPoint97( RTL_CONSTASCII_USTRINGPARAM( "MS PowerPoint 97" ));	46	static const String pFilterPowerPoint97( RTL_CONSTASCII_USTRINGPARAM( "MS PowerPoint 97" ));
47	static const String pFilterPowerPoint97Template( RTL_CONSTASCII_USTRINGPARAM( "MS PowerPoint 97 Vorlage" ));	47	static const String pFilterPowerPoint97Template( RTL_CONSTASCII_USTRINGPARAM( "MS PowerPoint 97 Vorlage" ));
		48	static const String pFilterPowerPoint97AutoPlay( RTL_CONSTASCII_USTRINGPARAM( "MS PowerPoint 97 AutoPlay" ));
48		49
49	// XML content stream	50	// XML content stream
50	static const String pStarDrawXMLContent( RTL_CONSTASCII_USTRINGPARAM( "content.xml" ));	51	static const String pStarDrawXMLContent( RTL_CONSTASCII_USTRINGPARAM( "content.xml" ));





/*************************************************************************
|*
|* ImportFrom: load from 3rd party format
|*
\************************************************************************/

sal_Bool DrawDocShell::ImportFrom( SfxMedium &rMedium )
{
    const sal_Bool bRet=SfxObjectShell::ImportFrom(rMedium);

    SfxItemSet* pSet = rMedium.GetItemSet();
	if( pSet )
	{
		if( SFX_ITEM_SET == pSet->GetItemState(SID_DOC_STARTPRESENTATION)&&
			( (SfxBoolItem&) ( pSet->Get( SID_DOC_STARTPRESENTATION ) ) ).GetValue() )
		{
			mpDoc->SetStartWithPresentation( true );

            // tell SFX to change viewshell when in preview mode
            if( IsPreview() )
            {
                SfxItemSet *pMediumSet = GetMedium()->GetItemSet();
                if( pMediumSet )
                    pMediumSet->Put( SfxUInt16Item( SID_VIEW_ID, 1 ) );
            }
		}
	}

    return bRet;
}

/*************************************************************************
|*
|* ConvertFrom: aus Fremdformat laden
|*
\************************************************************************/

		}
	}

	if( aFilterName == pFilterPowerPoint97 
        || aFilterName == pFilterPowerPoint97Template
        || aFilterName == pFilterPowerPoint97AutoPlay)
	{
		mpDoc->StopWorkStartupDelay();
        bRet = SdPPTFilter( rMedium, *this, sal_True ).Import();

Lines 88-93 public: Link Here

(-)sd/source/ui/inc/DrawDocShell.hxx (+1 lines)
88	virtual void Activate( BOOL bMDI );	88	virtual void Activate( BOOL bMDI );
89	virtual void Deactivate( BOOL bMDI );	89	virtual void Deactivate( BOOL bMDI );
90	virtual BOOL InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );	90	virtual BOOL InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
		91	virtual sal_Bool ImportFrom( SfxMedium &rMedium );
91	virtual BOOL ConvertFrom( SfxMedium &rMedium );	92	virtual BOOL ConvertFrom( SfxMedium &rMedium );
92	virtual BOOL Save();	93	virtual BOOL Save();
93	virtual BOOL SaveAsOwnFormat( SfxMedium& rMedium );	94	virtual BOOL SaveAsOwnFormat( SfxMedium& rMedium );

Lines 35-40 Link Here

(-)sd/source/ui/slideshow/slideshow.cxx (+25 lines)
35	#include <com/sun/star/beans/PropertyAttribute.hpp>	35	#include <com/sun/star/beans/PropertyAttribute.hpp>
36	#include <com/sun/star/drawing/framework/XControllerManager.hpp>	36	#include <com/sun/star/drawing/framework/XControllerManager.hpp>
37	#include <com/sun/star/container/XIndexAccess.hpp>	37	#include <com/sun/star/container/XIndexAccess.hpp>
		38	#include <com/sun/star/frame/XDispatchProvider.hpp>
		39	#include <com/sun/star/util/URL.hpp>
38		40
39	#include <cppuhelper/bootstrap.hxx>	41	#include <cppuhelper/bootstrap.hxx>
40		42
Lines 72-77 using ::com::sun::star::awt::XWindow; Link Here
72	using namespace ::sd;	74	using namespace ::sd;
73	using namespace ::cppu;	75	using namespace ::cppu;
74	using namespace ::vos;	76	using namespace ::vos;
		77	using namespace ::com::sun::star;
75	using namespace ::com::sun::star::uno;	78	using namespace ::com::sun::star::uno;
76	using namespace ::com::sun::star::presentation;	79	using namespace ::com::sun::star::presentation;
77	using namespace ::com::sun::star::drawing;	80	using namespace ::com::sun::star::drawing;
Lines 777-782 void SAL_CALL SlideShow::end() throw(RuntimeException) Link Here
777	if( pDrawViewShell )	780	if( pDrawViewShell )
778	pDrawViewShell->SwitchPage( (USHORT)xController->getRestoreSlide() );	781	pDrawViewShell->SwitchPage( (USHORT)xController->getRestoreSlide() );
779	}	782	}
		783
		784	if( pViewShell->GetDoc()->IsStartWithPresentation() )
		785	{
		786	pViewShell->GetDoc()->SetStartWithPresentation( false );
		787
		788	Reference<frame::XDispatchProvider> xProvider(pViewShell->GetViewShellBase().GetController()->getFrame(),
		789	UNO_QUERY);
		790	if( xProvider.is() )
		791	{
		792	util::URL aURL;
		793	aURL.Complete = ::rtl::OUString::createFromAscii(".uno:CloseFrame");
		794
		795	uno::Reference< frame::XDispatch > xDispatch(
		796	xProvider->queryDispatch(
		797	aURL, ::rtl::OUString(), 0));
		798	if( xDispatch.is() )
		799	{
		800	xDispatch->dispatch(aURL,
		801	uno::Sequence< beans::PropertyValue >());
		802	}
		803	}
		804	}
780	}	805	}
781	}	806	}
782	mpCurrentViewShellBase = 0;	807	mpCurrentViewShellBase = 0;

Lines 365-374 SdFilterDetect::~SdFilterDetect() Link Here

(-)sd/source/ui/unoidl/sddetect.cxx (-3 / +5 lines)
365	String aFileName(aMedium.GetName());	365	String aFileName(aMedium.GetName());
366	aFileName.ToUpperAscii();	366	aFileName.ToUpperAscii();
367		367
368	if( aFileName.SearchAscii( ".POT" ) == STRING_NOTFOUND )	368	if( aFileName.SearchAscii( ".POT" ) != STRING_NOTFOUND )
369	pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97);
370	else
371	pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97Template );	369	pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97Template );
		370	else if( aFileName.SearchAscii( ".PPS" ) != STRING_NOTFOUND )
		371	pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97AutoPlay );
		372	else
		373	pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97);
372	}	374	}
373	}	375	}
374	else	376	else

Lines 492-498 void ViewShellBase::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) Link Here

(-)sd/source/ui/view/ViewShellBase.cxx (-1 lines)
492	{	492	{
493	if( GetViewFrame() )	493	if( GetViewFrame() )
494	{	494	{
495	GetDocument()->SetStartWithPresentation( false );
496	GetViewFrame()->GetDispatcher()->Execute(	495	GetViewFrame()->GetDispatcher()->Execute(
497	SID_PRESENTATION, SFX_CALLMODE_ASYNCHRON );	496	SID_PRESENTATION, SFX_CALLMODE_ASYNCHRON );
498	}	497	}

Lines 68-73 Link Here

(-)sfx2/inc/sfx2/docfilt.hxx (+1 lines)
68		68
69	#define SFX_FILTER_BROWSERPREFERED 0x00400000L	69	#define SFX_FILTER_BROWSERPREFERED 0x00400000L
70	#define SFX_FILTER_PREFERED 0x10000000L	70	#define SFX_FILTER_PREFERED 0x10000000L
		71	#define SFX_FILTER_STARTPRESENTATION 0x20000000L
71		72
72	#define SFX_FILTER_VERSION_NONE 0	73	#define SFX_FILTER_VERSION_NONE 0
73	#define SFX_FILTER_NOTINSTALLED SFX_FILTER_MUSTINSTALL \| SFX_FILTER_CONSULTSERVICE	74	#define SFX_FILTER_NOTINSTALLED SFX_FILTER_MUSTINSTALL \| SFX_FILTER_CONSULTSERVICE

Lines 364-370 public: Link Here

(-)sfx2/inc/sfx2/objsh.hxx (-4 / +8 lines)
364	sal_Bool SaveCompletedChildren( sal_Bool bSuccess );	364	sal_Bool SaveCompletedChildren( sal_Bool bSuccess );
365		365
366	sal_Bool InsertFrom( SfxMedium &rMedium );	366	sal_Bool InsertFrom( SfxMedium &rMedium );
367	sal_Bool ImportFrom( SfxMedium &rMedium );	367	virtual sal_Bool ImportFrom( SfxMedium &rMedium );
368	sal_Bool ExportTo( SfxMedium &rMedium );	368	sal_Bool ExportTo( SfxMedium &rMedium );
369		369
370	// xmlsec05, check with SFX team	370	// xmlsec05, check with SFX team
371	-- sfx2/source/doc/objstor.cxx	371	++ sfx2/source/doc/objstor.cxx
Lines 756-761 sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) Link Here
756	sal_uInt32 nError = HandleFilter( pMedium, this );	756	sal_uInt32 nError = HandleFilter( pMedium, this );
757	if ( nError != ERRCODE_NONE )	757	if ( nError != ERRCODE_NONE )
758	SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );	758	SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
		759
		760	if (pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARTPRESENTATION)
		761	pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, TRUE) );
759	}	762	}
760		763
761	EnableSetModified( sal_False );	764	EnableSetModified( sal_False );
762	-- sd/source/ui/slideshow/slideshowimpl.cxx	765	++ sd/source/ui/slideshow/slideshowimpl.cxx
Lines 3239-3245 void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException) Link Here
3239	if( mpShowWindow )	3239	if( mpShowWindow )
3240	{	3240	{
3241	mpShowWindow->SetEndMode();	3241	mpShowWindow->SetEndMode();
3242	pause();	3242	if( !mpViewShell->GetDoc()->IsStartWithPresentation() )
		3243	pause();
3243	}	3244	}
3244	}	3245	}
3245	}	3246	}

Return to issue 111311

Lines 469-474 BOOL DrawDocShell::LoadFrom( SfxMedium& rMedium ) Link Here

(-)sd/source/ui/docshell/docshel4.cxx (-1 / +34 lines)
469		469
470	/*************************************************************************	470	/*************************************************************************
471	\|*	471	\|*
		472	\|* ImportFrom: load from 3rd party format
		473	\|*
		474	\************************************************************************/
		475
		476	sal_Bool DrawDocShell::ImportFrom( SfxMedium &rMedium )
		477	{
		478	const sal_Bool bRet=SfxObjectShell::ImportFrom(rMedium);
		479
		480	SfxItemSet* pSet = rMedium.GetItemSet();
		481	if( pSet )
		482	{
		483	if( SFX_ITEM_SET == pSet->GetItemState(SID_DOC_STARTPRESENTATION)&&
		484	( (SfxBoolItem&) ( pSet->Get( SID_DOC_STARTPRESENTATION ) ) ).GetValue() )
		485	{
		486	mpDoc->SetStartWithPresentation( true );
		487
		488	// tell SFX to change viewshell when in preview mode
		489	if( IsPreview() )
		490	{
		491	SfxItemSet *pMediumSet = GetMedium()->GetItemSet();
		492	if( pMediumSet )
		493	pMediumSet->Put( SfxUInt16Item( SID_VIEW_ID, 1 ) );
		494	}
		495	}
		496	}
		497
		498	return bRet;
		499	}
		500
		501	/*************************************************************************
		502	\|*
472	\|* ConvertFrom: aus Fremdformat laden	503	\|* ConvertFrom: aus Fremdformat laden
473	\|*	504	\|*
474	\************************************************************************/	505	\************************************************************************/
Lines 499-505 BOOL DrawDocShell::ConvertFrom( SfxMedium& rMedium ) Link Here
499	}	530	}
500	}	531	}
501		532
502	if( aFilterName == pFilterPowerPoint97 \|\| aFilterName == pFilterPowerPoint97Template)	533	if( aFilterName == pFilterPowerPoint97
		534	\|\| aFilterName == pFilterPowerPoint97Template
		535	\|\| aFilterName == pFilterPowerPoint97AutoPlay)
503	{	536	{
504	mpDoc->StopWorkStartupDelay();	537	mpDoc->StopWorkStartupDelay();
505	bRet = SdPPTFilter( rMedium, *this, sal_True ).Import();	538	bRet = SdPPTFilter( rMedium, *this, sal_True ).Import();

Lines 133-138 extern rtl::OUString pFilterStrings[]; Link Here

(-)filter/source/config/cache/constant.hxx (+2 lines)
133	#define FLAGNAME_OWN _FILTER_CONFIG_FROM_ASCII_("OWN" )	133	#define FLAGNAME_OWN _FILTER_CONFIG_FROM_ASCII_("OWN" )
134	#define FLAGNAME_PACKED _FILTER_CONFIG_FROM_ASCII_("PACKED" )	134	#define FLAGNAME_PACKED _FILTER_CONFIG_FROM_ASCII_("PACKED" )
135	#define FLAGNAME_PREFERRED _FILTER_CONFIG_FROM_ASCII_("PREFERRED" )	135	#define FLAGNAME_PREFERRED _FILTER_CONFIG_FROM_ASCII_("PREFERRED" )
		136	#define FLAGNAME_STARTPRESENTATION _FILTER_CONFIG_FROM_ASCII_("STARTPRESENTATION")
136	#define FLAGNAME_READONLY _FILTER_CONFIG_FROM_ASCII_("READONLY" )	137	#define FLAGNAME_READONLY _FILTER_CONFIG_FROM_ASCII_("READONLY" )
137	#define FLAGNAME_SILENTEXPORT _FILTER_CONFIG_FROM_ASCII_("SILENTEXPORT" )	138	#define FLAGNAME_SILENTEXPORT _FILTER_CONFIG_FROM_ASCII_("SILENTEXPORT" )
138	#define FLAGNAME_SUPPORTSSELECTION _FILTER_CONFIG_FROM_ASCII_("SUPPORTSSELECTION")	139	#define FLAGNAME_SUPPORTSSELECTION _FILTER_CONFIG_FROM_ASCII_("SUPPORTSSELECTION")
Lines 158-163 extern rtl::OUString pFilterStrings[]; Link Here
158	#define FLAGVAL_OWN 0x00000020 // 32	159	#define FLAGVAL_OWN 0x00000020 // 32
159	#define FLAGVAL_PACKED 0x00100000 // 1048576	160	#define FLAGVAL_PACKED 0x00100000 // 1048576
160	#define FLAGVAL_PREFERRED 0x10000000 // 268435456	161	#define FLAGVAL_PREFERRED 0x10000000 // 268435456
		162	#define FLAGVAL_STARTPRESENTATION 0x20000000 // 268435456
161	#define FLAGVAL_READONLY 0x00010000 // 65536	163	#define FLAGVAL_READONLY 0x00010000 // 65536
162	#define FLAGVAL_SILENTEXPORT 0x00200000 // 2097152	164	#define FLAGVAL_SILENTEXPORT 0x00200000 // 2097152
163	#define FLAGVAL_SUPPORTSSELECTION 0x00000400 // 1024	165	#define FLAGVAL_SUPPORTSSELECTION 0x00000400 // 1024

Lines 5-10 all_fragments+=impress Link Here

(-)filter/source/config/fragments/fcfg_impress.mk (+4 lines)
5	T4_IMPRESS = \	5	T4_IMPRESS = \
6	draw_StarOffice_XML_Draw \	6	draw_StarOffice_XML_Draw \
7	impress_MS_PowerPoint_97 \	7	impress_MS_PowerPoint_97 \
		8	impress_MS_PowerPoint_97_AutoPlay \
8	impress_MS_PowerPoint_97_Vorlage \	9	impress_MS_PowerPoint_97_Vorlage \
9	impress_StarOffice_XML_Impress \	10	impress_StarOffice_XML_Impress \
10	impress_StarOffice_XML_Impress_Template \	11	impress_StarOffice_XML_Impress_Template \
Lines 14-25 T4_IMPRESS = \ Link Here
14	impress8_template\	15	impress8_template\
15	draw8\	16	draw8\
16	MS_PowerPoint_2007_XML\	17	MS_PowerPoint_2007_XML\
		18	MS_PowerPoint_2007_XML_AutoPlay\
17	MS_PowerPoint_2007_XML_Template	19	MS_PowerPoint_2007_XML_Template
18		20
19	# -----------------------------------------------	21	# -----------------------------------------------
20	# count = 20	22	# count = 20
21	F4_IMPRESS = \	23	F4_IMPRESS = \
22	MS_PowerPoint_97 \	24	MS_PowerPoint_97 \
		25	MS_PowerPoint_97_AutoPlay \
23	MS_PowerPoint_97_Vorlage \	26	MS_PowerPoint_97_Vorlage \
24	impress_StarOffice_XML_Draw \	27	impress_StarOffice_XML_Draw \
25	StarOffice_XML__Impress_ \	28	StarOffice_XML__Impress_ \
Lines 30-35 F4_IMPRESS = \ Link Here
30	impress8_template\	33	impress8_template\
31	impress8_draw\	34	impress8_draw\
32	impress_MS_PowerPoint_2007_XML\	35	impress_MS_PowerPoint_2007_XML\
		36	impress_MS_PowerPoint_2007_XML_AutoPlay\
33	impress_MS_PowerPoint_2007_XML_Template	37	impress_MS_PowerPoint_2007_XML_Template
34		38
35	# -----------------------------------------------	39	# -----------------------------------------------

Line 0 Link Here

(-)filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu (+13 lines)
	1	<node oor:name="MS PowerPoint 97 AutoPlay" oor:op="replace">
	2	<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN STARTPRESENTATION</value></prop>
	3	<prop oor:name="UIComponent"/>
	4	<prop oor:name="FilterService"/>
	5	<prop oor:name="UserData"><value>sdfilt</value></prop>
	6	<prop oor:name="UIName">
	7	<value xml:lang="x-default">Microsoft PowerPoint 97/2000/XP</value>
	8	</prop>
	9	<prop oor:name="FileFormatVersion"><value>0</value></prop>
	10	<prop oor:name="Type"><value>impress_MS_PowerPoint_97_AutoPlay</value></prop>
	11	<prop oor:name="TemplateName"/>
	12	<prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
	13	</node>

Lines 63-68 namespace framework{ Link Here

(-)framework/inc/filterflags.h (+3 lines)
63	#define FILTERFLAGNAME_SILENTEXPORT DECLARE_ASCII("SilentExport" ) // x	63	#define FILTERFLAGNAME_SILENTEXPORT DECLARE_ASCII("SilentExport" ) // x
64	#define FILTERFLAGNAME_BROWSERPREFERED DECLARE_ASCII("BrowserPrefered" ) // deprecated	64	#define FILTERFLAGNAME_BROWSERPREFERED DECLARE_ASCII("BrowserPrefered" ) // deprecated
65	#define FILTERFLAGNAME_PREFERED DECLARE_ASCII("Prefered" ) // x	65	#define FILTERFLAGNAME_PREFERED DECLARE_ASCII("Prefered" ) // x
		66	#define FILTERFLAGNAME_STARTPRESENTATION DECLARE_ASCII("StartPresentation") // x
66		67
67	#define FILTERFLAG_IMPORT 0x00000001L // 1	68	#define FILTERFLAG_IMPORT 0x00000001L // 1
68	#define FILTERFLAG_EXPORT 0x00000002L // 2	69	#define FILTERFLAG_EXPORT 0x00000002L // 2
Lines 89-94 namespace framework{ Link Here
89	#define FILTERFLAG_BROWSERPREFERED 0x00400000L // 4194304	90	#define FILTERFLAG_BROWSERPREFERED 0x00400000L // 4194304
90	//FREE! ... 0x00800000L	91	//FREE! ... 0x00800000L
91	#define FILTERFLAG_PREFERED 0x10000000L // 268435456	92	#define FILTERFLAG_PREFERED 0x10000000L // 268435456
		93	#define FILTERFLAG_STARTPRESENTATION 0x20000000L
92		94
93	class FlagCheck	95	class FlagCheck
94	{	96	{
Lines 146-151 class FlagCheck Link Here
146	nCheck &= ~FILTERFLAG_SILENTEXPORT;	148	nCheck &= ~FILTERFLAG_SILENTEXPORT;
147	nCheck &= ~FILTERFLAG_BROWSERPREFERED;	149	nCheck &= ~FILTERFLAG_BROWSERPREFERED;
148	nCheck &= ~FILTERFLAG_PREFERED;	150	nCheck &= ~FILTERFLAG_PREFERED;
		151	nCheck &= ~FILTERFLAG_STARTPRESENTATION;
149	return(nCheck == 0);	152	return(nCheck == 0);
150	}	153	}
151		154