summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sfx2/inc/sfx2/mnuitem.hxx17
-rw-r--r--sfx2/source/menu/mnuitem.cxx97
-rw-r--r--sfx2/source/menu/thessubmenu.cxx66
-rw-r--r--sfx2/source/menu/thessubmenu.hxx19
-rw-r--r--svx/inc/svx/grafctrl.hxx2
-rw-r--r--svx/inc/svx/lboxctrl.hxx2
-rw-r--r--svx/inc/svx/tbcontrl.hxx22
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx5
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx5
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx59
-rwxr-xr-xunusedcode.easy11
-rw-r--r--vcl/inc/unx/salbmp.h7
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx39
13 files changed, 4 insertions, 347 deletions
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 88871d598084..4350aae47384 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -126,23 +126,6 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
{ SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \
Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
-
-
-class SfxAppMenuControl_Impl : public SfxMenuControl
-{
- PopupMenu* pMenu;
- sal_uIntPtr m_nSymbolsStyle;
- sal_Bool m_bShowMenuImages;
-
-protected:
- DECL_LINK( Activate, Menu * );
-
-public:
- static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
- SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings );
- ~SfxAppMenuControl_Impl();
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index c01f7b37a3b7..49dce66a07e8 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -301,103 +301,6 @@ PopupMenu* SfxMenuControl::GetPopup () const
return 0;
}
-long Select_Impl( void* pHdl, void* pVoid );
-
-SfxMenuControl* SfxAppMenuControl_Impl::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings )
-{
- return new SfxAppMenuControl_Impl(nId, rMenu, rBindings);
-}
-
-SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
- sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings )
- : SfxMenuControl( nPos, rBindings ), pMenu(0)
-{
- String aText = rMenu.GetItemText( nPos );
-
- // Determine the current background color setting for menus
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- m_nSymbolsStyle = rSettings.GetSymbolsStyle();
- m_bShowMenuImages = rSettings.GetUseImagesInMenus();
-
- Reference<com::sun::star::lang::XMultiServiceFactory> aXMultiServiceFactory(::comphelper::getProcessServiceFactory());
- ::framework::MenuConfiguration aConf( aXMultiServiceFactory );
- Reference<com::sun::star::frame::XFrame> aXFrame( GetBindings().GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() );
- pMenu = aConf.CreateBookmarkMenu( aXFrame, GetId() == SID_NEWDOCDIRECT ? BOOKMARK_NEWMENU : BOOKMARK_WIZARDMENU );
- if( pMenu )
- {
- pMenu->SetSelectHdl( Link( &(this->GetBindings()), Select_Impl ) );
- pMenu->SetActivateHdl( LINK(this, SfxAppMenuControl_Impl, Activate) );
- rMenu.SetPopupMenu( nPos, pMenu );
- }
-}
-
-SfxAppMenuControl_Impl::~SfxAppMenuControl_Impl()
-{
- delete pMenu;
-}
-
-IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
-{
- if ( pActMenu )
- {
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- sal_uIntPtr nSymbolsStyle = rSettings.GetSymbolsStyle();
- sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
-
- if (( nSymbolsStyle != m_nSymbolsStyle ) ||
- ( bShowMenuImages != m_bShowMenuImages ))
- {
- m_nSymbolsStyle = nSymbolsStyle;
- m_bShowMenuImages = bShowMenuImages;
-
- sal_uInt16 nCount = pActMenu->GetItemCount();
- for ( sal_uInt16 nSVPos = 0; nSVPos < nCount; nSVPos++ )
- {
- sal_uInt16 nItemId = pActMenu->GetItemId( nSVPos );
- if ( pActMenu->GetItemType( nSVPos ) != MENUITEM_SEPARATOR )
- {
- if ( bShowMenuImages )
- {
- sal_Bool bImageSet = sal_False;
- ::rtl::OUString aImageId;
- ::framework::MenuConfiguration::Attributes* pMenuAttributes =
- (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nItemId );
-
- if ( pMenuAttributes )
- aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
-
- if ( !aImageId.isEmpty() )
- {
- Reference< ::com::sun::star::frame::XFrame > xFrame;
- Image aImage = GetImage( xFrame, aImageId, false );
- if ( !!aImage )
- {
- bImageSet = sal_True;
- pActMenu->SetItemImage( nItemId, aImage );
- }
- }
-
- String aCmd( pActMenu->GetItemCommand( nItemId ) );
- if ( !bImageSet && aCmd.Len() )
- {
- Image aImage = SvFileInformationManager::GetImage(
- INetURLObject(aCmd), false );
- if ( !!aImage )
- pActMenu->SetItemImage( nItemId, aImage );
- }
- }
- else
- pActMenu->SetItemImage( nItemId, Image() );
- }
- }
- }
-
- return sal_True;
- }
-
- return sal_False;
-}
-
SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
sal_uInt16 nId, Menu& rMenu, const String& sItemText,
SfxBindings& rBindings, SfxVirtualMenu* pVirt)
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index 1bda672e3610..21d44dc8ced5 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -46,75 +46,9 @@
#include <sfx2/viewsh.hxx>
#include "thessubmenu.hxx"
-
using namespace ::com::sun::star;
using ::rtl::OUString;
-
-// STATIC DATA -----------------------------------------------------------
-
-SfxMenuControl* SfxThesSubMenuControl::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings )
-{
- return new SfxThesSubMenuControl(nId, rMenu, rBindings);
-}
-
-/*
- Constructor; sets the Select-Handler for the Menu and inserts it into
- its Parent.
- */
-SfxThesSubMenuControl::SfxThesSubMenuControl( sal_uInt16 nSlotId, Menu &rMenu, SfxBindings &rBindings )
- : SfxMenuControl( nSlotId, rBindings ),
- pMenu(new PopupMenu),
- rParent(rMenu)
-{
- rMenu.SetPopupMenu(nSlotId, pMenu);
- pMenu->SetSelectHdl(LINK(this, SfxThesSubMenuControl, MenuSelect));
- pMenu->Clear();
- rParent.EnableItem( GetId(), sal_False );
-}
-
-
-SfxThesSubMenuControl::~SfxThesSubMenuControl()
-{
- delete pMenu;
-}
-
-
-/*
- Status notification:
- If the functionality is disabled, the corresponding
- menu entry in Parentmenu is disabled, otherwise it is enabled.
- */
-void SfxThesSubMenuControl::StateChanged(
- sal_uInt16 /*nSID*/,
- SfxItemState eState,
- const SfxPoolItem* /*pState*/ )
-{
- rParent.EnableItem(GetId(), SFX_ITEM_AVAILABLE == eState );
-}
-
-
-/*
- Select-Handler for Menus;
- run the selected Verb,
- */
-IMPL_LINK_INLINE_START( SfxThesSubMenuControl, MenuSelect, Menu *, pSelMenu )
-{
- const sal_uInt16 nSlotId = pSelMenu->GetCurItemId();
- if( nSlotId )
- GetBindings().Execute(nSlotId);
- return 1;
-}
-IMPL_LINK_INLINE_END( SfxThesSubMenuControl, MenuSelect, Menu *, pSelMenu )
-
-
-PopupMenu* SfxThesSubMenuControl::GetPopup() const
-{
- return pMenu;
-}
-
-
-
OUString SfxThesSubMenuHelper::GetText(
const String &rLookUpString,
xub_StrLen nDelimPos )
diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx
index b177b112d58a..9e7b48e16735 100644
--- a/sfx2/source/menu/thessubmenu.hxx
+++ b/sfx2/source/menu/thessubmenu.hxx
@@ -42,25 +42,6 @@ class Menu;
namespace css = ::com::sun::star;
-class SfxThesSubMenuControl : public SfxMenuControl
-{
- PopupMenu* pMenu;
- Menu& rParent;
-
-private:
- virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
- DECL_LINK( MenuSelect, Menu * );
-
-public:
- SfxThesSubMenuControl(sal_uInt16, Menu&, SfxBindings&);
- ~SfxThesSubMenuControl();
-
- virtual PopupMenu* GetPopup() const;
-
- static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
-};
-
-
class SfxThesSubMenuHelper
{
css::uno::Reference< css::linguistic2::XLinguServiceManager > m_xLngMgr;
diff --git a/svx/inc/svx/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx
index 27816f282d7e..8e4b0688128b 100644
--- a/svx/inc/svx/grafctrl.hxx
+++ b/svx/inc/svx/grafctrl.hxx
@@ -73,8 +73,6 @@ public:
class SvxGrafToolBoxControl : public SfxToolBoxControl
{
public:
- static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx );
-
SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxGrafToolBoxControl();
diff --git a/svx/inc/svx/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx
index ce6aa8c0fc22..6f9e9593d739 100644
--- a/svx/inc/svx/lboxctrl.hxx
+++ b/svx/inc/svx/lboxctrl.hxx
@@ -51,8 +51,6 @@ protected:
DECL_LINK( SelectHdl, void * );
public:
- static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx );
-
SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual ~SvxListBoxControl();
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 35806e5c707c..3f2bd3967f4d 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -344,7 +344,6 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl
Color mLastColor;
public:
- SFX_DECL_TOOLBOX_CONTROL();
SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxColorToolBoxControl();
@@ -418,27 +417,6 @@ public:
virtual SfxPopupWindow* CreatePopupWindow();
};
-
-
-class SvxReloadControllerItem_Impl;
-class SvxReloadControllerItem : public SfxToolBoxControl
-{
-private:
- SvxReloadControllerItem_Impl* pImpl;
-
-public:
- static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx );
-
- SvxReloadControllerItem( sal_uInt16 nSlotId,
- sal_uInt16 nId,
- ToolBox& rTbx );
- ~SvxReloadControllerItem();
-
-protected:
- virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
- const SfxPoolItem* pState );
-};
-
class SVX_DLLPUBLIC SvxSimpleUndoRedoController : public SfxToolBoxControl
{
private:
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 5e4d30008731..fb534742be53 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -546,11 +546,6 @@ SfxPopupWindow* SvxGrafFilterToolBoxControl::CreatePopupWindow()
// - SvxGrafToolBoxControl -
// -------------------------
-SfxToolBoxControl* SvxGrafToolBoxControl::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx )
-{
- return new SvxGrafToolBoxControl( nSlotId, nId, rTbx );
-}
-
// -----------------------------------------------------------------------------
SvxGrafToolBoxControl::SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx) :
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 2c3bfe407e5c..d281d5cf1338 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -164,11 +164,6 @@ Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow()
/////////////////////////////////////////////////////////////////
-SfxToolBoxControl* SvxListBoxControl::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx )
-{
- return new SvxListBoxControl( nSlotId, nId, rTbx );
-}
-
SvxListBoxControl::SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx ),
pPopupWin ( 0 )
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d5177806e50b..d6a3244e6cfb 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -123,17 +123,11 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxStyleToolBoxControl, SfxTemplateItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFontNameToolBoxControl, SvxFontItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFontColorToolBoxControl, SvxColorItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxColorExtToolBoxControl, SvxColorItem );
-SFX_IMPL_TOOLBOX_CONTROL( SvxColorToolBoxControl, SvxColorItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFrameToolBoxControl, SvxBoxItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFrameLineStyleToolBoxControl, SvxLineItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFrameLineColorToolBoxControl, SvxColorItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxSimpleUndoRedoController, SfxStringItem );
-SfxToolBoxControl* SvxReloadControllerItem::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx )
-{
- return new SvxReloadControllerItem( nSlotId, nId, rTbx );
-}
-
//========================================================================
// class SvxStyleBox_Impl -----------------------------------------------------
//========================================================================
@@ -2561,59 +2555,6 @@ void SvxFrameLineColorToolBoxControl::StateChanged(
}
}
-// class SvxReloadControllerItem_Impl ------------------------------------
-
-class SvxReloadControllerItem_Impl
-{
-public:
- Image* pNormalImage;
- Image* pSpecialImage;
-
- SvxReloadControllerItem_Impl() :
- pNormalImage( new Image( SVX_RES( RID_SVX_RELOAD_NORMAL ) ) ), pSpecialImage( 0 ) {}
- ~SvxReloadControllerItem_Impl() { delete pNormalImage; delete pSpecialImage; }
-
- Image& GetNormalImage() { return *pNormalImage; }
- Image& GetSpecialImage()
- {
- if ( !pSpecialImage )
- pSpecialImage = new Image( SVX_RES( RID_SVX_RELOAD_SPECIAL ) );
- return *pSpecialImage;
- }
-};
-
-// -----------------------------------------------------------------------
-
-SvxReloadControllerItem::SvxReloadControllerItem( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
-: SfxToolBoxControl( nSlotId, nId, rTbx )
-, pImpl( new SvxReloadControllerItem_Impl )
-{
- rTbx.SetItemImage( nId, pImpl->GetNormalImage() );
-}
-
-// -----------------------------------------------------------------------
-
-SvxReloadControllerItem::~SvxReloadControllerItem()
-{
- delete pImpl;
-}
-
-// -----------------------------------------------------------------------
-
-void SvxReloadControllerItem::StateChanged(
- sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
-{
- SfxBoolItem* pItem = PTR_CAST( SfxBoolItem, pState );
- ToolBox& rBox = GetToolBox();
- if( pItem )
- {
- rBox.SetItemImage( GetId(),
- pItem->GetValue() ? pImpl->GetSpecialImage() :
- pImpl->GetNormalImage() );
- }
- rBox.EnableItem( GetId(), eState != SFX_ITEM_DISABLED );
-}
-
//========================================================================
// class SvxSimpleUndoRedoController -------------------------------------
//========================================================================
diff --git a/unusedcode.easy b/unusedcode.easy
index 05808d423f29..6d42adf99cf5 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,3 +1,4 @@
+(anonymous namespace)::writeU8(WPXBinaryData&, int)
Button::ImplGetSymbolAlign() const
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
CharPosArray::Insert(CharPosArray const*, unsigned short, unsigned short, unsigned short)
@@ -50,7 +51,6 @@ SalGraphics::drawPolyLine(basegfx::B2DPolygon const&, double, basegfx::B2DVector
SalGraphics::drawPolyPolygon(basegfx::B2DPolyPolygon const&, double)
SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
-SbxDecimal::getByte(unsigned char&)
SbxDecimal::getInt(int&)
SbxDecimal::getUInt(unsigned int&)
ScAddInAsyncs::Insert(ScAddInAsync* const&, unsigned short&)
@@ -81,6 +81,7 @@ ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long)
ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ScDBData>)
ScDBCollection::AnonDBs::size() const
+ScDPFieldControlBase::GetDupCount(unsigned long) const
ScDPSaveDimension::Refresh(com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> const&, std::__debug::list<rtl::OUString, std::allocator<rtl::OUString> > const&)
ScDocRowHeightUpdater::TabRanges::TabRanges()
ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
@@ -1008,6 +1009,8 @@ dbtools::StatementComposer::getDisposeComposer() const
dbtools::getComposedRowSetStatement(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, unsigned char, unsigned char)
dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
dbtools::throwFunctionNotSupportedException(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, com::sun::star::uno::Any const&)
+dp_misc::TRACE(rtl::OString const&)
+dp_misc::writeConsoleError(rtl::OString const&)
drawinglayer::attribute::SdrFillTextAttribute::isDefault() const
drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const
drawinglayer::attribute::SdrTextAttribute::getPropertiesVersion() const
@@ -1020,12 +1023,6 @@ formula::FormulaTokenIterator::First()
framework::TabWindow::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
jfw_plugin::VendorBase::createInstance()
jfw_plugin::VendorBase::getJavaExePaths(int*)
-jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&)
-libcdr::CDRDocument::generateSVG(WPXInputStream*, WPXString&)
-libcmis::SessionFactory::getRepositories(std::__debug::map<int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<int>, std::allocator<std::pair<int const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >)
-libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString&)
-libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long, WPXString&, libwpg::WPGFileFormat)
-libwpg::WPGraphics::parse(unsigned char const*, unsigned long, libwpg::WPGPaintInterface*, libwpg::WPGFileFormat)
nullcanvas::CanvasFont::getFontMatrix() const
nullcanvas::CanvasHelper::flush() const
nullcanvas::CanvasHelper::getPalette()
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 31aeeab58271..942a1f703993 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -207,13 +207,6 @@ public:
long nHeight
);
- ImplSalDDB(
- Display* pDisplay,
- XLIB_Window hWindow,
- SalX11Screen nXScreen,
- XImage* pImage
- );
-
~ImplSalDDB();
Pixmap ImplGetPixmap() const { return maPixmap; }
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index cd617b8c2c58..bde272b48363 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -912,45 +912,6 @@ ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable,
}
}
-// -----------------------------------------------------------------------------------------
-// create from XImage
-
-ImplSalDDB::ImplSalDDB (Display* pDisplay, XLIB_Window hWindow, SalX11Screen nXScreen, XImage* pImage)
- : mnXScreen( nXScreen )
-{
- maPixmap = XCreatePixmap (pDisplay, hWindow, pImage->width, pImage->height, pImage->depth);
- if (maPixmap != 0)
- {
- XGCValues aValues;
- GC aGC;
- int nValues = GCFunction;
-
- aValues.function = GXcopy;
-
- if (pImage->depth == 1)
- {
- nValues |= ( GCForeground | GCBackground );
- aValues.foreground = 1;
- aValues.background = 0;
- }
-
- aGC = XCreateGC (pDisplay, maPixmap, nValues, &aValues);
- XPutImage (pDisplay, maPixmap, aGC, pImage, 0, 0, 0, 0, pImage->width, pImage->height);
- XFreeGC (pDisplay, aGC);
-
- maTwoRect.mnSrcX = 0;
- maTwoRect.mnSrcY = 0;
- maTwoRect.mnDestX = 0;
- maTwoRect.mnDestY = 0;
- maTwoRect.mnSrcWidth = pImage->width;
- maTwoRect.mnDestWidth = pImage->width;
- maTwoRect.mnSrcHeight = pImage->height;
- maTwoRect.mnDestHeight = pImage->height;
-
- mnDepth = pImage->depth;
- }
-}
-
// -----------------------------------------------------------------------------
ImplSalDDB::ImplSalDDB(
generated by cgit (git 2.34.1) at 2025-02-19 15:05:59 +0000