summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-01-30 14:36:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-01-30 16:17:45 +0100
commitfacc94bb0aef58353d54e14f948790643ccbec32 (patch)
tree00da6a066f7acd65787730ffbe78b6439e5bf148 /vcl/source/window
parentb87af9775167002d36a3bc16cb308ea7895d7ea0 (diff)
loplugin:unusedfields
Change-Id: Ifb9c91b3e8d6c2dd3a639a239fa41e7d5c7a4ee6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87735 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/splitwin.cxx39
1 files changed, 9 insertions, 30 deletions
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index f1f56776cc5d..7f48142f6a54 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -82,10 +82,8 @@ class ImplSplitSet
{
public:
ImplSplitSet();
- ~ImplSplitSet();
std::vector< ImplSplitItem > mvItems;
- std::unique_ptr<Wallpaper> mpWallpaper;
long mnLastSize;
long mnSplitSize;
sal_uInt16 mnId;
@@ -122,11 +120,6 @@ ImplSplitSet::ImplSplitSet() :
{
}
-ImplSplitSet::~ImplSplitSet()
-{
- mpWallpaper.reset();
-}
-
/** Check whether the given size is inside the valid range defined by
[rItem.mnMinSize,rItem.mnMaxSize]. When it is not inside it then return
the upper or lower bound, respectively. Otherwise return the given size
@@ -859,13 +852,6 @@ void SplitWindow::ImplDrawBack(vcl::RenderContext& rRenderContext, ImplSplitSet*
for ( const auto& rItem : rItems )
{
pSet = rItem.mpSet.get();
- if (pSet && pSet->mpWallpaper)
- {
- Point aPoint(rItem.mnLeft, rItem.mnTop);
- Size aSize(rItem.mnWidth, rItem.mnHeight);
- tools::Rectangle aRect(aPoint, aSize);
- rRenderContext.DrawWallpaper(aRect, *pSet->mpWallpaper);
- }
}
for ( auto& rItem : rItems )
@@ -1190,23 +1176,16 @@ void SplitWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
void SplitWindow::ImplInitSettings()
{
- // If MainSet has a Wallpaper, this is the background,
- // otherwise it is the standard colour
- if ( mpMainSet->mpWallpaper )
- SetBackground( *mpMainSet->mpWallpaper );
- else
- {
- const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+ const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- Color aColor;
- if ( IsControlBackground() )
- aColor = GetControlBackground();
- else if ( Window::GetStyle() & WB_3DLOOK )
- aColor = rStyleSettings.GetFaceColor();
- else
- aColor = rStyleSettings.GetWindowColor();
- SetBackground( aColor );
- }
+ Color aColor;
+ if ( IsControlBackground() )
+ aColor = GetControlBackground();
+ else if ( Window::GetStyle() & WB_3DLOOK )
+ aColor = rStyleSettings.GetFaceColor();
+ else
+ aColor = rStyleSettings.GetWindowColor();
+ SetBackground( aColor );
}
SplitWindow::SplitWindow( vcl::Window* pParent, WinBits nStyle ) :