diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-01 20:35:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-02 14:43:36 +0000 |
| commit | 17f6ebef2f3edbb7876524118dfe633025dc289b (patch) | |
| tree | b9155cdfb0f717bf292d3b74cccc87cd3a2bb5ad /vcl/source | |
| parent | 22c276885e5ebd9c0c1ec06ccb6b021a471a452f (diff) | |
valgrind: scary warning that the cairo font options were deleted before use
Change-Id: I58427aafb30eca64a67bcf7dd9a7738d8da3e085
(cherry picked from commit 3520b0f82aa2146958fbc1bda1cf7e9b5beb9a5d)
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/settings.cxx | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index e910a92db274..70a56a340515 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -194,7 +194,6 @@ struct ImplStyleData bool mbPrimaryButtonWarpsSlider; DialogStyle maDialogStyle; FrameStyle maFrameStyle; - const void* mpFontOptions; sal_uInt16 mnEdgeBlending; Color maEdgeBlendingTopLeftColor; @@ -549,7 +548,6 @@ ImplStyleData::ImplStyleData() : mbAutoMnemonic = true; mnToolbarIconSize = ToolbarIconSize::Unknown; meUseImagesInMenus = TRISTATE_INDET; - mpFontOptions = nullptr; mnEdgeBlending = 35; maEdgeBlendingTopLeftColor = RGB_COLORDATA(0xC0, 0xC0, 0xC0); maEdgeBlendingBottomRightColor = RGB_COLORDATA(0x40, 0x40, 0x40); @@ -670,7 +668,6 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) : mnToolbarIconSize = rData.mnToolbarIconSize; mIconThemeScanner.reset(new vcl::IconThemeScanner(*rData.mIconThemeScanner)); mIconThemeSelector.reset(new vcl::IconThemeSelector(*rData.mIconThemeSelector)); - mpFontOptions = rData.mpFontOptions; mnEdgeBlending = rData.mnEdgeBlending; maEdgeBlendingTopLeftColor = rData.maEdgeBlendingTopLeftColor; maEdgeBlendingBottomRightColor = rData.maEdgeBlendingBottomRightColor; @@ -1546,19 +1543,6 @@ StyleSettings::GetPrimaryButtonWarpsSlider() const } void -StyleSettings::SetCairoFontOptions( const void *pOptions ) -{ - CopyData(); - mxData->mpFontOptions = pOptions; -} - -const void* -StyleSettings::GetCairoFontOptions() const -{ - return mxData->mpFontOptions; -} - -void StyleSettings::SetAppFont( const vcl::Font& rFont ) { CopyData(); |