summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.hxx4
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.cxx8
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.hxx10
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx2
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx2
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx2
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.hxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx14
-rw-r--r--dbaccess/source/ui/inc/dbwizsetup.hxx6
9 files changed, 25 insertions, 25 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index f86e6d320e6f..60d04bad4c1e 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <svtools/roadmapwizard.hxx>
+#include <vcl/roadmapwizard.hxx>
#include <memory>
@@ -32,7 +32,7 @@ namespace dbmm
// MacroMigrationDialog
struct MacroMigrationDialog_Data;
- typedef ::svt::RoadmapWizard MacroMigrationDialog_Base;
+ typedef ::vcl::RoadmapWizard MacroMigrationDialog_Base;
class MacroMigrationDialog : public MacroMigrationDialog_Base
{
public:
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index 7c17ac5f19f8..3820a688ba1e 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -69,7 +69,7 @@ namespace dbmm
m_pCloseDocError->Show( _bShow );
}
- VclPtr<TabPage> PreparationPage::Create( ::svt::RoadmapWizard& _rParentDialog )
+ VclPtr<TabPage> PreparationPage::Create( ::vcl::RoadmapWizard& _rParentDialog )
{
return VclPtr<PreparationPage>::Create(&_rParentDialog);
}
@@ -161,7 +161,7 @@ namespace dbmm
return true;
}
- VclPtr<TabPage> SaveDBDocPage::Create( ::svt::RoadmapWizard& _rParentDialog )
+ VclPtr<TabPage> SaveDBDocPage::Create( ::vcl::RoadmapWizard& _rParentDialog )
{
return VclPtr<SaveDBDocPage>::Create( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) );
}
@@ -194,7 +194,7 @@ namespace dbmm
MacroMigrationPage::dispose();
}
- VclPtr<TabPage> ProgressPage::Create(::svt::RoadmapWizard& _rParentDialog)
+ VclPtr<TabPage> ProgressPage::Create(::vcl::RoadmapWizard& _rParentDialog)
{
return VclPtr<ProgressPage>::Create(&_rParentDialog);
}
@@ -289,7 +289,7 @@ namespace dbmm
MacroMigrationPage::dispose();
}
- VclPtr<TabPage> ResultPage::Create(::svt::RoadmapWizard& _rParentDialog)
+ VclPtr<TabPage> ResultPage::Create(::vcl::RoadmapWizard& _rParentDialog)
{
return VclPtr<ResultPage>::Create(&_rParentDialog);
}
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index d2f30f44b688..171f1d8cad61 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -30,7 +30,7 @@
#include <vcl/edit.hxx>
#include <vcl/vclmedit.hxx>
-namespace svt
+namespace vcl
{
class RoadmapWizard;
}
@@ -59,7 +59,7 @@ namespace dbmm
virtual ~PreparationPage() override;
virtual void dispose() override;
- static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog );
+ static VclPtr<TabPage> Create( ::vcl::RoadmapWizard& _rParentDialog );
void showCloseDocsError(bool _bShow);
@@ -74,7 +74,7 @@ namespace dbmm
explicit SaveDBDocPage(MacroMigrationDialog& _rParentDialog);
virtual ~SaveDBDocPage() override;
virtual void dispose() override;
- static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog );
+ static VclPtr<TabPage> Create( ::vcl::RoadmapWizard& _rParentDialog );
OUString getBackupLocation() const { return m_pLocationController->getURL(); }
void grabLocationFocus() { m_pSaveAsLocation->GrabFocus(); }
@@ -102,7 +102,7 @@ namespace dbmm
virtual ~ProgressPage() override;
virtual void dispose() override;
- static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog );
+ static VclPtr<TabPage> Create( ::vcl::RoadmapWizard& _rParentDialog );
void setDocumentCounts( const sal_Int32 _nForms, const sal_Int32 _nReports );
void onFinishedSuccessfully();
@@ -135,7 +135,7 @@ namespace dbmm
virtual ~ResultPage() override;
virtual void dispose() override;
- static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog );
+ static VclPtr<TabPage> Create( ::vcl::RoadmapWizard& _rParentDialog );
void displayMigrationLog( const bool _bSuccessful, const OUString& _rLog );
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 5bf0805206a0..b6680a8a061f 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -52,7 +52,7 @@
#include <ucbhelper/commandenvironment.hxx>
#include "finteraction.hxx"
#include <unotools/pathoptions.hxx>
-#include <svtools/roadmapwizard.hxx>
+#include <vcl/roadmapwizard.hxx>
#include "TextConnectionHelper.hxx"
#include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index f5ae1a6fbaf8..eb34ff7b6368 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -27,7 +27,7 @@
#include <curledit.hxx>
#include "TextConnectionHelper.hxx"
-#include <svtools/roadmapwizard.hxx>
+#include <vcl/roadmapwizard.hxx>
#include <ucbhelper/content.hxx>
#include <vcl/field.hxx>
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index e2d7989b0234..a35aa6f6c780 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -50,7 +50,7 @@
#include "finteraction.hxx"
#include "DBSetupConnectionPages.hxx"
#include <unotools/pathoptions.hxx>
-#include <svtools/roadmapwizard.hxx>
+#include <vcl/roadmapwizard.hxx>
namespace
{
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index 212d161bda43..e8db965e5b2d 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -25,7 +25,7 @@
#include <charsetlistbox.hxx>
#include <ucbhelper/content.hxx>
#include <curledit.hxx>
-#include <svtools/roadmapwizard.hxx>
+#include <vcl/roadmapwizard.hxx>
#include <vcl/field.hxx>
#include <rtl/ustring.hxx>
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 4fc9ec6aaeea..97cdfdb5e609 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -80,7 +80,7 @@
namespace dbaui
{
using namespace dbtools;
-using namespace svt;
+using namespace vcl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::sdbc;
@@ -104,7 +104,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
,const Reference< XComponentContext >& _rxORB
,const css::uno::Any& _aDataSourceName
)
- :svt::RoadmapWizard( _pParent )
+ :vcl::RoadmapWizard( _pParent )
, m_bIsConnectable( false)
, m_sRM_IntroText( DBA_RES( STR_PAGETITLE_INTROPAGE ) )
@@ -152,7 +152,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
for(PathId i = 1;aIter != aEnd;++aIter,++i)
{
const OUString& sURLPrefix = aIter.getURLPrefix();
- svt::RoadmapWizardTypes::WizardPath aPath;
+ vcl::RoadmapWizardTypes::WizardPath aPath;
aPath.push_back(PAGE_DBSETUPWIZARD_INTRO);
m_pCollection->fillPageIds(sURLPrefix,aPath);
aPath.push_back(PAGE_DBSETUPWIZARD_AUTHENTIFICATION);
@@ -161,7 +161,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
declareAuthDepPath(sURLPrefix,i,aPath);
}
- svt::RoadmapWizardTypes::WizardPath aPath;
+ vcl::RoadmapWizardTypes::WizardPath aPath;
aPath.push_back(PAGE_DBSETUPWIZARD_INTRO);
declarePath( static_cast<PathId>(m_pCollection->size()+1), aPath);
@@ -174,7 +174,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
setTitleBase(DBA_RES(STR_DBWIZARDTITLE));
}
-void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths)
+void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const vcl::RoadmapWizardTypes::WizardPath& _rPaths)
{
bool bHasAuthentication = DataSourceMetaData::getAuthentication( _sURL ) != AuthNone;
@@ -188,7 +188,7 @@ void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _n
}
// call base method
- ::svt::RoadmapWizard::declarePath( _nPathId, aPath );
+ ::vcl::RoadmapWizard::declarePath( _nPathId, aPath );
}
OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const
@@ -265,7 +265,7 @@ void ODbTypeWizDialogSetup::dispose()
m_pGeneralPage.clear();
m_pMySQLIntroPage.clear();
m_pFinalPage.clear();
- svt::RoadmapWizard::dispose();
+ vcl::RoadmapWizard::dispose();
}
IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage&, void)
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 4e56f5551bee..25001361b3f5 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -25,7 +25,7 @@
#include "IItemSetHelper.hxx"
#include <tools/urlobj.hxx>
#include <memory>
-#include <svtools/roadmapwizard.hxx>
+#include <vcl/roadmapwizard.hxx>
#include <connectivity/dbtools.hxx>
namespace com { namespace sun { namespace star {
@@ -54,7 +54,7 @@ class ODbDataSourceAdministrationHelper;
class OMySQLIntroPageSetup;
class OFinalDBPageSetup;
-class ODbTypeWizDialogSetup final : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog
+class ODbTypeWizDialogSetup final : public vcl::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog
{
private:
std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl;
@@ -141,7 +141,7 @@ private:
the first state in this path, following by an arbitrary number of others, as in
RoadmapWizard::declarePath.
*/
- void declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths);
+ void declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const vcl::RoadmapWizardTypes::WizardPath& _rPaths);
void RegisterDataSourceByLocation(const OUString& sPath);
bool SaveDatabaseDocument();
generated by cgit (git 2.34.1) at 2024-06-30 00:21:35 +0000