diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-03-11 17:18:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-11 17:18:33 +0000 |
| commit | 7cfa311d55f50c0e42067efd6fda29597d2e1522 (patch) | |
| tree | 16a1aaf81c32f1964b934e0df20d0046b427a14f /canvas | |
| parent | 6617505ee19cd0fa1f19815f5a736755e488beae (diff) | |
presumably this Commit->ImplCommit is the right build fix
Change-Id: Ica4ccac97c077dd3046e42650889ba538814bf9b
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/directx/dx_config.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/directx/dx_config.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index 64d591a5dad1..d1d410d09037 100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx @@ -130,7 +130,7 @@ namespace dxcanvas } void DXCanvasItem::Notify( const com::sun::star::uno::Sequence<OUString>& ) {} - void DXCanvasItem::Commit() {} + void DXCanvasItem::ImplCommit() {} bool DXCanvasItem::isDeviceUsable( const DeviceInfo& rDeviceInfo ) const { diff --git a/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx index 34707ef8d038..0f244c895e5d 100644 --- a/canvas/source/directx/dx_config.hxx +++ b/canvas/source/directx/dx_config.hxx @@ -66,10 +66,10 @@ namespace dxcanvas bool isBlacklistCurrentDevice() const; void blacklistDevice( const DeviceInfo& rDeviceInfo ); void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const; - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; private: + virtual void ImplCommit() SAL_OVERRIDE; typedef std::set< DeviceInfo > ValueSet; ValueSet maValues; boost::optional<sal_Int32> maMaxTextureSize; |