summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-01-14 11:28:22 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-01-15 00:36:42 +0000
commit10b10580c46a69d25e987212bb127787300b871e (patch)
tree19f77df035dd7b4b2b47e95a9eb184e2d8f5968a
parentca93d98343a03026c7568abc2ddda838f10fcbde (diff)
vcl: rename methods to crisp up a 'DisplayScreen' naming concept
-rw-r--r--vcl/aqua/source/app/salsys.cxx4
-rw-r--r--vcl/headless/svpdummies.cxx4
-rw-r--r--vcl/inc/aqua/salsys.h4
-rw-r--r--vcl/inc/headless/svpdummies.hxx4
-rw-r--r--vcl/inc/ios/salsys.h4
-rw-r--r--vcl/inc/salsys.hxx8
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtksys.hxx6
-rw-r--r--vcl/inc/unx/x11/x11sys.hxx8
-rw-r--r--vcl/inc/vcl/svapp.hxx6
-rw-r--r--vcl/inc/vcl/syswin.hxx8
-rw-r--r--vcl/inc/win/salsys.h6
-rw-r--r--vcl/ios/source/app/salsys.cxx4
-rw-r--r--vcl/source/app/svapp.cxx12
-rw-r--r--vcl/source/components/display.cxx16
-rw-r--r--vcl/unx/gtk/app/gtksys.cxx6
-rw-r--r--vcl/unx/x11/x11sys.cxx6
-rw-r--r--vcl/win/source/app/salinfo.cxx6
18 files changed, 56 insertions, 58 deletions
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 0c67ccfec620..8a371d6bf1cd 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -70,7 +70,7 @@ Rectangle AquaSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
return aRet;
}
-Rectangle AquaSalSystem::GetDisplayWorkAreaPosSizePixel( unsigned int nScreen )
+Rectangle AquaSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen )
{
NSArray* pScreens = [NSScreen screens];
Rectangle aRet;
@@ -89,7 +89,7 @@ Rectangle AquaSalSystem::GetDisplayWorkAreaPosSizePixel( unsigned int nScreen )
return aRet;
}
-rtl::OUString AquaSalSystem::GetScreenName( unsigned int nScreen )
+rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen )
{
NSArray* pScreens = [NSScreen screens];
OUString aRet;
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 74d9fc0c3cae..a4125f951abe 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -78,12 +78,12 @@ Rectangle SvpSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
return aRect;
}
-Rectangle SvpSalSystem::GetDisplayWorkAreaPosSizePixel( unsigned int nScreen )
+Rectangle SvpSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen )
{
return GetDisplayScreenPosSizePixel( nScreen );
}
-rtl::OUString SvpSalSystem::GetScreenName( unsigned int nScreen )
+rtl::OUString SvpSalSystem::GetDisplayScreenName( unsigned int nScreen )
{
rtl::OUStringBuffer aBuf( 32 );
aBuf.appendAscii( "VirtualScreen " );
diff --git a/vcl/inc/aqua/salsys.h b/vcl/inc/aqua/salsys.h
index bc09765cb0d3..6491cab50048 100644
--- a/vcl/inc/aqua/salsys.h
+++ b/vcl/inc/aqua/salsys.h
@@ -46,9 +46,9 @@ public:
// get info about the display
virtual unsigned int GetDisplayScreenCount();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetScreenName( unsigned int nScreen );
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
const rtl::OUString& rMessage,
int nButtonCombination,
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 045214ec65cd..e1fb22c36341 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -82,8 +82,8 @@ class SvpSalSystem : public SalSystem
// get info about the display
virtual unsigned int GetDisplayScreenCount();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetScreenName( unsigned int nScreen );
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
diff --git a/vcl/inc/ios/salsys.h b/vcl/inc/ios/salsys.h
index 81522e82da2d..48ccfabc47bf 100644
--- a/vcl/inc/ios/salsys.h
+++ b/vcl/inc/ios/salsys.h
@@ -40,9 +40,9 @@ public:
// get info about the display
virtual unsigned int GetDisplayScreenCount();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetScreenName( unsigned int nScreen );
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
virtual int ShowNativeMessageBox( const String& rTitle,
const String& rMessage,
int nButtonCombination,
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 24af20a118d7..ea952340c8c2 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -57,11 +57,9 @@ const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_YES = 6;
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO = 7;
-
// -------------
// - SalSystem -
// -------------
-
class VCL_PLUGIN_PUBLIC SalSystem
{
public:
@@ -88,7 +86,7 @@ public:
@returns the default screen number
*/
- virtual unsigned int GetDefaultDisplayNumber() { return 0; }
+ virtual unsigned int GetDisplayDefaultScreen() { return 0; }
/* Gets relative position and size of the screens attached to the display
@param nScreen
@@ -106,7 +104,7 @@ public:
@returns position and size relative to the scree
*/
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen ) = 0;
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ) = 0;
/* Gets the name of a screen
@param nScreen
@@ -114,7 +112,7 @@ public:
@returns the name of the screen
*/
- virtual rtl::OUString GetScreenName( unsigned int nScreen ) = 0;
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ) = 0;
/* Shows a native message box with the specified title, message and button
combination.
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index cbd1341f7896..ced4d165433f 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -155,7 +155,7 @@ public:
virtual int CaptureMouse( SalFrame* pFrame );
#if GTK_CHECK_VERSION(3,0,0)
- int GetDefaultScreenNumber() { return m_pSys->GetDefaultDisplayNumber(); }
+ int GetDefaultScreenNumber() { return m_pSys->GetDisplayDefaultScreen(); }
int GetScreenCount() { return m_pSys->GetDisplayScreenCount(); }
Size GetScreenSize( int screen );
#endif
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index 4836f8b41ee1..784623b901fd 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -43,10 +43,10 @@ public:
virtual bool IsUnifiedDisplay();
virtual unsigned int GetDisplayScreenCount();
- virtual unsigned int GetDefaultDisplayNumber();
- virtual rtl::OUString GetScreenName (unsigned int nScreen);
+ virtual unsigned int GetDisplayDefaultScreen();
+ virtual rtl::OUString GetDisplayScreenName (unsigned int nScreen);
virtual Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen);
- virtual Rectangle GetDisplayWorkAreaPosSizePixel (unsigned int nScreen);
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel (unsigned int nScreen);
virtual int ShowNativeDialog (const rtl::OUString& rTitle,
const rtl::OUString& rMessage,
const std::list< rtl::OUString >& rButtons,
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index d030d8432f5d..8a36d3ef9be3 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -45,10 +45,10 @@ public:
// overload pure virtual methods
virtual unsigned int GetDisplayScreenCount();
virtual bool IsUnifiedDisplay();
- virtual unsigned int GetDefaultDisplayNumber();
- virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetScreenName( unsigned int nScreen );
+ virtual unsigned int GetDisplayDefaultScreen();
+ virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
virtual int ShowNativeDialog( const rtl::OUString& rTitle,
const rtl::OUString& rMessage,
const std::list< rtl::OUString >& rButtons,
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 3bdfd900efb4..ba33ee2109ee 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -292,11 +292,11 @@ public:
// if IsUnifiedDisplay() == true the return value will be
// nearest screen of the target rectangle
// in case of IsUnifiedDisplay() == false the return value
- // will always be GetDefaultDisplayNumber()
+ // will always be GetDisplayDefaultScreen()
SAL_DLLPRIVATE static unsigned int GetBestScreen( const Rectangle& );
SAL_DLLPRIVATE static Rectangle GetWorkAreaPosSizePixel( unsigned int nScreen );
- SAL_DLLPRIVATE static unsigned int GetDefaultDisplayNumber();
- SAL_DLLPRIVATE static rtl::OUString GetScreenName( unsigned int nScreen );
+ SAL_DLLPRIVATE static unsigned int GetDisplayDefaultScreen();
+ SAL_DLLPRIVATE static rtl::OUString GetDisplayScreenName( unsigned int nScreen );
static const LocaleDataWrapper& GetAppLocaleDataWrapper();
diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index 19cce93d44dd..832ebd2cec17 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.hxx
@@ -241,10 +241,10 @@ public:
/**
Returns the screen number the window is on
- The screen number is counted the same way that
+ The Display Screen number is counted the same way that
<code>Application::GetScreenPosSizePixel</code>,
<code>Application::GetWorkAreaPosSizePixel</code>,
- <code>Application::GetScreenName</code>
+ <code>Application::GetDisplayScreenName</code>
and of course <code>SystemWindow::SetScreenNumber</code>
are counted in.
@@ -263,10 +263,10 @@ public:
Move the Window to a new screen. The same rules for
positioning apply as in <code>SystemWindow::GetScreenNumber</code>
- The screen number is counted the same way that
+ The Display Screen number is counted the same way that
<code>Application::GetScreenPosSizePixel</code>,
<code>Application::GetWorkAreaPosSizePixel</code>,
- <code>Application::GetScreenName</code>
+ <code>Application::GetDisplayScreenName</code>
and of course <code>SystemWindow::GetScreenNumber</code>
are counted in.
diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index 8eb002af79a2..7bd092cd7624 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -69,10 +69,10 @@ public:
virtual ~WinSalSystem();
virtual unsigned int GetDisplayScreenCount();
- virtual unsigned int GetDefaultDisplayNumber();
+ virtual unsigned int GetDisplayDefaultScreen();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetScreenName( unsigned int nScreen );
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
const rtl::OUString& rMessage,
int nButtonCombination,
diff --git a/vcl/ios/source/app/salsys.cxx b/vcl/ios/source/app/salsys.cxx
index 92114c5ef492..3a517baeb5c7 100644
--- a/vcl/ios/source/app/salsys.cxx
+++ b/vcl/ios/source/app/salsys.cxx
@@ -70,7 +70,7 @@ Rectangle IosSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
return aRet;
}
-Rectangle IosSalSystem::GetDisplayWorkAreaPosSizePixel( unsigned int nScreen )
+Rectangle IosSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen )
{
NSArray* pScreens = [UIScreen screens];
Rectangle aRet;
@@ -89,7 +89,7 @@ Rectangle IosSalSystem::GetDisplayWorkAreaPosSizePixel( unsigned int nScreen )
return aRet;
}
-rtl::OUString IosSalSystem::GetScreenName( unsigned int nScreen )
+rtl::OUString IosSalSystem::GetDisplayScreenName( unsigned int nScreen )
{
NSArray* pScreens = [UIScreen screens];
OUString aRet;
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 4df93e8f5914..f3e3fc20d361 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1252,10 +1252,10 @@ unsigned int Application::GetScreenCount()
return pSys ? pSys->GetDisplayScreenCount() : 0;
}
-rtl::OUString Application::GetScreenName( unsigned int nScreen )
+rtl::OUString Application::GetDisplayScreenName( unsigned int nScreen )
{
SalSystem* pSys = ImplGetSalSystem();
- return pSys ? pSys->GetScreenName( nScreen ) : rtl::OUString();
+ return pSys ? pSys->GetDisplayScreenName( nScreen ) : rtl::OUString();
}
bool Application::IsUnifiedDisplay()
@@ -1264,10 +1264,10 @@ bool Application::IsUnifiedDisplay()
return pSys ? pSys->IsUnifiedDisplay() : true;
}
-unsigned int Application::GetDefaultDisplayNumber()
+unsigned int Application::GetDisplayDefaultScreen()
{
SalSystem* pSys = ImplGetSalSystem();
- return pSys ? pSys->GetDefaultDisplayNumber() : 0;
+ return pSys ? pSys->GetDisplayDefaultScreen() : 0;
}
Rectangle Application::GetScreenPosSizePixel( unsigned int nScreen )
@@ -1279,7 +1279,7 @@ Rectangle Application::GetScreenPosSizePixel( unsigned int nScreen )
Rectangle Application::GetWorkAreaPosSizePixel( unsigned int nScreen )
{
SalSystem* pSys = ImplGetSalSystem();
- return pSys ? pSys->GetDisplayWorkAreaPosSizePixel( nScreen ) : Rectangle();
+ return pSys ? pSys->GetDisplayScreenWorkAreaPosSizePixel( nScreen ) : Rectangle();
}
namespace {
@@ -1296,7 +1296,7 @@ unsigned long calcDistSquare( const Point& i_rPoint, const Rectangle& i_rRect )
unsigned int Application::GetBestScreen( const Rectangle& i_rRect )
{
if( !IsUnifiedDisplay() )
- return GetDefaultDisplayNumber();
+ return GetDisplayDefaultScreen();
const unsigned int nScreens = GetScreenCount();
unsigned int nBestMatchScreen = 0;
diff --git a/vcl/source/components/display.cxx b/vcl/source/components/display.cxx
index 24516208ed4b..60870e304b07 100644
--- a/vcl/source/components/display.cxx
+++ b/vcl/source/components/display.cxx
@@ -55,7 +55,7 @@ namespace vcl
class DisplayInfo : public ::cppu::WeakAggImplHelper3< XPropertySet, XPropertySetInfo, XServiceInfo >
{
public:
- DisplayInfo( sal_uInt32 nDisplay );
+ DisplayInfo( sal_uInt32 nDisplayScreen );
// XPropertySet
virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException);
@@ -77,7 +77,7 @@ public:
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException);
private:
- sal_uInt32 mnDisplay;
+ sal_uInt32 mnDisplayScreen;
};
static const char* pScreenAreaName = "ScreenArea";
@@ -86,8 +86,8 @@ static const char* pScreenName = "ScreenName";
// --------------------------------------------------------------------
-DisplayInfo::DisplayInfo( sal_uInt32 nDisplay )
-: mnDisplay( nDisplay )
+DisplayInfo::DisplayInfo( sal_uInt32 nDisplayScreen )
+: mnDisplayScreen( nDisplayScreen )
{
}
@@ -107,15 +107,15 @@ Any SAL_CALL DisplayInfo::getPropertyValue( const OUString& PropertyName ) throw
Rectangle aRect;
if( PropertyName.equalsAscii( pScreenAreaName ) )
{
- aRect = Application::GetScreenPosSizePixel( mnDisplay );
+ aRect = Application::GetScreenPosSizePixel( mnDisplayScreen );
}
else if( PropertyName.equalsAscii( pWorkAreaName ) )
{
- aRect = Application::GetWorkAreaPosSizePixel( mnDisplay );
+ aRect = Application::GetWorkAreaPosSizePixel( mnDisplayScreen );
}
else if( PropertyName.equalsAscii( pScreenName ) )
{
- return Any( Application::GetScreenName( mnDisplay ) );
+ return Any( Application::GetDisplayScreenName( mnDisplayScreen ) );
}
else
throw UnknownPropertyException();
@@ -252,7 +252,7 @@ Any SAL_CALL DisplayAccess::getPropertyValue( const OUString& PropertyName ) thr
}
else if( PropertyName.equalsAscii( pDefaultDisplayName ) )
{
- aRet <<= sal_Int32( Application::GetDefaultDisplayNumber() );
+ aRet <<= sal_Int32( Application::GetDisplayDefaultScreen() );
}
else
throw UnknownPropertyException();
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index 98c012ad5135..9ce1671d28f5 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -153,7 +153,7 @@ static int _get_primary_monitor (GdkScreen *pScreen)
}
} // end anonymous namespace
-unsigned int GtkSalSystem::GetDefaultDisplayNumber()
+unsigned int GtkSalSystem::GetDisplayDefaultScreen()
{
GdkScreen *pDefault = gdk_display_get_default_screen (mpDisplay);
int idx = getScreenIdxFromPtr (mpDisplay, pDefault);
@@ -172,7 +172,7 @@ Rectangle GtkSalSystem::GetDisplayScreenPosSizePixel (unsigned int nScreen)
return Rectangle (aRect.x, aRect.y, aRect.width, aRect.height);
}
-Rectangle GtkSalSystem::GetDisplayWorkAreaPosSizePixel (unsigned int nScreen)
+Rectangle GtkSalSystem::GetDisplayScreenWorkAreaPosSizePixel (unsigned int nScreen)
{
// FIXME: in theory we need extra code here to collect
// the work area, ignoring fixed panels etc. on the screen.
@@ -180,7 +180,7 @@ Rectangle GtkSalSystem::GetDisplayWorkAreaPosSizePixel (unsigned int nScreen)
return GetDisplayScreenPosSizePixel( nScreen );
}
-rtl::OUString GtkSalSystem::GetScreenName(unsigned int nScreen)
+rtl::OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen)
{
gchar *pStr;
gint nMonitor;
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index c2c7388cdef7..a5fb4613a534 100644
--- a/vcl/unx/x11/x11sys.cxx
+++ b/vcl/unx/x11/x11sys.cxx
@@ -67,7 +67,7 @@ bool X11SalSystem::IsUnifiedDisplay()
return pSalDisp->IsXinerama() ? true : (nScreenCount == 1);
}
-unsigned int X11SalSystem::GetDefaultDisplayNumber()
+unsigned int X11SalSystem::GetDisplayDefaultScreen()
{
SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
return pSalDisp->GetDefaultScreenNumber();
@@ -92,13 +92,13 @@ Rectangle X11SalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
return aRet;
}
-Rectangle X11SalSystem::GetDisplayWorkAreaPosSizePixel( unsigned int nScreen )
+Rectangle X11SalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen )
{
// FIXME: workareas
return GetDisplayScreenPosSizePixel( nScreen );
}
-rtl::OUString X11SalSystem::GetScreenName( unsigned int nScreen )
+rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
{
rtl::OUString aScreenName;
SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index d6410b87adc1..3d3f487c00ac 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -184,7 +184,7 @@ bool WinSalSystem::IsMultiDisplay()
return false;
}
-unsigned int WinSalSystem::GetDefaultDisplayNumber()
+unsigned int WinSalSystem::GetDisplayDefaultScreen()
{
initMonitors();
return m_nPrimary;
@@ -196,13 +196,13 @@ Rectangle WinSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aArea : Rectangle();
}
-Rectangle WinSalSystem::GetDisplayWorkAreaPosSizePixel( unsigned int nScreen )
+Rectangle WinSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen )
{
initMonitors();
return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aWorkArea : Rectangle();
}
-rtl::OUString WinSalSystem::GetScreenName( unsigned int nScreen )
+rtl::OUString WinSalSystem::GetDisplayScreenName( unsigned int nScreen )
{
initMonitors();
return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aName : rtl::OUString();