[Libreoffice-commits] core.git: include/sfx2 include/svx include/vcl sfx2/source slideshow/source svx/source unusedcode.easy vcl/source
Caolán McNamara
caolanm at redhat.com
Sat Apr 4 09:13:45 PDT 2015
include/sfx2/dispatch.hxx | 4 --
include/svx/svdobj.hxx | 5 ---
include/vcl/menu.hxx | 8 +----
include/vcl/toolbox.hxx | 3 -
sfx2/source/control/dispatch.cxx | 35 ----------------------
slideshow/source/engine/usereventqueue.cxx | 14 --------
slideshow/source/inc/usereventqueue.hxx | 8 -----
svx/source/svdraw/svdobj.cxx | 46 -----------------------------
unusedcode.easy | 29 +++++++++---------
vcl/source/gdi/impvect.cxx | 36 +++++++++++++---------
vcl/source/gdi/impvect.hxx | 28 +++--------------
vcl/source/window/menu.cxx | 11 ++----
vcl/source/window/toolbox2.cxx | 12 -------
13 files changed, 50 insertions(+), 189 deletions(-)
New commits:
commit 1a3c99f2c31dbc4dd6b3b5788ea0b49a34bea2c6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Apr 4 15:33:20 2015 +0100
callcatcher: update unusedcode
mostly changed due to loplugin:constantfunction
Change-Id: Ib677c78db256f8032a99b3f02a3e363fee68ebcc
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index c32ec1f..274c0c2 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -92,9 +92,7 @@ friend class SfxBindings;
friend class SfxStateCache;
friend class SfxPopupMenuManager;
friend class SfxHelp;
- // For bindings: Finding the Message;
- // level for re-access
- SAL_DLLPRIVATE bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer &rServer, bool bModal );
+
bool _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, bool bModal );
bool _FillState( const SfxSlotServer &rServer,
SfxItemSet &rState, const SfxSlot *pRealSlot );
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 82e1952..971c5b2 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -208,11 +208,6 @@ public:
virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0
sal_uInt32 GetInventor() const { return nInventor;}
sal_uInt16 GetId() const { return nIdentifier;}
-
- SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
- Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
- void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
- OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
};
// all geometrical data of an arbitrary object for use in undo/redo
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 4fd81d2..cd058db 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -381,12 +381,10 @@ public:
namespace vcl
{
- class VCL_DLLPUBLIC MenuInvalidator
+ namespace MenuInvalidator
{
- public:
- MenuInvalidator();
- static VclEventListeners2* GetMenuInvalidateListeners();
- static void Invalidated();
+ VCL_DLLPUBLIC VclEventListeners2* GetMenuInvalidateListeners();
+ VCL_DLLPUBLIC void Invalidated();
};
}
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index e2bb2b5..d723e6e 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -378,9 +378,6 @@ public:
Rectangle GetItemRect( sal_uInt16 nItemId ) const;
Rectangle GetItemPosRect( sal_uInt16 nPos ) const;
- /// Returns size of the bitmap / text that is inside this toolbox item.
- Size GetItemContentSize( sal_uInt16 nItemId ) const;
-
/// Retrieves the optimal position to place a popup window for this item (subtoolbar or dropdown)
Point GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index f7b2961..081d1a6 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1642,41 +1642,6 @@ SfxSlotFilterState SfxDispatcher::IsSlotEnabledByFilter_Impl( sal_uInt16 nSID )
return bFound ? SFX_SLOT_FILTER_DISABLED : SFX_SLOT_FILTER_ENABLED;
}
-bool SfxDispatcher::_TryIntercept_Impl
-(
- sal_uInt16 nSlot, // Slot-Id to search for
- SfxSlotServer& rServer, // <SfxSlotServer>-Instance to fill
- bool bSelf
-)
-{
- // Maybe the parent is also belongs to a component
- SfxDispatcher *pParent = xImp->pParent;
- sal_uInt16 nLevels = xImp->aStack.size();
- while ( pParent && pParent->xImp->pFrame )
- {
- nLevels = nLevels + pParent->xImp->aStack.size();
- pParent = pParent->xImp->pParent;
- }
-
- if ( bSelf )
- {
- // Query the ComponentViewShell
- Flush();
- SfxShell *pObjShell = GetShell(0);
- SfxInterface *pIFace = pObjShell->GetInterface();
- const SfxSlot *pSlot = pIFace->GetSlot(nSlot);
-
- if ( pSlot )
- {
- rServer.SetSlot(pSlot);
- rServer.SetShellLevel(0);
- return true;
- }
- }
-
- return false;
-}
-
/** This helper method searches for the <Slot-Server> which currently serves
the nSlot. As the result, rServe is filled accordingly.
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index f19e8f5..33b0f62 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -572,7 +572,6 @@ UserEventQueue::UserEventQueue( EventMultiplexer& rMultiplexer,
mpAudioStoppedEventHandler(),
mpClickEventHandler(),
mpSkipEffectEventHandler(),
- mpRewindEffectEventHandler(),
mpDoubleClickEventHandler(),
mpMouseEnterHandler(),
mpMouseLeaveHandler(),
@@ -626,10 +625,6 @@ void UserEventQueue::clear()
mrMultiplexer.removeNextEffectHandler( mpSkipEffectEventHandler );
mpSkipEffectEventHandler.reset();
}
- if(mpRewindEffectEventHandler) {
- mrMultiplexer.removeClickHandler( mpRewindEffectEventHandler );
- mpRewindEffectEventHandler.reset();
- }
if( mpShapeDoubleClickEventHandler ) {
mrMultiplexer.removeDoubleClickHandler( mpShapeDoubleClickEventHandler );
mrMultiplexer.removeMouseMoveHandler( mpShapeDoubleClickEventHandler );
@@ -782,15 +777,6 @@ void UserEventQueue::registerSkipEffectEvent(
mpSkipEffectEventHandler->addEvent( pEvent );
}
-void UserEventQueue::registerRewindEffectEvent( EventSharedPtr const& pEvent )
-{
- registerEvent( mpRewindEffectEventHandler,
- pEvent,
- boost::bind( &EventMultiplexer::addClickHandler,
- boost::ref(mrMultiplexer), _1,
- -1.0 /* prio below default */ ) );
-}
-
void UserEventQueue::registerShapeDoubleClickEvent(
const EventSharedPtr& rEvent,
const ShapeSharedPtr& rShape )
diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx
index 340198e..a09c962 100644
--- a/slideshow/source/inc/usereventqueue.hxx
+++ b/slideshow/source/inc/usereventqueue.hxx
@@ -165,13 +165,6 @@ public:
EventSharedPtr const& pEvent,
const bool bSkipTriggersNextEffect);
- /** Registes an event that is fired when the current effects(s)
- are rewound, .e.g. when the right mouse button is pressed.
- Then, all registered events are fired and removed from this
- queue.
- */
- void registerRewindEffectEvent( EventSharedPtr const& rEvent );
-
/** Register an event that is fired to show the next event
For every next effect event, only one of the events
@@ -266,7 +259,6 @@ private:
::boost::shared_ptr<ShapeClickEventHandler> mpShapeClickEventHandler;
::boost::shared_ptr<ClickEventHandler> mpClickEventHandler;
::boost::shared_ptr<SkipEffectEventHandler> mpSkipEffectEventHandler;
- ::boost::shared_ptr<RewindEffectEventHandler> mpRewindEffectEventHandler;
::boost::shared_ptr<ShapeClickEventHandler> mpShapeDoubleClickEventHandler;
::boost::shared_ptr<ClickEventHandler> mpDoubleClickEventHandler;
::boost::shared_ptr<MouseEnterHandler> mpMouseEnterHandler;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 59c6bbc..2108dab 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -177,52 +177,6 @@ SdrObjUserData::SdrObjUserData(const SdrObjUserData& rData) :
SdrObjUserData::~SdrObjUserData() {}
-
-
-SdrObject* SdrObjUserData::CheckMacroHit(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const
-{
- if(pObj)
- {
- if(rRec.pPageView)
- {
- return SdrObjectPrimitiveHit(*pObj, rRec.aPos, rRec.nTol, *rRec.pPageView, rRec.pVisiLayer, false);
- }
- }
-
- return 0;
-}
-
-Pointer SdrObjUserData::GetMacroPointer(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const
-{
- return Pointer(POINTER_REFHAND);
-}
-
-void SdrObjUserData::PaintMacro(OutputDevice& rOut, const Rectangle& /*rDirtyRect*/, const SdrObjMacroHitRec& /*rRec*/, const SdrObject* pObj) const
-{
- if(!pObj)
- return;
-
- const RasterOp eRop(rOut.GetRasterOp());
- const basegfx::B2DPolyPolygon aPolyPolygon(pObj->TakeXorPoly());
- const sal_uInt32 nCount(aPolyPolygon.count());
-
- rOut.SetLineColor(COL_BLACK);
- rOut.SetFillColor();
- rOut.SetRasterOp(ROP_INVERT);
-
- for(sal_uInt32 a(0); a < nCount; a++)
- {
- rOut.DrawPolyLine(aPolyPolygon.getB2DPolygon(a));
- }
-
- rOut.SetRasterOp(eRop);
-}
-
-OUString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const
-{
- return OUString();
-}
-
SdrObjGeoData::SdrObjGeoData():
pGPL(NULL),
bMovProt(false),
diff --git a/unusedcode.easy b/unusedcode.easy
index 7f7580a..e88e695 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,5 @@
BigInt::BigInt(unsigned int)
+BitmapFilterStackBlur::filter(BitmapEx&)
FontCharMap::GetDefaultMap(bool)
OpenGLContext::init(_XDisplay*, unsigned long, unsigned int, unsigned int, int)
OpenGLContext::renderToFile()
@@ -20,9 +21,9 @@ Primitive2dXmlDump::filterAllActionTypes()
Printer::Error()
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
ScCellValue::set(ScRefCellValue const&)
-ScCondFormatManagerDlg::IsInRefMode() const
ScDocument::CreateFormatTable() const
ScDocument::EndAllListeners(ScRange const&)
+ScDocument::GetLastDataPos(short) const
ScImportExport::ImportData(rtl::OUString const&, com::sun::star::uno::Any const&)
ScImportExport::ScImportExport(ScDocument*, rtl::OUString const&)
ScPrivatSplit::GetDeltaX()
@@ -33,7 +34,6 @@ ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any cons
SdrUndoObjList::SetOrdNum(unsigned int)
SecurityEnvironment_NssImpl::getCertificate(rtl::OUString const&, rtl::OUString const&)
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
-SotObject::GetInterface(SvGlobalName const&)
StylePool::getCount() const
StyleSettings::SetAlternatingRowColor(Color const&)
StyleSettings::SetCursorSize(long)
@@ -45,6 +45,7 @@ StyleSettings::SetUseFlatBorders(bool)
StyleSettings::SetUseFlatMenus(bool)
SvpSalFrame::enableDamageTracker(bool)
SvpSalInstance::PostedEventsInQueue()
+SvtAccessibilityOptions::IsModified() const
SvtListener::IsListening(SvtBroadcaster&) const
SvxColorTabPage::GetPropertyList(XPropertyListType)
SvxOpenGLObject::getRenderer()
@@ -52,7 +53,6 @@ SvxOpenGLObject::setRenderer(IOpenGLRenderer*)
Test::testCopyPasteSkipEmptyConditionalFormatting()
Test::testPerf()
Test::testSharedFormulaMoveBlock()
-ToolBox::UserDraw(UserDrawEvent const&)
UnxPluginComm::NPP_GetMIMEDescription()
XclXmlUtils::ToOString(XclRange const&)
XmlTestTools::parseXml(utl::TempFile&)
@@ -124,11 +124,7 @@ apitest::XNamedRanges::testRemoveByName()
apitest::XPrintAreas::testSetAndGetPrintTitleColumns()
apitest::XPrintAreas::testSetAndGetPrintTitleRows()
apitest::XPropertySet::PropsToTest::PropsToTest()
-apitest::XPropertySet::testAddPropertyChangeListener()
-apitest::XPropertySet::testAddVetoableChangeListener()
apitest::XPropertySet::testGetPropertyValue()
-apitest::XPropertySet::testRemovePropertyChangeListener()
-apitest::XPropertySet::testRemoveVetoableChangeListener()
apitest::XPropertySet::testSetPropertyValue()
apitest::XReplaceable::testCreateReplaceDescriptor()
apitest::XReplaceable::testReplaceAll()
@@ -144,7 +140,6 @@ apitest::XSheetAnnotations::testCount()
apitest::XSheetAnnotations::testGetByIndex()
apitest::XSheetAnnotations::testInsertNew()
apitest::XSheetAnnotations::testRemoveByIndex()
-apitest::XSheetOutline::testAutoOutline()
apitest::XSheetOutline::testClearOutline()
apitest::XSheetOutline::testGroup()
apitest::XSheetOutline::testHideDetail()
@@ -173,9 +168,9 @@ basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon c
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
chart::ShapeToolbarController::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
comphelper::OAccessibleImplementationAccess::setStateBit(short, bool)
-comphelper::detail::ConfigurationWrapper::getGroupReadWrite(std::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
+comphelper::detail::ConfigurationWrapper::getGroupReadWrite(std::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&)
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
-comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(std::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
+comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(std::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&)
connectivity::dbase::ODbaseResultSet::createAnalyzer()
connectivity::firebird::release(int&, cppu::OBroadcastHelperVar<cppu::OMultiTypeInterfaceContainerHelper, com::sun::star::uno::Type>&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&, com::sun::star::lang::XComponent*)
connectivity::odbc::appendSQLWCHARs(rtl::OUStringBuffer&, wchar_t const*, int)
@@ -185,18 +180,16 @@ dbaccess::OBookmarkContainer::dispose()
dbaccess::StorageInputStream::close()
dbaui::OConnectionLineAccess::contains(com::sun::star::awt::Point const&)
dbaui::OConnectionLineAccess::isEditable() const
-dbaui::OConnectionLineAccess::isFocusTraversable()
dbaui::OConnectionLineAccess::isShowing()
-dbaui::OConnectionLineAccess::isVisible()
dbaui::OGenericUnoController::InvalidateFeature(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::frame::XStatusListener> const&, bool)
dbaui::OJoinDesignViewAccess::isEditable() const
-dbaui::OJoinTableView::StartDrag(signed char, Point const&)
dbaui::OQueryViewSwitch::resizeDocumentView(Rectangle&)
dbaui::OQueryViewSwitch::setReadOnly(bool)
dbaui::OTableRowView::SetUpdatable(bool)
dbaui::OTableWindowAccess::isEditable() const
dp_registry::backend::RegisteredDb::getEntry(rtl::OUString const&)
-oglcanvas::CanvasHelper::flush() const
+frm::ODatabaseForm::Create(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+oglcanvas::CanvasHelper::drawPoint(com::sun::star::rendering::XCanvas const*, com::sun::star::geometry::RealPoint2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&)
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
oox::drawingml::TextListStyle::dump() const
sc::CLBuildKernelThread::CLBuildKernelThread()
@@ -212,4 +205,12 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&)
std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
+vcl::IsWindowSystemAvailable()
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
+vclcanvas::CanvasBitmapHelper::setData(com::sun::star::uno::Sequence<signed char> const&, com::sun::star::rendering::IntegerBitmapLayout const&, com::sun::star::geometry::IntegerRectangle2D const&)
+vclcanvas::CanvasBitmapHelper::setPixel(com::sun::star::uno::Sequence<signed char> const&, com::sun::star::rendering::IntegerBitmapLayout const&, com::sun::star::geometry::IntegerPoint2D const&)
+vclcanvas::CanvasHelper::drawPoint(com::sun::star::rendering::XCanvas const*, com::sun::star::geometry::RealPoint2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&)
+vclcanvas::CanvasHelper::setData(com::sun::star::uno::Sequence<signed char> const&, com::sun::star::rendering::IntegerBitmapLayout const&, com::sun::star::geometry::IntegerRectangle2D const&)
+vclcanvas::CanvasHelper::setPixel(com::sun::star::uno::Sequence<signed char> const&, com::sun::star::rendering::IntegerBitmapLayout const&, com::sun::star::geometry::IntegerPoint2D const&)
+vclcanvas::DeviceHelper::enterFullScreenMode(bool)
+vclcanvas::SpriteDeviceHelper::createBuffers(int)
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index d5435ef..9a71a24 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -46,6 +46,18 @@
if(_def_pProgress&&_def_pProgress->IsSet()) \
(_def_pProgress->Call(reinterpret_cast<void*>(_def_nVal)));
+class ImplVectMap;
+class ImplChain;
+
+namespace ImplVectorizer
+{
+ ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor );
+ void ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags );
+ bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain );
+ bool ImplIsUp( ImplVectMap* pMap, long nY, long nX );
+ void ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly );
+}
+
struct ChainMove { long nDX; long nDY; };
static const ChainMove aImplMove[ 8 ] = {
@@ -619,15 +631,9 @@ void ImplChain::ImplPostProcess( const ImplPointArray& rArr )
aNewArr2.ImplCreatePoly( maPoly );
}
-ImplVectorizer::ImplVectorizer()
-{
-}
+namespace ImplVectorizer {
-ImplVectorizer::~ImplVectorizer()
-{
-}
-
-bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
+bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress )
{
bool bRet = false;
@@ -729,7 +735,7 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
return bRet;
}
-bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp,
+bool ImplVectorize( const Bitmap& rMonoBmp,
tools::PolyPolygon& rPolyPoly,
sal_uLong nFlags, const Link* pProgress )
{
@@ -823,7 +829,7 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp,
return bRet;
}
-void ImplVectorizer::ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly )
+void ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly )
{
if( rPolyPoly.Count() > VECT_POLY_MAX )
{
@@ -855,7 +861,7 @@ void ImplVectorizer::ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly )
}
}
-ImplVectMap* ImplVectorizer::ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor )
+ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor )
{
ImplVectMap* pMap = NULL;
@@ -942,7 +948,7 @@ ImplVectMap* ImplVectorizer::ImplExpand( BitmapReadAccess* pRAcc, const Color& r
return pMap;
}
-void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags )
+void ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags )
{
const long nWidth = pMap->Width(), nHeight= pMap->Height();
@@ -1009,7 +1015,7 @@ void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPoly
}
}
-bool ImplVectorizer::ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain )
+bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain )
{
long nActX = rStartPt.X();
long nActY = rStartPt.Y();
@@ -1059,7 +1065,7 @@ bool ImplVectorizer::ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, Im
return true;
}
-bool ImplVectorizer::ImplIsUp( ImplVectMap* pMap, long nY, long nX )
+bool ImplIsUp( ImplVectMap* pMap, long nY, long nX )
{
if( pMap->IsDone( nY - 1L, nX ) )
return true;
@@ -1071,4 +1077,6 @@ bool ImplVectorizer::ImplIsUp( ImplVectMap* pMap, long nY, long nX )
return false;
}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx
index 0051bef..4e1ec38 100644
--- a/vcl/source/gdi/impvect.hxx
+++ b/vcl/source/gdi/impvect.hxx
@@ -24,30 +24,12 @@
#include <vcl/gdimtf.hxx>
// - Vectorizer -
-
-class BitmapReadAccess;
-class ImplChain;
-class ImplVectMap;
-
-class ImplVectorizer
+namespace ImplVectorizer
{
-private:
-
- static ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor );
- static void ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags );
- static bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain );
- static bool ImplIsUp( ImplVectMap* pMap, long nY, long nX );
- static void ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly );
-
-public:
-
- ImplVectorizer();
- ~ImplVectorizer();
-
- static bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
- sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress );
- static bool ImplVectorize( const Bitmap& rMonoBmp, tools::PolyPolygon& rPolyPoly,
- sal_uLong nFlags, const Link* pProgress );
+ bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
+ sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress );
+ bool ImplVectorize( const Bitmap& rMonoBmp, tools::PolyPolygon& rPolyPoly,
+ sal_uLong nFlags, const Link* pProgress );
};
#endif
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index b1cc88b..d32c86f 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3154,21 +3154,18 @@ ImplMenuDelData::~ImplMenuDelData()
const_cast< Menu* >( mpMenu )->ImplRemoveDel( *this );
}
-namespace vcl
-{
- MenuInvalidator::MenuInvalidator() {};
-
+namespace vcl { namespace MenuInvalidator {
static VclEventListeners2* pMenuInvalidateListeners = NULL;
- VclEventListeners2* MenuInvalidator::GetMenuInvalidateListeners()
+ VclEventListeners2* GetMenuInvalidateListeners()
{
if(!pMenuInvalidateListeners)
pMenuInvalidateListeners = new VclEventListeners2();
return pMenuInvalidateListeners;
}
- void MenuInvalidator::Invalidated()
+ void Invalidated()
{
VclSimpleEvent aEvent(0);
GetMenuInvalidateListeners()->callListeners(&aEvent);
};
-}
+} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 7fbdb39..2c9a9d0 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1022,18 +1022,6 @@ Rectangle ToolBox::GetItemPosRect( sal_uInt16 nPos ) const
return Rectangle();
}
-Size ToolBox::GetItemContentSize( sal_uInt16 nItemId ) const
-{
- if ( mbCalc || mbFormat )
- const_cast<ToolBox*>(this)->ImplFormat();
-
- sal_uInt16 nPos = GetItemPos( nItemId );
- if ( nPos < mpData->m_aItems.size() )
- return mpData->m_aItems[nPos].maContentSize;
- else
- return Size();
-}
-
bool ToolBox::ImplHasExternalMenubutton()
{
// check if the borderwindow (i.e. the decoration) provides the menu button
More information about the Libreoffice-commits
mailing list