summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-18 14:30:24 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-20 08:07:53 +0000
commit72edb6967f245f0c99c6a61e0ce8d0a245600cba (patch)
tree5608bc1243477801e747735d8b71ec42fbb01e86 /vcl/source
parentaad5eced795c60f873b67fe97baeefb9ef1bfef8 (diff)
loplugin:unusedmethods in vcl
also drops the CairoFontsCache ref-counting, since nothing was actually using it. Change-Id: If05ecb054b6b8d97b0d3010185cf23c28390ec04 Reviewed-on: https://gerrit.libreoffice.org/25105 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/control/combobox.cxx2
-rw-r--r--vcl/source/edit/textdat2.hxx7
-rw-r--r--vcl/source/edit/textund2.hxx12
-rw-r--r--vcl/source/edit/textview.cxx10
-rw-r--r--vcl/source/font/font.cxx30
-rw-r--r--vcl/source/gdi/pdffontcache.hxx5
-rw-r--r--vcl/source/window/commandevent.cxx21
-rw-r--r--vcl/source/window/menu.cxx67
-rw-r--r--vcl/source/window/syschild.cxx33
9 files changed, 6 insertions, 181 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 6b54142519bf..2f72aa92110e 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1028,8 +1028,6 @@ bool ComboBox::IsInDropDown() const
return m_pImpl->m_pFloatWin && m_pImpl->m_pFloatWin->IsInPopupMode();
}
-sal_Unicode ComboBox::GetMultiSelectionSeparator() const { return m_pImpl->m_cMultiSep; }
-
void ComboBox::EnableMultiSelection( bool bMulti )
{
m_pImpl->m_pImplLB->EnableMultiSelection( bMulti, false );
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 2788d3696f7d..6a09fa8e4fac 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -52,13 +52,6 @@ private:
sal_uInt8 nKind;
bool bRightToLeft;
- TETextPortion()
- : nLen {0}
- , nWidth {-1}
- , nKind {PORTIONKIND_TEXT}
- , bRightToLeft {false}
- {}
-
public:
TETextPortion( sal_Int32 nL )
: nLen {nL}
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 786402c4daf9..bcb44bbf34b7 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -103,18 +103,6 @@ public:
virtual OUString GetComment () const override;
};
-class TextUndoSetAttribs: public TextUndo
-{
-public:
- TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel );
- virtual ~TextUndoSetAttribs();
-
- virtual void Undo() override;
- virtual void Redo() override;
-
- virtual OUString GetComment () const override;
-};
-
#endif // INCLUDED_VCL_SOURCE_EDIT_TEXTUND2_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index a033c6b871b7..732651ecd3ef 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -475,16 +475,6 @@ void TextView::ImpShowHideSelection(bool /*bShow*/, const TextSelection* pRange)
}
}
-VirtualDevice* TextView::GetVirtualDevice()
-{
- if ( !mpImpl->mpVirtDev )
- {
- mpImpl->mpVirtDev = VclPtr<VirtualDevice>::Create();
- mpImpl->mpVirtDev->SetLineColor();
- }
- return mpImpl->mpVirtDev;
-}
-
void TextView::EraseVirtualDevice()
{
mpImpl->mpVirtDev.disposeAndClear();
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index de56c8059e57..bc490ff431af 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -694,7 +694,6 @@ void Font::SetQuality( int nQuality ) { mpImplFont->SetQuality( nQuality ); }
void Font::IncreaseQualityBy( int nQualityAmount ) { mpImplFont->IncreaseQualityBy( nQualityAmount ); }
void Font::DecreaseQualityBy( int nQualityAmount ) { mpImplFont->DecreaseQualityBy( nQualityAmount ); }
-OUString Font::GetMapNames() const { return mpImplFont->GetMapNames(); }
void Font::SetMapNames( OUString const & aMapNames ) { mpImplFont->SetMapNames(aMapNames); }
bool Font::IsBuiltInFont() const { return mpImplFont->IsBuiltInFont(); }
@@ -830,35 +829,6 @@ bool ImplFont::operator==( const ImplFont& rOther ) const
return true;
}
-bool ImplFont::CompareDeviceIndependentFontAttributes(const ImplFont& rOther) const
-{
- if (maFamilyName != rOther.maFamilyName)
- return false;
-
- if (maStyleName != rOther.maStyleName)
- return false;
-
- if (meWeight != rOther.meWeight)
- return false;
-
- if (meItalic != rOther.meItalic)
- return false;
-
- if (meFamily != rOther.meFamily)
- return false;
-
- if (mePitch != rOther.mePitch)
- return false;
-
- if (meWidthType != rOther.meWidthType)
- return false;
-
- if (mbSymbolFlag != rOther.mbSymbolFlag)
- return false;
-
- return true;
-}
-
void ImplFont::AskConfig()
{
if( mbConfigLookup )
diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index f6686296bbd0..8bf5c959b429 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -38,11 +38,6 @@ namespace vcl
std::type_info* m_typeFontFace;
FontIdentifier( const PhysicalFontFace*, bool bVertical );
- FontIdentifier()
- : m_nFontId(0)
- , m_bVertical(false)
- , m_typeFontFace(nullptr)
- {}
// Less than needed for std::set and std::map
bool operator<( const FontIdentifier& rRight ) const
diff --git a/vcl/source/window/commandevent.cxx b/vcl/source/window/commandevent.cxx
index 25b3f15873d4..e7f7dcd8569d 100644
--- a/vcl/source/window/commandevent.cxx
+++ b/vcl/source/window/commandevent.cxx
@@ -64,11 +64,6 @@ CommandExtTextInputData::~CommandExtTextInputData()
delete [] mpTextAttr;
}
-CommandInputContextData::CommandInputContextData()
-{
- meLanguage = LANGUAGE_DONTKNOW;
-}
-
CommandInputContextData::CommandInputContextData( LanguageType eLang )
{
meLanguage = eLang;
@@ -99,33 +94,17 @@ CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDelta,
mbDeltaIsPixel = bDeltaIsPixel;
}
-CommandScrollData::CommandScrollData()
-{
- mnDeltaX = 0;
- mnDeltaY = 0;
-}
-
CommandScrollData::CommandScrollData( long nDeltaX, long nDeltaY )
{
mnDeltaX = nDeltaX;
mnDeltaY = nDeltaY;
}
-CommandModKeyData::CommandModKeyData()
-{
- mnCode = 0L;
-}
-
CommandModKeyData::CommandModKeyData( sal_uInt16 nCode )
{
mnCode = nCode;
}
-CommandSelectionChangeData::CommandSelectionChangeData()
-{
- mnStart = mnEnd = 0;
-}
-
CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart, sal_uLong nEnd )
{
mnStart = nStart;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index ce465f9c3a6f..64549365efd9 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1077,61 +1077,6 @@ void Menu::SetItemImage( sal_uInt16 nItemId, const Image& rImage )
ImplGetSalMenu()->SetItemImage( nPos, pData->pSalMenuItem, rImage );
}
-static inline Image ImplRotImage( const Image& rImage, long nAngle10 )
-{
- Image aRet;
- BitmapEx aBmpEx( rImage.GetBitmapEx() );
-
- aBmpEx.Rotate( nAngle10, COL_WHITE );
-
- return Image( aBmpEx );
-}
-
-void Menu::SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 )
-{
- size_t nPos;
- MenuItemData* pData = pItemList->GetData( nItemId, nPos );
-
- if ( pData )
- {
- long nDeltaAngle = (nAngle10 - pData->nItemImageAngle) % 3600;
- while( nDeltaAngle < 0 )
- nDeltaAngle += 3600;
-
- pData->nItemImageAngle = nAngle10;
- if( nDeltaAngle && !!pData->aImage )
- pData->aImage = ImplRotImage( pData->aImage, nDeltaAngle );
- }
-}
-
-static inline Image ImplMirrorImage( const Image& rImage )
-{
- Image aRet;
- BitmapEx aBmpEx( rImage.GetBitmapEx() );
-
- aBmpEx.Mirror( BmpMirrorFlags::Horizontal );
-
- return Image( aBmpEx );
-}
-
-void Menu::SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror )
-{
- size_t nPos;
- MenuItemData* pData = pItemList->GetData( nItemId, nPos );
-
- if ( pData )
- {
- if( ( pData->bMirrorMode && ! bMirror ) ||
- ( ! pData->bMirrorMode && bMirror )
- )
- {
- pData->bMirrorMode = bMirror;
- if( !!pData->aImage )
- pData->aImage = ImplMirrorImage( pData->aImage );
- }
- }
-}
-
Image Menu::GetItemImage( sal_uInt16 nItemId ) const
{
MenuItemData* pData = pItemList->GetData( nItemId );
@@ -2750,12 +2695,6 @@ void MenuBar::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<MenuBar::
pMenuWin->SetMenuBarButtonHighlightHdl(nId, rLink);
}
-Rectangle MenuBar::GetMenuBarButtonRectPixel( sal_uInt16 nId )
-{
- MenuBarWindow* pMenuWin = getMenuBarWindow();
- return pMenuWin ? pMenuWin->GetMenuBarButtonRectPixel(nId) : Rectangle();
-}
-
void MenuBar::RemoveMenuBarButton( sal_uInt16 nId )
{
MenuBarWindow* pMenuWin = getMenuBarWindow();
@@ -2764,6 +2703,12 @@ void MenuBar::RemoveMenuBarButton( sal_uInt16 nId )
pMenuWin->RemoveMenuBarButton(nId);
}
+Rectangle MenuBar::GetMenuBarButtonRectPixel( sal_uInt16 nId )
+{
+ MenuBarWindow* pMenuWin = getMenuBarWindow();
+ return pMenuWin ? pMenuWin->GetMenuBarButtonRectPixel(nId) : Rectangle();
+}
+
bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId )
{
MenuBarWindow* pMenuWin = getMenuBarWindow();
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 7f92c641127d..d6595038991b 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -162,39 +162,6 @@ void SystemChildWindow::EnableEraseBackground( bool bEnable )
mpWindowImpl->mpSysObj->EnableEraseBackground( bEnable );
}
-void SystemChildWindow::ImplTestJavaException( void* pEnv )
-{
-#if HAVE_FEATURE_JAVA
- JNIEnv* pJavaEnv = static_cast< JNIEnv* >( pEnv );
- jthrowable jtThrowable = pJavaEnv->ExceptionOccurred();
-
- if( jtThrowable )
- { // is it a java exception ?
-#if OSL_DEBUG_LEVEL > 1
- pJavaEnv->ExceptionDescribe();
-#endif // OSL_DEBUG_LEVEL > 1
- pJavaEnv->ExceptionClear();
-
- jclass jcThrowable = pJavaEnv->FindClass("java/lang/Throwable");
- jmethodID jmThrowable_getMessage = pJavaEnv->GetMethodID(jcThrowable, "getMessage", "()Ljava/lang/String;");
- jstring jsMessage = static_cast<jstring>( pJavaEnv->CallObjectMethod(jtThrowable, jmThrowable_getMessage) );
- OUString ouMessage;
-
- if(jsMessage)
- {
- const jchar * jcMessage = pJavaEnv->GetStringChars(jsMessage, nullptr);
- ouMessage = OUString(
- reinterpret_cast<sal_Unicode const *>(jcMessage));
- pJavaEnv->ReleaseStringChars(jsMessage, jcMessage);
- }
-
- throw uno::RuntimeException(ouMessage);
- }
-#else
- (void)pEnv;
-#endif // HAVE_FEATURE_JAVA
-}
-
void SystemChildWindow::SetForwardKey( bool bEnable )
{
if ( mpWindowImpl->mpSysObj )