[Libreoffice-commits] .: sot/source svtools/inc svtools/source sw/inc tools/source unusedcode.easy vcl/inc vcl/unx
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Aug 13 09:19:24 PDT 2012
sot/source/sdstor/storage.cxx | 14 ------
svtools/inc/svtools/PlaceEditDialog.hxx | 2
svtools/source/dialogs/PlaceEditDialog.cxx | 5 --
svtools/source/misc/transfer.cxx | 7 ---
sw/inc/unofield.hxx | 1
tools/source/fsys/tempfile.cxx | 5 --
unusedcode.easy | 5 --
vcl/inc/unx/salgdi.h | 7 ---
vcl/unx/generic/gdi/salgdi2.cxx | 61 -----------------------------
9 files changed, 107 deletions(-)
New commits:
commit 582e06f71c63d70189e1ecd4fe365c541648cf83
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 13 16:55:38 2012 +0200
unusedcode.easy: remove unused code
Change-Id: I87e7264ffd3086796aaa8e136c2f9b77fde7b74f
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index eb3880d..56a3679 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -1148,20 +1148,6 @@ sal_Bool SotStorage::GetProperty( const String& rName, ::com::sun::star::uno::An
}
}
-sal_Bool SotStorage::GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue )
-{
- UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg );
- if ( pStg )
- {
- return pStg->GetProperty( rEleName, rName, rValue );
- }
- else
- {
- DBG_WARNING("W1:Not implemented!");
- return sal_False;
- }
-}
-
sal_Bool SotStorage::IsOLEStorage() const
{
UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg );
diff --git a/svtools/inc/svtools/PlaceEditDialog.hxx b/svtools/inc/svtools/PlaceEditDialog.hxx
index 997707e..14a1fb0 100644
--- a/svtools/inc/svtools/PlaceEditDialog.hxx
+++ b/svtools/inc/svtools/PlaceEditDialog.hxx
@@ -100,8 +100,6 @@ public :
rtl::OUString GetServerName() { return m_aEDServerName.GetText(); }
rtl::OUString GetServerUrl();
- ResId GetResId( sal_uInt16 nId );
-
private:
void InitDetails( );
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 6d3d12b..9807050 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -159,11 +159,6 @@ rtl::OUString PlaceEditDialog::GetServerUrl()
return sUrl;
}
-ResId PlaceEditDialog::GetResId(sal_uInt16 nId)
-{
- return SvtResId( nId );
-}
-
boost::shared_ptr<Place> PlaceEditDialog::GetPlace()
{
boost::shared_ptr<Place> newPlace( new Place( m_aEDServerName.GetText(), GetServerUrl(), true ) );
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index a85cf1f..0a80eb8 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -2197,13 +2197,6 @@ sal_Bool TransferableDataHelper::GetInputStream( const DataFlavor& rFlavor, Refe
// -----------------------------------------------------------------------------
-sal_Bool TransferableDataHelper::GetInterface( const DataFlavor& rFlavor, Reference< XInterface >& rIf )
-{
- const Any aAny( GetAny( rFlavor ) );
- return( aAny.hasValue() && ( aAny >>= rIf ) );
-}
-
-// -----------------------------------------------------------------------------
void TransferableDataHelper::Rebind( const Reference< XTransferable >& _rxNewContent )
{
mxTransfer = _rxNewContent;
diff --git a/sw/inc/unofield.hxx b/sw/inc/unofield.hxx
index c583353..ddcc2e8 100644
--- a/sw/inc/unofield.hxx
+++ b/sw/inc/unofield.hxx
@@ -108,7 +108,6 @@ public:
SwDoc* GetDoc() {return m_pDoc;}
sal_Bool IsDescriptor()const {return m_bIsDescriptor;}
- sal_uInt16 GetResId() const {return nResTypeId;}
};
struct SwFieldProperties_Impl;
diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx
index c438561..407af3e 100644
--- a/tools/source/fsys/tempfile.cxx
+++ b/tools/source/fsys/tempfile.cxx
@@ -244,11 +244,6 @@ TempFile::~TempFile()
delete pImp;
}
-sal_Bool TempFile::IsValid() const
-{
- return pImp->aName.Len() != 0;
-}
-
String TempFile::GetName() const
{
rtl::OUString aTmp;
diff --git a/unusedcode.easy b/unusedcode.easy
index 2efaa7e..7e85a7c 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,5 +1,4 @@
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
-PlaceEditDialog::GetResId(unsigned short)
PopupMenu::SetSelectedEntry(unsigned short)
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)
@@ -8,11 +7,9 @@ ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
StgCache::Pos2Page(int)
SvtSlideSorterBarOptions::AddListenerLink(Link const&)
SvtSlideSorterBarOptions::RemoveListenerLink(Link const&)
-TempFile::IsValid() const
TextEngine::GetLeftMargin() const
ThumbnailView::GetItemCount() const
ThumbnailView::InsertItem(unsigned short, BitmapEx const&, rtl::OUString const&, unsigned long)
@@ -21,12 +18,10 @@ ThumbnailView::SetColCount(unsigned short)
ThumbnailView::SetLineCount(unsigned short)
ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
ThumbnailViewItemAcc::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)
-TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
VCLXPrinterServer::getImplementationId()
VCLXPrinterServer::getTypes()
VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction const&, Point const&, boost::shared_array<unsigned char> const&)
Window::PostUserEvent(unsigned long&, unsigned long, void*)
-X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, unsigned long)
X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
XclExpColorScale::XclExpColorScale(XclExpRoot const&, ScColorScaleFormat const&)
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 3ffbd87..359d274 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -186,13 +186,6 @@ protected:
unsigned int &nDY,
int &nSrcX,
int &nSrcY ) const;
- GC SetMask ( int &nX,
- int &nY,
- unsigned int &nDX,
- unsigned int &nDY,
- int &nSrcX,
- int &nSrcY,
- Pixmap hClipMask );
using SalGraphics::DrawBitmap;
void DrawBitmap( const SalTwoRect *pPosAry,
SalGraphics *pThis,
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 033055a..40f3599 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -322,67 +322,6 @@ int X11SalGraphics::Clip( int &nX,
: RectanglePart;
}
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-GC X11SalGraphics::SetMask( int &nX,
- int &nY,
- unsigned int &nDX,
- unsigned int &nDY,
- int &nSrcX,
- int &nSrcY,
- Pixmap hClipMask )
-{
- int n = Clip( nX, nY, nDX, nDY, nSrcX, nSrcY );
- if( RectangleOut == n )
- return NULL;
-
- Display *pDisplay = GetXDisplay();
-
- if( !pMaskGC_ )
- pMaskGC_ = CreateGC( GetDrawable() );
-
- if( RectangleIn == n )
- {
- XSetClipMask( pDisplay, pMaskGC_, hClipMask );
- XSetClipOrigin( pDisplay, pMaskGC_, nX - nSrcX, nY - nSrcY );
- return pMaskGC_;
- }
-
- // - - - - create alternate clip pixmap for region clipping - - - -
- Pixmap hPixmap = limitXCreatePixmap( pDisplay, hClipMask, nDX, nDY, 1 );
-
- if( !hPixmap )
- {
-#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
- fprintf( stderr, "X11SalGraphics::SetMask !hPixmap\n" );
-#endif
- return NULL;
- }
-
- // - - - - reset pixmap; all 0 - - - - - - - - - - - - - - - - - - -
- XFillRectangle( pDisplay,
- hPixmap,
- GetDisplay()->GetMonoGC( m_nXScreen ),
- 0, 0,
- nDX, nDY );
-
- // - - - - copy pixmap only within region - - - - - - - - - - - - -
- GC pMonoGC = GetMonoGC( hPixmap );
- XSetClipOrigin( pDisplay, pMonoGC, -nX, -nY );
- XCopyArea( pDisplay,
- hClipMask, // Source
- hPixmap, // Destination
- pMonoGC,
- nSrcX, nSrcY, // Source
- nDX, nDY, // Width & Height
- 0, 0 ); // Destination
-
- XSetClipMask( pDisplay, pMaskGC_, hPixmap );
- XSetClipOrigin( pDisplay, pMaskGC_, nX, nY );
-
- XFreePixmap( pDisplay, hPixmap );
- return pMaskGC_;
-}
-
// -=-= SalGraphics =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
More information about the Libreoffice-commits
mailing list