loplugin:staticmethods

Change-Id: Ibf0c73ac17ec19ed672f66907db47057920babca

44 files changed, 160 insertions, 160 deletions

diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index 4db4c1d5e0c7..96b1c80098d1 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -80,7 +80,7 @@ class CUPSManager : public PrinterInfoManager
 
     virtual void initialize() SAL_OVERRIDE;
 
-    void getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner, int& rNumOptions, void** rOptions ) const;
+    static void getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner, int& rNumOptions, void** rOptions );
     void runDests();
     OString threadedCupsGetPPD(const char* pPrinter);
 
diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx
index 60b6bb3c297d..978910a46f01 100644
--- a/vcl/inc/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
@@ -46,23 +46,23 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper3<
      * fire the events on the dnd listener container of the specified window
      */
 
-    sal_Int32 fireDragEnterEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
+    static sal_Int32 fireDragEnterEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
         const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction,
         const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aFlavorList ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDragOverEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
+    static sal_Int32 fireDragOverEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
         const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDragExitEvent( vcl::Window *pWindow ) throw(::com::sun::star::uno::RuntimeException);
+    static sal_Int32 fireDragExitEvent( vcl::Window *pWindow ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDropActionChangedEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
+    static sal_Int32 fireDropActionChangedEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
         const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDropEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext,
+    static sal_Int32 fireDropEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext,
         const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction,
         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable ) throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 fireDragGestureEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource,
+    static sal_Int32 fireDragGestureEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource,
         const ::com::sun::star::uno::Any& event, const Point& rOrigin, const sal_Int8 nDragAction )throw(::com::sun::star::uno::RuntimeException);
 
 public:
diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index e957b508e1cb..7b9c083e0034 100644
--- a/vcl/inc/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
@@ -59,8 +59,8 @@ namespace grutils
     private:
         GrFeatureParser(const GrFeatureParser & copy) SAL_DELETED_FUNCTION;
         void setLang(const gr_face * face, const OString & lang);
-        bool isCharId(const OString & id, size_t offset, size_t length);
-        gr_uint32 getCharId(const OString & id, size_t offset, size_t length);
+        static bool isCharId(const OString & id, size_t offset, size_t length);
+        static gr_uint32 getCharId(const OString & id, size_t offset, size_t length);
         short getIntValue(const OString & id, size_t offset, size_t length);
         size_t mnNumSettings;
         FeatId maLang;
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 3d68e7649314..297d28a7f4fa 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -54,7 +54,7 @@ protected:
     basegfx::B2IVector                   GetSize() { return m_aOrigDevice->getSize(); }
 
 public:
-    GlyphCache& getPlatformGlyphCache();
+    static GlyphCache& getPlatformGlyphCache();
     void setDevice(basebmp::BitmapDeviceSharedPtr& rDevice);
     void BlendTextColor(const basebmp::Color &rTextColor, const basebmp::BitmapDeviceSharedPtr &rAlphaMask,
                         const basegfx::B2IPoint &rDstPoint);
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index d177aa2a1b08..61dd536b2f47 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1265,7 +1265,7 @@ void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_u
 
     if( mpParent )
     {
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
         {
             if( (nFlags & SAL_FRAME_POSSIZE_WIDTH) != 0 )
                 nX = mpParent->maGeometry.nWidth - nWidth-1 - nX;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 04c6e90cfd84..67c0a9a4fc61 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -628,7 +628,7 @@ private:
         aEvent.mnCode   =  aEvent.mnButton | nModMask;
 
         // --- RTL --- (mirror mouse pos)
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
             aEvent.mnX = pDispatchFrame->maGeometry.nWidth-1-aEvent.mnX;
 
         pDispatchFrame->CallCallback( nEvent, &aEvent );
@@ -790,7 +790,7 @@ private:
         aEvent.mbDeltaIsPixel   = TRUE;
 
         // --- RTL --- (mirror mouse pos)
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
             aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
 
         aEvent.mnDelta = nDeltaZ;
@@ -846,7 +846,7 @@ private:
         aEvent.mbDeltaIsPixel   = TRUE;
 
         // --- RTL --- (mirror mouse pos)
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
             aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
 
         if( dX != 0.0 )
@@ -906,7 +906,7 @@ private:
         aEvent.mbDeltaIsPixel = FALSE;
 
         // --- RTL --- (mirror mouse pos)
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
             aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
 
         if( dX != 0.0 )
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index cd2b8c5b892e..559b41897f1c 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -746,7 +746,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
         {
             ButtonValue aButtonValue = aValue.getTristateVal();
 
-            if( Application::GetSettings().GetLayoutRTL() && aButtonValue == BUTTONVALUE_OFF )
+            if( AllSettings::GetLayoutRTL() && aButtonValue == BUTTONVALUE_OFF )
             {
                 // FIXME: a value of kThemeDisclosureLeft
                 // should draw a theme compliant left disclosure triangle
@@ -784,7 +784,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     case BUTTONVALUE_OFF:
                         // FIXME: this should have drawn a theme compliant disclosure triangle
                         // (see above)
-                        if( Application::GetSettings().GetLayoutRTL() )
+                        if( AllSettings::GetLayoutRTL() )
                         {
                             aInfo.value = kThemeDisclosureLeft;//collapsed, RTL
                         }
@@ -815,7 +815,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
             aTrackInfo.bounds.origin.y     -= 2; // FIXME: magic for shadow
             aTrackInfo.bounds.size.width   -= 2; // FIXME: magic for shadow
             aTrackInfo.attributes           = kThemeTrackHorizontal;
-            if( Application::GetSettings().GetLayoutRTL() )
+            if( AllSettings::GetLayoutRTL() )
                 aTrackInfo.attributes      |= kThemeTrackRightToLeft;
             aTrackInfo.enableState          = getTrackState( nState );
             // the intro bitmap never gets key anyway; we want to draw that enabled
@@ -972,7 +972,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 
             //support for RTL
             //see issue 79748
-            if( Application::GetSettings().GetLayoutRTL() ) {
+            if( AllSettings::GetLayoutRTL() ) {
                 if( aTabItemDrawInfo.position == kHIThemeTabPositionFirst )
                         aTabItemDrawInfo.position = kHIThemeTabPositionLast;
                 else if( aTabItemDrawInfo.position == kHIThemeTabPositionLast )
@@ -1105,7 +1105,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     HIRect buttonRc = ImplGetHIRectFromRectangle(aSpinRect);
 
                     // FIXME: without this fuzz factor there is some unwanted clipping
-                    if( Application::GetSettings().GetLayoutRTL() )
+                    if( AllSettings::GetLayoutRTL() )
                         buttonRc.origin.x -= FOCUS_RING_WIDTH - CLIP_FUZZ;
                     else
                         buttonRc.origin.x += FOCUS_RING_WIDTH + CLIP_FUZZ;
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index d15508f9994c..54faf897b807 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -778,7 +778,7 @@ void CanvasBitmapTest::runTest()
         CPPUNIT_ASSERT_MESSAGE("(9,2) incorrect content",
                                pBmpAcc->GetPixel(2,9) == BitmapColor(9));
 
-        aBmp.GetBitmap().ReleaseAccess(pBmpAcc);
+        Bitmap::ReleaseAccess(pBmpAcc);
     }
 
     xTestBmp.set( new TestBitmap( geometry::IntegerSize2D(10,10), false ));
@@ -815,7 +815,7 @@ void CanvasBitmapTest::runTest()
                                pAlphaAcc->GetPixel(2,9) == BitmapColor(253));
 
         aBmp.GetAlpha().ReleaseAccess(pAlphaAcc);
-        aBmp.GetBitmap().ReleaseAccess(pBmpAcc);
+        Bitmap::ReleaseAccess(pBmpAcc);
     }
 }
 
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index b202d64e4d9c..7d625dfdcf30 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2821,12 +2821,12 @@ namespace
     }
 }
 
-bool AllSettings::GetLayoutRTL() const
+bool AllSettings::GetLayoutRTL()
 {
     return GetConfigLayoutRTL(false);
 }
 
-bool AllSettings::GetMathLayoutRTL() const
+bool AllSettings::GetMathLayoutRTL()
 {
     return GetConfigLayoutRTL(true);
 }
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f704e66d458b..a35327a306d2 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1034,7 +1034,7 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd )
             if( !aClipRgn.IsNull() )
             {
                 // transform clipping region to border window's coordinate system
-                if( IsRTLEnabled() != pBorder->IsRTLEnabled() && Application::GetSettings().GetLayoutRTL() )
+                if( IsRTLEnabled() != pBorder->IsRTLEnabled() && AllSettings::GetLayoutRTL() )
                 {
                     // need to mirror in case border is not RTL but edit is (or vice versa)
 
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index a4ffdf8482b3..a78c5612ec86 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -43,7 +43,7 @@ void MenuButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
         nStyle |= WB_TABSTOP;
 
     PushButton::ImplInit( pParent, nStyle );
-    EnableRTL( Application::GetSettings().GetLayoutRTL() );
+    EnableRTL( AllSettings::GetLayoutRTL() );
 }
 
 void MenuButton::ExecuteMenu()
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index e176657002fb..dd46cdad48fd 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -334,7 +334,7 @@ IMPL_LINK( ImpVclMEdit, ScrollHdl, ScrollBar*, pCurScrollBar )
 
 void ImpVclMEdit::SetAlign( WinBits nWinStyle )
 {
-    bool bRTL = Application::GetSettings().GetLayoutRTL();
+    bool bRTL = AllSettings::GetLayoutRTL();
     mpTextWindow->GetTextEngine()->SetRightToLeft( bRTL );
 
     if ( nWinStyle & WB_CENTER )
@@ -423,7 +423,7 @@ void ImpVclMEdit::Resize()
         Point aTextWindowPos( maTextWindowOffset );
         if ( mpVScrollBar )
         {
-            if( Application::GetSettings().GetLayoutRTL() )
+            if( AllSettings::GetLayoutRTL() )
             {
                 mpVScrollBar->setPosSizePixel( 0, 0, nSBWidth, aSz.Height() );
                 aTextWindowPos.X() += nSBWidth;
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 0b14c77d820f..3526a0bcaf5b 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -69,10 +69,10 @@ GIFReader::~GIFReader()
     aImGraphic.SetContext( NULL );
 
     if( pAcc1 )
-        aBmp1.ReleaseAccess( pAcc1 );
+        Bitmap::ReleaseAccess( pAcc1 );
 
     if( pAcc8 )
-        aBmp8.ReleaseAccess( pAcc8 );
+        Bitmap::ReleaseAccess( pAcc8 );
 
     delete[] pSrcBuf;
 }
@@ -544,12 +544,12 @@ void GIFReader::CreateNewBitmaps()
 {
     AnimationBitmap aAnimBmp;
 
-    aBmp8.ReleaseAccess( pAcc8 );
+    Bitmap::ReleaseAccess( pAcc8 );
     pAcc8 = NULL;
 
     if( bGCTransparent )
     {
-        aBmp1.ReleaseAccess( pAcc1 );
+        Bitmap::ReleaseAccess( pAcc1 );
         pAcc1 = NULL;
         aAnimBmp.aBmpEx = BitmapEx( aBmp8, aBmp1 );
     }
@@ -585,11 +585,11 @@ const Graphic& GIFReader::GetIntermediateGraphic()
     {
         Bitmap  aBmp;
 
-        aBmp8.ReleaseAccess( pAcc8 );
+        Bitmap::ReleaseAccess( pAcc8 );
 
         if ( bGCTransparent )
         {
-            aBmp1.ReleaseAccess( pAcc1 );
+            Bitmap::ReleaseAccess( pAcc1 );
             aImGraphic = BitmapEx( aBmp8, aBmp1 );
 
             pAcc1 = aBmp1.AcquireWriteAccess();
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index ff1eed9ebce1..6bf877ab80c3 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -40,7 +40,7 @@ XBMReader::~XBMReader()
     delete[] pHexTable;
 
     if( pAcc1 )
-        aBmp1.ReleaseAccess( pAcc1 );
+        Bitmap::ReleaseAccess( pAcc1 );
 }
 
 void XBMReader::InitTable()
@@ -319,7 +319,7 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
         {
             Bitmap aBlackBmp( Size( pAcc1->Width(), pAcc1->Height() ), 1 );
 
-            aBmp1.ReleaseAccess( pAcc1 ), pAcc1 = NULL;
+            Bitmap::ReleaseAccess( pAcc1 ), pAcc1 = NULL;
             aBlackBmp.Erase( Color( COL_BLACK ) );
             rGraphic = BitmapEx( aBlackBmp, aBmp1 );
             eReadState = XBMREAD_OK;
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index fc378c2bd4c4..05d4d0f146bf 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -54,7 +54,7 @@ XPMReader::XPMReader(SvStream& rStm)
 XPMReader::~XPMReader()
 {
     if( mpAcc )
-        maBmp.ReleaseAccess( mpAcc );
+        Bitmap::ReleaseAccess( mpAcc );
 }
 
 ReadState XPMReader::ReadXPM( Graphic& rGraphic )
@@ -181,21 +181,21 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
         {
             if ( mpMaskAcc )
             {
-                maMaskBmp.ReleaseAccess ( mpMaskAcc), mpMaskAcc = NULL;
-                maBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
+                Bitmap::ReleaseAccess ( mpMaskAcc), mpMaskAcc = NULL;
+                Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL;
                 rGraphic = Graphic( BitmapEx( maBmp, maMaskBmp ) );
             }
             else
             {
-                maBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
+                Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL;
                 rGraphic = maBmp;
             }
             eReadState = XPMREAD_OK;
         }
         else
         {
-            if ( mpMaskAcc ) maMaskBmp.ReleaseAccess ( mpMaskAcc), mpMaskAcc = NULL;
-            if ( mpAcc ) maBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
+            if ( mpMaskAcc ) Bitmap::ReleaseAccess ( mpMaskAcc), mpMaskAcc = NULL;
+            if ( mpAcc ) Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL;
             eReadState = XPMREAD_ERROR;
         }
     }
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index 03c3ce918b30..5785224a7602 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -196,10 +196,10 @@ JPEGReader::~JPEGReader()
         delete[] mpBuffer;
 
     if( mpAcc )
-        maBmp.ReleaseAccess( mpAcc );
+        Bitmap::ReleaseAccess( mpAcc );
 
     if( mpAcc1 )
-        maBmp1.ReleaseAccess( mpAcc1 );
+        Bitmap::ReleaseAccess( mpAcc1 );
 }
 
 unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam )
@@ -217,7 +217,7 @@ unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam )
 
     if( mpAcc )
     {
-        maBmp.ReleaseAccess( mpAcc );
+        Bitmap::ReleaseAccess( mpAcc );
         maBmp = Bitmap();
         mpAcc = NULL;
     }
@@ -295,7 +295,7 @@ unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam )
     // clean up, if no Bitmap buffer can be provided.
     if ( !pBmpBuf )
     {
-        maBmp.ReleaseAccess( mpAcc );
+        Bitmap::ReleaseAccess( mpAcc );
         maBmp = Bitmap();
         mpAcc = NULL;
     }
@@ -388,7 +388,7 @@ Graphic JPEGReader::CreateIntermediateGraphic( const Bitmap& rBitmap, long nLine
     {
         if( mpAcc1 )
         {
-            maBmp1.ReleaseAccess( mpAcc1 );
+            Bitmap::ReleaseAccess( mpAcc1 );
         }
 
         maBmp1 = Bitmap( rBitmap.GetSizePixel(), 1 );
@@ -408,7 +408,7 @@ Graphic JPEGReader::CreateIntermediateGraphic( const Bitmap& rBitmap, long nLine
                 mpAcc1->FillRect( Rectangle( Point( 0, mnLastLines ), Size( mpAcc1->Width(), nNewLines ) ) );
             }
 
-            maBmp1.ReleaseAccess( mpAcc1 );
+            Bitmap::ReleaseAccess( mpAcc1 );
             aGraphic = BitmapEx( rBitmap, maBmp1 );
             mpAcc1 = maBmp1.AcquireWriteAccess();
         }
@@ -465,7 +465,7 @@ ReadState JPEGReader::Read( Graphic& rGraphic )
             mpBuffer = NULL;
         }
 
-        maBmp.ReleaseAccess( mpAcc );
+        Bitmap::ReleaseAccess( mpAcc );
         mpAcc = NULL;
 
         if( mrStream.GetError() == ERRCODE_IO_PENDING )
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 45fd8ceceb41..fe03540519a5 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -236,7 +236,7 @@ bool JPEGWriter::Write( const Graphic& rGraphic )
         delete[] mpBuffer;
         mpBuffer = NULL;
 
-        aGraphicBmp.ReleaseAccess( mpReadAccess );
+        Bitmap::ReleaseAccess( mpReadAccess );
         mpReadAccess = NULL;
     }
     if ( mxStatusIndicator.is() )
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 21f3516a1c88..c7d131586c92 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -667,7 +667,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
                             }
                         }
                     }
-                    aBmp.ReleaseAccess( pAcc );
+                    Bitmap::ReleaseAccess( pAcc );
                     if ( nSye && nSxe &&
                         ( ( nSx + nSxe ) <= aBmp.GetSizePixel().Width() ) &&
                             ( ( nSy + nSye <= aBmp.GetSizePixel().Height() ) ) )
@@ -759,7 +759,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
                 nCount = pBmp->Height() * pBmp->Width();
                 if ( !nCount )
                     nCount++;
-                aBmp.ReleaseAccess( pBmp );
+                Bitmap::ReleaseAccess( pBmp );
             }
             Color aColor( (sal_uInt8)( nRed / nCount ), (sal_uInt8)( nGreen / nCount ), (sal_uInt8)( nBlue / nCount ) );
             pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( aColor, false ) );
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 3df5896513ed..b5209f84fad3 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -280,7 +280,7 @@ bool Bitmap::HasGreyPalette() const
     if( pIAcc )
     {
         bRet = pIAcc->HasPalette() && pIAcc->GetPalette().IsGreyPalette();
-        const_cast<Bitmap*>(this)->ReleaseAccess( pIAcc );
+        ReleaseAccess( pIAcc );
     }
 
     return bRet;
@@ -334,7 +334,7 @@ sal_uLong Bitmap::GetChecksum() const
                 mpImpBmp->ImplSetChecksum( nRet = nCrc );
             }
 
-            if (pRAcc) const_cast<Bitmap*>(this)->ReleaseAccess( pRAcc );
+            if (pRAcc) ReleaseAccess( pRAcc );
         }
     }
 
@@ -702,7 +702,7 @@ bool Bitmap::Rotate( long nAngle10, const Color& rFillColor )
                                 pWriteAcc->SetPixel( nY, nX, pReadAcc->GetPixel( nOtherY--, nOtherX ) );
                     }
 
-                    Bitmap::ReleaseAccess( pWriteAcc );
+                    ReleaseAccess( pWriteAcc );
                 }
 
                 aRotatedBmp = aNewBmp;
@@ -772,7 +772,7 @@ bool Bitmap::Rotate( long nAngle10, const Color& rFillColor )
                         }
                     }
 
-                    Bitmap::ReleaseAccess( pWriteAcc );
+                    ReleaseAccess( pWriteAcc );
                 }
 
                 aRotatedBmp = aNewBmp;
@@ -818,7 +818,7 @@ bool Bitmap::Crop( const Rectangle& rRectPixel )
                     for( long nX = 0, nX2 = nOldX; nX < nNewWidth; nX++, nX2++ )
                         pWriteAcc->SetPixel( nY, nX, pReadAcc->GetPixel( nY2, nX2 ) );
 
-                Bitmap::ReleaseAccess( pWriteAcc );
+                ReleaseAccess( pWriteAcc );
                 bRet = true;
             }
 
@@ -899,7 +899,7 @@ bool Bitmap::CopyPixel( const Rectangle& rRectDst,
                     }
 
                     if( pSrcAcc )
-                        Bitmap::ReleaseAccess( pSrcAcc );
+                        ReleaseAccess( pSrcAcc );
 
                     if( pDstAcc )
                         ReleaseAccess( pDstAcc );
@@ -953,7 +953,7 @@ bool Bitmap::CopyPixel( const Rectangle& rRectDst,
                         bRet = ( nWidth > 0L ) && ( nHeight > 0L );
                     }
 
-                    Bitmap::ReleaseAccess( pReadAcc );
+                    ReleaseAccess( pReadAcc );
                 }
             }
         }
@@ -1060,7 +1060,7 @@ bool Bitmap::CopyPixel_AlphaOptimized( const Rectangle& rRectDst, const Rectangl
                         bRet = ( nWidth > 0L ) && ( nHeight > 0L );
                     }
 
-                    Bitmap::ReleaseAccess( pReadAcc );
+                    ReleaseAccess( pReadAcc );
                 }
             }
         }
@@ -1168,7 +1168,7 @@ bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor )
                         for( nX = 0; nX < nNewWidth; nX++ )
                             pWriteAcc->SetPixel( nY, nX, aColor );
 
-                Bitmap::ReleaseAccess( pWriteAcc );
+                ReleaseAccess( pWriteAcc );
                 bRet = true;
             }
 
@@ -1354,11 +1354,11 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const
                 }
             }
 
-            const_cast<Bitmap*>(this)->ReleaseAccess( pReadAcc );
+            ReleaseAccess( pReadAcc );
             bRet = true;
         }
 
-        aNewBmp.ReleaseAccess( pWriteAcc );
+        ReleaseAccess( pWriteAcc );
     }
 
     if( bRet )
@@ -1469,7 +1469,7 @@ vcl::Region Bitmap::CreateRegion( const Color& rColor, const Rectangle& rRect )
         //aRegion.ImplEndAddRect();
         //aRegion.SetRegionRectangles(aRectangles);
 
-        const_cast<Bitmap*>(this)->ReleaseAccess( pReadAcc );
+        ReleaseAccess( pReadAcc );
     }
     else
         aRegion = aRect;
@@ -1543,7 +1543,7 @@ bool Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor )
         bRet = true;
     }
 
-    Bitmap::ReleaseAccess( pMaskAcc );
+    ReleaseAccess( pMaskAcc );
     ReleaseAccess( pAcc );
 
     return bRet;
@@ -1576,8 +1576,8 @@ bool Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor )
     }
 
     ReleaseAccess( pAcc );
-    ( (AlphaMask&) rAlpha ).ReleaseAccess( pAlphaAcc );
-    Bitmap::ReleaseAccess( pNewAcc );
+    ReleaseAccess( pAlphaAcc );
+    ReleaseAccess( pNewAcc );
 
     if( bRet )
     {
@@ -1921,7 +1921,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
         bRet = true;
     }
 
-    Bitmap::ReleaseAccess( pMaskAcc );
+    ReleaseAccess( pMaskAcc );
     ReleaseAccess( pAcc );
 
     return bRet;
@@ -1954,7 +1954,7 @@ bool Bitmap::Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor )
         bRet = true;
     }
 
-    const_cast<AlphaMask&>(rAlpha).ReleaseAccess( pAlphaAcc );
+    ReleaseAccess( pAlphaAcc );
     ReleaseAccess( pAcc );
 
     return bRet;
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 60ed14d9f3ae..d3d6db4deca4 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -380,7 +380,7 @@ bool Bitmap::ImplMakeMono( sal_uInt8 cThreshold )
                 }
             }
 
-            aNewBmp.ReleaseAccess( pWriteAcc );
+            ReleaseAccess( pWriteAcc );
             bRet = true;
         }
 
@@ -455,7 +455,7 @@ bool Bitmap::ImplMakeMonoDither()
                 }
             }
 
-            aNewBmp.ReleaseAccess( pWriteAcc );
+            ReleaseAccess( pWriteAcc );
             bRet = true;
         }
 
@@ -561,7 +561,7 @@ bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys )
                             pWriteAcc->SetPixelIndex( nY, nX, (pReadAcc->GetPixel( nY, nX ) ).GetLuminance() >> nShift );
                 }
 
-                aNewBmp.ReleaseAccess( pWriteAcc );
+                ReleaseAccess( pWriteAcc );
                 bRet = true;
             }
 
@@ -816,7 +816,7 @@ bool Bitmap::ImplConvertGhosted()
             if( pW )
             {
                 pW->CopyBuffer( *pR );
-                aNewBmp.ReleaseAccess( pW );
+                ReleaseAccess( pW );
                 bRet = true;
             }
         }
@@ -842,7 +842,7 @@ bool Bitmap::ImplConvertGhosted()
                     }
                 }
 
-                aNewBmp.ReleaseAccess( pW );
+                ReleaseAccess( pW );
                 bRet = true;
             }
         }
@@ -1114,7 +1114,7 @@ bool Bitmap::ImplScaleFast( const double& rScaleX, const double& rScaleY )
                     }
 
                     bRet = true;
-                    aNewBmp.ReleaseAccess( pWriteAcc );
+                    ReleaseAccess( pWriteAcc );
                 }
             }
             ReleaseAccess( pReadAcc );
@@ -1220,7 +1220,7 @@ bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rScaleY
             }
 
             ReleaseAccess( pReadAcc );
-            aNewBmp.ReleaseAccess( pWriteAcc );
+            ReleaseAccess( pWriteAcc );
 
             if( bRet )
             {
@@ -1293,7 +1293,7 @@ bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rScaleY
                 }
 
                 ReleaseAccess( pReadAcc );
-                aNewBmp.ReleaseAccess( pWriteAcc );
+                ReleaseAccess( pWriteAcc );
 
                 if( bRet )
                 {
@@ -1440,10 +1440,10 @@ namespace
                     }
                 }
 
-                rTarget.ReleaseAccess(pWriteAcc);
+                Bitmap::ReleaseAccess(pWriteAcc);
             }
 
-            rSource.ReleaseAccess(pReadAcc);
+            Bitmap::ReleaseAccess(pReadAcc);
             delete[] pWeights;
             delete[] pCount;
             delete[] pPixels;
@@ -1539,8 +1539,8 @@ namespace
                 }
             }
 
-            rTarget.ReleaseAccess(pWriteAcc);
-            rSource.ReleaseAccess(pReadAcc);
+            Bitmap::ReleaseAccess(pWriteAcc);
+            Bitmap::ReleaseAccess(pReadAcc);
 
             delete[] pWeights;
             delete[] pCount;
@@ -1738,7 +1738,7 @@ bool Bitmap::ImplDitherMatrix()
     }
 
     ReleaseAccess( pReadAcc );
-    aNewBmp.ReleaseAccess( pWriteAcc );
+    ReleaseAccess( pWriteAcc );
 
     if( bRet )
     {
@@ -1873,7 +1873,7 @@ bool Bitmap::ImplDitherFloyd()
         }
 
         ReleaseAccess( pReadAcc );
-        aNewBmp.ReleaseAccess( pWriteAcc );
+        ReleaseAccess( pWriteAcc );
 
         if( bRet )
         {
@@ -1963,7 +1963,7 @@ bool Bitmap::ImplDitherFloyd16()
     }
 
     ReleaseAccess( pReadAcc );
-    aNewBmp.ReleaseAccess( pWriteAcc );
+    ReleaseAccess( pWriteAcc );
 
     if( bRet )
     {
@@ -2042,7 +2042,7 @@ bool Bitmap::ImplReduceSimple( sal_uInt16 nColorCount )
                         pWAcc->SetPixelIndex( nY, nX, static_cast<sal_uInt8>(aOct.GetBestPaletteIndex( pRAcc->GetPixel( nY, nX ) )) );
             }
 
-            aNewBmp.ReleaseAccess( pWAcc );
+            ReleaseAccess( pWAcc );
             bRet = true;
         }
 
@@ -2204,7 +2204,7 @@ bool Bitmap::ImplReducePopular( sal_uInt16 nColCount )
                 }
             }
 
-            aNewBmp.ReleaseAccess( pWAcc );
+            ReleaseAccess( pWAcc );
             bRet = true;
         }
 
@@ -2294,7 +2294,7 @@ bool Bitmap::ImplReduceMedian( sal_uInt16 nColCount )
                     pWAcc->SetPixelIndex( nY, nX, static_cast<sal_uInt8>( aMap.GetBestPaletteIndex( pRAcc->GetColor( nY, nX ) )) );
 
             rtl_freeMemory( pColBuf );
-            aNewBmp.ReleaseAccess( pWAcc );
+            ReleaseAccess( pWAcc );
             bRet = true;
         }
 
@@ -2648,7 +2648,7 @@ bool Bitmap::ImplConvolutionPass(Bitmap& aNewBitmap, BitmapReadAccess* pReadAcc,
             pWriteAcc->SetPixel(nDestY, nDestX, aResultColor);
         }
     }
-    aNewBitmap.ReleaseAccess( pWriteAcc );
+    ReleaseAccess( pWriteAcc );
     return true;
 }
 
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 7782bd473134..d75d6749143e 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -751,7 +751,7 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32 nY) const
                             nTransparency = 0x00;
                         }
 
-                        aTestBitmap.ReleaseAccess(pRead);
+                        Bitmap::ReleaseAccess(pRead);
                     }
                     break;
                 }
@@ -778,7 +778,7 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32 nY) const
                                 }
                             }
 
-                            aTestBitmap.ReleaseAccess(pRead);
+                            Bitmap::ReleaseAccess(pRead);
                         }
                     }
                     break;
@@ -1299,8 +1299,8 @@ BitmapEx createBlendFrame(
                 }
             }
 
-            aContent.ReleaseAccess(xContent);
-            aAlpha.ReleaseAccess(pAlpha);
+            Bitmap::ReleaseAccess(xContent);
+            Bitmap::ReleaseAccess(pAlpha);
 
             pBlendFrameCache->m_aLastResult = BitmapEx(aContent, aAlpha);
         }
@@ -1308,12 +1308,12 @@ BitmapEx createBlendFrame(
         {
             if(xContent)
             {
-                aContent.ReleaseAccess(xContent);
+                Bitmap::ReleaseAccess(xContent);
             }
 
             if(pAlpha)
             {
-                aAlpha.ReleaseAccess(pAlpha);
+                Bitmap::ReleaseAccess(pAlpha);
             }
         }
     }
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index d4f5447cce22..044b0962b760 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -830,11 +830,11 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, Bitmap* pBmpAlpha, sal_uLon
             }
 
             delete pMemStm;
-            aNewBmp.ReleaseAccess(pAcc);
+            Bitmap::ReleaseAccess(pAcc);
 
             if(bAlphaPossible)
             {
-                aNewBmpAlpha.ReleaseAccess(pAccAlpha);
+                Bitmap::ReleaseAccess(pAccAlpha);
 
                 if(!bAlphaUsed)
                 {
@@ -1515,11 +1515,11 @@ bool ImplWriteDIB(
                 bRet = ImplWriteDIBBody(rSource, rOStm, *pAcc, pAccAlpha, bCompressed);
             }
 
-            const_cast< Bitmap& >(rSource).ReleaseAccess(pAcc);
+            Bitmap::ReleaseAccess(pAcc);
 
             if(pAccAlpha)
             {
-                const_cast< Bitmap* >(pSourceAlpha)->ReleaseAccess(pAccAlpha);
+                Bitmap::ReleaseAccess(pAccAlpha);
             }
         }
 
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 00720878069d..184e5b192e85 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -274,7 +274,7 @@ void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev,
                             }
                         }
 
-                        aTmpBmp.ReleaseAccess( pAcc );
+                        Bitmap::ReleaseAccess( pAcc );
                     }
                 }
 
@@ -392,9 +392,9 @@ void ImplImageBmp::ImplUpdateDisabledBmpEx( int nPos )
         }
     }
 
-    aBmp.ReleaseAccess( pBmp );
+    Bitmap::ReleaseAccess( pBmp );
     aBmpAlphaMask.ReleaseAccess( pBmpAlphaMask );
-    aGrey.ReleaseAccess( pGrey );
+    Bitmap::ReleaseAccess( pGrey );
     aGreyAlphaMask.ReleaseAccess( pGreyAlphaMask );
 
     maDisabledBmpEx = BitmapEx( aGrey, aGreyAlphaMask );
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 024d53f154a7..d5435efdb58c 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -722,7 +722,7 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
         }
     }
 
-    xBmp->ReleaseAccess( pRAcc );
+    Bitmap::ReleaseAccess( pRAcc );
     xBmp.reset();
     VECT_PROGRESS( pProgress, 100 );
 
@@ -746,7 +746,7 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp,
 
     pRAcc = xBmp->AcquireReadAccess();
     std::unique_ptr <ImplVectMap> xMap(ImplExpand( pRAcc, COL_BLACK ));
-    xBmp->ReleaseAccess( pRAcc );
+    Bitmap::ReleaseAccess( pRAcc );
     xBmp.reset();
 
     VECT_PROGRESS( pProgress, 60 );
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 519a27851099..fe275146ee35 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -424,14 +424,14 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint )
 
     // release write access of the bitmaps
     if ( mpAcc )
-        mpBmp->ReleaseAccess( mpAcc ), mpAcc = NULL;
+        Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL;
 
     if ( mpMaskAcc )
     {
         if ( mpAlphaMask )
             mpAlphaMask->ReleaseAccess( mpMaskAcc );
         else if ( mpMaskBmp )
-            mpMaskBmp->ReleaseAccess( mpMaskAcc );
+            Bitmap::ReleaseAccess( mpMaskAcc );
 
         mpMaskAcc = NULL;
     }
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index 0b61f75eeb5e..d3ee25fbeff9 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -167,7 +167,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
                         ImplWriteTransparent();
                         ImplWriteIDAT();
                     }
-                    aBmp.ReleaseAccess(mpAccess);
+                    Bitmap::ReleaseAccess(mpAccess);
                     mpAccess = NULL;
                 }
                 else
@@ -210,7 +210,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
                                 ImplWritepHYs(rBmpEx);
                                 ImplWriteIDAT();
                             }
-                            aMask.ReleaseAccess(mpMaskAccess);
+                            Bitmap::ReleaseAccess(mpMaskAccess);
                             mpMaskAccess = NULL;
                         }
                         else
@@ -218,7 +218,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
                             mbStatus = false;
                         }
                     }
-                    aBmp.ReleaseAccess(mpAccess);
+                    Bitmap::ReleaseAccess(mpAccess);
                     mpAccess = NULL;
                 }
                 else
@@ -240,7 +240,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
 
                     ImplWriteIDAT();
                 }
-                aBmp.ReleaseAccess(mpAccess);
+                Bitmap::ReleaseAccess(mpAccess);
                 mpAccess = NULL;
             }
             else
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index c9339e3e31ad..76a471b45d99 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -225,7 +225,7 @@ void ImplConvertTransparentAction( GDIMetaFile&        o_rMtf,
             if( pRA->HasPalette() )
                 aActualColor = pRA->GetBestPaletteColor( aBgColor ).operator Color();
 
-            aBmp.ReleaseAccess(pRA);
+            Bitmap::ReleaseAccess(pRA);
 
             // did we get true white?
             if( aActualColor.GetColorError( aBgColor ) )
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 760f1899f511..e3381ab2722d 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -53,7 +53,7 @@ SalFrameGeometry SalFrame::GetGeometry()
 {
     // mirror frame coordinates at parent
     SalFrame *pParent = GetParent();
-    if( pParent && Application::GetSettings().GetLayoutRTL() )
+    if( pParent && AllSettings::GetLayoutRTL() )
     {
         SalFrameGeometry aGeom = maGeometry;
         int parent_x = aGeom.nX - pParent->maGeometry.nX;
@@ -69,7 +69,7 @@ SalGraphics::SalGraphics()
     m_bAntiAliasB2DDraw(false)
 {
     // read global RTL settings
-    if( Application::GetSettings().GetLayoutRTL() )
+    if( AllSettings::GetLayoutRTL() )
         m_nLayout = SAL_LAYOUT_BIDI_RTL;
 }
 
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 6cbfd523a5c6..ab3d48a6d9c5 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -424,9 +424,9 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
 VclCanvasBitmap::~VclCanvasBitmap()
 {
     if( m_pAlphaAcc )
-        m_aAlpha.ReleaseAccess(m_pAlphaAcc);
+        Bitmap::ReleaseAccess(m_pAlphaAcc);
     if( m_pBmpAcc )
-        m_aBitmap.ReleaseAccess(m_pBmpAcc);
+        Bitmap::ReleaseAccess(m_pBmpAcc);
 }
 
 // XBitmap
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index ffac35c35a04..35ef02d1498a 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1248,9 +1248,9 @@ namespace
             }
         }
 
-        const_cast<Bitmap&>(rBitmap).ReleaseAccess( pBmp );
-        aGrey.ReleaseAccess( pGrey );
-        aGreyAlphaMask.ReleaseAccess( pGreyAlphaMask );
+        Bitmap::ReleaseAccess( pBmp );
+        Bitmap::ReleaseAccess( pGrey );
+        Bitmap::ReleaseAccess( pGreyAlphaMask );
         return BitmapEx( aGrey, aGreyAlphaMask );
     }
 }
@@ -1427,8 +1427,8 @@ Bitmap OutputDevice::BlendBitmapWithAlpha(
             }
         }
 
-        aBmp.ReleaseAccess( pB );
-        aDither.ReleaseAccess( pW );
+        Bitmap::ReleaseAccess( pB );
+        Bitmap::ReleaseAccess( pW );
         res = aDither;
     }
     else
@@ -1451,11 +1451,11 @@ Bitmap OutputDevice::BlendBitmapWithAlpha(
             }
         }
 
-        aBmp.ReleaseAccess( pB );
+        Bitmap::ReleaseAccess( pB );
         res = aBmp;
     }
 
-    aAlphaBitmap.ReleaseAccess( pAlphaW );
+    Bitmap::ReleaseAccess( pAlphaW );
     mpAlphaVDev->DrawBitmap( aDstRect.TopLeft(), aAlphaBitmap );
     mpAlphaVDev->EnableMapMode( bOldMapMode );
 
@@ -1513,8 +1513,8 @@ Bitmap OutputDevice::BlendBitmap(
             }
         }
 
-        aBmp.ReleaseAccess( pB );
-        aDither.ReleaseAccess( pW );
+        Bitmap::ReleaseAccess( pB );
+        Bitmap::ReleaseAccess( pW );
         res = aDither;
     }
     else
@@ -1576,7 +1576,7 @@ Bitmap OutputDevice::BlendBitmap(
             }
         }
 
-        aBmp.ReleaseAccess( pB );
+        Bitmap::ReleaseAccess( pB );
         res = aBmp;
     }
 
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 0747b7b210e8..372eb23bc8f4 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -120,7 +120,7 @@ OutputDevice::OutputDevice() :
     mnDrawMode                      = 0;
     mnTextLayoutMode                = TEXT_LAYOUT_DEFAULT;
 
-    if( Application::GetSettings().GetLayoutRTL() ) //#i84553# tip BiDi preference to RTL
+    if( AllSettings::GetLayoutRTL() ) //#i84553# tip BiDi preference to RTL
         mnTextLayoutMode            = TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT;
 
     meOutDevType                    = OUTDEV_DONTKNOW;
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index c52cae5f858c..0bd7914bd125 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -2583,7 +2583,7 @@ bool OutputDevice::GetTextBoundRect( Rectangle& rRect,
         nRight = nX;
     }
 
-    aBmp.ReleaseAccess( pAcc );
+    Bitmap::ReleaseAccess( pAcc );
 
     if( nTop <= nBottom )
     {
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index c180114315f1..fce446688a73 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -568,8 +568,8 @@ void OutputDevice::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly,
                         }
                     }
 
-                    aPolyMask.ReleaseAccess( pR );
-                    aPaint.ReleaseAccess( pW );
+                    Bitmap::ReleaseAccess( pR );
+                    Bitmap::ReleaseAccess( pW );
 
                     DrawBitmap( aDstRect.TopLeft(), aPaint );
 
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index 7ccaa99f298c..dabfef79569e 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -51,7 +51,7 @@ vcl::Window* DNDEventDispatcher::findTopLevelWindow(Point location)
 
     // find the window that is toplevel for this coordinates
     // because those coordinates come from outside, they must be mirrored if RTL layout is active
-    if( Application::GetSettings().GetLayoutRTL() )
+    if( AllSettings::GetLayoutRTL() )
         m_pTopWindow->ImplMirrorFramePos( location );
     vcl::Window * pChildWindow = m_pTopWindow->ImplFindWindow( location );
 
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index f7089c162dda..13734851ab9b 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -221,7 +221,7 @@ Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow,
     Rectangle normRect( rRect );  // rRect is already relative to top-level window
     normRect.SetPos( pW->ScreenToOutputPixel( normRect.TopLeft() ) );
 
-    bool bRTL = Application::GetSettings().GetLayoutRTL();
+    bool bRTL = AllSettings::GetLayoutRTL();
 
     Rectangle devRect(  pW->OutputToAbsoluteScreenPixel( normRect.TopLeft() ),
                         pW->OutputToAbsoluteScreenPixel( normRect.BottomRight() ) );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8d7339fcb696..6fdb764bf2b5 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -905,7 +905,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
     }
 
     if( pParent && ! mpWindowImpl->mbFrame )
-        mbEnableRTL = Application::GetSettings().GetLayoutRTL();
+        mbEnableRTL = AllSettings::GetLayoutRTL();
 
     // test for frame creation
     if ( mpWindowImpl->mbFrame )
@@ -1192,7 +1192,7 @@ void Window::ImplInitWindowData( WindowType nType )
 
     meOutDevType        = OUTDEV_WINDOW;
 
-    mbEnableRTL         = Application::GetSettings().GetLayoutRTL();         // true: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
+    mbEnableRTL         = AllSettings::GetLayoutRTL();         // true: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
 }
 
 void Window::getFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, OutputDevice& rDev )
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index d3df6d03729d..890cb61a9452 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2536,7 +2536,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/,
             {
             SalPaintEvent const * pPaintEvt = static_cast<SalPaintEvent const *>(pEvent);
 
-            if( Application::GetSettings().GetLayoutRTL() )
+            if( AllSettings::GetLayoutRTL() )
             {
                 // --- RTL --- (mirror paint rect)
                 SalFrame* pSalFrame = pWindow->ImplGetWindowImpl()->mpFrame;
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 8a12fbb42562..4611f377ac48 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -569,7 +569,7 @@ struct less_ppd_key : public ::std::binary_function<double, double, bool>
     { return left->getOrderDependency() < right->getOrderDependency(); }
 };
 
-void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner, int& rNumOptions, void** rOptions ) const
+void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner, int& rNumOptions, void** rOptions )
 {
     rNumOptions = 0;
     *rOptions = NULL;
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 413d47c02a70..b39dd8e1d7b3 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -242,7 +242,7 @@ static void CreateNetWmAppIcon( sal_uInt16 nIcon, NetWmIconData& netwm_icon )
                 BitmapColor alpha = maskData->GetColor( y, x );
                 netwm_icon[ pos++ ] = (((( 255 - alpha.GetBlue()) * 256U ) + col.GetRed()) * 256 + col.GetGreen()) * 256 + col.GetBlue();
             }
-        icon.ReleaseAccess( iconData );
+        Bitmap::ReleaseAccess( iconData );
         mask.ReleaseAccess( maskData );
     }
     netwm_icon.resize( pos );
@@ -1902,7 +1902,7 @@ void X11SalFrame::SetPosSize( const Rectangle &rPosSize )
      if( mpParent && ! IsSysChildWindow() )
      {
         // --- RTL --- (mirror window pos)
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
             values.x = mpParent->maGeometry.nWidth-values.width-1-values.x;
 
          ::Window aChild;
@@ -2960,7 +2960,7 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
             nEvent = SALEVENT_WHEELMOUSE;
 
             // --- RTL --- (mirror mouse pos)
-            if( Application::GetSettings().GetLayoutRTL() )
+            if( AllSettings::GetLayoutRTL() )
                 aWheelEvt.mnX = nWidth_-1-aWheelEvt.mnX;
             return CallCallback( nEvent, &aWheelEvt );
         }
@@ -2974,7 +2974,7 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
         )
     {
         // --- RTL --- (mirror mouse pos)
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
             aMouseEvt.mnX = nWidth_-1-aMouseEvt.mnX;
         nRet = CallCallback( nEvent, &aMouseEvt );
     }
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index ab0ab95d9d0e..32a3de583d6e 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2518,7 +2518,7 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
             // Draw an edit field for SpinBoxes and ComboBoxes
             Rectangle aEditBoxRect( pixmapRect );
             aEditBoxRect.SetSize( Size( pixmapRect.GetWidth() - upBtnRect.GetWidth(), aEditBoxRect.GetHeight() ) );
-            if( Application::GetSettings().GetLayoutRTL() )
+            if( AllSettings::GetLayoutRTL() )
                 aEditBoxRect.setX( upBtnRect.GetWidth() );
             else
                 aEditBoxRect.setX( 0 );
@@ -2567,7 +2567,7 @@ static Rectangle NWGetSpinButtonRect( SalX11Screen nScreen,
     buttonSize -= buttonSize % 2 - 1; /* force odd */
     buttonRect.SetSize( Size( buttonSize + 2 * gWidgetData[nScreen].gSpinButtonWidget->style->xthickness,
                               buttonRect.GetHeight() ) );
-    if( Application::GetSettings().GetLayoutRTL() )
+    if( AllSettings::GetLayoutRTL() )
         buttonRect.setX( aAreaRect.Left() );
     else
         buttonRect.setX( aAreaRect.Left() + (aAreaRect.GetWidth() - buttonRect.GetWidth()) );
@@ -2583,7 +2583,7 @@ static Rectangle NWGetSpinButtonRect( SalX11Screen nScreen,
     }
     else
     {
-        if( Application::GetSettings().GetLayoutRTL() ) {
+        if( AllSettings::GetLayoutRTL() ) {
             buttonRect.Left()   = buttonRect.Right()+1;
             buttonRect.Right()  = aAreaRect.Right();
         } else {
@@ -2675,7 +2675,7 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
 
     Rectangle        aEditBoxRect( pixmapRect );
     aEditBoxRect.SetSize( Size( pixmapRect.GetWidth() - buttonRect.GetWidth(), aEditBoxRect.GetHeight() ) );
-    if( Application::GetSettings().GetLayoutRTL() )
+    if( AllSettings::GetLayoutRTL() )
         aEditBoxRect.SetPos( Point( x + buttonRect.GetWidth() , y ) );
 
     #define ARROW_EXTENT        0.7
@@ -2744,7 +2744,7 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen,
     if( nPart == PART_BUTTON_DOWN )
     {
         aButtonRect.SetSize( Size( nButtonWidth, aAreaRect.GetHeight() ) );
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
             aButtonRect.SetPos( Point( aAreaRect.Left(), aAreaRect.Top() ) );
         else
             aButtonRect.SetPos( Point( aAreaRect.Left() + aAreaRect.GetWidth() - nButtonWidth,
@@ -2764,7 +2764,7 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen,
         Point aEditPos = aAreaRect.TopLeft();
         aEditPos.X() += adjust_x;
         aEditPos.Y() += adjust_y;
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
             aEditPos.X() += nButtonWidth;
         aButtonRect.SetPos( aEditPos );
     }
@@ -3404,7 +3404,7 @@ bool GtkSalGraphics::NWPaintGTKPopupMenu(
                               nState, nStateType );
 
             GtkArrowType eArrow;
-            if( Application::GetSettings().GetLayoutRTL() )
+            if( AllSettings::GetLayoutRTL() )
                 eArrow = GTK_ARROW_LEFT;
             else
                 eArrow = GTK_ARROW_RIGHT;
@@ -3548,7 +3548,7 @@ bool GtkSalGraphics::NWPaintGTKProgress(
         if( nProgressWidth > 0 )
         {
             // paint progress
-            if( Application::GetSettings().GetLayoutRTL() )
+            if( AllSettings::GetLayoutRTL() )
             {
                 gtk_paint_box( gWidgetData[m_nXScreen].gProgressBar->style,
                                pixDrawable,
@@ -3708,7 +3708,7 @@ static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen,
 
         case PART_SUB_EDIT:
             aPartSize.Width() = aAreaRect.GetWidth() - nButtonAreaWidth - xthickness;
-            if( Application::GetSettings().GetLayoutRTL() )
+            if( AllSettings::GetLayoutRTL() )
                 aPartPos.X() = aAreaRect.Left() + nButtonAreaWidth;
             else
                 aPartPos.X() = aAreaRect.Left() + xthickness;
@@ -3761,7 +3761,7 @@ static Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen,
         right = pIndicatorSpacing->right;
 
     aIndicatorRect.SetSize( Size( width, height ) );
-    if( Application::GetSettings().GetLayoutRTL() )
+    if( AllSettings::GetLayoutRTL() )
         x = aAreaRect.Left() + right;
     else
         x = aAreaRect.Left() + aAreaRect.GetWidth() - width - right - gWidgetData[nScreen].gOptionMenuWidget->style->xthickness;
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index acf170f2da09..78d561554831 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2051,7 +2051,7 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u
     {
         if( m_pParent )
         {
-            if( Application::GetSettings().GetLayoutRTL() )
+            if( AllSettings::GetLayoutRTL() )
                 nX = m_pParent->maGeometry.nWidth-maGeometry.nWidth-1-nX;
             nX += m_pParent->maGeometry.nX;
             nY += m_pParent->maGeometry.nY;
@@ -3272,7 +3272,7 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
     }
 
     // --- RTL --- (mirror mouse pos)
-    if( Application::GetSettings().GetLayoutRTL() )
+    if( AllSettings::GetLayoutRTL() )
         aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
 
     vcl::DeletionListener aDel( pThis );
@@ -3340,7 +3340,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
     aEvent.mbHorz           = (pSEvent->direction == GDK_SCROLL_LEFT || pSEvent->direction == GDK_SCROLL_RIGHT);
 
     // --- RTL --- (mirror mouse pos)
-    if( Application::GetSettings().GetLayoutRTL() )
+    if( AllSettings::GetLayoutRTL() )
         aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
 
     pThis->CallCallback( SALEVENT_WHEELMOUSE, &aEvent );
@@ -3398,7 +3398,7 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer
     aEvent.mnButton = 0;
 
     // --- RTL --- (mirror mouse pos)
-    if( Application::GetSettings().GetLayoutRTL() )
+    if( AllSettings::GetLayoutRTL() )
         aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
 
     vcl::DeletionListener aDel( pThis );
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index aedbf8987e56..e7b8899e595a 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -1005,7 +1005,7 @@ bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         long nProgressWidth = aValue.getNumericVal();
         nProgressWidth *= (aProgressRect.right - aProgressRect.left);
         nProgressWidth /= (rc.right - rc.left);
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
             aProgressRect.left = aProgressRect.right - nProgressWidth;
         else
             aProgressRect.right = aProgressRect.left + nProgressWidth;
@@ -1074,7 +1074,7 @@ bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
             if( nPart == PART_ENTIRE_CONTROL )
             {
                 RECT aGutterRC = rc;
-                if( Application::GetSettings().GetLayoutRTL() )
+                if( AllSettings::GetLayoutRTL() )
                 {
                     aGutterRC.right -= aValue.getNumericVal()+1;
                     aGutterRC.left = aGutterRC.right-3;
@@ -1107,7 +1107,7 @@ bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
                         const MenupopupValue& rMVal( static_cast<const MenupopupValue&>(aValue) );
                         aBGRect.top    = rMVal.maItemRect.Top();
                         aBGRect.bottom = rMVal.maItemRect.Bottom()+1; // see below in drawNativeControl
-                        if( Application::GetSettings().GetLayoutRTL() )
+                        if( AllSettings::GetLayoutRTL() )
                         {
                             aBGRect.right = rMVal.maItemRect.Right()+1;
                             aBGRect.left = aBGRect.right - (rMVal.getNumericVal()-rMVal.maItemRect.Left());
@@ -1133,7 +1133,7 @@ bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
             else if( nPart == PART_MENU_SEPARATOR )
             {
                 // adjust for gutter position
-                if( Application::GetSettings().GetLayoutRTL() )
+                if( AllSettings::GetLayoutRTL() )
                     rc.right -= aValue.getNumericVal()+1;
                 else
                     rc.left += aValue.getNumericVal()+1;
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 1544b2f11c82..47a72052f417 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1286,7 +1286,7 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
             // --- RTL --- (mirror window pos)
             RECT aParentRect;
             GetClientRect( ImplGetParentHwnd( mhWnd ), &aParentRect );
-            if( Application::GetSettings().GetLayoutRTL() )
+            if( AllSettings::GetLayoutRTL() )
                 nX = (aParentRect.right - aParentRect.left) - nWidth-1 - nX;
 
             //#110386#, do not transform coordinates for system child windows
@@ -3173,7 +3173,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
             UpdateWindow( hWnd );
 
         // --- RTL --- (mirror mouse pos)
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
             aMouseEvt.mnX = pFrame->maGeometry.nWidth-1-aMouseEvt.mnX;
 
         nRet = pFrame->CallCallback( nEvent, &aMouseEvt );
@@ -3263,7 +3263,7 @@ static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar
             aWheelEvt.mnCode |= KEY_MOD2;
 
         // --- RTL --- (mirror mouse pos)
-        if( Application::GetSettings().GetLayoutRTL() )
+        if( AllSettings::GetLayoutRTL() )
             aWheelEvt.mnX = pFrame->maGeometry.nWidth-1-aWheelEvt.mnX;
 
         nRet = pFrame->CallCallback( SALEVENT_WHEELMOUSE, &aWheelEvt );
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 1c3d285ee76b..ebf716c3abd1 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -119,7 +119,7 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :
             pAcc->SetPixel( nY, nX, BitmapColor( sal_uInt8(fRed), sal_uInt8(fGreen), sal_uInt8(fBlue) ) );
         }
     }
-    m_aBitmap.ReleaseAccess( pAcc );
+    Bitmap::ReleaseAccess( pAcc );
 }
 
 void MyWin::MouseMove( const MouseEvent& rMEvt )