diff options
Diffstat (limited to 'dbaccess/source')
28 files changed, 3 insertions, 39 deletions
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index 62574861b490..3a9f2c750db0 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -37,7 +37,6 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XTransactionListener.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/NotInitializedException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -56,7 +55,6 @@ #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> -#include <com/sun/star/frame/DoubleInitializationException.hpp> #include <comphelper/broadcasthelper.hxx> #include <comphelper/namedvaluecollection.hxx> diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index 8fd8ccc137b9..0532a764fb9b 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -27,6 +27,7 @@ #include "documenteventnotifier.hxx" #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> +#include <com/sun/star/frame/DoubleInitializationException.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 2ea984863578..919577442777 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -37,8 +37,6 @@ #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/task/XJobExecutor.hpp> -#include <com/sun/star/frame/XDispatchProviderInterception.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/ucb/InsertCommandArgument.hpp> #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/report/XReportEngine.hpp> @@ -94,7 +92,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/storagehelper.hxx> diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index dcf2cfbb6847..4885f97e314a 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -28,7 +28,6 @@ #include "apitools.hxx" #include <comphelper/uno3.hxx> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/embed/XStateChangeListener.hpp> #include <com/sun/star/sdb/XSubDocument.hpp> diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index a1010534703c..aff11ddd5376 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -29,10 +29,9 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrameLoader.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XLoadEventListener.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index be5152de4821..b60d11fad841 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::style; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace xmloff::token; diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index e542a07c0a1d..b271d29ddcff 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/ErrorMessageDialog.hpp> diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 5262a422fff2..a4d508006ca5 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -34,8 +34,6 @@ #include <com/sun/star/frame/thePopupMenuControllerFactory.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/Frame.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/sdb/CommandType.hpp> diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index c9b14279c90c..634ebadfabbd 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILVIEW_HXX #define INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILVIEW_HXX -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/ucb/XContent.hpp> diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 6695065bb57e..c57c414464ba 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -54,7 +54,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::container; using ::com::sun::star::sdb::application::NamedDatabaseObject; diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index a7a1fb8bed96..cadd8b326721 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -23,7 +23,7 @@ #include "AppElementType.hxx" #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/lang/XComponent.hpp> #include <comphelper/sharedmutex.hxx> #include <cppuhelper/implbase.hxx> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index c727bdb0bba5..0517b4382832 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -91,7 +91,6 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/document/MacroExecMode.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/ui/XContextMenuInterceptor.hpp> #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 27036b7125c9..8b768662079f 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp> #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> #include <com/sun/star/ui/XContextMenuInterceptor.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/URL.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> @@ -50,7 +49,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ui; using namespace ::com::sun::star::view; diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index c6b45907751f..8d29764cf207 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -63,7 +63,6 @@ namespace dbaui using namespace ::com::sun::star::lang; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::container; - using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; using namespace ::dbtools; using namespace ::comphelper; diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 6f9dd87af9e7..0ede6f9d76cc 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -21,7 +21,6 @@ #include <dbaccess/dataview.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XController.hpp> #include <vcl/split.hxx> #include "IClipBoardTest.hxx" diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index ceca8068ae8c..fc779bcd3c6d 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index be810b75b1a0..fe42de6415ed 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -23,7 +23,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index d1dd97d3f704..acad9b7e7b30 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -27,8 +27,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <comphelper/namedvaluecollection.hxx> diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 57eb77fe1cd6..a52e7c8176ab 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -68,7 +68,6 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdb::application; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ucb; OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pControler) diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 4ab9b6e26bce..842c57ea1c7e 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -68,7 +68,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::awt; diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index d764b507dd45..d92e9b244a81 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -23,10 +23,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/frame/TaskCreator.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XFrames.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/application/XTableUIProvider.hpp> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 2904b81b7eca..0e006a5a95ef 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -25,10 +25,8 @@ #include <comphelper/classids.hxx> #include <comphelper/namedvaluecollection.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/util/URL.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/ucb/XCommandProcessor.hpp> #include <com/sun/star/ucb/OpenCommandArgument.hpp> diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 28f72782687f..7241301b61c5 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -23,7 +23,6 @@ #include <comphelper/types.hxx> #include "dbustrings.hrc" #include <connectivity/dbtools.hxx> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <comphelper/extract.hxx> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 6090b28014a3..c92eeaf1dfb6 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -35,7 +35,6 @@ using namespace dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; // end of temp classes OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent) diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 6a5ad4796f18..118dd30d837e 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -43,7 +43,6 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XLoadEventListener.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/sdb/CommandType.hpp> @@ -61,7 +60,6 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/VetoException.hpp> -#include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/ui/XUIElement.hpp> #include <comphelper/propertysequence.hxx> diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index cf32dbacdd39..0f171ef16410 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -31,7 +31,6 @@ #include <comphelper/types.hxx> #include "dbustrings.hrc" #include <connectivity/dbtools.hxx> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XChild.hpp> diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index db857f810671..2499e94cc618 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -54,7 +54,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; using namespace ::com::sun::star::io; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 2da0d3c63ff3..a3264d3cb609 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XTitleChangeListener.hpp> -#include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/sdb/CommandType.hpp> |