Skip to content

C
core
Kaydet (Commit) 7cfa311d authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

presumably this Commit->ImplCommit is the right build fix 

Change-Id: Ica4ccac97c077dd3046e42650889ba538814bf9b
üst 6617505e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
canvas/source/directx/dx_config.cxx
Dosyayı görüntüle @ 7cfa311d
...@@ -130,7 +130,7 @@ namespace dxcanvas ...@@ -130,7 +130,7 @@ namespace dxcanvas
} }
void DXCanvasItem::Notify( const com::sun::star::uno::Sequence<OUString>& ) {} void DXCanvasItem::Notify( const com::sun::star::uno::Sequence<OUString>& ) {}
void DXCanvasItem::Commit() {} void DXCanvasItem::ImplCommit() {}
bool DXCanvasItem::isDeviceUsable( const DeviceInfo& rDeviceInfo ) const bool DXCanvasItem::isDeviceUsable( const DeviceInfo& rDeviceInfo ) const
{ {
......
canvas/source/directx/dx_config.hxx
Dosyayı görüntüle @ 7cfa311d
...@@ -66,10 +66,10 @@ namespace dxcanvas ...@@ -66,10 +66,10 @@ namespace dxcanvas
bool isBlacklistCurrentDevice() const; bool isBlacklistCurrentDevice() const;
void blacklistDevice( const DeviceInfo& rDeviceInfo ); void blacklistDevice( const DeviceInfo& rDeviceInfo );
void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const; void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const;
virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE;
virtual void Commit();
private: private:
virtual void ImplCommit() SAL_OVERRIDE;
typedef std::set< DeviceInfo > ValueSet; typedef std::set< DeviceInfo > ValueSet;
ValueSet maValues; ValueSet maValues;
boost::optional<sal_Int32> maMaxTextureSize; boost::optional<sal_Int32> maMaxTextureSize;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment