diff options
-rw-r--r-- | unusedcode.easy | 1 | ||||
-rw-r--r-- | vcl/inc/unx/saldisp.hxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/unusedcode.easy b/unusedcode.easy index c4784db7613a..26f593d49331 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -194,7 +194,6 @@ SVGExport::GetGlyphPlacement() const SVGExport::IsUseGradient() const SVGExport::popClip() SVGExport::pushClip(basegfx::B2DPolyPolygon const&) -SalDisplay::IsLocal() SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const&, unsigned int, OutputDevice const*) SalGraphics::DrawNativeControlText(unsigned int, unsigned int, Rectangle const&, unsigned int, ImplControlValue const&, rtl::OUString const&, OutputDevice const*) SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&, SalBitmap const&) diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index d8ee2ec1a4c5..94b66dc58817 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -305,9 +305,13 @@ protected: srv_vendor_t meServerVendor; SalWM eWindowManager_; + +#if defined(SOLARIS) sal_Bool bLocal_; // Server==Client? Init // in SalDisplay::IsLocal() sal_Bool mbLocalIsValid; // bLocal_ is valid ? +#endif + // until x bytes XLIB_Cursor aPointerCache_[POINTER_COUNT]; @@ -375,7 +379,9 @@ public: XLIB_Cursor GetPointer( int ePointerStyle ); virtual int CaptureMouse( SalFrame *pCapture ); +#if defined(SOLARIS) sal_Bool IsLocal(); +#endif void Remove( XEvent *pEvent ); virtual ScreenData *initScreen( SalX11Screen nXScreen ) const; diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 23ff906c0330..71bc7dbb4315 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -228,6 +228,9 @@ static sal_Bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI // --------------------------------------------------------------------------- +/* this stuff is used in SalDisplay::GetKeyboardName for SOLARIS */ +#if defined(SOLARIS) + // check wether displaystring is in format N.M or N. or just N // with N and M beeing natural numbers static sal_Bool @@ -342,6 +345,8 @@ sal_Bool SalDisplay::IsLocal() return (sal_Bool)bLocal_; } +#endif //SOLARIS + // --------------------------------------------------------------------------- extern "C" srv_vendor_t sal_GetServerVendor( Display *p_display ) @@ -817,9 +822,11 @@ void SalDisplay::Init() SetServerVendor(); X11SalBitmap::ImplCreateCache(); +#if defined(SOLARIS) bLocal_ = sal_False; /* dont care, initialize later by calling SalDisplay::IsLocal() */ mbLocalIsValid = sal_False; /* bLocal_ is not yet initialized */ +#endif // - - - - - - - - - - Synchronize - - - - - - - - - - - - - if( getenv( "SAL_SYNCHRONIZE" ) ) |