diff options
Diffstat (limited to 'sd/source/ui/framework')
61 files changed, 261 insertions, 261 deletions
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx index c46a89df8ee8..e0a6c3735c8b 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx index bad80ff50d69..87d20588ca02 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 5e70c313f251..d10324f4be47 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,7 +115,7 @@ void ChangeRequestQueueProcessor::AddRequest ( OSL_TRACE("Adding request\n"); TraceRequest(rxRequest); #endif - + maQueue.push_back(rxRequest); StartProcessing(); } diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx index 3d144bb08cda..74e902543294 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,7 +112,7 @@ private: is destroyed. */ sal_uIntPtr mnUserEventId; - + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfiguration> mxConfiguration; diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 2637a9ac1413..2b4a6697f064 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace { for STL containers. */ class XResourceIdLess - : public ::std::binary_function <Reference<XResourceId>, Reference<XResourceId>, bool> + : public ::std::binary_function <Reference<XResourceId>, Reference<XResourceId>, bool> { public: bool operator () (const Reference<XResourceId>& rId1, const Reference<XResourceId>& rId2) const @@ -119,7 +119,7 @@ Configuration::Configuration ( } - + Configuration::Configuration ( const Reference<XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents, @@ -137,7 +137,7 @@ Configuration::Configuration ( Configuration::~Configuration (void) { } - + @@ -152,7 +152,7 @@ void SAL_CALL Configuration::disposing (void) //----- XConfiguration -------------------------------------------------------- - + void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResourceId) throw (RuntimeException) { @@ -210,7 +210,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( ThrowIfDisposed(); bool bFilterResources (rsResourceURLPrefix.getLength() > 0); - + // Collect the matching resources in a vector. ::std::vector<Reference<XResourceId> > aResources; ResourceContainer::const_iterator iResource; @@ -221,7 +221,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( if ( ! (*iResource)->isBoundTo(rxAnchorId,eMode)) continue; - + if (bFilterResources) { // Apply the given resource prefix as filter. @@ -247,7 +247,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( Sequence<Reference<XResourceId> > aResult (aResources.size()); for (sal_uInt32 nIndex=0; nIndex<aResources.size(); ++nIndex) aResult[nIndex] = aResources[nIndex]; - + return aResult; } @@ -308,7 +308,7 @@ OUString SAL_CALL Configuration::getName (void) aString += FrameworkHelper::ResourceIdToString(*iResource); } aString += OUString::createFromAscii("]"); - + return aString; } @@ -332,7 +332,7 @@ void Configuration::PostEvent ( const bool bActivation) { OSL_ASSERT(rxResourceId.is()); - + if (mxBroadcaster.is()) { ConfigurationChangeEvent aEvent; @@ -348,7 +348,7 @@ void Configuration::PostEvent ( else aEvent.Type = FrameworkHelper::msResourceDeactivationEvent; aEvent.Configuration = this; - + mxBroadcaster->notifyEvent(aEvent); } } diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index 55e22361ad3a..c08e6ff59db5 100755 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,7 +118,7 @@ void ConfigurationClassifier::PartitionResources ( OSL_TRACE("copying resource ids to C2-C1\r"); #endif CopyResources(aC2minusC1, mxConfiguration2, maC2minusC1); - + // Process the unique resources that belong to both configurations. ResourceIdVector::const_iterator iResource; for (iResource=aC1andC2.begin(); iResource!=aC1andC2.end(); ++iResource) @@ -154,7 +154,7 @@ void ConfigurationClassifier::ClassifyResources ( for (sal_Int32 j=0; j<nL2 && !bFound; ++j) if (aA1[i]->getResourceURL().equals(aA2[j]->getResourceURL())) bFound = true; - + if (bFound) rS1andS2.push_back(aA1[i]); else @@ -170,7 +170,7 @@ void ConfigurationClassifier::ClassifyResources ( for (sal_Int32 i=0; i<nL1 && !bFound; ++i) if (aA2[j]->getResourceURL().equals(aA1[i]->getResourceURL())) bFound = true; - + if ( ! bFound) rS2minusS1.push_back(aA2[j]); } @@ -195,7 +195,7 @@ void ConfigurationClassifier::CopyResources ( OUString(), AnchorBindingMode_INDIRECT)); const sal_Int32 nL (aBoundResources.getLength()); - + rTarget.reserve(rTarget.size() + 1 + nL); rTarget.push_back(*iResource); @@ -204,7 +204,7 @@ void ConfigurationClassifier::CopyResources ( OUStringToOString(FrameworkHelper::ResourceIdToString(*iResource), RTL_TEXTENCODING_UTF8).getStr()); #endif - + const Reference<XResourceId>* aA = aBoundResources.getConstArray(); for (sal_Int32 i=0; i<nL; ++i) { diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx index b19f8c1459a5..4fb9394bcd8d 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 2f846e50be25..4329c575e8b3 100755 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,7 +116,7 @@ public: ::com::sun::star::drawing::framework::XConfiguration> mxRequestedConfiguration; ViewShellBase* mpBase; - + ::boost::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer; ::boost::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager; @@ -142,14 +142,14 @@ ConfigurationController::Lock::Lock (const Reference<XConfigurationController>& : mxController(rxController) { OSL_ASSERT(mxController.is()); - + if (mxController.is()) mxController->lock(); } - - - + + + ConfigurationController::Lock::~Lock (void) { if (mxController.is()) @@ -286,7 +286,7 @@ void SAL_CALL ConfigurationController::notifyEvent ( //----- XConfigurationController ---------------------------------------------- - + void SAL_CALL ConfigurationController::lock (void) throw (RuntimeException) { @@ -296,7 +296,7 @@ void SAL_CALL ConfigurationController::lock (void) ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); - + ++mpImplementation->mnLockCount; if (mpImplementation->mpConfigurationUpdaterLock.get()==NULL) mpImplementation->mpConfigurationUpdaterLock @@ -379,7 +379,7 @@ void SAL_CALL ConfigurationController::requestResourceActivation ( requestResourceDeactivation(aResourceList[nIndex]); } } - + Reference<XConfigurationChangeRequest> xRequest( new GenericConfigurationChangeRequest( rxResourceId, @@ -476,7 +476,7 @@ sal_Bool SAL_CALL ConfigurationController::hasPendingRequests (void) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); - + return ! mpImplementation->mpQueueProcessor->IsEmpty(); } @@ -595,7 +595,7 @@ void SAL_CALL ConfigurationController::restoreConfiguration ( //----- XResourceFactoryManager ----------------------------------------------- - + void SAL_CALL ConfigurationController::addResourceFactory( const OUString& sResourceURL, const Reference<XResourceFactory>& rxResourceFactory) @@ -608,7 +608,7 @@ void SAL_CALL ConfigurationController::addResourceFactory( - + void SAL_CALL ConfigurationController::removeResourceFactoryForURL( const OUString& sResourceURL) throw (RuntimeException) diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index ff167f07520a..416760c1027d 100755 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ void ConfigurationControllerBroadcaster::AddListener( OUString::createFromAscii("invalid listener"), mxConfigurationController, 0); - + if (maListenerMap.find(rsEventType) == maListenerMap.end()) maListenerMap[rsEventType] = ListenerList(); ListenerDescriptor aDescriptor; @@ -80,7 +80,7 @@ void ConfigurationControllerBroadcaster::RemoveListener( OUString::createFromAscii("invalid listener"), mxConfigurationController, 0); - + ListenerMap::iterator iMap; ListenerList::iterator iList; for (iMap=maListenerMap.begin(); iMap!=maListenerMap.end(); ++iMap) @@ -143,7 +143,7 @@ void ConfigurationControllerBroadcaster::NotifyListeners (const ConfigurationCha ListenerList aList (iMap->second.begin(), iMap->second.end()); NotifyListeners(aList,rEvent); } - + // Notify the universal listeners. iMap = maListenerMap.find(OUString()); if (iMap != maListenerMap.end()) diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index a5939386d7b7..d29b06125bde 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index 93ff7ee54e00..8f7d055e8544 100755 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -113,7 +113,7 @@ void ConfigurationControllerResourceManager::DeactivateResources ( rResources.rend(), ::boost::bind(&ConfigurationControllerResourceManager::DeactivateResource, this, _1, rxConfiguration)); -} +} @@ -152,7 +152,7 @@ void ConfigurationControllerResourceManager::ActivateResource ( #endif return; } - + try { // 2. Create the resource. @@ -171,7 +171,7 @@ void ConfigurationControllerResourceManager::ActivateResource ( { DBG_UNHANDLED_EXCEPTION(); } - + if (xResource.is()) { #if defined VERBOSE && VERBOSE>=1 @@ -224,10 +224,10 @@ void ConfigurationControllerResourceManager::DeactivateResource ( { // 1. Remove resource from URL->Object map. ResourceDescriptor aDescriptor (RemoveResource(rxResourceId)); - + if (aDescriptor.mxResource.is() && aDescriptor.mxResourceFactory.is()) { - // 2. Notifiy listeners that the resource is being deactivated. + // 2. Notifiy listeners that the resource is being deactivated. mpBroadcaster->NotifyListeners( FrameworkHelper::msResourceDeactivationEvent, rxResourceId, @@ -289,7 +289,7 @@ void ConfigurationControllerResourceManager::AddResource ( aDescriptor.mxResource = rxResource; aDescriptor.mxResourceFactory = rxFactory; maResourceMap[rxResource->getResourceId()] = aDescriptor; - + #if defined VERBOSE && VERBOSE>=2 OSL_TRACE("ConfigurationControllerResourceManager::AddResource(): added %s -> %x\n", OUStringToOString( diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx index 0c095df50fdf..9743e1a7546d 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ public: const ::std::vector< css::uno::Reference<css::drawing::framework::XResourceId> >& rResources, const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration); - + /** Deactivate all the resources that are specified by resource ids in rResources. The resource ids of deactivated resources are removed from the given configuration. Activated resources are notified to all @@ -126,15 +126,15 @@ private: void ActivateResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration); - + void DeactivateResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration); - + void AddResource ( const css::uno::Reference<css::drawing::framework::XResource>& rxResource, const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory); - + ResourceDescriptor RemoveResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId); }; diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index b9552940060e..1d19026be57e 100755 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx index b04206fd65e1..4fd464bc8553 100755 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 4ab361a9490d..28a502488547 100755 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -137,7 +137,7 @@ void ConfigurationUpdater::RequestUpdate ( do { UpdateConfiguration(); - + if (mbUpdatePending && IsUpdatePossible()) continue; } @@ -215,7 +215,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) catch(RuntimeException) { } - + // Notify the end of the update. aEvent.Type = FrameworkHelper::msConfigurationUpdateEndEvent; mpBroadcaster->NotifyListeners(aEvent); @@ -239,7 +239,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) { DBG_UNHANDLED_EXCEPTION(); } - + #if defined VERBOSE && VERBOSE>0 OSL_TRACE("ConfigurationUpdater::UpdateConfiguration)"); OSL_TRACE("UpdateConfiguration end"); @@ -397,7 +397,7 @@ void ConfigurationUpdater::CheckPureAnchors ( OUStringToOString( FrameworkHelper::ResourceIdToString(xResourceId), RTL_TEXTENCODING_UTF8).getStr()); -#endif +#endif // Erase element from current configuration. for (sal_Int32 nI=nIndex; nI<nCount-2; ++nI) aResources[nI] = aResources[nI+1]; diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index a9f3e09f2a64..2548b0232681 100755 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ public: void SetControllerManager( const css::uno::Reference< css::drawing::framework::XControllerManager>& rxControllerManager); - + /** Request an update of the current configuration so that it looks like the given requested configuration. It checks whether an update of the current configuration can be done. Calls UpdateConfiguration() @@ -90,7 +90,7 @@ public: made. */ ::boost::shared_ptr<ConfigurationUpdaterLock> GetLock (void); - + private: /** A reference to the XControllerManager is kept so that UpdateConfiguration() has access to the other sub controllers. @@ -122,13 +122,13 @@ private: resets the flag to </FALSE>. */ bool mbUpdatePending; - + /** This flag is set to </TRUE> while the UpdateConfiguration() method is running. It is used to prevent reentrance problems with this method. */ bool mbUpdateBeingProcessed; - + /** The ConfigurationController is locked when this count has a value larger then zero. If the controller is locked then updates of the current configuration are not made. diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index 18c80b8b1243..eeba7cc75605 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest (void) thr - + void SAL_CALL GenericConfigurationChangeRequest::execute ( const Reference<XConfiguration>& rxConfiguration) throw (RuntimeException) @@ -71,7 +71,7 @@ void SAL_CALL GenericConfigurationChangeRequest::execute ( case Activation: rxConfiguration->addResource(mxResourceId); break; - + case Deactivation: rxConfiguration->removeResource(mxResourceId); break; diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index ce708e1fa71a..03a7e52d947c 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ public: resource is requested. */ enum Mode { Activation, Deactivation }; - + /** Create a new object that represents the request for activation or deactivation of the specified resource. @param rxsResourceId @@ -80,12 +80,12 @@ public: rxResourceId, const Mode eMode) throw (::com::sun::star::lang::IllegalArgumentException); - + virtual ~GenericConfigurationChangeRequest (void) throw(); - + // XConfigurationChangeOperation - + /** The requested configuration change is executed on the given configuration. Additionally to the explicitly requested change other changes have to be made as well. See class description for an diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index 1df3c77d78ba..942eca26b27d 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -193,7 +193,7 @@ Reference<XResourceFactory> ResourceFactoryManager::GetFactory ( // requested view type. Note that this can (and should) cause // intermediate calls to AddFactory(). xModuleController->requestResource(sURLBase); - + xFactory = FindFactory(sURLBase); } } diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx index dc7d2574dbfc..d8ad8c9aa639 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ private: typedef ::std::vector< ::std::pair< - rtl::OUString, + rtl::OUString, css::uno::Reference<css::drawing::framework::XResourceFactory> > > FactoryPatternList; FactoryPatternList maFactoryPatternList; diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 15d7c3a6f4ec..ab46f7da51e5 100755 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -294,7 +294,7 @@ sal_Int16 SAL_CALL throw (RuntimeException) { sal_Int16 nResult (0); - + if ( ! rxResourceId.is()) { // The empty reference is interpreted as empty resource id object. @@ -381,7 +381,7 @@ sal_Int16 ResourceId::CompareToExternalImplementation (const Reference<XResource const Sequence<OUString> aAnchorURLs (rxId->getAnchorURLs()); const sal_uInt32 nLocalURLCount (maResourceURLs.size()); const sal_uInt32 nURLCount(1+aAnchorURLs.getLength()); - + // Start comparison with the top most anchors. sal_Int32 nLocalResult (0); for (sal_Int32 nIndex=nURLCount-1,nLocalIndex=nLocalURLCount-1; @@ -449,7 +449,7 @@ sal_Bool SAL_CALL return IsBoundToAnchor(&sResourceURL, &aAnchorURLs, eMode); } } - + @@ -609,7 +609,7 @@ void ResourceId::ParseResourceURL (void) SdGlobalResourceContainer::Instance().AddResource( Reference<XInterface>(xURLTransformer,UNO_QUERY)); } - + if (xURLTransformer.is() && maResourceURLs.size() > 0) { mpURL.reset(new util::URL); diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index 1c39006b29c7..3f092d327c34 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ UpdateRequest::~UpdateRequest (void) throw() - + void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfiguration) throw (RuntimeException) { diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index e3fc159d4b11..87031583125c 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,9 +64,9 @@ public: UpdateRequest (void) throw(); virtual ~UpdateRequest (void) throw(); - + // XConfigurationChangeOperation - + virtual void SAL_CALL execute ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration) diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index f406501bd114..e05e66c4c47c 100755 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -146,7 +146,7 @@ BasicPaneFactory::BasicPaneFactory ( BasicPaneFactory::~BasicPaneFactory (void) { } - + @@ -440,7 +440,7 @@ void SAL_CALL BasicPaneFactory::notifyConfigurationChange ( - + //===== lang::XEventListener ================================================== void SAL_CALL BasicPaneFactory::disposing ( @@ -477,7 +477,7 @@ Reference<XResource> BasicPaneFactory::CreateFrameWindowPane ( const Reference<XResourceId>& rxPaneId) { Reference<XResource> xPane; - + if (mpViewShellBase != NULL) { xPane = new FrameWindowPane(rxPaneId, mpViewShellBase->GetViewWindow()); @@ -522,12 +522,12 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane ( pShell.reset(new LeftImpressPaneShell()); nChildWindowId = ::sd::LeftPaneImpressChildWindow::GetChildWindowId(); break; - + case LeftDrawPaneId: pShell.reset(new LeftDrawPaneShell()); nChildWindowId = ::sd::LeftPaneDrawChildWindow::GetChildWindowId(); break; - + case RightPaneId: pShell.reset(new ToolPanelPaneShell()); nChildWindowId = ::sd::ToolPanelChildWindow::GetChildWindowId(); diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index 9b41866180fc..9ce59689fb11 100755 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,25 +77,25 @@ namespace sd { namespace framework { */ class BasicPaneFactory : private ::cppu::BaseMutex, - public BasicPaneFactoryInterfaceBase + public BasicPaneFactoryInterfaceBase { public: BasicPaneFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~BasicPaneFactory (void); - + virtual void SAL_CALL disposing (void); - + // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); // XResourceFactory - + virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId) @@ -115,7 +115,7 @@ public: // lang::XEventListener - + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index d353cfc58c1f..3301f4b2b5ad 100755 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -189,7 +189,7 @@ void SAL_CALL BasicToolBarFactory::disposing ( //===== XPaneFactory ========================================================== - + Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( const Reference<XResourceId>& rxToolBarId) throw (RuntimeException, IllegalArgumentException, WrappedTargetException) @@ -197,7 +197,7 @@ Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( ThrowIfDisposed(); Reference<XResource> xToolBar; - + if (rxToolBarId->getResourceURL().equals(FrameworkHelper::msViewTabBarURL)) { xToolBar = new ViewTabBar(rxToolBarId, mxController); @@ -205,7 +205,7 @@ Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( else throw lang::IllegalArgumentException(); - + return xToolBar; } diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index 686de897c179..8b98a3d15a0f 100755 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,18 +64,18 @@ namespace sd { namespace framework { */ class BasicToolBarFactory : protected ::cppu::BaseMutex, - public BasicToolBarFactoryInterfaceBase + public BasicToolBarFactoryInterfaceBase { public: BasicToolBarFactory ( const css::uno::Reference<com::sun::star::uno::XComponentContext>& rxContext); virtual ~BasicToolBarFactory (void); - + virtual void SAL_CALL disposing (void); - + // ToolBarFactory - + virtual css::uno::Reference<com::sun::star::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference< @@ -90,14 +90,14 @@ public: // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<com::sun::star::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); - + // lang::XEventListener - + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 1320df5c827b..d73efd9979bf 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -153,7 +153,7 @@ BasicViewFactory::BasicViewFactory ( BasicViewFactory::~BasicViewFactory (void) { } - + @@ -172,7 +172,7 @@ void SAL_CALL BasicViewFactory::disposing (void) { ReleaseView(*iView, true); } - + // Release the view shell container. At this point no one other than us // should hold references to the view shells (at the moment this is a // trivial requirement, because no one other then us holds a shared @@ -215,10 +215,10 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); // Get the view frame. - SfxViewFrame* pFrame = NULL; + SfxViewFrame* pFrame = NULL; if (mpBase != NULL) pFrame = mpBase->GetViewFrame(); - + if (pFrame != NULL && mpBase!=NULL && pWindow!=NULL) { // Try to get the view from the cache. @@ -229,7 +229,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( { pDescriptor = CreateView(rxViewId, *pFrame, *pWindow, xPane, pFrameView); } - + if (pDescriptor.get() != NULL) xView = pDescriptor->mxView; @@ -240,7 +240,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( else pWindow->Resize(); } - + return xView; } @@ -354,14 +354,14 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) FrameView* pFrameView) { ::boost::shared_ptr<ViewDescriptor> pDescriptor (new ViewDescriptor()); - + pDescriptor->mpViewShell = CreateViewShell( rxViewId, rFrame, rWindow, pFrameView); pDescriptor->mxViewId = rxViewId; - + if (pDescriptor->mpViewShell.get() != NULL) { const bool bIsCenterPane ( @@ -476,7 +476,7 @@ void BasicViewFactory::ReleaseView ( bool bDoNotCache) { bool bIsCacheable (!bDoNotCache && IsCacheable(rpDescriptor)); - + if (bIsCacheable) { Reference<XRelocatableResource> xResource (rpDescriptor->mxView, UNO_QUERY); @@ -496,14 +496,14 @@ void BasicViewFactory::ReleaseView ( bIsCacheable = false; } } - + if ( ! bIsCacheable) { // Shut down the current view shell. rpDescriptor->mpViewShell->Shutdown (); mpBase->GetDocShell()->Disconnect(rpDescriptor->mpViewShell.get()); mpBase->GetViewShellManager()->DeactivateViewShell(rpDescriptor->mpViewShell.get()); - + Reference<XComponent> xComponent (rpDescriptor->mxView, UNO_QUERY); if (xComponent.is()) xComponent->dispose(); @@ -581,7 +581,7 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& r if (xResource->relocateToAnchor(xNewAnchor)) bRelocationSuccessfull = true; } - + if ( ! bRelocationSuccessfull) { ReleaseView(pDescriptor, true); diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index e5bb43551a24..34d2e258768b 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,16 +81,16 @@ namespace sd { namespace framework { */ class BasicViewFactory : private sd::MutexOwner, - public BasicViewFactoryInterfaceBase + public BasicViewFactoryInterfaceBase { public: BasicViewFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~BasicViewFactory (void); - + virtual void SAL_CALL disposing (void); - + // XViewFactory virtual css::uno::Reference<css::drawing::framework::XResource> @@ -102,9 +102,9 @@ public: const css::uno::Reference<css::drawing::framework::XResource>& xView) throw(css::uno::RuntimeException); - + // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); @@ -129,7 +129,7 @@ private: ::Window& rWindow, const css::uno::Reference<css::drawing::framework::XPane>& rxPane, FrameView* pFrameView); - + ::boost::shared_ptr<ViewShell> CreateViewShell ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, SfxViewFrame& rFrame, diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 5e4e6df987f0..a9717ff21dee 100755 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -146,7 +146,7 @@ void SAL_CALL ChildWindowPane::disposing (void) if (mxWindow.is()) // Window already exists => nothing to do. break; - + // When the window is not yet present then obtain it only when the // shell has already been activated. The activation is not // necessary for the code to work properly but is used to optimize @@ -156,7 +156,7 @@ void SAL_CALL ChildWindowPane::disposing (void) // Impress takes longer. if ( ! mbHasBeenActivated && mpShell.get()!=NULL && ! mpShell->IsActive()) break; - + mbHasBeenActivated = true; SfxViewFrame* pViewFrame = mrViewShellBase.GetViewFrame(); if (pViewFrame == NULL) @@ -193,7 +193,7 @@ void SAL_CALL ChildWindowPane::disposing (void) // At last, we have access to the window and its UNO wrapper. mpWindow = &pDockingWindow->GetContentWindow(); mxWindow = VCLUnoHelper::GetInterface(mpWindow); - + // Register as window listener to be informed when the child window // is hidden. if (mxWindow.is()) @@ -218,11 +218,11 @@ Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow (void) IMPLEMENT_FORWARD_XINTERFACE2( - ChildWindowPane, + ChildWindowPane, ChildWindowPaneInterfaceBase, Pane); IMPLEMENT_FORWARD_XTYPEPROVIDER2( - ChildWindowPane, + ChildWindowPane, ChildWindowPaneInterfaceBase, Pane); @@ -235,7 +235,7 @@ void SAL_CALL ChildWindowPane::disposing (const lang::EventObject& rEvent) throw (RuntimeException) { ThrowIfDisposed(); - + if (rEvent.Source == mxWindow) { // The window is gone but the pane remains alive. The next call to diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index 4d2f154a327f..7bf636c3f765 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,7 +118,7 @@ private: USHORT mnChildWindowId; ViewShellBase& mrViewShellBase; ::std::auto_ptr<SfxShell> mpShell; - + /** This flag is set when the pane shell has been activated at least once. It is used to optimize the start-up performance (by not showing the window too early) and by not delaying its creation at diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index 8cdbffe05816..31707e9fb867 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index 9fbc153f59ce..017fc7414062 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 74088422b4ab..c5f3d59807bd 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ FullScreenPane::FullScreenPane ( sal_Int32 nScreenNumber = 1; ExtractArguments(rxPaneId, nScreenNumber); - + if (mpWorkWindow.get() == NULL) return; @@ -134,8 +134,8 @@ void SAL_CALL FullScreenPane::disposing (void) mpWorkWindow->RemoveEventListener(aWindowEventHandler); mpWorkWindow.reset(); } - - + + FrameWindowPane::disposing(); } @@ -191,7 +191,7 @@ void SAL_CALL FullScreenPane::setAccessible ( throw (RuntimeException) { ThrowIfDisposed(); - + if (mpWindow != NULL) { Reference<lang::XInitialization> xInitializable (rxAccessible, UNO_QUERY); @@ -242,14 +242,14 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void) if (pWindow != NULL) { Sequence<Any> aArg (5); - + // common: first any is VCL pointer to window (for VCL canvas) aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow)); aArg[1] = Any(); aArg[2] = makeAny(::com::sun::star::awt::Rectangle()); aArg[3] = makeAny(sal_False); aArg[4] = makeAny(mxWindow); - + Reference<lang::XMultiServiceFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); return Reference<rendering::XCanvas>( diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index c69a09e10b54..7e71abb8470c 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ public: const cssu::Reference<css::accessibility::XAccessible>& rxAccessible) throw (cssu::RuntimeException); - + //------------------------------------------------------------------------- DECL_LINK(WindowEventHandler, VclWindowEvent*); diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 94081f24b733..08306aa22cbc 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ void Pane::disposing (void) //----- XPane ----------------------------------------------------------------- - + Reference<awt::XWindow> SAL_CALL Pane::getWindow (void) throw (RuntimeException) { @@ -106,7 +106,7 @@ Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void) if ( ! mxCanvas.is()) mxCanvas = CreateCanvas(); - + return mxCanvas; } @@ -215,7 +215,7 @@ const Sequence<sal_Int8>& Pane::getUnoTunnelId (void) sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId) throw (RuntimeException) -{ +{ sal_Int64 nResult = 0; if (rId.getLength() == 16 @@ -236,7 +236,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas (void) throw (RuntimeException) { Reference<rendering::XCanvas> xCanvas; - + if (mpWindow != NULL) { ::cppcanvas::SpriteCanvasSharedPtr pCanvas ( @@ -244,7 +244,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas (void) if (pCanvas.get() != NULL) xCanvas = Reference<rendering::XCanvas>(pCanvas->getUNOSpriteCanvas(), UNO_QUERY); } - + return xCanvas; } diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 6f22f1484627..623eddf134a8 100755 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,9 +61,9 @@ public: virtual ~PresentationFactoryProvider (void); virtual void SAL_CALL disposing (void); - + // XInitialization - + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArguments) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -95,7 +95,7 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (RuntimeException) { return false; } - + private: Reference<XResourceId> mxResourceId; }; @@ -167,7 +167,7 @@ PresentationFactory::PresentationFactory ( PresentationFactory::~PresentationFactory (void) { } - + @@ -231,7 +231,7 @@ void SAL_CALL PresentationFactory::notifyConfigurationChange ( - + //===== lang::XEventListener ================================================== void SAL_CALL PresentationFactory::disposing ( @@ -290,7 +290,7 @@ void PresentationFactoryProvider::disposing (void) // XInitialization - + void SAL_CALL PresentationFactoryProvider::initialize( const Sequence<Any>& aArguments) throw (Exception, RuntimeException) diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index d7c45ceb803b..b518b51aea4d 100755 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,13 +82,13 @@ typedef ::cppu::WeakComponentImplHelper1 < class TaskPanelResource : private ::cppu::BaseMutex, - public TaskPanelResourceInterfaceBase + public TaskPanelResourceInterfaceBase { public: TaskPanelResource ( const Reference<XResourceId>& rxResourceId ); virtual ~TaskPanelResource (); - + virtual void SAL_CALL disposing (); // XResource @@ -134,9 +134,9 @@ void SAL_CALL TaskPanelFactory::disposing (void) - + //===== XInitialization ======================================================= - + void SAL_CALL TaskPanelFactory::initialize( const ::com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArguments) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) @@ -205,7 +205,7 @@ Reference<XResource> SAL_CALL TaskPanelFactory::createResource ( throw (RuntimeException, IllegalArgumentException, WrappedTargetException) { Reference<XResource> xResource; - + if ( ! rxResourceId.is()) return NULL; @@ -214,7 +214,7 @@ Reference<XResource> SAL_CALL TaskPanelFactory::createResource ( if ( sResourceURL.match( FrameworkHelper::msTaskPanelURLPrefix ) ) { toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( sResourceURL ) ); - + if ( ( ePanelId != toolpanel::PID_UNKNOWN ) && ( mpViewShellBase != NULL ) ) { ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) ); diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx index 086788a6763e..347e89c4d953 100755 --- a/sd/source/ui/framework/factories/TaskPanelFactory.hxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,18 +57,18 @@ namespace sd { namespace framework { */ class TaskPanelFactory : private ::cppu::BaseMutex, - public TaskPanelFactoryInterfaceBase + public TaskPanelFactoryInterfaceBase { public: TaskPanelFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~TaskPanelFactory (void); - + virtual void SAL_CALL disposing (void); - + // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index a1c0bd525c9e..faac4af35412 100755 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ ViewShellWrapper::ViewShellWrapper ( ViewShellWrapper::~ViewShellWrapper (void) { } - + @@ -149,7 +149,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( if (xWindow.is()) xWindow->removeWindowListener(this); mxWindow = NULL; - + if (mpViewShell.get() != NULL) { ::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); @@ -197,7 +197,7 @@ const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId (void) sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId) throw (RuntimeException) -{ +{ sal_Int64 nResult = 0; if (rId.getLength() == 16 @@ -231,7 +231,7 @@ void SAL_CALL ViewShellWrapper::windowMoved (const awt::WindowEvent& rEvent) { (void)rEvent; } - + @@ -243,7 +243,7 @@ void SAL_CALL ViewShellWrapper::windowShown (const lang::EventObject& rEvent) if (pViewShell != NULL) pViewShell->Resize(); } - + diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 32e055144fc3..1b3f24187b23 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxC if (xControllerManager.is()) { mxConfigurationController = xControllerManager->getConfigurationController(); - + // Tunnel through the controller to obtain a ViewShellBase. Reference<lang::XUnoTunnel> xTunnel (rxController, UNO_QUERY); if (xTunnel.is()) @@ -84,7 +84,7 @@ CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxC mbValid = true; } } - + if (mbValid) { mxConfigurationController->addConfigurationChangeListener( @@ -104,7 +104,7 @@ CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxC CenterViewFocusModule::~CenterViewFocusModule (void) { } - + diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx index e104b8971fb3..c099d9ea795b 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,16 +63,16 @@ namespace sd { namespace framework { */ class CenterViewFocusModule : private sd::MutexOwner, - public CenterViewFocusModuleInterfaceBase + public CenterViewFocusModuleInterfaceBase { public: CenterViewFocusModule ( ::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController); virtual ~CenterViewFocusModule (void); - + virtual void SAL_CALL disposing (void); - + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/DrawModule.cxx b/sd/source/ui/framework/module/DrawModule.cxx index 1f1604a3099c..9f3e695e89fc 100644 --- a/sd/source/ui/framework/module/DrawModule.cxx +++ b/sd/source/ui/framework/module/DrawModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/module/ImpressModule.cxx b/sd/source/ui/framework/module/ImpressModule.cxx index a5856bc3ebc9..a635e3fa2069 100755 --- a/sd/source/ui/framework/module/ImpressModule.cxx +++ b/sd/source/ui/framework/module/ImpressModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index e910a8df7496..ef4b8b529299 100755 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -243,7 +243,7 @@ void ModuleController::InstantiateStartupServices (void) void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues) { OSL_ASSERT(rValues.size() == snStartupPropertyCount); - + try { // Get the service name of the startup service. @@ -319,7 +319,7 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL) //----- XInitialization ------------------------------------------------------- - + void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments) throw (Exception, RuntimeException) { diff --git a/sd/source/ui/framework/module/PresentationModule.cxx b/sd/source/ui/framework/module/PresentationModule.cxx index 6a5ba5dc5e7f..2fc1a783355e 100755 --- a/sd/source/ui/framework/module/PresentationModule.cxx +++ b/sd/source/ui/framework/module/PresentationModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx index 090247e7f68c..1bc567ac8a93 100755 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx +++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -160,13 +160,13 @@ bool ReadOnlyModeObserver::ConnectToDispatch (void) } } } - + return mxDispatch.is(); } - + void ReadOnlyModeObserver::statusChanged (const frame::FeatureStateEvent& rEvent) throw (RuntimeException) { @@ -191,7 +191,7 @@ void SAL_CALL ReadOnlyModeObserver::disposing ( mxConfigurationController = NULL; else if (rEvent.Source == mxDispatch) mxDispatch = NULL; - + dispose(); } diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx index d783d6d83abf..d4b0314aa265 100755 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx +++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ public: ReadOnlyModeObserver ( const ::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController); virtual ~ReadOnlyModeObserver (void); - + virtual void SAL_CALL disposing (void); @@ -97,7 +97,7 @@ public: const com::sun::star::lang::EventObject& rEvent) throw (com::sun::star::uno::RuntimeException); - + // frame::XStatusListener /** Called by slot state change broadcasters. @@ -107,9 +107,9 @@ public: statusChanged ( const ::com::sun::star::frame::FeatureStateEvent& rState) throw (::com::sun::star::uno::RuntimeException); - + // XConfigurationChangeListener - + virtual void SAL_CALL notifyConfigurationChange ( const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index fcd90ca6454b..8050fc058055 100755 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index d00ee78c2de3..dd7cd9e0c73c 100755 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace sd { namespace framework { */ class ResourceManager : private sd::MutexOwner, - public ResourceManagerInterfaceBase + public ResourceManagerInterfaceBase { public: ResourceManager ( @@ -70,14 +70,14 @@ public: activate the resource managed by the called object. */ void AddActiveMainView (const ::rtl::OUString& rsMainViewURL); - + virtual void SAL_CALL disposing (void); /** Allow the ResourceManager to make resource activation or deactivation requests. */ void Enable (void); - + /** Disable the resource management. When called, the ResourceManager requests the resource to be deactivated. Until enabled again it does not make any further requests for resource activation or @@ -86,7 +86,7 @@ public: Call this for example to hide resources in read-only mode. */ void Disable (void); - + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index 79396a57f36a..47acc5b88f5d 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController) if (xControllerManager.is()) { mxConfigurationController = xControllerManager->getConfigurationController(); - + // Tunnel through the controller to obtain a ViewShellBase. Reference<lang::XUnoTunnel> xTunnel (rxController, UNO_QUERY); if (xTunnel.is()) @@ -94,7 +94,7 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController) ShellStackGuard::~ShellStackGuard (void) { } - + diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 694e7fe5719f..a60c1caa2df4 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,15 +75,15 @@ namespace sd { namespace framework { */ class ShellStackGuard : private ::cppu::BaseMutex, - public ShellStackGuardInterfaceBase + public ShellStackGuardInterfaceBase { public: ShellStackGuard (css::uno::Reference<css::frame::XController>& rxController); virtual ~ShellStackGuard (void); - + virtual void SAL_CALL disposing (void); - + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index 2a1aaa4ca771..3a836e5fb3d0 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ SlideSorterModule::SlideSorterModule ( AddActiveMainView(FrameworkHelper::msImpressViewURL); AddActiveMainView(FrameworkHelper::msOutlineViewURL); AddActiveMainView(FrameworkHelper::msNotesViewURL); - + AddActiveMainView(FrameworkHelper::msDrawViewURL); mxConfigurationController->addConfigurationChangeListener( @@ -82,7 +82,7 @@ SlideSorterModule::SlideSorterModule ( SlideSorterModule::~SlideSorterModule (void) { } - + diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index c685c16d830b..d36510e60db2 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ public: const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::OUString& rsLeftPaneURL); virtual ~SlideSorterModule (void); - - + + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index b987009537b8..6b154d7ae893 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ ToolBarModule::ToolBarModule ( ToolBarModule::~ToolBarModule (void) { } - + diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx index 1e26cef6d435..47228ee97548 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace { */ class ToolBarModule : private ::cppu::BaseMutex, - public ToolBarModuleInterfaceBase + public ToolBarModuleInterfaceBase { public: /** Create a new module. @@ -70,10 +70,10 @@ public: ToolBarModule ( const css::uno::Reference<css::frame::XController>& rxController); virtual ~ToolBarModule (void); - + virtual void SAL_CALL disposing (void); - + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index 888fa68ad708..ed9447efab48 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ using ::sd::framework::FrameworkHelper; namespace sd { namespace framework { namespace { - + typedef ::cppu::WeakComponentImplHelper1 < ::com::sun::star::frame::XStatusListener > LocalReadOnlyModeObserverInterfaceBase; @@ -102,7 +102,7 @@ public: xComponent->removeEventListener(this); } - + virtual void SAL_CALL disposing (const com::sun::star::lang::EventObject& rEvent) throw(RuntimeException) { @@ -117,14 +117,14 @@ public: } dispose(); } - + virtual void SAL_CALL statusChanged (const com::sun::star::frame::FeatureStateEvent& rEvent) throw(RuntimeException) { bool bReadWrite (true); if (rEvent.IsEnabled) rEvent.State >>= bReadWrite; - + if (bReadWrite) mpResourceManager->Enable(); else diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index 7d728e60e93d..34b0ecf42d46 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index 6a4db6246c1a..7bc49d6baff5 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ ViewTabBarModule::ViewTabBarModule ( mxViewTabBarId(rxViewTabBarId) { Reference<XControllerManager> xControllerManager (rxController, UNO_QUERY); - + if (xControllerManager.is()) { mxConfigurationController = xControllerManager->getConfigurationController(); @@ -95,7 +95,7 @@ ViewTabBarModule::ViewTabBarModule ( ViewTabBarModule::~ViewTabBarModule (void) { } - + @@ -172,7 +172,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar) if ( ! xBar.is()) xBar = Reference<XTabBar>( mxConfigurationController->getResource(mxViewTabBarId), UNO_QUERY); - + if (xBar.is()) { TabBarButton aEmptyButton; @@ -202,7 +202,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar) aNotesViewButton.ButtonLabel = String(SdResId(STR_NOTES_MODE)); if ( ! xBar->hasTabBarButton(aNotesViewButton)) xBar->addTabBarButtonAfter(aNotesViewButton, aOutlineViewButton); - + TabBarButton aHandoutViewButton; aHandoutViewButton.ResourceId = FrameworkHelper::CreateResourceId( FrameworkHelper::msHandoutViewURL, diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx index f775bfb87c38..559724232d48 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.hxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace sd { namespace framework { */ class ViewTabBarModule : private sd::MutexOwner, - public ViewTabBarModuleInterfaceBase + public ViewTabBarModuleInterfaceBase { public: /** Create a new module that controlls the view tab bar above the view @@ -73,10 +73,10 @@ public: const css::uno::Reference< css::drawing::framework::XResourceId>& rxViewTabBarId); virtual ~ViewTabBarModule (void); - + virtual void SAL_CALL disposing (void); - + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 078f86a88d86..6b59149370d8 100755 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,7 +152,7 @@ public: /** This method is called when the ViewShellBase is being destroyed. */ virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint); - + private: ::sd::ViewShellBase& mrBase; bool mbListeningToViewShellBase; @@ -330,7 +330,7 @@ public: ~DisposeListener (void); virtual void SAL_CALL disposing (void); - + virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) throw(RuntimeException); @@ -375,7 +375,7 @@ FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap; ::boost::shared_ptr<FrameworkHelper> FrameworkHelper::Instance (ViewShellBase& rBase) { - + ::boost::shared_ptr<FrameworkHelper> pHelper; InstanceMap::const_iterator iHelper (maInstanceMap.find(&rBase)); @@ -397,7 +397,7 @@ FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap; OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); pHelper = iHelper->second; } - + return pHelper; } @@ -500,7 +500,7 @@ bool FrameworkHelper::IsValid (void) Reference<XView> FrameworkHelper::GetView (const Reference<XResourceId>& rxPaneOrViewId) { Reference<XView> xView; - + if ( ! rxPaneOrViewId.is() || ! mxConfigurationController.is()) return NULL; @@ -639,7 +639,7 @@ ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) void FrameworkHelper::HandleModeChangeSlot ( - ULONG nSlotId, + ULONG nSlotId, SfxRequest& rRequest) { BOOL bIsActive = TRUE; @@ -658,9 +658,9 @@ void FrameworkHelper::HandleModeChangeSlot ( const SfxItemSet* pRequestArguments = rRequest.GetArgs(); if (pRequestArguments) { - SFX_REQUEST_ARG (rRequest, - pIsActive, - SfxBoolItem, + SFX_REQUEST_ARG (rRequest, + pIsActive, + SfxBoolItem, (USHORT)nSlotId, FALSE); bIsActive = pIsActive->GetValue (); @@ -674,19 +674,19 @@ void FrameworkHelper::HandleModeChangeSlot ( if ( ! mxConfigurationController.is()) throw RuntimeException(); - + Reference<XResourceId> xPaneId ( CreateResourceId(framework::FrameworkHelper::msCenterPaneURL)); Reference<XView> xView (GetView(xPaneId)); ::boost::shared_ptr<ViewShell> pCenterViewShell (GetViewShell(xView)); - + ::rtl::OUString sRequestedView; if (bIsActive) { switch (nSlotId) { case SID_NORMAL_MULTI_PANE_GUI: - case SID_DRAWINGMODE: + case SID_DRAWINGMODE: sRequestedView = FrameworkHelper::msImpressViewURL; break; @@ -708,7 +708,7 @@ void FrameworkHelper::HandleModeChangeSlot ( break; } } - + if (xView.is() && xView->getResourceId()->getResourceURL().equals(sRequestedView)) { @@ -1138,7 +1138,7 @@ LifetimeController::LifetimeController (::sd::ViewShellBase& rBase) StartListening(mrBase); acquire(); mbListeningToViewShellBase = true; - + Reference<XComponent> xComponent (rBase.GetController(), UNO_QUERY); if (xComponent.is()) { |