7 files changed, 4 insertions, 63 deletions
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index c8256bc2c0a6..55e22361ad3a 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -87,15 +87,12 @@ const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC2m
 
 
 
-
 const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC1andC2 (void) const
 {
     return maC1andC2;
 }
 
 
-
-
 void ConfigurationClassifier::PartitionResources (
     const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS1,
     const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS2)
@@ -222,8 +219,6 @@ void ConfigurationClassifier::CopyResources (
 }
 
 
-
-
 void ConfigurationClassifier::TraceResourceIdVector (
     const sal_Char* pMessage,
     const ResourceIdVector& rResources) const
@@ -240,6 +235,4 @@ void ConfigurationClassifier::TraceResourceIdVector (
 }
 
 
-
-
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index a33bfdcda268..2f846e50be25 100755
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -101,8 +101,6 @@ public:
         const Reference<frame::XController>& rxController);
     ~Implementation (void);
 
-    void Initialize (const Reference<frame::XController>& rxController);
-
     Reference<XControllerManager> mxControllerManager;
 
     /** The Broadcaster class implements storing and calling of listeners.
@@ -119,8 +117,6 @@ public:
 
     ViewShellBase* mpBase;
 
-    bool mbIsInitialized;
-
     ::boost::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
 
     ::boost::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
@@ -705,7 +701,6 @@ ConfigurationController::Implementation::Implementation (
       mpBroadcaster(new ConfigurationControllerBroadcaster(&rController)),
       mxRequestedConfiguration(new Configuration(&rController, true)),
       mpBase(NULL),
-      mbIsInitialized(false),
       mpResourceFactoryContainer(new ResourceFactoryManager(mxControllerManager)),
       mpResourceManager(
           new ConfigurationControllerResourceManager(mpResourceFactoryContainer,mpBroadcaster)),
@@ -721,27 +716,6 @@ ConfigurationController::Implementation::Implementation (
 
 
 
-void ConfigurationController::Implementation::Initialize (
-    const Reference<frame::XController>& rxController)
-{
-    mxControllerManager = Reference<XControllerManager>(rxController, UNO_QUERY_THROW);
-
-    mpConfigurationUpdater->SetControllerManager(mxControllerManager);
-
-    // Tunnel through the controller to obtain a ViewShellBase.
-    Reference<lang::XUnoTunnel> xTunnel (rxController, UNO_QUERY_THROW);
-    if (xTunnel.is())
-    {
-        ::sd::DrawController* pController = reinterpret_cast<sd::DrawController*>(
-            xTunnel->getSomething(sd::DrawController::getUnoTunnelId()));
-        if (pController != NULL)
-            mpBase = pController->GetViewShellBase();
-    }
-}
-
-
-
-
 ConfigurationController::Implementation::~Implementation (void)
 {
 }
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index 498f0670542e..b9552940060e 100755
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -60,12 +60,12 @@ void ConfigurationTracer::TraceConfiguration (
 
 
 
+#ifdef DEBUG
 void ConfigurationTracer::TraceBoundResources (
     const Reference<XConfiguration>& rxConfiguration,
     const Reference<XResourceId>& rxResourceId,
     const int nIndentation)
 {
-#ifdef DEBUG
     Sequence<Reference<XResourceId> > aResourceList (
         rxConfiguration->getResources(rxResourceId, ::rtl::OUString(), AnchorBindingMode_DIRECT));
     const ::rtl::OUString sIndentation (::rtl::OUString::createFromAscii("    "));
@@ -77,11 +77,7 @@ void ConfigurationTracer::TraceBoundResources (
         OSL_TRACE("%s", OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr());
         TraceBoundResources(rxConfiguration, aResourceList[nIndex], nIndentation+1);
     }
-#else
-    (void)rxConfiguration;
-    (void)rxResourceId;
-    (void)nIndentation;
-#endif
 }
+#endif
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
index 8a789a051584..b04206fd65e1 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
@@ -32,7 +32,6 @@
 
 namespace sd { namespace framework {
 
-
 /** Print debug information about configurations to the standard error
     output channel.
 */
@@ -43,13 +42,14 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration,
         const char* pMessage);
-
+#ifdef DEBUG
     static void TraceBoundResources (
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::drawing::framework::XResourceId>& rxResourceId,
         const int nIndentation);
+#endif
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index aa8aca5a5ffd..4ab361a9490d 100755
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -163,14 +163,6 @@ Reference<XConfiguration> ConfigurationUpdater::GetCurrentConfiguration (void) c
 
 
 
-Reference<XConfiguration> ConfigurationUpdater::GetRequestedConfiguration (void) const
-{
-    return mxRequestedConfiguration;
-}
-
-
-
-
 bool ConfigurationUpdater::IsUpdatePossible (void)
 {
     return ! mbUpdateBeingProcessed
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 87c92be5e5c4..a9f3e09f2a64 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -84,9 +84,6 @@ public:
     css::uno::Reference<
         css::drawing::framework::XConfiguration> GetCurrentConfiguration (void) const;
 
-    css::uno::Reference<
-        css::drawing::framework::XConfiguration> GetRequestedConfiguration (void) const;
-
     friend class ConfigurationUpdaterLock;
     /** Return a lock of the called ConfigurationUpdater.  While the
         returned object exists no update of the current configuration is
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 32894411547a..15d7c3a6f4ec 100644..100755
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -592,17 +592,6 @@ bool ResourceId::IsBoundToAnchor (
 
 
 
-bool ResourceId::IsValid (void) const
-{
-    return maResourceURLs.size() == 0
-        || maResourceURLs[0].getLength()>0
-        || maResourceURLs.size() == 1;
-
-}
-
-
-
-
 void ResourceId::ParseResourceURL (void)
 {
     ::osl::Guard< ::osl::Mutex > aGuard (::osl::Mutex::getGlobalMutex());