Attachment #51666 for issue #86367

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




                                                        0,
                                                        aArgs );

//             ::rtl::OUString aDocumentName;
//             uno::Reference < frame::XModel > xDocument( m_xComponent, uno::UNO_QUERY );

//REMOVE	            uno::Sequence< beans::PropertyValue > aDocArgs = xDocument->getArgs();
//REMOVE	            for ( sal_Int32 nInd = 0; nInd < aDocArgs.getLength(); nInd++ )
//REMOVE	                if ( aDocArgs[nInd].Name.equalsAscii( "Title" ) )
//REMOVE	                {
//REMOVE	                    aDocArgs[nInd].Value >>= aDocumentName;
//REMOVE	                    break;
//REMOVE	                }
//REMOVE
//REMOVE	            SetTitle( aDocumentName );

            return sal_True;
        }
        else

}

//---------------------------------------------------------------------------
void DocumentHolder::SetTitle( const rtl::OUString& aDocumentName )
{
	// TODO: to have a different title for links
	if( m_xFrame.is() )
	{
		rtl::OUString aFilterName;
		uno::Sequence<beans::PropertyValue> aSeq;
        uno::Reference < frame::XModel > xDocument( m_xComponent, uno::UNO_QUERY );
        if( xDocument.is() )
		{
            aSeq = xDocument->getArgs();
			for( sal_Int32 j = 0; j < aSeq.getLength(); ++j )
			{
				if( aSeq[j].Name == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) ) )
				{
					aSeq[j].Value >>= aFilterName;
					break;
				}
			}
		}

		if( aFilterName.getLength() )
		{
			uno::Reference<container::XNameAccess> xNameAccess(
				m_xFactory->createInstance(
					rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) ) ),
				uno::UNO_QUERY );
			try {
				if( xNameAccess.is() && ( xNameAccess->getByName( aFilterName ) >>= aSeq ) )
				{
					for( sal_Int32 j = 0; j < aSeq.getLength(); ++j )
						if( aSeq[j].Name == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ) ) )
						{
							aSeq[j].Value >>= aFilterName;
							break;
						}
				}
			}
			catch( const uno::Exception& )
			{
			}
		}

		// set the title
		uno::Reference<beans::XPropertySet> xPropSet( m_xFrame,uno::UNO_QUERY );
		if( xPropSet.is() )
		{
			uno::Any aAny;
			static const sal_Unicode u[] = { ' ', '(', ' ', 0 };
			static const sal_Unicode c[] = { ' ', ')', 0 };
			rtl::OUString aTotalName( aFilterName );
			aTotalName += rtl::OUString( u );
			aTotalName += aDocumentName;
			aTotalName += rtl::OUString( c );
			aAny <<= aTotalName;

			try
			{
				xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
											aAny );
			}
			catch( const uno::Exception& )
			{
			}
		}
	}

	m_aDocumentNamePart = aDocumentName;

	if( m_pInterceptor )
		m_pInterceptor->GenerateFeatureStateEvent();
}

//---------------------------------------------------------------------------
void DocumentHolder::SetContainerName( const rtl::OUString& aContainerName )
{
	m_aContainerName = aContainerName;
}

//---------------------------------------------------------------------------
void DocumentHolder::Hide()
{
	if( m_xFrame.is() )
		m_xFrame->deactivate();
}

#if 0
//---------------------------------------------------------------------------




}


void SAL_CALL Interceptor::dispose()
	throw( uno::RuntimeException )
{
	lang::EventObject aEvt;
	aEvt.Source = static_cast< frame::XDispatch* >( this );
	
	osl::MutexGuard aGuard(m_aMutex);
	
	if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() )
		m_pDisposeEventListeners->disposeAndClear( aEvt );
	
	if(m_pStatCL)
		m_pStatCL->disposeAndClear( aEvt );
	
	m_xSlaveDispatchProvider = 0;
	m_xMasterDispatchProvider = 0;
}



Interceptor::Interceptor( DocumentHolder* pDocHolder )
	: m_pDocHolder( pDocHolder ),
	  m_pDisposeEventListeners(0),

		}
}

void Interceptor::GenerateFeatureStateEvent()
{
	if(m_pStatCL)
	{
		for(int i = 0; i < IUL; ++i)
		{
			if( i == 1 )
				continue;
			
			cppu::OInterfaceContainerHelper* pICH = 
				m_pStatCL->getContainer(m_aInterceptedURL[i]);
			uno::Sequence<uno::Reference<uno::XInterface> > aSeq;
			if(pICH)
				aSeq = pICH->getElements();
			if(!aSeq.getLength())
				continue;
			
			frame::FeatureStateEvent aStateEvent;
			aStateEvent.IsEnabled = sal_True;
			aStateEvent.Requery = sal_False;			
			if(i == 0)
			{
				aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
				aStateEvent.FeatureDescriptor = rtl::OUString(
					RTL_CONSTASCII_USTRINGPARAM("Update"));
				aStateEvent.State <<= (rtl::OUString(
					RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() );
				
			}
			else if ( i == 5 )
			{
				aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
				aStateEvent.FeatureDescriptor = rtl::OUString(
					RTL_CONSTASCII_USTRINGPARAM("SaveCopyTo"));
				aStateEvent.State <<= (rtl::OUString(
					RTL_CONSTASCII_USTRINGPARAM("($3)")));
			}
			else
			{
				aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
				aStateEvent.FeatureDescriptor = rtl::OUString(
					RTL_CONSTASCII_USTRINGPARAM("Close and Return"));
				aStateEvent.State <<= (rtl::OUString(
					RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() );
				
			}
			
			for(sal_Int32 k = 0; k < aSeq.getLength(); ++k)
			{
				uno::Reference<frame::XStatusListener>
					Control(aSeq[k],uno::UNO_QUERY);
				if(Control.is())
					Control->statusChanged(aStateEvent);
				
			}
		}
	}
}


void SAL_CALL
Interceptor::addStatusListener( 
	const uno::Reference< 




	void CloseDocument( sal_Bool bDeliverOwnership, sal_Bool bWaitForClose );
	void CloseFrame();

	void SetTitle(const rtl::OUString& aDocumentName);

	rtl::OUString GetTitle() const
	{
		return m_aContainerName + ::rtl::OUString::createFromAscii( " - " ) + m_aDocumentNamePart;
	}

	void SetContainerName(const rtl::OUString& aContainerName);
	rtl::OUString GetContainerName() const { return m_aContainerName; }

	void SetOutplaceFrameProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aProps )


	void Show();

	void Hide();

	// sal_Bool SetVisArea( sal_Int64 nAspect, const ::com::sun::star::awt::Rectangle& aRect );
	// sal_Bool GetVisArea( sal_Int64 nAspect, ::com::sun::star::awt::Rectangle *pRect );
	sal_Bool SetExtent( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize );




	Interceptor( DocumentHolder* pDocHolder );
	~Interceptor();

	void GenerateFeatureStateEvent();
	
	void DisconnectDocHolder();
	// overwritten to release the statuslistner.


	removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener )
		throw( com::sun::star::uno::RuntimeException );
	
	void SAL_CALL
	dispose() throw(::com::sun::star::uno::RuntimeException);
	
	
	//XDispatch
	virtual void SAL_CALL 
	dispatch( 




	, m_bWasEverActive( sal_False )
	, m_nNotificationLock( 0 )
	{}
#ifdef WNT
	void StartControlExecution();
	sal_Bool EndControlExecution_WasModified();
	void ModificationNotificationIsDone();
#endif
	void LockNotification();
	void UnlockNotification();


	::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetNewFilledTempStream_Impl(
									const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream )
		throw( ::com::sun::star::io::IOException );
#ifdef WNT
	void SwitchComponentToRunningState_Impl();
#endif
	void MakeEventListenerNotification_Impl( const ::rtl::OUString& aEventName );
#ifdef WNT
	void StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState );

	::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > GetStreamForSaving();


	::com::sun::star::uno::Sequence< sal_Int32 > GetIntermediateVerbsSequence_Impl( sal_Int32 nNewState );

	::com::sun::star::uno::Sequence< sal_Int32 > GetReachableStatesList_Impl(
						const ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor >& aVerbList );
#endif

	void CloseComponent();
	void Dispose();

							const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs,
							sal_Bool bSaveAs )
		throw ( ::com::sun::star::uno::Exception );
#ifdef WNT
	void StoreObjectToStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOutStream )
		throw ( ::com::sun::star::uno::Exception );
#endif
	void InsertVisualCache_Impl(
			const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream,
			const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xCachedVisualRepresentation )

					const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream,
					sal_Bool bAllowRepair50 = sal_False )
		throw ();
#ifdef WNT
	sal_Bool SaveObject_Impl();
	sal_Bool OnShowWindow_Impl( sal_Bool bShow );

	void CreateOleComponent_Impl( OleComponent* pOleComponent = NULL );
	void CreateOleComponentAndLoad_Impl( OleComponent* pOleComponent = NULL );
	void CreateOleComponentFromClipboard_Impl( OleComponent* pOleComponent = NULL );
#endif
	void SetObjectIsLink_Impl( sal_Bool bIsLink ) { m_bIsLink = bIsLink; }

#ifdef WNT
	::rtl::OUString CreateTempURLEmpty_Impl();
	::rtl::OUString GetTempURL_Impl();
#endif
	::rtl::OUString GetContainerName_Impl() { return m_aContainerName; }

public:

	// factory can do it for OOo objects, but for OLE objects OS dependent code is required
	OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory,
						sal_Bool bLink );
#ifdef WNT
	// this constructor let object be initialized from clipboard
	OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
#endif

    virtual ~OleEmbeddedObject();

#ifdef WNT
    void OnIconChanged_Impl();
    void OnViewChanged_Impl();
    void OnClosed_Impl();
#endif

// XEmbeddedObject






using namespace ::com::sun::star;

#ifdef WNT
//----------------------------------------------
void OleEmbeddedObject::SwitchComponentToRunningState_Impl()
{
#ifdef WNT
	if ( m_pOleComponent )
	{
		try

		}
	}
	else
#endif
	{
		throw embed::UnreachableStateException();
	}

	
	return uno::Sequence< sal_Int32 >();
}
#endif
//----------------------------------------------
void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
		throw ( embed::UnreachableStateException,




, m_bFromClipboard( sal_False )
{
}
#ifdef WNT
//------------------------------------------------------
// this constructor let object be initialized from clipboard
OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory )

, m_bFromClipboard( sal_True )
{
}
#endif
//------------------------------------------------------
OleEmbeddedObject::~OleEmbeddedObject()
{

		}
	}
}
#ifdef WNT
//----------------------------------------------
void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState )
{

		}
	}
}
#endif
//------------------------------------------------------
void OleEmbeddedObject::GetRidOfComponent()
{





	return aResult;
}
#ifdef WNT
::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const ::rtl::OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
	throw( io::IOException, uno::RuntimeException )
{


	xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ), uno::makeAny( aMediaType ) );
}
#endif
//------------------------------------------------------
void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStream )
{

	xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" ),
								uno::makeAny( (sal_Bool)sal_True ) );
}
#ifdef WNT
//------------------------------------------------------
void VerbExecutionController::StartControlExecution()
{

	if ( m_bVerbExecutionInProgress && osl_getThreadIdentifier( NULL ) == m_nVerbExecutionThreadIdentifier )
		m_bChangedOnVerbExecution = sal_True;
}
#endif
//-----------------------------------------------
void VerbExecutionController::LockNotification()
{

	SwitchOwnPersistence( xNewParentStorage, xNewOwnStream, aNewName );
}

#ifdef WNT
//----------------------------------------------
sal_Bool OleEmbeddedObject::SaveObject_Impl()
{

}

//------------------------------------------------------
void OleEmbeddedObject::CreateOleComponent_Impl( OleComponent* pOleComponent )
#ifdef WNT
pOleComponent
#endif
)
{
#ifdef WNT
	if ( !m_pOleComponent )
	{
		m_pOleComponent = pOleComponent ? pOleComponent : new OleComponent( m_xFactory, this );


		m_pOleComponent->addCloseListener( m_xClosePreventer );
	}
#endif
}

//------------------------------------------------------
void OleEmbeddedObject::CreateOleComponentAndLoad_Impl( OleComponent* pOleComponent )
#ifdef WNT
pOleComponent
#endif
)
{
#ifdef WNT
	if ( !m_pOleComponent )
	{
		if ( !m_xObjectStream.is() )


		m_pOleComponent->LoadEmbeddedObject( m_aTempURL );
	}

#endif
}

//------------------------------------------------------
void OleEmbeddedObject::CreateOleComponentFromClipboard_Impl( OleComponent* pOleComponent )
#ifdef WNT
pOleComponent
#endif
)
{
#ifdef WNT
	if ( !m_pOleComponent )
	{
		if ( !m_xObjectStream.is() )

		// will be detected later by olecomponent
		m_pOleComponent->CreateObjectFromClipboard();
	}
#endif
}

//------------------------------------------------------

}

//----------------------------------------------
void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream > xOutStream )
#ifdef WNT
xOutStream
#endif
)
	throw ( uno::Exception )
{
	// this method should be used only on windows
#ifdef WNT
	if ( m_pOleComponent )
		m_pOleComponent->StoreOwnTmpIfNecessary();



	// TODO: should the view replacement be in the stream ???
	//		 probably it must be specified on storing
#else
	throw io::IOException();
#endif
}
#endif
//------------------------------------------------------
void OleEmbeddedObject::StoreToLocation_Impl(
							const uno::Reference< embed::XStorage >& xStorage,

Return to issue 86367

Lines 1109-1127 Link Here

(-)source/general/docholder.cxx (-98 lines)
1109	0,	1109	0,
1110	aArgs );	1110	aArgs );
1111		1111
1112	// ::rtl::OUString aDocumentName;
1113	// uno::Reference < frame::XModel > xDocument( m_xComponent, uno::UNO_QUERY );
1114
1115	//REMOVE uno::Sequence< beans::PropertyValue > aDocArgs = xDocument->getArgs();
1116	//REMOVE for ( sal_Int32 nInd = 0; nInd < aDocArgs.getLength(); nInd++ )
1117	//REMOVE if ( aDocArgs[nInd].Name.equalsAscii( "Title" ) )
1118	//REMOVE {
1119	//REMOVE aDocArgs[nInd].Value >>= aDocumentName;
1120	//REMOVE break;
1121	//REMOVE }
1122	//REMOVE
1123	//REMOVE SetTitle( aDocumentName );
1124
1125	return sal_True;	1112	return sal_True;
1126	}	1113	}
1127	else	1114	else
Lines 1152-1242 Link Here
1152	}	1139	}
1153		1140
1154	//---------------------------------------------------------------------------	1141	//---------------------------------------------------------------------------
1155	void DocumentHolder::SetTitle( const rtl::OUString& aDocumentName )
1156	{
1157	// TODO: to have a different title for links
1158	if( m_xFrame.is() )
1159	{
1160	rtl::OUString aFilterName;
1161	uno::Sequence<beans::PropertyValue> aSeq;
1162	uno::Reference < frame::XModel > xDocument( m_xComponent, uno::UNO_QUERY );
1163	if( xDocument.is() )
1164	{
1165	aSeq = xDocument->getArgs();
1166	for( sal_Int32 j = 0; j < aSeq.getLength(); ++j )
1167	{
1168	if( aSeq[j].Name == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) ) )
1169	{
1170	aSeq[j].Value >>= aFilterName;
1171	break;
1172	}
1173	}
1174	}
1175
1176	if( aFilterName.getLength() )
1177	{
1178	uno::Reference<container::XNameAccess> xNameAccess(
1179	m_xFactory->createInstance(
1180	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) ) ),
1181	uno::UNO_QUERY );
1182	try {
1183	if( xNameAccess.is() && ( xNameAccess->getByName( aFilterName ) >>= aSeq ) )
1184	{
1185	for( sal_Int32 j = 0; j < aSeq.getLength(); ++j )
1186	if( aSeq[j].Name == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ) ) )
1187	{
1188	aSeq[j].Value >>= aFilterName;
1189	break;
1190	}
1191	}
1192	}
1193	catch( const uno::Exception& )
1194	{
1195	}
1196	}
1197
1198	// set the title
1199	uno::Reference<beans::XPropertySet> xPropSet( m_xFrame,uno::UNO_QUERY );
1200	if( xPropSet.is() )
1201	{
1202	uno::Any aAny;
1203	static const sal_Unicode u[] = { ' ', '(', ' ', 0 };
1204	static const sal_Unicode c[] = { ' ', ')', 0 };
1205	rtl::OUString aTotalName( aFilterName );
1206	aTotalName += rtl::OUString( u );
1207	aTotalName += aDocumentName;
1208	aTotalName += rtl::OUString( c );
1209	aAny <<= aTotalName;
1210
1211	try
1212	{
1213	xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
1214	aAny );
1215	}
1216	catch( const uno::Exception& )
1217	{
1218	}
1219	}
1220	}
1221
1222	m_aDocumentNamePart = aDocumentName;
1223
1224	if( m_pInterceptor )
1225	m_pInterceptor->GenerateFeatureStateEvent();
1226	}
1227
1228	//---------------------------------------------------------------------------
1229	void DocumentHolder::SetContainerName( const rtl::OUString& aContainerName )
1230	{
1231	m_aContainerName = aContainerName;
1232	}
1233
1234	//---------------------------------------------------------------------------
1235	void DocumentHolder::Hide()
1236	{
1237	if( m_xFrame.is() )
1238	m_xFrame->deactivate();
1239	}
1240		1142
1241	#if 0	1143	#if 0
1242	//---------------------------------------------------------------------------	1144	//---------------------------------------------------------------------------

Lines 123-148 Link Here

(-)source/general/intercept.cxx (-80 lines)
123	}	123	}
124		124
125		125
126	void SAL_CALL Interceptor::dispose()
127	throw( uno::RuntimeException )
128	{
129	lang::EventObject aEvt;
130	aEvt.Source = static_cast< frame::XDispatch* >( this );
131
132	osl::MutexGuard aGuard(m_aMutex);
133
134	if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() )
135	m_pDisposeEventListeners->disposeAndClear( aEvt );
136
137	if(m_pStatCL)
138	m_pStatCL->disposeAndClear( aEvt );
139
140	m_xSlaveDispatchProvider = 0;
141	m_xMasterDispatchProvider = 0;
142	}
143
144
145
146	Interceptor::Interceptor( DocumentHolder* pDocHolder )	126	Interceptor::Interceptor( DocumentHolder* pDocHolder )
147	: m_pDocHolder( pDocHolder ),	127	: m_pDocHolder( pDocHolder ),
148	m_pDisposeEventListeners(0),	128	m_pDisposeEventListeners(0),
Lines 227-292 Link Here
227	}	207	}
228	}	208	}
229		209
230	void Interceptor::GenerateFeatureStateEvent()
231	{
232	if(m_pStatCL)
233	{
234	for(int i = 0; i < IUL; ++i)
235	{
236	if( i == 1 )
237	continue;
238
239	cppu::OInterfaceContainerHelper* pICH =
240	m_pStatCL->getContainer(m_aInterceptedURL[i]);
241	uno::Sequence<uno::Reference<uno::XInterface> > aSeq;
242	if(pICH)
243	aSeq = pICH->getElements();
244	if(!aSeq.getLength())
245	continue;
246
247	frame::FeatureStateEvent aStateEvent;
248	aStateEvent.IsEnabled = sal_True;
249	aStateEvent.Requery = sal_False;
250	if(i == 0)
251	{
252	aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
253	aStateEvent.FeatureDescriptor = rtl::OUString(
254	RTL_CONSTASCII_USTRINGPARAM("Update"));
255	aStateEvent.State <<= (rtl::OUString(
256	RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() );
257
258	}
259	else if ( i == 5 )
260	{
261	aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
262	aStateEvent.FeatureDescriptor = rtl::OUString(
263	RTL_CONSTASCII_USTRINGPARAM("SaveCopyTo"));
264	aStateEvent.State <<= (rtl::OUString(
265	RTL_CONSTASCII_USTRINGPARAM("($3)")));
266	}
267	else
268	{
269	aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
270	aStateEvent.FeatureDescriptor = rtl::OUString(
271	RTL_CONSTASCII_USTRINGPARAM("Close and Return"));
272	aStateEvent.State <<= (rtl::OUString(
273	RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() );
274
275	}
276
277	for(sal_Int32 k = 0; k < aSeq.getLength(); ++k)
278	{
279	uno::Reference<frame::XStatusListener>
280	Control(aSeq[k],uno::UNO_QUERY);
281	if(Control.is())
282	Control->statusChanged(aStateEvent);
283
284	}
285	}
286	}
287	}
288
289
290	void SAL_CALL	210	void SAL_CALL
291	Interceptor::addStatusListener(	211	Interceptor::addStatusListener(
292	const uno::Reference<	212	const uno::Reference<

Lines 175-188 Link Here

(-)source/inc/docholder.hxx (-5 lines)
175	void CloseDocument( sal_Bool bDeliverOwnership, sal_Bool bWaitForClose );	175	void CloseDocument( sal_Bool bDeliverOwnership, sal_Bool bWaitForClose );
176	void CloseFrame();	176	void CloseFrame();
177		177
178	void SetTitle(const rtl::OUString& aDocumentName);
179
180	rtl::OUString GetTitle() const	178	rtl::OUString GetTitle() const
181	{	179	{
182	return m_aContainerName + ::rtl::OUString::createFromAscii( " - " ) + m_aDocumentNamePart;	180	return m_aContainerName + ::rtl::OUString::createFromAscii( " - " ) + m_aDocumentNamePart;
183	}	181	}
184		182
185	void SetContainerName(const rtl::OUString& aContainerName);
186	rtl::OUString GetContainerName() const { return m_aContainerName; }	183	rtl::OUString GetContainerName() const { return m_aContainerName; }
187		184
188	void SetOutplaceFrameProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aProps )	185	void SetOutplaceFrameProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aProps )
Lines 206-213 Link Here
206		203
207	void Show();	204	void Show();
208		205
209	void Hide();
210
211	// sal_Bool SetVisArea( sal_Int64 nAspect, const ::com::sun::star::awt::Rectangle& aRect );	206	// sal_Bool SetVisArea( sal_Int64 nAspect, const ::com::sun::star::awt::Rectangle& aRect );
212	// sal_Bool GetVisArea( sal_Int64 nAspect, ::com::sun::star::awt::Rectangle *pRect );	207	// sal_Bool GetVisArea( sal_Int64 nAspect, ::com::sun::star::awt::Rectangle *pRect );
213	sal_Bool SetExtent( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize );	208	sal_Bool SetExtent( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize );

Lines 68-75 Link Here

(-)source/inc/intercept.hxx (-6 lines)
68	Interceptor( DocumentHolder* pDocHolder );	68	Interceptor( DocumentHolder* pDocHolder );
69	~Interceptor();	69	~Interceptor();
70		70
71	void GenerateFeatureStateEvent();
72
73	void DisconnectDocHolder();	71	void DisconnectDocHolder();
74	// overwritten to release the statuslistner.	72	// overwritten to release the statuslistner.
75		73
Lines 83-92 Link Here
83	removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener )	81	removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener )
84	throw( com::sun::star::uno::RuntimeException );	82	throw( com::sun::star::uno::RuntimeException );
85		83
86	void SAL_CALL
87	dispose() throw(::com::sun::star::uno::RuntimeException);
88
89
90	//XDispatch	84	//XDispatch
91	virtual void SAL_CALL	85	virtual void SAL_CALL
92	dispatch(	86	dispatch(

Lines 110-120 Link Here

(-)source/inc/oleembobj.hxx (-14 / +19 lines)
110	, m_bWasEverActive( sal_False )	110	, m_bWasEverActive( sal_False )
111	, m_nNotificationLock( 0 )	111	, m_nNotificationLock( 0 )
112	{}	112	{}
113		113	#ifdef WNT
114	void StartControlExecution();	114	void StartControlExecution();
115	sal_Bool EndControlExecution_WasModified();	115	sal_Bool EndControlExecution_WasModified();
116	void ModificationNotificationIsDone();	116	void ModificationNotificationIsDone();
117		117	#endif
118	void LockNotification();	118	void LockNotification();
119	void UnlockNotification();	119	void UnlockNotification();
120		120
Lines 235-252 Link Here
235	::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetNewFilledTempStream_Impl(	235	::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetNewFilledTempStream_Impl(
236	const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream )	236	const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream )
237	throw( ::com::sun::star::io::IOException );	237	throw( ::com::sun::star::io::IOException );
238		238	#ifdef WNT
239	void SwitchComponentToRunningState_Impl();	239	void SwitchComponentToRunningState_Impl();
240		240	#endif
241	void MakeEventListenerNotification_Impl( const ::rtl::OUString& aEventName );	241	void MakeEventListenerNotification_Impl( const ::rtl::OUString& aEventName );
		242	#ifdef WNT
242	void StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState );	243	void StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState );
243
244	::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > GetStreamForSaving();	244	::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > GetStreamForSaving();
245		245
		246
246	::com::sun::star::uno::Sequence< sal_Int32 > GetIntermediateVerbsSequence_Impl( sal_Int32 nNewState );	247	::com::sun::star::uno::Sequence< sal_Int32 > GetIntermediateVerbsSequence_Impl( sal_Int32 nNewState );
247		248
248	::com::sun::star::uno::Sequence< sal_Int32 > GetReachableStatesList_Impl(	249	::com::sun::star::uno::Sequence< sal_Int32 > GetReachableStatesList_Impl(
249	const ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor >& aVerbList );	250	const ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor >& aVerbList );
		251	#endif
250		252
251	void CloseComponent();	253	void CloseComponent();
252	void Dispose();	254	void Dispose();
Lines 269-278 Link Here
269	const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs,	271	const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs,
270	sal_Bool bSaveAs )	272	sal_Bool bSaveAs )
271	throw ( ::com::sun::star::uno::Exception );	273	throw ( ::com::sun::star::uno::Exception );
272		274	#ifdef WNT
273	void StoreObjectToStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOutStream )	275	void StoreObjectToStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOutStream )
274	throw ( ::com::sun::star::uno::Exception );	276	throw ( ::com::sun::star::uno::Exception );
275		277	#endif
276	void InsertVisualCache_Impl(	278	void InsertVisualCache_Impl(
277	const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream,	279	const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream,
278	const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xCachedVisualRepresentation )	280	const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xCachedVisualRepresentation )
Lines 292-310 Link Here
292	const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream,	294	const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream,
293	sal_Bool bAllowRepair50 = sal_False )	295	sal_Bool bAllowRepair50 = sal_False )
294	throw ();	296	throw ();
295		297	#ifdef WNT
296	sal_Bool SaveObject_Impl();	298	sal_Bool SaveObject_Impl();
297	sal_Bool OnShowWindow_Impl( sal_Bool bShow );	299	sal_Bool OnShowWindow_Impl( sal_Bool bShow );
298
299	void CreateOleComponent_Impl( OleComponent* pOleComponent = NULL );	300	void CreateOleComponent_Impl( OleComponent* pOleComponent = NULL );
300	void CreateOleComponentAndLoad_Impl( OleComponent* pOleComponent = NULL );	301	void CreateOleComponentAndLoad_Impl( OleComponent* pOleComponent = NULL );
301	void CreateOleComponentFromClipboard_Impl( OleComponent* pOleComponent = NULL );	302	void CreateOleComponentFromClipboard_Impl( OleComponent* pOleComponent = NULL );
302		303	#endif
303	void SetObjectIsLink_Impl( sal_Bool bIsLink ) { m_bIsLink = bIsLink; }	304	void SetObjectIsLink_Impl( sal_Bool bIsLink ) { m_bIsLink = bIsLink; }
304		305
		306	#ifdef WNT
305	::rtl::OUString CreateTempURLEmpty_Impl();	307	::rtl::OUString CreateTempURLEmpty_Impl();
306	::rtl::OUString GetTempURL_Impl();	308	::rtl::OUString GetTempURL_Impl();
307		309	#endif
308	::rtl::OUString GetContainerName_Impl() { return m_aContainerName; }	310	::rtl::OUString GetContainerName_Impl() { return m_aContainerName; }
309		311
310	public:	312	public:
Lines 317-331 Link Here
317	// factory can do it for OOo objects, but for OLE objects OS dependent code is required	319	// factory can do it for OOo objects, but for OLE objects OS dependent code is required
318	OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory,	320	OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory,
319	sal_Bool bLink );	321	sal_Bool bLink );
320		322	#ifdef WNT
321	// this constructor let object be initialized from clipboard	323	// this constructor let object be initialized from clipboard
322	OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );	324	OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
		325	#endif
323		326
324	virtual ~OleEmbeddedObject();	327	virtual ~OleEmbeddedObject();
325		328
326	void OnIconChanged_Impl();	329	#ifdef WNT
		330	void OnIconChanged_Impl();
327	void OnViewChanged_Impl();	331	void OnViewChanged_Impl();
328	void OnClosed_Impl();	332	void OnClosed_Impl();
		333	#endif
329		334
330	// XEmbeddedObject	335	// XEmbeddedObject
331		336

Lines 90-99 Link Here

(-)source/msole/oleembed.cxx (-3 / +2 lines)
90		90
91	using namespace ::com::sun::star;	91	using namespace ::com::sun::star;
92		92
		93	#ifdef WNT
93	//----------------------------------------------	94	//----------------------------------------------
94	void OleEmbeddedObject::SwitchComponentToRunningState_Impl()	95	void OleEmbeddedObject::SwitchComponentToRunningState_Impl()
95	{	96	{
96	#ifdef WNT
97	if ( m_pOleComponent )	97	if ( m_pOleComponent )
98	{	98	{
99	try	99	try
Lines 112-118 Link Here
112	}	112	}
113	}	113	}
114	else	114	else
115	#endif
116	{	115	{
117	throw embed::UnreachableStateException();	116	throw embed::UnreachableStateException();
118	}	117	}
Lines 149-155 Link Here
149		148
150	return uno::Sequence< sal_Int32 >();	149	return uno::Sequence< sal_Int32 >();
151	}	150	}
152		151	#endif
153	//----------------------------------------------	152	//----------------------------------------------
154	void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )	153	void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
155	throw ( embed::UnreachableStateException,	154	throw ( embed::UnreachableStateException,

Lines 125-131 Link Here

(-)source/msole/olemisc.cxx (-4 / +4 lines)
125	, m_bFromClipboard( sal_False )	125	, m_bFromClipboard( sal_False )
126	{	126	{
127	}	127	}
128		128	#ifdef WNT
129	//------------------------------------------------------	129	//------------------------------------------------------
130	// this constructor let object be initialized from clipboard	130	// this constructor let object be initialized from clipboard
131	OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory )	131	OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
Lines 155-161 Link Here
155	, m_bFromClipboard( sal_True )	155	, m_bFromClipboard( sal_True )
156	{	156	{
157	}	157	}
158		158	#endif
159	//------------------------------------------------------	159	//------------------------------------------------------
160	OleEmbeddedObject::~OleEmbeddedObject()	160	OleEmbeddedObject::~OleEmbeddedObject()
161	{	161	{
Lines 200-206 Link Here
200	}	200	}
201	}	201	}
202	}	202	}
203		203	#ifdef WNT
204	//----------------------------------------------	204	//----------------------------------------------
205	void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState )	205	void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState )
206	{	206	{
Lines 241-247 Link Here
241	}	241	}
242	}	242	}
243	}	243	}
244		244	#endif
245	//------------------------------------------------------	245	//------------------------------------------------------
246	void OleEmbeddedObject::GetRidOfComponent()	246	void OleEmbeddedObject::GetRidOfComponent()
247	{	247	{

Lines 221-227 Link Here

(-)source/msole/olepersist.cxx (-37 / +10 lines)
221		221
222	return aResult;	222	return aResult;
223	}	223	}
224		224	#ifdef WNT
225	::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const ::rtl::OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory )	225	::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const ::rtl::OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
226	throw( io::IOException, uno::RuntimeException )	226	throw( io::IOException, uno::RuntimeException )
227	{	227	{
Lines 263-269 Link Here
263		263
264	xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ), uno::makeAny( aMediaType ) );	264	xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ), uno::makeAny( aMediaType ) );
265	}	265	}
266		266	#endif
267	//------------------------------------------------------	267	//------------------------------------------------------
268	void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStream )	268	void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStream )
269	{	269	{
Lines 274-280 Link Here
274	xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" ),	274	xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" ),
275	uno::makeAny( (sal_Bool)sal_True ) );	275	uno::makeAny( (sal_Bool)sal_True ) );
276	}	276	}
277		277	#ifdef WNT
278	//------------------------------------------------------	278	//------------------------------------------------------
279	void VerbExecutionController::StartControlExecution()	279	void VerbExecutionController::StartControlExecution()
280	{	280	{
Lines 312-318 Link Here
312	if ( m_bVerbExecutionInProgress && osl_getThreadIdentifier( NULL ) == m_nVerbExecutionThreadIdentifier )	312	if ( m_bVerbExecutionInProgress && osl_getThreadIdentifier( NULL ) == m_nVerbExecutionThreadIdentifier )
313	m_bChangedOnVerbExecution = sal_True;	313	m_bChangedOnVerbExecution = sal_True;
314	}	314	}
315		315	#endif
316	//-----------------------------------------------	316	//-----------------------------------------------
317	void VerbExecutionController::LockNotification()	317	void VerbExecutionController::LockNotification()
318	{	318	{
Lines 934-940 Link Here
934	SwitchOwnPersistence( xNewParentStorage, xNewOwnStream, aNewName );	934	SwitchOwnPersistence( xNewParentStorage, xNewOwnStream, aNewName );
935	}	935	}
936		936
937		937	#ifdef WNT
938	//----------------------------------------------	938	//----------------------------------------------
939	sal_Bool OleEmbeddedObject::SaveObject_Impl()	939	sal_Bool OleEmbeddedObject::SaveObject_Impl()
940	{	940	{
Lines 1089-1101 Link Here
1089	}	1089	}
1090		1090
1091	//------------------------------------------------------	1091	//------------------------------------------------------
1092	void OleEmbeddedObject::CreateOleComponent_Impl( OleComponent*	1092	void OleEmbeddedObject::CreateOleComponent_Impl( OleComponent* pOleComponent )
1093	#ifdef WNT
1094	pOleComponent
1095	#endif
1096	)
1097	{	1093	{
1098	#ifdef WNT
1099	if ( !m_pOleComponent )	1094	if ( !m_pOleComponent )
1100	{	1095	{
1101	m_pOleComponent = pOleComponent ? pOleComponent : new OleComponent( m_xFactory, this );	1096	m_pOleComponent = pOleComponent ? pOleComponent : new OleComponent( m_xFactory, this );
Lines 1108-1124 Link Here
1108		1103
1109	m_pOleComponent->addCloseListener( m_xClosePreventer );	1104	m_pOleComponent->addCloseListener( m_xClosePreventer );
1110	}	1105	}
1111	#endif
1112	}	1106	}
1113		1107
1114	//------------------------------------------------------	1108	//------------------------------------------------------
1115	void OleEmbeddedObject::CreateOleComponentAndLoad_Impl( OleComponent*	1109	void OleEmbeddedObject::CreateOleComponentAndLoad_Impl( OleComponent* pOleComponent )
1116	#ifdef WNT
1117	pOleComponent
1118	#endif
1119	)
1120	{	1110	{
1121	#ifdef WNT
1122	if ( !m_pOleComponent )	1111	if ( !m_pOleComponent )
1123	{	1112	{
1124	if ( !m_xObjectStream.is() )	1113	if ( !m_xObjectStream.is() )
Lines 1135-1152 Link Here
1135		1124
1136	m_pOleComponent->LoadEmbeddedObject( m_aTempURL );	1125	m_pOleComponent->LoadEmbeddedObject( m_aTempURL );
1137	}	1126	}
1138
1139	#endif
1140	}	1127	}
1141		1128
1142	//------------------------------------------------------	1129	//------------------------------------------------------
1143	void OleEmbeddedObject::CreateOleComponentFromClipboard_Impl( OleComponent*	1130	void OleEmbeddedObject::CreateOleComponentFromClipboard_Impl( OleComponent* pOleComponent )
1144	#ifdef WNT
1145	pOleComponent
1146	#endif
1147	)
1148	{	1131	{
1149	#ifdef WNT
1150	if ( !m_pOleComponent )	1132	if ( !m_pOleComponent )
1151	{	1133	{
1152	if ( !m_xObjectStream.is() )	1134	if ( !m_xObjectStream.is() )
Lines 1158-1164 Link Here
1158	// will be detected later by olecomponent	1140	// will be detected later by olecomponent
1159	m_pOleComponent->CreateObjectFromClipboard();	1141	m_pOleComponent->CreateObjectFromClipboard();
1160	}	1142	}
1161	#endif
1162	}	1143	}
1163		1144
1164	//------------------------------------------------------	1145	//------------------------------------------------------
Lines 1181-1195 Link Here
1181	}	1162	}
1182		1163
1183	//----------------------------------------------	1164	//----------------------------------------------
1184	void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream >	1165	void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream > xOutStream )
1185	#ifdef WNT
1186	xOutStream
1187	#endif
1188	)
1189	throw ( uno::Exception )	1166	throw ( uno::Exception )
1190	{	1167	{
1191	// this method should be used only on windows	1168	// this method should be used only on windows
1192	#ifdef WNT
1193	if ( m_pOleComponent )	1169	if ( m_pOleComponent )
1194	m_pOleComponent->StoreOwnTmpIfNecessary();	1170	m_pOleComponent->StoreOwnTmpIfNecessary();
1195		1171
Lines 1227-1237 Link Here
1227		1203
1228	// TODO: should the view replacement be in the stream ???	1204	// TODO: should the view replacement be in the stream ???
1229	// probably it must be specified on storing	1205	// probably it must be specified on storing
1230	#else
1231	throw io::IOException();
1232	#endif
1233	}	1206	}
1234		1207	#endif
1235	//------------------------------------------------------	1208	//------------------------------------------------------
1236	void OleEmbeddedObject::StoreToLocation_Impl(	1209	void OleEmbeddedObject::StoreToLocation_Impl(
1237	const uno::Reference< embed::XStorage >& xStorage,	1210	const uno::Reference< embed::XStorage >& xStorage,