6 files changed, 2 insertions, 74 deletions
diff --git a/toolkit/source/layout/core/helper.cxx b/toolkit/source/layout/core/helper.cxx
index f915d197c709..eff0838f65d4 100644
--- a/toolkit/source/layout/core/helper.cxx
+++ b/toolkit/source/layout/core/helper.cxx
@@ -43,24 +43,6 @@ namespace layoutimpl
 using namespace com::sun::star;
 using rtl::OUString;
 
-uno::Reference< awt::XWindowPeer >
-getParent( uno::Reference< uno::XInterface > xRef )
-{
-    do
-    {
-        uno::Reference< awt::XWindowPeer > xPeer( xRef, uno::UNO_QUERY );
-        if ( xPeer.is() )
-            return xPeer;
-
-        uno::Reference< awt::XLayoutContainer > xCont( xRef, uno::UNO_QUERY );
-        if ( xCont.is() )
-            xRef = xCont->getParent();
-    }
-    while ( xRef.is() );
-
-    return uno::Reference< awt::XWindowPeer >();
-}
-
 }
 
 #include "bin.hxx"
@@ -329,7 +311,7 @@ uno::Reference <awt::XLayoutConstrains> WidgetFactory::implCreateWidget (uno::Re
         parent = parentComponent->GetWindow ();
 
     VCLXWindow* component = 0;
-    Window* window = 0; //sfx2CreateWindow (&component, parent, name, attributes);
+    Window* window = 0;
     if (!window)
         window = layoutCreateWindow (&component, parent, name, attributes);
 
@@ -348,29 +330,6 @@ uno::Reference <awt::XLayoutConstrains> WidgetFactory::implCreateWidget (uno::Re
     return reference;
 }
 
-extern "C" { static void SAL_CALL thisModule() {} }
-
-Window* WidgetFactory::sfx2CreateWindow (VCLXWindow** component, Window* parent, OUString const& name, long& attributes)
-{
-    OSL_TRACE("Asking sfx2: %s", OUSTRING_CSTR (name));
-
-    if (!mSfx2Library)
-    {
-        OUString libraryName = ::vcl::unohelper::CreateLibraryName ("sfx", sal_True);
-        mSfx2Library = osl_loadModuleRelative (&thisModule, libraryName.pData, SAL_LOADMODULE_DEFAULT);
-        if (mSfx2Library)
-        {
-            OUString functionName (RTL_CONSTASCII_USTRINGPARAM ("CreateWindow"));
-            mSfx2CreateWidget = (WindowCreator) osl_getFunctionSymbol (mSfx2Library, functionName.pData);
-        }
-    }
-
-    if (mSfx2CreateWidget)
-        return mSfx2CreateWidget (component, name, parent, attributes);
-
-    return 0;
-}
-
 Window* WidgetFactory::layoutCreateWindow (VCLXWindow** component, Window *parent, OUString const& name, long& attributes)
 {
     Window* window = 0;
diff --git a/toolkit/source/layout/core/helper.hxx b/toolkit/source/layout/core/helper.hxx
index cd91a19aa88d..87ef7b62020d 100644
--- a/toolkit/source/layout/core/helper.hxx
+++ b/toolkit/source/layout/core/helper.hxx
@@ -121,12 +121,6 @@ protected:
 
 css::uno::Any anyFromString (const rtl::OUString &value, const css::uno::Type &type);
 
-// The native widgets wrapper hierarchy may not reflect that of the layout
-// hierarchy as some containers don't have an associated native widget.
-// Use this function to get the native parent of the given peer.
-css::uno::Reference< css::awt::XWindowPeer >
-getParent( css::uno::Reference< css::uno::XInterface > xPeer );
-
 class TOOLKIT_DLLPUBLIC WidgetFactory
 {
 public:
@@ -138,7 +132,6 @@ public:
     static css::uno::Reference< css::awt::XLayoutConstrains > createWidget( css::uno::Reference <css::awt::XToolkit > xToolkit, css::uno::Reference< css::uno::XInterface > xParent, rtl::OUString const &name, long properties);
     static css::uno::Reference <css::awt::XLayoutContainer> createContainer (rtl::OUString const& name);
     static css::uno::Reference <css::awt::XLayoutConstrains> implCreateWidget (css::uno::Reference <css::uno::XInterface> xParent, rtl::OUString name, long attributes);
-    static Window* sfx2CreateWindow (VCLXWindow** component, Window* parent, rtl::OUString const& name, long& attributes);
     static Window* layoutCreateWindow (VCLXWindow** component, Window *parent, rtl::OUString const& name, long& attributes);
 };
 
diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx
index 893b51889782..88ba18b7ce68 100644
--- a/toolkit/source/layout/core/proplist.cxx
+++ b/toolkit/source/layout/core/proplist.cxx
@@ -88,18 +88,6 @@ setProperty( const uno::Reference< uno::XInterface > &xPeer,
     }
 }
 
-uno::Any TOOLKIT_DLLPUBLIC
-getProperty( const uno::Reference< uno::XInterface > &xPeer,
-                      const OUString &rName )
-{
-    uno::Reference< awt::XVclWindowPeer> xVclPeer( xPeer, uno::UNO_QUERY );
-    if ( xVclPeer.is() )
-        return xVclPeer->getProperty( rName );
-
-    uno::Reference< beans::XPropertySet > xPropSet( xPeer, uno::UNO_QUERY );
-    return xPropSet->getPropertyValue( rName );
-}
-
 } // namespace prophlp
 
 
diff --git a/toolkit/source/layout/core/proplist.hxx b/toolkit/source/layout/core/proplist.hxx
index fafd45059552..bddd24bd34f8 100644
--- a/toolkit/source/layout/core/proplist.hxx
+++ b/toolkit/source/layout/core/proplist.hxx
@@ -64,12 +64,10 @@ bool TOOLKIT_DLLPUBLIC canHandleProps( const css::uno::Reference< css::uno::XInt
 // if so which properties ?
 css::uno::Reference< css::beans::XPropertySetInfo > TOOLKIT_DLLPUBLIC queryPropertyInfo(
     const css::uno::Reference< css::uno::XInterface > &xRef );
-// set / get ...
+// set ...
 void TOOLKIT_DLLPUBLIC setProperty( const css::uno::Reference< css::uno::XInterface > &xRef,
                   const rtl::OUString &rName,
                   css::uno::Any aValue );
-css::uno::Any TOOLKIT_DLLPUBLIC getProperty( const css::uno::Reference< css::uno::XInterface > &xRef,
-                           const rtl::OUString &rName );
 } // namespace prophlp
 
 } // namespace layoutimpl
diff --git a/toolkit/source/layout/core/root.cxx b/toolkit/source/layout/core/root.cxx
index e10857280613..408b7efa53e6 100644
--- a/toolkit/source/layout/core/root.cxx
+++ b/toolkit/source/layout/core/root.cxx
@@ -202,13 +202,6 @@ uno::Reference< awt::XLayoutContainer > LayoutRoot::getLayoutContainer() throw (
     return uno::Reference< awt::XLayoutContainer >();
 }
 
-// local helper ...
-void LayoutRoot::addItem( const OUString &rName,
-                          const uno::Reference< awt::XLayoutConstrains > &xRef )
-{
-    maItems[ rName ] = xRef;
-}
-
 // XNameAccess
 uno::Any SAL_CALL LayoutRoot::getByName( const OUString &rName )
     throw ( container::NoSuchElementException,
diff --git a/toolkit/source/layout/core/root.hxx b/toolkit/source/layout/core/root.hxx
index 8254f1b46b38..8110529df183 100644
--- a/toolkit/source/layout/core/root.hxx
+++ b/toolkit/source/layout/core/root.hxx
@@ -95,9 +95,6 @@ public:
     LayoutRoot( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
     virtual ~LayoutRoot();
 
-    void addItem( const rtl::OUString &rName,
-                  const css::uno::Reference< css::awt::XLayoutConstrains > &xRef );
-
     void setWindow(    css::uno::Reference< css::awt::XLayoutConstrains > xPeer )
     {
         mxWindow = css::uno::Reference< css::awt::XWindow >( xPeer, css::uno::UNO_QUERY );