summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-05 00:17:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-05 10:54:21 +0100
commit04ce2cea24b7e90de6542789dfdcf894082fad70 (patch)
treeade6f571585e3978dfa57a558d3cabcdf4ffa942 /vcl
parentf8238e893b94901a6b1b2e08fd45be1a15726996 (diff)
callcatcher: drop some Impl methods, regenerate list
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/vcl/canvastools.hxx1
-rw-r--r--vcl/inc/vcl/cvtgrf.hxx4
-rw-r--r--vcl/inc/vcl/dialog.hxx1
-rw-r--r--vcl/source/gdi/cvtgrf.cxx76
-rw-r--r--vcl/source/gdi/gdimtf.cxx15
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx5
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx2
-rw-r--r--vcl/source/helper/canvastools.cxx6
-rw-r--r--vcl/source/window/dialog.cxx31
9 files changed, 0 insertions, 141 deletions
diff --git a/vcl/inc/vcl/canvastools.hxx b/vcl/inc/vcl/canvastools.hxx
index 516dfacfad8a..7c9653e1f200 100644
--- a/vcl/inc/vcl/canvastools.hxx
+++ b/vcl/inc/vcl/canvastools.hxx
@@ -180,7 +180,6 @@ namespace vcl
::com::sun::star::geometry::RealSize2D VCL_DLLPUBLIC size2DFromSize( const Size& );
Size VCL_DLLPUBLIC sizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& );
- Point VCL_DLLPUBLIC pointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& );
// geometry::Integer
::com::sun::star::geometry::IntegerSize2D VCL_DLLPUBLIC integerSize2DFromSize( const Size& );
diff --git a/vcl/inc/vcl/cvtgrf.hxx b/vcl/inc/vcl/cvtgrf.hxx
index 50d766f5565c..0603052e8651 100644
--- a/vcl/inc/vcl/cvtgrf.hxx
+++ b/vcl/inc/vcl/cvtgrf.hxx
@@ -48,10 +48,6 @@ private:
ConvertData* mpConvertData;
public:
- SAL_DLLPRIVATE sal_uLong ImplConvert( sal_uLong nInFormat, void* pInBuffer, sal_uLong nInBufSize,
- void** ppOutBuffer, sal_uLong nOutFormat );
-
-public:
GraphicConverter();
~GraphicConverter();
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 7b8c3ac032f2..bb4179914387 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -68,7 +68,6 @@ protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
SAL_DLLPRIVATE void ImplDialogRes( const ResId& rResId );
- SAL_DLLPRIVATE void ImplCenterDialog();
public:
SAL_DLLPRIVATE sal_Bool IsInClose() const { return mbInClose; }
diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx
index 6d3b60777120..a17c00f4e798 100644
--- a/vcl/source/gdi/cvtgrf.cxx
+++ b/vcl/source/gdi/cvtgrf.cxx
@@ -56,82 +56,6 @@ GraphicConverter::~GraphicConverter()
// ------------------------------------------------------------------------
-sal_uLong GraphicConverter::ImplConvert( sal_uLong nInFormat, void* pInBuffer, sal_uLong nInBufSize,
- void** ppOutBuffer, sal_uLong nOutFormat )
-{
- sal_uLong nRetBufSize = 0UL;
-
- if( ( nInFormat != nOutFormat ) && pInBuffer )
- {
- if( ( nInFormat == CVT_SVM ) || ( nInFormat == CVT_BMP ) )
- {
- SvMemoryStream aIStm;
- Graphic aGraphic;
-
- aIStm.SetBuffer( (char*) pInBuffer, nInBufSize, sal_False, nInBufSize );
- aIStm >> aGraphic;
-
- if( !aIStm.GetError() )
- {
- SvMemoryStream aOStm( 64535, 64535 );
-
- mpConvertData = new ConvertData( aGraphic, aOStm, nOutFormat );
-
- if( maFilterHdl.IsSet() && maFilterHdl.Call( mpConvertData ) )
- {
- nRetBufSize = aOStm.Seek( STREAM_SEEK_TO_END );
- *ppOutBuffer = (void*) aOStm.GetData();
- aOStm.ObjectOwnsMemory( sal_False );
- }
-
- delete mpConvertData;
- mpConvertData = NULL;
- }
- }
- else if( ( nOutFormat == CVT_SVM ) || ( nOutFormat == CVT_BMP ) )
- {
- SvMemoryStream aIStm;
-
- aIStm.SetBuffer( (char*) pInBuffer, nInBufSize, sal_False, nInBufSize );
- mpConvertData = new ConvertData( Graphic(), aIStm, nInFormat );
-
- if( maFilterHdl.IsSet() && maFilterHdl.Call( mpConvertData ) )
- {
- SvMemoryStream aOStm( 645535, 64535 );
- Graphic& rGraphic = mpConvertData->maGraphic;
-
- if( ( rGraphic.GetType() == GRAPHIC_BITMAP ) && ( CVT_SVM == nOutFormat ) )
- {
- GDIMetaFile aMtf;
-
- aMtf.SetPrefSize( rGraphic.GetPrefSize() );
- aMtf.SetPrefMapMode( rGraphic.GetPrefMapMode() );
- aMtf.AddAction( new MetaBmpExScaleAction( Point(), aMtf.GetPrefSize(), rGraphic.GetBitmapEx() ) );
- rGraphic = aMtf;
- }
- else if( ( rGraphic.GetType() == GRAPHIC_GDIMETAFILE ) && ( CVT_BMP == nOutFormat ) )
- rGraphic = rGraphic.GetBitmapEx();
-
- aOStm << rGraphic;
-
- if( !aOStm.GetError() )
- {
- nRetBufSize = aOStm.Seek( STREAM_SEEK_TO_END );
- *ppOutBuffer = (void*) aOStm.GetData();
- aOStm.ObjectOwnsMemory( sal_False );
- }
- }
-
- delete mpConvertData;
- mpConvertData = NULL;
- }
- }
-
- return nRetBufSize;
-}
-
-// ------------------------------------------------------------------------
-
sal_uLong GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, sal_uLong nFormat )
{
GraphicConverter* pCvt = ImplGetSVData()->maGDIData.mpGrfConverter;
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index bdbca9d4067d..fffde0472b75 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -169,8 +169,6 @@ public:
void ImplInsert( ImpLabel* p ) { aList.push_back( p ); }
- ImpLabel* ImplFirst();
- ImpLabel* ImplNext();
ImpLabel* ImplGetLabel( size_t nPos ) const;
ImpLabel* ImplRemove( size_t nPos );
@@ -197,19 +195,6 @@ ImpLabelList::~ImpLabelList()
}
// ------------------------------------------------------------------------
-ImpLabel* ImpLabelList::ImplFirst()
-{
- nListPos = 0;
- return ( aList.empty() ) ? NULL : aList[ nListPos ];
-}
-
-// ------------------------------------------------------------------------
-ImpLabel* ImpLabelList::ImplNext()
-{
- return ( nListPos + 1 < aList.size() ) ? aList[ ++nListPos ] : NULL;
-}
-
-// ------------------------------------------------------------------------
ImpLabel* ImpLabelList::ImplGetLabel( size_t nPos ) const
{
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 23d3cb4e9748..a56ea83d8910 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -8559,11 +8559,6 @@ void PDFWriterImpl::beginRedirect( SvStream* pStream, const Rectangle& rTargetRe
m_aCurrentPDFState.m_aFillColor = Color( COL_TRANSPARENT );
}
-Rectangle PDFWriterImpl::getRedirectTargetRect() const
-{
- return m_aOutputStreams.empty() ? Rectangle() : m_aOutputStreams.front().m_aTargetRect;
-}
-
SvStream* PDFWriterImpl::endRedirect()
{
SvStream* pStream = NULL;
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 4397d7c5c0c4..65fc682b3b75 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -995,8 +995,6 @@ i12626
void beginCompression();
void endCompression();
void beginRedirect( SvStream* pStream, const Rectangle& );
- // returns an empty rect if no redirection is happending
- Rectangle getRedirectTargetRect() const;
SvStream* endRedirect();
void endPage();
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index cddc1b513d1a..85da67a773c5 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -404,12 +404,6 @@ namespace vcl
static_cast<long>(rSize.Height + .5) );
}
- Point pointFromRealPoint2D( const geometry::RealPoint2D& rPoint )
- {
- return Point( static_cast<long>(rPoint.X + .5),
- static_cast<long>(rPoint.Y + .5) );
- }
-
::Size sizeFromB2DSize( const ::basegfx::B2DVector& rVec )
{
return ::Size( FRound( rVec.getX() ),
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 5c4c786a1f39..e057c4e06f1d 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -385,35 +385,6 @@ void Dialog::ImplInitSettings()
// -----------------------------------------------------------------------
-void Dialog::ImplCenterDialog()
-{
- Rectangle aDeskRect = ImplGetFrameWindow()->GetDesktopRectPixel();
- Point aDeskPos = aDeskRect.TopLeft();
- Size aDeskSize = aDeskRect.GetSize();
- Size aWinSize = GetSizePixel();
- Window *pWindow = this;
- while ( pWindow->mpWindowImpl->mpBorderWindow )
- pWindow = pWindow->mpWindowImpl->mpBorderWindow;
- Point aWinPos( ((aDeskSize.Width() - aWinSize.Width()) / 2) + aDeskPos.X(),
- ((aDeskSize.Height() - aWinSize.Height()) / 2) + aDeskPos.Y() );
-
- // Pruefen, ob Dialogbox ausserhalb des Desks liegt
- if ( (aWinPos.X() + aWinSize.Width()) > (aDeskPos.X()+aDeskSize.Width()) )
- aWinPos.X() = aDeskPos.X()+aDeskSize.Width() - aWinSize.Width();
- if ( (aWinPos.Y()+aWinSize.Height()) > (aDeskPos.Y()+aDeskSize.Height()) )
- aWinPos.Y() = aDeskPos.Y()+aDeskSize.Height() - aWinSize.Height();
- // Linke Ecke bevorzugen, da Titelbar oben ist
- if ( aWinPos.X() < aDeskPos.X() )
- aWinPos.X() = aDeskPos.X();
- if ( aWinPos.Y() < aDeskPos.Y() )
- aWinPos.Y() = aDeskPos.Y();
-
- //SetPosPixel( aWinPos );
- SetPosPixel( pWindow->ScreenToOutputPixel( aWinPos ) );
-}
-
-// -----------------------------------------------------------------------
-
Dialog::Dialog( WindowType nType ) :
SystemWindow( nType )
{
@@ -517,8 +488,6 @@ void Dialog::StateChanged( StateChangedType nType )
if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
ImplWindowAutoMnemonic( this );
- //if ( IsDefaultPos() && !mpWindowImpl->mbFrame )
- // ImplCenterDialog();
if ( !HasChildPathFocus() || HasFocus() )
GrabFocusToFirstControl();
if ( !(GetStyle() & WB_CLOSEABLE) )