[Libreoffice-commits] core.git: include/vcl vcl/generic vcl/headless vcl/inc vcl/osx vcl/source vcl/unx vcl/win
Noel Grandin
noel at peralex.com
Thu Oct 1 23:38:44 PDT 2015
include/vcl/syswin.hxx | 6 -
vcl/generic/glyphs/gcach_ftyp.cxx | 5 -
vcl/generic/glyphs/gcach_ftyp.hxx | 5 -
vcl/generic/print/genpspgraphics.cxx | 14 --
vcl/headless/svpdummies.cxx | 5 -
vcl/headless/svpframe.cxx | 15 ---
vcl/headless/svpinst.cxx | 11 --
vcl/inc/fontmanager.hxx | 27 -----
vcl/inc/generic/glyphcache.hxx | 2
vcl/inc/generic/printergfx.hxx | 10 --
vcl/inc/graphite_features.hxx | 3
vcl/inc/graphite_layout.hxx | 4
vcl/inc/graphite_serverfont.hxx | 4
vcl/inc/headless/svpdummies.hxx | 1
vcl/inc/headless/svpframe.hxx | 7 -
vcl/inc/headless/svpgdi.hxx | 3
vcl/inc/headless/svpinst.hxx | 2
vcl/inc/headless/svpvd.hxx | 2
vcl/inc/ilstbox.hxx | 7 -
vcl/inc/image.h | 1
vcl/inc/impfont.hxx | 3
vcl/inc/opengl/x11/salvd.hxx | 1
vcl/inc/osx/salsys.h | 1
vcl/inc/salsys.hxx | 8 -
vcl/inc/sft.hxx | 7 -
vcl/inc/svdata.hxx | 4
vcl/inc/unx/gtk/glomenu.h | 8 -
vcl/inc/unx/gtk/gtkdata.hxx | 1
vcl/inc/unx/gtk/gtkinst.hxx | 4
vcl/inc/unx/gtk/gtksalmenu.hxx | 2
vcl/inc/unx/gtk/gtksys.hxx | 1
vcl/inc/unx/i18n_cb.hxx | 4
vcl/inc/unx/i18n_ic.hxx | 2
vcl/inc/unx/i18n_im.hxx | 2
vcl/inc/unx/i18n_xkb.hxx | 14 --
vcl/inc/unx/pixmap.hxx | 1
vcl/inc/unx/saldata.hxx | 6 -
vcl/inc/unx/saldisp.hxx | 17 ---
vcl/inc/unx/salframe.h | 11 --
vcl/inc/unx/salgdi.h | 9 -
vcl/inc/unx/salobj.h | 2
vcl/inc/unx/salunx.h | 3
vcl/inc/unx/salunxtime.h | 12 --
vcl/inc/unx/salvd.h | 4
vcl/inc/unx/wmadaptor.hxx | 15 ---
vcl/inc/unx/x11/x11sys.hxx | 1
vcl/inc/win/salsys.h | 1
vcl/osx/salsys.cxx | 16 ---
vcl/source/app/svdata.cxx | 4
vcl/source/filter/jpeg/transupp.c | 87 -----------------
vcl/source/filter/jpeg/transupp.h | 3
vcl/source/filter/sgvmain.hxx | 1
vcl/source/filter/wmf/winmtf.hxx | 2
vcl/source/fontsubset/sft.cxx | 3
vcl/source/gdi/bmpfast.cxx | 1
vcl/source/gdi/impanmvw.hxx | 1
vcl/source/gdi/impfont.cxx | 150 -------------------------------
vcl/source/gdi/pdfwriter_impl.hxx | 3
vcl/unx/generic/app/i18n_cb.cxx | 7 -
vcl/unx/generic/app/salinst.cxx | 6 -
vcl/unx/generic/app/wmadaptor.cxx | 66 -------------
vcl/unx/generic/dtrans/X11_clipboard.hxx | 2
vcl/unx/generic/dtrans/X11_selection.hxx | 1
vcl/unx/generic/dtrans/bmp.hxx | 1
vcl/unx/generic/gdi/cairo_xlib_cairo.hxx | 2
vcl/unx/generic/gdi/gdiimpl.cxx | 14 --
vcl/unx/generic/gdi/gdiimpl.hxx | 1
vcl/unx/generic/gdi/xrender_peer.hxx | 50 ----------
vcl/unx/gtk/app/gtksys.cxx | 30 ------
vcl/unx/gtk/window/glomenu.cxx | 21 ----
vcl/unx/x11/x11sys.cxx | 41 --------
vcl/win/source/app/salinfo.cxx | 6 -
72 files changed, 19 insertions(+), 778 deletions(-)
New commits:
commit 837f171810a95a1d87907dd08d67e969276f0559
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 1 14:20:31 2015 +0200
loplugin:unusedmethods in vcl
Change-Id: Ib404310761fd555b033ab6594ba8636d37f23463
Reviewed-on: https://gerrit.libreoffice.org/19074
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index fe4eaf4..1a8f3bd 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -247,8 +247,7 @@ public:
Returns the screen number the window is on
The Display Screen number is counted the same way that
- <code>Application::GetScreenPosSizePixel</code>,
- <code>Application::GetDisplayScreenName</code>
+ <code>Application::GetScreenPosSizePixel</code>
and of course <code>SystemWindow::SetScreenNumber</code>
are counted in.
@@ -268,8 +267,7 @@ public:
positioning apply as in <code>SystemWindow::GetScreenNumber</code>
The Display Screen number is counted the same way that
- <code>Application::GetScreenPosSizePixel</code>,
- <code>Application::GetDisplayScreenName</code>
+ <code>Application::GetScreenPosSizePixel</code>
and of course <code>SystemWindow::GetScreenNumber</code>
are counted in.
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 95739db..27ca576 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -214,13 +214,12 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz
#endif
FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
- const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic)
+ const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId)
:
maFaceFT( NULL ),
mpFontFile( FtFontFile::FindFontFile( rNativeFileName ) ),
mnFaceNum( nFaceNum ),
mnRefCount( 0 ),
- mnSynthetic( nSynthetic ),
#if ENABLE_GRAPHITE
mbCheckedGraphite(false),
mpGraphiteFace(NULL),
@@ -400,7 +399,7 @@ void FreetypeManager::AddFontFile( const OString& rNormalizedName,
return;
FtFontInfo* pFontInfo = new FtFontInfo( rDevFontAttr,
- rNormalizedName, nFaceNum, nFontId, 0);
+ rNormalizedName, nFaceNum, nFontId);
maFontList[ nFontId ] = pFontInfo;
if( mnMaxFontId < nFontId )
mnMaxFontId = nFontId;
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index 1e4a312..7ffca25 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -60,7 +60,7 @@ class FtFontInfo
public:
FtFontInfo( const ImplDevFontAttributes&,
const OString& rNativeFileName,
- int nFaceNum, sal_IntPtr nFontId, int nSynthetic);
+ int nFaceNum, sal_IntPtr nFontId);
~FtFontInfo();
const unsigned char* GetTable( const char*, sal_uLong* pLength=0 ) const;
@@ -72,8 +72,6 @@ public:
void ReleaseFaceFT();
const OString& GetFontFileName() const { return mpFontFile->GetFileName(); }
- int GetFaceNum() const { return mnFaceNum; }
- int GetSynthetic() const { return mnSynthetic; }
sal_IntPtr GetFontId() const { return mnFontId; }
bool IsSymbolFont() const { return maDevFontAttributes.IsSymbolFont(); }
const ImplFontAttributes& GetFontAttributes() const { return maDevFontAttributes; }
@@ -91,7 +89,6 @@ private:
FtFontFile* mpFontFile;
const int mnFaceNum;
int mnRefCount;
- const int mnSynthetic;
#if ENABLE_GRAPHITE
bool mbCheckedGraphite;
GraphiteFaceWrapper * mpGraphiteFace;
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 571be87..dca1fb3 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -86,8 +86,6 @@ private:
virtual sal_uInt32 GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const SAL_OVERRIDE;
virtual sal_uInt8 GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const SAL_OVERRIDE;
virtual sal_uInt8 GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const SAL_OVERRIDE;
- virtual sal_uInt32 GetWidth () const SAL_OVERRIDE;
- virtual sal_uInt32 GetHeight() const SAL_OVERRIDE;
virtual sal_uInt32 GetDepth () const SAL_OVERRIDE;
};
@@ -157,18 +155,6 @@ SalPrinterBmp::~SalPrinterBmp ()
}
sal_uInt32
-SalPrinterBmp::GetWidth () const
-{
- return mpBmpBuffer->mnWidth;
-}
-
-sal_uInt32
-SalPrinterBmp::GetHeight () const
-{
- return mpBmpBuffer->mnHeight;
-}
-
-sal_uInt32
SalPrinterBmp::GetDepth () const
{
sal_uInt32 nDepth;
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index ab151d7..06258cc 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -64,11 +64,6 @@ Rectangle SvpSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
return aRect;
}
-OUString SvpSalSystem::GetDisplayScreenName( unsigned int nScreen )
-{
- return "VirtualScreen " + OUString::number(nScreen);
-}
-
int SvpSalSystem::ShowNativeDialog( const OUString&, const OUString&,
const std::list< OUString >&, int )
{
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index c7595ee..74ec326 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -49,21 +49,6 @@ namespace {
};
}
-void SvpSalFrame::enableDamageTracker( bool bOn )
-{
- if( m_bDamageTracking == bOn )
- return;
- if( m_aFrame.get() )
- {
- if( m_bDamageTracking )
- m_aFrame->setDamageTracker( basebmp::IBitmapDeviceDamageTrackerSharedPtr() );
- else
- m_aFrame->setDamageTracker(
- basebmp::IBitmapDeviceDamageTrackerSharedPtr( new DamageTracker ) );
- }
- m_bDamageTracking = bOn;
-}
-
#endif
SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 8a14e62..978a455 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -125,17 +125,6 @@ void SvpSalInstance::PostEvent(const SalFrame* pFrame, ImplSVEvent* pData, sal_u
Wakeup();
}
-bool SvpSalInstance::PostedEventsInQueue()
-{
- bool result = false;
- if( osl_acquireMutex( m_aEventGuard ) )
- {
- result = m_aUserEvents.size() > 0;
- osl_releaseMutex( m_aEventGuard );
- }
- return result;
-}
-
void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
{
m_aFrames.remove( pFrame );
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index 9d00e60..8b4f76a 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -335,9 +335,6 @@ public:
void initialize();
- // returns the number of managed fonts
- int getFontCount() const { return m_aFonts.size(); }
-
// returns the ids of all managed fonts.
void getFontList( std::list< fontID >& rFontIDs );
@@ -351,9 +348,6 @@ public:
// get a specific fonts PSName name
const OUString& getPSName( fontID nFontID ) const;
- // get a specific fonts family name aliases
- void getFontFamilyAliases( fontID nFontID ) const;
-
// get a specific fonts type
fonttype::type getFontType( fontID nFontID ) const
{
@@ -368,13 +362,6 @@ public:
return pFont ? pFont->m_eItalic : ITALIC_DONTKNOW;
}
- // get a specific fonts width type
- FontWidth getFontWidth( fontID nFontID ) const
- {
- PrintFont* pFont = getFont( nFontID );
- return pFont ? pFont->m_eWidth : WIDTH_DONTKNOW;
- }
-
// get a specific fonts weight type
FontWeight getFontWeight( fontID nFontID ) const
{
@@ -382,13 +369,6 @@ public:
return pFont ? pFont->m_eWeight : WEIGHT_DONTKNOW;
}
- // get a specific fonts pitch type
- FontPitch getFontPitch( fontID nFontID ) const
- {
- PrintFont* pFont = getFont( nFontID );
- return pFont ? pFont->m_ePitch : PITCH_DONTKNOW;
- }
-
// get a specific fonts encoding
rtl_TextEncoding getFontEncoding( fontID nFontID ) const
{
@@ -448,12 +428,6 @@ public:
// helper for type 1 fonts
std::list< OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const;
- std::pair< std::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator,
- std::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator >
- getAdobeCodeFromUnicode( sal_Unicode aChar ) const
- {
- return m_aUnicodeToAdobecode.equal_range( aChar );
- }
std::list< sal_Unicode > getUnicodeFromAdobeName( const OString& rName ) const;
std::pair< std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator,
std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator >
@@ -528,7 +502,6 @@ public:
bool Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes );
- int FreeTypeCharIndex( void *pFace, sal_uInt32 aChar );
};
} // namespace
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 49223ef..509044d 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -144,7 +144,6 @@ public:
GlyphData() : mnLruValue(0) {}
const GlyphMetric& GetMetric() const { return maMetric; }
- Size GetSize() const { return maMetric.GetSize(); }
void SetSize( const Size& s) { maMetric.SetSize( s ); }
void SetOffset( int nX, int nY ) { maMetric.SetOffset( nX, nY ); }
@@ -185,7 +184,6 @@ public:
void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const;
const unsigned char* GetTable( const char* pName, sal_uLong* pLength );
int GetEmUnits() const { return maFaceFT->units_per_EM;}
- const FT_Size_Metrics& GetMetricsFT() const { return maSizeFT->metrics; }
double GetStretch() { return mfStretch; }
const FontCharMapPtr GetFontCharMap() const;
bool GetFontCapabilities(vcl::FontCapabilities &) const;
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index fcb9584..7033283 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -76,8 +76,6 @@ public:
bool Is () const
{ return meColorspace != eInvalid; }
- ColorSpace GetColorSpace () const
- { return meColorspace; }
sal_uInt16 GetRed () const
{ return mnRed; }
sal_uInt16 GetGreen () const
@@ -137,8 +135,6 @@ public:
virtual sal_uInt32 GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const = 0;
virtual sal_uInt8 GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const = 0;
virtual sal_uInt8 GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const = 0;
- virtual sal_uInt32 GetWidth () const = 0;
- virtual sal_uInt32 GetHeight () const = 0;
virtual sal_uInt32 GetDepth () const = 0;
};
@@ -189,12 +185,6 @@ private:
osl::File* mpPageHeader;
osl::File* mpPageBody;
- static void TranslateCoordinates (sal_Int32 &rXOut, sal_Int32 &rYOut,
- sal_Int32 nXIn, sal_Int32 nYIn )
- { rXOut = nXIn; rYOut = nYIn; }
- static void TranslateCoordinates (Point& rOut, const Point& rIn)
- { rOut = rIn; }
-
/* text/font related data, for a type1 font it has to be checked
whether this font has already been downloaded. A TrueType font
will be converted into one or more Type3 fonts, containing glyphs
diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index 420c8e5..dc37dfc 100644
--- a/vcl/inc/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
@@ -48,9 +48,6 @@ namespace grutils
GrFeatureParser(const gr_face * face, const OString& features, const OString& lang);
GrFeatureParser(const gr_face * face, const OString& lang);
~GrFeatureParser();
- gr_uint32 getLanguage() const { return maLang.num; };
- sal_Int32 hashCode() const { return mnHash; }
- size_t numFeatures() const { return mnNumSettings; }
gr_feature_val * values() const { return mpSettings; };
private:
GrFeatureParser(const GrFeatureParser & copy) SAL_DELETED_FUNCTION;
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index b97b351..6ab6d6f 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -135,9 +135,11 @@ public:
virtual ~GraphiteLayout() throw();
void SetFont(gr_font * pFont) { mpFont = pFont; }
+#ifdef WNT
gr_font * GetFont() { return mpFont; }
- void SetFeatures(grutils::GrFeatureParser * aFeature) { mpFeatures = aFeature; }
void SetFontScale(float s) { mfScaling = s; };
+#endif
+ void SetFeatures(grutils::GrFeatureParser * aFeature) { mpFeatures = aFeature; }
virtual sal_GlyphId getKashidaGlyph(int & width) = 0;
void kashidaJustify(std::vector<int> & rDeltaWidth, sal_GlyphId, int width);
diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index 7dfde21..ec002a5 100644
--- a/vcl/inc/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -104,10 +104,6 @@ public:
virtual ~GraphiteServerFontLayout() throw();
static bool IsGraphiteEnabledFont(ServerFont& rServerFont);
-// For use with PspGraphics
- const sal_Unicode* getTextPtr() const { return mpStr; };
- int getMinCharPos() const { return mnMinCharPos; }
- int getMaxCharPos() const { return mnEndCharPos; }
};
#endif
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index bbe23e4..7b13fa2 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -67,7 +67,6 @@ public:
// get info about the display
virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
- virtual OUString GetDisplayScreenName( unsigned int nScreen ) SAL_OVERRIDE;
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 23edc62..5a82c07 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -71,7 +71,6 @@ public:
void GetFocus();
void LoseFocus();
void PostPaint(bool bImmediate) const;
- void AllocateFrame();
#if defined ANDROID
const basebmp::BitmapDeviceSharedPtr& getDevice() const { return m_aFrame; }
@@ -126,15 +125,9 @@ public:
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
virtual void EndSetClipRegion() SAL_OVERRIDE;
-#ifndef IOS
- // If enabled we can get damage notifications for regions immediately rendered to ...
- void enableDamageTracker( bool bOn = true );
-#endif
-
/*TODO: functional implementation */
virtual void SetScreenNumber( unsigned int nScreen ) SAL_OVERRIDE { (void)nScreen; }
virtual void SetApplicationID(const OUString &rApplicationID) SAL_OVERRIDE { (void) rApplicationID; }
- bool IsVisible() { return m_bVisible; }
static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; }
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 6e98ff3..5a1f824 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -52,9 +52,6 @@ class VCL_DLLPUBLIC SvpSalGraphics : public SalGraphics
basebmp::DrawMode m_aDrawMode;
-protected:
- basegfx::B2IVector GetSize() { return m_aOrigDevice->getSize(); }
-
public:
static GlyphCache& getPlatformGlyphCache();
void setDevice(basebmp::BitmapDeviceSharedPtr& rDevice);
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 4a4e907..8c76636 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -99,8 +99,6 @@ public:
void PostEvent(const SalFrame* pFrame, ImplSVEvent* pData, sal_uInt16 nEvent);
- bool PostedEventsInQueue();
-
void StartTimer( sal_uLong nMS );
void StopTimer();
void Wakeup();
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index 255de3a..9b73ae5 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -46,8 +46,6 @@ public:
const bool bTopDown
) SAL_OVERRIDE;
- basebmp::BitmapDeviceSharedPtr getBitmapDevice() { return m_aDevice; }
-
// SalGeometryProvider
virtual long GetWidth() const SAL_OVERRIDE { return m_aDevice.get() ? m_aDevice->getSize().getX() : 0; }
virtual long GetHeight() const SAL_OVERRIDE { return m_aDevice.get() ? m_aDevice->getSize().getY() : 0; }
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 3a8312d..b89ebe9 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -294,7 +294,6 @@ public:
either at top or in the middle depending on the chosen style*/
void ShowProminentEntry( sal_Int32 nEntryPos );
void SetProminentEntryType( ProminentEntry eType ) { meProminentType = eType; }
- ProminentEntry GetProminentEntryType() const { return meProminentType; }
using Window::IsVisible;
bool IsVisible( sal_Int32 nEntry ) const;
@@ -333,19 +332,14 @@ public:
void SetScrollHdl( const Link<ImplListBoxWindow*,void>& rLink ) { maScrollHdl = rLink; }
void SetSelectHdl( const Link<LinkParamNone*,void>& rLink ) { maSelectHdl = rLink; }
- const Link<LinkParamNone*,void>& GetSelectHdl() const { return maSelectHdl; }
void SetCancelHdl( const Link<LinkParamNone*,void>& rLink ) { maCancelHdl = rLink; }
- const Link<LinkParamNone*,void>& GetCancelHdl() const { return maCancelHdl; }
void SetDoubleClickHdl( const Link<ImplListBoxWindow*,void>& rLink ) { maDoubleClickHdl = rLink; }
- const Link<ImplListBoxWindow*,void>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
void SetMRUChangedHdl( const Link<LinkParamNone*,void>& rLink ) { maMRUChangedHdl = rLink; }
void SetFocusHdl( const Link<sal_Int32,void>& rLink ) { maFocusHdl = rLink ; }
- const Link<sal_Int32,void>& GetFocusHdl() const { return maFocusHdl; }
boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal;
void SetListItemSelectHdl( const Link<LinkParamNone*,void>& rLink ) { maListItemSelectHdl = rLink ; }
- const Link<LinkParamNone*,void>& GetListItemSelectHdl() const { return maListItemSelectHdl; }
bool IsSelectionChanged() const { return mbSelectionChanged; }
sal_uInt16 GetSelectModifier() const { return mnSelectModifier; }
@@ -606,7 +600,6 @@ public:
boost::signals2::signal< void ( ImplBtn* ) > buttonDownSignal;
};
-void ImplInitFieldSettings( vcl::Window* pWin, bool bFont, bool bForeground, bool bBackground );
void ImplInitDropDownButton( PushButton* pButton );
#endif // INCLUDED_VCL_INC_ILSTBOX_HXX
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 479bb66..5b8e92d6 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -34,7 +34,6 @@ public:
~ImplImageBmp();
void Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHeight,sal_uInt16 nInitSize );
- void ColorTransform();
void Draw( OutputDevice* pDev, const Point& rPos, DrawImageFlags nStyle, const Size* pSize = NULL );
private:
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 05f05e3..898e47d 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -118,7 +118,6 @@ public:
long GetSlant() const { return mnSlant; }
bool IsScalable() const { return ((mnMiscFlags & SCALABLE_FLAG) != 0); }
- bool SupportsCJK() const { return ((mnMiscFlags & CJK_FLAG) != 0); }
bool operator==( const ImplFontMetric& ) const;
};
@@ -209,8 +208,6 @@ public:
bool ParseCMAP( const unsigned char* pRawData, int nRawLength, CmapResult& );
-void UpdateAttributesFromPSName( const OUString& rPSName, ImplDevFontAttributes& );
-
#endif // INCLUDED_VCL_INC_IMPFONT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/x11/salvd.hxx b/vcl/inc/opengl/x11/salvd.hxx
index f74bbb5..eb08ae1 100644
--- a/vcl/inc/opengl/x11/salvd.hxx
+++ b/vcl/inc/opengl/x11/salvd.hxx
@@ -43,7 +43,6 @@ public:
virtual long GetHeight() const SAL_OVERRIDE { return mnHeight; }
SalDisplay * GetDisplay() const { return mpDisplay; }
- sal_uInt16 GetDepth() const { return mnDepth; }
SalX11Screen GetXScreenNumber() const { return mnXScreen; }
virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h
index 91f7d45..74832c7 100644
--- a/vcl/inc/osx/salsys.h
+++ b/vcl/inc/osx/salsys.h
@@ -36,7 +36,6 @@ public:
virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
- virtual OUString GetDisplayScreenName( unsigned int nScreen ) SAL_OVERRIDE;
virtual int ShowNativeMessageBox( const OUString& rTitle,
const OUString& rMessage,
int nButtonCombination,
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 927cd62..0d6fff4 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -78,14 +78,6 @@ public:
size: size of the screen
*/
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) = 0;
- /* Gets the name of a screen
-
- @param nScreen
- The screen number to be queried
-
- @returns the name of the screen
- */
- virtual OUString GetDisplayScreenName( unsigned int nScreen ) = 0;
/* Shows a native message box with the specified title, message and button
combination.
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index e2c7fb4..f65cdc2 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -474,6 +474,7 @@ namespace vcl
*/
int VCL_DLLPUBLIC MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, bool bvertical);
+#if defined(WNT) || defined(MACOSX)
/**
* Maps a Unicode (UCS-2) character to a glyph ID and returns it. Missing glyph has
* a glyphID of 0 so this function can be used to test if a character is encoded in the font.
@@ -484,6 +485,7 @@ namespace vcl
* @ingroup sft
*/
sal_uInt16 MapChar(TrueTypeFont *ttf, sal_uInt16 ch, bool bvertical);
+#endif
/**
* Returns 0 when the font does not substitute vertical glyphs
@@ -504,11 +506,6 @@ namespace vcl
void GetTTGlobalFontInfo(TrueTypeFont *ttf, TTGlobalFontInfo *info);
/**
- * Returns nonzero if font is a symbol encoded font
- */
- int CheckSymbolEncoding(TrueTypeFont* ttf);
-
-/**
* returns the number of glyphs in a font
*/
int GetTTGlyphCount( TrueTypeFont* ttf );
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 3ae13d6..f45ade7 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -363,8 +363,6 @@ DockingManager* ImplGetDockingManager();
BlendFrameCache* ImplGetBlendFrameCache();
void ImplWindowAutoMnemonic( vcl::Window* pWindow );
-void ImplUpdateSystemProcessWindow();
-
bool ImplCallHotKey( const vcl::KeyCode& rKeyCode );
void ImplFreeHotKeyData();
void ImplFreeEventHookData();
@@ -374,7 +372,9 @@ bool ImplCallPreNotify( NotifyEvent& rEvt );
VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData();
VCL_PLUGIN_PUBLIC void ImplHideSplash();
+#ifdef _WIN32
bool ImplInitAccessBridge();
+#endif
FieldUnitStringList* ImplGetFieldUnits();
FieldUnitStringList* ImplGetCleanedFieldUnits();
diff --git a/vcl/inc/unx/gtk/glomenu.h b/vcl/inc/unx/gtk/glomenu.h
index 197752f..0e3ce64 100644
--- a/vcl/inc/unx/gtk/glomenu.h
+++ b/vcl/inc/unx/gtk/glomenu.h
@@ -107,11 +107,6 @@ gchar * g_lo_menu_get_accelerator_from_item_in_section (GLOMenu
gint section,
gint position);
-void g_lo_menu_set_submenu_to_item_in_section (GLOMenu *menu,
- gint section,
- gint position,
- GMenuModel *submenu);
-
void g_lo_menu_new_submenu_in_item_in_section (GLOMenu *menu,
gint section,
gint position);
@@ -125,9 +120,6 @@ void g_lo_menu_set_submenu_action_to_item_in_section (GLOMenu
gint position,
const gchar *action);
-GLOMenu * g_lo_menu_get_menu_containing_item (GLOMenu *menu,
- gint item_id);
-
G_END_DECLS
#endif // INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 697fece..38324c4 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -158,7 +158,6 @@ public:
virtual int CaptureMouse( SalFrame* pFrame ) SAL_OVERRIDE;
#endif
- int GetDefaultScreen() { return m_pSys->GetDisplayBuiltInScreen(); }
SalX11Screen GetDefaultXScreen() { return m_pSys->GetDisplayDefaultXScreen(); }
Size GetScreenSize( int nDisplayScreen );
int GetXScreenCount() { return m_pSys->GetDisplayXScreenCount(); }
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 9a11df1..35b341c 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -100,10 +100,6 @@ public:
void RemoveTimer (SalTimer *pTimer);
- // for managing a mirror of the in-flight un-dispatched gdk event queue
- void addEvent( sal_uInt16 nMask );
- void subtractEvent( sal_uInt16 nMask );
-
std::shared_ptr<vcl::unx::GtkPrintWrapper> getPrintWrapper() const;
private:
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 7322ef4..1db5de8 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -76,11 +76,9 @@ public:
void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; }
Menu* GetMenu() { return mpVCLMenu; }
void SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; }
- GMenuModel* GetMenuModel() { return mpMenuModel; }
unsigned GetItemCount() { return maItems.size(); }
GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; }
void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; }
- GActionGroup* GetActionGroup() { return mpActionGroup; }
bool IsItemVisible( unsigned nPos );
void NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText );
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index 1c6a762..29d9561 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -29,7 +29,6 @@ public:
virtual bool IsUnifiedDisplay() SAL_OVERRIDE;
virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
virtual unsigned int GetDisplayBuiltInScreen() SAL_OVERRIDE;
- virtual OUString GetDisplayScreenName (unsigned int nScreen) SAL_OVERRIDE;
virtual Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen) SAL_OVERRIDE;
virtual int ShowNativeDialog (const OUString& rTitle,
const OUString& rMessage,
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 7ce4f46..b81e91d 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -35,14 +35,10 @@ void PreeditCaretCallback( XIC ic, XPointer client_data,
XIMPreeditCaretCallbackStruct *call_data );
void GetPreeditSpotLocation(XIC ic, XPointer client_data);
-// private hook to prevent from sending further edit events
-void PreeditCancelCallback( XPointer client_data );
-
void StatusStartCallback (XIC ic, XPointer client_data, XPointer call_data);
void StatusDoneCallback (XIC ic, XPointer client_data, XPointer call_data);
void StatusDrawCallback (XIC ic, XPointer client_data,
XIMStatusDrawCallbackStruct *call_data);
-void SwitchIMCallback (XIC ix, XPointer client_data, XPointer call_data );
// keep informed if kinput2 crashed again
void IC_IMDestroyCallback (XIM im, XPointer client_data, XPointer call_data);
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index b76ce3e..62a4d9e 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -66,9 +66,7 @@ public:
void UnsetICFocus( SalFrame* pFrame );
void HandleDestroyIM();
- int HandleKeyEvent( XKeyEvent *pEvent, SalFrame *pFrame ); // unused
void EndExtTextInput( EndExtTextInputFlags nFlags ); // unused
- int CommitStringCallback( sal_Unicode* pText, sal_Size nLength );
int CommitKeyEvent( sal_Unicode* pText, sal_Size nLength );
int UpdateSpotLocation();
diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx
index 8e3a2ae..3fee4c1 100644
--- a/vcl/inc/unx/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -22,8 +22,6 @@
#include <vclpluginapi.h>
-extern "C" char* GetMethodName( XIMStyle nStyle, char *pBuf, int nBufSize);
-
#define bUseInputMethodDefault True
class VCLPLUG_GEN_PUBLIC SalI18N_InputMethod
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index 76b2192..0e69992 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -45,8 +45,6 @@ public:
void Dispatch( XEvent *pEvent ); // keep track of group changes
- inline sal_uInt32 GetGroup() const ; // the current keyboard group
- inline sal_uInt32 GetDefaultGroup() const ; // base group, usually group 1
inline int GetEventBase() const ;
protected:
@@ -71,18 +69,6 @@ SalI18N_KeyboardExtension::UseExtension( bool bState )
mbUseExtension = mbUseExtension && bState;
}
-inline sal_uInt32
-SalI18N_KeyboardExtension::GetGroup() const
-{
- return mnGroup;
-}
-
-inline sal_uInt32
-SalI18N_KeyboardExtension::GetDefaultGroup() const
-{
- return mnDefaultGroup;
-}
-
inline int
SalI18N_KeyboardExtension::GetEventBase() const
{
diff --git a/vcl/inc/unx/pixmap.hxx b/vcl/inc/unx/pixmap.hxx
index ec3c932..0057763 100644
--- a/vcl/inc/unx/pixmap.hxx
+++ b/vcl/inc/unx/pixmap.hxx
@@ -33,7 +33,6 @@ public:
Drawable GetDrawable() const { return GetPixmap(); };
int GetWidth() const { return mnWidth; };
int GetHeight() const { return mnHeight; };
- Size GetSize() const { return Size( mnWidth, mnHeight ); };
protected:
int mnWidth;
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 1cd83a9..3c0f273 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -69,14 +69,10 @@ public:
virtual void initNWF();
virtual void deInitNWF();
- SalDisplay* GetX11Display() const
- { return vcl_sal::getSalDisplay(this); }
void DeleteDisplay(); // for shutdown
inline SalXLib* GetLib() const { return pXLib_; }
- void StartTimer( sal_uLong nMS );
- inline void StopTimer();
static void Timeout( bool idle );
// X errors
@@ -85,8 +81,6 @@ public:
void XError( Display *pDisp, XErrorEvent *pEvent );
bool HasXErrorOccurred() const
{ return m_aXErrorHandlerStack.back().m_bWas; }
- unsigned int GetLastXErrorRequestCode() const
- { return m_aXErrorHandlerStack.back().m_nLastErrorRequest; }
void ResetXErrorOccurred()
{ m_aXErrorHandlerStack.back().m_bWas = false; }
void PushXErrorLevel( bool bIgnore );
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index a304a4b..93794f5 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -86,7 +86,6 @@ public:
inline Visual *GetVisual() const { return visual; }
inline int GetClass() const { return c_class; }
inline int GetDepth() const { return depth; }
- inline SalRGB GetMode() const { return eRGBMode_; }
Pixel GetTCPixel( SalColor nColor ) const;
SalColor GetTCColor( Pixel nPixel ) const;
@@ -122,7 +121,6 @@ public:
inline Pixel GetWhitePixel() const { return m_nWhitePixel; }
inline Pixel GetBlackPixel() const { return m_nBlackPixel; }
inline Pixel GetUsed() const { return m_nUsed; }
- inline int GetClass() const { return m_aVisual.GetClass(); }
bool GetXPixels( XColor &rColor,
int r,
@@ -307,7 +305,6 @@ public:
Cursor GetPointer( PointerStyle ePointerStyle );
virtual int CaptureMouse( SalFrame *pCapture );
- void Remove( XEvent *pEvent );
virtual ScreenData *initScreen( SalX11Screen nXScreen ) const;
const ScreenData& getDataForScreen( SalX11Screen nXScreen ) const
{
@@ -327,11 +324,6 @@ public:
bool IsDisplay() const { return !!pXLib_; }
GC GetMonoGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aMonoGC; }
GC GetCopyGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aCopyGC; }
- GC GetAndInvertedGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aAndInvertedGC; }
- GC GetAndGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aAndGC; }
- GC GetOrGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aOrGC; }
- GC GetStippleGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aStippleGC; }
- GC GetGC( sal_uInt16 nDepth, SalX11Screen nXScreen ) const;
Pixmap GetInvert50( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_hInvert50; }
const SalColormap& GetColormap( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aColormap; }
const SalVisual& GetVisual( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aVisual; }
@@ -341,7 +333,6 @@ public:
Time GetLastUserEventTime( bool bAlwaysReget = false ) const;
bool XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate, long i_nTimeout = 1000 ) const;
- SalXLib* GetXLib() const { return pXLib_; }
SalI18N_InputMethod* GetInputMethod() const { return mpInputMethod; }
SalI18N_KeyboardExtension* GetKbdExtension() const { return mpKbdExtension; }
@@ -354,7 +345,6 @@ public:
const std::vector< Rectangle >& GetXineramaScreens() const { return m_aXineramaScreens; }
::Window GetRootWindow( SalX11Screen nXScreen ) const
{ return getDataForScreen( nXScreen ).m_aRoot; }
- const std::vector< ScreenData >& GetScreenData() { return m_aScreens; }
unsigned int GetXScreenCount() const { return m_aScreens.size(); }
const std::list< SalFrame* >& getFrames() const { return m_aFrames; }
@@ -365,13 +355,6 @@ public:
virtual void PostUserEvent() SAL_OVERRIDE = 0;
};
-inline GC SalDisplay::GetGC( sal_uInt16 nDepth, SalX11Screen nXScreen ) const
-{ return 1 == nDepth
- ? GetMonoGC( nXScreen )
- : getDataForScreen(nXScreen).m_aVisual.GetDepth() == nDepth
- ? GetCopyGC( nXScreen )
- : None; }
-
inline Display *SalColormap::GetXDisplay() const
{ return m_pDisplay->GetDisplay(); }
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index d062791..4a90067 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 HandleMapUnmapEvent ( XEvent *pEvent );
long HandleStateEvent ( XPropertyEvent *pEvent );
long HandleReparentEvent ( XReparentEvent *pEvent );
long HandleClientMessage ( XClientMessageEvent*pEvent );
@@ -176,18 +175,12 @@ public:
{
return pDisplay_->GetDisplay();
}
- ::Window GetDrawable() const
- {
- return GetWindow();
- }
SalX11Screen GetScreenNumber() const { return m_nXScreen; }
::Window GetWindow() const { return mhWindow; }
::Window GetShellWindow() const { return mhShellWindow; }
::Window GetForeignParent() const { return mhForeignParent; }
::Window GetStackingWindow() const { return mhStackingWindow; }
- long ShutDown() const { return CallCallback( SALEVENT_SHUTDOWN, 0 ); }
long Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); }
- sal_uIntPtr GetStyle() const { return nStyle_; }
Cursor GetCursor() const { return hCursor_; }
bool IsCaptured() const { return nCaptured_ == 1; }
@@ -199,8 +192,6 @@ public:
bool IsSysChildWindow() const { return (nStyle_ & (SAL_FRAME_STYLE_SYSTEMCHILD)) != 0; }
bool IsFloatGrabWindow() const;
SalI18N_InputContext* getInputContext() const { return mpInputContext; }
- void getPosSize( Rectangle& rRect ) { GetPosSize( rRect ); }
- void setPosSize( const Rectangle& rRect ) { SetPosSize( rRect ); }
bool isMapped() const { return bMapped_; }
bool hasFocus() const { return mbInputFocus; }
@@ -271,8 +262,6 @@ public:
virtual Window GetX11Window() SAL_OVERRIDE;
- static Bool checkKeyReleaseForRepeat( Display*, XEvent*, XPointer pX11SalFrame );
-
/// @internal
void setPendingSizeEvent();
};
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 58afd62..3517359 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -75,7 +75,6 @@ public:
void Init( SalFrame *pFrame, Drawable aDrawable, SalX11Screen nXScreen );
void Init( X11SalVirtualDevice *pVirtualDevice, SalColormap* pColormap = NULL, bool bDeleteColormap = false );
void Init( X11OpenGLSalVirtualDevice *pVirtualDevice );
- void Init( class ImplSalPrinterData *pPrinter );
void DeInit();
virtual SalGraphicsImpl* GetImpl() const SAL_OVERRIDE;
@@ -307,16 +306,8 @@ protected:
bool GetDitherPixmap ( SalColor nSalColor );
using SalGraphics::DrawBitmap;
- void DrawBitmap(
- const SalTwoRect& rPosAry,
- SalGraphics *pThis,
- const SalBitmap &rSalBitmap,
- const SalBitmap &rTransparentBitmap,
- SalColor nTransparentColor );
GC GetFontGC();
- void DrawPrinterString( const SalLayout& );
- void DrawServerFontString( const ServerFontLayout& );
void freeResources();
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 4fc5a08..ec94c10 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -41,8 +41,6 @@ public:
numClipRectangles = 0; }
sal_uInt16 GetClipRegionType() {
return nClipRegionType; }
- void SetClipRegionType( sal_uInt16 nType ) {
- nClipRegionType = nType; }
int GetRectangleCount() {
return numClipRectangles; }
diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h
index 13bb033d..1d893dd 100644
--- a/vcl/inc/unx/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -28,9 +28,6 @@
inline long Divide( long nDividend, long nDivisor )
{ return (nDividend + nDivisor/2) / nDivisor; }
-inline long DPI( long pixel, long mm )
-{ return Divide( pixel*254, mm*10 ); }
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salunxtime.h b/vcl/inc/unx/salunxtime.h
index 4715bfd..c20a1aa 100644
--- a/vcl/inc/unx/salunxtime.h
+++ b/vcl/inc/unx/salunxtime.h
@@ -85,18 +85,6 @@ inline timeval &operator += ( timeval &t1, sal_uIntPtr t2 )
return t1;
}
-inline timeval operator + ( const timeval &t1, const timeval &t2 )
-{
- timeval t0 = t1;
- return t0 += t2;
-}
-
-inline timeval operator + ( const timeval &t1, sal_uIntPtr t2 )
-{
- timeval t0 = t1;
- return t0 += t2;
-}
-
inline timeval operator - ( const timeval &t1, const timeval &t2 )
{
timeval t0 = t1;
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index 14ad97e..12b0cca 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -57,10 +57,6 @@ public:
{
return pDisplay_;
}
- bool IsDisplay() const
- {
- return pDisplay_->IsDisplay();
- }
Pixmap GetDrawable() const { return hDrawable_; }
sal_uInt16 GetDepth() const { return nDepth_; }
SalX11Screen GetXScreenNumber() const { return m_nXScreen; }
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index b0fcba9..5eab4d5 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -186,12 +186,6 @@ public:
{ return m_aWMName; }
/*
- * gets the number of workareas (virtual desktops)
- */
- int getWorkAreaCount() const
- { return m_aWMWorkAreas.size(); }
-
- /*
* gets the current work area/desktop number: [0,m_nDesktops[ or -1 if unknown
*/
int getCurrentWorkArea() const;
@@ -249,15 +243,6 @@ public:
bool isLegacyPartialFullscreen() const
{ return m_bLegacyPartialFullscreen; }
/*
- * set window struts
- */
- virtual void setFrameStruts( X11SalFrame*pFrame,
- int left, int right, int top, int bottom,
- int left_start_y, int left_end_y,
- int right_start_y, int right_end_y,
- int top_start_x, int top_end_x,
- int bottom_start_x, int bottom_end_x ) const;
- /*
* set _NET_WM_USER_TIME property, if NetWM
*/
virtual void setUserTime( X11SalFrame* i_pFrame, long i_nUserTime ) const;
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index 9943549..7acf3e7 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -36,7 +36,6 @@ public:
virtual bool IsUnifiedDisplay() SAL_OVERRIDE;
virtual unsigned int GetDisplayBuiltInScreen() SAL_OVERRIDE;
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
- virtual OUString GetDisplayScreenName( unsigned int nScreen ) SAL_OVERRIDE;
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
const std::list< OUString >& rButtons,
diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index 740edf7..fc7a4b2 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -59,7 +59,6 @@ public:
virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
virtual unsigned int GetDisplayBuiltInScreen() SAL_OVERRIDE;
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
- virtual OUString GetDisplayScreenName( unsigned int nScreen ) SAL_OVERRIDE;
virtual int ShowNativeMessageBox( const OUString& rTitle,
const OUString& rMessage,
int nButtonCombination,
diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx
index a60f260..72f4132 100644
--- a/vcl/osx/salsys.cxx
+++ b/vcl/osx/salsys.cxx
@@ -57,22 +57,6 @@ Rectangle AquaSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
return aRet;
}
-OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen )
-{
- NSArray* pScreens = [NSScreen screens];
- OUString aRet;
- if( nScreen < [pScreens count] )
- {
- ResMgr* pMgr = ImplGetResMgr();
- if( pMgr )
- {
- OUString aScreenName(ResId(SV_MAC_SCREENNNAME, *pMgr).toString());
- aRet = aScreenName.replaceAll("%d", OUString::number(nScreen));
- }
- }
- return aRet;
-}
-
static NSString* getStandardString( StandardButtonType nButtonId, bool bUseResources )
{
OUString aText;
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 56b2908..7b83ba7 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -249,6 +249,7 @@ BlendFrameCache* ImplGetBlendFrameCache()
bool HasAtHook();
#endif
+#ifdef _WIN32
bool ImplInitAccessBridge()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -256,7 +257,6 @@ bool ImplInitAccessBridge()
{
css::uno::Reference< XComponentContext > xContext(comphelper::getProcessComponentContext());
-#ifdef _WIN32
if (!HasAtHook() && !getenv("SAL_FORCE_IACCESSIBLE2"))
{
SAL_INFO("vcl", "Apparently no running AT -> "
@@ -276,11 +276,11 @@ bool ImplInitAccessBridge()
return false;
}
}
-#endif
}
return true;
}
+#endif
vcl::Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos )
{
diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
index b6e2898..323aa30 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -781,93 +781,6 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
}
-/* Parse an unsigned integer: subroutine for jtransform_parse_crop_spec.
- * Returns TRUE if valid integer found, FALSE if not.
- * *strptr is advanced over the digit string, and *result is set to its value.
- */
-
-LOCAL(boolean)
-jt_read_integer (const char ** strptr, JDIMENSION * result)
-{
- const char * ptr = *strptr;
- JDIMENSION val = 0;
-
- for (; isdigit(*ptr); ptr++) {
- val = val * 10 + (JDIMENSION) (*ptr - '0');
- }
- *result = val;
- if (ptr == *strptr)
- return FALSE; /* oops, no digits */
- *strptr = ptr;
- return TRUE;
-}
-
-
-/* Parse a crop specification (written in X11 geometry style).
- * The routine returns TRUE if the spec string is valid, FALSE if not.
- *
- * The crop spec string should have the format
- * <width>[f]x<height>[f]{+-}<xoffset>{+-}<yoffset>
- * where width, height, xoffset, and yoffset are unsigned integers.
- * Each of the elements can be omitted to indicate a default value.
- * (A weakness of this style is that it is not possible to omit xoffset
- * while specifying yoffset, since they look alike.)
- *
- * This code is loosely based on XParseGeometry from the X11 distribution.
- */
-
-GLOBAL(boolean)
-jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec)
-{
- info->crop = FALSE;
- info->crop_width_set = JCROP_UNSET;
- info->crop_height_set = JCROP_UNSET;
- info->crop_xoffset_set = JCROP_UNSET;
- info->crop_yoffset_set = JCROP_UNSET;
-
- if (isdigit(*spec)) {
- /* fetch width */
- if (! jt_read_integer(&spec, &info->crop_width))
- return FALSE;
- if (*spec == 'f' || *spec == 'F') {
- spec++;
- info->crop_width_set = JCROP_FORCE;
- } else
- info->crop_width_set = JCROP_POS;
- }
- if (*spec == 'x' || *spec == 'X') {
- /* fetch height */
- spec++;
- if (! jt_read_integer(&spec, &info->crop_height))
- return FALSE;
- if (*spec == 'f' || *spec == 'F') {
- spec++;
- info->crop_height_set = JCROP_FORCE;
- } else
- info->crop_height_set = JCROP_POS;
- }
- if (*spec == '+' || *spec == '-') {
- /* fetch xoffset */
- info->crop_xoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS;
- spec++;
- if (! jt_read_integer(&spec, &info->crop_xoffset))
- return FALSE;
- }
- if (*spec == '+' || *spec == '-') {
- /* fetch yoffset */
- info->crop_yoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS;
- spec++;
- if (! jt_read_integer(&spec, &info->crop_yoffset))
- return FALSE;
- }
- /* We had better have gotten to the end of the string. */
- if (*spec != '\0')
- return FALSE;
- info->crop = TRUE;
- return TRUE;
-}
-
-
/* Trim off any partial iMCUs on the indicated destination edge */
LOCAL(void)
diff --git a/vcl/source/filter/jpeg/transupp.h b/vcl/source/filter/jpeg/transupp.h
index d556228..fe1b04a 100644
--- a/vcl/source/filter/jpeg/transupp.h
+++ b/vcl/source/filter/jpeg/transupp.h
@@ -162,9 +162,6 @@ typedef struct {
#if TRANSFORMS_SUPPORTED
-/* Parse a crop specification (written in X11 geometry style) */
-EXTERN(boolean) jtransform_parse_crop_spec
- (jpeg_transform_info *info, const char *spec);
/* Request any required workspace */
EXTERN(boolean) jtransform_request_workspace
(j_decompress_ptr srcinfo, jpeg_transform_info *info);
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index 6223d45..22ba5aa 100644
--- a/vcl/source/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
@@ -303,7 +303,6 @@ public:
friend SvStream& ReadBmapType(SvStream& rIStream, BmapType& rBmap);
virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE;
- void SetPaths( const INetURLObject& rFltPath );
};
#define GrupSize 48
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index bf93363..0126970 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -625,10 +625,8 @@ public:
void SetRefPix( const Size& rSize );
void SetRefMill( const Size& rSize );
- sal_uInt32 GetMapMode() const { return mnMapMode; };
void SetMapMode( sal_uInt32 mnMapMode );
void SetWorldTransform( const XForm& rXForm );
- const XForm& GetWorldTransform() const { return maXForm; }
void ModifyWorldTransform( const XForm& rXForm, sal_uInt32 nMode );
void Push();
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 9f1e387..d901cc8 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2413,6 +2413,7 @@ int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphA
return nchars;
}
+#if defined(WNT) || defined(MACOSX)
sal_uInt16 MapChar(TrueTypeFont *ttf, sal_uInt16 ch, bool bvertical)
{
switch (ttf->cmapType) {
@@ -2438,6 +2439,8 @@ sal_uInt16 MapChar(TrueTypeFont *ttf, sal_uInt16 ch, bool bvertical)
ch = (sal_uInt16)UseGSUB(ttf,ch);
return ch;
}
+#endif
+
int DoesVerticalSubstitution( TrueTypeFont *ttf, int bvertical)
{
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 10d18ba..c5793b3 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -221,7 +221,6 @@ public:
void operator++() { mpPixel += 1; }
PIXBYTE GetAlpha() const { return mpPixel[0]; }
void SetAlpha( PIXBYTE a ) const { mpPixel[0] = a; }
- static void SetColor( PIXBYTE, PIXBYTE, PIXBYTE ) {}
};
// TODO: for some reason many Alpha maps are BMP_FORMAT_8BIT_PAL
diff --git a/vcl/source/gdi/impanmvw.hxx b/vcl/source/gdi/impanmvw.hxx
index 0955046..d7eab0f 100644
--- a/vcl/source/gdi/impanmvw.hxx
+++ b/vcl/source/gdi/impanmvw.hxx
@@ -70,7 +70,6 @@ private:
const Point& getOutPos() const { return maPt; }
- const Size& getOutSize() const { return maSz; }
const Size& getOutSizePix() const { return maSzPix; }
void pause( bool bPause ) { mbPause = bPause; }
diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
index a8863ef..57e8b05 100644
--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -596,154 +596,4 @@ int FontCharMap::GetGlyphIndex( sal_UCS4 cChar ) const
return nGlyphIndex;
}
-// on some systems we have to get the font attributes from the name table
-// since neither head's macStyle nor OS/2's panose are easily available
-// during font enumeration. macStyle bits would be not sufficient anyway
-// and SFNT fonts on Mac usually do not contain an OS/2 table.
-void UpdateAttributesFromPSName( const OUString& rPSName, ImplDevFontAttributes& rDFA )
-{
- OString aPSName( OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() );
-
- // TODO: use a multi-string ignore-case matcher once it becomes available
- if( (aPSName.indexOf("regular") != -1)
- || (aPSName.indexOf("normal") != -1)
- || (aPSName.indexOf("roman") != -1)
- || (aPSName.indexOf("medium") != -1)
- || (aPSName.indexOf("plain") != -1)
- || (aPSName.indexOf("standard") != -1)
- || (aPSName.indexOf("std") != -1) )
- {
- rDFA.SetWidthType(WIDTH_NORMAL);
- rDFA.SetWeight(WEIGHT_NORMAL);
- rDFA.SetItalic(ITALIC_NONE);
- }
-
- // heuristics for font weight
- if (aPSName.indexOf("extrablack") != -1)
- rDFA.SetWeight(WEIGHT_BLACK);
- else if (aPSName.indexOf("black") != -1)
- rDFA.SetWeight(WEIGHT_BLACK);
- else if( (aPSName.indexOf("semibold") != -1)
- || (aPSName.indexOf("smbd") != -1))
- rDFA.SetWeight(WEIGHT_SEMIBOLD);
- else if (aPSName.indexOf("ultrabold") != -1)
- rDFA.SetWeight(WEIGHT_ULTRABOLD);
- else if (aPSName.indexOf("extrabold") != -1)
- rDFA.SetWeight(WEIGHT_BLACK);
- else if( (aPSName.indexOf("bold") != -1)
- || (aPSName.indexOf("-bd") != -1))
- rDFA.SetWeight(WEIGHT_BOLD);
- else if (aPSName.indexOf("extralight") != -1)
- rDFA.SetWeight(WEIGHT_ULTRALIGHT);
- else if (aPSName.indexOf("ultralight") != -1)
- rDFA.SetWeight(WEIGHT_ULTRALIGHT);
- else if (aPSName.indexOf("light") != -1)
- rDFA.SetWeight(WEIGHT_LIGHT);
- else if (aPSName.indexOf("thin") != -1)
- rDFA.SetWeight(WEIGHT_THIN);
- else if (aPSName.indexOf("-w3") != -1)
- rDFA.SetWeight(WEIGHT_LIGHT);
- else if (aPSName.indexOf("-w4") != -1)
- rDFA.SetWeight(WEIGHT_SEMILIGHT);
- else if (aPSName.indexOf("-w5") != -1)
- rDFA.SetWeight(WEIGHT_NORMAL);
- else if (aPSName.indexOf("-w6") != -1)
- rDFA.SetWeight(WEIGHT_SEMIBOLD);
- else if (aPSName.indexOf("-w7") != -1)
- rDFA.SetWeight(WEIGHT_BOLD);
- else if (aPSName.indexOf("-w8") != -1)
- rDFA.SetWeight(WEIGHT_ULTRABOLD);
- else if (aPSName.indexOf("-w9") != -1)
- rDFA.SetWeight(WEIGHT_BLACK);
-
- // heuristics for font slant
- if( (aPSName.indexOf("italic") != -1)
- || (aPSName.indexOf(" ital") != -1)
- || (aPSName.indexOf("cursive") != -1)
- || (aPSName.indexOf("-it") != -1)
- || (aPSName.indexOf("lightit") != -1)
- || (aPSName.indexOf("mediumit") != -1)
- || (aPSName.indexOf("boldit") != -1)
- || (aPSName.indexOf("cnit") != -1)
- || (aPSName.indexOf("bdcn") != -1)
- || (aPSName.indexOf("bdit") != -1)
- || (aPSName.indexOf("condit") != -1)
- || (aPSName.indexOf("bookit") != -1)
- || (aPSName.indexOf("blackit") != -1) )
- rDFA.SetItalic(ITALIC_NORMAL);
- if( (aPSName.indexOf("oblique") != -1)
- || (aPSName.indexOf("inclined") != -1)
- || (aPSName.indexOf("slanted") != -1) )
- rDFA.SetItalic(ITALIC_OBLIQUE);
-
- // heuristics for font width
- if( (aPSName.indexOf("condensed") != -1)
- || (aPSName.indexOf("-cond") != -1)
- || (aPSName.indexOf("boldcond") != -1)
- || (aPSName.indexOf("boldcn") != -1)
- || (aPSName.indexOf("cnit") != -1) )
- rDFA.SetWidthType(WIDTH_CONDENSED);
- else if (aPSName.indexOf("narrow") != -1)
- rDFA.SetWidthType(WIDTH_SEMI_CONDENSED);
- else if (aPSName.indexOf("expanded") != -1)
- rDFA.SetWidthType(WIDTH_EXPANDED);
- else if (aPSName.indexOf("wide") != -1)
- rDFA.SetWidthType(WIDTH_EXPANDED);
-
- // heuristics for font pitch
- if( (aPSName.indexOf("mono") != -1)
- || (aPSName.indexOf("courier") != -1)
- || (aPSName.indexOf("monaco") != -1)
- || (aPSName.indexOf("typewriter") != -1) )
- rDFA.SetPitch(PITCH_FIXED);
-
- // heuristics for font family type
- if( (aPSName.indexOf("script") != -1)
- || (aPSName.indexOf("chancery") != -1)
- || (aPSName.indexOf("zapfino") != -1))
- rDFA.SetFamilyType(FAMILY_SCRIPT);
- else if( (aPSName.indexOf("comic") != -1)
- || (aPSName.indexOf("outline") != -1)
- || (aPSName.indexOf("pinpoint") != -1) )
- rDFA.SetFamilyType(FAMILY_DECORATIVE);
- else if( (aPSName.indexOf("sans") != -1)
- || (aPSName.indexOf("arial") != -1) )
- rDFA.SetFamilyType(FAMILY_SWISS);
- else if( (aPSName.indexOf("roman") != -1)
- || (aPSName.indexOf("times") != -1) )
- rDFA.SetFamilyType(FAMILY_ROMAN);
-
- // heuristics for codepoint semantic
- if( (aPSName.indexOf("symbol") != -1)
- || (aPSName.indexOf("dings") != -1)
- || (aPSName.indexOf("dingbats") != -1)
- || (aPSName.indexOf("ornaments") != -1)
- || (aPSName.indexOf("embellishments") != -1) )
- rDFA.SetSymbolFlag(true);
-
- // #i100020# special heuristic for names with single-char styles
- // NOTE: we are checking name that hasn't been lower-cased
- if( rPSName.getLength() > 3 )
- {
- int i = rPSName.getLength();
- sal_Unicode c = rPSName[--i];
- if( c == 'C' ) { // "capitals"
- rDFA.SetFamilyType(FAMILY_DECORATIVE);
- c = rPSName[--i];
- }
- if( c == 'O' ) { // CFF-based OpenType
- c = rPSName[--i];
- }
- if( c == 'I' ) { // "italic"
- rDFA.SetItalic(ITALIC_NORMAL);
- c = rPSName[--i];
- }
- if( c == 'B' ) // "bold"
- rDFA.SetWeight(WEIGHT_BOLD);
- if( c == 'C' ) // "capitals"
- rDFA.SetFamilyType(FAMILY_DECORATIVE);
- // TODO: check that all single-char styles have been resolved?
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index c9affe6..7b2adef 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -167,7 +167,6 @@ public:
// appends a horizontal waveline with vertical offset (helper for drawWaveLine)
void appendWaveLine( sal_Int32 nLength, sal_Int32 nYOffset, sal_Int32 nDelta, OStringBuffer& rBuffer ) const;
- sal_Int32 getWidth() const { return m_nPageWidth ? m_nPageWidth : m_pWriter->m_nInheritedPageWidth; }
sal_Int32 getHeight() const { return m_nPageHeight ? m_nPageHeight : m_pWriter->m_nInheritedPageHeight; }
};
@@ -884,8 +883,6 @@ i12626
bool emitWidgetAnnotations();
// writes all annotation objects
bool emitAnnotations();
- // writes the dest dict for the catalog
- sal_Int32 emitDestDict();
//write the named destination stuff
sal_Int32 emitNamedDestinations();//i56629
// writes outline dict and tree
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 1d6be55..9f267a3 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -519,13 +519,6 @@ StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data)
return;
}
-void
-SwitchIMCallback (XIC, XPointer, XPointer call_data)
-{
- XIMSwitchIMNotifyCallbackStruct* pCallData = reinterpret_cast<XIMSwitchIMNotifyCallbackStruct*>(call_data);
- vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) );
-}
-
// vii. destroy callbacks: internally disable all IC/IM calls
void
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 1cefa88..e27ca1b 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -190,16 +190,14 @@ extern "C" { static void SAL_CALL thisModule() {} }
void X11SalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService)
{
- const OUString SYM_ADD_TO_RECENTLY_USED_FILE_LIST("add_to_recently_used_file_list");
- const OUString LIB_RECENT_FILE("librecentfile.so");
typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const OUString&, const OUString&, const OUString&);
PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = 0;
osl::Module module;
- module.loadRelative( &thisModule, LIB_RECENT_FILE );
+ module.loadRelative( &thisModule, "librecentfile.so" );
if (module.is())
- add_to_recently_used_file_list = reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST));
+ add_to_recently_used_file_list = reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol("add_to_recently_used_file_list"));
if (add_to_recently_used_file_list)
add_to_recently_used_file_list(rFileUrl, rMimeType, rDocumentService);
}
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 43432cf..74a32f6 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -61,12 +61,6 @@ public:
virtual int handlePropertyNotify( X11SalFrame* pFrame, XPropertyEvent* pEvent ) const SAL_OVERRIDE;
virtual void showFullScreen( X11SalFrame* pFrame, bool bFullScreen ) const SAL_OVERRIDE;
virtual void frameIsMapping( X11SalFrame* pFrame ) const SAL_OVERRIDE;
- virtual void setFrameStruts( X11SalFrame* pFrame,
- int left, int right, int top, int bottom,
- int left_start_y, int left_end_y,
- int right_start_y, int right_end_y,
- int top_start_x, int top_end_x,
- int bottom_start_x, int bottom_end_x ) const SAL_OVERRIDE;
virtual void setUserTime( X11SalFrame* i_pFrame, long i_nUserTime ) const SAL_OVERRIDE;
};
@@ -2228,66 +2222,6 @@ void NetWMAdaptor::frameIsMapping( X11SalFrame* pFrame ) const
}
/*
- * WMAdaptor::setFrameStruts
- */
-void WMAdaptor::setFrameStruts( X11SalFrame*,
- int, int, int, int,
- int, int, int, int,
- int, int, int, int ) const
-{
-}
-
-/*
- * NetWMAdaptor::setFrameStruts
- */
-void NetWMAdaptor::setFrameStruts( X11SalFrame* pFrame,
- int left, int right, int top, int bottom,
- int left_start_y, int left_end_y,
- int right_start_y, int right_end_y,
- int top_start_x, int top_end_x,
- int bottom_start_x, int bottom_end_x ) const
-{
- long nData[12];
- nData[0] = left;
- nData[1] = right;
- nData[2] = top;
- nData[3] = bottom;
- nData[4] = left_start_y;
- nData[5] = left_end_y;
- nData[6] = right_start_y;
- nData[7] = right_end_y;
- nData[8] = top_start_x;
- nData[9] = top_end_x;
- nData[10]= bottom_start_x;
- nData[11]= bottom_end_x;
- Atom aProperty = None;
- int nSetData = 0;
-
- if( m_aWMAtoms[NET_WM_STRUT_PARTIAL] )
- {
- aProperty = m_aWMAtoms[NET_WM_STRUT_PARTIAL];
- nSetData = 12;
- }
- else if( m_aWMAtoms[NET_WM_STRUT] )
- {
- aProperty = m_aWMAtoms[NET_WM_STRUT];
- nSetData = 4;
- }
- if( nSetData )
- {
- XChangeProperty( m_pDisplay,
- pFrame->GetShellWindow(),
- aProperty,
- XA_CARDINAL,
- 32,
- PropModeReplace,
- reinterpret_cast<unsigned char*>(&nData),
- nSetData
- );
- }
-}
-
-/*
* WMAdaptor::setUserTime
*/
void WMAdaptor::setUserTime( X11SalFrame*, long ) const
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index fc1e4db..b212dbe 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -62,8 +62,6 @@ namespace x11 {
virtual ~X11Clipboard();
- static X11Clipboard* get( const OUString& rDisplayName, Atom aSelection );
-
/*
* XServiceInfo
*/
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index d7ec585..7c4e523 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -428,7 +428,6 @@ namespace x11 {
static SelectionManager& get( const OUString& rDisplayName = OUString() );
Display * getDisplay() { return m_pDisplay; };
- ::Window getWindow() { return m_aWindow; };
void registerHandler( Atom selection, SelectionAdaptor& rAdaptor );
void deregisterHandler( Atom selection );
diff --git a/vcl/unx/generic/dtrans/bmp.hxx b/vcl/unx/generic/dtrans/bmp.hxx
index 6a0c801..dbcd74c 100644
--- a/vcl/unx/generic/dtrans/bmp.hxx
+++ b/vcl/unx/generic/dtrans/bmp.hxx
@@ -71,7 +71,6 @@ public:
Pixmap getPixmap() const { return m_aPixmap; }
Pixmap getBitmap() const { return m_aBitmap; }
VisualID getVisualID() const { return m_aInfo.visualid; }
- int getClass() const { return m_aInfo.c_class; }
int getDepth() const { return m_aInfo.depth; }
};
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
index 7cb5b5b..f710a3f 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
@@ -60,8 +60,6 @@ namespace cairo {
{}
~X11Pixmap();
-
- void clear() { mpDisplay=NULL; mhDrawable=0; }
};
typedef std::shared_ptr<X11Pixmap> X11PixmapSharedPtr;
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index d350d01..e85b096 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -326,20 +326,6 @@ GC X11SalGraphicsImpl::GetTrackingGC()
return mpTrackingGC;
}
-inline GC X11SalGraphicsImpl::GetMonoGC( Pixmap hPixmap )
-{
- if( !mpMonoGC )
- mpMonoGC = CreateGC( hPixmap );
-
- if( !mbMonoGC )
- {
- mrParent.SetClipRegion( mpMonoGC );
- mbMonoGC = true;
- }
-
- return mpMonoGC;
-}
-
GC X11SalGraphicsImpl::GetInvertGC()
{
if( !mpInvertGC )
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 24173c7..b454053 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -80,7 +80,6 @@ private:
GC GetTrackingGC();
GC GetInvertGC();
GC GetInvert50GC();
- inline GC GetMonoGC( Pixmap hPixmap );
void DrawLines( sal_uIntPtr nPoints,
const SalPolyLine &rPoints,
diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index bf8dfd6..dd0a420 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -60,20 +60,11 @@ public:
int nXDst, int nYDst, unsigned nWidth, unsigned nHeight ) const;
void FreePicture( Picture ) const;
- GlyphSet CreateGlyphSet() const;
- void FreeGlyphSet( GlyphSet ) const;
- void AddGlyph( GlyphSet, XRenderGlyph nXRGlyph, const XGlyphInfo&,
- const char* pBuffer, int nBufSize ) const;
- static void FreeGlyph( GlyphSet, XRenderGlyph nXRGlyphId );
- void CompositeString32( Picture aSrc, Picture aDst, GlyphSet,
- int nDstX, int nDstY, const unsigned* pText, int nTextLen ) const;
void FillRectangle( int nOp, Picture aDst, const XRenderColor*,
int nX, int nY, unsigned nW, unsigned nH ) const;
void CompositeTrapezoids( int nOp, Picture aSrc, Picture aDst,
const XRenderPictFormat*, int nXSrc, int nYSrc,
const XTrapezoid*, int nCount ) const;
- void AddTraps( Picture aDst, int nXOfs, int nYOfs,
- const _XTrap*, int nCount ) const;
};
inline XRenderPictFormat* XRenderPeer::GetStandardFormatA8() const
@@ -131,41 +122,6 @@ inline void XRenderPeer::FreePicture( Picture aPicture ) const
XRenderFreePicture( mpDisplay, aPicture );
}
-inline GlyphSet XRenderPeer::CreateGlyphSet() const
-{
- return XRenderCreateGlyphSet( mpDisplay, mpStandardFormatA8 );
-}
-
-inline void XRenderPeer::FreeGlyphSet( GlyphSet aGS ) const
-{
- XRenderFreeGlyphSet( mpDisplay, aGS );
-}
-
-inline void XRenderPeer::AddGlyph( GlyphSet aGS, XRenderGlyph nXRGlyph,
- const XGlyphInfo& rGI, const char* pBuffer, int nBufSize ) const
-{
- XRenderAddGlyphs( mpDisplay, aGS, &nXRGlyph, &rGI, 1,
- pBuffer, nBufSize );
-}
-
-inline void XRenderPeer::FreeGlyph( GlyphSet aGS, XRenderGlyph nXRGlyph )
-{
- (void)aGS; (void)nXRGlyph;
-
- // XRenderFreeGlyphs not implemented yet for version<=0.2
- // #108209# disabled because of crash potential,
- // the glyph leak is not too bad because they will
- // be cleaned up when the glyphset is released
-}
-
-inline void XRenderPeer::CompositeString32( Picture aSrc, Picture aDst,
- GlyphSet aGlyphSet, int nDstX, int nDstY,
- const unsigned* pText, int nTextLen ) const
-{
- XRenderCompositeString32( mpDisplay, PictOpOver, aSrc, aDst, NULL,
- aGlyphSet, 0, 0, nDstX, nDstY, pText, nTextLen );
-}
-
inline void XRenderPeer::FillRectangle( int a, Picture b, const XRenderColor* c,
int d, int e, unsigned int f, unsigned int g) const
{
@@ -180,12 +136,6 @@ inline void XRenderPeer::CompositeTrapezoids( int nOp,
nXSrc, nYSrc, pXT, nCount );
}
-inline void XRenderPeer::AddTraps( Picture aDst, int nXOfs, int nYOfs,
- const _XTrap* pTraps, int nCount ) const
-{
- XRenderAddTraps( mpDisplay, aDst, nXOfs, nYOfs, pTraps, nCount );
-}
-
inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTransparency = 0.0 )
{
XRenderColor aRetVal;
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index f114221..7c5e781 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -247,36 +247,6 @@ Rectangle GtkSalSystem::GetDisplayScreenPosSizePixel (unsigned int nScreen)
return Rectangle (Point(aRect.x, aRect.y), Size(aRect.width, aRect.height));
}
-OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen)
-{
- gchar *pStr;
- gint nMonitor;
- GdkScreen *pScreen;
- pScreen = getScreenMonitorFromIdx (nScreen, nMonitor);
- if (!pScreen)
- return OUString();
-
-#if GTK_CHECK_VERSION(3,0,0) || GTK_CHECK_VERSION(2,14,0)
- pStr = gdk_screen_get_monitor_plug_name (pScreen, nMonitor);
-#else
- static gchar * (*get_fn) (GdkScreen *, int) = NULL;
-
- GModule *module = g_module_open (NULL, (GModuleFlags) 0);
- if (!g_module_symbol (module, "gdk_screen_get_monitor_plug_name",
- (gpointer *)&get_fn))
- get_fn = NULL;
- g_module_close (module);
-
- if (get_fn)
- pStr = get_fn (pScreen, nMonitor);
- else
- pStr = g_strdup_printf ("%d", nScreen);
-#endif
- OUString aRet (pStr, strlen (pStr), RTL_TEXTENCODING_UTF8);
- g_free (pStr);
- return aRet;
-}
-
// convert ~ to indicate mnemonic to '_'
static OString MapToGtkAccelerator(const OUString &rStr)
{
diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx
index 5a9095c..b6d86c2 100644
--- a/vcl/unx/gtk/window/glomenu.cxx
+++ b/vcl/unx/gtk/window/glomenu.cxx
@@ -509,27 +509,6 @@ g_lo_menu_new_submenu_in_item_in_section (GLOMenu *menu,
}
}
-void
-g_lo_menu_set_submenu_to_item_in_section (GLOMenu *menu,
- gint section,
- gint position,
- GMenuModel *submenu)
-{
- g_return_if_fail (G_IS_LO_MENU (menu));
- g_return_if_fail (0 <= section && section < (gint) menu->items->len);
-
- GLOMenu *model = g_lo_menu_get_section (menu, section);
-
- g_return_if_fail (model != NULL);
-
- g_lo_menu_set_link (model, position, G_MENU_LINK_SUBMENU, submenu);
-
- // Notify the update.
- g_menu_model_items_changed (G_MENU_MODEL (model), position, 1, 1);
-
- g_object_unref (model);
-}
-
GLOMenu *
g_lo_menu_get_submenu_from_item_in_section (GLOMenu *menu,
gint section,
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index fbb625a..31fd008 100644
--- a/vcl/unx/x11/x11sys.cxx
+++ b/vcl/unx/x11/x11sys.cxx
@@ -85,47 +85,6 @@ Rectangle X11SalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
return aRet;
}
-OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
-{
- OUString aScreenName;
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
- if( pSalDisp->IsXinerama() )
- {
- const std::vector< Rectangle >& rScreens = pSalDisp->GetXineramaScreens();
- if( nScreen >= rScreens.size() )
- nScreen = 0;
- OUStringBuffer aBuf( 256 );
- aBuf.append( OStringToOUString( OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) );
- aBuf.append( " [" );
- aBuf.append( static_cast<sal_Int32>(nScreen) );
- aBuf.append( ']' );
- aScreenName = aBuf.makeStringAndClear();
- }
- else
- {
- if( nScreen >= static_cast<unsigned int>(pSalDisp->GetXScreenCount()) )
- nScreen = 0;
- OUStringBuffer aBuf( 256 );
- aBuf.append( OStringToOUString( OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) );
- // search backwards for ':'
- int nPos = aBuf.getLength();
- if( nPos > 0 )
- nPos--;
- while( nPos > 0 && aBuf[nPos] != ':' )
- nPos--;
- // search forward to '.'
- while( nPos < aBuf.getLength() && aBuf[nPos] != '.' )
- nPos++;
- if( nPos < aBuf.getLength() )
- aBuf.setLength( nPos+1 );
- else
- aBuf.append( '.' );
- aBuf.append( static_cast<sal_Int32>(nScreen) );
- aScreenName = aBuf.makeStringAndClear();
- }
- return aScreenName;
-}
-
int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons, int nDefButton )
{
int nRet = -1;
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index b31be87..b175757 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -169,12 +169,6 @@ Rectangle WinSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aArea : Rectangle();
}
-OUString WinSalSystem::GetDisplayScreenName( unsigned int nScreen )
-{
- initMonitors();
- return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aName : OUString();
-}
-
/* We have to map the button identifier to the identifier used by the Win32
Platform SDK to specify the default button for the MessageBox API.
The first dimension is the button combination, the second dimension
More information about the Libreoffice-commits
mailing list