[Libreoffice-commits] core.git: compilerplugins/clang cui/source include/vcl vcl/inc vcl/opengl vcl/source vcl/unx vcl/win
Noel Grandin
noel at peralex.com
Fri Jul 10 01:21:45 PDT 2015
compilerplugins/clang/unusedmethods.py | 7 +
cui/source/factory/dlgfact.cxx | 15 ----
cui/source/factory/dlgfact.hxx | 3
include/vcl/abstdlg.hxx | 1
include/vcl/bitmap.hxx | 1
include/vcl/bitmapex.hxx | 2
include/vcl/btndlg.hxx | 5 -
include/vcl/builder.hxx | 4 -
include/vcl/button.hxx | 13 ---
include/vcl/ctrl.hxx | 1
include/vcl/dialog.hxx | 2
include/vcl/dockwin.hxx | 45 ------------
include/vcl/edit.hxx | 2
include/vcl/fixed.hxx | 13 +--
include/vcl/floatwin.hxx | 1
include/vcl/image.hxx | 2
include/vcl/layout.hxx | 47 -------------
include/vcl/menu.hxx | 20 -----
include/vcl/outdev.hxx | 21 -----
include/vcl/rendersettings.hxx | 6 -
include/vcl/scrbar.hxx | 2
include/vcl/settings.hxx | 1
include/vcl/syswin.hxx | 1
include/vcl/tabctrl.hxx | 9 --
include/vcl/tabdlg.hxx | 3
include/vcl/toolbox.hxx | 35 ---------
include/vcl/vclmedit.hxx | 1
include/vcl/virdev.hxx | 1
include/vcl/window.hxx | 4 -
include/vcl/wrkwin.hxx | 1
vcl/inc/PhysicalFontCollection.hxx | 1
vcl/inc/PhysicalFontFace.hxx | 1
vcl/inc/brdwin.hxx | 2
vcl/inc/openglgdiimpl.hxx | 5 -
vcl/inc/outdev.h | 3
vcl/inc/outfont.hxx | 4 -
vcl/inc/salgdiimpl.hxx | 5 -
vcl/inc/salinst.hxx | 8 --
vcl/inc/unx/salinst.h | 1
vcl/opengl/gdiimpl.cxx | 8 --
vcl/source/app/salvtables.cxx | 5 -
vcl/source/app/settings.cxx | 7 -
vcl/source/gdi/bitmapex.cxx | 8 --
vcl/source/outdev/map.cxx | 48 -------------
vcl/source/outdev/rendersettings.cxx | 29 --------
vcl/unx/generic/app/salinst.cxx | 119 ---------------------------------
vcl/unx/generic/gdi/gdiimpl.cxx | 7 -
vcl/unx/generic/gdi/gdiimpl.hxx | 5 -
vcl/win/source/gdi/gdiimpl.cxx | 54 --------------
vcl/win/source/gdi/gdiimpl.hxx | 5 -
50 files changed, 16 insertions(+), 578 deletions(-)
New commits:
commit 001e694ecd21095b6fcfb5632ace63d8e0c2b7f8
Author: Noel Grandin <noel at peralex.com>
Date: Wed Jul 8 10:25:58 2015 +0200
loplugin:unusedmethods vcl(part2)
Change-Id: I12356b3fdce68282a30cae2b270b02e46558860a
Reviewed-on: https://gerrit.libreoffice.org/16847
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index 69a253a..05e38b6 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -29,7 +29,7 @@ exclusionSet = set([
"void comphelper::IEventProcessor::release()",
"void SotMutexHolder::acquire()",
"void SotMutexHolder::release()",
- # used by Windows build
+ # only used by Windows build
"_Bool basegfx::B2ITuple::equalZero() const",
"class basegfx::B2DPolyPolygon basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const",
"void OpenGLContext::requestSingleBufferedRendering()",
@@ -43,8 +43,13 @@ exclusionSet = set([
"void StyleSettings::SetCursorSize(long)",
"_Bool CommandMediaData::GetPassThroughToOS() const",
"void Application::AppEvent(const class ApplicationEvent &)",
+ "int PhysicalFontFace::GetWidth() const",
+ "void PhysicalFontFace::SetBitmapSize(int,int)",
+ "_Bool SalObject::IsEraseBackgroundEnabled()",
# instantiated from a template in VCL, not sure why it is not being picked up
"class basegfx::B2DPolygon OutputDevice::PixelToLogic(const class basegfx::B2DPolygon &,const class MapMode &) const",
+ # only used by OSX build
+ "void StyleSettings::SetHideDisabledMenuItems(_Bool)",
])
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 8826c9c..197d795 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -449,11 +449,6 @@ void AbstractSearchProgress_Impl::Update()
pDlg->Update();
}
-void AbstractSearchProgress_Impl::Sync()
-{
- pDlg->Sync();
-}
-
void AbstractSearchProgress_Impl::SetFileType( const OUString& rType )
{
pDlg->SetFileType( rType );
@@ -473,11 +468,6 @@ void AbstractTakeProgress_Impl::Update()
pDlg->Update();
}
-void AbstractTakeProgress_Impl::Sync()
-{
- pDlg->Sync();
-}
-
void AbstractTakeProgress_Impl::SetFile( const INetURLObject& rURL )
{
pDlg->SetFile( rURL );
@@ -503,11 +493,6 @@ void VclAbstractRefreshableDialog_Impl::Update()
pDlg->Update();
}
-void VclAbstractRefreshableDialog_Impl::Sync()
-{
- pDlg->Sync();
-}
-
OUString AbstractURLDlg_Impl::GetURL() const
{
return pDlg->GetURL();
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 943811d..a987ab8 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -97,7 +97,6 @@ class VclAbstractRefreshableDialog_Impl : public VclAbstractRefreshableDialog
{
DECL_ABSTDLG_BASE(VclAbstractRefreshableDialog_Impl,Dialog)
virtual void Update() SAL_OVERRIDE ;
- virtual void Sync() SAL_OVERRIDE ;
};
class CuiAbstractSfxDialog_Impl : public SfxAbstractDialog
@@ -213,7 +212,6 @@ class AbstractSearchProgress_Impl : public AbstractSearchProgress
{
DECL_ABSTDLG_BASE(AbstractSearchProgress_Impl,SearchProgress)
virtual void Update() SAL_OVERRIDE ;
- virtual void Sync() SAL_OVERRIDE ;
virtual void SetFileType( const OUString& rType ) SAL_OVERRIDE ;
virtual void SetDirectory( const INetURLObject& rURL ) SAL_OVERRIDE ;
virtual PLinkStub GetLinkStubCleanUpHdl() SAL_OVERRIDE ;
@@ -225,7 +223,6 @@ class AbstractTakeProgress_Impl : public AbstractTakeProgress
{
DECL_ABSTDLG_BASE(AbstractTakeProgress_Impl,TakeProgress)
virtual void Update() SAL_OVERRIDE ;
- virtual void Sync() SAL_OVERRIDE ;
virtual void SetFile( const INetURLObject& rURL ) SAL_OVERRIDE ;
virtual PLinkStub GetLinkStubCleanUpHdl() SAL_OVERRIDE ;
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 8ac20a1..3b2dd2d 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -53,7 +53,6 @@ class VCL_DLLPUBLIC VclAbstractRefreshableDialog : public VclAbstractDialog
{
public:
virtual void Update() = 0;
- virtual void Sync() = 0;
};
class VCL_DLLPUBLIC AbstractPasswordToOpenModifyDialog : public VclAbstractDialog
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 16a6fb8..6cdb318 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -826,7 +826,6 @@ public:
SAL_DLLPRIVATE void ImplAdaptBitCount(Bitmap& rNew) const;
SAL_DLLPRIVATE bool ImplScaleFast( const double& rScaleX, const double& rScaleY );
SAL_DLLPRIVATE bool ImplScaleInterpolate( const double& rScaleX, const double& rScaleY );
- SAL_DLLPRIVATE bool ImplScaleSuper( const double& rScaleX, const double& rScaleY );
SAL_DLLPRIVATE bool ImplScaleConvolution( const double& rScaleX, const double& rScaleY, const Kernel& aKernel);
SAL_DLLPRIVATE bool ImplConvolutionPass(
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index c63758d..0937f0b 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -60,8 +60,6 @@ public:
bool operator!=( const BitmapEx& rBitmapEx ) const { return !(*this==rBitmapEx); }
bool operator!() const { return !aBitmap; }
- bool IsEqual( const BitmapEx& rBmpEx ) const;
-
bool IsEmpty() const;
void SetEmpty();
void Clear();
diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index 6ae2824..5328084 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -57,7 +57,6 @@ public:
void Click();
void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; }
- const Size& GetPageSizePixel() const { return maPageSize; }
sal_uInt16 GetCurButtonId() const { return mnCurButtonId; }
@@ -72,10 +71,6 @@ public:
void SetButtonHelpText( sal_uInt16 nId, const OUString& rText );
void SetFocusButton( sal_uInt16 nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; }
- sal_uInt16 GetFocusButton() const { return mnFocusButtonId; }
-
- void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
- const Link<>& GetClickHdl() const { return maClickHdl; }
protected:
ButtonDialog( WindowType nType );
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 518d8a8..b0d8ace 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -474,10 +474,6 @@ public:
{
return m_pUIBuilder->get<T>(sID);
}
- PopupMenu* get_menu(PopupMenu*& ret, const OString & sID)
- {
- return m_pUIBuilder->get_menu(ret, sID);
- }
PopupMenu* get_menu(const OString & sID)
{
return m_pUIBuilder->get_menu(sID);
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index b34ed2e..2c485e4 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -180,7 +180,6 @@ public:
void SetSymbolAlign( SymbolAlign eAlign );
void SetDropDown( PushButtonDropdownStyle nStyle );
- PushButtonDropdownStyle GetDropDown() const { return mnDDStyle; }
void SetState( TriState eState );
TriState GetState() const { return meState; }
@@ -194,14 +193,11 @@ public:
void EndSelection();
void SaveValue() { meSaveValue = GetState(); }
- TriState GetSavedValue() const { return meSaveValue; }
bool IsValueChangedFromSaved() const { return meSaveValue != GetState(); }
Size CalcMinimumSize( long nMaxWidth = 0 ) const;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
- void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; }
- const Link<>& GetToggleHdl() const { return maToggleHdl; }
virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
virtual void ShowFocus(const Rectangle& rRect) SAL_OVERRIDE;
};
@@ -327,10 +323,8 @@ protected:
virtual const Color&
GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE;
- inline void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; }
- inline const Rectangle& GetMouseRect( ) const { return maMouseRect; }
- inline void SetStateRect( const Rectangle& _rStateRect ) { maStateRect = _rStateRect; }
- inline const Rectangle& GetStateRect( ) const { return maStateRect; }
+ inline void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; }
+ inline void SetStateRect( const Rectangle& _rStateRect ) { maStateRect = _rStateRect; }
// draws the radio button (the knob image), in its current state (pressed/checked)
// at the usual location, which can be overridden with SetStateRect
@@ -379,7 +373,6 @@ public:
virtual Size GetOptimalSize() const SAL_OVERRIDE;
void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; }
- const Link<>& GetToggleHdl() const { return maToggleHdl; }
/** GetRadioButtonGroup returns a list of pointers to <code>RadioButton</code>s in the same group.
@@ -491,8 +484,6 @@ public:
virtual Size GetOptimalSize() const SAL_OVERRIDE;
void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; }
- const Link<>& GetToggleHdl() const { return maToggleHdl; }
- bool IsLegacyNoTextAlign() { return mbLegacyNoTextAlign; }
void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; }
virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index b85f561..038d445 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -166,7 +166,6 @@ public:
long ToRelativeLineIndex( long nIndex ) const;
void SetGetFocusHdl( const Link<>& rLink ) { maGetFocusHdl = rLink; }
- const Link<>& GetGetFocusHdl() const { return maGetFocusHdl; }
void SetLoseFocusHdl( const Link<>& rLink ) { maLoseFocusHdl = rLink; }
const Link<>& GetLoseFocusHdl() const { return maLoseFocusHdl; }
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index aae1dcc..273606b 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -145,9 +145,7 @@ public:
protected:
using Window::Show;
- void Show( bool bVisible = true );
using Window::Hide;
- void Hide();
private:
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 156d0a0..bae8483 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -149,7 +149,6 @@ public:
void TitleButtonClick( TitleButton nButton );
void Resizing( Size& rSize );
void Tracking( const TrackingEvent& rTEvt );
- long Notify( NotifyEvent& rNEvt );
void ShowTitleButton( TitleButton nButton, bool bVisible = true );
@@ -160,7 +159,6 @@ public:
bool IsDocking() const { return mbDocking; }
bool IsDockable() const { return mbDockable; }
bool IsDockingCanceled() const { return mbDockCanceled; }
- bool IsFloatingPrevented() const { return mbFloatPrevented; }
void SetFloatingMode( bool bFloatMode = false );
bool IsFloatingMode() const;
@@ -172,9 +170,6 @@ public:
void setPosSizePixel( long nX, long nY,
long nWidth, long nHeight,
PosSizeFlags nFlags = PosSizeFlags::All );
- void SetPosSizePixel( const Point& rNewPos,
- const Size& rNewSize )
- { mpDockingWindow->SetPosSizePixel( rNewPos, rNewSize ); }
Point GetPosPixel() const;
Size GetSizePixel() const;
};
@@ -314,16 +309,9 @@ public:
virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- void SetPin( bool bPin );
- bool IsPinned() const;
-
- void RollUp();
void RollDown();
bool IsRollUp() const;
- void SetRollUpOutputSizePixel( const Size& rSize );
- Size GetRollUpOutputSizePixel() const;
-
void SetMinOutputSizePixel( const Size& rSize );
const Size& GetMinOutputSizePixel() const;
@@ -333,7 +321,6 @@ public:
bool IsDockable() const { return mbDockable; }
bool IsDockingCanceled() const { return mbDockCanceled; }
bool IsDockingPrevented() const { return mbDockPrevented; }
- bool IsFloatingPrevented() const { return mbFloatPrevented; }
void SetFloatingMode( bool bFloatMode = false );
bool IsFloatingMode() const;
@@ -362,26 +349,7 @@ public:
virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE;
};
-inline void DockingWindow::SetPin( bool bPin )
-{
- if ( mpFloatWin )
- mpFloatWin->SetPin( bPin );
- mbPinned = bPin;
-}
-
-inline bool DockingWindow::IsPinned() const
-{
- if ( mpFloatWin )
- return mpFloatWin->IsPinned();
- return mbPinned;
-}
-inline void DockingWindow::RollUp()
-{
- if ( mpFloatWin )
- mpFloatWin->RollUp();
- mbRollUp = true;
-}
inline void DockingWindow::RollDown()
{
@@ -397,19 +365,6 @@ inline bool DockingWindow::IsRollUp() const
return mbRollUp;
}
-inline void DockingWindow::SetRollUpOutputSizePixel( const Size& rSize )
-{
- if ( mpFloatWin )
- mpFloatWin->SetRollUpOutputSizePixel( rSize );
- maRollUpOutSize = rSize;
-}
-
-inline Size DockingWindow::GetRollUpOutputSizePixel() const
-{
- if ( mpFloatWin )
- return mpFloatWin->GetRollUpOutputSizePixel();
- return maRollUpOutSize;
-}
inline void DockingWindow::SetMinOutputSizePixel( const Size& rSize )
{
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index a116a1e..c134780 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -55,7 +55,6 @@ private:
OUString sForbiddenChars;
public:
void SetForbiddenChars(const OUString& rSet) { sForbiddenChars = rSet; }
- const OUString& GetForbiddenChars() { return sForbiddenChars; }
virtual OUString filter(const OUString &rText);
@@ -212,7 +211,6 @@ public:
virtual sal_Int32 GetMaxTextLen() const { return mnMaxTextLen; }
void SetWidthInChars(sal_Int32 nWidthInChars);
- sal_Int32 GetWidthInChars() const { return mnWidthInChars; }
void setMaxWidthChars(sal_Int32 nWidth);
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index cfc7590..f24a0d5 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -71,17 +71,15 @@ public:
virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- void setMaxWidthChars(sal_Int32 nWidth);
- sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; }
- void setMinWidthChars(sal_Int32 nWidth);
- sal_Int32 getMinWidthChars() const { return m_nMinWidthChars; }
+ void setMaxWidthChars(sal_Int32 nWidth);
+ void setMinWidthChars(sal_Int32 nWidth);
static Size CalcMinimumTextSize(Control const* pControl, long nMaxWidth = 0x7fffffff);
static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth);
Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
- virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
- void set_mnemonic_widget(vcl::Window *pWindow);
- vcl::Window* get_mnemonic_widget() const { return m_pMnemonicWindow; }
+ virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
+ void set_mnemonic_widget(vcl::Window *pWindow);
+ vcl::Window* get_mnemonic_widget() const { return m_pMnemonicWindow; }
};
class VCL_DLLPUBLIC SelectableFixedText : public Edit
@@ -154,7 +152,6 @@ public:
void SetBitmap( const Bitmap& rBitmap );
using OutputDevice::GetBitmap;
- const Bitmap& GetBitmap() const { return maBitmap; }
};
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 411e8c1..023666f 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -167,7 +167,6 @@ public:
bool IsPopupModeTearOff() const { return mbPopupModeTearOff; }
void SetPopupModeEndHdl( const Link<>& rLink ) { maPopupModeEndHdl = rLink; }
- const Link<>& GetPopupModeEndHdl() const { return maPopupModeEndHdl; }
bool GrabsFocus() const { return mbGrabFocus; }
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 7ca4985..67f0b91 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -66,8 +66,6 @@ public:
BitmapEx GetBitmapEx() const;
css::uno::Reference< css::graphic::XGraphic > GetXGraphic() const;
- Image GetColorTransformedImage( ImageColorTransform eColorTransform ) const;
-
bool operator!() const { return !mpImplData; }
Image& operator=( const Image& rImage );
bool operator==( const Image& rImage ) const;
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 7d67230..b8472ef 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -86,10 +86,6 @@ public:
{
m_bHomogeneous = bHomogeneous;
}
- bool get_homogeneous() const
- {
- return m_bHomogeneous;
- }
virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
protected:
virtual sal_uInt16 getDefaultAccessibleRole() const SAL_OVERRIDE;
@@ -105,8 +101,6 @@ protected:
virtual void setPrimaryCoordinate(Point &rPos, long) const = 0;
virtual long getSecondaryDimension(const Size &rSize) const = 0;
virtual void setSecondaryDimension(Size &rSize, long) const = 0;
- virtual long getSecondaryCoordinate(const Point &rPos) const = 0;
- virtual void setSecondaryCoordinate(Point &rPos, long) const = 0;
virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const = 0;
};
@@ -144,14 +138,6 @@ protected:
{
rSize.setWidth(nWidth);
}
- virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE
- {
- return rPos.getX();
- }
- virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE
- {
- rPos.setX(nPos);
- }
virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE
{
return rWindow.get_expand() || rWindow.get_vexpand();
@@ -191,14 +177,6 @@ protected:
{
rSize.setHeight(nHeight);
}
- virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE
- {
- return rPos.getY();
- }
- virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE
- {
- rPos.setY(nPos);
- }
virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE
{
return rWindow.get_expand() || rWindow.get_hexpand();
@@ -227,10 +205,6 @@ public:
{
m_eLayoutStyle = eStyle;
}
- VclButtonBoxStyle get_layout() const
- {
- return m_eLayoutStyle;
- }
virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
void sort_native_button_order();
protected:
@@ -283,14 +257,6 @@ protected:
{
rSize.setWidth(nWidth);
}
- virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE
- {
- return rPos.getX();
- }
- virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE
- {
- rPos.setX(nPos);
- }
virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE
{
return rWindow.get_expand() || rWindow.get_vexpand();
@@ -330,14 +296,6 @@ protected:
{
rSize.setHeight(nHeight);
}
- virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE
- {
- return rPos.getY();
- }
- virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE
- {
- rPos.setY(nPos);
- }
virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE
{
return rWindow.get_expand() || rWindow.get_hexpand();
@@ -539,13 +497,8 @@ public:
{
m_pDisclosureButton->SetText(rLabel);
}
- OUString get_label() const
- {
- return m_pDisclosureButton->GetText();
- }
virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE;
void SetExpandedHdl( const Link<>& rLink ) { maExpandedHdl = rLink; }
- const Link<>& GetExpandedHdl() const { return maExpandedHdl; }
protected:
virtual Size calculateRequisition() const SAL_OVERRIDE;
virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE;
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 479849f..25714b3 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -219,7 +219,9 @@ public:
SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const { return pStartedFrom; }
SAL_DLLPRIVATE vcl::Window* ImplGetWindow() const { return pWindow; }
+#if defined(MACOSX)
void ImplSelectWithStart( Menu* pStartMenu = NULL );
+#endif
protected:
@@ -290,7 +292,6 @@ public:
bool IsItemChecked( sal_uInt16 nItemId ) const;
virtual void SelectItem(sal_uInt16 nItemId) = 0;
- void DeSelect() { SelectItem( 0xFFFF ); } // MENUITEMPOS_INVALID
void EnableItem( sal_uInt16 nItemId, bool bEnable = true );
void EnableItem(const OString &rIdent, bool bEnable = true)
@@ -351,15 +352,6 @@ public:
{
aSelectHdl = rLink;
}
- const Link<>& GetSelectHdl() const
- {
- return aSelectHdl;
- }
-
- bool HasLogo() const
- {
- return pLogo != nullptr;
- }
sal_uInt16 GetTitleHeight()
{
@@ -368,8 +360,6 @@ public:
void AddEventListener( const Link<>& rEventListener );
void RemoveEventListener( const Link<>& rEventListener );
- void AddChildEventListener( const Link<>& rEventListener );
- void RemoveChildEventListener( const Link<>& rEventListener );
Menu& operator =( const Menu& rMenu );
@@ -481,9 +471,7 @@ public:
void SetCloseButtonClickHdl( const Link<>& rLink ) { maCloseHdl = rLink; }
const Link<>& GetCloseButtonClickHdl() const { return maCloseHdl; }
- void SetFloatButtonClickHdl( const Link<>& rLink ) { maFloatHdl = rLink; }
const Link<>& GetFloatButtonClickHdl() const { return maFloatHdl; }
- void SetHideButtonClickHdl( const Link<>& rLink ) { maHideHdl = rLink; }
const Link<>& GetHideButtonClickHdl() const { return maHideHdl; }
// - by default a menubar is displayable
@@ -552,10 +540,6 @@ public:
{
aTitleText = rTitle;
}
- const OUString& GetText() const
- {
- return aTitleText;
- }
sal_uInt16 Execute( vcl::Window* pWindow, const Point& rPopupPos );
sal_uInt16 Execute( vcl::Window* pWindow, const Rectangle& rRect, PopupMenuFlags nFlags = PopupMenuFlags::NONE );
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 8f39b2f..7c4a27a 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1717,8 +1717,6 @@ public:
const MapMode& rMapMode ) const;
Polygon LogicToPixel( const Polygon& rLogicPoly,
const MapMode& rMapMode ) const;
- tools::PolyPolygon LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly,
- const MapMode& rMapMode ) const;
basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly,
const MapMode& rMapMode ) const;
@@ -1739,8 +1737,6 @@ public:
const MapMode& rMapMode ) const;
basegfx::B2DPolygon PixelToLogic( const basegfx::B2DPolygon& rDevicePoly,
const MapMode& rMapMode ) const;
- tools::PolyPolygon PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly,
- const MapMode& rMapMode ) const;
basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly,
const MapMode& rMapMode ) const;
@@ -1806,7 +1802,6 @@ public:
SAL_DLLPRIVATE long ImplLogicWidthToDevicePixel( long nWidth ) const;
SAL_DLLPRIVATE DeviceCoordinate LogicWidthToDeviceCoordinate( long nWidth ) const;
- SAL_DLLPRIVATE DeviceCoordinate LogicHeightToDeviceCoordinate( long nHeight ) const;
protected:
/**
@@ -1905,22 +1900,6 @@ private:
*/
SAL_DLLPRIVATE Rectangle ImplDevicePixelToLogic( const Rectangle& rPixelRect ) const;
- /** Convert a logical B2DPolygon to a B2DPolygon in physical device pixel units.
-
- @param rLogicSize Const reference to a B2DPolygon in logical units
-
- @returns B2DPolyPolygon based on physical device pixel coordinates and units.
- */
- SAL_DLLPRIVATE ::basegfx::B2DPolygon ImplLogicToDevicePixel( const ::basegfx::B2DPolygon& rLogicPoly ) const;
-
- /** Convert a logical B2DPolyPolygon to a B2DPolyPolygon in physical device pixel units.
-
- @param rLogicPolyPoly Const reference to a B2DPolyPolygon in logical units
-
- @returns B2DPolyPolygon based on physical device pixel coordinates and units.
- */
- SAL_DLLPRIVATE ::basegfx::B2DPolyPolygon ImplLogicToDevicePixel( const ::basegfx::B2DPolyPolygon& rLogicPolyPoly ) const;
-
/** Convert a logical polygon to a polygon in physical device pixel units.
@param rLogicPoly Const reference to a polygon in logical units
diff --git a/include/vcl/rendersettings.hxx b/include/vcl/rendersettings.hxx
index f6df721..41a2775 100644
--- a/include/vcl/rendersettings.hxx
+++ b/include/vcl/rendersettings.hxx
@@ -29,12 +29,6 @@ public:
virtual ~RenderSettings()
{}
- inline void SetLineColor(const Color& rColor);
- inline void SetFillColor(const Color& rColor);
- inline void SetBackground(const Wallpaper& rBackground);
- inline void SetFont(const vcl::Font& rNewFont);
-
- void PushAndApply(vcl::RenderContext& rRenderContext);
void Apply(vcl::RenderContext& rRenderContext);
};
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 1c3c63f..5de297f 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -115,7 +115,6 @@ public:
void EnableDrag( bool bEnable = true )
{ mbFullDrag = bEnable; }
- bool IsDragEnabled() const { return mbFullDrag; }
void SetRangeMin( long nNewRange );
long GetRangeMin() const { return mnMinRange; }
@@ -136,7 +135,6 @@ public:
ScrollType GetType() const { return meScrollType; }
void SetScrollHdl( const Link<>& rLink ) { maScrollHdl = rLink; }
- const Link<>& GetScrollHdl() const { return maScrollHdl; }
void SetEndScrollHdl( const Link<>& rLink ) { maEndScrollHdl = rLink; }
const Link<>& GetEndScrollHdl() const { return maEndScrollHdl; }
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 59af8ee..996feb1 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -409,7 +409,6 @@ public:
void SetInactiveTabColor( const Color& rColor );
const Color& GetInactiveTabColor() const;
- void SetAlternatingRowColor( const Color& rColor );
const Color& GetAlternatingRowColor() const;
void SetHighContrastMode(bool bHighContrast );
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 875586d..94ecbad 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -228,7 +228,6 @@ public:
void SetMenuBar(MenuBar* pMenuBar, const css::uno::Reference<css::frame::XFrame>& rFrame = css::uno::Reference<css::frame::XFrame>());
MenuBar* GetMenuBar() const { return mpMenuBar; }
void SetMenuBarMode( MenuBarMode nMode );
- MenuBarMode GetMenuBarMode() const { return mnMenuBarMode; }
TaskPaneList* GetTaskPaneList();
void GetWindowStateData( WindowStateData& rData ) const;
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 4a6a530..3d4ab05 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -140,9 +140,6 @@ public:
void SelectTabPage( sal_uInt16 nPageId );
void SetMaxPageWidth( long nMaxWidth ) { mnMaxPageWidth = nMaxWidth; }
- long GetMaxPageWidth() const { return mnMaxPageWidth; }
- void ResetMaxPageWidth() { SetMaxPageWidth( 0 ); }
- bool IsMaxPageWidth() const { return mnMaxPageWidth != 0; }
void SetTabPage( sal_uInt16 nPageId, TabPage* pPage );
TabPage* GetTabPage( sal_uInt16 nPageId ) const;
@@ -161,18 +158,12 @@ public:
void SetPageImage( sal_uInt16 nPageId, const Image& rImage );
- void SetHelpText( const OUString& rText )
- { Control::SetHelpText( rText ); }
- const OUString& GetHelpText() const
- { return Control::GetHelpText(); }
-
void SetHelpId( const OString& rId )
{ Control::SetHelpId( rId ); }
const OString& GetHelpId() const
{ return Control::GetHelpId(); }
void SetActivatePageHdl( const Link<>& rLink ) { maActivateHdl = rLink; }
- const Link<>& GetActivatePageHdl() const { return maActivateHdl; }
void SetDeactivatePageHdl( const Link<TabControl *, bool>& rLink ) { maDeactivateHdl = rLink; }
// returns (control relative) bounding rectangle for the
diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx
index db3f592..8a1a94f 100644
--- a/include/vcl/tabdlg.hxx
+++ b/include/vcl/tabdlg.hxx
@@ -47,9 +47,8 @@ public:
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; }
- vcl::Window* GetViewWindow() const { return mpViewWindow; }
+ vcl::Window* GetViewWindow() const { return mpViewWindow; }
void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; }
- WindowAlign GetViewAlign() const { return meViewAlign; }
};
#endif // INCLUDED_VCL_TABDLG_HXX
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 23ae8ed..73cb937 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -52,12 +52,6 @@ public:
ToolBoxCustomizeEvent( ToolBox* pDropBox,
sal_uInt16 nId, sal_uInt16 nPos = 0,
void* pUserData = NULL );
-
- ToolBox* GetTargetBox() const { return mpTargetBox; }
- sal_uInt16 GetTargetPos() const { return mnPosTo; }
- sal_uInt16 GetSourceId() const { return mnIdFrom; }
- void* GetData() const { return mpData; }
- bool IsResized() const;
};
inline ToolBoxCustomizeEvent::ToolBoxCustomizeEvent()
@@ -78,14 +72,6 @@ inline ToolBoxCustomizeEvent::ToolBoxCustomizeEvent( ToolBox* pDropBox,
mpData = pUserData;
}
-inline bool ToolBoxCustomizeEvent::IsResized() const
-{
- if ( mnPosTo == TOOLBOX_CUSTOMIZE_RESIZE )
- return true;
- else
- return false;
-}
-
#define TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004)
#define TOOLBOX_APPEND ((sal_uInt16)0xFFFF)
@@ -372,8 +358,6 @@ public:
bool IsHorizontal() const { return mbHorz; }
void SetLineCount( sal_uInt16 nNewLines );
- sal_uInt16 GetLineCount() const { return mnLines; }
- sal_uInt16 GetCurLine() const { return mnCurLine; }
void ShowLine( bool bNext );
// Used to enable/disable scrolling one page at a time for toolbar
@@ -396,10 +380,8 @@ public:
/// Retrieves the optimal position to place a popup window for this item (subtoolbar or dropdown)
Point GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const;
- Rectangle GetScrollRect() const;
sal_uInt16 GetCurItemId() const { return mnCurItemId; }
sal_uInt16 GetDownItemId() const { return mnDownItemId; }
- sal_uInt16 GetClicks() const { return mnMouseClicks; }
sal_uInt16 GetModifier() const { return mnMouseModifier; }
sal_uInt16 GetKeyModifier() const { return mnKeyModifier; }
@@ -480,8 +462,6 @@ public:
// computes the smallest useful size when docked, ie with the first item visible only (+drag area and menu button)
Size CalcMinimumWindowSizePixel() const;
- void SetDockingRects( const Rectangle& rOutRect,
- const Rectangle& rInRect );
void SetFloatingLines( sal_uInt16 nFloatLines );
sal_uInt16 GetFloatingLines() const;
@@ -495,14 +475,12 @@ public:
static bool AlwaysLocked();
void EnableMenuStrings( bool bEnable = true ) { mbMenuStrings = bEnable; }
- bool IsMenuStringsEnabled() const { return mbMenuStrings; }
void SetOutStyle( sal_uInt16 nNewStyle );
sal_uInt16 GetOutStyle() const { return mnOutStyle; }
void EnableCustomize( bool bEnable = true );
bool IsCustomize() { return mbCustomize; }
- bool IsInCustomizeMode() const { return mbCustomizeMode; }
using DockingWindow::SetHelpText;
using DockingWindow::GetHelpText;
@@ -537,8 +515,6 @@ public:
// open custommenu
void ExecuteCustomMenu();
- // allow Click Handler to detect special key
- bool IsShift() const { return mbIsShift; }
// allow Click Handler to distinguish between mouse and key input
bool IsKeyEvent() const { return mbIsKeyEvent; }
@@ -580,17 +556,6 @@ inline Size ToolBox::CalcWindowSizePixel() const
return CalcWindowSizePixel( mnLines );
}
-inline Rectangle ToolBox::GetScrollRect() const
-{
- return maUpperRect.GetUnion( maLowerRect );
-}
-
-inline void ToolBox::SetDockingRects( const Rectangle& rOutRect,
- const Rectangle& rInRect )
-{
- maOutDockRect = rOutRect;
- maInDockRect = rInRect;
-}
inline void ToolBox::SetFloatingLines( sal_uInt16 nNewLines )
{
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 5416521..5b1ec57 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -108,7 +108,6 @@ public:
void SaveValue() { aSaveValue = GetText(); }
const OUString& GetSavedValue() const { return aSaveValue; }
- bool IsValueChangedFromSaved() const { return aSaveValue != GetText(); }
void SetModifyHdl( const Link<>& rLink ) SAL_OVERRIDE { aModifyHdlLink = rLink; }
const Link<>& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; }
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 9f0fdbc..ef86e5d 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -69,7 +69,6 @@ protected:
virtual void ReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE;
public:
- SalVirtualDevice* getSalVirtualDevice() { return mpVirDev; }
/** Create a virtual device of size 1x1
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 545f4bb..46d0176 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -570,7 +570,6 @@ public:
DECL_DLLPRIVATE_LINK_TYPED( ImplTrackTimerHdl, Timer*, void );
DECL_DLLPRIVATE_LINK( ImplAsyncFocusHdl, void* );
DECL_DLLPRIVATE_LINK_TYPED( ImplHandleResizeTimerHdl, Idle*, void );
- DECL_DLLPRIVATE_LINK( ImplHideOwnerDrawWindowsHdl, void* );
SAL_DLLPRIVATE static void ImplInitAppFontData( vcl::Window* pWindow );
@@ -760,7 +759,6 @@ private:
SAL_DLLPRIVATE void ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl = true );
- SAL_DLLPRIVATE void ImplAlignChildren();
SAL_DLLPRIVATE void ImplToBottomChild();
SAL_DLLPRIVATE void ImplCalcToTop( ImplCalcToTopData* pPrevData );
@@ -1363,8 +1361,6 @@ private:
SAL_DLLPRIVATE bool ImplIsAccessibleNativeFrame() const;
SAL_DLLPRIVATE sal_uInt16 ImplGetAccessibleCandidateChildWindowCount( GetWindowType nFirstWindowType ) const;
SAL_DLLPRIVATE vcl::Window* ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, GetWindowType nFirstWindowType, bool bTopLevel = true ) const;
- SAL_DLLPRIVATE bool ImplRegisterAccessibleNativeFrame();
- SAL_DLLPRIVATE void ImplRevokeAccessibleNativeFrame();
///@}
/*
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index 493779a..467e54a 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -96,7 +96,6 @@ public:
*/
void StartPresentationMode( bool bPresentation = true,
PresentationFlags nFlags = PresentationFlags::NONE );
- void EndPresentationMode() { StartPresentationMode( false ); }
bool IsPresentationMode() const { return mbPresentationMode; }
bool IsMinimized() const;
diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx
index a71ff8b..1625a35 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -75,7 +75,6 @@ public:
protected:
void InitMatchData() const;
- bool AreMapNamesAvailable() const { return mbMapNames; }
PhysicalFontFamily* ImplFindByAliasName(const OUString& rSearchName,
const OUString& rShortName) const;
diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx
index fa275cc..4c3f04b 100644
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -61,7 +61,6 @@ public:
bool IsScalable() const { return (mnHeight == 0); }
bool CheckMagic( int n ) const { return (n == mnMagic); }
PhysicalFontFace* GetNextFace() const { return mpNext; }
- PhysicalFontFace* CreateAlias() const { return Clone(); }
bool IsBetterMatch( const FontSelectPattern&, FontMatchStatus& ) const;
sal_Int32 CompareWithSize( const PhysicalFontFace& ) const;
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index d00ca1b..5811c052 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -144,7 +144,6 @@ public:
void Draw( const Rectangle& rRect, OutputDevice* pDev, const Point& rPos );
void SetDisplayActive( bool bActive );
- bool IsDisplayActive() const { return mbDisplayActive; }
void SetTitleType( sal_uInt16 nTitleType, const Size& rSize );
void SetBorderStyle( WindowBorderStyle nStyle );
WindowBorderStyle GetBorderStyle() const { return mnBorderStyle; }
@@ -234,7 +233,6 @@ public:
static void ImplInitTitle( ImplBorderFrameData* pData );
static sal_uInt16 ImplHitTest( ImplBorderFrameData* pData, const Point& rPos );
static bool ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
- bool ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
static OUString ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect );
static long ImplCalcTitleWidth( const ImplBorderFrameData* pData );
};
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index b056382..caa883d 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -247,11 +247,6 @@ public:
virtual void drawBitmap(
const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
- SalColor nTransparentColor ) SAL_OVERRIDE;
-
- virtual void drawBitmap(
- const SalTwoRect& rPosAry,
- const SalBitmap& rSalBitmap,
const SalBitmap& rMaskBitmap ) SAL_OVERRIDE;
virtual void drawMask(
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index abedf48..256e19e 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -64,7 +64,6 @@ public:
void Add( int nHeight ) { maSizeList.push_back( nHeight ); }
int Count() const { return maSizeList.size(); }
int Get( int nIndex ) const { return maSizeList[ nIndex ]; }
- const OUString& GetFontName() const { return maFontName; }
};
// nowadays these substitutions are needed for backward compatibility and tight platform integration:
@@ -107,8 +106,6 @@ public:
void AddFontSubstitute( const OUString& rFontName, const OUString& rSubstName, AddFontSubstituteFlags nFlags );
void RemoveFontSubstitute( int nIndex );
int GetFontSubstituteCount() const { return maFontSubstList.size(); };
- bool Empty() const { return maFontSubstList.empty(); }
- void Clear() { maFontSubstList.clear(); }
bool FindFontSubstitute( OUString& rSubstName, const OUString& rFontName, AddFontSubstituteFlags nFlags ) const;
};
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index f9f5344..dd6c456 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -94,10 +94,6 @@ private:
class ImplDevFontAttributes : public ImplFontAttributes
{
public: // TODO: create matching interface class
- const OUString& GetAliasNames() const { return maMapNames; }
- int GetQuality() const { return mnQuality; }
- bool IsRotatable() const { return mbOrientation; }
- bool IsDeviceFont() const { return mbDevice; }
bool IsEmbeddable() const { return mbEmbeddable; }
bool IsSubsettable() const { return mbSubsettable; }
diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index aa08cf0..237f60b 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -136,11 +136,6 @@ public:
virtual void drawBitmap(
const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
- SalColor nTransparentColor ) = 0;
-
- virtual void drawBitmap(
- const SalTwoRect& rPosAry,
- const SalBitmap& rSalBitmap,
const SalBitmap& rMaskBitmap ) = 0;
virtual void drawMask(
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 4ad66af..63e707e 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -147,17 +147,9 @@ public:
bool CallEventCallback( void* pEvent, int nBytes )
{ return m_pEventInst.is() && m_pEventInst->dispatchEvent( pEvent, nBytes ); }
- bool CallErrorCallback( void* pEvent, int nBytes )
- { return m_pEventInst.is() && m_pEventInst->dispatchErrorEvent( pEvent, nBytes ); }
-
enum ConnectionIdentifierType { AsciiCString, Blob };
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0;
- // this is a vehicle for PrintFontManager to bridge the gap between vcl and libvclplug_*
- // this is only necessary because PrintFontManager is an exported vcl API and therefore
- // needs to be in libvcl while libvclplug_* do not contain exported C++ API
- virtual void FillFontPathList( std::list< OString >& o_rFontPaths );
-
// dtrans implementation
virtual css::uno::Reference< css::uno::XInterface > CreateClipboard( const css::uno::Sequence< css::uno::Any >& i_rArguments );
virtual css::uno::Reference< css::uno::XInterface > CreateDragSource();
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 7197e7c..ea57496 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -75,7 +75,6 @@ public:
virtual bool AnyInput( VclInputFlags nType ) SAL_OVERRIDE;
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) SAL_OVERRIDE;
- virtual void FillFontPathList( std::list< OString >& o_rFontPaths ) SAL_OVERRIDE;
void SetLib( SalXLib *pXLib ) { mpXLib = pXLib; }
// dtrans implementation
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 97f1c14..174563e 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1494,14 +1494,6 @@ void OpenGLSalGraphicsImpl::drawBitmap( const SalTwoRect& rPosAry, const SalBitm
}
void OpenGLSalGraphicsImpl::drawBitmap(
- const SalTwoRect& /*rPosAry*/,
- const SalBitmap& /*rSalBitmap*/,
- SalColor /*nTransparentColor*/ )
-{
- OSL_FAIL( "::DrawBitmap with transparent color not supported" );
-}
-
-void OpenGLSalGraphicsImpl::drawBitmap(
const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
const SalBitmap& rMaskBitmap )
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 4c56363..227e1e2 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -65,11 +65,6 @@ SalInstance::~SalInstance()
{
}
-void SalInstance::FillFontPathList( std::list< OString >& )
-{
- // do nothing
-}
-
SalMenu* SalInstance::CreateMenu( bool, Menu* )
{
// default: no native menus
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index b8572e3..66b515e 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1424,13 +1424,6 @@ StyleSettings::GetInactiveTabColor() const
return mxData->maInactiveTabColor;
}
-void
-StyleSettings::SetAlternatingRowColor( const Color& rColor )
-{
- CopyData();
- mxData->maAlternatingRowColor = rColor;
-}
-
const Color&
StyleSettings::GetAlternatingRowColor() const
{
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 5b0567a..e59d4ab 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -224,14 +224,6 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const
return( ( aMask == rBitmapEx.aMask ) && ( bAlpha == rBitmapEx.bAlpha ) );
}
-bool BitmapEx::IsEqual( const BitmapEx& rBmpEx ) const
-{
- return( rBmpEx.eTransparent == eTransparent &&
- rBmpEx.bAlpha == bAlpha &&
- rBmpEx.aBitmap.IsEqual( aBitmap ) &&
- rBmpEx.aMask.IsEqual( aMask ) );
-}
-
bool BitmapEx::IsEmpty() const
{
return( aBitmap.IsEmpty() && aMask.IsEmpty() );
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 530df02..c3fa43d 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1197,23 +1197,6 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly,
return aPoly;
}
-tools::PolyPolygon OutputDevice::LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly,
- const MapMode& rMapMode ) const
-{
-
- if ( rMapMode.IsDefault() )
- return rLogicPolyPoly;
-
- tools::PolyPolygon aPolyPoly( rLogicPolyPoly );
- sal_uInt16 nPoly = aPolyPoly.Count();
- for( sal_uInt16 i = 0; i < nPoly; i++ )
- {
- Polygon& rPoly = aPolyPoly[i];
- rPoly = LogicToPixel( rPoly, rMapMode );
- }
- return aPolyPoly;
-}
-
basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly,
const MapMode& rMapMode ) const
{
@@ -1463,23 +1446,6 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly,
return aPoly;
}
-tools::PolyPolygon OutputDevice::PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly,
- const MapMode& rMapMode ) const
-{
-
- if ( rMapMode.IsDefault() )
- return rDevicePolyPoly;
-
- tools::PolyPolygon aPolyPoly( rDevicePolyPoly );
- sal_uInt16 nPoly = aPolyPoly.Count();
- for( sal_uInt16 i = 0; i < nPoly; i++ )
- {
- Polygon& rPoly = aPolyPoly[i];
- rPoly = PixelToLogic( rPoly, rMapMode );
- }
- return aPolyPoly;
-}
-
basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixelPoly,
const MapMode& rMapMode ) const
{
@@ -2073,18 +2039,4 @@ DeviceCoordinate OutputDevice::LogicWidthToDeviceCoordinate( long nWidth ) const
#endif
}
-DeviceCoordinate OutputDevice::LogicHeightToDeviceCoordinate( long nHeight ) const
-{
- if ( !mbMap )
- return (DeviceCoordinate)nHeight;
-#if VCL_FLOAT_DEVICE_PIXEL
- return (double)nHeight * maMapRes.mfScaleY * mnDPIY;
-#else
-
- return ImplLogicToPixel( nHeight, mnDPIY,
- maMapRes.mnMapScNumY, maMapRes.mnMapScDenomY,
- maThresRes.mnThresLogToPixY );
-#endif
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/outdev/rendersettings.cxx b/vcl/source/outdev/rendersettings.cxx
index fd2524d..2d7b871 100644
--- a/vcl/source/outdev/rendersettings.cxx
+++ b/vcl/source/outdev/rendersettings.cxx
@@ -13,35 +13,6 @@
namespace vcl
{
-void RenderSettings::SetLineColor(const Color& rColor)
-{
- maOutDevState.mpLineColor = new Color(rColor);
- maOutDevState.mnFlags |= PushFlags::LINECOLOR;
-}
-
-void RenderSettings::SetFillColor(const Color& rColor)
-{
- maOutDevState.mpFillColor = new Color(rColor);
- maOutDevState.mnFlags |= PushFlags::FILLCOLOR;
-}
-
-void RenderSettings::SetFont(const vcl::Font& rNewFont)
-{
- maOutDevState.mpFont = new vcl::Font(rNewFont);
- maOutDevState.mnFlags |= PushFlags::FONT;
-}
-
-void RenderSettings::SetBackground(const Wallpaper& rBackground)
-{
- mpBackground.reset(new Wallpaper(rBackground));
-}
-
-void RenderSettings::PushAndApply(vcl::RenderContext& rRenderContext)
-{
- rRenderContext.Push(maOutDevState.mnFlags);
- Apply(rRenderContext);
-}
-
void RenderSettings::Apply(vcl::RenderContext& rRenderContext)
{
if (maOutDevState.mnFlags & PushFlags::LINECOLOR)
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 4b5f7e2..1cefa88 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -186,125 +186,6 @@ void X11SalInstance::DestroyFrame( SalFrame* pFrame )
delete pFrame;
}
-static void getServerDirectories( std::list< OString >& o_rFontPaths )
-{
-#ifdef LINUX
- /*
- * chkfontpath exists on some (RH derived) Linux distributions
- */
- static const char* pCommands[] = {
- "/usr/sbin/chkfontpath 2>/dev/null", "chkfontpath 2>/dev/null"
- };
- ::std::list< OString > aLines;
-
- for( unsigned int i = 0; i < SAL_N_ELEMENTS(pCommands); i++ )
- {
- FILE* pPipe = popen( pCommands[i], "r" );
- aLines.clear();
- if( pPipe )
- {
- char line[1024];
- while( fgets( line, sizeof(line), pPipe ) )
- {
- int nLen = strlen( line );
- if( line[nLen-1] == '\n' )
- line[nLen-1] = 0;
- char* pSearch = strstr( line, ": " );
- if( pSearch )
- aLines.push_back( pSearch+2 );
- }
- if( ! pclose( pPipe ) )
- break;
- }
- }
-
- for( ::std::list< OString >::iterator it = aLines.begin(); it != aLines.end(); ++it )
- {
- if( ! access( it->getStr(), F_OK ) )
- {
- o_rFontPaths.push_back( *it );
-#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "adding fs dir %s\n", it->getStr() );
-#endif
- }
- }
-#else
- (void)o_rFontPaths;
-#endif
-}
-
-void X11SalInstance::FillFontPathList( std::list< OString >& o_rFontPaths )
-{
- Display *pDisplay = vcl_sal::getSalDisplay(GetGenericData())->GetDisplay();
-
- DBG_ASSERT( pDisplay, "No Display !" );
- if( pDisplay )
- {
- // get font paths to look for fonts
- int nPaths = 0, i;
- char** pPaths = XGetFontPath( pDisplay, &nPaths );
-
- bool bServerDirs = false;
- for( i = 0; i < nPaths; i++ )
- {
- OString aPath( pPaths[i] );
- sal_Int32 nPos = 0;
- if( ! bServerDirs
- && ( nPos = aPath.indexOf( ':' ) ) > 0
- && ( !aPath.copy(nPos).equals( ":unscaled" ) ) )
- {
- bServerDirs = true;
- getServerDirectories( o_rFontPaths );
- }
- else
- {
- psp::normPath( aPath );
- o_rFontPaths.push_back( aPath );
- }
- }
-
- if( nPaths )
- XFreeFontPath( pPaths );
- }
-
- // insert some standard directories
- o_rFontPaths.push_back( "/usr/openwin/lib/X11/fonts/TrueType" );
- o_rFontPaths.push_back( "/usr/openwin/lib/X11/fonts/Type1" );
- o_rFontPaths.push_back( "/usr/openwin/lib/X11/fonts/Type1/sun" );
- o_rFontPaths.push_back( "/usr/X11R6/lib/X11/fonts/truetype" );
- o_rFontPaths.push_back( "/usr/X11R6/lib/X11/fonts/Type1" );
-
- #ifdef SOLARIS
- /* cde specials, from /usr/dt/bin/Xsession: here are the good fonts,
- the OWfontpath file may contain as well multiple lines as a comma
- separated list of fonts in each line. to make it even more weird
- environment variables are allowed as well */
-
- const char* lang = getenv("LANG");
- if ( lang != NULL )
- {
- OUString aOpenWinDir( "/usr/openwin/lib/locale/" );
- aOpenWinDir += OUString::createFromAscii( lang );
- aOpenWinDir += "/OWfontpath";
-
- SvFileStream aStream( aOpenWinDir, StreamMode::READ );
-
- // TODO: replace environment variables
- while( aStream.IsOpen() && ! aStream.IsEof() )
- {
- OString aLine;
- aStream.ReadLine( aLine );
- psp::normPath( aLine );
- // try to avoid bad fonts in some cases
- static bool bAvoid = (strncasecmp( lang, "ar", 2 ) == 0) || (strncasecmp( lang, "he", 2 ) == 0) || strncasecmp( lang, "iw", 2 ) == 0 || (strncasecmp( lang, "hi", 2 ) == 0);
- if( bAvoid && aLine.indexOf("iso_8859") != -1 )
- continue;
- o_rFontPaths.push_back( aLine );
- }
- }
- #endif /* SOLARIS */
-}
-
extern "C" { static void SAL_CALL thisModule() {} }
void X11SalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService)
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index f5b8098..7a2beb1 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -949,13 +949,6 @@ bool X11SalGraphicsImpl::drawAlphaRect( long nX, long nY, long nWidth,
return true;
}
-void X11SalGraphicsImpl::drawBitmap( const SalTwoRect&,
- const SalBitmap&,
- SalColor )
-{
- OSL_FAIL( "::DrawBitmap with transparent color not supported" );
-}
-
void X11SalGraphicsImpl::drawMask( const SalTwoRect& rPosAry,
const SalBitmap &rSalBitmap,
SalColor nMaskColor )
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 509ac1d..f5df99c 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -195,11 +195,6 @@ public:
virtual void drawBitmap(
const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
- SalColor nTransparentColor ) SAL_OVERRIDE;
-
- virtual void drawBitmap(
- const SalTwoRect& rPosAry,
- const SalBitmap& rSalBitmap,
const SalBitmap& rMaskBitmap ) SAL_OVERRIDE;
virtual void drawMask(
diff --git a/vcl/win/source/gdi/gdiimpl.cxx b/vcl/win/source/gdi/gdiimpl.cxx
index a58b3c2..aea064d 100644
--- a/vcl/win/source/gdi/gdiimpl.cxx
+++ b/vcl/win/source/gdi/gdiimpl.cxx
@@ -717,60 +717,6 @@ void WinSalGraphicsImpl::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap&
void WinSalGraphicsImpl::drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSSalBitmap,
- SalColor nTransparentColor )
-{
- DBG_ASSERT( !mrParent.isPrinter(), "No transparency print possible!" );
-
- const WinSalBitmap& rSalBitmap = static_cast<const WinSalBitmap&>(rSSalBitmap);
-
- WinSalBitmap* pMask = new WinSalBitmap;
- const Point aPoint;
- const Size aSize( rSalBitmap.GetSize() );
- HBITMAP hMaskBitmap = CreateBitmap( (int) aSize.Width(), (int) aSize.Height(), 1, 1, NULL );
- HDC hMaskDC = ImplGetCachedDC( CACHED_HDC_1, hMaskBitmap );
- const BYTE cRed = SALCOLOR_RED( nTransparentColor );
- const BYTE cGreen = SALCOLOR_GREEN( nTransparentColor );
- const BYTE cBlue = SALCOLOR_BLUE( nTransparentColor );
-
- if( rSalBitmap.ImplGethDDB() )
- {
- HDC hSrcDC = ImplGetCachedDC( CACHED_HDC_2, rSalBitmap.ImplGethDDB() );
- COLORREF aOldCol = SetBkColor( hSrcDC, RGB( cRed, cGreen, cBlue ) );
-
- BitBlt( hMaskDC, 0, 0, (int) aSize.Width(), (int) aSize.Height(), hSrcDC, 0, 0, SRCCOPY );
-
- SetBkColor( hSrcDC, aOldCol );
- ImplReleaseCachedDC( CACHED_HDC_2 );
- }
- else
- {
- WinSalBitmap* pTmpSalBmp = new WinSalBitmap;
-
- if( pTmpSalBmp->Create( rSalBitmap, &mrParent ) )
- {
- HDC hSrcDC = ImplGetCachedDC( CACHED_HDC_2, pTmpSalBmp->ImplGethDDB() );
- COLORREF aOldCol = SetBkColor( hSrcDC, RGB( cRed, cGreen, cBlue ) );
-
- BitBlt( hMaskDC, 0, 0, (int) aSize.Width(), (int) aSize.Height(), hSrcDC, 0, 0, SRCCOPY );
-
- SetBkColor( hSrcDC, aOldCol );
- ImplReleaseCachedDC( CACHED_HDC_2 );
- }
-
- delete pTmpSalBmp;
- }
-
- ImplReleaseCachedDC( CACHED_HDC_1 );
-
- // hMaskBitmap is destroyed by new SalBitmap 'pMask' ( bDIB==FALSE, bCopy == FALSE )
- if( pMask->Create( hMaskBitmap, FALSE, FALSE ) )
- drawBitmap( rPosAry, rSalBitmap, *pMask );
-
- delete pMask;
-}
-
-void WinSalGraphicsImpl::drawBitmap( const SalTwoRect& rPosAry,
- const SalBitmap& rSSalBitmap,
const SalBitmap& rSTransparentBitmap )
{
DBG_ASSERT( !mrParent.isPrinter(), "No transparency print possible!" );
diff --git a/vcl/win/source/gdi/gdiimpl.hxx b/vcl/win/source/gdi/gdiimpl.hxx
index 2985f3b..bdcdda1 100644
--- a/vcl/win/source/gdi/gdiimpl.hxx
+++ b/vcl/win/source/gdi/gdiimpl.hxx
@@ -144,11 +144,6 @@ public:
virtual void drawBitmap(
const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
- SalColor nTransparentColor ) SAL_OVERRIDE;
-
- virtual void drawBitmap(
- const SalTwoRect& rPosAry,
- const SalBitmap& rSalBitmap,
const SalBitmap& rMaskBitmap ) SAL_OVERRIDE;
virtual void drawMask(
More information about the Libreoffice-commits
mailing list