[Libreoffice-commits] .: toolkit/source

[Joseph Powers]

 toolkit/source/controls/controlmodelcontainerbase.cxx |   15 +++++++--------
 toolkit/source/controls/dialogcontrol.cxx             |    3 +--
 toolkit/source/controls/tabpagemodel.cxx              |    7 +++----
 3 files changed, 11 insertions(+), 14 deletions(-)

New commits:
commit ee9c802733aa9cd9fcaa4e14667f747ef49d9491
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Fri Apr 29 06:13:13 2011 -0700

    Remove some references to "tools/list.hxx" which wheren't needed.

diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 2be6fa2..fea29fc 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.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,6 @@
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include <tools/list.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
@@ -1484,13 +1483,13 @@ void ControlContainerBase::dispose() throw(RuntimeException)
     aEvt.Source = static_cast< ::cppu::OWeakObject* >( this );
     // Notify our listener helper about dispose
     // --- SAFE ---
-    
+
     SolarMutexClearableGuard aGuard;
     Reference< XEventListener > xListener( mxListener, UNO_QUERY );
     mxListener.clear();
     aGuard.clear();
     // --- SAFE ---
-    
+
     if ( xListener.is() )
         xListener->disposing( aEvt );
     UnoControlContainer::dispose();
@@ -1707,7 +1706,7 @@ void ControlContainerBase::ImplModelPropertiesChanged( const Sequence< PropertyC
             }
         }
     }
-    
+
     UnoControlContainer::ImplModelPropertiesChanged( rEvents );
 }
 
@@ -1803,7 +1802,7 @@ void lcl_ApplyResolverToNestedContainees(  const Reference< resource::XStringRes
             lcl_ApplyResolverToNestedContainees(  xStringResourceResolver, xNestedContainer );
 
     }
-    
+
 }
 void ControlContainerBase::ImplStartListingForResourceEvents()
 {
@@ -1831,7 +1830,7 @@ void ControlContainerBase::ImplUpdateResourceResolver()
         return;
 
     lcl_ApplyResolverToNestedContainees(  xStringResourceResolver, this );
-    
+
     // propagate resource resolver changes to language dependent props of the dialog
     Reference< XPropertySet > xPropertySet( getModel(), UNO_QUERY );
     if ( xPropertySet.is() )
@@ -1873,7 +1872,7 @@ uno::Reference< graphic::XGraphic > ControlContainerBase::Impl_getGraphicFromURL
 
 ::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl )
 {
-    
+
     ::rtl::OUString baseLocation;
     ::rtl::OUString url;
 
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 4aece91..193785f 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.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
@@ -40,7 +40,6 @@
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include <tools/list.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index e19ef6b..41f21e1 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.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
@@ -40,7 +40,6 @@
 #include <com/sun/star/awt/UnoControlDialogModelProvider.hpp>
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include <tools/list.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
@@ -238,7 +237,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument
                 xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL)));
                 xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT)));
                 xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED)));
-                xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL)));                
+                xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL)));
             }
         }
     }
@@ -250,7 +249,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument
 {
     return rtl::OUString::createFromAscii("com.sun.star.awt.tab.UnoControlTabPageModel");
 }
- 
+
 Sequence<rtl::OUString> SAL_CALL UnoControlTabPageModel_getSupportedServiceNames (void)
      throw (RuntimeException)
 {