[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/opengl vcl/source vcl/unx
Noel Grandin
noel.grandin at collabora.co.uk
Wed Oct 26 06:49:53 UTC 2016
include/vcl/bitmap.hxx | 6 --
include/vcl/btndlg.hxx | 2
include/vcl/builder.hxx | 2
include/vcl/dockwin.hxx | 1
include/vcl/field.hxx | 2
include/vcl/layout.hxx | 8 --
include/vcl/print.hxx | 5 -
include/vcl/printerinfomanager.hxx | 1
include/vcl/settings.hxx | 4 -
include/vcl/texteng.hxx | 3 -
include/vcl/threadex.hxx | 5 -
include/vcl/toolbox.hxx | 2
include/vcl/window.hxx | 1
vcl/inc/brdwin.hxx | 3 -
vcl/inc/listbox.hxx | 3 -
vcl/inc/octree.hxx | 1
vcl/inc/opengl/BufferObject.hxx | 17 ++----
vcl/inc/opengl/texture.hxx | 1
vcl/inc/printdlg.hxx | 1
vcl/inc/unx/glyphcache.hxx | 1
vcl/inc/unx/gtk/gtkframe.hxx | 2
vcl/inc/unx/saldisp.hxx | 1
vcl/opengl/texture.cxx | 5 -
vcl/source/app/settings.cxx | 26 ++-------
vcl/source/components/dtranscomp.cxx | 68 ++++++++-----------------
vcl/source/control/field.cxx | 9 +--
vcl/source/control/imp_listbox.cxx | 16 -----
vcl/source/edit/texteng.cxx | 21 +------
vcl/source/filter/wmf/wmfwr.cxx | 7 --
vcl/source/filter/wmf/wmfwr.hxx | 1
vcl/source/gdi/bitmap.cxx | 4 -
vcl/source/gdi/octree.cxx | 16 ++---
vcl/source/gdi/print.cxx | 9 +--
vcl/source/gdi/textlayout.cxx | 14 -----
vcl/source/helper/threadex.cxx | 2
vcl/source/window/brdwin.cxx | 9 ---
vcl/source/window/btndlg.cxx | 9 ---
vcl/source/window/builder.cxx | 14 -----
vcl/source/window/dockwin.cxx | 2
vcl/source/window/layout.cxx | 4 -
vcl/source/window/paint.cxx | 9 ---
vcl/source/window/printdlg.cxx | 5 -
vcl/source/window/toolbox.cxx | 10 +++
vcl/source/window/toolbox2.cxx | 16 -----
vcl/unx/generic/app/saldisp.cxx | 2
vcl/unx/generic/gdi/cairo_xlib_cairo.cxx | 2
vcl/unx/generic/gdi/cairo_xlib_cairo.hxx | 1
vcl/unx/generic/gdi/xrender_peer.cxx | 2
vcl/unx/generic/gdi/xrender_peer.hxx | 8 --
vcl/unx/generic/glyphs/glyphcache.cxx | 5 -
vcl/unx/generic/print/glyphset.cxx | 8 --
vcl/unx/generic/print/glyphset.hxx | 19 +++---
vcl/unx/generic/printer/printerinfomanager.cxx | 12 +---
vcl/unx/gtk3/gtk3gtkframe.cxx | 9 ---
54 files changed, 98 insertions(+), 318 deletions(-)
New commits:
commit fe1f1247fad782bdf43322532fdeb1ba9f03135a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Oct 25 11:24:19 2016 +0200
loplugin:expandablemethods in vcl
Change-Id: I1876e203d3a3a5fa36d83a9b282ba49429c1da2a
Reviewed-on: https://gerrit.libreoffice.org/30261
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 22cf1675..0f773ba 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -241,7 +241,6 @@ public:
inline bool operator==( const Bitmap& rBitmap ) const;
inline bool operator!=( const Bitmap& rBitmap ) const;
- inline bool IsSameInstance( const Bitmap& rBmp ) const;
bool IsEqual( const Bitmap& rBmp ) const;
inline bool IsEmpty() const;
@@ -772,11 +771,6 @@ inline bool Bitmap::operator!=( const Bitmap& rBitmap ) const
return( rBitmap.mxImpBmp != mxImpBmp );
}
-inline bool Bitmap::IsSameInstance( const Bitmap& rBitmap ) const
-{
- return( rBitmap.mxImpBmp == mxImpBmp );
-}
-
inline bool Bitmap::IsEmpty() const
{
return( mxImpBmp == nullptr );
diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index 139033b..5c239d7 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -57,8 +57,6 @@ public:
virtual void Resize() override;
virtual void StateChanged( StateChangedType nStateChange ) override;
- void Click();
-
void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; }
sal_uInt16 GetCurButtonId() const { return mnCurButtonId; }
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 9c8be70..428f9aa 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -375,8 +375,6 @@ private:
void handleListStore(xmlreader::XmlReader &reader, const OString &rID);
void handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex);
- void handleAdjustment(const OString &rID, stringmap &rProperties);
- void handleTextBuffer(const OString &rID, stringmap &rProperties);
void handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &reader);
void handleMenu(xmlreader::XmlReader &reader, const OString &rID);
std::vector<OString> handleItems(xmlreader::XmlReader &reader, const OString &rID);
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index bbaef0f..041ade5 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -263,7 +263,6 @@ protected:
public:
bool isLayoutEnabled() const;
void setOptimalLayoutSize();
- bool isCalculatingInitialLayoutSize() const { return mbIsCalculatingInitialLayoutSize; }
SAL_DLLPRIVATE bool ImplStartDocking( const Point& rPos );
SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; }
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 09e9a4e..68c90d9 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -258,8 +258,6 @@ public:
virtual void Reformat() override;
- OUString GetCurrencySymbol() const;
-
virtual void SetValue( sal_Int64 nNewValue ) override;
virtual sal_Int64 GetValue() const override;
virtual OUString CreateFieldText( sal_Int64 nValue ) const override;
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 4ed021f..800f5ac 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -328,14 +328,6 @@ public:
, m_nRowSpacing(0), m_nColumnSpacing(0)
{
}
- void set_row_homogeneous(bool bHomogeneous)
- {
- m_bRowHomogeneous = bHomogeneous;
- }
- void set_column_homogeneous(bool bHomogeneous)
- {
- m_bColumnHomogeneous = bHomogeneous;
- }
bool get_row_homogeneous() const
{
return m_bRowHomogeneous;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 5578615..f20a647 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -309,11 +309,6 @@ public:
Orientation GetOrientation() const;
bool SetDuplexMode( DuplexMode );
- /** @return The angle that a landscape page will be turned counterclockwise wrt to portrait.
-
- The return value may be only valid for the current paper
- */
- int GetLandscapeAngle() const;
bool SetPaperBin( sal_uInt16 nPaperBin );
sal_uInt16 GetPaperBin() const;
bool SetPaper( Paper ePaper );
diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx
index 49482bd..6dddd02 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -123,7 +123,6 @@ protected:
// if a paper is already set it will not be overwritten
void setDefaultPaper( PPDContext& rInfo ) const;
- void initSystemDefaultPaper();
public:
// there can only be one
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 2dcd0db..bd51613 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -604,9 +604,6 @@ public:
class VCL_DLLPUBLIC MiscSettings
{
- void CopyData();
-
-private:
std::shared_ptr<ImplMiscData> mxData;
public:
@@ -629,7 +626,6 @@ public:
class VCL_DLLPUBLIC HelpSettings
{
- void CopyData();
std::shared_ptr<ImplHelpData> mxData;
public:
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index f9d3e19..5d18075 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -166,9 +166,6 @@ protected:
void ImpParagraphRemoved( sal_uInt32 nPara );
void ImpCharsRemoved( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars );
void ImpCharsInserted( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars );
- void ImpFormattingParagraph( sal_uInt32 nPara );
- void ImpTextHeightChanged();
- void ImpTextFormatted();
DECL_LINK( IdleFormatHdl, Idle *, void );
void CheckIdleFormatter();
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 67baa06..076974b 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -45,10 +45,7 @@ namespace vcl
virtual ~SolarThreadExecutor();
virtual long doIt() = 0;
- void execute() { impl_execute(); }
-
- private:
- void impl_execute();
+ void execute();
};
namespace solarthread {
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 5024e08..ab1dfaf 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -197,7 +197,6 @@ private:
SAL_DLLPRIVATE void ImplFillLayoutData() const;
SAL_DLLPRIVATE bool ImplHasClippedItems();
SAL_DLLPRIVATE Point ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) const;
- SAL_DLLPRIVATE void ImplExecuteCustomMenu();
SAL_DLLPRIVATE bool ImplIsFloatingMode() const;
SAL_DLLPRIVATE bool ImplIsInPopupMode() const;
SAL_DLLPRIVATE const OUString& ImplGetHelpText( sal_uInt16 nItemId ) const;
@@ -370,7 +369,6 @@ public:
void SetItemImage( sal_uInt16 nItemId, const Image& rImage );
Image GetItemImage( sal_uInt16 nItemId ) const;
Image GetItemImageOriginal( sal_uInt16 nItemId ) const;
- void UpdateImageOrientation();
void SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 );
void SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror );
void SetItemText( sal_uInt16 nItemId, const OUString& rText );
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ae93080..54810ee 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -688,7 +688,6 @@ private:
SAL_DLLPRIVATE void ImplCallPaint(const vcl::Region* pRegion, sal_uInt16 nPaintFlags);
SAL_DLLPRIVATE void ImplCallOverlapPaint();
- SAL_DLLPRIVATE void ImplPostPaint();
SAL_DLLPRIVATE void ImplUpdateWindowPtr( vcl::Window* pWindow );
SAL_DLLPRIVATE void ImplUpdateWindowPtr();
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index e42ca64..3e02d04 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -109,9 +109,6 @@ private:
void ImplInit( vcl::Window* pParent,
WinBits nStyle, BorderWindowStyle nTypeStyle,
SystemParentData* pParentData );
- void ImplInit( vcl::Window* pParent,
- WinBits nStyle, BorderWindowStyle nTypeStyle,
- const css::uno::Any& );
ImplBorderWindow (const ImplBorderWindow &) = delete;
ImplBorderWindow& operator= (const ImplBorderWindow &) = delete;
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 48bcdab..5802613 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -543,8 +543,6 @@ public:
void SetImage( const Image& rImg ) { maImage = rImg; }
- void MBDown();
-
void SetMBDownHdl( const Link<void*,void>& rLink ) { maMBDownHdl = rLink; }
void SetUserDrawHdl( const Link<UserDrawEvent*, void>& rLink ) { maUserDrawHdl = rLink; }
@@ -576,7 +574,6 @@ public:
ImplBtn( vcl::Window* pParent, WinBits nWinStyle );
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
- void MBDown();
void SetMBDownHdl( const Link<void*,void>& rLink ) { maMBDownHdl = rLink; }
};
diff --git a/vcl/inc/octree.hxx b/vcl/inc/octree.hxx
index bc9facb..44a4c5e 100644
--- a/vcl/inc/octree.hxx
+++ b/vcl/inc/octree.hxx
@@ -48,7 +48,6 @@ private:
void CreatePalette( NODE* pNode );
void GetPalIndex( NODE* pNode );
- SAL_DLLPRIVATE void ImplCreateOctree();
SAL_DLLPRIVATE void ImplDeleteOctree( NODE** ppNode );
SAL_DLLPRIVATE void ImplAdd( NODE** ppNode );
SAL_DLLPRIVATE void ImplReduce();
diff --git a/vcl/inc/opengl/BufferObject.hxx b/vcl/inc/opengl/BufferObject.hxx
index 3cda66d..56f3aa9 100644
--- a/vcl/inc/opengl/BufferObject.hxx
+++ b/vcl/inc/opengl/BufferObject.hxx
@@ -30,7 +30,12 @@ public:
virtual ~BufferObject()
{
- dispose();
+ if (mId)
+ {
+ glDeleteBuffers(1, &mId);
+ CHECK_GL_ERROR();
+ mId = 0;
+ }
}
void bind()
@@ -61,16 +66,6 @@ public:
}
}
- void dispose()
- {
- if (mId)
- {
- glDeleteBuffers(1, &mId);
- CHECK_GL_ERROR();
- mId = 0;
- }
- }
-
};
template<typename TYPE>
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index b092473..923e9d4 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -47,7 +47,6 @@ public:
ImplOpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, void const * pData );
ImplOpenGLTexture( int nX, int nY, int nWidth, int nHeight );
~ImplOpenGLTexture();
- void Dispose();
bool InsertBuffer(int nX, int nY, int nWidth, int nHeight, int nFormat, int nType, sal_uInt8* pData);
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 69d6771..fc30c21 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -77,7 +77,6 @@ namespace vcl
NupOrderType mnOrderMode;
int mnRows;
int mnColumns;
- void ImplInitSettings();
public:
ShowNupOrderWindow( vcl::Window* pParent );
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 7cb2a84..f289421 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -79,7 +79,6 @@ private:
void AddedGlyph( ServerFont&, GlyphData& );
void RemovingGlyph();
void UsingGlyph( ServerFont&, GlyphData& );
- void GrowNotify();
private:
void GarbageCollect();
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 40ae9e2..c6d7743 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -423,8 +423,6 @@ public:
void startDrag(gint nButton, gint nDragOriginX, gint nDragOriginY,
GdkDragAction sourceActions, GtkTargetList* pTargetList);
- void WithDrawn();
-
static void closePopup();
#endif
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index f4d2b23..e1e6d5f 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -351,7 +351,6 @@ public:
const SalX11Screen& GetDefaultXScreen() const { return m_nXDefaultScreen; }
const Size& GetScreenSize( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aSize; }
srv_vendor_t GetServerVendor() const { return meServerVendor; }
- void SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); }
bool IsDisplay() const { return !!pXLib_; }
GC GetCopyGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aCopyGC; }
Pixmap GetInvert50( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_hInvert50; }
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index dd358aa..0681161 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -157,11 +157,6 @@ GLuint ImplOpenGLTexture::AddStencil()
ImplOpenGLTexture::~ImplOpenGLTexture()
{
VCL_GL_INFO( "~OpenGLTexture " << mnTexture );
- Dispose();
-}
-
-void ImplOpenGLTexture::Dispose()
-{
if( mnTexture != 0 )
{
// During shutdown GL is already de-initialized, so we should not try to create a new context.
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 6c9f743..5ca3f6f 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2381,14 +2381,6 @@ MiscSettings::~MiscSettings()
{
}
-void MiscSettings::CopyData()
-{
- // copy if other references exist
- if ( ! mxData.unique() ) {
- mxData = std::make_shared<ImplMiscData>(*mxData);
- }
-}
-
bool MiscSettings::operator ==( const MiscSettings& rSet ) const
{
if ( mxData == rSet.mxData )
@@ -2548,7 +2540,10 @@ void MiscSettings::SetEnableATToolSupport( bool bEnable )
void MiscSettings::SetEnableLocalizedDecimalSep( bool bEnable )
{
- CopyData();
+ // copy if other references exist
+ if ( ! mxData.unique() ) {
+ mxData = std::make_shared<ImplMiscData>(*mxData);
+ }
mxData->mbEnableLocalizedDecimalSep = bEnable;
}
@@ -2585,14 +2580,6 @@ HelpSettings::~HelpSettings()
{
}
-void HelpSettings::CopyData()
-{
- // copy if other references exist
- if ( ! mxData.unique() ) {
- mxData = std::make_shared<ImplHelpData>(*mxData);
- }
-}
-
bool HelpSettings::operator ==( const HelpSettings& rSet ) const
{
if ( mxData == rSet.mxData )
@@ -2615,7 +2602,10 @@ HelpSettings::GetTipDelay() const
void
HelpSettings::SetTipTimeout( sal_uLong nTipTimeout )
{
- CopyData();
+ // copy if other references exist
+ if ( ! mxData.unique() ) {
+ mxData = std::make_shared<ImplHelpData>(*mxData);
+ }
mxData->mnTipTimeout = nTipTimeout;
}
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index c58835b..9456ca5 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -78,7 +78,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) override;
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override;
- static OUString getImplementationName_static();
static Sequence< OUString > getSupportedServiceNames_static();
/*
@@ -119,11 +118,6 @@ GenericClipboard::~GenericClipboard()
{
}
-OUString GenericClipboard::getImplementationName_static()
-{
- return OUString( "com.sun.star.datatransfer.VCLGenericClipboard" );
-}
-
Sequence< OUString > GenericClipboard::getSupportedServiceNames_static()
{
Sequence< OUString > aRet { "com.sun.star.datatransfer.clipboard.SystemClipboard" };
@@ -132,7 +126,7 @@ Sequence< OUString > GenericClipboard::getSupportedServiceNames_static()
OUString GenericClipboard::getImplementationName() throw( RuntimeException, std::exception )
{
- return getImplementationName_static();
+ return OUString("com.sun.star.datatransfer.VCLGenericClipboard");
}
Sequence< OUString > GenericClipboard::getSupportedServiceNames() throw( RuntimeException, std::exception )
@@ -243,17 +237,15 @@ Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Seq
OUString SAL_CALL Clipboard_getImplementationName()
{
- #if defined UNX
return OUString(
- #if ! defined MACOSX
+ #if defined MACOSX
+ "com.sun.star.datatransfer.clipboard.AquaClipboard"
+ #elif defined UNX
"com.sun.star.datatransfer.X11ClipboardSupport"
#else
- "com.sun.star.datatransfer.clipboard.AquaClipboard"
+ "com.sun.star.datatransfer.VCLGenericClipboard"
#endif
);
- #else
- return GenericClipboard::getImplementationName_static();
- #endif
}
Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory( const Reference< XMultiServiceFactory > & )
@@ -290,7 +282,7 @@ public:
OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override
- { return getImplementationName_static(); }
+ { return OUString("com.sun.star.datatransfer.dnd.VclGenericDragSource"); }
sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException, std::exception) override
@@ -305,11 +297,6 @@ public:
Sequence<OUString> aRet { "com.sun.star.datatransfer.dnd.GenericDragSource" };
return aRet;
}
-
- static OUString getImplementationName_static()
- {
- return OUString("com.sun.star.datatransfer.dnd.VclGenericDragSource");
- }
};
GenericDragSource::~GenericDragSource()
@@ -345,27 +332,23 @@ void GenericDragSource::initialize( const Sequence< Any >& ) throw( Exception, s
Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames()
{
#if defined MACOSX
- return Sequence< OUString > { "com.sun.star.datatransfer.dnd.OleDragSource" };
+ return { "com.sun.star.datatransfer.dnd.OleDragSource" };
#elif defined UNX
- return Sequence< OUString > { "com.sun.star.datatransfer.dnd.X11DragSource" };
+ return { "com.sun.star.datatransfer.dnd.X11DragSource" };
#else
- return GenericDragSource::getSupportedServiceNames_static();
+ return { "com.sun.star.datatransfer.dnd.VclGenericDragSource" };
#endif
}
OUString SAL_CALL DragSource_getImplementationName()
{
- #if defined UNX
- return OUString(
- #if ! defined MACOSX
- "com.sun.star.datatransfer.dnd.XdndSupport"
- #else
- "com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"
- #endif
- );
- #else
- return GenericDragSource::getImplementationName_static();
- #endif
+#if defined MACOSX
+ return OUString("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1");
+#elif defined UNX
+ return OUString("com.sun.star.datatransfer.dnd.XdndSupport");
+#else
+ return OUString("com.sun.star.datatransfer.dnd.VclGenericDragSource");
+#endif
}
Reference< XInterface > SAL_CALL DragSource_createInstance( const Reference< XMultiServiceFactory >& )
@@ -404,7 +387,7 @@ public:
OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override
- { return getImplementationName_static(); }
+ { return OUString("com.sun.star.datatransfer.dnd.VclGenericDropTarget"); }
sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException, std::exception) override
@@ -419,11 +402,6 @@ public:
Sequence<OUString> aRet { "com.sun.star.datatransfer.dnd.GenericDropTarget" };
return aRet;
}
-
- static OUString getImplementationName_static()
- {
- return OUString("com.sun.star.datatransfer.dnd.VclGenericDropTarget");
- }
};
GenericDropTarget::~GenericDropTarget()
@@ -473,17 +451,15 @@ Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames()
OUString SAL_CALL DropTarget_getImplementationName()
{
- #if defined UNX
return OUString(
- #if ! defined MACOSX
- "com.sun.star.datatransfer.dnd.XdndDropTarget"
- #else
+ #if defined MACOSX
"com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"
- #endif
- );
+ #elif defined UNX
+ "com.sun.star.datatransfer.dnd.XdndDropTarget"
#else
- return GenericDropTarget::getImplementationName_static();
+ "com.sun.star.datatransfer.dnd.VclGenericDropTarget"
#endif
+ );
}
Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMultiServiceFactory >& )
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 8765e34..fe4d60c 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1845,11 +1845,6 @@ CurrencyFormatter::~CurrencyFormatter()
{
}
-OUString CurrencyFormatter::GetCurrencySymbol() const
-{
- return ImplGetLocaleDataWrapper().getCurrSymbol();
-}
-
void CurrencyFormatter::SetValue( sal_Int64 nNewValue )
{
SetUserValue( nNewValue );
@@ -1859,7 +1854,9 @@ void CurrencyFormatter::SetValue( sal_Int64 nNewValue )
OUString CurrencyFormatter::CreateFieldText( sal_Int64 nValue ) const
{
- return ImplGetLocaleDataWrapper().getCurr( nValue, GetDecimalDigits(), GetCurrencySymbol(), IsUseThousandSep() );
+ return ImplGetLocaleDataWrapper().getCurr( nValue, GetDecimalDigits(),
+ ImplGetLocaleDataWrapper().getCurrSymbol(),
+ IsUseThousandSep() );
}
sal_Int64 CurrencyFormatter::GetValue() const
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index e6359c7..70deaae 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2575,17 +2575,11 @@ ImplWin::ImplWin( vcl::Window* pParent, WinBits nWinStyle ) :
mnItemPos = LISTBOX_ENTRY_NOTFOUND;
}
-void ImplWin::MBDown()
-{
- if (IsEnabled())
- maMBDownHdl.Call(this);
-}
-
void ImplWin::MouseButtonDown( const MouseEvent& )
{
if( IsEnabled() )
{
- MBDown();
+ maMBDownHdl.Call(this);
}
}
@@ -2885,18 +2879,12 @@ ImplBtn::ImplBtn( vcl::Window* pParent, WinBits nWinStyle ) :
{
}
-void ImplBtn::MBDown()
-{
- if (IsEnabled())
- maMBDownHdl.Call(this);
-}
-
void ImplBtn::MouseButtonDown( const MouseEvent& )
{
//PushButton::MouseButtonDown( rMEvt );
if( IsEnabled() )
{
- MBDown();
+ maMBDownHdl.Call(this);
mbDown = true;
}
}
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 20969d2..f91e69d 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -1519,7 +1519,7 @@ void TextEngine::FormatDoc()
{
const long nOldParaWidth = mnCurTextWidth >= 0 ? CalcTextWidth( nPara ) : -1;
- ImpFormattingParagraph( nPara );
+ Broadcast( TextHint( TEXT_HINT_FORMATPARA, nPara ) );
if ( CreateLines( nPara ) )
bGrow = true;
@@ -1578,14 +1578,14 @@ void TextEngine::FormatDoc()
if ( nDiff )
{
mbFormatted = true;
- ImpTextHeightChanged();
+ Broadcast( TextHint( TEXT_HINT_TEXTHEIGHTCHANGED ) );
}
}
mbIsFormatting = false;
mbFormatted = true;
- ImpTextFormatted();
+ Broadcast( TextHint( TEXT_HINT_TEXTFORMATTED ) );
}
void TextEngine::CreateAndInsertEmptyLine( sal_uInt32 nPara )
@@ -2746,21 +2746,6 @@ void TextEngine::ImpCharsInserted( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 n
Broadcast( TextHint( TEXT_HINT_PARACONTENTCHANGED, nPara ) );
}
-void TextEngine::ImpFormattingParagraph( sal_uInt32 nPara )
-{
- Broadcast( TextHint( TEXT_HINT_FORMATPARA, nPara ) );
-}
-
-void TextEngine::ImpTextHeightChanged()
-{
- Broadcast( TextHint( TEXT_HINT_TEXTHEIGHTCHANGED ) );
-}
-
-void TextEngine::ImpTextFormatted()
-{
- Broadcast( TextHint( TEXT_HINT_TEXTFORMATTED ) );
-}
-
void TextEngine::Draw( OutputDevice* pDev, const Point& rPos )
{
ImpPaint( pDev, rPos, nullptr );
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 3d8bb91..969a6f7 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -838,11 +838,6 @@ void WMFWriter::TrueTextOut(const Point & rPoint, const OString& rString)
UpdateRecordHeader();
}
-void WMFWriter::WMFRecord_EndOfFile()
-{
- WriteRecordHeader(0x00000003,0x0000);
-}
-
void WMFWriter::WMFRecord_IntersectClipRect( const Rectangle& rRect )
{
WriteRecordHeader( 0x00000007, W_META_INTERSECTCLIPRECT );
@@ -1787,7 +1782,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
// Write records
WriteRecords(rMTF);
- WMFRecord_EndOfFile();
+ WriteRecordHeader(0x00000003,0x0000); // end of file
UpdateHeader();
while(pAttrStack)
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index 47e0d56..c7d130e 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -170,7 +170,6 @@ private:
void WMFRecord_SetWindowOrg(const Point & rPoint);
void WMFRecord_StretchDIB(const Point & rPoint, const Size & rSize, const Bitmap & rBitmap, sal_uInt32 nROP = 0UL );
void WMFRecord_TextOut(const Point & rPoint, const OUString & rString);
- void WMFRecord_EndOfFile();
void WMFRecord_IntersectClipRect( const Rectangle& rRect);
sal_uInt16 AllocHandle();
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index e9461d1..cf0bf70 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -241,8 +241,8 @@ Bitmap& Bitmap::operator=( Bitmap&& rBitmap )
bool Bitmap::IsEqual( const Bitmap& rBmp ) const
{
- return(IsSameInstance(rBmp) || // Includes both are nullptr
- (rBmp.mxImpBmp && mxImpBmp && mxImpBmp->ImplIsEqual(*rBmp.mxImpBmp)));
+ return rBmp.mxImpBmp == mxImpBmp || // Includes both are nullptr
+ (rBmp.mxImpBmp && mxImpBmp && mxImpBmp->ImplIsEqual(*rBmp.mxImpBmp));
}
void Bitmap::SetEmpty()
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index cfd079b..7df368b 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -60,17 +60,7 @@ Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) :
{
pNodeCache = new ImpNodeCache( nColors );
memset( pReduce, 0, ( OCTREE_BITS + 1 ) * sizeof( NODE* ) );
- ImplCreateOctree();
-}
-
-Octree::~Octree()
-{
- ImplDeleteOctree( &pTree );
- delete pNodeCache;
-}
-void Octree::ImplCreateOctree()
-{
if( !!*pAcc )
{
const long nWidth = pAcc->Width();
@@ -113,6 +103,12 @@ void Octree::ImplCreateOctree()
}
}
+Octree::~Octree()
+{
+ ImplDeleteOctree( &pTree );
+ delete pNodeCache;
+}
+
void Octree::ImplDeleteOctree( NODE** ppNode )
{
for (OctreeNode* i : (*ppNode)->pChild)
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 45c771a..da2305c 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1306,7 +1306,9 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe
{
ImplJobSetup& rData = aJobSetup.ImplGetData();
- int nLandscapeAngle = GetLandscapeAngle();
+ // The angle that a landscape page will be turned counterclockwise wrt to portrait.
+ int nLandscapeAngle = mpInfoPrinter ? mpInfoPrinter->GetLandscapeAngle( &maJobSetup.ImplGetConstData() ) : 900;
+
int nPaperCount = GetPaperInfoCount();
bool bFound = false;
@@ -1596,11 +1598,6 @@ bool Printer::SetDuplexMode( DuplexMode eDuplex )
return true;
}
-int Printer::GetLandscapeAngle() const
-{
- return mpInfoPrinter ? mpInfoPrinter->GetLandscapeAngle( &maJobSetup.ImplGetConstData() ) : 900;
-}
-
Paper Printer::GetPaper() const
{
return maJobSetup.ImplGetConstData().GetPaperFormat();
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 4d9783e..ad11dee 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -87,16 +87,6 @@ namespace vcl
long GetTextArray( const OUString& _rText, long* _pDXAry, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const;
Rectangle DrawText( const Rectangle& _rRect, const OUString& _rText, DrawTextFlags _nStyle, MetricVector* _pVector, OUString* _pDisplayText );
- protected:
- void onBeginDrawText()
- {
- m_aCompleteTextRect.SetEmpty();
- }
- const Rectangle& onEndDrawText()
- {
- return m_aCompleteTextRect;
- }
-
private:
OutputDevice& m_rTargetDevice;
OutputDevice& m_rReferenceDevice;
@@ -268,9 +258,9 @@ namespace vcl
// but passed pixel coordinates. So, adjust the rect.
Rectangle aRect( m_rTargetDevice.PixelToLogic( _rRect ) );
- onBeginDrawText();
+ m_aCompleteTextRect.SetEmpty();
m_rTargetDevice.DrawText( aRect, _rText, _nStyle, _pVector, _pDisplayText, this );
- Rectangle aTextRect = onEndDrawText();
+ Rectangle aTextRect = m_aCompleteTextRect;
if ( aTextRect.IsEmpty() && !aRect.IsEmpty() )
{
diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx
index f09f2f4..24b418e 100644
--- a/vcl/source/helper/threadex.cxx
+++ b/vcl/source/helper/threadex.cxx
@@ -46,7 +46,7 @@ IMPL_LINK_NOARG(SolarThreadExecutor, worker, void*, void)
}
}
-void SolarThreadExecutor::impl_execute()
+void SolarThreadExecutor::execute()
{
if( ::osl::Thread::getCurrentIdentifier() == Application::GetMainThreadIdentifier() )
{
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 842fe83..ce63cfd 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1709,13 +1709,6 @@ void ImplStdBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, con
void ImplBorderWindow::ImplInit( vcl::Window* pParent,
WinBits nStyle, BorderWindowStyle nTypeStyle,
- const css::uno::Any& )
-{
- ImplInit( pParent, nStyle, nTypeStyle, nullptr );
-}
-
-void ImplBorderWindow::ImplInit( vcl::Window* pParent,
- WinBits nStyle, BorderWindowStyle nTypeStyle,
SystemParentData* pSystemParentData
)
{
@@ -1804,7 +1797,7 @@ ImplBorderWindow::ImplBorderWindow( vcl::Window* pParent, WinBits nStyle ,
BorderWindowStyle nTypeStyle ) :
Window( WINDOW_BORDERWINDOW )
{
- ImplInit( pParent, nStyle, nTypeStyle, css::uno::Any() );
+ ImplInit( pParent, nStyle, nTypeStyle, nullptr );
}
ImplBorderWindow::~ImplBorderWindow()
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 70d3d45..aafb1c8 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -220,7 +220,8 @@ IMPL_LINK( ButtonDialog, ImplClickHdl, Button*, pBtn, void )
if ( it->mpPushButton == pBtn )
{
mnCurButtonId = it->mnId;
- Click();
+ if ( IsInExecute() )
+ EndDialog( mnCurButtonId );
break;
}
}
@@ -260,12 +261,6 @@ void ButtonDialog::StateChanged( StateChangedType nType )
Dialog::StateChanged( nType );
}
-void ButtonDialog::Click()
-{
- if ( IsInExecute() )
- EndDialog( GetCurButtonId() );
-}
-
void ButtonDialog::AddButton( const OUString& rText, sal_uInt16 nId,
ButtonDialogFlags nBtnFlags, long nSepPixel )
{
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index a117a92..1c6db66 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2265,16 +2265,6 @@ void VclBuilder::collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rM
rMap[sProperty] = sValue;
}
-void VclBuilder::handleAdjustment(const OString &rID, stringmap &rProperties)
-{
- m_pParserState->m_aAdjustments[rID] = rProperties;
-}
-
-void VclBuilder::handleTextBuffer(const OString &rID, stringmap &rProperties)
-{
- m_pParserState->m_aTextBuffers[rID] = rProperties;
-}
-
void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex)
{
int nLevel = 1;
@@ -2904,12 +2894,12 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, xmlreader::Xm
if (sClass == "GtkAdjustment")
{
- handleAdjustment(sID, aProperties);
+ m_pParserState->m_aAdjustments[sID] = aProperties;
return nullptr;
}
else if (sClass == "GtkTextBuffer")
{
- handleTextBuffer(sID, aProperties);
+ m_pParserState->m_aTextBuffers[sID] = aProperties;
return nullptr;
}
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index e48df2e..c07dc21 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -1043,7 +1043,7 @@ Size DockingWindow::GetOptimalSize() const
void DockingWindow::queue_resize(StateChangedType eReason)
{
bool bTriggerLayout = true;
- if (maLayoutIdle.IsActive() || isCalculatingInitialLayoutSize())
+ if (maLayoutIdle.IsActive() || mbIsCalculatingInitialLayoutSize)
{
bTriggerLayout = false;
}
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 884e5e0..e624ed5 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1440,9 +1440,9 @@ bool VclGrid::set_property(const OString &rKey, const OString &rValue)
else if (rKey == "column-spacing")
set_column_spacing(rValue.toInt32());
else if (rKey == "row-homogeneous")
- set_row_homogeneous(toBool(rValue));
+ m_bRowHomogeneous = toBool(rValue);
else if (rKey == "column-homogeneous")
- set_column_homogeneous(toBool(rValue));
+ m_bColumnHomogeneous = toBool(rValue);
else if (rKey == "n-rows")
/*nothing to do*/;
else
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index af0896c..7639a0e 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -638,12 +638,6 @@ void Window::ImplCallOverlapPaint()
}
}
-void Window::ImplPostPaint()
-{
- if ( !mpWindowImpl->mpFrameData->maPaintIdle.IsActive() )
- mpWindowImpl->mpFrameData->maPaintIdle.Start();
-}
-
IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Idle *, void)
{
// save paint events until layout is done
@@ -732,7 +726,8 @@ void Window::ImplInvalidateFrameRegion( const vcl::Region* pRegion, InvalidateFl
pParent->ImplInvalidateFrameRegion( pChildRegion, nFlags );
}
}
- ImplPostPaint();
+ if ( !mpWindowImpl->mpFrameData->maPaintIdle.IsActive() )
+ mpWindowImpl->mpFrameData->maPaintIdle.Start();
}
void Window::ImplInvalidateOverlapFrameRegion( const vcl::Region& rRegion )
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index d0abe92..04e150d 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -310,11 +310,6 @@ PrintDialog::ShowNupOrderWindow::ShowNupOrderWindow( vcl::Window* i_pParent )
, mnRows( 1 )
, mnColumns( 1 )
{
- ImplInitSettings();
-}
-
-void PrintDialog::ShowNupOrderWindow::ImplInitSettings()
-{
SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFieldColor() ) );
}
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 24cb4a7..4378e01 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -18,6 +18,7 @@
*/
#include <vcl/toolbox.hxx>
+#include <vcl/commandinfoprovider.hxx>
#include <vcl/event.hxx>
#include <vcl/decoview.hxx>
#include <vcl/accel.hxx>
@@ -4518,7 +4519,14 @@ void ToolBox::statusChanged( const css::frame::FeatureStateEvent& Event )
mbImagesMirrored = aItem.IsMirrored();
mnImagesRotationAngle = aItem.GetRotation();
- UpdateImageOrientation();
+ // update image orientation
+ for (std::vector<ImplToolItem>::const_iterator it = mpData->m_aItems.begin(); it != mpData->m_aItems.end(); ++it)
+ {
+ if (vcl::CommandInfoProvider::Instance().IsMirrored(it->maCommandStr))
+ SetItemImageMirrorMode(it->mnId, mbImagesMirrored);
+ if (vcl::CommandInfoProvider::Instance().IsRotated(it->maCommandStr))
+ SetItemImageAngle(it->mnId, mnImagesRotationAngle);
+ }
}
}
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index af98244..677f9c1 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1067,17 +1067,6 @@ void ToolBox::SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror )
}
}
-void ToolBox::UpdateImageOrientation()
-{
- for (std::vector<ImplToolItem>::const_iterator it = mpData->m_aItems.begin(); it != mpData->m_aItems.end(); ++it)
- {
- if (vcl::CommandInfoProvider::Instance().IsMirrored(it->maCommandStr))
- SetItemImageMirrorMode(it->mnId, mbImagesMirrored);
- if (vcl::CommandInfoProvider::Instance().IsRotated(it->maCommandStr))
- SetItemImageAngle(it->mnId, mnImagesRotationAngle);
- }
-}
-
Image ToolBox::GetItemImage(sal_uInt16 nItemId) const
{
ImplToolItem* pItem = ImplGetItem(nItemId);
@@ -1718,11 +1707,6 @@ IMPL_LINK( ToolBox, ImplCustomMenuListener, VclMenuEvent&, rEvent, void )
IMPL_LINK_NOARG(ToolBox, ImplCallExecuteCustomMenu, void*, void)
{
mpData->mnEventId = nullptr;
- ImplExecuteCustomMenu();
-}
-
-void ToolBox::ImplExecuteCustomMenu()
-{
if( IsMenuEnabled() )
{
if( GetMenuType() & ToolBoxMenuType::Customize )
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 3cb7cec..0bff9b8 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -632,7 +632,7 @@ void SalDisplay::Init()
if( !nMaxRequestSize_ )
nMaxRequestSize_ = XMaxRequestSize( pDisp_ ) * 4;
- SetServerVendor();
+ meServerVendor = sal_GetServerVendor(pDisp_);
X11SalBitmap::ImplCreateCache();
// - - - - - - - - - - Synchronize - - - - - - - - - - - - -
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
index 85bb40a..7814e18 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
@@ -253,7 +253,7 @@ namespace cairo
SystemGraphicsData aSystemGraphicsData;
aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
- aSystemGraphicsData.hDrawable = getDrawable();
+ aSystemGraphicsData.hDrawable = mpPixmap ? mpPixmap->mhDrawable : maSysData.hDrawable;
aSystemGraphicsData.pXRenderFormat = getRenderFormat();
int width = cairo_xlib_surface_get_width(mpSurface.get());
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
index 6a58364..2c5261f 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
@@ -92,7 +92,6 @@ namespace cairo {
DeviceFormat getFormat() const;
const X11PixmapSharedPtr& getPixmap() const { return mpPixmap; }
void* getRenderFormat() const { return maSysData.pRenderFormat; }
- long getDrawable() const { return mpPixmap ? mpPixmap->mhDrawable : maSysData.hDrawable; }
};
}
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index 4104a5a..e5124db 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -44,7 +44,7 @@ void XRenderPeer::InitRenderLib()
// the 8bit alpha mask format must be there
XRenderPictFormat aPictFormat={0,0,8,{0,0,0,0,0,0,0,0xFF},0};
- mpStandardFormatA8 = FindPictureFormat( PictFormatAlphaMask|PictFormatDepth, aPictFormat );
+ mpStandardFormatA8 = XRenderFindFormat( mpDisplay, PictFormatAlphaMask|PictFormatDepth, &aPictFormat, 0 );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index 6bba583..d7387b9 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -47,8 +47,6 @@ public:
// the methods below are thin wrappers for the XRENDER API
XRenderPictFormat* FindVisualFormat( Visual* ) const;
- XRenderPictFormat* FindPictureFormat( unsigned long nMask,
- const XRenderPictFormat& ) const;
Picture CreatePicture( Drawable, const XRenderPictFormat*,
unsigned long nDrawable, const XRenderPictureAttributes* ) const;
void ChangePicture( Picture, unsigned long nValueMask,
@@ -81,12 +79,6 @@ inline XRenderPictFormat* XRenderPeer::FindVisualFormat( Visual* pVisual ) const
return XRenderFindVisualFormat ( mpDisplay, pVisual );
}
-inline XRenderPictFormat* XRenderPeer::FindPictureFormat( unsigned long nFormatMask,
- const XRenderPictFormat& rFormatAttr ) const
-{
- return XRenderFindFormat( mpDisplay, nFormatMask, &rFormatAttr, 0 );
-}
-
inline Picture XRenderPeer::CreatePicture( Drawable aDrawable,
const XRenderPictFormat* pVisFormat, unsigned long nValueMask,
const XRenderPictureAttributes* pRenderAttr ) const
diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx
index 22ee588..e0c04a4 100644
--- a/vcl/unx/generic/glyphs/glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/glyphcache.cxx
@@ -285,11 +285,6 @@ inline void GlyphCache::AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphDa
++mnGlyphCount;
mnBytesUsed += sizeof( rGlyphData );
UsingGlyph( rServerFont, rGlyphData );
- GrowNotify();
-}
-
-void GlyphCache::GrowNotify()
-{
if( mnBytesUsed > mnMaxSize )
GarbageCollect();
}
diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx
index 72fc2fa..65079bf 100644
--- a/vcl/unx/generic/print/glyphset.cxx
+++ b/vcl/unx/generic/print/glyphset.cxx
@@ -397,7 +397,7 @@ GlyphSet::PSDefineReencodedFont (osl::File* pOutFile, sal_Int32 nGlyphSetID)
sal_Int32 nSize = 0;
nSize += psp::appendStr ("(", pEncodingVector + nSize);
- nSize += psp::appendStr (GetReencodedFontName(nGlyphSetID).getStr(),
+ nSize += psp::appendStr (GetReencodedFontName(GetGlyphSetEncoding(nGlyphSetID), maBaseName).getStr(),
pEncodingVector + nSize);
nSize += psp::appendStr (") cvn (", pEncodingVector + nSize);
nSize += psp::appendStr (maBaseName.getStr(),
@@ -433,12 +433,6 @@ GlyphSet::GetReencodedFontName (rtl_TextEncoding nEnc, const OString &rFontName)
}
}
-OString
-GlyphSet::GetReencodedFontName (sal_Int32 nGlyphSetID)
-{
- return GetReencodedFontName (GetGlyphSetEncoding(nGlyphSetID), maBaseName);
-}
-
void GlyphSet::DrawGlyphs(
PrinterGfx& rGfx,
const Point& rPoint,
diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx
index 07d9cba..dfe17ce 100644
--- a/vcl/unx/generic/print/glyphset.hxx
+++ b/vcl/unx/generic/print/glyphset.hxx
@@ -41,8 +41,8 @@ class GlyphSet
private:
sal_Int32 mnFontID;
- bool mbVertical;
- OString maBaseName;
+ bool mbVertical;
+ OString maBaseName;
fonttype::type meBaseType;
rtl_TextEncoding mnBaseEncoding;
bool mbUseFontEncoding;
@@ -52,16 +52,15 @@ private:
typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t;
typedef std::list< glyph_map_t > glyph_list_t;
- char_list_t maCharList;
- glyph_list_t maGlyphList;
+ char_list_t maCharList;
+ glyph_list_t maGlyphList;
- OString GetGlyphSetName (sal_Int32 nGlyphSetID);
- OString GetCharSetName (sal_Int32 nGlyphSetID);
- sal_Int32 GetGlyphSetEncoding (sal_Int32 nGlyphSetID);
- OString GetGlyphSetEncodingName (sal_Int32 nGlyphSetID);
+ OString GetGlyphSetName (sal_Int32 nGlyphSetID);
+ OString GetCharSetName (sal_Int32 nGlyphSetID);
+ sal_Int32 GetGlyphSetEncoding (sal_Int32 nGlyphSetID);
+ OString GetGlyphSetEncodingName (sal_Int32 nGlyphSetID);
- OString GetReencodedFontName (sal_Int32 nGlyphSetID);
- void PSDefineReencodedFont (osl::File* pOutFile,
+ void PSDefineReencodedFont (osl::File* pOutFile,
sal_Int32 nGlyphSetID);
bool GetCharID (sal_Unicode nChar,
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 1a0c3b2..820610f 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -113,7 +113,10 @@ PrinterInfoManager::PrinterInfoManager( Type eType ) :
{
if( eType == Type::Default )
m_pQueueInfo = new SystemQueueInfo();
- initSystemDefaultPaper();
+
+ m_aSystemDefaultPaper = OStringToOUString(
+ PaperInfo::toPSName(PaperInfo::getSystemDefaultPaper().getPaper()),
+ RTL_TEXTENCODING_UTF8);
}
PrinterInfoManager::~PrinterInfoManager()
@@ -124,13 +127,6 @@ PrinterInfoManager::~PrinterInfoManager()
#endif
}
-void PrinterInfoManager::initSystemDefaultPaper()
-{
- m_aSystemDefaultPaper = OStringToOUString(
- PaperInfo::toPSName(PaperInfo::getSystemDefaultPaper().getPaper()),
- RTL_TEXTENCODING_UTF8);
-}
-
bool PrinterInfoManager::checkPrintersChanged( bool bWait )
{
// check if files were created, deleted or modified since initialize()
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 08dd543..f274a78 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2550,12 +2550,6 @@ void GtkSalFrame::StartToolKitMoveBy()
pEvent->button.time);
}
-void GtkSalFrame::WithDrawn()
-{
- if (isFloatGrabWindow())
- closePopup();
-}
-
void GtkSalFrame::closePopup()
{
if (!m_nFloats)
@@ -3148,7 +3142,8 @@ gboolean GtkSalFrame::signalWindowState( GtkWidget*, GdkEvent* pEvent, gpointer
if ((pEvent->window_state.new_window_state & GDK_WINDOW_STATE_WITHDRAWN) &&
!(pThis->m_nState & GDK_WINDOW_STATE_WITHDRAWN))
{
- pThis->WithDrawn();
+ if (pThis->isFloatGrabWindow())
+ closePopup();
}
pThis->m_nState = pEvent->window_state.new_window_state;
More information about the Libreoffice-commits
mailing list