summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-30 19:26:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-02-01 08:11:19 +0000
commit01695131f3283d15e8fb803c7a342d0932d0e182 (patch)
tree531710c0d82e1e46dd3ed721261c985135bcd4bd
parent30c4cc2f09144b80216bca03089970348126fb5e (diff)
Resolves: tdf#93821 assume mbNoSaveBackground as true everywhere
Change-Id: I126aa5e9b96299eb25c2240d097859b3c0756535
-rw-r--r--include/vcl/dialog.hxx1
-rw-r--r--include/vcl/floatwin.hxx1
-rw-r--r--include/vcl/syswin.hxx3
-rw-r--r--vcl/inc/svdata.hxx1
-rw-r--r--vcl/ios/iosinst.cxx1
-rw-r--r--vcl/osx/salinst.cxx1
-rw-r--r--vcl/source/app/help.cxx3
-rw-r--r--vcl/source/control/imp_listbox.cxx2
-rw-r--r--vcl/source/opengl/OpenGLHelper.cxx1
-rw-r--r--vcl/source/window/dialog.cxx4
-rw-r--r--vcl/source/window/floatwin.cxx5
-rw-r--r--vcl/source/window/menufloatingwindow.cxx1
-rw-r--r--vcl/source/window/syswin.cxx27
13 files changed, 0 insertions, 51 deletions
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index eb4a2fdda033..1c0b92f291cc 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -41,7 +41,6 @@ private:
DialogImpl* mpDialogImpl;
long mnMousePositioned;
bool mbInExecute;
- bool mbOldSaveBack;
bool mbInClose;
bool mbModalMode;
InitFlag mnInitFlag; // used for deferred init
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 61d724b1ed81..20b0688adc97 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -106,7 +106,6 @@ private:
bool mbPopupModeCanceled;
bool mbPopupModeTearOff;
bool mbMouseDown;
- bool mbOldSaveBackMode;
bool mbGrabFocus; // act as key input window, although focus is not set
bool mbInCleanUp;
Link<FloatingWindow*,void> maPopupModeEndHdl;
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 12b0f8f69302..e95cbf93f7bb 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -210,9 +210,6 @@ public:
// separately from the window title
void SetRepresentedURL( const OUString& );
- void EnableSaveBackground( bool bSave = true );
- bool IsSaveBackgroundEnabled() const;
-
void ShowTitleButton( TitleButton nButton, bool bVisible = true );
bool IsTitleButtonVisible( TitleButton nButton ) const;
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index a0663b11e3de..d139c140edd0 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -198,7 +198,6 @@ struct ImplSVWinData
StartAutoScrollFlags mnAutoScrollFlags; // auto scroll flags
bool mbNoDeactivate; // true: do not execute Deactivate
bool mbNoSaveFocus; // true: menus must not save/restore focus
- bool mbNoSaveBackground; // true: save background is unnecessary or even less performant
};
typedef std::vector< std::pair< OUString, FieldUnit > > FieldUnitStringList;
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 5f58b7bdbe28..6ca639eaba48 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -176,7 +176,6 @@ SalInstance *CreateSalInstance()
IosSalInstance* pInstance = new IosSalInstance( new SalYieldMutex() );
new IosSalData( pInstance );
pInstance->AcquireYieldMutex(1);
- ImplGetSVData()->maWinData.mbNoSaveBackground = true;
return pInstance;
}
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 2e3fdadd2e00..63b8e0585fc7 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -338,7 +338,6 @@ SalInstance* CreateSalInstance()
ImplGetSVData()->maNWFData.mbProgressNeedsErase = true;
ImplGetSVData()->maNWFData.mbCheckBoxNeedsErase = true;
ImplGetSVData()->maNWFData.mnStatusBarLowerRightOffset = 10;
- ImplGetSVData()->maWinData.mbNoSaveBackground = true;
return pInst;
}
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index a41c666a0db1..f48f6c59b15e 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -237,9 +237,6 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal
ImplSetMouseTransparent( true );
mnHelpWinStyle = nHelpWinStyle;
mnStyle = nStyle;
-// on windows this will raise the application window, because help windows are system windows now
-// EnableAlwaysOnTop();
- EnableSaveBackground();
if( mnStyle & QuickHelpFlags::BiDiRtl )
{
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 18e1756a524d..65fd57a0bd61 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2944,8 +2944,6 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( vcl::Window* pParent ) :
mnPopupModeStartSaveSelection = LISTBOX_ENTRY_NOTFOUND;
- EnableSaveBackground();
-
vcl::Window * pBorderWindow = ImplGetBorderWindow();
if( pBorderWindow )
{
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index a8a62fc57a02..f98acbef27d9 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -1004,7 +1004,6 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
{
if (!getenv("SAL_DISABLE_GL_WATCHDOG"))
OpenGLWatchdogThread::start();
- ImplGetSVData()->maWinData.mbNoSaveBackground = true;
}
return bRet;
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index d06ca8713885..ce0d6f1a0a5e 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -357,7 +357,6 @@ void Dialog::ImplInitDialogData()
mpWindowImpl->mbDialog = true;
mpPrevExecuteDlg = nullptr;
mbInExecute = false;
- mbOldSaveBack = false;
mbInClose = false;
mbModalMode = false;
mpContentArea.clear();
@@ -855,8 +854,6 @@ bool Dialog::ImplStartExecuteModal()
}
mbInExecute = true;
SetModalInputMode( true );
- mbOldSaveBack = IsSaveBackgroundEnabled();
- EnableSaveBackground();
// FIXME: no layouting, workaround some clipping issues
ImplAdjustNWFSizes();
@@ -962,7 +959,6 @@ void Dialog::EndDialog( long nResult )
mpPrevExecuteDlg = nullptr;
Hide();
- EnableSaveBackground( mbOldSaveBack );
if ( GetParent() )
{
NotifyEvent aNEvt( MouseNotifyEvent::ENDEXECUTEDIALOG, this );
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 8b075c7a740f..ed997c8020af 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -170,7 +170,6 @@ FloatingWindow::FloatingWindow(vcl::Window* pParent, const OString& rID, const O
, mbPopupModeCanceled(false)
, mbPopupModeTearOff(false)
, mbMouseDown(false)
- , mbOldSaveBackMode(false)
, mbGrabFocus(false)
, mbInCleanUp(false)
{
@@ -696,9 +695,6 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, FloatWinPopupFlags
mbPopupModeTearOff = false;
mbMouseDown = false;
- mbOldSaveBackMode = IsSaveBackgroundEnabled();
- EnableSaveBackground();
-
// add FloatingWindow to list of windows that are in popup mode
ImplSVData* pSVData = ImplGetSVData();
mpNextFloat = pSVData->maWinData.mpFirstFloat;
@@ -795,7 +791,6 @@ void FloatingWindow::ImplEndPopupMode( FloatWinPopupEndFlags nFlags, VclPtr<vcl:
if ( xFocusId != nullptr )
Window::EndSaveFocus( xFocusId, false );
}
- EnableSaveBackground( mbOldSaveBackMode );
mbPopupModeCanceled = bool(nFlags & FloatWinPopupEndFlags::Cancel);
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 60c52b9e1cb6..2620b0d97aa5 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -45,7 +45,6 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, vcl::Window* pParent, WinBit
bIgnoreFirstMove = true;
bKeyInput = false;
- EnableSaveBackground();
ApplySettings(*this);
SetPopupModeEndHdl( LINK( this, MenuFloatingWindow, PopupEnd ) );
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 5ff9f1d67575..19ec2f944357 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -291,33 +291,6 @@ void SystemWindow::SetIcon( sal_uInt16 nIcon )
}
}
-void SystemWindow::EnableSaveBackground(bool bSave)
-{
- if( ImplGetSVData()->maWinData.mbNoSaveBackground )
- bSave = false;
-
- vcl::Window* pWindow = this;
- while (pWindow->mpWindowImpl->mpBorderWindow)
- pWindow = pWindow->mpWindowImpl->mpBorderWindow;
- if (pWindow->mpWindowImpl->mbOverlapWin && !pWindow->mpWindowImpl->mbFrame)
- {
- pWindow->mpWindowImpl->mpOverlapData->mbSaveBack = bSave;
- if (!bSave)
- pWindow->ImplDeleteOverlapBackground();
- }
-}
-
-bool SystemWindow::IsSaveBackgroundEnabled() const
-{
- const vcl::Window* pWindow = this;
- while ( pWindow->mpWindowImpl->mpBorderWindow )
- pWindow = pWindow->mpWindowImpl->mpBorderWindow;
- if ( pWindow->mpWindowImpl->mpOverlapData )
- return pWindow->mpWindowImpl->mpOverlapData->mbSaveBack;
- else
- return false;
-}
-
void SystemWindow::ShowTitleButton( TitleButton nButton, bool bVisible )
{
if ( nButton == TitleButton::Docking )