diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-19 10:55:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-19 15:05:08 +0200 |
| commit | a32c8b65ee1dce8d06b2a5b00d33327ba1bc445f (patch) | |
| tree | c9a02500cf730916eddc6ecfffcc646d1a2afef2 /vcl/unx/x11 | |
| parent | 76eae641c926faea1b9f9e2694b28de1f2f4d17f (diff) | |
rename GetGenericData to GetGenericUnixSalData
Change-Id: Id95334da347c8341d9d190307603218eedb9c1e6
Reviewed-on: https://gerrit.libreoffice.org/42457
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx/x11')
| -rw-r--r-- | vcl/unx/x11/x11sys.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx index db8b237a7272..69e4a035c20c 100644 --- a/vcl/unx/x11/x11sys.cxx +++ b/vcl/unx/x11/x11sys.cxx @@ -42,28 +42,28 @@ X11SalSystem::~X11SalSystem() // for the moment only handle xinerama case unsigned int X11SalSystem::GetDisplayScreenCount() { - SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData()); + SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData()); return pSalDisp->IsXinerama() ? pSalDisp->GetXineramaScreens().size() : pSalDisp->GetXScreenCount(); } bool X11SalSystem::IsUnifiedDisplay() { - SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData()); + SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData()); unsigned int nScreenCount = pSalDisp->GetXScreenCount(); return pSalDisp->IsXinerama() || (nScreenCount == 1); } unsigned int X11SalSystem::GetDisplayBuiltInScreen() { - SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData()); + SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData()); return pSalDisp->GetDefaultXScreen().getXScreen(); } tools::Rectangle X11SalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen ) { tools::Rectangle aRet; - SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData()); + SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData()); if( pSalDisp->IsXinerama() ) { const std::vector< tools::Rectangle >& rScreens = pSalDisp->GetXineramaScreens(); |