diff options
Diffstat (limited to 'extensions/source/dbpilots/commonpagesdbp.cxx')
| -rw-r--r-- | extensions/source/dbpilots/commonpagesdbp.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 3566e91c5c61..8bac5d09c42c 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <comphelper/interaction.hxx> #include <connectivity/dbtools.hxx> #include <sfx2/docfilt.hxx> @@ -46,7 +46,6 @@ namespace dbp using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; @@ -58,7 +57,6 @@ namespace dbp : OControlWizardPage(pPage, pWizard, "modules/sabpilot/ui/tableselectionpage.ui", "TableSelectionPage") , m_xTable(m_xBuilder->weld_tree_view("table")) , m_xDatasource(m_xBuilder->weld_tree_view("datasource")) - , m_xDatasourceLabel(m_xBuilder->weld_label("datasourcelabel")) , m_xSearchDatabase(m_xBuilder->weld_button("search")) , m_xSourceBox(m_xBuilder->weld_container("sourcebox")) { @@ -162,13 +160,13 @@ namespace dbp xOldConn = getFormConnection(); OUString sDataSource = m_xDatasource->get_selected_text(); - rContext.xForm->setPropertyValue("DataSourceName", makeAny( sDataSource ) ); + rContext.xForm->setPropertyValue("DataSourceName", Any( sDataSource ) ); } OUString sCommand = m_xTable->get_selected_text(); sal_Int32 nCommandType = m_xTable->get_selected_id().toInt32(); - rContext.xForm->setPropertyValue("Command", makeAny( sCommand ) ); - rContext.xForm->setPropertyValue("CommandType", makeAny( nCommandType ) ); + rContext.xForm->setPropertyValue("Command", Any( sCommand ) ); + rContext.xForm->setPropertyValue("CommandType", Any( nCommandType ) ); if ( !rContext.bEmbedded ) setFormConnection( xOldConn, false ); @@ -344,7 +342,7 @@ namespace dbp lcl_fillEntries(*m_xTable, aQueryNames, BMP_QUERY, CommandType::QUERY); } - OMaybeListSelectionPage::OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID) + OMaybeListSelectionPage::OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID) : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID) , m_pYes(nullptr) , m_pNo(nullptr) |