diff options
Diffstat (limited to 'sd/source/ui/framework/configuration')
23 files changed, 87 insertions, 87 deletions
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx index 3bc276268e0e..2c8777d1cfcb 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx @@ -2,7 +2,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 16d1eb4bfa50..8f89073e6d30 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx @@ -2,7 +2,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 8f83f86128c3..fb76e18834f5 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -2,7 +2,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 @@ 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 abbadd3dcc31..a965a9420144 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx @@ -2,7 +2,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 @@ 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 18e216f10545..412a91fe37d9 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -2,7 +2,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,7 +48,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 @@ -120,7 +120,7 @@ Configuration::Configuration ( } - + Configuration::Configuration ( const Reference<XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents, @@ -138,7 +138,7 @@ Configuration::Configuration ( Configuration::~Configuration (void) { } - + @@ -153,7 +153,7 @@ void SAL_CALL Configuration::disposing (void) //----- XConfiguration -------------------------------------------------------- - + void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResourceId) throw (RuntimeException) { @@ -211,7 +211,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; @@ -222,7 +222,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( if ( ! (*iResource)->isBoundTo(rxAnchorId,eMode)) continue; - + if (bFilterResources) { // Apply the given resource prefix as filter. @@ -248,7 +248,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; } @@ -309,7 +309,7 @@ OUString SAL_CALL Configuration::getName (void) aString += FrameworkHelper::ResourceIdToString(*iResource); } aString += OUString::createFromAscii("]"); - + return aString; } @@ -333,7 +333,7 @@ void Configuration::PostEvent ( const bool bActivation) { OSL_ASSERT(rxResourceId.is()); - + if (mxBroadcaster.is()) { ConfigurationChangeEvent aEvent; @@ -349,7 +349,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 f2b7384e4658..52ac65423726 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -2,7 +2,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 @@ -119,7 +119,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) @@ -155,7 +155,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 @@ -171,7 +171,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]); } @@ -196,7 +196,7 @@ void ConfigurationClassifier::CopyResources ( OUString(), AnchorBindingMode_INDIRECT)); const sal_Int32 nL (aBoundResources.getLength()); - + rTarget.reserve(rTarget.size() + 1 + nL); rTarget.push_back(*iResource); @@ -205,7 +205,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 e8cfecd8d1f6..5b04407748f4 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx @@ -2,7 +2,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 10d7a1aa00e7..f3f4ab4617f8 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -2,7 +2,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 @@ -117,7 +117,7 @@ public: ::com::sun::star::drawing::framework::XConfiguration> mxRequestedConfiguration; ViewShellBase* mpBase; - + ::boost::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer; ::boost::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager; @@ -143,14 +143,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()) @@ -287,7 +287,7 @@ void SAL_CALL ConfigurationController::notifyEvent ( //----- XConfigurationController ---------------------------------------------- - + void SAL_CALL ConfigurationController::lock (void) throw (RuntimeException) { @@ -297,7 +297,7 @@ void SAL_CALL ConfigurationController::lock (void) ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); - + ++mpImplementation->mnLockCount; if (mpImplementation->mpConfigurationUpdaterLock.get()==NULL) mpImplementation->mpConfigurationUpdaterLock @@ -380,7 +380,7 @@ void SAL_CALL ConfigurationController::requestResourceActivation ( requestResourceDeactivation(aResourceList[nIndex]); } } - + Reference<XConfigurationChangeRequest> xRequest( new GenericConfigurationChangeRequest( rxResourceId, @@ -477,7 +477,7 @@ sal_Bool SAL_CALL ConfigurationController::hasPendingRequests (void) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); - + return ! mpImplementation->mpQueueProcessor->IsEmpty(); } @@ -596,7 +596,7 @@ void SAL_CALL ConfigurationController::restoreConfiguration ( //----- XResourceFactoryManager ----------------------------------------------- - + void SAL_CALL ConfigurationController::addResourceFactory( const OUString& sResourceURL, const Reference<XResourceFactory>& rxResourceFactory) @@ -609,7 +609,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 55d72d592f99..dcd4b321891b 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -2,7 +2,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 @@ void ConfigurationControllerBroadcaster::AddListener( OUString::createFromAscii("invalid listener"), mxConfigurationController, 0); - + if (maListenerMap.find(rsEventType) == maListenerMap.end()) maListenerMap[rsEventType] = ListenerList(); ListenerDescriptor aDescriptor; @@ -81,7 +81,7 @@ void ConfigurationControllerBroadcaster::RemoveListener( OUString::createFromAscii("invalid listener"), mxConfigurationController, 0); - + ListenerMap::iterator iMap; ListenerList::iterator iList; for (iMap=maListenerMap.begin(); iMap!=maListenerMap.end(); ++iMap) @@ -144,7 +144,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 c15abbbb7eb2..6bdb4ce68ffa 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -2,7 +2,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 b640c89453cc..1aadd82dc0fd 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -2,7 +2,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 @@ -114,7 +114,7 @@ void ConfigurationControllerResourceManager::DeactivateResources ( rResources.rend(), ::boost::bind(&ConfigurationControllerResourceManager::DeactivateResource, this, _1, rxConfiguration)); -} +} @@ -153,7 +153,7 @@ void ConfigurationControllerResourceManager::ActivateResource ( #endif return; } - + try { // 2. Create the resource. @@ -172,7 +172,7 @@ void ConfigurationControllerResourceManager::ActivateResource ( { DBG_UNHANDLED_EXCEPTION(); } - + if (xResource.is()) { #if defined VERBOSE && VERBOSE>=1 @@ -225,10 +225,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, @@ -290,7 +290,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 34d58c46ee47..aa69b957c271 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx @@ -2,7 +2,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 ::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 @@ -127,15 +127,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 f4a2aa297fe1..2665a78a1968 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -2,7 +2,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 fce1751b2aba..e30e15328594 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx @@ -2,7 +2,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 dd24374002e2..0605ffcda607 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -2,7 +2,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 @@ -138,7 +138,7 @@ void ConfigurationUpdater::RequestUpdate ( do { UpdateConfiguration(); - + if (mbUpdatePending && IsUpdatePossible()) continue; } @@ -216,7 +216,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) catch(RuntimeException) { } - + // Notify the end of the update. aEvent.Type = FrameworkHelper::msConfigurationUpdateEndEvent; mpBroadcaster->NotifyListeners(aEvent); @@ -240,7 +240,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) { DBG_UNHANDLED_EXCEPTION(); } - + #if defined VERBOSE && VERBOSE>0 OSL_TRACE("ConfigurationUpdater::UpdateConfiguration)"); OSL_TRACE("UpdateConfiguration end"); @@ -398,7 +398,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 509ebbd9b429..aa716ca49bce 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -2,7 +2,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 @@ -72,7 +72,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() @@ -91,7 +91,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. @@ -123,13 +123,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 6d146fa11e97..ed1a798b246a 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -2,7 +2,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 @@ GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest (void) thr - + void SAL_CALL GenericConfigurationChangeRequest::execute ( const Reference<XConfiguration>& rxConfiguration) throw (RuntimeException) @@ -72,7 +72,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 119e49e5aa20..33d4971fe4ce 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -2,7 +2,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 @@ 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 @@ -81,12 +81,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 ef6b785e0495..8ddfc5677f7b 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -2,7 +2,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 @@ -194,7 +194,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 f0b5d99094a6..69e8acb01de0 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx @@ -2,7 +2,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 @@ -103,7 +103,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 88c548ca2d3c..befd9c90af8d 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -2,7 +2,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 @@ -295,7 +295,7 @@ sal_Int16 SAL_CALL throw (RuntimeException) { sal_Int16 nResult (0); - + if ( ! rxResourceId.is()) { // The empty reference is interpreted as empty resource id object. @@ -382,7 +382,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; @@ -450,7 +450,7 @@ sal_Bool SAL_CALL return IsBoundToAnchor(&sResourceURL, &aAnchorURLs, eMode); } } - + @@ -610,7 +610,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 ba779c4b587c..9918f4a3b4d3 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -2,7 +2,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 @@ -55,7 +55,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 f9b4cd32b82f..730bcd798cd3 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -2,7 +2,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,9 +65,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) |