Kaydet (Commit) 5298b1b3 authored tarafından Caolán McNamara's avatar Caolán McNamara

callcatcher: ditch some more methods

üst 3e661396
......@@ -97,14 +97,6 @@ namespace connectivity
// determines the default international setting
static const ::com::sun::star::lang::Locale& getDefaultLocale();
/** set's the default locale which should be used when analyzing strings
<p>If no locale is set, and any method which needs a locale is called, a default
(en-US) is used.</p>
<p>If, while parsing, the locale can be obtained from other sources (such as the number format
set for a table column), the preferred locale is ignored.</p>
*/
static void setDefaultLocale( const ::com::sun::star::lang::Locale& _rLocale );
/** get's a locale instance which should be used when parsing in the context specified by this instance
<p>if this is not overridden by derived classes, it returns the static default locale.</p>
*/
......
......@@ -4476,12 +4476,6 @@ static Locale& impl_getLocaleInstance( )
return s_aLocale;
}
//------------------------------------------------------------------------------
void OParseContext::setDefaultLocale( const ::com::sun::star::lang::Locale& _rLocale )
{
impl_getLocaleInstance() = _rLocale;
}
//------------------------------------------------------------------------------
Locale OParseContext::getPreferredLocale( ) const
{
......
......@@ -339,9 +339,6 @@ namespace accessibility
int getNotifierClientId() const;
// retrieve text interface for given paragraph index
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleText > GetParaInterface( sal_Int32 nIndex );
/// Do we have children? This is the case for image bullets
sal_Bool HaveChildren();
......
......@@ -82,7 +82,6 @@ public:
sal_Bool Store( SvStream& rOStream ) const;
static EditTextObject* Create( SvStream& rIStream,
SfxItemPool* pGlobalTextObjectPool = 0 );
void Skip( SvStream& rIStream );
virtual sal_uInt16 GetParagraphCount() const;
......
......@@ -530,27 +530,6 @@ namespace accessibility
return mpEditSource ? sal_True : sal_False ;
}
uno::Reference< XAccessibleText > AccessibleEditableTextPara::GetParaInterface( sal_Int32 nIndex )
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
uno::Reference< XAccessible > xParent = getAccessibleParent();
if( xParent.is() )
{
uno::Reference< XAccessibleContext > xParentContext = xParent->getAccessibleContext();
if( xParentContext.is() )
{
uno::Reference< XAccessible > xPara = xParentContext->getAccessibleChild( nIndex );
if( xPara.is() )
{
return uno::Reference< XAccessibleText > ( xPara, uno::UNO_QUERY );
}
}
}
return uno::Reference< XAccessibleText >();
}
SvxEditSourceAdapter& AccessibleEditableTextPara::GetEditSource() const SAL_THROW((uno::RuntimeException))
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
......
......@@ -420,20 +420,6 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobal
return pTxtObj;
}
void EditTextObject::Skip( SvStream& rIStream )
{
sal_Size nStartPos = rIStream.Tell();
sal_uInt16 _nWhich;
rIStream >> _nWhich;
sal_uInt32 nStructSz;
rIStream >> nStructSz;
sal_Size nFullSz = sizeof( _nWhich ) + sizeof( nStructSz ) + nStructSz;
rIStream.Seek( nStartPos + nFullSz );
}
void EditTextObject::StoreData( SvStream& ) const
{
OSL_FAIL( "StoreData: Base class!" );
......
......@@ -43,7 +43,6 @@ class FORMULA_DLLPUBLIC RefEdit : public Edit
private:
Timer aTimer;
IControlReferenceHandler* pAnyRefDlg; // parent dialog
sal_Bool bSilentFocus; // for SilentGrabFocus()
DECL_LINK( UpdateHdl, Timer* );
......@@ -71,8 +70,6 @@ public:
void StartUpdateData();
void SilentGrabFocus(); // does not update any references
void SetRefDialog( IControlReferenceHandler* pDlg );
inline IControlReferenceHandler* GetRefDialog() { return pAnyRefDlg; }
};
......
......@@ -930,7 +930,6 @@ void EditBox::UpdateOldSel()
RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResId& rResId ) :
Edit( _pParent, rResId ),
pAnyRefDlg( pParent ),
bSilentFocus( sal_False )
{
aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) );
aTimer.SetTimeout( SC_ENABLE_TIME );
......@@ -939,7 +938,6 @@ RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResI
RefEdit::RefEdit( Window* pParent, const ResId& rResId ) :
Edit( pParent, rResId ),
pAnyRefDlg( NULL ),
bSilentFocus( sal_False )
{
}
......@@ -979,13 +977,6 @@ void RefEdit::StartUpdateData()
aTimer.Start();
}
void RefEdit::SilentGrabFocus()
{
bSilentFocus = sal_True;
GrabFocus();
bSilentFocus = sal_False;
}
void RefEdit::SetRefDialog( IControlReferenceHandler* pDlg )
{
pAnyRefDlg = pDlg;
......@@ -1021,8 +1012,7 @@ void RefEdit::KeyInput( const KeyEvent& rKEvt )
void RefEdit::GetFocus()
{
Edit::GetFocus();
if( !bSilentFocus )
StartUpdateData();
StartUpdateData();
}
void RefEdit::LoseFocus()
......
......@@ -43,8 +43,6 @@ typedef MenuExtensionItem ( *pfunc_setMenuExtensionSupplier)();
namespace framework
{
FWE_DLLPUBLIC pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pSetMenuExtensionSupplier );
FWE_DLLPUBLIC MenuExtensionItem SAL_CALL GetMenuExtension();
}
......
......@@ -185,7 +185,6 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
void impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle);
void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle);
::rtl::OUString impl_getSubTitle ();
::rtl::OUString impl_convertURL2Title(const ::rtl::OUString& sURL);
......
......@@ -36,15 +36,6 @@ static pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFunc = NULL;
namespace framework
{
pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFuncArg )
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
pfunc_setMenuExtensionSupplier pOldMenuExtensionSupplierFunc = pMenuExtensionSupplierFunc;
pMenuExtensionSupplierFunc = pMenuExtensionSupplierFuncArg;
return pOldMenuExtensionSupplierFunc;
}
MenuExtensionItem SAL_CALL GetMenuExtension()
{
MenuExtensionItem aItem;
......
......@@ -679,23 +679,6 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl
xNewBroadcaster->addTitleChangeListener (xThis);
}
//-----------------------------------------------
::rtl::OUString TitleHelper::impl_getSubTitle ()
{
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
css::uno::Reference< css::frame::XTitle > xSubTitle(m_xSubTitle.get (), css::uno::UNO_QUERY);
aLock.clear ();
// <- SYNCHRONIZED
if (xSubTitle.is ())
return xSubTitle->getTitle ();
return ::rtl::OUString ();
}
//-----------------------------------------------
::rtl::OUString TitleHelper::impl_convertURL2Title(const ::rtl::OUString& sURL)
{
......
......@@ -66,18 +66,11 @@ public:
static GraphicFilter* pGrfFilter;
static BitmapEx CreateQuickDrawBitmapEx( const Graphic& rGraphic, const OutputDevice& rCompDev,
const MapMode& rMapMode, const Size& rLogSize,
const Point& rPoint, const Size& rSize );
static Graphic MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags );
static Animation MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr );
static sal_uInt16 WriteGraphic( const Graphic& rGraphic, String& rFileName,
const String& rFilterName, const sal_uIntPtr nFlags = 0L,
const Size* pMtfSize_100TH_MM = NULL );
static void DrawQuickDrawBitmapEx( OutputDevice* pOutDev, const Point& rPt,
const Size& rSize, const BitmapEx& rBmpEx );
static void DrawTiledBitmapEx( OutputDevice* pOutDev, const Point& rStartPt, const Size& rGrfSize,
const Rectangle& rTileRect, const BitmapEx& rBmpEx );
static sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
GraphicFilter& rFilter, const sal_uInt16 nFormat,
......
......@@ -39,7 +39,6 @@ class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem
public:
TYPEINFO();
SVX_DLLPRIVATE XSecondaryFillColorItem() {}
SVX_DLLPRIVATE XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
XSecondaryFillColorItem(const String& rName, const Color& rTheColor);
SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn);
......
......@@ -58,186 +58,6 @@
GraphicFilter* XOutBitmap::pGrfFilter = NULL;
// -----------------------------------------------------------------------------
BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const OutputDevice& rCompDev,
const MapMode& rMapMode, const Size& rLogSize,
const Point& rPoint, const Size& rSize )
{
BitmapEx aRetBmp;
if( rGraphic.IsAlpha() )
aRetBmp = rGraphic.GetBitmapEx();
else
{
VirtualDevice aVDev( rCompDev );
MapMode aMap( rMapMode );
aMap.SetOrigin( Point() );
aVDev.SetMapMode( aMap );
Point aPoint( aVDev.LogicToPixel( rPoint ) );
Size aOldSize( aVDev.LogicToPixel( rSize ) );
Size aAbsSize( aOldSize );
Size aQSizePix( aVDev.LogicToPixel( rLogSize ) );
aVDev.SetMapMode( MapMode() );
if( aOldSize.Width() < 0 )
aAbsSize.Width() = -aAbsSize.Width();
if( aOldSize.Height() < 0 )
aAbsSize.Height() = -aAbsSize.Height();
if( aVDev.SetOutputSizePixel( aAbsSize ) )
{
Point aNewOrg( -aPoint.X(), -aPoint.Y() );
const Point aNullPoint;
// horizontale Spiegelung ggf. beruecksichtigen
if( aOldSize.Width() < 0 )
{
aNewOrg.X() -= aOldSize.Width();
// und jetzt noch einen abziehen
aNewOrg.X()--;
}
// vertikale Spiegelung ggf. beruecksichtigen
if( rSize.Height() < 0 )
{
aNewOrg.Y() -= aOldSize.Height();
// und jetzt noch einen abziehen
aNewOrg.Y()--;
}
if( rGraphic.GetType() != GRAPHIC_BITMAP )
{
rGraphic.Draw( &aVDev, aNewOrg, aQSizePix );
const Bitmap aBmp( aVDev.GetBitmap( aNullPoint, aAbsSize ) );
Bitmap aMask;
Graphic( rGraphic.GetGDIMetaFile().GetMonochromeMtf( COL_BLACK ) ).Draw( &aVDev, aNewOrg, aQSizePix );
aMask = aVDev.GetBitmap( aNullPoint, aAbsSize );
aRetBmp = BitmapEx( aBmp, aMask );
}
else
{
Bitmap aBmp( rGraphic.GetBitmap() );
// UNX has got problems with 1x1 bitmaps which are transparent (KA 02.11.1998)
#ifdef UNX
const Size aBmpSize( aBmp.GetSizePixel() );
sal_Bool bFullTrans = sal_False;
if( aBmpSize.Width() == 1 && aBmpSize.Height() == 1 && rGraphic.IsTransparent() )
{
Bitmap aTrans( rGraphic.GetBitmapEx().GetMask() );
BitmapReadAccess* pMAcc = aBmp.AcquireReadAccess();
if( pMAcc )
{
if( pMAcc->GetColor( 0, 0 ) == BitmapColor( Color( COL_WHITE ) ) )
bFullTrans = sal_True;
aTrans.ReleaseAccess( pMAcc );
}
}
if( !bFullTrans )
#endif // UNX
{
DitherBitmap( aBmp );
aVDev.DrawBitmap( aNewOrg, aQSizePix, aBmp );
aBmp = aVDev.GetBitmap( aNullPoint, aAbsSize );
if( !rGraphic.IsTransparent() )
aRetBmp = BitmapEx( aBmp );
else
{
Bitmap aTrans( rGraphic.GetBitmapEx().GetMask() );
if( !aTrans )
aRetBmp = BitmapEx( aBmp, rGraphic.GetBitmapEx().GetTransparentColor() );
else
{
aVDev.DrawBitmap( aNewOrg, aQSizePix, aTrans );
aRetBmp = BitmapEx( aBmp, aVDev.GetBitmap( Point(), aAbsSize ) );
}
}
}
}
}
}
return aRetBmp;
}
// ------------------------------------------------------------------------
void XOutBitmap::DrawQuickDrawBitmapEx( OutputDevice* pOutDev, const Point& rPt,
const Size& rSize, const BitmapEx& rBmpEx )
{
const Size aBmpSizePix( rBmpEx.GetSizePixel() );
const Size aSizePix( pOutDev->LogicToPixel( rSize ) );
if ( ( aSizePix.Width() - aBmpSizePix.Width() ) || ( aSizePix.Height() - aBmpSizePix.Height() ) )
rBmpEx.Draw( pOutDev, rPt, rSize );
else
rBmpEx.Draw( pOutDev, rPt );
}
// ------------------------------------------------------------------------
void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
const Point& rStartPt, const Size& rGrfSize,
const Rectangle& rTileRect, const BitmapEx& rBmpEx )
{
Rectangle aClipRect( pOutDev->LogicToPixel( pOutDev->GetClipRegion().GetBoundRect() ) );
Rectangle aPixRect( pOutDev->LogicToPixel( rTileRect ) );
const Size aPixSize( pOutDev->LogicToPixel( rGrfSize ) );
const Point aPixPoint( pOutDev->LogicToPixel( rStartPt ) );
Point aOrg;
const long nWidth = aPixSize.Width();
const long nHeight = aPixSize.Height();
long nXPos = aPixPoint.X() + ( ( aPixRect.Left() - aPixPoint.X() ) / nWidth ) * nWidth;
long nYPos = aPixPoint.Y() + ( ( aPixRect.Top() - aPixPoint.Y() ) / nHeight ) * nHeight;
const long nBottom = aPixRect.Bottom();
const long nRight = aPixRect.Right();
const long nLeft = nXPos;
const sal_Bool bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
pOutDev->Push();
pOutDev->SetMapMode( MapMode() );
// ggf. neue ClipRegion berechnen und setzen
if ( pOutDev->IsClipRegion() )
aPixRect.Intersection( aClipRect );
pOutDev->SetClipRegion( aPixRect );
while( nYPos <= nBottom )
{
while( nXPos <= nRight )
{
if ( bNoSize )
rBmpEx.Draw( pOutDev, Point( nXPos, nYPos ) );
else
rBmpEx.Draw( pOutDev, Point( nXPos, nYPos ), aPixSize );
nXPos += nWidth;
}
nXPos = nLeft;
nYPos += nHeight;
}
pOutDev->Pop();
}
// ------------------------------------------------------------------------
Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr )
......
......@@ -3069,11 +3069,6 @@ bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
// -----------------------------
TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem);
XSecondaryFillColorItem::XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_SECONDARYFILLCOLOR, nIndex, rTheColor)
{
}
XSecondaryFillColorItem::XSecondaryFillColorItem(const XubString& rName, const Color& rTheColor) :
XColorItem(XATTR_SECONDARYFILLCOLOR, rName, rTheColor)
{
......
......@@ -559,15 +559,12 @@ public:
GetParaImportPropertySetMapper() const;
UniReference< SvXMLImportPropertyMapper > const&
GetTextImportPropertySetMapper() const;
UniReference< SvXMLImportPropertyMapper > const&
GetFrameImportPropertySetMapper() const;
UniReference< SvXMLImportPropertyMapper > const&
GetSectionImportPropertySetMapper() const;
UniReference< SvXMLImportPropertyMapper > const&
GetRubyImportPropertySetMapper() const;
static SvXMLImportPropertyMapper *CreateShapeExtPropMapper(SvXMLImport&);
static SvXMLImportPropertyMapper *CreateCharExtPropMapper(SvXMLImport&, XMLFontStylesContext *pFontDecls = NULL);
static SvXMLImportPropertyMapper *CreateParaExtPropMapper(SvXMLImport&, XMLFontStylesContext *pFontDecls = NULL);
static SvXMLImportPropertyMapper* CreateParaDefaultExtPropMapper(SvXMLImport&, XMLFontStylesContext* pFontDecls = NULL);
static SvXMLImportPropertyMapper* CreateTableDefaultExtPropMapper(SvXMLImport&, XMLFontStylesContext* pFontDecls = NULL);
......
......@@ -747,12 +747,6 @@ XMLTextImportHelper::GetTextImportPropertySetMapper() const
return m_pImpl->m_xTextImpPrMap;
}
UniReference< SvXMLImportPropertyMapper > const&
XMLTextImportHelper::GetFrameImportPropertySetMapper() const
{
return m_pImpl->m_xFrameImpPrMap;
}
UniReference< SvXMLImportPropertyMapper > const&
XMLTextImportHelper::GetSectionImportPropertySetMapper() const
{
......@@ -1078,15 +1072,6 @@ SvXMLImportPropertyMapper *XMLTextImportHelper::CreateShapeExtPropMapper(SvXMLIm
const_cast<XMLFontStylesContext*>(rImport.GetFontDecls()) );
}
SvXMLImportPropertyMapper *XMLTextImportHelper::CreateCharExtPropMapper(SvXMLImport& rImport, XMLFontStylesContext *pFontDecls)
{
XMLPropertySetMapper *pPropMapper =
new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT );
if (!pFontDecls)
pFontDecls = const_cast<XMLFontStylesContext*>(rImport.GetFontDecls());
return new XMLTextImportPropertyMapper( pPropMapper, rImport, pFontDecls );
}
SvXMLImportPropertyMapper *XMLTextImportHelper::CreateParaExtPropMapper(SvXMLImport& rImport, XMLFontStylesContext *pFontDecls)
{
XMLPropertySetMapper *pPropMapper =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment