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

callcatcher: update unused code list

Change-Id: Iff29c1f0a795d920a071eadc64e6639ff7506fff
üst 6f6056b6
...@@ -673,20 +673,6 @@ public: ...@@ -673,20 +673,6 @@ public:
const BinRange& rRange, const BinRange& rRange,
bool bAbsolute ); bool bAbsolute );
/** Generates a cell range list string in A1:A1 notation from the passed
cell range addresses. May enclose multiple ranges into parentheses.
@param rRanges The list of cell range addresses.
@param bAbsolute True = adds dollar signs before columns and rows.
@param cSeparator Separator character between ranges.
@param bEncloseMultiple True = enclose multiple ranges in parentheses.
*/
static ::rtl::OUString generateRangeList2dString(
const ApiCellRangeList& rRanges,
bool bAbsolute,
sal_Unicode cSeparator,
bool bEncloseMultiple );
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
/** Generates a string in Calc formula notation from the passed string. /** Generates a string in Calc formula notation from the passed string.
......
...@@ -1446,21 +1446,6 @@ OUString FormulaProcessorBase::generateRange2dString( const BinRange& rRange, bo ...@@ -1446,21 +1446,6 @@ OUString FormulaProcessorBase::generateRange2dString( const BinRange& rRange, bo
return aBuffer.makeStringAndClear(); return aBuffer.makeStringAndClear();
} }
OUString FormulaProcessorBase::generateRangeList2dString( const ApiCellRangeList& rRanges,
bool bAbsolute, sal_Unicode cSeparator, bool bEncloseMultiple )
{
OUStringBuffer aBuffer;
for( ApiCellRangeList::const_iterator aIt = rRanges.begin(), aEnd = rRanges.end(); aIt != aEnd; ++aIt )
{
if( aBuffer.getLength() > 0 )
aBuffer.append( cSeparator );
aBuffer.append( generateRange2dString( *aIt, bAbsolute ) );
}
if( bEncloseMultiple && (rRanges.size() > 1) )
aBuffer.insert( 0, sal_Unicode( '(' ) ).append( sal_Unicode( ')' ) );
return aBuffer.makeStringAndClear();
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
OUString FormulaProcessorBase::generateApiString( const OUString& rString ) OUString FormulaProcessorBase::generateApiString( const OUString& rString )
......
CompressGraphicsDialog::CompressGraphicsDialog(Window*, Graphic const&, Size&, Rectangle&, SfxBindings&)
CompressGraphicsDialog::GetCompressedGraphic()
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool) FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
Line::Intersection(Rectangle const&, Line&) const Line::Intersection(Rectangle const&, Line&) const
PoHeader::PoHeader()
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char) SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
ScFiltersTest::testColorScaleODS() ScFiltersTest::testColorScaleODS()
ScFiltersTest::testColorScaleXLSX() ScFiltersTest::testColorScaleXLSX()
...@@ -12,8 +15,8 @@ String::String(unsigned short) ...@@ -12,8 +15,8 @@ String::String(unsigned short)
SvListView::HasEntryFocus(SvTreeListEntry*) const SvListView::HasEntryFocus(SvTreeListEntry*) const
SvTreeList::GetChildIterators(SvTreeListEntry const*) const SvTreeList::GetChildIterators(SvTreeListEntry const*) const
SvViewDataEntry::SetCursored(bool) SvViewDataEntry::SetCursored(bool)
SvtGraphicStroke::toString() const
TextEngine::GetLeftMargin() const TextEngine::GetLeftMargin() const
ThumbnailView::CalcWindowSizePixel(unsigned short, unsigned short, unsigned short, unsigned short, unsigned short)
ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&) ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
TransitionScene::clear() TransitionScene::clear()
UnoControl::UnoControl() UnoControl::UnoControl()
...@@ -51,7 +54,6 @@ framework::OReadMenuDocumentHandler::getServiceFactory() ...@@ -51,7 +54,6 @@ framework::OReadMenuDocumentHandler::getServiceFactory()
jfw_plugin::VendorBase::createInstance() jfw_plugin::VendorBase::createInstance()
oox::drawingml::TextListStyle::dump() const oox::drawingml::TextListStyle::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&) oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
oox::xls::FormulaProcessorBase::generateRangeList2dString(oox::xls::ApiCellRangeList const&, bool, unsigned short, bool)
sc_apitest::main() sc_apitest::main()
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
......
...@@ -138,8 +138,6 @@ public: ...@@ -138,8 +138,6 @@ public:
double getMiterLimit () const; double getMiterLimit () const;
/// Get an array of "on" and "off" lengths for stroke dashing /// Get an array of "on" and "off" lengths for stroke dashing
void getDashArray ( DashArray& ) const; void getDashArray ( DashArray& ) const;
/// Query a textual representation of the object's content
::rtl::OString toString () const;
// mutators // mutators
/// Set path to stroke /// Set path to stroke
......
...@@ -50,7 +50,6 @@ private: ...@@ -50,7 +50,6 @@ private:
PopupMenu* mpMenu; PopupMenu* mpMenu;
sal_uInt16 mnCurItemId; sal_uInt16 mnCurItemId;
sal_uInt16 mnMenuMode; sal_uInt16 mnMenuMode;
bool mbDisplaySelectedItem;
Link maActivateHdl; Link maActivateHdl;
Link maSelectHdl; Link maSelectHdl;
...@@ -58,14 +57,10 @@ private: ...@@ -58,14 +57,10 @@ private:
SAL_DLLPRIVATE void ImplExecuteMenu(); SAL_DLLPRIVATE void ImplExecuteMenu();
DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* ); DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* );
SAL_DLLPRIVATE void updateText();
// Copy assignment is forbidden and not implemented. // Copy assignment is forbidden and not implemented.
SAL_DLLPRIVATE MenuButton( const MenuButton & ); SAL_DLLPRIVATE MenuButton( const MenuButton & );
SAL_DLLPRIVATE MenuButton& operator=( const MenuButton & ); SAL_DLLPRIVATE MenuButton& operator=( const MenuButton & );
DECL_LINK(MenuEventListener, VclSimpleEvent*);
protected: protected:
using Window::ImplInit; using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
...@@ -95,10 +90,6 @@ public: ...@@ -95,10 +90,6 @@ public:
const Link& GetActivateHdl() const { return maActivateHdl; } const Link& GetActivateHdl() const { return maActivateHdl; }
void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
const Link& GetSelectHdl() const { return maSelectHdl; } const Link& GetSelectHdl() const { return maSelectHdl; }
void SetShowDisplaySelectedItem(bool bShow);
virtual Size GetOptimalSize(WindowSizeType eType) const;
}; };
#endif // _SV_MENUBTN_HXX #endif // _SV_MENUBTN_HXX
......
...@@ -77,7 +77,6 @@ void MenuButton::ImplExecuteMenu() ...@@ -77,7 +77,6 @@ void MenuButton::ImplExecuteMenu()
MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) MenuButton::MenuButton( Window* pParent, WinBits nWinBits )
: PushButton( WINDOW_MENUBUTTON ) : PushButton( WINDOW_MENUBUTTON )
, mbDisplaySelectedItem(false)
{ {
ImplInitMenuButtonData(); ImplInitMenuButtonData();
ImplInit( pParent, nWinBits ); ImplInit( pParent, nWinBits );
...@@ -87,7 +86,6 @@ MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) ...@@ -87,7 +86,6 @@ MenuButton::MenuButton( Window* pParent, WinBits nWinBits )
MenuButton::MenuButton( Window* pParent, const ResId& rResId ) MenuButton::MenuButton( Window* pParent, const ResId& rResId )
: PushButton( WINDOW_MENUBUTTON ) : PushButton( WINDOW_MENUBUTTON )
, mbDisplaySelectedItem(false)
{ {
ImplInitMenuButtonData(); ImplInitMenuButtonData();
rResId.SetRT( RSC_MENUBUTTON ); rResId.SetRT( RSC_MENUBUTTON );
...@@ -120,8 +118,6 @@ void MenuButton::ImplLoadRes( const ResId& rResId ) ...@@ -120,8 +118,6 @@ void MenuButton::ImplLoadRes( const ResId& rResId )
MenuButton::~MenuButton() MenuButton::~MenuButton()
{ {
delete mpMenuTimer; delete mpMenuTimer;
if (mbDisplaySelectedItem && mpMenu)
mpMenu->RemoveEventListener(LINK(this, MenuButton, MenuEventListener));
delete mpOwnMenu; delete mpOwnMenu;
} }
...@@ -203,33 +199,9 @@ void MenuButton::Activate() ...@@ -203,33 +199,9 @@ void MenuButton::Activate()
void MenuButton::Select() void MenuButton::Select()
{ {
updateText();
maSelectHdl.Call( this ); maSelectHdl.Call( this );
} }
void MenuButton::updateText()
{
if (mbDisplaySelectedItem)
{
if (mpMenu)
SetText(mpMenu->GetItemText(mpMenu->GetCurItemId()));
else
SetText(OUString());
}
}
Size MenuButton::GetOptimalSize(WindowSizeType eType) const
{
Size aRet = PushButton::GetOptimalSize(eType);
if (mbDisplaySelectedItem && mpMenu)
{
Size aMenuSize(mpMenu->ImplCalcSize(const_cast<MenuButton*>(this)));
if (aMenuSize.Width() > aRet.Width())
aRet.Width() = aMenuSize.Width();
}
return aRet;
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void MenuButton::SetMenuMode( sal_uInt16 nMode ) void MenuButton::SetMenuMode( sal_uInt16 nMode )
...@@ -239,52 +211,13 @@ void MenuButton::SetMenuMode( sal_uInt16 nMode ) ...@@ -239,52 +211,13 @@ void MenuButton::SetMenuMode( sal_uInt16 nMode )
mnMenuMode = nMode; mnMenuMode = nMode;
} }
void MenuButton::SetShowDisplaySelectedItem(bool bShow)
{
if (mbDisplaySelectedItem == bShow)
return;
if (mbDisplaySelectedItem && mpMenu)
mpMenu->RemoveEventListener(LINK(this, MenuButton, MenuEventListener));
mbDisplaySelectedItem = bShow;
if (mbDisplaySelectedItem && mpMenu)
mpMenu->AddEventListener(LINK(this, MenuButton, MenuEventListener));
}
void MenuButton::SetPopupMenu( PopupMenu* pNewMenu ) void MenuButton::SetPopupMenu( PopupMenu* pNewMenu )
{ {
if (pNewMenu == mpMenu) if (pNewMenu == mpMenu)
return; return;
if (mbDisplaySelectedItem && mpMenu)
mpMenu->RemoveEventListener(LINK(this, MenuButton, MenuEventListener));
// Fuer die 5.1-Auslieferung besser noch nicht inline, ansonsten kann // Fuer die 5.1-Auslieferung besser noch nicht inline, ansonsten kann
// diese Funktion zur 6.0 inline werden // diese Funktion zur 6.0 inline werden
mpMenu = pNewMenu; mpMenu = pNewMenu;
updateText();
if (mbDisplaySelectedItem && mpMenu)
mpMenu->AddEventListener(LINK(this, MenuButton, MenuEventListener));
}
IMPL_LINK(MenuButton, MenuEventListener, VclSimpleEvent*, pEvent)
{
if (pEvent && pEvent->ISA(VclMenuEvent))
{
VclMenuEvent* pMenuEvent = (VclMenuEvent*)pEvent;
if (pMenuEvent->GetMenu() == mpMenu)
{
switch (pMenuEvent->GetId())
{
case VCLEVENT_MENU_INSERTITEM:
case VCLEVENT_MENU_REMOVEITEM:
case VCLEVENT_MENU_ITEMTEXTCHANGED:
queue_resize();
break;
case VCLEVENT_MENU_SELECT:
updateText();
break;
}
}
}
return 0;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -21,72 +21,6 @@ ...@@ -21,72 +21,6 @@
#include <vcl/graphictools.hxx> #include <vcl/graphictools.hxx>
static ::rtl::OString polyToString( const Polygon& rPoly )
{
::rtl::OString aStr;
sal_uInt16 nVertex;
for(nVertex=0; nVertex<rPoly.GetSize(); ++nVertex)
{
aStr += "(";
switch( rPoly.GetFlags(nVertex) )
{
case POLY_NORMAL:
case POLY_SMOOTH:
case POLY_SYMMTR:
aStr += "n: ";
break;
case POLY_CONTROL:
aStr += "c: ";
break;
default:
OSL_FAIL( "SvtGraphicStroke::polyToString invalid flag");
break;
}
aStr += ::rtl::OString::valueOf( static_cast< double >( rPoly[nVertex].getX() ) );
aStr += ",";
aStr += ::rtl::OString::valueOf( static_cast< double >( rPoly[nVertex].getY() ) );
aStr += ") ";
}
return aStr;
}
static ::rtl::OString polyPolyToString( const PolyPolygon& rPolyPoly )
{
::rtl::OString aStr;
sal_uInt16 nPoly;
for(nPoly=0; nPoly<rPolyPoly.Count(); ++nPoly)
{
const Polygon& rPoly = rPolyPoly[nPoly];
aStr += "{ ";
aStr += polyToString( rPoly );
aStr += "} ";
}
return aStr;
}
static ::rtl::OString dashToString( const SvtGraphicStroke::DashArray& rDashArray )
{
::rtl::OString aStr;
aStr += "dash: [ ";
int i, nDashes( rDashArray.size() );
for(i=0; i<nDashes; ++i)
{
aStr += ::rtl::OString::valueOf( rDashArray[i] );
aStr += " ";
}
aStr += "] ";
return aStr;
}
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
SvtGraphicFill::Transform::Transform() SvtGraphicFill::Transform::Transform()
...@@ -176,78 +110,6 @@ void SvtGraphicStroke::getDashArray( DashArray& rDashArray ) const ...@@ -176,78 +110,6 @@ void SvtGraphicStroke::getDashArray( DashArray& rDashArray ) const
rDashArray = maDashArray; rDashArray = maDashArray;
} }
::rtl::OString SvtGraphicStroke::toString() const
{
::rtl::OString aStr;
aStr += polyToString( maPath );
aStr += "trans: ";
aStr += ::rtl::OString::valueOf( static_cast< double >(getTransparency()) );
aStr += " width: ";
aStr += ::rtl::OString::valueOf( static_cast< double >(getStrokeWidth()) );
aStr += " cap: ";
switch( getCapType() )
{
case capButt:
aStr += "butt";
break;
case capRound:
aStr += "round";
break;
case capSquare:
aStr += "square";
break;
default:
OSL_FAIL( "SvtGraphicStroke::toString missing cap type");
break;
}
aStr += " join: ";
switch( getJoinType() )
{
case joinMiter:
aStr += "miter";
break;
case joinRound:
aStr += "round";
break;
case joinBevel:
aStr += "bevel";
break;
case joinNone:
aStr += "none";
break;
default:
OSL_FAIL( "SvtGraphicStroke::toString missing join type");
break;
}
aStr += " ";
if( maStartArrow.Count() )
{
aStr += "start: ";
aStr += polyPolyToString( maStartArrow );
aStr += " ";
}
if( maEndArrow.Count() )
{
aStr += "end: ";
aStr += polyPolyToString( maEndArrow );
aStr += " ";
}
aStr += dashToString( maDashArray );
return aStr;
}
void SvtGraphicStroke::setPath( const Polygon& rPoly ) void SvtGraphicStroke::setPath( const Polygon& rPoly )
{ {
maPath = rPoly; maPath = rPoly;
......
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