diff options
| -rw-r--r-- | include/vcl/roadmap.hxx (renamed from svtools/inc/roadmap.hxx) | 14 | ||||
| -rw-r--r-- | solenv/clang-format/blacklist | 4 | ||||
| -rw-r--r-- | svtools/Library_svt.mk | 1 | ||||
| -rw-r--r-- | svtools/source/dialogs/roadmapwizard.cxx | 26 | ||||
| -rw-r--r-- | svtools/source/inc/unoiface.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/unoiface.cxx | 32 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
| -rw-r--r-- | vcl/source/control/roadmap.cxx (renamed from svtools/source/control/roadmap.cxx) | 17 |
8 files changed, 48 insertions, 49 deletions
diff --git a/svtools/inc/roadmap.hxx b/include/vcl/roadmap.hxx index b09afcd4e238..1b58a194c0fb 100644 --- a/svtools/inc/roadmap.hxx +++ b/include/vcl/roadmap.hxx @@ -16,10 +16,10 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_INC_ROADMAP_HXX -#define INCLUDED_SVTOOLS_INC_ROADMAP_HXX +#ifndef INCLUDED_VCL_INC_ROADMAP_HXX +#define INCLUDED_VCL_INC_ROADMAP_HXX -#include <svtools/svtdllapi.h> +#include <vcl/dllapi.h> #include <vcl/ctrl.hxx> #include <vcl/hyperlabel.hxx> #include <vcl/imgctrl.hxx> @@ -27,7 +27,7 @@ class Bitmap; -namespace svt +namespace vcl { struct RoadmapTypes @@ -40,7 +40,7 @@ public: class RoadmapImpl; class RoadmapItem; -class SVT_DLLPUBLIC ORoadmap final : public Control, public RoadmapTypes +class VCL_DLLPUBLIC ORoadmap final : public Control, public RoadmapTypes { public: ORoadmap( vcl::Window* _pParent, WinBits _nWinStyle ); @@ -82,7 +82,7 @@ private: /// called when an item has been selected by any means void Select(); - DECL_LINK(ImplClickHdl, vcl::HyperLabel*, void); + DECL_LINK(ImplClickHdl, HyperLabel*, void); RoadmapItem* GetByIndex( ItemIndex _nItemIndex ); const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; @@ -106,7 +106,7 @@ private: std::unique_ptr<RoadmapImpl> m_pImpl; }; -} // namespace svt +} // namespace vcl #endif diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 037c6db78dbe..f77aa382d9c3 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7905,6 +7905,7 @@ include/vcl/prntypes.hxx include/vcl/ptrstyle.hxx include/vcl/quickselectionengine.hxx include/vcl/region.hxx +include/vcl/roadmap.hxx include/vcl/salctype.hxx include/vcl/salgtype.hxx include/vcl/salnativewidgets.hxx @@ -13676,7 +13677,6 @@ svl/source/uno/pathservice.cxx svl/unx/source/svdde/ddedummy.cxx svtools/inc/pch/precompiled_svt.cxx svtools/inc/pch/precompiled_svt.hxx -svtools/inc/roadmap.hxx svtools/inc/strings.hxx svtools/inc/table/defaultinputhandler.hxx svtools/inc/table/gridtablerenderer.hxx @@ -13736,7 +13736,6 @@ svtools/source/control/fileurlbox.cxx svtools/source/control/indexentryres.cxx svtools/source/control/inettbc.cxx svtools/source/control/managedmenubutton.cxx -svtools/source/control/roadmap.cxx svtools/source/control/ruler.cxx svtools/source/control/scriptedtext.cxx svtools/source/control/scrwin.cxx @@ -17793,6 +17792,7 @@ vcl/source/control/menubtn.cxx vcl/source/control/notebookbar.cxx vcl/source/control/prgsbar.cxx vcl/source/control/quickselectionengine.cxx +vcl/source/control/roadmap.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 0c811012b30a..e240d5492f9b 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -108,7 +108,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/control/indexentryres \ svtools/source/control/inettbc \ svtools/source/control/managedmenubutton \ - svtools/source/control/roadmap \ svtools/source/control/ruler \ svtools/source/control/scriptedtext \ svtools/source/control/scrwin \ diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index d5e43b1e6171..6139634edfe1 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -21,7 +21,7 @@ #include <svtools/roadmapwizard.hxx> #include <svtools/strings.hrc> #include <svtools/svtresid.hxx> -#include <roadmap.hxx> +#include <vcl/roadmap.hxx> #include <tools/debug.hxx> #include <osl/diagnose.h> @@ -52,7 +52,7 @@ namespace svt struct RoadmapWizardImpl : public RoadmapWizardTypes { - ScopedVclPtr<ORoadmap> pRoadmap; + ScopedVclPtr<vcl::ORoadmap> pRoadmap; Paths aPaths; PathId nActivePath; StateDescriptions aStateDescriptors; @@ -128,7 +128,7 @@ namespace svt SetLeftAlignedButtonCount( 1 ); SetEmptyViewMargin(); - m_pImpl->pRoadmap.disposeAndReset( VclPtr<ORoadmap>::Create( this, WB_TABSTOP ) ); + m_pImpl->pRoadmap.disposeAndReset( VclPtr<vcl::ORoadmap>::Create( this, WB_TABSTOP ) ); m_pImpl->pRoadmap->SetText( SvtResId( STR_WIZDLG_ROADMAP_TITLE ) ); m_pImpl->pRoadmap->SetPosPixel( Point( 0, 0 ) ); m_pImpl->pRoadmap->SetItemSelectHdl( LINK( this, RoadmapWizard, OnRoadmapItemSelected ) ); @@ -243,7 +243,7 @@ namespace svt return; // determine up to which index (in the new path) we have to display the items - RoadmapTypes::ItemIndex nUpperStepBoundary = static_cast<RoadmapTypes::ItemIndex>(rActivePath.size()); + vcl::RoadmapTypes::ItemIndex nUpperStepBoundary = static_cast<vcl::RoadmapTypes::ItemIndex>(rActivePath.size()); bool bIncompletePath = false; if ( !m_pImpl->bActivePathIsDefinite ) { @@ -278,8 +278,8 @@ namespace svt // now, we have to remove all items after nCurrentStatePathIndex, and insert the items from the active // path, up to (excluding) nUpperStepBoundary - RoadmapTypes::ItemIndex nLoopUntil = ::std::max( nUpperStepBoundary, m_pImpl->pRoadmap->GetItemCount() ); - for ( RoadmapTypes::ItemIndex nItemIndex = nCurrentStatePathIndex; nItemIndex < nLoopUntil; ++nItemIndex ) + vcl::RoadmapTypes::ItemIndex nLoopUntil = ::std::max( nUpperStepBoundary, m_pImpl->pRoadmap->GetItemCount() ); + for ( vcl::RoadmapTypes::ItemIndex nItemIndex = nCurrentStatePathIndex; nItemIndex < nLoopUntil; ++nItemIndex ) { bool bExistentItem = ( nItemIndex < m_pImpl->pRoadmap->GetItemCount() ); bool bNeedItem = ( nItemIndex < nUpperStepBoundary ); @@ -297,7 +297,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? - RoadmapTypes::ItemId nPresentItemId = m_pImpl->pRoadmap->GetItemID( nItemIndex ); + vcl::RoadmapTypes::ItemId nPresentItemId = m_pImpl->pRoadmap->GetItemID( nItemIndex ); WizardState nRequiredState = rActivePath[ nItemIndex ]; if ( nPresentItemId != nRequiredState ) { @@ -424,7 +424,7 @@ namespace svt IMPL_LINK_NOARG(RoadmapWizard, OnRoadmapItemSelected, LinkParamNone*, void) { - RoadmapTypes::ItemId nCurItemId = m_pImpl->pRoadmap->GetCurrentRoadmapItemID(); + vcl::RoadmapTypes::ItemId nCurItemId = m_pImpl->pRoadmap->GetCurrentRoadmapItemID(); if ( nCurItemId == getCurrentState() ) // nothing to do return; @@ -518,7 +518,7 @@ namespace svt } // if the state is currently in the roadmap, reflect it's new status - m_pImpl->pRoadmap->EnableRoadmapItem( static_cast<RoadmapTypes::ItemId>(_nState), _bEnable ); + m_pImpl->pRoadmap->EnableRoadmapItem( static_cast<vcl::RoadmapTypes::ItemId>(_nState), _bEnable ); } @@ -543,21 +543,21 @@ namespace svt void RoadmapWizard::updateRoadmapItemLabel( WizardState _nState ) { const WizardPath& rActivePath( m_pImpl->aPaths[ m_pImpl->nActivePath ] ); - RoadmapTypes::ItemIndex nUpperStepBoundary = static_cast<RoadmapTypes::ItemIndex>(rActivePath.size()); - RoadmapTypes::ItemIndex nLoopUntil = ::std::max( nUpperStepBoundary, m_pImpl->pRoadmap->GetItemCount() ); + vcl::RoadmapTypes::ItemIndex nUpperStepBoundary = static_cast<vcl::RoadmapTypes::ItemIndex>(rActivePath.size()); + vcl::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 ( RoadmapTypes::ItemIndex nItemIndex = nCurrentStatePathIndex; nItemIndex < nLoopUntil; ++nItemIndex ) + for ( vcl::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? - RoadmapTypes::ItemId nPresentItemId = m_pImpl->pRoadmap->GetItemID( nItemIndex ); + vcl::RoadmapTypes::ItemId nPresentItemId = m_pImpl->pRoadmap->GetItemID( nItemIndex ); WizardState nRequiredState = rActivePath[ nItemIndex ]; if ( _nState == nRequiredState ) { diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index efdd1a8cfe79..9088a11ebeb2 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -215,7 +215,7 @@ protected: // class SVTXRoadmap -namespace svt +namespace vcl { class ORoadmap; } diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index dcaa46182e90..43cb1d85711e 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -26,7 +26,7 @@ #include <svtools/svmedit.hxx> #include <unoiface.hxx> #include <svtools/filectrl.hxx> -#include <roadmap.hxx> +#include <vcl/roadmap.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/awt/LineEndFormat.hpp> @@ -118,7 +118,7 @@ SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const cs } else if (aServiceName.equalsIgnoreAsciiCase("roadmap") ) { - pWindow = VclPtr< ::svt::ORoadmap>::Create( pParent, WB_TABSTOP ); + pWindow = VclPtr< ::vcl::ORoadmap>::Create( pParent, WB_TABSTOP ); *ppNewComp = new SVTXRoadmap; } else if ( aServiceName.equalsIgnoreAsciiCase( "ProgressBar" ) ) @@ -1416,7 +1416,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) case VclEventId::RoadmapItemSelected: { SolarMutexGuard aGuard; - VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); + VclPtr<::vcl::ORoadmap> pField = GetAs< vcl::ORoadmap >(); if ( pField ) { sal_Int16 CurItemID = pField->GetCurrentRoadmapItemID(); @@ -1438,7 +1438,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) void SVTXRoadmap::propertyChange( const css::beans::PropertyChangeEvent& evt ) { SolarMutexGuard aGuard; - VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); + VclPtr<::vcl::ORoadmap> pField = GetAs< vcl::ORoadmap >(); if ( !pField ) return; @@ -1453,20 +1453,20 @@ void SVTXRoadmap::propertyChange( const css::beans::PropertyChangeEvent& evt ) { bool bEnable = false; evt.NewValue >>= bEnable; - pField->EnableRoadmapItem( static_cast<RoadmapTypes::ItemId>(nID) , bEnable ); + pField->EnableRoadmapItem( static_cast<vcl::RoadmapTypes::ItemId>(nID) , bEnable ); } else if ( sPropertyName == "Label" ) { OUString sLabel; evt.NewValue >>= sLabel; - pField->ChangeRoadmapItemLabel( static_cast<RoadmapTypes::ItemId>(nID) , sLabel ); + pField->ChangeRoadmapItemLabel( static_cast<vcl::RoadmapTypes::ItemId>(nID) , sLabel ); } else if ( sPropertyName == "ID" ) { sal_Int32 nNewID = 0; evt.NewValue >>= nNewID; evt.OldValue >>= nID; - pField->ChangeRoadmapItemID( static_cast<RoadmapTypes::ItemId>(nID), static_cast<RoadmapTypes::ItemId>(nNewID) ); + pField->ChangeRoadmapItemID( static_cast<vcl::RoadmapTypes::ItemId>(nID), static_cast<vcl::RoadmapTypes::ItemId>(nNewID) ); } // else // TODO handle Interactive appropriately @@ -1509,20 +1509,20 @@ RMItemData SVTXRoadmap::GetRMItemData( const css::container::ContainerEvent& _rE void SVTXRoadmap::elementInserted( const css::container::ContainerEvent& _rEvent ) { SolarMutexGuard aGuard; - VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); + VclPtr<::vcl::ORoadmap> pField = GetAs< vcl::ORoadmap >(); if ( pField ) { RMItemData CurItemData = GetRMItemData( _rEvent ); sal_Int32 InsertIndex = 0; _rEvent.Accessor >>= InsertIndex; - pField->InsertRoadmapItem( InsertIndex, CurItemData.Label, static_cast<RoadmapTypes::ItemId>(CurItemData.n_ID), CurItemData.b_Enabled ); + pField->InsertRoadmapItem( InsertIndex, CurItemData.Label, static_cast<vcl::RoadmapTypes::ItemId>(CurItemData.n_ID), CurItemData.b_Enabled ); } } void SVTXRoadmap::elementRemoved( const css::container::ContainerEvent& _rEvent ) { SolarMutexGuard aGuard; - VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); + VclPtr<::vcl::ORoadmap> pField = GetAs< vcl::ORoadmap >(); if ( pField ) { sal_Int32 DelIndex = 0; @@ -1534,13 +1534,13 @@ void SVTXRoadmap::elementRemoved( const css::container::ContainerEvent& _rEvent void SVTXRoadmap::elementReplaced( const css::container::ContainerEvent& _rEvent ) { SolarMutexGuard aGuard; - VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); + VclPtr<::vcl::ORoadmap> pField = GetAs< vcl::ORoadmap >(); if ( pField ) { RMItemData CurItemData = GetRMItemData( _rEvent ); sal_Int32 ReplaceIndex = 0; _rEvent.Accessor >>= ReplaceIndex; - pField->ReplaceRoadmapItem( ReplaceIndex, CurItemData.Label, static_cast<RoadmapTypes::ItemId>(CurItemData.n_ID), CurItemData.b_Enabled ); + pField->ReplaceRoadmapItem( ReplaceIndex, CurItemData.Label, static_cast<vcl::RoadmapTypes::ItemId>(CurItemData.n_ID), CurItemData.b_Enabled ); } } @@ -1549,7 +1549,7 @@ void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any { SolarMutexGuard aGuard; - VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); + VclPtr<::vcl::ORoadmap> pField = GetAs< vcl::ORoadmap >(); if ( pField ) { sal_uInt16 nPropType = GetPropertyId( PropertyName ); @@ -1575,7 +1575,7 @@ void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any { sal_Int32 nId = 0; Value >>= nId; - pField->SelectRoadmapItemByID( static_cast<RoadmapTypes::ItemId>(nId) ); + pField->SelectRoadmapItemByID( static_cast<vcl::RoadmapTypes::ItemId>(nId) ); } break; @@ -1605,7 +1605,7 @@ css::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) css::uno::Any aReturn; - VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); + VclPtr<::vcl::ORoadmap> pField = GetAs< vcl::ORoadmap >(); if ( pField ) { sal_uInt16 nPropType = GetPropertyId( PropertyName ); @@ -1631,7 +1631,7 @@ css::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) void SVTXRoadmap::ImplSetNewImage() { OSL_PRECOND( GetWindow(), "SVTXRoadmap::ImplSetNewImage: window is required to be not-NULL!" ); - VclPtr< ::svt::ORoadmap > pButton = GetAs< ::svt::ORoadmap >(); + VclPtr< ::vcl::ORoadmap > pButton = GetAs< ::vcl::ORoadmap >(); pButton->SetRoadmapBitmap( GetImage().GetBitmapEx() ); } diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 2fdff2495f81..8ab20f6dcc07 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -203,6 +203,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/control/notebookbar \ vcl/source/control/quickselectionengine \ vcl/source/control/prgsbar \ + vcl/source/control/roadmap \ vcl/source/control/scrbar \ vcl/source/control/slider \ vcl/source/control/spinbtn \ diff --git a/svtools/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx index 7813a2394a0f..462073a73007 100644 --- a/svtools/source/control/roadmap.cxx +++ b/vcl/source/control/roadmap.cxx @@ -17,11 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <roadmap.hxx> - #include <vector> #include <algorithm> #include <vcl/event.hxx> +#include <vcl/roadmap.hxx> #include <vcl/settings.hxx> #include <tools/color.hxx> #include <rtl/ustring.hxx> @@ -30,7 +29,7 @@ #define ROADMAP_INDENT_Y 27 #define ROADMAP_ITEM_DISTANCE_Y 6 -namespace svt +namespace vcl { typedef std::vector< RoadmapItem* > HL_Vector; @@ -49,7 +48,7 @@ class RoadmapItem : public RoadmapTypes { private: VclPtr<IDLabel> mpID; - VclPtr<vcl::HyperLabel> mpDescription; + VclPtr<HyperLabel> mpDescription; const Size m_aItemPlayground; public: @@ -69,7 +68,7 @@ public: void ToggleBackgroundColor( const Color& _rGBColor ); void SetInteractive( bool _bInteractive ); - void SetClickHdl( const Link<vcl::HyperLabel*,void>& rLink ); + void SetClickHdl( const Link<HyperLabel*,void>& rLink ); void Enable( bool bEnable ); bool IsEnabled() const; void GrabFocus(); @@ -622,7 +621,7 @@ bool ORoadmap::PreNotify(NotifyEvent& _rNEvt) return Window::PreNotify( _rNEvt ); } -IMPL_LINK(ORoadmap, ImplClickHdl, vcl::HyperLabel*, CurHyperLabel, void) +IMPL_LINK(ORoadmap, ImplClickHdl, HyperLabel*, CurHyperLabel, void) { SelectRoadmapItemByID( CurHyperLabel->GetID() ); } @@ -666,7 +665,7 @@ RoadmapItem::RoadmapItem(ORoadmap& _rParent, const Size& _rItemPlayground) { mpID = VclPtr<IDLabel>::Create( &_rParent, WB_WORDBREAK ); mpID->Show(); - mpDescription = VclPtr<vcl::HyperLabel>::Create( &_rParent, WB_NOTABSTOP | WB_WORDBREAK ); + mpDescription = VclPtr<HyperLabel>::Create( &_rParent, WB_NOTABSTOP | WB_WORDBREAK ); mpDescription->Show(); } @@ -794,7 +793,7 @@ void RoadmapItem::Update(ItemIndex RMIndex, const OUString& _rText) ImplUpdateIndex( RMIndex ); } -void RoadmapItem::SetClickHdl(const Link<vcl::HyperLabel*,void>& rLink) +void RoadmapItem::SetClickHdl(const Link<HyperLabel*,void>& rLink) { if ( mpDescription ) mpDescription->SetClickHdl( rLink); @@ -831,6 +830,6 @@ void IDLabel::DataChanged(const DataChangedEvent& rDCEvt) } } -} // namespace svt +} // namespace vcl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |