diff options
Diffstat (limited to 'dbaccess')
44 files changed, 181 insertions, 86 deletions
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 996b7b28f28f..d01342bfdd1d 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -108,6 +108,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/ui/control/ColumnControlWindow \ dbaccess/source/ui/control/curledit \ dbaccess/source/ui/control/dbtreelistbox \ + dbaccess/source/ui/control/FieldControls \ dbaccess/source/ui/control/FieldDescControl \ dbaccess/source/ui/control/listviewitems \ dbaccess/source/ui/control/marktree \ diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index 66140cf7c948..471d0497c36f 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -23,6 +23,7 @@ // ---- needed as long as we have no contexts for components --- #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <rtl/instance.hxx> #include <svl/solar.hrc> diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 6211f5502d38..001c174fcc5f 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -59,6 +59,7 @@ #include "databaseobjectview.hxx" #include "imageprovider.hxx" #include <vcl/waitobj.hxx> +#include <vcl/settings.hxx> #include <tools/stream.hxx> #include <rtl/ustrbuf.hxx> #include "IApplicationController.hxx" diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 0495f5059f01..130a39c04721 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -32,6 +32,7 @@ #include "listviewitems.hxx" #include <vcl/image.hxx> #include <vcl/mnemonic.hxx> +#include <vcl/settings.hxx> #include "browserids.hxx" #include "AppDetailPageHelper.hxx" #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index f5cc75e3b7d9..05253c24c217 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -26,6 +26,7 @@ #include <vcl/syswin.hxx> #include <vcl/menu.hxx> #include <vcl/mnemonic.hxx> +#include <vcl/settings.hxx> #include "IApplicationController.hxx" using namespace ::dbaui; diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 381ed4a11871..3f794cfb3e72 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -21,6 +21,7 @@ #include "moduledbu.hxx" #include "memory" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <tools/debug.hxx> namespace dbaui diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index d35e8cdd9b11..056aa434e2a5 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -36,6 +36,7 @@ #include "tabletree.hxx" #include "AppSwapWindow.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "AppTitleWindow.hxx" #include "dsntypes.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index 8a3d7a7dda2c..edd48b43a31d 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -28,6 +28,7 @@ #include <sfx2/sfx.hrc> #include <svtools/imgdef.hxx> #include <tools/diagnose_ex.h> +#include <vcl/settings.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index aa502ff4564c..44d08805bbbe 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -125,6 +125,7 @@ #include <vcl/toolbox.hxx> #include <vcl/waitobj.hxx> #include <vcl/wrkwin.hxx> +#include <vcl/settings.hxx> #include <memory> diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx new file mode 100644 index 000000000000..9d9ea9e9f1a7 --- /dev/null +++ b/dbaccess/source/ui/control/FieldControls.cxx @@ -0,0 +1,123 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include "FieldControls.hxx" +#include "SqlNameEdit.hxx" + +#include <vcl/settings.hxx> + +namespace dbaui { + +namespace { + +void lcl_setSpecialReadOnly( sal_Bool _bReadOnly, Window* _pWin ) +{ + StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings(); + const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor(); + _pWin->SetBackground(Wallpaper(rNewColor)); + _pWin->SetControlBackground(rNewColor); +} + +} + +OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, + rtl::OUString& _rAllowedChars, + sal_uInt16 nHelpId, + short nPosition, + WinBits nWinStyle) + :OSQLNameEdit(pParent, nWinStyle, _rAllowedChars) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + +void +OPropColumnEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +{ + SetReadOnly(_bReadOnly); + lcl_setSpecialReadOnly(_bReadOnly,this); +} + + + +OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) + :Edit(pParent, nWinStyle) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + +OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) + :Edit(pParent, _rRes) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + +void +OPropEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +{ + SetReadOnly(_bReadOnly); + lcl_setSpecialReadOnly(_bReadOnly,this); +} + +void +OPropNumericEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +{ + SetReadOnly(_bReadOnly); + lcl_setSpecialReadOnly(_bReadOnly,this); +} + + +OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) + :NumericField(pParent, nWinStyle) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + +OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) + :NumericField(pParent, _rRes) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + +OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) + :ListBox(pParent, nWinStyle) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} +OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) + :ListBox(pParent, _rRes) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + + +void +OPropListBoxCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +{ + SetReadOnly(_bReadOnly); + lcl_setSpecialReadOnly(_bReadOnly,this); +} + +} // end namespace dbaui diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index fa9cb5447967..b14bf5ae81f5 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -21,6 +21,7 @@ #include <tools/debug.hxx> #include <vcl/split.hxx> +#include <vcl/settings.hxx> #define SPLITTER_WIDTH 80 diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 98165e9829d8..4799a80f7435 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -19,6 +19,7 @@ #include "curledit.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <osl/diagnose.h> namespace dbaui diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index f60b59d8d532..b012cba4f5fe 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -20,6 +20,7 @@ #include "marktree.hxx" #include "dbu_control.hrc" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 1418c218be49..8f3938532b88 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -34,6 +34,7 @@ #include "undosqledit.hxx" #include "QueryDesignView.hxx" #include <svl/smplhint.hxx> +#include <vcl/settings.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index d302a039f3e8..3e089a7401af 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -28,6 +28,7 @@ #include "indexfieldscontrol.hxx" #include "indexcollection.hxx" #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/sdb/SQLContext.hpp> #include "UITools.hxx" #include <svtools/imgdef.hxx> diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 824abc2ce0c8..e72494df1a50 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -21,6 +21,7 @@ #include "dbu_dlg.hrc" #include <osl/diagnose.h> #include "dbaccess_helpid.hrc" +#include <vcl/settings.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index d7c9b67f84fe..2fabcb4ca785 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -30,6 +30,7 @@ #include <comphelper/extract.hxx> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <tools/diagnose_ex.h> +#include <vcl/settings.hxx> #include <algorithm> using namespace dbaui; diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 15f2acb601a7..1a76c21ebaf5 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -31,6 +31,7 @@ #include <svl/stritem.hxx> #include "dbustrings.hrc" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/waitobj.hxx> #include <com/sun/star/i18n/Collator.hpp> #include <com/sun/star/sdb/SQLContext.hpp> diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 21c8ee6e0039..cea9025c5da7 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -26,6 +26,7 @@ #include <vcl/fixed.hxx> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> namespace dbaui { diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index aef6c7dc29d4..2724d1e090f6 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/Date.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <map> #include <vector> #include <comphelper/stl_types.hxx> diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 0fb95c02d8e3..2503fa79c969 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -27,16 +27,6 @@ namespace dbaui { - namespace - { - void lcl_setSpecialReadOnly( sal_Bool _bReadOnly, Window* _pWin ) - { - StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings(); - const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor(); - _pWin->SetBackground(Wallpaper(rNewColor)); - _pWin->SetControlBackground(rNewColor); - } - } class OPropColumnEditCtrl : public OSQLNameEdit { @@ -44,29 +34,17 @@ namespace dbaui short m_nPos; OUString m_strHelpText; public: - inline OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly) - { - SetReadOnly(_bReadOnly); - lcl_setSpecialReadOnly(_bReadOnly,this); - } + virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + }; - inline OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, - OUString& _rAllowedChars, - sal_uInt16 nHelpId, - short nPosition, - WinBits nWinStyle) - :OSQLNameEdit(pParent, nWinStyle, _rAllowedChars) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } + class OPropEditCtrl : public Edit { OModuleClient m_aModuleClient; @@ -74,67 +52,34 @@ namespace dbaui OUString m_strHelpText; public: - inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); + OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly) - { - SetReadOnly(_bReadOnly); - lcl_setSpecialReadOnly(_bReadOnly,this); - } + virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); }; - inline OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) - :Edit(pParent, nWinStyle) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } - inline OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) - :Edit(pParent, _rRes) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } - class OPropNumericEditCtrl : public NumericField { short m_nPos; OUString m_strHelpText; public: - inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); + OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly) - { - SetReadOnly(_bReadOnly); - lcl_setSpecialReadOnly(_bReadOnly,this); - } - }; + virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); - inline OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) - :NumericField(pParent, nWinStyle) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } - inline OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) - :NumericField(pParent, _rRes) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } + }; class OPropListBoxCtrl : public ListBox { @@ -142,33 +87,18 @@ namespace dbaui OUString m_strHelpText; public: - inline OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - inline OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); + OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); - inline sal_Bool IsModified() const { return GetSelectEntryPos() != GetSavedValue(); } + sal_Bool IsModified() const { return GetSelectEntryPos() != GetSavedValue(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly) - { - SetReadOnly(_bReadOnly); - lcl_setSpecialReadOnly(_bReadOnly,this); - } + virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + }; - inline OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) - :ListBox(pParent, nWinStyle) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } - inline OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) - :ListBox(pParent, _rRes) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDCONTROLS_HXX diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 0c9a056200c5..ac802e59f058 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -24,6 +24,7 @@ #include <editeng/svxenum.hxx> #include <tools/stream.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> namespace dbaui { diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index e9068d12e02e..71742ef03ad8 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase1.hxx> #include <tools/stream.hxx> diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 6707591ca3f7..5d30bd92bff5 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -23,6 +23,7 @@ #include "apitools.hxx" #include <vcl/dialog.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/msgbox.hxx> namespace com { namespace sun { namespace star { diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index cbacdfc76acf..61e3e676f29a 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/toolbox.hxx> #include <svtools/treelistbox.hxx> #include <unotools/viewoptions.hxx> diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 814cd38aeba3..ea8b68bc14f5 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index dcb03ea4aa9d..ceb52b4fe019 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -55,6 +55,7 @@ #include <rtl/tencinfo.h> #include "UITools.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> using namespace dbaui; using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 9951a4d1419e..83021aadd035 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -46,6 +46,7 @@ #include "QEnumTypes.hxx" #include "UITools.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> using namespace dbaui; using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index d9e5c58ab58e..21cc78652dc1 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -51,6 +51,7 @@ #include "UITools.hxx" #include <toolkit/helper/vclunohelper.hxx> #include <vcl/outdev.hxx> +#include <vcl/settings.hxx> #include <svtools/rtfout.hxx> #include <svtools/htmlcfg.hxx> #include <connectivity/formattedcolumnvalue.hxx> diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index dae1258b3783..6a03ebd4fb49 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -24,6 +24,7 @@ #include "UITools.hxx" #include <svtools/imgdef.hxx> #include <vcl/event.hxx> +#include <vcl/settings.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 9cd2d9bafd38..95afe5f22e07 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -53,6 +53,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <vcl/stdtext.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 18cab465e9ef..685da8d69468 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -25,6 +25,7 @@ #include "dbu_misc.hrc" #include "WizardPages.hrc" #include <vcl/scrbar.hxx> +#include <vcl/settings.hxx> #include "svtools/treelistentry.hxx" #include <com/sun/star/sdbc/DataType.hpp> diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 36afe62d77f1..ec66d0411c23 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -26,6 +26,7 @@ #include <math.h> #include <osl/diagnose.h> #include <vcl/lineinfo.hxx> +#include <vcl/settings.hxx> using namespace dbaui; const long DESCRIPT_LINE_WIDTH = 15; diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 31dd26d43b54..ce3a7cafce43 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -37,6 +37,7 @@ #include "dbustrings.hrc" #include <comphelper/extract.hxx> #include "UITools.hxx" +#include <vcl/settings.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 718c7c5cf82b..75db5a29385c 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -34,6 +34,7 @@ #include "QueryMoveTabWinUndoAct.hxx" #include "QuerySizeTabWinUndoAct.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "TableWindowData.hxx" #include "JAccess.hxx" #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 3fb10b21430b..54754ad0e28a 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -35,6 +35,7 @@ #include "dbustrings.hrc" #include "QTableWindow.hxx" #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include "QueryDesignFieldUndoAct.hxx" #include "sqlmessage.hxx" #include "UITools.hxx" diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 8041308c9127..f4e6a73a5e51 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -27,6 +27,7 @@ #include <osl/diagnose.h> #include <vcl/svapp.hxx> #include <vcl/wall.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index 7b104816ec3f..ae990328e79b 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -23,6 +23,7 @@ #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <vcl/menu.hxx> +#include <vcl/settings.hxx> #include <tools/debug.hxx> #include "dbustrings.hrc" #include <sfx2/cntids.hrc> diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index c549510ca52e..4bc0b92ea678 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -21,6 +21,7 @@ #include "QueryDesignView.hxx" #include <tools/debug.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "JoinController.hxx" #include <toolkit/helper/vclunohelper.hxx> #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index caf3e433b328..0782c3a4938f 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include "RelationControl.hxx" #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> using namespace dbaui; using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index cdd1ad4a4955..f84984f28304 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -21,6 +21,7 @@ #include <tools/debug.hxx> #include "RelationTableView.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "ConnectionLine.hxx" using namespace dbaui; diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 2677a5b395a7..2bb1d3feff4e 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -20,6 +20,7 @@ #include "TableDesignHelpBar.hxx" #include <tools/debug.hxx> #include <svtools/svmedit.hxx> +#include <vcl/settings.hxx> #include "dbaccess_helpid.hrc" #include <boost/scoped_ptr.hpp> using namespace dbaui; diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 92e286e34484..36302780cd0c 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -29,6 +29,7 @@ #include <comphelper/types.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <unotools/syslocale.hxx> +#include <vcl/settings.hxx> #include "UITools.hxx" using namespace ::dbaui; diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 04ea9cb6f31b..a59c6f112f51 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -23,6 +23,7 @@ #include "dbu_tbl.hrc" #include "TableDesignHelpBar.hxx" #include <vcl/fixed.hxx> +#include <vcl/settings.hxx> #include "dbaccess_helpid.hrc" #include "moduledbu.hxx" #include <boost/scoped_ptr.hpp> |