loplugin:constantfunction: vcl

Change-Id: I985b781a8d53190505fcb1182749cdaf5cd0f8d0

45 files changed, 40 insertions, 419 deletions

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index b9c4d9429671..c79c883a4890 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -894,13 +894,7 @@ sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar )
         GlyphSubstitution::const_iterator it = maGlyphSubstitution.find( aGlyphId );
         if( it == maGlyphSubstitution.end() )
         {
-            sal_GlyphId nTemp = GetVerticalChar( aChar );
-            if( nTemp ) // is substitution possible
-                nTemp = GetRawGlyphIndex( nTemp );
-            if( nTemp ) // substitute manually if sensible
-                aGlyphId = nTemp | (GF_GSUB | GF_ROTL);
-            else
-                nGlyphFlags |= GetVerticalFlags( aChar );
+            nGlyphFlags |= GetVerticalFlags( aChar );
         }
         else
         {
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index f9da8c92b628..7cfeeade1273 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -668,8 +668,6 @@ PrinterJob::StartPage (const JobData& rJobSetup)
 bool
 PrinterJob::EndPage ()
 {
-    m_pGraphics->OnEndPage();
-
     osl::File* pPageHeader = maHeaderList.back();
     osl::File* pPageBody   = maPageList.back();
 
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index a2e5255a64fe..ed598b6cb19b 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -118,8 +118,6 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
     {
         if (sPage == "paper")
             m_pPaperPage->update();
-        else if (sPage == "device")
-            m_pDevicePage->update();
     }
 
     return 0;
@@ -359,10 +357,6 @@ RTSDevicePage::~RTSDevicePage()
 {
 }
 
-void RTSDevicePage::update()
-{
-}
-
 sal_uLong RTSDevicePage::getDepth()
 {
     sal_uInt16 nSelectPos = m_pDepthBox->GetSelectEntryPos();
diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx
index 08fb22d9309e..6d641bedadf9 100644
--- a/vcl/generic/print/prtsetup.hxx
+++ b/vcl/generic/print/prtsetup.hxx
@@ -114,8 +114,6 @@ public:
     RTSDevicePage( RTSDialog* );
     virtual ~RTSDevicePage();
 
-    void update();
-
     sal_uLong getLevel();
     sal_uLong getPDFDevice();
     sal_uLong getDepth();
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index eeaa02925153..dec130475a41 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -662,11 +662,6 @@ PrinterGfx::GetCharWidth (sal_Unicode nFrom, sal_Unicode nTo, long *pWidthArray)
  */
 
 void
-PrinterGfx::OnEndPage ()
-{
-}
-
-void
 PrinterGfx::OnEndJob ()
 {
     maPS3Font.clear();
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 7e91e1dcf49f..8e56c82f97ac 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -42,13 +42,8 @@ namespace {
     /// Decouple SalFrame lifetime from damagetracker lifetime
     struct DamageTracker : public basebmp::IBitmapDeviceDamageTracker
     {
-        DamageTracker( SvpSalFrame& rFrame ) : m_rFrame( rFrame ) {}
         virtual ~DamageTracker() {}
-        virtual void damaged( const basegfx::B2IBox& rDamageRect ) const SAL_OVERRIDE
-        {
-            m_rFrame.damaged( rDamageRect );
-        }
-        SvpSalFrame& m_rFrame;
+        virtual void damaged( const basegfx::B2IBox& ) const SAL_OVERRIDE {}
     };
 }
 
@@ -62,7 +57,7 @@ void SvpSalFrame::enableDamageTracker( bool bOn )
             m_aFrame->setDamageTracker( basebmp::IBitmapDeviceDamageTrackerSharedPtr() );
         else
             m_aFrame->setDamageTracker(
-                basebmp::IBitmapDeviceDamageTrackerSharedPtr( new DamageTracker( *this ) ) );
+                basebmp::IBitmapDeviceDamageTrackerSharedPtr( new DamageTracker ) );
     }
     m_bDamageTracking = bOn;
 }
@@ -299,7 +294,7 @@ void SvpSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u
         m_aFrame = createBitmapDevice( aFrameSize, m_bTopDown, m_nScanlineFormat, nStride );
         if (m_bDamageTracking)
             m_aFrame->setDamageTracker(
-                basebmp::IBitmapDeviceDamageTrackerSharedPtr( new DamageTracker( *this ) ) );
+                basebmp::IBitmapDeviceDamageTrackerSharedPtr( new DamageTracker ) );
         // update device in existing graphics
         for( std::list< SvpSalGraphics* >::iterator it = m_aGraphics.begin();
              it != m_aGraphics.end(); ++it )
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index aa7f87ce4876..93de736cbccb 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -298,7 +298,6 @@ public:
     void            LicenseWarning (const Point& rPoint, const sal_Unicode* pStr,
                                     sal_Int16 nLen, const sal_Int32* pDeltaArray);
 
-    void            OnEndPage ();
     void            OnEndJob ();
     void            writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts );
     PrintFontManager& GetFontMgr () { return mrFontMgr; }
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 416a257423a6..7bbf73ab1cc0 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -128,8 +128,7 @@ public:
 
 #ifndef IOS
     // If enabled we can get damage notifications for regions immediately rendered to ...
-    void                enableDamageTracker( bool bOn = true );
-    void                damaged( const basegfx::B2IBox& /* rDamageRect */) {}
+    void                        enableDamageTracker( bool bOn = true );
 #endif
 
     /*TODO: functional implementation */
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index ab6adbbdce55..fef1da807543 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -136,8 +136,6 @@ namespace vcl
 
             NUpTabPage( VclBuilder* );
 
-            void readFromSettings();
-            void storeToSettings();
             void initFromMultiPageSetup( const vcl::PrinterController::MultiPageSetup& );
             void enableNupControls( bool bEnable );
 
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 698263a55d31..943f8eb6bf5b 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -118,7 +118,6 @@ std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs);
 // helper functions often used with ImplLayoutArgs
 bool IsDiacritic( sal_UCS4 );
 int GetVerticalFlags( sal_UCS4 );
-sal_UCS4 GetVerticalChar( sal_UCS4 );
 
 // all positions/widths are in font units
 // one exception: drawposition is in pixel units
@@ -175,7 +174,7 @@ public:
     virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const = 0;
     virtual DeviceCoordinate GetTextWidth() const { return FillDXArray( NULL ); }
     virtual void    GetCaretPositions( int nArraySize, long* pCaretXArray ) const = 0;
-    bool            IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594
+    virtual bool    IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594
 
     // methods using glyph indexing
     virtual int     GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdAry, Point& rPos, int&,
@@ -193,7 +192,7 @@ public:
     virtual void    MoveGlyph( int nStart, long nNewXPos ) = 0;
     virtual void    DropGlyph( int nStart ) = 0;
     virtual void    Simplify( bool bIsBase ) = 0;
-    void            DisableGlyphInjection( bool /*bDisable*/ ) {}
+    virtual void    DisableGlyphInjection( bool /*bDisable*/ ) {}
 
 protected:
     // used by layout engines
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index b7127194b0bc..56225ccf1fec 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -155,7 +155,6 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
         void            createIMContext();
         void            deleteIMContext();
         void            updateIMSpotLocation();
-        void            setInputContext( SalInputContext* pContext );
         void            endExtTextInput( sal_uInt16 nFlags );
         bool            handleKeyEvent( GdkEventKey* pEvent );
         void            focusChanged( bool bFocusIn );
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 5426eee77919..5204143b6be8 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -53,7 +53,7 @@ public:
     virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
     virtual void                    Show( bool bVisible ) SAL_OVERRIDE;
 
-    virtual void                                    SetForwardKey( bool bEnable ) SAL_OVERRIDE;
+    virtual void                    SetForwardKey( bool bEnable ) SAL_OVERRIDE;
 
     virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
 };
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 517f1bbe7244..2703a0506364 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -73,8 +73,6 @@ public:
     void Map( SalFrame *pFrame );
     void Unmap( SalFrame* pFrame );
 
-    void SetLanguage(LanguageType aInputLanguage);
-
     SalI18N_InputContext( SalFrame *aFrame );
     ~SalI18N_InputContext();
 
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 4bb50d0ad473..ee0ff3419bb8 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -89,10 +89,6 @@ public:
 
     // External Control:
 
-    /** Return true if the status window can be toggled on and off externally.
-     */
-    bool canToggleStatusWindow() const;
-
     /** Toggle the status window on or off.
 
         This only works if canToggleStatusWindow returns true (otherwise, any
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index aa635650186a..f4e1fea16b56 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -47,20 +47,6 @@ class   ColorMask;
 
 namespace vcl_sal { class WMAdaptor; }
 
-#define PROPERTY_SUPPORT_WM_Parent_Pixmap_None  0x00000004
-#define PROPERTY_SUPPORT_WM_ClientPos           0x00000008
-#define PROPERTY_SUPPORT_3ButtonMouse           0x00000020
-
-#define PROPERTY_BUG_XCopyArea_GXxor            0x00002000  // from window
-#define PROPERTY_BUG_Tile                       0x00008000  // Recreate the
-                                            // dither brush each time
-#define PROPERTY_BUG_FillPolygon_Tile           0x00010000  // always Toggle Fillstyle
-#define PROPERTY_BUG_DrawLine                   0x00020000  // a DrawLine is one point to short
-
-#define PROPERTY_FEATURE_TrustedSolaris         0x04000000
-
-#define PROPERTY_DEFAULT                        0x00000FCB
-
 // server vendor
 
 typedef enum  {
@@ -350,7 +336,6 @@ public:
     const SalVisual&      GetVisual( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aVisual; }
     RenderEntryMap&       GetRenderEntries( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aRenderData; }
     const Pair     &GetResolution() const { return aResolution_; }
-    sal_uLong       GetProperties() const { return PROPERTY_DEFAULT; }
     sal_uLong       GetMaxRequestSize() const { return nMaxRequestSize_; }
     Time            GetLastUserEventTime( bool bAlwaysReget = false ) const;
 
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index af89ba8fc1f3..f0132e66ffe9 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -146,7 +146,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public X11WindowProvider
     long            HandleFocusEvent    ( XFocusChangeEvent *pEvent );
     long            HandleExposeEvent   ( XEvent            *pEvent );
     long            HandleSizeEvent     ( XConfigureEvent   *pEvent );
-    long            HandleColormapEvent ( XColormapEvent    *pEvent );
     long            HandleMapUnmapEvent ( XEvent            *pEvent );
     long            HandleStateEvent    ( XPropertyEvent    *pEvent );
     long            HandleReparentEvent ( XReparentEvent    *pEvent );
diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx
index 2e690c75ac7f..bba7452ca2ee 100644
--- a/vcl/source/app/dndhelp.cxx
+++ b/vcl/source/app/dndhelp.cxx
@@ -37,30 +37,6 @@ void vcl::unohelper::DragAndDropClient::dragDropEnd( const ::com::sun::star::dat
 {
 }
 
-void vcl::unohelper::DragAndDropClient::dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& /*dsde*/ )
-    throw (::com::sun::star::uno::RuntimeException,
-           std::exception)
-{
-}
-
-void vcl::unohelper::DragAndDropClient::dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& /*dse*/ )
-    throw (::com::sun::star::uno::RuntimeException,
-           std::exception)
-{
-}
-
-void vcl::unohelper::DragAndDropClient::dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& /*dsde*/ )
-    throw (::com::sun::star::uno::RuntimeException,
-           std::exception)
-{
-}
-
-void vcl::unohelper::DragAndDropClient::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& /*dsde*/ )
-    throw (::com::sun::star::uno::RuntimeException,
-           std::exception)
-{
-}
-
 void vcl::unohelper::DragAndDropClient::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& /*dtde*/ )
     throw (::com::sun::star::uno::RuntimeException,
            std::exception)
@@ -85,12 +61,6 @@ void vcl::unohelper::DragAndDropClient::dragOver( const ::com::sun::star::datatr
 {
 }
 
-void vcl::unohelper::DragAndDropClient::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& /*dtde*/ )
-    throw (::com::sun::star::uno::RuntimeException,
-           std::exception)
-{
-}
-
 vcl::unohelper::DragAndDropWrapper::DragAndDropWrapper( DragAndDropClient* pClient )
 {
     mpClient = pClient;
@@ -133,28 +103,20 @@ void vcl::unohelper::DragAndDropWrapper::dragDropEnd( const ::com::sun::star::da
         mpClient->dragDropEnd( rDSDE );
 }
 
-void vcl::unohelper::DragAndDropWrapper::dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    if ( mpClient )
-        mpClient->dragEnter( dsde );
 }
 
-void vcl::unohelper::DragAndDropWrapper::dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    if ( mpClient )
-        mpClient->dragExit( dse );
 }
 
-void vcl::unohelper::DragAndDropWrapper::dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    if ( mpClient )
-        mpClient->dragOver( dsde );
 }
 
-void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    if ( mpClient )
-        mpClient->dropActionChanged( dsde );
 }
 
 // ::com::sun::star::datatransfer::dnd::XDropTargetListener
@@ -182,10 +144,8 @@ void vcl::unohelper::DragAndDropWrapper::dragOver( const ::com::sun::star::datat
         mpClient->dragOver( rDTDE );
 }
 
-void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    if ( mpClient )
-        mpClient->dropActionChanged( rDTDE );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index bc6f1319c6d1..2906819d0306 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2772,11 +2772,6 @@ void AllSettings::SetLanguageTag( const LanguageTag& rLanguageTag )
     }
 }
 
-void AllSettings::SetUILanguageTag( const LanguageTag& )
-{
-    // there is only one UILocale per process
-}
-
 namespace
 {
     bool GetConfigLayoutRTL(bool bMath)
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index ec9b9a0bd3ed..83a248a8605d 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -907,16 +907,9 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawF
         }
     }
 
-    UserDrawEvent aUDEvt( this, aInRect, 0 );
-    UserDraw( aUDEvt );
-
     pDev->Pop();  // restore clipregion
 }
 
-void PushButton::UserDraw( const UserDrawEvent& )
-{
-}
-
 void PushButton::ImplDrawPushButton( bool bLayout )
 {
     if( !bLayout )
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 0f1bb2a7911d..f8e36dad4a6f 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -942,11 +942,6 @@ void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
             pDev->DrawImage( aPos, *pImage, nStyle );
         }
     }
-
-    mbInUserDraw = true;
-    UserDrawEvent aUDEvt( pDev, Rectangle( rPos, rSize ), 0, nStyle );
-    UserDraw( aUDEvt );
-    mbInUserDraw = false;
 }
 
 void FixedImage::Paint( const Rectangle& )
@@ -959,10 +954,6 @@ Size FixedImage::GetOptimalSize() const
     return maImage.GetSizePixel();
 }
 
-void FixedImage::UserDraw( const UserDrawEvent& )
-{
-}
-
 void FixedImage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                        sal_uLong nFlags )
 {
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 1897b676e4c1..644ee1ce30a5 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -1280,10 +1280,6 @@ sal_uLong TextEngine::CalcParaHeight( sal_uLong nParagraph ) const
     return nHeight;
 }
 
-void TextEngine::UpdateSelections()
-{
-}
-
 Range TextEngine::GetInvalidYOffsets( sal_uLong nPortion )
 {
     TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPortion );
diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index 2ecd26495965..1ba423a45e50 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -119,8 +119,6 @@ void TextUndoManager::UndoRedoEnd()
         GetView()->ImpSetSelection( aNewSel );
     }
 
-    mpTextEngine->UpdateSelections();
-
     mpTextEngine->FormatAndUpdate( GetView() );
 }
 
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 5fc04a71313a..030365f4ddbb 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -780,8 +780,6 @@ bool TextView::KeyInput( const KeyEvent& rKeyEvent )
     if ( aCurSel != aOldSel )   // Check if changed, maybe other method already changed mpImpl->maSelection, don't overwrite that!
         ImpSetSelection( aCurSel );
 
-    mpImpl->mpTextEngine->UpdateSelections();
-
     if ( ( nCode != KEY_UP ) && ( nCode != KEY_DOWN ) )
         mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW;
 
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index 7f00f4e12e29..800b3d7ba393 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -90,7 +90,6 @@ private:
     void                ImplWriteChunk( sal_uInt8 nNumb );
     void                ImplWriteChunk( sal_uInt32 nNumb );
     void                ImplWriteChunk( unsigned char* pSource, sal_uInt32 nDatSize );
-    void                ImplCloseChunk( void ) const;
 };
 
 PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
@@ -233,7 +232,6 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
         if ( mbStatus )
         {
             ImplOpenChunk( PNGCHUNK_IEND );     // create an IEND chunk
-            ImplCloseChunk();
         }
     }
 }
@@ -299,7 +297,6 @@ bool PNGWriterImpl::ImplWriteHeader()
         ImplWriteChunk((sal_uInt8) 0 );             // compression type
         ImplWriteChunk((sal_uInt8) 0 );             // filter type - is not supported in this version
         ImplWriteChunk((sal_uInt8) mnInterlaced );  // interlace type
-        ImplCloseChunk();
     }
     else
         mbStatus = false;
@@ -322,7 +319,6 @@ void PNGWriterImpl::ImplWritePalette()
         *pTmp++ = rColor.GetBlue();
     }
     ImplWriteChunk( pTempBuf.get(), nCount*3 );
-    ImplCloseChunk();
 }
 
 void PNGWriterImpl::ImplWriteTransparent ()
@@ -333,8 +329,6 @@ void PNGWriterImpl::ImplWriteTransparent ()
 
     for ( sal_uLong n = 0UL; n <= nTransIndex; n++ )
         ImplWriteChunk( ( nTransIndex == n ) ? (sal_uInt8) 0x0 : (sal_uInt8) 0xff );
-
-    ImplCloseChunk();
 }
 
 void PNGWriterImpl::ImplWritepHYs( const BitmapEx& rBmpEx )
@@ -351,7 +345,6 @@ void PNGWriterImpl::ImplWritepHYs( const BitmapEx& rBmpEx )
             ImplWriteChunk( nPrefSizeX );
             ImplWriteChunk( nPrefSizeY );
             ImplWriteChunk( nMapUnit );
-            ImplCloseChunk();
         }
     }
 }
@@ -440,7 +433,6 @@ void PNGWriterImpl::ImplWriteIDAT ()
         nBytes = nBytesToWrite <= mnMaxChunkSize ? nBytesToWrite : mnMaxChunkSize;
         ImplOpenChunk( PNGCHUNK_IDAT );
         ImplWriteChunk( (unsigned char*)aOStm.GetData() + ( nIDATSize - nBytesToWrite ), nBytes );
-        ImplCloseChunk();
         nBytesToWrite -= nBytes;
     }
 }
@@ -642,11 +634,6 @@ void PNGWriterImpl::ImplWriteChunk ( unsigned char* pSource, sal_uInt32 nDatSize
     }
 }
 
-// nothing to do
-void PNGWriterImpl::ImplCloseChunk ( void ) const
-{
-}
-
 PNGWriter::PNGWriter( const BitmapEx& rBmpEx,
     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) :
     mpImpl( new ::vcl::PNGWriterImpl( rBmpEx, pFilterData ) )
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 27bb7e17a56e..fbaeb22a468a 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -214,11 +214,6 @@ int GetVerticalFlags( sal_UCS4 nChar )
     return GF_NONE; // not rotated as default
 }
 
-sal_UCS4 GetVerticalChar( sal_UCS4 )
-{
-    return 0; // #i14788# input method is responsible vertical char changes
-}
-
 sal_UCS4 GetMirroredChar( sal_UCS4 nChar )
 {
     nChar = u_charMirror( nChar );
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index 7720519667b1..a1c19e779fda 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -57,10 +57,6 @@ vcl::Window *DebugEventInjector::ChooseWindow()
     return aChildren[ aChildren.size() * getRandom() ];
 }
 
-void DebugEventInjector::InjectMouseEvent()
-{
-}
-
 typedef std::vector< SalMenuEvent > MenuItemIds;
 
 static void CollectMenuItemIds( Menu *pMenu, MenuItemIds &rIds )
@@ -193,8 +189,6 @@ void DebugEventInjector::InjectEvent()
         InjectKeyNavEdit();
     else if (nRand < 0.95)
         InjectMenuEvent();
-    else
-        InjectMouseEvent();
 }
 
 void DebugEventInjector::InjectKeyNavEdit()
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index cf7f4dfb2c6e..a389216fb914 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -263,19 +263,16 @@ void ImplDockFloatWin2::TitleButtonClick( sal_uInt16 nButton )
 void ImplDockFloatWin2::Pin()
 {
     FloatingWindow::Pin();
-    mpDockWin->Pin();
 }
 
 void ImplDockFloatWin2::Roll()
 {
     FloatingWindow::Roll();
-    mpDockWin->Roll();
 }
 
 void ImplDockFloatWin2::PopupModeEnd()
 {
     FloatingWindow::PopupModeEnd();
-    mpDockWin->PopupModeEnd();
 }
 
 void ImplDockFloatWin2::Resizing( Size& rSize )
@@ -286,7 +283,7 @@ void ImplDockFloatWin2::Resizing( Size& rSize )
 
 bool ImplDockFloatWin2::Close()
 {
-    return mpDockWin->Close();
+    return true;
 }
 
 DockingManager::DockingManager()
@@ -1038,12 +1035,6 @@ bool ImplDockingWindowWrapper::PrepareToggleFloatingMode()
     return bFloating;
 }
 
-bool ImplDockingWindowWrapper::Close()
-{
-    // TODO: send event
-    return true;
-}
-
 void ImplDockingWindowWrapper::ToggleFloatingMode()
 {
     // notify dockingwindow/toolbox
@@ -1075,21 +1066,6 @@ void ImplDockingWindowWrapper::TitleButtonClick( sal_uInt16 nType )
     }
 }
 
-void ImplDockingWindowWrapper::Pin()
-{
-    // TODO: send event
-}
-
-void ImplDockingWindowWrapper::Roll()
-{
-    // TODO: send event
-}
-
-void ImplDockingWindowWrapper::PopupModeEnd()
-{
-    // TODO: send event
-}
-
 void ImplDockingWindowWrapper::Resizing( Size& rSize )
 {
     // TODO: add virtual Resizing() to class Window, so we can get rid of class DockingWindow
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 0d08d274a10c..5a0df3cbaa46 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -213,25 +213,21 @@ void ImplDockFloatWin::Resize()
 void ImplDockFloatWin::TitleButtonClick( sal_uInt16 nButton )
 {
     FloatingWindow::TitleButtonClick( nButton );
-    mpDockWin->TitleButtonClick( nButton );
 }
 
 void ImplDockFloatWin::Pin()
 {
     FloatingWindow::Pin();
-    mpDockWin->Pin();
 }
 
 void ImplDockFloatWin::Roll()
 {
     FloatingWindow::Roll();
-    mpDockWin->Roll();
 }
 
 void ImplDockFloatWin::PopupModeEnd()
 {
     FloatingWindow::PopupModeEnd();
-    mpDockWin->PopupModeEnd();
 }
 
 void ImplDockFloatWin::Resizing( Size& rSize )
@@ -704,22 +700,6 @@ void DockingWindow::ToggleFloatingMode()
 {
 }
 
-void DockingWindow::TitleButtonClick( sal_uInt16 )
-{
-}
-
-void DockingWindow::Pin()
-{
-}
-
-void DockingWindow::Roll()
-{
-}
-
-void DockingWindow::PopupModeEnd()
-{
-}
-
 void DockingWindow::Resizing( Size& )
 {
 }
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 2b599e3ef0f4..9cf25e95a126 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -469,14 +469,6 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll
     }
 }
 
-void PrintDialog::NUpTabPage::readFromSettings()
-{
-}
-
-void PrintDialog::NUpTabPage::storeToSettings()
-{
-}
-
 PrintDialog::JobTabPage::JobTabPage( VclBuilder* pUIBuilder )
     : maCollateImg( VclResId( SV_PRINT_COLLATE_IMG ) )
     , maNoCollateImg( VclResId( SV_PRINT_NOCOLLATE_IMG ) )
@@ -726,7 +718,6 @@ PrintDialog::~PrintDialog()
 void PrintDialog::readFromSettings()
 {
     maJobPage.readFromSettings();
-    maNUpPage.readFromSettings();
     maOptionsPage.readFromSettings();
 
     // read last selected tab page; if it exists, activate it
@@ -761,7 +752,6 @@ void PrintDialog::readFromSettings()
 void PrintDialog::storeToSettings()
 {
     maJobPage.storeToSettings();
-    maNUpPage.storeToSettings();
     maOptionsPage.storeToSettings();
 
     // store last selected printer
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index c6db5b12e742..e6b7c1592405 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1289,9 +1289,6 @@ void ImplTBDragMgr::EndDragging( bool bOK )
 
                 // re-calculate and show ToolBox
                 mpDragBox->ImplInvalidate( true );
-                mpDragBox->Customize( ToolBoxCustomizeEvent( mpDragBox, nTempItem,
-                                                             TOOLBOX_CUSTOMIZE_RESIZE,
-                                                             mpCustomizeData ) );
             }
             else
             {
@@ -1315,14 +1312,7 @@ void ImplTBDragMgr::EndDragging( bool bOK )
                     }
 
                     aPos = pDropBox->ScreenToOutputPixel( aPos );
-                    sal_uInt16 nPos = ToolBox::ImplFindItemPos( pDropBox, aPos );
-                    mpDragBox->Customize( ToolBoxCustomizeEvent( pDropBox, nTempItem,
-                                                                 nPos, mpCustomizeData ) );
-                }
-                else
-                {
-                    mpDragBox->Customize( ToolBoxCustomizeEvent( NULL, nTempItem,
-                                                                 0, mpCustomizeData ) );
+                    ToolBox::ImplFindItemPos( pDropBox, aPos );
                 }
             }
         }
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 17588506d021..5b6553fa7cf4 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -454,14 +454,6 @@ void ToolBox::Select()
         pWrapper->GetFloatingWindow()->EndPopupMode();
 }
 
-void ToolBox::Customize( const ToolBoxCustomizeEvent& )
-{
-}
-
-void ToolBox::UserDraw( const UserDrawEvent& )
-{
-}
-
 void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos )
 {
     sal_uLong nObjMask;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 94bea227d753..cb931cb85d0a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3895,20 +3895,4 @@ Any Window::GetSystemDataAny() const
 
 } /* namespace vcl */
 
-bool ImplDoTiledRendering()
-{
-#if !HAVE_FEATURE_DESKTOP && !defined(ANDROID)
-    // We do tiled rendering only for iOS at the moment, actually, but
-    // let's see what happens if we assume it for Android, too.
-    // (That comment doesn't match what the code does, does it?)
-    return true;
-#else
-    // We need some way to know globally if this process will use
-    // tiled rendering or not. Or should this be a per-window setting?
-    // Or what?
-    return false;
-#endif
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 9ace80d321ef..c9db00486637 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1997,11 +1997,6 @@ inline bool ImplHandleSalMouseButtonUp( vcl::Window* pWindow, SalMouseEvent* pEv
                                  ImplGetMouseButtonMode( pEvent ) );
 }
 
-static bool ImplHandleSalMouseActivate( vcl::Window* /*pWindow*/, SalMouseActivateEvent* /*pEvent*/ )
-{
-    return false;
-}
-
 static bool ImplHandleMenuEvent( vcl::Window* pWindow, SalMenuEvent* pEvent, sal_uInt16 nEvent )
 {
     // Find SystemWindow and its Menubar and let it dispatch the command
@@ -2343,7 +2338,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/,
         }
         break;
         case SALEVENT_MOUSEACTIVATE:
-            nRet = ImplHandleSalMouseActivate( pWindow, (SalMouseActivateEvent*)pEvent );
+            nRet = false;
             break;
         case SALEVENT_KEYINPUT:
             {
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index c055ff44c2e2..87e84bbddd21 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -625,13 +625,6 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame )
 // multi byte input method only
 
 void
-SalI18N_InputContext::SetLanguage(LanguageType)
-{
-    // not yet implemented
-    return;
-}
-
-void
 SalI18N_InputContext::EndExtTextInput( sal_uInt16 /*nFlags*/ )
 {
     if ( mbUseable && (maContext != NULL) && maClientData.pFrame )
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 9f616cc73c43..838a455b9590 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -597,11 +597,6 @@ SalFrame* I18NStatus::getStatusFrame() const
     return pRet;
 }
 
-bool I18NStatus::canToggleStatusWindow() const
-{
-    return true;
-}
-
 void I18NStatus::toggleStatusWindow()
 {
     if (m_pStatusWindow != 0)
@@ -631,7 +626,7 @@ X11ImeStatus::~X11ImeStatus()
 
 bool X11ImeStatus::canToggle()
 {
-    return vcl::I18NStatus::get().canToggleStatusWindow();
+    return true;
 }
 
 void X11ImeStatus::toggle()
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 5e74cff7178e..dcdf0bd16726 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2211,8 +2211,6 @@ void SalDisplay::PrintInfo() const
                 << KeyStr( nMod1KeySym_ ) << " (0x" << sal::static_int_cast< unsigned int >(nMod1KeySym_) << ")");
         if( XExtendedMaxRequestSize(pDisp_) * 4 )
             SAL_INFO( "vcl", "\tXMaxRequestSize   \t" << XMaxRequestSize(pDisp_) * 4 << " " << XExtendedMaxRequestSize(pDisp_) * 4 << " [bytes]");
-        if( GetProperties() != PROPERTY_DEFAULT )
-            SAL_INFO( "vcl", "\tProperties        \t0x" << std::hex << GetProperties() << "\n");
         SAL_INFO( "vcl", "\tWMName            \t" << getWMAdaptor()->getWindowManagerName() );
     }
     SAL_INFO( "vcl", "Screen" );
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
index bbdd86a0e3cd..375bdea01538 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
@@ -115,9 +115,8 @@ void DragSourceContext::setCursor( sal_Int32 cursorId ) throw(std::exception)
     m_rManager.setCursor( cursorId, m_aDropWindow, m_nTimestamp );
 }
 
-void DragSourceContext::setImage( sal_Int32 imageId ) throw(std::exception)
+void DragSourceContext::setImage( sal_Int32 ) throw(std::exception)
 {
-    m_rManager.setImage( imageId, m_aDropWindow, m_nTimestamp );
 }
 
 void DragSourceContext::transferablesFlavorsChanged() throw(std::exception)
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index a5c8387d21fb..24480fca9c2e 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -3471,10 +3471,6 @@ void SelectionManager::setCursor( sal_Int32 cursor, ::Window aDropWindow, Time )
     }
 }
 
-void SelectionManager::setImage( sal_Int32, ::Window, Time )
-{
-}
-
 void SelectionManager::transferablesFlavorsChanged()
 {
     osl::MutexGuard aGuard(m_aMutex);
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index c04ae945ed51..5289ee437b0e 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -462,7 +462,6 @@ namespace x11 {
         // for XDragSourceContext
         sal_Int32 getCurrentCursor() { return m_aCurrentCursor;}
         void setCursor( sal_Int32 cursor, ::Window aDropXLIB_Window, Time aTimestamp );
-        void setImage( sal_Int32 image, ::Window aDropXLIB_Window, Time aTimestamp );
         void transferablesFlavorsChanged();
 
         void shutdown() throw();
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 673448f96c84..178b5246b1bc 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -440,11 +440,6 @@ GC X11SalGraphicsImpl::SelectBrush()
         }
         else
         {
-            // Bug in Sun Solaris 2.5.1, XFillPolygon doesn't always reflect
-            // changes of the tile. PROPERTY_BUG_Tile doesn't fix this !
-            if (mrParent.GetDisplay()->GetProperties() & PROPERTY_BUG_FillPolygon_Tile)
-                XSetFillStyle ( pDisplay, mpBrushGC, FillSolid );
-
             XSetFillStyle ( pDisplay, mpBrushGC, FillTiled );
             XSetTile      ( pDisplay, mpBrushGC, mrParent.hBrush_ );
         }
@@ -574,57 +569,20 @@ void X11SalGraphicsImpl::copyBits( const SalTwoRect& rPosAry,
                                            !mrParent.bVirDev_ &&
                                            pSrcGraphics->bWindow_ );
 
-        GC pCopyGC;
-
-        if( mbXORMode
-            && !pSrcGraphics->bVirDev_
-            && (mrParent.GetDisplay()->GetProperties() & PROPERTY_BUG_XCopyArea_GXxor) )
-        {
-            Pixmap hPixmap = limitXCreatePixmap( mrParent.GetXDisplay(),
-                                            pSrcGraphics->GetDrawable(),        // source
-                                            rPosAry.mnSrcWidth, rPosAry.mnSrcHeight,
-                                            pSrcGraphics->GetBitCount() );
+        GC pCopyGC = GetCopyGC();
 
-            pCopyGC = mrParent.GetDisplay()->GetCopyGC( mrParent.m_nXScreen );
-
-            if( bNeedGraphicsExposures )
-                XSetGraphicsExposures( mrParent.GetXDisplay(),
-                                       pCopyGC,
-                                       True );
-
-            XCopyArea( mrParent.GetXDisplay(),
-                       pSrcGraphics->GetDrawable(),     // source
-                       hPixmap,                         // destination
-                       pCopyGC,                         // no clipping
-                       rPosAry.mnSrcX,     rPosAry.mnSrcY,
-                       rPosAry.mnSrcWidth, rPosAry.mnSrcHeight,
-                       0,                   0 );            // destination
-            XCopyArea( mrParent.GetXDisplay(),
-                       hPixmap,                             // source
-                       mrParent.GetDrawable(),                       // destination
-                       GetInvertGC(),       // destination clipping
-                       0,                   0,              // source
-                       rPosAry.mnSrcWidth, rPosAry.mnSrcHeight,
-                       rPosAry.mnDestX,    rPosAry.mnDestY );
-            XFreePixmap( mrParent.GetXDisplay(), hPixmap );
-        }
-        else
-        {
-            pCopyGC = GetCopyGC();
-
-            if( bNeedGraphicsExposures )
-                XSetGraphicsExposures( mrParent.GetXDisplay(),
-                                       pCopyGC,
-                                       True );
-
-            XCopyArea( mrParent.GetXDisplay(),
-                       pSrcGraphics->GetDrawable(),     // source
-                       mrParent.GetDrawable(),                   // destination
-                       pCopyGC,                         // destination clipping
-                       rPosAry.mnSrcX,     rPosAry.mnSrcY,
-                       rPosAry.mnSrcWidth, rPosAry.mnSrcHeight,
-                       rPosAry.mnDestX,    rPosAry.mnDestY );
-        }
+        if( bNeedGraphicsExposures )
+            XSetGraphicsExposures( mrParent.GetXDisplay(),
+                                   pCopyGC,
+                                   True );
+
+        XCopyArea( mrParent.GetXDisplay(),
+                   pSrcGraphics->GetDrawable(),     // source
+                   mrParent.GetDrawable(),                   // destination
+                   pCopyGC,                         // destination clipping
+                   rPosAry.mnSrcX,     rPosAry.mnSrcY,
+                   rPosAry.mnSrcWidth, rPosAry.mnSrcHeight,
+                   rPosAry.mnDestX,    rPosAry.mnDestY );
 
         if( bNeedGraphicsExposures )
         {
@@ -1277,16 +1235,8 @@ void X11SalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 )
 {
     if( mnPenColor != SALCOLOR_NONE )
     {
-        if ( mrParent.GetDisplay()->GetProperties() & PROPERTY_BUG_DrawLine )
-        {
-            GC aGC = SelectPen();
-            XDrawPoint (mrParent.GetXDisplay(), mrParent.GetDrawable(), aGC, (int)nX1, (int)nY1);
-            XDrawPoint (mrParent.GetXDisplay(), mrParent.GetDrawable(), aGC, (int)nX2, (int)nY2);
-            XDrawLine  (mrParent.GetXDisplay(), mrParent.GetDrawable(), aGC, nX1, nY1, nX2, nY2 );
-        }
-        else
-            XDrawLine( mrParent.GetXDisplay(), mrParent.GetDrawable(),SelectPen(),
-                       nX1, nY1, nX2, nY2 );
+        XDrawLine( mrParent.GetXDisplay(), mrParent.GetDrawable(),SelectPen(),
+                   nX1, nY1, nX2, nY2 );
     }
 }
 
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 29366cabe76a..9ea94b5f469f 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -254,13 +254,7 @@ bool X11SalGraphics::GetDitherPixmap( SalColor nSalColor )
                                    8,               // bitmap_pad
                                    0 );             // (default) bytes_per_line
 
-    if ( GetDisplay()->GetProperties() & PROPERTY_BUG_Tile )
-    {
-        if (hBrush_)
-            XFreePixmap (GetXDisplay(), hBrush_);
-        hBrush_ = limitXCreatePixmap( GetXDisplay(), GetDrawable(), 8, 8, 8 );
-    }
-    else if( !hBrush_ )
+    if( !hBrush_ )
         hBrush_ = limitXCreatePixmap( GetXDisplay(), GetDrawable(), 8, 8, 8 );
 
     // put the ximage to the pixmap
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 4be773fd099e..c5aa6b8740e4 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1922,13 +1922,6 @@ void X11SalFrame::SetPosSize( const Rectangle &rPosSize )
     if( values.width != (int)maGeometry.nWidth || values.height != (int)maGeometry.nHeight )
         bSized = true;
 
-    if( ! ( nStyle_ & ( SAL_FRAME_STYLE_PLUG | SAL_FRAME_STYLE_FLOAT ) )
-        && !(pDisplay_->GetProperties() & PROPERTY_SUPPORT_WM_ClientPos) )
-    {
-        values.x    -= maGeometry.nLeftDecoration;
-        values.y    -= maGeometry.nTopDecoration;
-    }
-
     // do net set WMNormalHints for ..
     if(
         // child windows
@@ -2494,8 +2487,6 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext )
         if (mpInputContext->UseContext())
         {
               mpInputContext->ExtendEventMask( GetShellWindow() );
-              if (pContext->mnOptions & SAL_INPUTCONTEXT_CHANGELANGUAGE)
-                mpInputContext->SetLanguage(pContext->meLanguage);
             if (mbInputFocus)
                 mpInputContext->SetICFocus( this );
         }
@@ -2765,46 +2756,12 @@ static Bool compressWheelEvents( Display*, XEvent* event, XPointer p )
 long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
 {
     SalMouseEvent       aMouseEvt = {0, 0, 0, 0, 0};
-    sal_uInt16              nEvent = 0;
+    sal_uInt16          nEvent = 0;
     bool                bClosePopups = false;
 
     if( nVisibleFloats && pEvent->type == EnterNotify )
         return 0;
 
-    // Solaris X86: clicking the right button on a two-button mouse
-    // generates a button2 event not a button3 event
-    if (pDisplay_->GetProperties() & PROPERTY_SUPPORT_3ButtonMouse )
-    {
-        switch (pEvent->type)
-        {
-            case EnterNotify:
-            case LeaveNotify:
-                if ( pEvent->xcrossing.state & Button2Mask )
-                {
-                    pEvent->xcrossing.state &= ~Button2Mask;
-                    pEvent->xcrossing.state |=  Button3Mask;
-                }
-                break;
-
-            case MotionNotify:
-                if ( pEvent->xmotion.state & Button2Mask )
-                {
-                    pEvent->xmotion.state &= ~Button2Mask;
-                    pEvent->xmotion.state |=  Button3Mask;
-                }
-                break;
-
-            default:
-                if ( Button2 == pEvent->xbutton.button )
-                {
-                    pEvent->xbutton.state &= ~Button2Mask;
-                    pEvent->xbutton.state |=  Button3Mask;
-                    pEvent->xbutton.button =  Button3;
-                }
-                break;
-        }
-    }
-
     if( LeaveNotify == pEvent->type || EnterNotify == pEvent->type )
     {
         /*
@@ -3788,10 +3745,8 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
     ::Window        hWM_Parent;
     ::Window        hRoot, *Children, hDummy;
     unsigned int    nChildren;
-    bool            bNone = pDisplay_->GetProperties()
-                            & PROPERTY_SUPPORT_WM_Parent_Pixmap_None;
-    bool            bAccessParentWindow = ! (pDisplay_->GetProperties()
-                            & PROPERTY_FEATURE_TrustedSolaris);
+    bool            bNone = false;
+    bool            bAccessParentWindow = true;
 
     static const char* pDisableStackingCheck = getenv( "SAL_DISABLE_STACKING_CHECK" );
 
@@ -3975,11 +3930,6 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
     return 1;
 }
 
-long X11SalFrame::HandleColormapEvent( XColormapEvent* )
-{
-    return 0;
-}
-
 long X11SalFrame::HandleStateEvent( XPropertyEvent *pEvent )
 {
     Atom          actual_type;
@@ -4240,7 +4190,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
                 break;
 
             case ColormapNotify:
-                nRet = HandleColormapEvent( &pEvent->xcolormap );
+                nRet = 0;
                 break;
 
             case PropertyNotify:
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 52ee62acbbab..9d1021a3759d 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2866,7 +2866,6 @@ void GtkSalFrame::SetInputContext( SalInputContext* pContext )
     // create a new im context
     if( ! m_pIMHandler )
         m_pIMHandler = new IMHandler( this );
-    m_pIMHandler->setInputContext( pContext );
 }
 
 void GtkSalFrame::EndExtTextInput( sal_uInt16 nFlags )
@@ -3952,10 +3951,6 @@ void GtkSalFrame::IMHandler::updateIMSpotLocation()
     GetGenericData()->ErrorTrapPop();
 }
 
-void GtkSalFrame::IMHandler::setInputContext( SalInputContext* )
-{
-}
-
 void GtkSalFrame::IMHandler::sendEmptyCommit()
 {
     vcl::DeletionListener aDel( m_pFrame );
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index a46d2cd155ec..7114db26f577 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -341,14 +341,6 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
                     mpGlyphRTLFlags[ mnGlyphCount ] = true;
                 }
 
-                // for vertical writing use vertical alternatives
-                if( bVertical )
-                {
-                    sal_UCS4 cVert = ::GetVerticalChar( cChar );
-                    if( cVert )
-                        cChar = cVert;
-                }
-
                 // rewrite the original string
                 // update the mappings between original and rewritten string
                // TODO: support surrogates in rewritten strings
diff --git a/vcl/win/source/gdi/winlayout.hxx b/vcl/win/source/gdi/winlayout.hxx
index 7847665cfa79..188b9539cbd7 100644
--- a/vcl/win/source/gdi/winlayout.hxx
+++ b/vcl/win/source/gdi/winlayout.hxx
@@ -124,13 +124,13 @@ public:
     virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const;
     virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const SAL_OVERRIDE;
     virtual void    GetCaretPositions( int nArraySize, long* pCaretXArray ) const;
-    virtual bool    IsKashidaPosValid ( int nCharPos ) const;
+    virtual bool    IsKashidaPosValid ( int nCharPos ) const SAL_OVERRIDE;
 
     // for glyph+font+script fallback
     virtual void    MoveGlyph( int nStart, long nNewXPos );
     virtual void    DropGlyph( int nStart );
     virtual void    Simplify( bool bIsBase );
-    virtual void    DisableGlyphInjection( bool bDisable ) { mbDisableGlyphInjection = bDisable; }
+    virtual void    DisableGlyphInjection( bool bDisable ) SAL_OVERRIDE { mbDisableGlyphInjection = bDisable; }
 
 protected:
     virtual         ~UniscribeLayout();