extensions/source/abpilot/abspilot.cxx | 10 +++++-----
extensions/source/abpilot/abspilot.hxx | 5 ++---
include/vcl/wizardmachine.hxx | 3 ---
vcl/source/control/roadmapwizard.cxx | 2 ++
4 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 339f9a79f93f4bb54271c52933b29777f6115f14
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sun May 18 00:07:58 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sun May 18 20:38:08 2025 +0200
extensions: Drop OAddressBookSourcePilot_Base typedef
Change-Id: I7a410a9609a63f4857242c05cbed56784963b276
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185464
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/extensions/source/abpilot/abspilot.cxx
b/extensions/source/abpilot/abspilot.cxx
index fb2be7e8ab33..442990fb94f0 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -49,7 +49,7 @@ namespace abp
using namespace ::com::sun::star::uno;
OAddressBookSourcePilot::OAddressBookSourcePilot(weld::Window* _pParent,
const Reference< XComponentContext >& _rxORB)
- :OAddressBookSourcePilot_Base( _pParent )
+ :vcl::RoadmapWizardMachine(_pParent)
,m_xORB(_rxORB)
,m_aNewDataSource(_rxORB)
,m_eNewDataSourceType( AST_INVALID )
@@ -164,7 +164,7 @@ namespace abp
short OAddressBookSourcePilot::run()
{
- short nRet = OAddressBookSourcePilot_Base::run();
+ short nRet = vcl::RoadmapWizardMachine::run();
implCleanup();
@@ -173,7 +173,7 @@ namespace abp
bool OAddressBookSourcePilot::onFinish()
{
- if ( !OAddressBookSourcePilot_Base::onFinish() )
+ if (!vcl::RoadmapWizardMachine::onFinish())
return false;
implCommitAll();
@@ -201,13 +201,13 @@ namespace abp
break;
}
- OAddressBookSourcePilot_Base::enterState(_nState);
+ vcl::RoadmapWizardMachine::enterState(_nState);
}
bool OAddressBookSourcePilot::prepareLeaveCurrentState( CommitPageReason
_eReason )
{
- if ( !OAddressBookSourcePilot_Base::prepareLeaveCurrentState( _eReason
) )
+ if (!vcl::RoadmapWizardMachine::prepareLeaveCurrentState(_eReason))
return false;
if ( _eReason == vcl::WizardTypes::eTravelBackward )
diff --git a/extensions/source/abpilot/abspilot.hxx
b/extensions/source/abpilot/abspilot.hxx
index 45c965d2be0d..b5fd0a4e336f 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -28,8 +28,7 @@ using vcl::WizardTypes::CommitPageReason;
namespace abp
{
- typedef ::vcl::RoadmapWizardMachine OAddressBookSourcePilot_Base;
- class OAddressBookSourcePilot final : public OAddressBookSourcePilot_Base
+ class OAddressBookSourcePilot final : public vcl::RoadmapWizardMachine
{
css::uno::Reference< css::uno::XComponentContext >
m_xORB;
@@ -56,7 +55,7 @@ namespace abp
bool connectToDataSource( bool _bForceReConnect );
- void travelNext( ) {
OAddressBookSourcePilot_Base::travelNext(); }
+ void travelNext( ) {
vcl::RoadmapWizardMachine::travelNext(); }
/// to be called when the selected type changed
void typeSelectionChanged( AddressSourceType _eType
);
commit 4cc7d063392157df280c40f0355ff8bc910ff139
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat May 17 23:49:15 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sun May 18 20:37:59 2025 +0200
vcl: Move defines to only source file using them
These are only used by the vcl::Window based RoadMapWizard
implementation, so don't need to be in a global vcl header.
Change-Id: I2abc4d8f26716e3e612b02f0e9c889e99e828bcb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185463
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx
index cc68840b3acf..bee7b64b2ba9 100644
--- a/include/vcl/wizardmachine.hxx
+++ b/include/vcl/wizardmachine.hxx
@@ -344,7 +344,4 @@ namespace vcl
};
} // namespace vcl
-#define WIZARDDIALOG_BUTTON_STDOFFSET_X 6
-#define WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X 3
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/roadmapwizard.cxx
b/vcl/source/control/roadmapwizard.cxx
index 16c91b2ee890..443b02436475 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -34,6 +34,8 @@
#define WIZARDDIALOG_BUTTON_OFFSET_Y 6
#define WIZARDDIALOG_BUTTON_DLGOFFSET_X 6
+#define WIZARDDIALOG_BUTTON_STDOFFSET_X 6
+#define WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X 3
#define WIZARDDIALOG_VIEW_DLGOFFSET_X 6
#define WIZARDDIALOG_VIEW_DLGOFFSET_Y 6
