removetooltypes01: rebase to DEV300_m96

13 files changed, 17 insertions, 729 deletions

diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 27786d3a79cf..11ab9659984b 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -29,18 +29,10 @@
 #include "precompiled_svtools.hxx"
 
 #include <stdio.h>
-
-
-#include "addresstemplate.hxx"
-#ifndef _SVT_ADDRESSTEMPLATE_HRC_
+#include <svtools/addresstemplate.hxx>
 #include "addresstemplate.hrc"
-#endif
-#ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
-#endif
-#ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
-#endif
 #include <svtools/svtdata.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
@@ -49,9 +41,7 @@
 #include <vcl/waitobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#ifndef _CPPUHELPER_EXTRACT_HXX_
 #include <cppuhelper/extract.hxx>
-#endif
 #include <comphelper/interaction.hxx>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
@@ -65,12 +55,9 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-#include "localresaccess.hxx"
-#ifndef SVTOOLS_FILENOTATION_HXX_
+#include <svtools/localresaccess.hxx>
 #include "svl/filenotation.hxx"
-#endif
 #include <tools/urlobj.hxx>
-
 #include <algorithm>
 
 // .......................................................................
diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
index 990dfc98f89b..0e4845949dca 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.src
@@ -25,15 +25,9 @@
  *
  ************************************************************************/
 
-#ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
-#endif
-#ifndef _SVT_ADDRESSTEMPLATE_HRC_
 #include "addresstemplate.hrc"
-#endif
-#ifndef _SVT_CONTROLDIMS_HRC_
-#include "controldims.hrc"
-#endif
+#include <svtools/controldims.hrc>
 
 #define FIELD_ROW_HEIGHT    17
 
diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx
index 8180f188bd1e..d0f86867686a 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include <filedlg.hxx>
+#include <svtools/filedlg.hxx>
 #include <filedlg2.hxx>
 
 PathDialog::PathDialog( Window* _pParent, WinBits nStyle, sal_Bool bCreateDir ) :
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index 73ad8e93e78e..7eda7eb16191 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -28,17 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include <vcl/svapp.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
 #include <svtools/svtdata.hxx>
-
 #include <filedlg2.hxx>
-#include <filedlg.hxx>
-#include <filedlg2.hrc>
+#include <svtools/filedlg.hxx>
+#include <svtools/filedlg2.hrc>
 #include <vcl/msgbox.hxx>
 #include <vos/security.hxx>
 #include <com/sun/star/i18n/XCollator.hpp>
diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src
index 977a0d6f430b..acef462c04cb 100644
--- a/svtools/source/dialogs/filedlg2.src
+++ b/svtools/source/dialogs/filedlg2.src
@@ -25,7 +25,8 @@
  *
  ************************************************************************/
 
-#include <filedlg2.hrc>
+#include <svtools/filedlg2.hrc>
+
 String STR_FILEDLG_SELECT
 {
     Text [ en-US ] = "Select Directory" ;
diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src
index f8ce80f62f2f..d91700afac8f 100644
--- a/svtools/source/dialogs/formats.src
+++ b/svtools/source/dialogs/formats.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "sores.hxx"
+#include <svtools/sores.hxx>
 
 String STR_FORMAT_STRING
 {
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 301b8602c17d..2052da492737 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svtools/insdlg.hxx>
-#include "sores.hxx"
+#include <svtools/sores.hxx>
 #include <svtools/svtdata.hxx>
 
 #include <tools/rc.hxx>
diff --git a/svtools/source/dialogs/makefile.mk b/svtools/source/dialogs/makefile.mk
deleted file mode 100644
index 99c4b59b76ae..000000000000
--- a/svtools/source/dialogs/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# 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
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=dialogs
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=		filedlg2.src	\
-                                so3res.src    \
-                                formats.src    \
-                prnsetup.src	\
-                printdlg.src	\
-                colrdlg.src		\
-                addresstemplate.src	\
-                wizardmachine.src
-
-
-EXCEPTIONSFILES=	$(SLO)$/addresstemplate.obj	\
-                    $(SLO)$/insdlg.obj       \
-                    $(SLO)$/roadmapwizard.obj 	\
-                    $(SLO)$/printdlg.obj \
-                    $(SLO)$/wizardmachine.obj
-
-
-SLOFILES=	\
-                    $(SLO)$/insdlg.obj       \
-                    $(SLO)$/roadmapwizard.obj 	\
-                    $(SLO)$/wizardmachine.obj 	\
-                    $(SLO)$/addresstemplate.obj 	\
-                    $(SLO)$/filedlg.obj 	\
-                    $(SLO)$/filedlg2.obj	\
-                    $(SLO)$/prnsetup.obj	\
-                    $(SLO)$/printdlg.obj	\
-                    $(SLO)$/colctrl.obj 	\
-                    $(SLO)$/colrdlg.obj 	\
-                    $(SLO)$/property.obj	\
-                    $(SLO)$/wizdlg.obj		\
-                    $(SLO)$/mcvmath.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index dc726683a355..cc8395229d6a 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.cxx
@@ -34,11 +34,12 @@
 #include <vcl/jobset.hxx>
 #include <tools/urlobj.hxx>
 #include "printdlg.hrc"
-#include "controldims.hrc"
+#include <svtools/controldims.hrc>
 #include <svtools/prnsetup.hxx>
 #include <svtools/printdlg.hxx>
 #include <svtools/svtdata.hxx>
-#include <filedlg.hxx>
+#include <svtools/filedlg.hxx>
+#include "svl/pickerhelper.hxx"
 #include <svtools/helpid.hrc>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx
deleted file mode 100644
index 4a20b37aa398..000000000000
--- a/svtools/source/dialogs/propctrl.cxx
+++ /dev/null
@@ -1,503 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-
-#ifndef _USR_INTROSP_HXX
-#include <usr/inspect.hxx>
-#endif
-#ifndef _USR_SERINFO_HXX
-#include <usr/serinfo.hxx>
-#endif
-#ifndef _USR_INTROSP_HXX
-#include <usr/introsp.hxx>
-#endif
-
-#include <propctrl.hxx>
-#include <property.hxx>
-
-
-// Controller-Implementation
-class PropertyEditorControler_Impl : public SvPropertyDataControl
-{
-    XIntrospectionAccessRef mxUnoAccess;
-    PropertySequence mPropSeq;
-    XPropertyEditorRef mxEditor;
-    SvPropertyBox* mpPropBox;
-    UsrAny maUnoObj;
-
-public:
-    // Provisorisch direkt Window mitgeben
-    PropertyEditorControler_Impl( SvPropertyBox* pPropBox_ );
-    //SimplePropertyEditor_Impl( void );
-
-    // Objekt zum Editieren setzen, dies loest das Eintragen
-    // der Properties in die PropertyBox aus
-    void setObject( XPropertyEditorRef xEditor_, const UsrAny& aToEditObj,
-        /* HACK fuer History-Interface*/String aPath, sal_Bool bBack=sal_False, sal_Bool bForward=sal_False );
-
-    /* SPAETER
-    SMART_UNO_DECLARATION(ImplIntrospection,UsrObject);
-
-    // Methoden von XInterface
-    XInterface *    queryInterface( Uik aUik );
-    XIdlClassRef    getIdlClass();
-    */
-
-    // Methoden von SvPropertyDataControl
-    virtual void                    Modified(   const String& aName,
-                                                const String& aVal,
-                                                void* pData);
-
-    virtual void                    Clicked(    const String& aName,
-                                                const String& aVal,
-                                                void* pData);
-
-    virtual void                    Commit(     const String& aName,
-                                                const String& aVal,
-                                                void* pData);
-
-    virtual void                    Select(     const String& aName,
-                                                void* pData);
-
-    virtual void                    LinkClicked(const String& aName,
-                                                void* pData);
-
-    // TODO: Das muss raus, sehr unglueckliche Schnittstelle
-    // PropertyBox erzwingt Zustand des Controllers
-    virtual String                  GetTheCorrectProperty() const;
-};
-
-// Methoden von XPropertyEditor
-PropertyEditorControler_Impl::PropertyEditorControler_Impl( SvPropertyBox* pPropBox_ )
-{
-    mpPropBox = pPropBox_;
-}
-
-void PropertyEditorControler_Impl::setObject( XPropertyEditorRef xEditor_, const UsrAny& aToEditObj,
-    /* HACK fuer History-Interface*/ String aPath, sal_Bool bBack, sal_Bool bForward )
-{
-    static XIntrospectionRef xIntrospection;
-
-    // Ohne Fenster laeuft gar nix
-    if( !mpPropBox )
-        return;
-
-    // Fenster aufraeumen
-    mpPropBox->ClearAll();
-
-    // Editor und Objekt �bernehmen
-    mxEditor = xEditor_;
-    maUnoObj = aToEditObj;
-
-    if( !xIntrospection.is() )
-    {
-        // Introspection-Service holen
-        XServiceManagerRef xServiceManager = getGlobalServiceManager();
-        XServiceProviderRef xProv = xServiceManager->getServiceProvider
-            ( "com.sun.star.beans.Introspection", UikSequence(), UikSequence() );
-        xIntrospection = (XIntrospection *)xProv->newInstance()
-            ->queryInterface( XIntrospection::getSmartUik() );
-    }
-    if( !xIntrospection.is() )
-        return;
-
-    // und unspecten
-    mxUnoAccess = xIntrospection->inspect( maUnoObj );
-    if( !mxUnoAccess.Is() )
-        return;
-
-    // Uns als Controler anmelden
-    mpPropBox->SetController( this );
-
-    // Properties anlegen
-    mPropSeq = mxUnoAccess->getProperties();
-    UINT32 nPropCount = mPropSeq.getLen();
-    const Property* pProps = mPropSeq.getConstArray();
-
-    // 1. Seite anlegen
-    sal_uInt16 nPropPageId = mpPropBox->AppendPage("Properties");
-
-    // Beim Eintragen solls nicht flimmern
-    mpPropBox->DisableUpdate();
-
-    // Dummy-Properties fuer Path und Navigation
-    SvPropertyData aProperty;
-    if( aPath.Len() )
-    {
-        // Interface und Structs werden Hyperlinks
-        aProperty.bIsHyperLink = sal_False;
-        aProperty.bIsLocked = sal_True;
-        aProperty.bHasVisibleXButton = sal_False;
-        aProperty.eKind = KOC_EDIT;
-        aProperty.pControl = NULL;
-        aProperty.pDataPtr = NULL;
-        aProperty.aName = "Path";
-        aProperty.aValue = aPath;
-        mpPropBox->InsertEntry( aProperty );
-    }
-    if( bBack || bForward )
-    {
-        // Interface und Structs werden Hyperlinks
-        aProperty.bIsHyperLink = sal_True;
-        aProperty.bIsLocked = sal_True;
-        // HACK, solange Hyperlink nicht funktioniert
-        aProperty.bHasVisibleXButton = aProperty.bIsHyperLink;
-        aProperty.eKind = KOC_EDIT;
-        UINT32 iHandle;
-        aProperty.pControl = NULL;
-        if( bBack )
-        {
-            iHandle = 1000001;
-            aProperty.pDataPtr = (void*)iHandle;
-            aProperty.aName = "<-";
-            aProperty.aValue = "Back";
-            mpPropBox->InsertEntry( aProperty );
-        }
-        if( bForward )
-        {
-            iHandle = 1000000;
-            aProperty.pDataPtr = (void*)iHandle;
-            aProperty.aName = "->";
-            aProperty.aValue = "Forward";
-            mpPropBox->InsertEntry( aProperty );
-        }
-    }
-
-    // Properties eintragen
-    // TODO: Wo kommen die Strings her
-    UINT32 i;
-    for( i = 0 ; i < nPropCount ; i++ )
-    {
-        const Property& rProp = pProps[ i ];
-
-        // TypeClass des Property ermitteln
-        XIdlClassRef xPropClass = rProp.Type;
-        if( !xPropClass.is() )
-        {
-            DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
-            return;
-        }
-        TypeClass eType = xPropClass->getTypeClass();
-
-        // Interface und Structs werden Hyperlinks
-        aProperty.bIsHyperLink = ( eType == TYPECLASS_INTERFACE || eType == TYPECLASS_STRUCT );
-        aProperty.bIsLocked = ((rProp.Attributes & PROPERTY_READONLY) != 0 );
-
-        // HACK, solange Hyperlink nicht funktioniert
-        aProperty.bHasVisibleXButton = aProperty.bIsHyperLink;
-
-        // Wert holen und in String wandeln
-        UsrAny aVal = mxUnoAccess->getPropertyValueByIndex( maUnoObj, i );
-        String aStrVal = AnyToString( aVal );
-
-        // Properties reinbraten
-        aProperty.eKind = KOC_EDIT;
-        aProperty.aName = rProp.Name;
-        aProperty.aValue = aStrVal;
-        aProperty.pDataPtr = (void*)i;
-        aProperty.pControl = NULL;
-        //aProperty.theValues.Insert(new String("1"),aProperty.theValues.Count());
-        //aProperty.theValues.Insert(new String("2"),aProperty.theValues.Count());
-        //aProperty.theValues.Insert(new String("3"),aProperty.theValues.Count());
-        //aProperty.theValues.Insert(new String("4"),aProperty.theValues.Count());
-        mpPropBox->InsertEntry( aProperty );
-    }
-
-    // 2. Seite fuer Listener
-    // TODO: Wo kommen die Eintraege her
-    sal_uInt16 nListenerPageId = mpPropBox->AppendPage("Listener");
-
-    XIdlClassSequence aSupportedListenerSeq = mxUnoAccess->getSupportedListeners();
-    const XIdlClassRef* pListenerArray = aSupportedListenerSeq.getConstArray();
-    UINT32 nIfaceCount = aSupportedListenerSeq.getLen();
-
-    // Property-Data vorfuellen
-    aProperty.eKind = KOC_EDIT;
-    //aProperty.eKind = KOC_UNDEFINED;
-    aProperty.aValue = "Listener-Value";
-    aProperty.bHasVisibleXButton = sal_True;
-    // TEST
-    //aProperty.bIsHyperLink = sal_True;
-    aProperty.bIsHyperLink = sal_False;
-    aProperty.bIsLocked = sal_True;
-    //aProperty.bIsLocked = sal_False;
-    aProperty.pDataPtr = NULL;
-    aProperty.pControl = NULL;
-
-    for( UINT32 j = 0 ; j < nIfaceCount ; j++ )
-    {
-        const XIdlClassRef& rxIfaceClass = pListenerArray[j];
-        aProperty.aName = rxIfaceClass->getName();
-        mpPropBox->InsertEntry( aProperty );
-    }
-    mpPropBox->EnableUpdate();
-    mpPropBox->SetPage( nPropPageId );
-}
-
-void PropertyEditorControler_Impl::Modified
-( const String& aName, const String& aVal, void* pData)
-{
-}
-
-void PropertyEditorControler_Impl::Clicked
-( const String& aName, const String& aVal, void* pData)
-{
-    // HACK, solange LinkClicked nicht funktioniert
-    UINT32 iPos = (UINT32)pData;
-    UINT32 nPropCount = mPropSeq.getLen();
-    if( iPos >= nPropCount )
-    {
-        // Spezial-IDs fuer forward/back?
-        sal_Bool bForward = (iPos == 1000000);
-        sal_Bool bBack = (iPos == 1000001);
-        if( bForward || bBack )
-        {
-            // Unterstuetzt der PropertyEditor das?
-            XPropertyEditorNavigationRef xPropEdNav = (XPropertyEditorNavigation*)
-                mxEditor->queryInterface( XPropertyEditorNavigation::getSmartUik() );
-            if( xPropEdNav.is() )
-            {
-                if( bForward )
-                    xPropEdNav->forward();
-                else
-                    xPropEdNav->back();
-            }
-        }
-        return;
-    }
-
-    const Property* pProps = mPropSeq.getConstArray();
-    const Property& rProp = pProps[ iPos ];
-    XIdlClassRef xPropClass = rProp.Type;
-    if( !xPropClass.is() )
-    {
-        DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
-        return;
-    }
-    TypeClass eType = xPropClass->getTypeClass();
-    if( eType == TYPECLASS_INTERFACE || eType == TYPECLASS_STRUCT )
-        LinkClicked( aName, pData );
-}
-
-void PropertyEditorControler_Impl::Commit
-( const String& aName, const String& aVal, void* pData)
-{
-    UINT32 iPos = (UINT32)pData;
-    UINT32 nPropCount = mPropSeq.getLen();
-    if( iPos >= nPropCount )
-        return;
-
-    // String in Property-Typ wandeln
-    const Property* pProps = mPropSeq.getConstArray();
-    const Property& rProp = pProps[ iPos ];
-    XIdlClassRef xPropClass = rProp.Type;
-    if( !xPropClass.is() )
-    {
-        DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
-        return;
-    }
-    TypeClass eType = xPropClass->getTypeClass();
-    UsrAny aValue = StringToAny( aVal, eType );
-
-    // Wert setzen
-    mxUnoAccess->setPropertyValueByIndex( maUnoObj, iPos, aValue );
-
-    // Wert neu holen und ggf. neu setzen
-    UsrAny aNewVal = mxUnoAccess->getPropertyValueByIndex( maUnoObj, iPos );
-    String aNewStrVal = AnyToString( aNewVal );
-    if( aNewStrVal != aVal )
-        mpPropBox->SetPropertyValue( aName, aNewStrVal );
-}
-
-void PropertyEditorControler_Impl::Select
-( const String& aName, void* pData)
-{
-}
-
-void PropertyEditorControler_Impl::LinkClicked(const String& aName, void* pData)
-{
-    UINT32 iPos = (UINT32)pData;
-    UINT32 nPropCount = mPropSeq.getLen();
-    if( iPos >= nPropCount )
-        return;
-
-    // Wert holen und an Master-Controller zurueckgeben
-    UsrAny aNewObj = mxUnoAccess->getPropertyValueByIndex( maUnoObj, iPos );
-    mxEditor->setObject( aNewObj, aName );
-}
-
-
-// TODO: Das muss raus, sehr unglueckliche Schnittstelle
-// PropertyBox erzwingt Zustand des Controllers
-String PropertyEditorControler_Impl::GetTheCorrectProperty() const
-{
-    return String();
-}
-
-
-SMART_UNO_IMPLEMENTATION(SimplePropertyEditor_Impl,UsrObject);
-
-// Methoden von XInterface
-XInterface * SimplePropertyEditor_Impl::queryInterface( Uik aUik )
-{
-    if( aUik == XPropertyEditor::getSmartUik() )
-        return (XPropertyEditor *)this;
-    if( aUik == XPropertyEditorNavigation::getSmartUik() )
-        return (XPropertyEditorNavigation *)this;
-    return UsrObject::queryInterface( aUik );
-}
-
-XIdlClassRef SimplePropertyEditor_Impl::getIdlClass()
-{
-    // TODO: Unterstuetzen
-    return NULL;
-}
-
-
-// Methoden von SimplePropertyEditor_Impl
-SimplePropertyEditor_Impl::SimplePropertyEditor_Impl( Window *pParent )
-    : maHistorySeq( 10 ), maHistoryNames( 10 ), bSimpleHistory( sal_False )
-{
-    //XVCLComponent xC = pParent->getVCLComponent
-    //xC->addVCLComponentListener( MyListener )
-
-    pActiveControler = NULL;
-    mpPropBox = new SvPropertyBox( pParent );
-    mpPropBox->Show();
-
-    long cxOut = pParent->GetOutputSizePixel().Width();
-    long cyOut = pParent->GetOutputSizePixel().Height();
-    Size aSize( cxOut, cyOut );
-    mpPropBox->SetPosSizePixel( Point( 0, 0 ), aSize );
-
-    mnHistoryCount = 0;
-    mnActualHistoryLevel = -1;
-}
-
-SimplePropertyEditor_Impl::~SimplePropertyEditor_Impl()
-{
-    delete mpPropBox;
-    if( pActiveControler )
-        delete pActiveControler;
-}
-
-// Private Methode zum Anlegen/Aktivieren der Controller
-void SimplePropertyEditor_Impl::showObject( const UsrAny& aToShowObj )
-{
-    if( pActiveControler )
-        delete pActiveControler;
-
-    // Neuen Controller auf der Wiese anlegen (TODO: Controller cachen?)
-    pActiveControler = new PropertyEditorControler_Impl( mpPropBox );
-
-    XPropertyEditorRef xThis = (XPropertyEditor *)this;
-    pActiveControler->setObject( xThis, aToShowObj,
-        /*aPath*/bSimpleHistory ? getPath() : String(),
-        /*bBack*/bSimpleHistory && mnActualHistoryLevel > 0,
-        /*bForward*/bSimpleHistory && (INT32)mnHistoryCount > mnActualHistoryLevel );
-}
-
-String SimplePropertyEditor_Impl::getPath( void )
-{
-    String aRetStr;
-    const String* pStr = maHistoryNames.getConstArray();
-    for( INT32 i = 0 ; i <= mnActualHistoryLevel ; i++ )
-    {
-        String aName = pStr[i];
-
-        // Root speziell behandeln
-        if( i == 0 )
-        {
-            aRetStr += aName;
-        }
-        else
-        {
-            // Ist es ein Index?
-            long l = (long)aName;
-            String aNumStr( l );
-            if( aNumStr == aName )
-            {
-                aRetStr += '[';
-                aRetStr += aName;
-                aRetStr += ']';
-            }
-            else
-            {
-                aRetStr += '.';
-                aRetStr += aName;
-            }
-        }
-    }
-    return aRetStr;
-}
-
-// Methoden von XPropertyEditor
-void SimplePropertyEditor_Impl::setObject( const UsrAny& aToEditObj, const XubString& aObjName )
-{
-    // History pflegen
-    mnActualHistoryLevel++;
-    mnHistoryCount = (UINT32)mnActualHistoryLevel;
-    UINT32 iHistorySize = maHistorySeq.getLen();
-    if( mnHistoryCount > iHistorySize )
-    {
-        maHistorySeq.realloc( iHistorySize + 10 );
-        maHistoryNames.realloc( iHistorySize + 10 );
-    }
-
-    // Neues Object eintragen
-    maHistorySeq.getArray()[ mnHistoryCount ] = aToEditObj;
-    maHistoryNames.getArray()[ mnHistoryCount ] = aObjName;
-
-    // Object anzeigen
-    showObject( aToEditObj );
-}
-
-// Methoden von PropertyEditorNavigation
-void SimplePropertyEditor_Impl::forward(void)
-{
-    if( (INT32)mnHistoryCount > mnActualHistoryLevel )
-    {
-        // Naechstes Object darstellen
-        mnActualHistoryLevel++;
-        showObject( maHistorySeq.getConstArray()[mnActualHistoryLevel] );
-    }
-}
-
-void SimplePropertyEditor_Impl::back(void)
-{
-    if( mnActualHistoryLevel > 0 )
-    {
-        // Voriges Object darstellen
-        mnActualHistoryLevel--;
-        showObject( maHistorySeq.getConstArray()[mnActualHistoryLevel] );
-    }
-}
-
-
diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx
deleted file mode 100644
index f82424682389..000000000000
--- a/svtools/source/dialogs/propctrl.hxx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
-#include <tools/stream.hxx>
-#include <vcl/sound.hxx>
-#include "sbx.hxx"
-#include "sbxbase.hxx"
-#include "sbxres.hxx"
-#include <svl/brdcst.hxx>
-  */
-
-
-#ifndef __PROPED_HXX__
-#include <proped.hxx>
-#endif
-#ifndef _UNO_HXX
-#include <usr/uno.hxx>
-#endif
-#ifndef _USR_SEQU_HXX
-#include <usr/sequ.hxx>
-#endif
-#ifndef __TOOLSIDL_HXX__
-#include <usr/toolsidl.hxx>
-#endif
-
-/*
-class XPropertyEditor
-    : public XInterface
-{
-public:
-
-    virtual void setObject(const UsrAny& aToInspectObj) = 0;
-
-    static Uik getSmartUik() { return(385); }
-};
-*/
-
-class PropertyEditorControler_Impl;
-class SvPropertyBox;
-class Window;
-
-class SimplePropertyEditor_Impl :
-    public XPropertyEditor,
-    public XPropertyEditorNavigation,
-    public UsrObject
-{
-    PropertyEditorControler_Impl* pActiveControler;
-    SvPropertyBox* mpPropBox;
-    UsrAny maStartUnoObj;
-    UsrAny maActiveUnoObj;
-
-    // History der Objekte speichern
-    AnySequence maHistorySeq;
-    WSStringSequence maHistoryNames;
-    UINT32 mnHistoryCount;
-    INT32 mnActualHistoryLevel;
-
-    // Einfache History via Dummy-Properties
-    sal_Bool bSimpleHistory;
-
-    // Methode zum Anlegen/Aktivieren der Controller
-    void showObject( const UsrAny& aToShowObj );
-    String getPath( void );
-
-public:
-    // Provisorischer Ctor mit Parent-Window
-    SimplePropertyEditor_Impl( Window *pParent );
-    ~SimplePropertyEditor_Impl();
-
-    // HACK fuer History-Test
-    void enableSimpleHistory( sal_Bool bHistory_ ) { bSimpleHistory = bHistory_; }
-
-    SMART_UNO_DECLARATION(ImplIntrospection,UsrObject);
-
-    // Methoden von XInterface
-    XInterface *    queryInterface( Uik aUik );
-    XIdlClassRef    getIdlClass();
-
-    // Methoden von XPropertyEditor
-    virtual void setObject(const UsrAny& aToInspectObj, const XubString& aObjName);
-
-    // Methoden von PropertyEditorNavigation
-    virtual void forward(void);
-    virtual void back(void);
-
-};
-
-
-
-
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 43b9fcddf91d..cdf2eef32fdc 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -31,7 +31,7 @@
 #include <svtools/roadmapwizard.hxx>
 #include <svtools/svtools.hrc>
 #include <svtools/svtdata.hxx>
-#include "roadmap.hxx"
+#include <svtools/roadmap.hxx>
 #include <tools/debug.hxx>
 
 #include <stdarg.h>
diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src
index 524b58e0a5df..0d1aa1756267 100644
--- a/svtools/source/dialogs/so3res.src
+++ b/svtools/source/dialogs/so3res.src
@@ -25,10 +25,11 @@
  *
  ************************************************************************/
 
-#include "sores.hxx"
+#include "svtools/sores.hxx"
 #define __RSC
-#include "soerr.hxx"
+#include <svtools/soerr.hxx>
 #define S_MAX   0x7fff
+
 Resource RID_SO_ERROR_HANDLER
 {
     String ERRCODE_SO_GENERALERROR&S_MAX