diff options
22 files changed, 80 insertions, 83 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index a0a352f0d6bd..db54937be38c 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -47,7 +47,7 @@ namespace chart CreationWizard::CreationWizard(vcl::Window* pParent, const uno::Reference<frame::XModel>& xChartModel, const uno::Reference<uno::XComponentContext>& xContext) - : svt::RoadmapWizard(pParent) + : vcl::RoadmapWizard(pParent) , m_xChartModel(xChartModel,uno::UNO_QUERY) , m_xComponentContext(xContext) , m_pTemplateProvider(nullptr) @@ -153,7 +153,7 @@ void CreationWizard::enterState(WizardState nState) enableButtons( WizardButtonFlags::PREVIOUS, nState > STATE_FIRST ); enableButtons( WizardButtonFlags::NEXT, nState < STATE_LAST ); if( isStateEnabled( nState )) - svt::RoadmapWizard::enterState(nState); + vcl::RoadmapWizard::enterState(nState); } void CreationWizard::setInvalidPage( TabPage * /* pTabPage */ ) diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index b9ddfef66896..0f05f6243f14 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -23,7 +23,7 @@ #include "TimerTriggeredControllerLock.hxx" #include "TabPageNotifiable.hxx" -#include <svtools/roadmapwizard.hxx> +#include <vcl/roadmapwizard.hxx> #include <memory> @@ -36,7 +36,7 @@ namespace chart class DialogModel; class ChartTypeTemplateProvider; -class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable +class CreationWizard : public vcl::RoadmapWizard, public TabPageNotifiable { public: CreationWizard(vcl::Window* pParent, 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(); diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index b55122eebf84..a161181e2518 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPILOT_HXX #define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPILOT_HXX -#include <svtools/roadmapwizard.hxx> +#include <vcl/roadmapwizard.hxx> #include "addresssettings.hxx" #include <vcl/fixed.hxx> #include "datasourcehandling.hxx" @@ -29,7 +29,7 @@ namespace abp { - typedef ::svt::RoadmapWizard OAddressBookSourcePilot_Base; + typedef ::vcl::RoadmapWizard OAddressBookSourcePilot_Base; class OAddressBookSourcePilot final : public OAddressBookSourcePilot_Base { css::uno::Reference< css::uno::XComponentContext > diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc index f0491fe20866..a7ddf804c2e3 100644 --- a/include/svtools/strings.hrc +++ b/include/svtools/strings.hrc @@ -241,8 +241,6 @@ #define STR_SVT_PRNDLG_DEFPRINTER NC_("STR_SVT_PRNDLG_DEFPRINTER", "Default printer") #define STR_SVT_PRNDLG_JOBCOUNT NC_("STR_SVT_PRNDLG_JOBCOUNT", "%d documents") -#define STR_WIZDLG_ROADMAP_TITLE NC_("STR_WIZDLG_ROADMAP_TITLE", "Steps") - #define STR_NO_FIELD_SELECTION NC_("STR_NO_FIELD_SELECTION", "<none>") #define STR_FIELD_COMPANY NC_("STR_FIELD_COMPANY", "Company") #define STR_FIELD_DEPARTMENT NC_("STR_FIELD_DEPARTMENT", "Department") diff --git a/include/svtools/roadmapwizard.hxx b/include/vcl/roadmapwizard.hxx index 2ff7c6146273..6764d40f8c6e 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/vcl/roadmapwizard.hxx @@ -17,15 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_ROADMAPWIZARD_HXX -#define INCLUDED_SVTOOLS_ROADMAPWIZARD_HXX +#ifndef INCLUDED_VCL_ROADMAPWIZARD_HXX +#define INCLUDED_VCL_ROADMAPWIZARD_HXX #include <memory> -#include <svtools/svtdllapi.h> +#include <vcl/dllapi.h> #include <vcl/wizardmachine.hxx> - -namespace svt +namespace vcl { struct RoadmapWizardImpl; class RoadmapWizard; @@ -60,7 +59,7 @@ namespace svt <code>n2</code>, which share at least the first <code>k</code> states (where <code>k</code> is at least 1), and an arbitrary number of other states. */ - class SVT_DLLPUBLIC RoadmapWizard : public vcl::OWizardMachine, public RoadmapWizardTypes + class VCL_DLLPUBLIC RoadmapWizard : public vcl::OWizardMachine, public RoadmapWizardTypes { private: std::unique_ptr<RoadmapWizardImpl> m_pImpl; @@ -208,16 +207,16 @@ namespace svt /** updates the roadmap control to show the given path, as far as possible (modulo conflicts with other paths) */ - SVT_DLLPRIVATE void implUpdateRoadmap( ); + VCL_DLLPRIVATE void implUpdateRoadmap( ); private: - SVT_DLLPRIVATE void impl_construct(); + VCL_DLLPRIVATE void impl_construct(); }; -} // namespace svt +} // namespace vcl -#endif // OOO_ INCLUDED_SVTOOLS_ROADMAPWIZARD_HXX +#endif // OOO_ INCLUDED_VCL_ROADMAPWIZARD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 290747d196e5..1973f44db94d 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -6986,7 +6986,6 @@ include/svtools/popupwindowcontroller.hxx include/svtools/printoptions.hxx include/svtools/prnsetup.hxx include/svtools/restartdialog.hxx -include/svtools/roadmapwizard.hxx include/svtools/rtfkeywd.hxx include/svtools/rtfout.hxx include/svtools/rtftoken.h @@ -7903,6 +7902,7 @@ include/vcl/ptrstyle.hxx include/vcl/quickselectionengine.hxx include/vcl/region.hxx include/vcl/roadmap.hxx +include/vcl/roadmapwizard.hxx include/vcl/salctype.hxx include/vcl/salgtype.hxx include/vcl/salnativewidgets.hxx @@ -13753,7 +13753,6 @@ svtools/source/dialogs/colrdlg.cxx svtools/source/dialogs/insdlg.cxx svtools/source/dialogs/prnsetup.cxx svtools/source/dialogs/restartdialog.cxx -svtools/source/dialogs/roadmapwizard.cxx svtools/source/edit/editsyntaxhighlighter.cxx svtools/source/edit/svmedit.cxx svtools/source/edit/svmedit2.cxx @@ -17790,6 +17789,7 @@ vcl/source/control/notebookbar.cxx vcl/source/control/prgsbar.cxx vcl/source/control/quickselectionengine.cxx vcl/source/control/roadmap.cxx +vcl/source/control/roadmapwizard.cxx vcl/source/control/scrbar.cxx vcl/source/control/slider.cxx vcl/source/control/spinbtn.cxx diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 62981eea217d..83815d191487 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -123,7 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/dialogs/PlaceEditDialog \ svtools/source/dialogs/prnsetup \ svtools/source/dialogs/restartdialog \ - svtools/source/dialogs/roadmapwizard \ svtools/source/dialogs/ServerDetailsControls \ svtools/source/edit/editsyntaxhighlighter \ svtools/source/edit/svmedit \ diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx index 2b17fcff5167..320d31e6330a 100644 --- a/svtools/source/uno/wizard/wizardshell.hxx +++ b/svtools/source/uno/wizard/wizardshell.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/ui/dialogs/XWizardController.hpp> #include <com/sun/star/ui/dialogs/XWizard.hpp> -#include <svtools/roadmapwizard.hxx> +#include <vcl/roadmapwizard.hxx> #include <map> #include <memory> @@ -37,7 +37,7 @@ namespace svt { namespace uno //= WizardShell - typedef ::svt::RoadmapWizard WizardShell_Base; + typedef ::vcl::RoadmapWizard WizardShell_Base; class WizardShell : public WizardShell_Base { public: diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index dcbcffa2c31e..49ea7c661fc9 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -124,7 +124,7 @@ VclPtr<TabPage> SwMailMergeWizard::createPage(WizardState _nState) void SwMailMergeWizard::enterState( WizardState _nState ) { - ::svt::RoadmapWizard::enterState( _nState ); + ::vcl::RoadmapWizard::enterState( _nState ); if (m_xConfigItem->GetTargetView()) { diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx index adc8cf460ed9..c6865a280e96 100644 --- a/sw/source/uibase/inc/mailmergewizard.hxx +++ b/sw/source/uibase/inc/mailmergewizard.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEWIZARD_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEWIZARD_HXX -#include <svtools/roadmapwizard.hxx> +#include <vcl/roadmapwizard.hxx> #include <rtl/ustring.hxx> class SwView; @@ -31,7 +31,7 @@ class SwMailMergeConfigItem; #define MM_GREETINGSPAGE 3 #define MM_LAYOUTPAGE 4 -class SwMailMergeWizard : public ::svt::RoadmapWizard +class SwMailMergeWizard : public ::vcl::RoadmapWizard { SwView* const m_pSwView; OUString sDocumentURL; @@ -77,9 +77,9 @@ public: void SetRestartPage(sal_uInt16 nPage) { m_nRestartPage = nPage;} bool skipUntil( sal_uInt16 nPage) - {return ::svt::RoadmapWizard::skipUntil(WizardState(nPage));} + {return ::vcl::RoadmapWizard::skipUntil(WizardState(nPage));} - using svt::RoadmapWizard::updateRoadmapItemLabel; + using vcl::RoadmapWizard::updateRoadmapItemLabel; virtual short Execute() override; }; diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 4f6e483fe685..a1fc61a12be7 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -204,6 +204,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/control/quickselectionengine \ vcl/source/control/prgsbar \ vcl/source/control/roadmap \ + vcl/source/control/roadmapwizard \ vcl/source/control/scrbar \ vcl/source/control/slider \ vcl/source/control/spinbtn \ diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc index 0991ff0182a4..e00f3869dfda 100644 --- a/vcl/inc/strings.hrc +++ b/vcl/inc/strings.hrc @@ -148,6 +148,7 @@ #define STR_SVT_CALENDAR_WEEK NC_("STR_SVT_CALENDAR_WEEK", "Week") #define STR_SVT_CALENDAR_TODAY NC_("STR_SVT_CALENDAR_TODAY", "Today") +#define STR_WIZDLG_ROADMAP_TITLE NC_("STR_WIZDLG_ROADMAP_TITLE", "Steps") #define STR_WIZDLG_FINISH NC_("STR_WIZDLG_FINISH", "~Finish") #define STR_WIZDLG_NEXT NC_("STR_WIZDLG_NEXT", "~Next >") #define STR_WIZDLG_PREVIOUS NC_("STR_WIZDLG_PREVIOUS", "< Bac~k") diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx index 8e9b4e38a260..ec27bb6dae82 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/vcl/source/control/roadmapwizard.cxx @@ -18,23 +18,24 @@ */ -#include <svtools/roadmapwizard.hxx> -#include <svtools/strings.hrc> -#include <svtools/svtresid.hxx> +#include <vcl/roadmapwizard.hxx> #include <vcl/roadmap.hxx> #include <tools/debug.hxx> #include <osl/diagnose.h> +#include <strings.hrc> +#include <svdata.hxx> + #include <vector> #include <map> #include <set> -namespace svt +namespace vcl { namespace { - typedef ::std::set< vcl::WizardTypes::WizardState > StateSet; + typedef ::std::set< WizardTypes::WizardState > StateSet; typedef ::std::map< RoadmapWizardTypes::PathId, @@ -42,7 +43,7 @@ namespace svt > Paths; typedef ::std::map< - vcl::WizardTypes::WizardState, + WizardTypes::WizardState, ::std::pair< OUString, RoadmapWizardTypes::RoadmapPageFactory @@ -52,7 +53,7 @@ namespace svt struct RoadmapWizardImpl : public RoadmapWizardTypes { - ScopedVclPtr<vcl::ORoadmap> pRoadmap; + ScopedVclPtr<ORoadmap> pRoadmap; Paths aPaths; PathId nActivePath; StateDescriptions aStateDescriptors; @@ -67,15 +68,15 @@ namespace svt } /// returns the index of the current state in given path, or -1 - static sal_Int32 getStateIndexInPath( vcl::WizardTypes::WizardState _nState, const WizardPath& _rPath ); + static sal_Int32 getStateIndexInPath( WizardTypes::WizardState _nState, const WizardPath& _rPath ); /// returns the index of the current state in the path with the given id, or -1 - sal_Int32 getStateIndexInPath( vcl::WizardTypes::WizardState _nState, PathId _nPathId ); + sal_Int32 getStateIndexInPath( WizardTypes::WizardState _nState, PathId _nPathId ); /// returns the index of the first state in which the two given paths differ static sal_Int32 getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS ); }; - sal_Int32 RoadmapWizardImpl::getStateIndexInPath( vcl::WizardTypes::WizardState _nState, const WizardPath& _rPath ) + sal_Int32 RoadmapWizardImpl::getStateIndexInPath( WizardTypes::WizardState _nState, const WizardPath& _rPath ) { sal_Int32 nStateIndexInPath = 0; bool bFound = false; @@ -94,7 +95,7 @@ namespace svt } - sal_Int32 RoadmapWizardImpl::getStateIndexInPath( vcl::WizardTypes::WizardState _nState, PathId _nPathId ) + sal_Int32 RoadmapWizardImpl::getStateIndexInPath( WizardTypes::WizardState _nState, PathId _nPathId ) { sal_Int32 nStateIndexInPath = -1; Paths::const_iterator aPathPos = aPaths.find( _nPathId ); @@ -116,7 +117,7 @@ namespace svt } //= RoadmapWizard - RoadmapWizard::RoadmapWizard( vcl::Window* _pParent ) + RoadmapWizard::RoadmapWizard( Window* _pParent ) :OWizardMachine( _pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) ,m_pImpl( new RoadmapWizardImpl ) { @@ -128,8 +129,8 @@ namespace svt SetLeftAlignedButtonCount( 1 ); SetEmptyViewMargin(); - m_pImpl->pRoadmap.disposeAndReset( VclPtr<vcl::ORoadmap>::Create( this, WB_TABSTOP ) ); - m_pImpl->pRoadmap->SetText( SvtResId( STR_WIZDLG_ROADMAP_TITLE ) ); + m_pImpl->pRoadmap.disposeAndReset( VclPtr<ORoadmap>::Create( this, WB_TABSTOP ) ); + m_pImpl->pRoadmap->SetText( VclResId( STR_WIZDLG_ROADMAP_TITLE ) ); m_pImpl->pRoadmap->SetPosPixel( Point( 0, 0 ) ); m_pImpl->pRoadmap->SetItemSelectHdl( LINK( this, RoadmapWizard, OnRoadmapItemSelected ) ); @@ -243,7 +244,7 @@ namespace svt return; // determine up to which index (in the new path) we have to display the items - vcl::RoadmapTypes::ItemIndex nUpperStepBoundary = static_cast<vcl::RoadmapTypes::ItemIndex>(rActivePath.size()); + RoadmapTypes::ItemIndex nUpperStepBoundary = static_cast<RoadmapTypes::ItemIndex>(rActivePath.size()); bool bIncompletePath = false; if ( !m_pImpl->bActivePathIsDefinite ) { @@ -271,15 +272,15 @@ namespace svt TabPage* pCurrentPage = GetPage( getCurrentState() ); if ( pCurrentPage ) { - const vcl::IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) ); + const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) ); OSL_ENSURE( pController != nullptr, "RoadmapWizard::implUpdateRoadmap: no controller for the current page!" ); bCurrentPageCanAdvance = !pController || pController->canAdvance(); } // now, we have to remove all items after nCurrentStatePathIndex, and insert the items from the active // path, up to (excluding) nUpperStepBoundary - vcl::RoadmapTypes::ItemIndex nLoopUntil = ::std::max( nUpperStepBoundary, m_pImpl->pRoadmap->GetItemCount() ); - for ( vcl::RoadmapTypes::ItemIndex nItemIndex = nCurrentStatePathIndex; nItemIndex < nLoopUntil; ++nItemIndex ) + RoadmapTypes::ItemIndex nLoopUntil = ::std::max( nUpperStepBoundary, m_pImpl->pRoadmap->GetItemCount() ); + for ( RoadmapTypes::ItemIndex nItemIndex = nCurrentStatePathIndex; nItemIndex < nLoopUntil; ++nItemIndex ) { bool bExistentItem = ( nItemIndex < m_pImpl->pRoadmap->GetItemCount() ); bool bNeedItem = ( nItemIndex < nUpperStepBoundary ); @@ -297,7 +298,7 @@ namespace svt { // there is an item with this index in the roadmap - does it match what is requested by // the respective state in the active path? - vcl::RoadmapTypes::ItemId nPresentItemId = m_pImpl->pRoadmap->GetItemID( nItemIndex ); + RoadmapTypes::ItemId nPresentItemId = m_pImpl->pRoadmap->GetItemID( nItemIndex ); WizardState nRequiredState = rActivePath[ nItemIndex ]; if ( nPresentItemId != nRequiredState ) { @@ -337,7 +338,7 @@ namespace svt } - vcl::WizardTypes::WizardState RoadmapWizard::determineNextState( WizardState _nCurrentState ) const + WizardTypes::WizardState RoadmapWizard::determineNextState( WizardState _nCurrentState ) const { sal_Int32 nCurrentStatePathIndex = -1; @@ -424,7 +425,7 @@ namespace svt IMPL_LINK_NOARG(RoadmapWizard, OnRoadmapItemSelected, LinkParamNone*, void) { - vcl::RoadmapTypes::ItemId nCurItemId = m_pImpl->pRoadmap->GetCurrentRoadmapItemID(); + RoadmapTypes::ItemId nCurItemId = m_pImpl->pRoadmap->GetCurrentRoadmapItemID(); if ( nCurItemId == getCurrentState() ) // nothing to do return; @@ -432,7 +433,7 @@ namespace svt if ( isTravelingSuspended() ) return; - vcl::WizardTravelSuspension aTravelGuard( *this ); + WizardTravelSuspension aTravelGuard( *this ); sal_Int32 nCurrentIndex = m_pImpl->getStateIndexInPath( getCurrentState(), m_pImpl->nActivePath ); sal_Int32 nNewIndex = m_pImpl->getStateIndexInPath( nCurItemId, m_pImpl->nActivePath ); @@ -518,7 +519,7 @@ namespace svt } // if the state is currently in the roadmap, reflect it's new status - m_pImpl->pRoadmap->EnableRoadmapItem( static_cast<vcl::RoadmapTypes::ItemId>(_nState), _bEnable ); + m_pImpl->pRoadmap->EnableRoadmapItem( static_cast<RoadmapTypes::ItemId>(_nState), _bEnable ); } @@ -543,21 +544,21 @@ namespace svt void RoadmapWizard::updateRoadmapItemLabel( WizardState _nState ) { const WizardPath& rActivePath( m_pImpl->aPaths[ m_pImpl->nActivePath ] ); - vcl::RoadmapTypes::ItemIndex nUpperStepBoundary = static_cast<vcl::RoadmapTypes::ItemIndex>(rActivePath.size()); - vcl::RoadmapTypes::ItemIndex nLoopUntil = ::std::max( nUpperStepBoundary, m_pImpl->pRoadmap->GetItemCount() ); + RoadmapTypes::ItemIndex nUpperStepBoundary = static_cast<RoadmapTypes::ItemIndex>(rActivePath.size()); + RoadmapTypes::ItemIndex nLoopUntil = ::std::max( nUpperStepBoundary, m_pImpl->pRoadmap->GetItemCount() ); sal_Int32 nCurrentStatePathIndex = -1; if ( m_pImpl->nActivePath != -1 ) nCurrentStatePathIndex = m_pImpl->getStateIndexInPath( getCurrentState(), m_pImpl->nActivePath ); if (nCurrentStatePathIndex < 0) return; - for ( vcl::RoadmapTypes::ItemIndex nItemIndex = nCurrentStatePathIndex; nItemIndex < nLoopUntil; ++nItemIndex ) + for ( RoadmapTypes::ItemIndex nItemIndex = nCurrentStatePathIndex; nItemIndex < nLoopUntil; ++nItemIndex ) { bool bExistentItem = ( nItemIndex < m_pImpl->pRoadmap->GetItemCount() ); if ( bExistentItem ) { // there is an item with this index in the roadmap - does it match what is requested by // the respective state in the active path? - vcl::RoadmapTypes::ItemId nPresentItemId = m_pImpl->pRoadmap->GetItemID( nItemIndex ); + RoadmapTypes::ItemId nPresentItemId = m_pImpl->pRoadmap->GetItemID( nItemIndex ); WizardState nRequiredState = rActivePath[ nItemIndex ]; if ( _nState == nRequiredState ) { @@ -568,8 +569,6 @@ namespace svt } } - -} // namespace svt - +} // namespace vcl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |