[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source vcl/unx
Noel Grandin
noel at peralex.com
Fri May 20 08:08:15 UTC 2016
include/vcl/bitmapaccess.hxx | 14 +-----
include/vcl/combobox.hxx | 1
include/vcl/commandevent.hxx | 4 -
include/vcl/dockwin.hxx | 3 -
include/vcl/event.hxx | 37 -----------------
include/vcl/font.hxx | 1
include/vcl/gfxlink.hxx | 7 ---
include/vcl/lazydelete.hxx | 5 --
include/vcl/menu.hxx | 2
include/vcl/pdfextoutdevdata.hxx | 2
include/vcl/print.hxx | 2
include/vcl/salctype.hxx | 4 -
include/vcl/salnativewidgets.hxx | 3 -
include/vcl/syschild.hxx | 1
include/vcl/texteng.hxx | 1
include/vcl/textview.hxx | 2
vcl/inc/impfont.hxx | 2
vcl/inc/listbox.hxx | 9 ----
vcl/inc/octree.hxx | 2
vcl/inc/salwtype.hxx | 4 -
vcl/inc/unx/cairotextrender.hxx | 4 -
vcl/inc/unx/fc_fontoptions.hxx | 7 ---
vcl/inc/unx/gtk/gtksalmenu.hxx | 2
vcl/inc/unx/i18n_ic.hxx | 5 --
vcl/inc/unx/i18n_xkb.hxx | 4 -
vcl/inc/unx/salmenu.h | 56 --------------------------
vcl/source/control/combobox.cxx | 2
vcl/source/edit/textdat2.hxx | 7 ---
vcl/source/edit/textund2.hxx | 12 -----
vcl/source/edit/textview.cxx | 10 ----
vcl/source/font/font.cxx | 30 --------------
vcl/source/gdi/pdffontcache.hxx | 5 --
vcl/source/window/commandevent.cxx | 21 ----------
vcl/source/window/menu.cxx | 67 ++------------------------------
vcl/source/window/syschild.cxx | 33 ---------------
vcl/unx/generic/gdi/cairotextrender.cxx | 17 --------
vcl/unx/generic/glyphs/scrptrun.h | 13 ------
37 files changed, 13 insertions(+), 388 deletions(-)
New commits:
commit 72edb6967f245f0c99c6a61e0ce8d0a245600cba
Author: Noel Grandin <noel at peralex.com>
Date: Wed May 18 14:30:24 2016 +0200
loplugin:unusedmethods in vcl
also drops the CairoFontsCache ref-counting, since nothing was actually
using it.
Change-Id: If05ecb054b6b8d97b0d3010185cf23c28390ec04
Reviewed-on: https://gerrit.libreoffice.org/25105
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index 051beb8..82fe209 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -219,17 +219,9 @@ private:
std::unique_ptr<BitmapColor> mpLineColor;
std::unique_ptr<BitmapColor> mpFillColor;
- BitmapWriteAccess()
- {}
-
- BitmapWriteAccess(const BitmapWriteAccess&)
- : BitmapReadAccess()
- {}
-
- BitmapWriteAccess& operator=(const BitmapWriteAccess&)
- {
- return *this;
- }
+ BitmapWriteAccess() = delete;
+ BitmapWriteAccess(const BitmapWriteAccess&) = delete;
+ BitmapWriteAccess& operator=(const BitmapWriteAccess&) = delete;
};
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 77754b7..61ad358 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -124,7 +124,6 @@ public:
void EnableMultiSelection( bool bMulti );
bool IsMultiSelectionEnabled() const;
- sal_Unicode GetMultiSelectionSeparator() const;
void SetSelectHdl(const Link<ComboBox&,void>& rLink);
const Link<ComboBox&,void>& GetSelectHdl() const;
diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx
index ba0542a..bd5f40a 100644
--- a/include/vcl/commandevent.hxx
+++ b/include/vcl/commandevent.hxx
@@ -120,7 +120,6 @@ private:
LanguageType meLanguage;
public:
- CommandInputContextData();
CommandInputContextData( LanguageType eLang );
};
@@ -179,7 +178,6 @@ private:
long mnDeltaY;
public:
- CommandScrollData();
CommandScrollData( long nDeltaX, long nDeltaY );
long GetDeltaX() const { return mnDeltaX; }
@@ -192,7 +190,6 @@ private:
sal_uInt16 mnCode;
public:
- CommandModKeyData();
CommandModKeyData( sal_uInt16 nCode );
bool IsMod1() const { return (mnCode & MODKEY_MOD1) != 0; }
@@ -267,7 +264,6 @@ private:
sal_uLong mnEnd;
public:
- CommandSelectionChangeData();
CommandSelectionChangeData( sal_uLong nStart, sal_uLong nEnd );
sal_uLong GetStart() const { return mnStart; }
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 48413b4..5351f11 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -35,7 +35,6 @@ struct DockingData
bool mbLivemode; // in
bool mbInteractive; // in
- DockingData() {};
DockingData( const Point& rPt, const Rectangle& rRect, bool b) :
maMousePos( rPt ), maTrackRect( rRect ), mbFloating( b ), mbLivemode( false ), mbInteractive( true )
{};
@@ -47,7 +46,6 @@ struct EndDockingData
bool mbFloating; // in
bool mbCancelled; // in
- EndDockingData() {};
EndDockingData( const Rectangle& rRect, bool b, bool bCancelled ) :
maWindowRect( rRect ), mbFloating( b ), mbCancelled( bCancelled )
{};
@@ -58,7 +56,6 @@ struct EndPopupModeData
Point maFloatingPos; // in
bool mbTearoff; // in
- EndPopupModeData() {};
EndPopupModeData( const Point& rPos, bool bTearoff ) :
maFloatingPos( rPos ), mbTearoff( bTearoff )
{};
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 562ab4c..81232fa 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -259,8 +259,6 @@ private:
bool mbKeyboardActivated;
public:
- explicit HelpEvent();
- explicit HelpEvent( HelpEventMode nHelpMode );
explicit HelpEvent( const Point& rMousePos, HelpEventMode nHelpMode );
const Point& GetMousePosPixel() const { return maPos; }
@@ -269,12 +267,6 @@ public:
void SetKeyboardActivated( bool bKeyboard ) { mbKeyboardActivated = bKeyboard; }
};
-inline HelpEvent::HelpEvent()
-{
- mnMode = HelpEventMode::CONTEXT;
- mbKeyboardActivated = true;
-}
-
inline HelpEvent::HelpEvent( const Point& rMousePos, HelpEventMode nHelpMode ) :
maPos( rMousePos )
{
@@ -282,12 +274,6 @@ inline HelpEvent::HelpEvent( const Point& rMousePos, HelpEventMode nHelpMode ) :
mbKeyboardActivated = false;
}
-inline HelpEvent::HelpEvent( HelpEventMode nHelpMode )
-{
- mnMode = nHelpMode;
- mbKeyboardActivated = true;
-}
-
/// Event to pass information for UserDraw() handling eg. in comboboxes.
class VCL_DLLPUBLIC UserDrawEvent
{
@@ -303,7 +289,6 @@ private:
sal_uInt16 mnStyle;
public:
- UserDrawEvent();
UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pRenderContext,
const Rectangle& rOutRect, sal_uInt16 nId, sal_uInt16 nStyle = 0);
@@ -314,14 +299,6 @@ public:
sal_uInt16 GetStyle() const { return mnStyle; }
};
-inline UserDrawEvent::UserDrawEvent()
- : mpWindow(nullptr)
- , mpRenderContext(nullptr)
- , mnItemId(0)
- , mnStyle(0)
-{
-}
-
inline UserDrawEvent::UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pRenderContext,
const Rectangle& rOutRect, sal_uInt16 nId, sal_uInt16 nStyle)
: mpWindow(pWindow)
@@ -340,7 +317,6 @@ private:
TrackingEventFlags mnFlags;
public:
- explicit TrackingEvent();
explicit TrackingEvent( const MouseEvent&,
TrackingEventFlags nTrackFlags = TrackingEventFlags::NONE );
@@ -354,11 +330,6 @@ public:
{ return bool(mnFlags & TrackingEventFlags::Cancel); }
};
-inline TrackingEvent::TrackingEvent()
-{
- mnFlags = TrackingEventFlags::NONE;
-}
-
inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt,
TrackingEventFlags nTrackFlags ) :
maMEvt( rMEvt )
@@ -449,7 +420,6 @@ private:
DataChangedEventType mnType;
public:
- explicit DataChangedEvent();
explicit DataChangedEvent( DataChangedEventType nType,
const void* pData = nullptr,
AllSettingsFlags nFlags = AllSettingsFlags::NONE );
@@ -460,13 +430,6 @@ public:
const AllSettings* GetOldSettings() const;
};
-inline DataChangedEvent::DataChangedEvent()
-{
- mpData = nullptr;
- mnFlags = AllSettingsFlags::NONE;
- mnType = DataChangedEventType::NONE;
-}
-
inline DataChangedEvent::DataChangedEvent( DataChangedEventType nType,
const void* pData,
AllSettingsFlags nChangeFlags )
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index d353f87..5c24f8a 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -85,7 +85,6 @@ public:
// Device dependent functions
int GetQuality() const;
- OUString GetMapNames() const;
bool IsBuiltInFont() const;
bool CanEmbed() const;
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 9be44e9..3bdb4b7 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -34,12 +34,6 @@ struct ImpBuffer
sal_uLong mnRefCount;
sal_uInt8* mpBuffer;
- ImpBuffer( sal_uLong nSize )
- {
- mnRefCount = 1UL;
- mpBuffer = nSize ? new sal_uInt8[ nSize ] : nullptr;
- }
-
ImpBuffer( sal_uInt8* pBuf ) { mnRefCount = 1UL; mpBuffer = pBuf; }
~ImpBuffer() { delete[] mpBuffer; }
@@ -124,7 +118,6 @@ private:
public:
GfxLink();
GfxLink( const GfxLink& );
- GfxLink( const OUString& rPath, GfxLinkType nType );
GfxLink( sal_uInt8* pBuf, sal_uInt32 nBufSize, GfxLinkType nType );
~GfxLink();
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index 0c2840f..4f28b32 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -102,11 +102,6 @@ namespace vcl
VclPtr<vcl::Window> m_pObject;
bool m_bDeleted;
- DeleteObjectEntry() :
- m_pObject( nullptr ),
- m_bDeleted( false )
- {}
-
DeleteObjectEntry( vcl::Window* i_pObject ) :
m_pObject( i_pObject ),
m_bDeleted( false )
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 0f4de5c..92d4b4e 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -315,8 +315,6 @@ public:
void SetItemImage( sal_uInt16 nItemId, const Image& rImage );
Image GetItemImage( sal_uInt16 nItemId ) const;
- void SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 );
- void SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror );
void SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand );
OUString GetItemCommand( sal_uInt16 nItemId ) const;
diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index 08ea937..48fab90 100644
--- a/include/vcl/pdfextoutdevdata.hxx
+++ b/include/vcl/pdfextoutdevdata.hxx
@@ -138,10 +138,8 @@ public:
bool GetIsLosslessCompression() const { return mbUseLosslessCompression;}
void SetIsLosslessCompression( const bool bLosslessCompression );
- sal_Int32 GetCompressionQuality() const { return mnCompressionQuality; }
void SetCompressionQuality( const sal_Int32 nQuality );
- sal_Int32 GetMaxImageResolution() const { return mnMaxImageResolution; }
void SetMaxImageResolution( const sal_Int32 nQuality );
bool GetIsReduceImageResolution() const { return mbReduceImageResolution;}
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index bf5112a..e38372d 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -583,8 +583,6 @@ public:
/// Create without ui properties
PrinterOptionsHelper() {}
- PrinterOptionsHelper( const std::vector< css::beans::PropertyValue >& i_rUIProperties )
- : m_aUIProperties( i_rUIProperties ) {}
~PrinterOptionsHelper() {}
/** Process a new set of properties
diff --git a/include/vcl/salctype.hxx b/include/vcl/salctype.hxx
index 4fdc6a8..e7afbcb 100644
--- a/include/vcl/salctype.hxx
+++ b/include/vcl/salctype.hxx
@@ -44,10 +44,6 @@ class SvStream;
struct ConvertData
{
-private:
-
- ConvertData();
-
public:
Graphic maGraphic;
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 8dc05a2..b2dd626 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -447,7 +447,6 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue
bool isBothAligned() const { return isLeftAligned() && isRightAligned(); }
bool isNotAligned() const { return !(mnAlignment & (TabitemFlags::LeftAligned | TabitemFlags::RightAligned)); }
bool isFirst() const { return bool(mnAlignment & TabitemFlags::FirstInGroup); }
- bool isLast() const { return bool(mnAlignment & TabitemFlags::LastInGroup); }
const Rectangle& getContentRect() const { return maContentRect; }
};
@@ -518,8 +517,6 @@ public:
class VCL_DLLPUBLIC MenupopupValue : public ImplControlValue
{
public:
- MenupopupValue() : ImplControlValue( CTRL_MENU_POPUP, 0 )
- {}
MenupopupValue( long i_nGutterWidth, const Rectangle& i_rItemRect )
: ImplControlValue( CTRL_MENU_POPUP, i_nGutterWidth )
, maItemRect( i_rItemRect )
diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx
index 9566cba..767ec95 100644
--- a/include/vcl/syschild.hxx
+++ b/include/vcl/syschild.hxx
@@ -31,7 +31,6 @@ class VCL_DLLPUBLIC SystemChildWindow : public vcl::Window
private:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInitSysChild( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = false );
- SAL_DLLPRIVATE void ImplTestJavaException( void* pEnv );
// Copy assignment is forbidden and not implemented.
SystemChildWindow (const SystemChildWindow &) = delete;
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 3b96203..3a5c3c9 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -88,7 +88,6 @@ class VCL_DLLPUBLIC TextEngine : public SfxBroadcaster
friend class TextUndoSplitPara;
friend class TextUndoInsertChars;
friend class TextUndoRemoveChars;
- friend class TextUndoSetAttribs;
private:
TextDoc* mpDoc;
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index 8b398e6..81fd8e4 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -82,8 +82,6 @@ protected:
bool ImplTruncateNewText( OUString& rNewText ) const;
bool ImplCheckTextLen( const OUString& rNewText );
- VirtualDevice* GetVirtualDevice();
-
// DragAndDropClient
virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) throw (css::uno::RuntimeException, std::exception) override;
virtual void dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index f2cb44c..e608471 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -65,8 +65,6 @@ public:
void SetSymbolFlag( const bool bSymbolFlag ) { mbSymbolFlag = bSymbolFlag; }
- bool CompareDeviceIndependentFontAttributes(const ImplFont& rOther) const;
-
// straight properties, no getting them from AskConfig()
FontFamily GetFamilyTypeNoAsk() const { return meFamily; }
FontWeight GetWeightNoAsk() const { return meWeight; }
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index df2f68c..abde99b 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -69,15 +69,6 @@ struct ImplEntryType
mbIsSelected = false;
mpUserData = nullptr;
}
-
- ImplEntryType( const Image& rImage ) :
- maImage( rImage ),
- mnFlags( ListBoxEntryFlags::NONE ),
- mnHeight( 0 )
- {
- mbIsSelected = false;
- mpUserData = nullptr;
- }
};
class ImplEntryList
diff --git a/vcl/inc/octree.hxx b/vcl/inc/octree.hxx
index 803f592..bc9facb 100644
--- a/vcl/inc/octree.hxx
+++ b/vcl/inc/octree.hxx
@@ -45,8 +45,6 @@ class BitmapReadAccess;
class VCL_PLUGIN_PUBLIC Octree
{
private:
- Octree() {}
-
void CreatePalette( NODE* pNode );
void GetPalIndex( NODE* pNode );
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 0403589..2a45616 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -113,8 +113,8 @@ struct SalMenuEvent
sal_uInt16 mnId; // Menu item ID
void* mpMenu; // pointer to VCL menu (class Menu)
- SalMenuEvent() : mnId( 0 ), mpMenu( nullptr ) {}
- SalMenuEvent( sal_uInt16 i_nId, void* i_pMenu )
+ SalMenuEvent() : mnId( 0 ), mpMenu( nullptr ) {}
+ SalMenuEvent( sal_uInt16 i_nId, void* i_pMenu )
: mnId( i_nId ), mpMenu( i_pMenu ) {}
};
diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index 14b3503..612daae 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -51,12 +51,10 @@ public:
};
private:
- static int mnRefCount;
typedef std::deque< std::pair<void *, CacheId> > LRUFonts;
static LRUFonts maLRUFonts;
public:
- CairoFontsCache();
- ~CairoFontsCache();
+ CairoFontsCache() = delete;
static void CacheFont(void *pFont, const CacheId &rId);
static void* FindCachedFont(const CacheId &rId);
diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx
index f831ef5..d99870d 100644
--- a/vcl/inc/unx/fc_fontoptions.hxx
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -37,13 +37,6 @@ public:
FontHinting meHinting; // whether the font should be hinted
FontHintStyle meHintStyle; // type of font hinting to be used
- FontConfigFontOptions() :
- meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
- meAntiAlias(ANTIALIAS_DONTKNOW),
- meAutoHint(AUTOHINT_DONTKNOW),
- meHinting(HINTING_DONTKNOW),
- meHintStyle(HINT_SLIGHT),
- mpPattern(nullptr) {}
FontConfigFontOptions(FcPattern* pPattern) :
meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
meAntiAlias(ANTIALIAS_DONTKNOW),
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 8469659..1a5cd0a 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -18,7 +18,7 @@
#include <gio/gio.h>
#endif
-#include <unx/salmenu.h>
+#include <salmenu.hxx>
#include <unx/gtk/gtkframe.hxx>
#include <vcl/idle.hxx>
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 4410d58..e612590 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -75,11 +75,6 @@ public:
SalI18N_InputContext( SalFrame *aFrame );
~SalI18N_InputContext();
-
-private:
-
- SalI18N_InputContext(); // do not use this
-
};
#endif // INCLUDED_VCL_INC_UNX_I18N_IC_HXX
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index 0e69992..763e8a2 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -46,10 +46,6 @@ public:
void Dispatch( XEvent *pEvent ); // keep track of group changes
inline int GetEventBase() const ;
-
-protected:
-
- SalI18N_KeyboardExtension(); // disabled
};
inline
diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h
deleted file mode 100644
index 9d43a10..0000000
--- a/vcl/inc/unx/salmenu.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_VCL_INC_UNX_SALMENU_H
-#define INCLUDED_VCL_INC_UNX_SALMENU_H
-
-#include <vcl/bitmap.hxx>
-#include <salmenu.hxx>
-
-class X11SalMenu : public SalMenu
-{
-public:
- X11SalMenu() {}
- virtual ~X11SalMenu();
-
- virtual bool VisibleMenuBar() override; // must return TRUE to actually DISPLAY native menu bars
- // otherwise only menu messages are processed (eg, OLE on Windows)
-
- virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) override;
- virtual void RemoveItem( unsigned nPos ) override;
- virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) override;
- virtual void SetFrame( const SalFrame* pFrame ) override;
- virtual void CheckItem( unsigned nPos, bool bCheck ) override;
- virtual void EnableItem( unsigned nPos, bool bEnable ) override;
- virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) override;
- virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) override;
- virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) override;
- virtual void GetSystemMenuData( SystemMenuData* pData ) override;
-};
-
-class X11SalMenuItem : public SalMenuItem
-{
-public:
- X11SalMenuItem() {}
- virtual ~X11SalMenuItem();
-};
-
-#endif // INCLUDED_VCL_INC_UNX_SALMENU_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 6b54142..2f72aa9 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1028,8 +1028,6 @@ bool ComboBox::IsInDropDown() const
return m_pImpl->m_pFloatWin && m_pImpl->m_pFloatWin->IsInPopupMode();
}
-sal_Unicode ComboBox::GetMultiSelectionSeparator() const { return m_pImpl->m_cMultiSep; }
-
void ComboBox::EnableMultiSelection( bool bMulti )
{
m_pImpl->m_pImplLB->EnableMultiSelection( bMulti, false );
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 2788d36..6a09fa8 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -52,13 +52,6 @@ private:
sal_uInt8 nKind;
bool bRightToLeft;
- TETextPortion()
- : nLen {0}
- , nWidth {-1}
- , nKind {PORTIONKIND_TEXT}
- , bRightToLeft {false}
- {}
-
public:
TETextPortion( sal_Int32 nL )
: nLen {nL}
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 786402c..bcb44bb 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -103,18 +103,6 @@ public:
virtual OUString GetComment () const override;
};
-class TextUndoSetAttribs: public TextUndo
-{
-public:
- TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel );
- virtual ~TextUndoSetAttribs();
-
- virtual void Undo() override;
- virtual void Redo() override;
-
- virtual OUString GetComment () const override;
-};
-
#endif // INCLUDED_VCL_SOURCE_EDIT_TEXTUND2_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index a033c6b..732651e 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -475,16 +475,6 @@ void TextView::ImpShowHideSelection(bool /*bShow*/, const TextSelection* pRange)
}
}
-VirtualDevice* TextView::GetVirtualDevice()
-{
- if ( !mpImpl->mpVirtDev )
- {
- mpImpl->mpVirtDev = VclPtr<VirtualDevice>::Create();
- mpImpl->mpVirtDev->SetLineColor();
- }
- return mpImpl->mpVirtDev;
-}
-
void TextView::EraseVirtualDevice()
{
mpImpl->mpVirtDev.disposeAndClear();
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index de56c80..bc490ff 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -694,7 +694,6 @@ void Font::SetQuality( int nQuality ) { mpImplFont->SetQuality( nQuality ); }
void Font::IncreaseQualityBy( int nQualityAmount ) { mpImplFont->IncreaseQualityBy( nQualityAmount ); }
void Font::DecreaseQualityBy( int nQualityAmount ) { mpImplFont->DecreaseQualityBy( nQualityAmount ); }
-OUString Font::GetMapNames() const { return mpImplFont->GetMapNames(); }
void Font::SetMapNames( OUString const & aMapNames ) { mpImplFont->SetMapNames(aMapNames); }
bool Font::IsBuiltInFont() const { return mpImplFont->IsBuiltInFont(); }
@@ -830,35 +829,6 @@ bool ImplFont::operator==( const ImplFont& rOther ) const
return true;
}
-bool ImplFont::CompareDeviceIndependentFontAttributes(const ImplFont& rOther) const
-{
- if (maFamilyName != rOther.maFamilyName)
- return false;
-
- if (maStyleName != rOther.maStyleName)
- return false;
-
- if (meWeight != rOther.meWeight)
- return false;
-
- if (meItalic != rOther.meItalic)
- return false;
-
- if (meFamily != rOther.meFamily)
- return false;
-
- if (mePitch != rOther.mePitch)
- return false;
-
- if (meWidthType != rOther.meWidthType)
- return false;
-
- if (mbSymbolFlag != rOther.mbSymbolFlag)
- return false;
-
- return true;
-}
-
void ImplFont::AskConfig()
{
if( mbConfigLookup )
diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index f668629..8bf5c95 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -38,11 +38,6 @@ namespace vcl
std::type_info* m_typeFontFace;
FontIdentifier( const PhysicalFontFace*, bool bVertical );
- FontIdentifier()
- : m_nFontId(0)
- , m_bVertical(false)
- , m_typeFontFace(nullptr)
- {}
// Less than needed for std::set and std::map
bool operator<( const FontIdentifier& rRight ) const
diff --git a/vcl/source/window/commandevent.cxx b/vcl/source/window/commandevent.cxx
index 25b3f15..e7f7dcd 100644
--- a/vcl/source/window/commandevent.cxx
+++ b/vcl/source/window/commandevent.cxx
@@ -64,11 +64,6 @@ CommandExtTextInputData::~CommandExtTextInputData()
delete [] mpTextAttr;
}
-CommandInputContextData::CommandInputContextData()
-{
- meLanguage = LANGUAGE_DONTKNOW;
-}
-
CommandInputContextData::CommandInputContextData( LanguageType eLang )
{
meLanguage = eLang;
@@ -99,33 +94,17 @@ CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDelta,
mbDeltaIsPixel = bDeltaIsPixel;
}
-CommandScrollData::CommandScrollData()
-{
- mnDeltaX = 0;
- mnDeltaY = 0;
-}
-
CommandScrollData::CommandScrollData( long nDeltaX, long nDeltaY )
{
mnDeltaX = nDeltaX;
mnDeltaY = nDeltaY;
}
-CommandModKeyData::CommandModKeyData()
-{
- mnCode = 0L;
-}
-
CommandModKeyData::CommandModKeyData( sal_uInt16 nCode )
{
mnCode = nCode;
}
-CommandSelectionChangeData::CommandSelectionChangeData()
-{
- mnStart = mnEnd = 0;
-}
-
CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart, sal_uLong nEnd )
{
mnStart = nStart;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index ce465f9..6454936 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1077,61 +1077,6 @@ void Menu::SetItemImage( sal_uInt16 nItemId, const Image& rImage )
ImplGetSalMenu()->SetItemImage( nPos, pData->pSalMenuItem, rImage );
}
-static inline Image ImplRotImage( const Image& rImage, long nAngle10 )
-{
- Image aRet;
- BitmapEx aBmpEx( rImage.GetBitmapEx() );
-
- aBmpEx.Rotate( nAngle10, COL_WHITE );
-
- return Image( aBmpEx );
-}
-
-void Menu::SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 )
-{
- size_t nPos;
- MenuItemData* pData = pItemList->GetData( nItemId, nPos );
-
- if ( pData )
- {
- long nDeltaAngle = (nAngle10 - pData->nItemImageAngle) % 3600;
- while( nDeltaAngle < 0 )
- nDeltaAngle += 3600;
-
- pData->nItemImageAngle = nAngle10;
- if( nDeltaAngle && !!pData->aImage )
- pData->aImage = ImplRotImage( pData->aImage, nDeltaAngle );
- }
-}
-
-static inline Image ImplMirrorImage( const Image& rImage )
-{
- Image aRet;
- BitmapEx aBmpEx( rImage.GetBitmapEx() );
-
- aBmpEx.Mirror( BmpMirrorFlags::Horizontal );
-
- return Image( aBmpEx );
-}
-
-void Menu::SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror )
-{
- size_t nPos;
- MenuItemData* pData = pItemList->GetData( nItemId, nPos );
-
- if ( pData )
- {
- if( ( pData->bMirrorMode && ! bMirror ) ||
- ( ! pData->bMirrorMode && bMirror )
- )
- {
- pData->bMirrorMode = bMirror;
- if( !!pData->aImage )
- pData->aImage = ImplMirrorImage( pData->aImage );
- }
- }
-}
-
Image Menu::GetItemImage( sal_uInt16 nItemId ) const
{
MenuItemData* pData = pItemList->GetData( nItemId );
@@ -2750,12 +2695,6 @@ void MenuBar::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<MenuBar::
pMenuWin->SetMenuBarButtonHighlightHdl(nId, rLink);
}
-Rectangle MenuBar::GetMenuBarButtonRectPixel( sal_uInt16 nId )
-{
- MenuBarWindow* pMenuWin = getMenuBarWindow();
- return pMenuWin ? pMenuWin->GetMenuBarButtonRectPixel(nId) : Rectangle();
-}
-
void MenuBar::RemoveMenuBarButton( sal_uInt16 nId )
{
MenuBarWindow* pMenuWin = getMenuBarWindow();
@@ -2764,6 +2703,12 @@ void MenuBar::RemoveMenuBarButton( sal_uInt16 nId )
pMenuWin->RemoveMenuBarButton(nId);
}
+Rectangle MenuBar::GetMenuBarButtonRectPixel( sal_uInt16 nId )
+{
+ MenuBarWindow* pMenuWin = getMenuBarWindow();
+ return pMenuWin ? pMenuWin->GetMenuBarButtonRectPixel(nId) : Rectangle();
+}
+
bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId )
{
MenuBarWindow* pMenuWin = getMenuBarWindow();
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 7f92c64..d659503 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -162,39 +162,6 @@ void SystemChildWindow::EnableEraseBackground( bool bEnable )
mpWindowImpl->mpSysObj->EnableEraseBackground( bEnable );
}
-void SystemChildWindow::ImplTestJavaException( void* pEnv )
-{
-#if HAVE_FEATURE_JAVA
- JNIEnv* pJavaEnv = static_cast< JNIEnv* >( pEnv );
- jthrowable jtThrowable = pJavaEnv->ExceptionOccurred();
-
- if( jtThrowable )
- { // is it a java exception ?
-#if OSL_DEBUG_LEVEL > 1
- pJavaEnv->ExceptionDescribe();
-#endif // OSL_DEBUG_LEVEL > 1
- pJavaEnv->ExceptionClear();
-
- jclass jcThrowable = pJavaEnv->FindClass("java/lang/Throwable");
- jmethodID jmThrowable_getMessage = pJavaEnv->GetMethodID(jcThrowable, "getMessage", "()Ljava/lang/String;");
- jstring jsMessage = static_cast<jstring>( pJavaEnv->CallObjectMethod(jtThrowable, jmThrowable_getMessage) );
- OUString ouMessage;
-
- if(jsMessage)
- {
- const jchar * jcMessage = pJavaEnv->GetStringChars(jsMessage, nullptr);
- ouMessage = OUString(
- reinterpret_cast<sal_Unicode const *>(jcMessage));
- pJavaEnv->ReleaseStringChars(jsMessage, jcMessage);
- }
-
- throw uno::RuntimeException(ouMessage);
- }
-#else
- (void)pEnv;
-#endif // HAVE_FEATURE_JAVA
-}
-
void SystemChildWindow::SetForwardKey( bool bEnable )
{
if ( mpWindowImpl->mpSysObj )
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 62aeca1..513f5e5 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -119,23 +119,6 @@ void ServerFontInstance::HandleFontOptions()
}
CairoFontsCache::LRUFonts CairoFontsCache::maLRUFonts;
-int CairoFontsCache::mnRefCount = 0;
-
-CairoFontsCache::CairoFontsCache()
-{
- ++mnRefCount;
-}
-
-CairoFontsCache::~CairoFontsCache()
-{
- --mnRefCount;
- if (!mnRefCount && !maLRUFonts.empty())
- {
- LRUFonts::iterator aEnd = maLRUFonts.end();
- for (LRUFonts::iterator aI = maLRUFonts.begin(); aI != aEnd; ++aI)
- cairo_font_face_destroy(static_cast<cairo_font_face_t*>(aI->first));
- }
-}
void CairoFontsCache::CacheFont(void *pFont, const CairoFontsCache::CacheId &rId)
{
diff --git a/vcl/unx/generic/glyphs/scrptrun.h b/vcl/unx/generic/glyphs/scrptrun.h
index 2efcff4..a13b65f 100644
--- a/vcl/unx/generic/glyphs/scrptrun.h
+++ b/vcl/unx/generic/glyphs/scrptrun.h
@@ -60,12 +60,9 @@ struct ParenStackEntry
class ScriptRun : public UObject {
public:
- ScriptRun();
ScriptRun(const UChar chars[], int32_t length);
- ScriptRun(const UChar chars[], int32_t start, int32_t length);
-
void reset();
void reset(int32_t start, int32_t count);
@@ -114,21 +111,11 @@ private:
static const char fgClassID;
};
-inline ScriptRun::ScriptRun()
-{
- reset(NULL, 0, 0);
-}
-
inline ScriptRun::ScriptRun(const UChar chars[], int32_t length)
{
reset(chars, 0, length);
}
-inline ScriptRun::ScriptRun(const UChar chars[], int32_t start, int32_t length)
-{
- reset(chars, start, length);
-}
-
inline int32_t ScriptRun::getScriptStart()
{
return scriptStart;
More information about the Libreoffice-commits
mailing list