canvas/source/directx/dx_config.cxx | 2 +- canvas/source/directx/dx_config.hxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 7cfa311d55f50c0e42067efd6fda29597d2e1522 Author: Caolán McNamara <[email protected]> Date: Wed Mar 11 17:18:33 2015 +0000 presumably this Commit->ImplCommit is the right build fix Change-Id: Ica4ccac97c077dd3046e42650889ba538814bf9b diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index 64d591a..d1d410d 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 34707ef..0f244c8 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;
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
