2 files changed, 18 insertions, 24 deletions
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 385ac40a2f8c..2b7a088d0d6c 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -2249,11 +2249,7 @@ void OutputDevice::SetSettings( const AllSettings& rSettings )
 
 sal_uInt16 OutputDevice::GetBitCount() const
 {
-
-    if ( meOutDevType == OUTDEV_VIRDEV )
-        return ((VirtualDevice*)this)->mnBitCount;
-
-    // we need a graphics
+    // we need a graphics instance
     if ( !mpGraphics )
     {
         if ( !((OutputDevice*)this)->ImplGetGraphics() )
@@ -2265,13 +2261,6 @@ sal_uInt16 OutputDevice::GetBitCount() const
 
 sal_uInt16 OutputDevice::GetAlphaBitCount() const
 {
-
-    if ( meOutDevType == OUTDEV_VIRDEV &&
-        mpAlphaVDev != NULL )
-    {
-        return mpAlphaVDev->GetBitCount();
-    }
-
     return 0;
 }
 
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index aa3f35947785..6fc68d29726d 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -369,6 +369,8 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra
     return bRet;
 }
 
+
+
 // #i32109#: Fill opaque areas correctly (without relying on
 // fill/linecolor state)
 void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect )
@@ -383,6 +385,8 @@ void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect )
     Pop();
 }
 
+
+
 bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer )
 {
     if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) )
@@ -418,18 +422,6 @@ bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, c
     return false;
 }
 
-void VirtualDevice::EnableRTL( bool bEnable )
-{
-    // virdevs default to not mirroring, they will only be set to mirroring
-    // under rare circumstances in the UI, eg the valueset control
-    // because each virdev has its own SalGraphics we can safely switch the SalGraphics here
-    // ...hopefully
-    if( ImplGetGraphics() )
-        mpGraphics->SetLayout( bEnable ? SAL_LAYOUT_BIDI_RTL : 0 );
-
-    OutputDevice::EnableRTL(bEnable);
-}
-
 bool VirtualDevice::SetOutputSizePixel( const Size& rNewSize, bool bErase )
 {
     return ImplSetOutputSizePixel( rNewSize, bErase, basebmp::RawMemorySharedArray() );
@@ -527,6 +519,19 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32
     mpFontCache = new ImplFontCache();
 }
 
+sal_uInt16 VirtualDevice::GetBitCount() const
+{
+    return mnBitCount;
+}
+
+sal_uInt16 VirtualDevice::GetAlphaBitCount() const
+{
+    if (mpAlphaVDev)
+        return mpAlphaVDev->GetBitCount();
+
+    return 0;
+}
+
 void VirtualDevice::Compat_ZeroExtleadBug()
 {
     meRefDevMode = (sal_uInt8)meRefDevMode | REFDEV_FORCE_ZERO_EXTLEAD;