diff options
22 files changed, 0 insertions, 321 deletions
diff --git a/basegfx/source/pixel/bpixel.cxx b/basegfx/source/pixel/bpixel.cxx index 579b8cbc8b8c..47561de84f76 100644 --- a/basegfx/source/pixel/bpixel.cxx +++ b/basegfx/source/pixel/bpixel.cxx @@ -22,18 +22,4 @@ namespace { struct EmptyBPixel : public rtl::Static<basegfx::BPixel, EmptyBPixel> {}; } -////////////////////////////////////////////////////////////////////////////// - -namespace basegfx -{ - const BPixel& BPixel::getEmptyBPixel() - { - return EmptyBPixel::get(); - } - - ////////////////////////////////////////////////////////////////////////// - // external operators - -} // end of namespace basegfx - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index c133cc60d634..920338878c6f 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1787,11 +1787,6 @@ void FormulaDlg::Update() m_pImpl->aTimer.Start(); } -// ----------------------------------------------------------------------------- -sal_Bool FormulaDlg::isUserMatrix() const -{ - return m_pImpl->bUserMatrixFlag; -} void FormulaDlg::DoEnter(sal_Bool _bOk) { m_pImpl->DoEnter(_bOk); diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx index 41c8c5f72720..516a421579a6 100644 --- a/include/basegfx/pixel/bpixel.hxx +++ b/include/basegfx/pixel/bpixel.hxx @@ -125,9 +125,6 @@ namespace basegfx { return (rPixel.maPixelUnion.maCombinedRGBO.mnValue != maPixelUnion.maCombinedRGBO.mnValue); } - - // empty element - static const BPixel& getEmptyBPixel(); }; ////////////////////////////////////////////////////////////////////////// diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 5a55f5ca81d1..8bb8047986bd 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -123,7 +123,6 @@ protected: void Update(const String& _sExp); void CheckMatrix(); void DoEnter(sal_Bool _bOk); - sal_Bool isUserMatrix() const; const IFunctionDescription* getCurrentFunctionDescription() const; sal_Bool UpdateParaWin(Selection& _rSelection); void UpdateParaWin(const Selection& _rSelection,const String& _sRefStr); diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index 1ca1eb4cf1f3..9319040d59be 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -46,7 +46,6 @@ protected: sal_Bool ImplGetPropertyValue_BOOL( sal_uInt16 nProp ); sal_Int16 ImplGetPropertyValue_INT16( sal_uInt16 nProp ); sal_Int32 ImplGetPropertyValue_INT32( sal_uInt16 nProp ); - sal_Int64 ImplGetPropertyValue_INT64( sal_uInt16 nProp ); double ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp ); OUString ImplGetPropertyValue_UString( sal_uInt16 nProp ); ::com::sun::star::util::Date ImplGetPropertyValue_Date( sal_uInt16 nProp ); diff --git a/include/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx index d0e15dcfdbec..e9b582bee924 100644 --- a/include/unotools/xmlaccelcfg.hxx +++ b/include/unotools/xmlaccelcfg.hxx @@ -85,26 +85,6 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume SvtAcceleratorItemList& m_aReadAcceleratorList; }; - -class OWriteAccelatorDocumentHandler -{ - public: - OWriteAccelatorDocumentHandler( - const SvtAcceleratorItemList& aWriteAcceleratorList, - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > ); - virtual ~OWriteAccelatorDocumentHandler(); - - void WriteAcceleratorDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - - private: - void WriteAcceleratorItem( const SvtAcceleratorConfigItem& aAcceleratorItem ) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - OUString m_aAttributeType; - const SvtAcceleratorItemList& m_aWriteAcceleratorList; -}; - #endif // INCLUDED_unotools_XMLACCELCFG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx index 70015ba17fa6..c8926cd57f2a 100644 --- a/include/vcl/bmpacc.hxx +++ b/include/vcl/bmpacc.hxx @@ -165,9 +165,6 @@ public: /** Get the color at coordinates fY, fX; if outside, return rFallback. Automatically does the correct inside/outside checks, e.g. static_cast< sal_uInt32 >(-0.25) *is* 0, not -1 and has to be outside */ BitmapColor GetColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const; - - /** Get the color at coordinates nY, nX; if outside, return rFallback */ - BitmapColor GetColorWithFallback( long nY, long nX, const BitmapColor& rFallback ) const; }; // --------------------- @@ -205,8 +202,6 @@ public: void FillRect( const Rectangle& rRect ); void DrawRect( const Rectangle& rRect ); - void FillPolyPolygon( const PolyPolygon& rPoly ); - private: BitmapColor* mpLineColor; diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index c321325ae78b..8820b5e7dce3 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -652,28 +652,6 @@ awt::Size SdPhotoAlbumDialog::createASRSize(const awt::Size& aPicSize, const awt return awt::Size(resizeWidth, resizeHeight); } -Reference< drawing::XShape > SdPhotoAlbumDialog::createXShapeFromUrl(const OUString& sUrl, - Reference< lang::XMultiServiceFactory > xShapeFactory, - Reference< graphic::XGraphicProvider> xProvider -) -{ - //First, we create an XGraphic - ::comphelper::NamedValueCollection aMediaProperties; - aMediaProperties.put( "URL", OUString( sUrl ) ); - Reference< graphic::XGraphic> xGraphic = - xProvider->queryGraphic( aMediaProperties.getPropertyValues() ); - //And then, we can create the XShape from the XGraphic - Reference< drawing::XShape > xShape( - xShapeFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), - uno::UNO_QUERY - ); - - Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); - xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic)); - - return xShape; // Image loaded into XShape -} - Reference< graphic::XGraphic> SdPhotoAlbumDialog::createXGraphicFromUrl(const OUString& sUrl, Reference< graphic::XGraphicProvider> xProvider ) diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index 302a00792cbe..99b93dd35e99 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -84,10 +84,6 @@ private: awt::Size createASRSize(const awt::Size& aPicSize, const awt::Size& aMaxSize); - Reference< drawing::XShape > createXShapeFromUrl(const OUString& sUrl, - Reference< lang::XMultiServiceFactory > xShapeFactory, - Reference< graphic::XGraphicProvider> xProvider); - Reference< graphic::XGraphic> createXGraphicFromUrl(const OUString& sUrl, Reference< graphic::XGraphicProvider> xProvider); diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index a50da0bcbcbb..76bdae53aae6 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -666,27 +666,6 @@ Reference<XResourceId> FrameworkHelper::RequestSidebarPanel ( return NULL; } - - - -void FrameworkHelper::RequestResourceDeactivation (const cssu::Reference<cssdf::XResourceId>& rxResourceId) -{ - try - { - if (mxConfigurationController.is() && rxResourceId.is()) - mxConfigurationController->requestResourceDeactivation(rxResourceId); - } - catch (lang::DisposedException&) - { - Dispose(); - } - catch (RuntimeException&) - {} -} - - - - ViewShell::ShellType FrameworkHelper::GetViewId (const OUString& rsViewURL) { if (mpViewURLMap->empty()) diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index c5796adb717b..4e0b5898f1cc 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -243,11 +243,6 @@ public: const OUString& rsSidebarPanelURL, const bool bEnsureTaskPaneIsVisible = true); - /** Request the deactivation of the specified resource. - */ - void RequestResourceDeactivation ( - const cssu::Reference<cssdf::XResourceId>& rxResourceId); - /** Process a slot call that requests a view shell change. */ void HandleModeChangeSlot ( diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index a5fc7ed9b21c..a1ddbedf83b1 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -318,35 +318,6 @@ IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener, return 0; } - - - -void CurrentMasterPagesSelector::NotifyHint (SfxBroadcaster&, const SfxHint& rHint) -{ - const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if (pSimpleHint != NULL) - { - if (pSimpleHint->GetId() == SFX_HINT_DOCCHANGED) - { - // Is the edit view visible in the center pane? - ::boost::shared_ptr<DrawViewShell> pDrawViewShell ( - ::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell())); - if (pDrawViewShell.get() != NULL) - { - // Is the edit view in master page mode? - if (pDrawViewShell->GetEditMode() == EM_MASTERPAGE) - { - // Mark the currently edited master page as precious. - SdPage* pCurrentMasterPage = pDrawViewShell->getCurrentPage(); - if (pCurrentMasterPage != NULL) - pCurrentMasterPage->SetPrecious(true); - } - } - } - } -} - - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index 37b228c9b49f..34c90b649362 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -78,7 +78,6 @@ private: virtual void LateInit (void); DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent*); - void NotifyHint (SfxBroadcaster&, const SfxHint& rHint); }; } } // end of namespace sd::sidebar diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index 46ea99c5e873..f284a2615c00 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -221,41 +221,6 @@ FocusManager::FocusLocation FocusManager::GetFocusLocation (const Window& rWindo return FocusLocation(PC_None, -1); } - - - -bool FocusManager::IsAnyPanelFocused (void) const -{ - for (::std::vector<Panel*>::const_iterator iPanel(maPanels.begin()),iEnd(maPanels.end()); - iPanel!=iEnd; - ++iPanel) - { - if ((*iPanel)->HasFocus()) - return true; - else if ((*iPanel)->HasChildPathFocus()) - return true; - } - return false; -} - - - - -bool FocusManager::IsAnyButtonFocused (void) const -{ - for (::std::vector<Button*>::const_iterator iButton(maButtons.begin()),iEnd(maButtons.end()); - iButton!=iEnd; - ++iButton) - { - if ((*iButton)->HasFocus()) - return true; - } - return false; -} - - - - void FocusManager::FocusDeckTitle (void) { if (mpDeckTitleBar != NULL) diff --git a/sfx2/source/sidebar/FocusManager.hxx b/sfx2/source/sidebar/FocusManager.hxx index 8111328ef198..c1249e19925c 100644 --- a/sfx2/source/sidebar/FocusManager.hxx +++ b/sfx2/source/sidebar/FocusManager.hxx @@ -113,9 +113,6 @@ private: */ void RemoveWindow (Window& rWindow); - bool IsAnyPanelFocused (void) const; - bool IsAnyButtonFocused (void) const; - void FocusDeckTitle (void); bool IsDeckTitleVisible (void) const; bool IsPanelTitleVisible (const sal_Int32 nPanelIndex) const; diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx index 26f06be28c1a..e87c54ee4d2a 100644 --- a/toolkit/source/controls/unocontrolbase.cxx +++ b/toolkit/source/controls/unocontrolbase.cxx @@ -151,11 +151,6 @@ sal_Int32 UnoControlBase::ImplGetPropertyValue_INT32( sal_uInt16 nProp ) return ImplGetPropertyValuePOD<sal_Int32>(nProp); } -sal_Int64 UnoControlBase::ImplGetPropertyValue_INT64( sal_uInt16 nProp ) -{ - return ImplGetPropertyValuePOD<sal_Int64>(nProp); -} - double UnoControlBase::ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp ) { return ImplGetPropertyValuePOD<double>(nProp); diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index c0143d4f0a24..9fe1d929b2bd 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.cxx @@ -332,67 +332,4 @@ void SAL_CALL OReadAccelatorDocumentHandler::endElement( const OUString& aName ) } } -// ------------------------------------------------------------------ - -OWriteAccelatorDocumentHandler::OWriteAccelatorDocumentHandler( - const SvtAcceleratorItemList& aWriteAcceleratorList, Reference< XDocumentHandler > xDocumentHandler ) : - m_xWriteDocumentHandler( xDocumentHandler ), - m_aWriteAcceleratorList( aWriteAcceleratorList ) -{ - m_aAttributeType = OUString( ATTRIBUTE_TYPE_CDATA ); -} - -OWriteAccelatorDocumentHandler::~OWriteAccelatorDocumentHandler() -{ -} - -void OWriteAccelatorDocumentHandler::WriteAcceleratorDocument() - throw ( SAXException, RuntimeException ) -{ - AttributeListImpl* pList = new AttributeListImpl; - Reference< XAttributeList > rList( (XAttributeList *)pList , UNO_QUERY ); - - m_xWriteDocumentHandler->startDocument(); - m_xWriteDocumentHandler->startElement( OUString( ELEMENT_ACCELERATORLIST ), rList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - - std::list< SvtAcceleratorConfigItem>::const_iterator p; - for ( p = m_aWriteAcceleratorList.begin(); p != m_aWriteAcceleratorList.end(); ++p ) - WriteAcceleratorItem( *p ); - - m_xWriteDocumentHandler->endElement( OUString( ELEMENT_ACCELERATORLIST ) ); - m_xWriteDocumentHandler->endDocument(); -} - -void OWriteAccelatorDocumentHandler::WriteAcceleratorItem( - const SvtAcceleratorConfigItem& aAcceleratorItem ) - throw( SAXException, RuntimeException ) -{ - AttributeListImpl* pAcceleratorAttributes = new AttributeListImpl; - Reference< XAttributeList > xAcceleratorAttrList( (XAttributeList *)pAcceleratorAttributes , UNO_QUERY ); - - // set attributes - pAcceleratorAttributes->addAttribute( - OUString( ATTRIBUTE_KEYCODE ), - m_aAttributeType, - OUString( aAcceleratorItem.nCode )); - - pAcceleratorAttributes->addAttribute( - OUString( ATTRIBUTE_MODIFIER ), - m_aAttributeType, - OUString( aAcceleratorItem.nModifier )); - - pAcceleratorAttributes->addAttribute( - OUString( ATTRIBUTE_URL ), - m_aAttributeType, - aAcceleratorItem.aCommand ); - - // write start element - m_xWriteDocumentHandler->startElement( - OUString( ELEMENT_ACCELERATORITEM ), - xAcceleratorAttrList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( ELEMENT_ACCELERATORITEM ) ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index 2d4a852d2a8e..59054022cd30 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -5,17 +5,12 @@ (anonymous namespace)::VBATest::testMiscOLEStuff() BackingWindow::LinkStubWindowEventListener(void*, void*) Bcp47CountryEntry::getLocale() const -BitmapReadAccess::GetColorWithFallback(long, long, BitmapColor const&) const -BitmapWriteAccess::FillPolyPolygon(PolyPolygon const&) CuiAboutConfigTabPage::LinkStubHeaderSelect_Impl(void*, void*) -DbgRegisterNamedUserChannel(rtl::OUString const&, void (*)(char const*)) EditTextObjectImpl::SetParaAttribs(int, SfxItemSet const&) FontSelectPatternAttributes::FontSelectPatternAttributes(PhysicalFontFace const&, Size const&, float, int, bool) ImplRegionBand::IsInside(long, long) ImplRegionBand::IsOver(long, long) LanguageTag::reset(_rtl_Locale const&) -OWriteAccelatorDocumentHandler::OWriteAccelatorDocumentHandler(std::__debug::list<SvtAcceleratorConfigItem, std::allocator<SvtAcceleratorConfigItem> > const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler>) -OWriteAccelatorDocumentHandler::WriteAcceleratorDocument() OutputDevice::GetCanvas() const OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, MapMode const&) OutputDevice::LogicToPixel(Region const&, MapMode const&) const @@ -90,7 +85,6 @@ TextEngine::GetLeftMargin() const ThumbnailView::DeselectItem(unsigned short) ThumbnailView::GetItemText(unsigned short) const ThumbnailView::SetColor(Color const&) -UnoControlBase::ImplGetPropertyValue_INT64(unsigned short) VclMultiLineEdit::SetTextSelectable(bool) apitest::XCellRangesQuery::testQueryFormulaCells() apitest::XDataPilotDescriptor::testGetHiddenFields() @@ -115,7 +109,6 @@ apitest::XText::testInsertRemoveTextContent() basebmp::BitmapDevice::getBufferSize() const basebmp::createBitmapDevice(basegfx::B2IVector const&, bool, basebmp::Format, boost::shared_array<unsigned char> const&, boost::shared_ptr<std::__debug::vector<basebmp::Color, std::allocator<basebmp::Color> > const> const&) basebmp::createBitmapDevice(basegfx::B2IVector const&, bool, basebmp::Format, boost::shared_ptr<std::__debug::vector<basebmp::Color, std::allocator<basebmp::Color> > const> const&) -basegfx::BPixel::getEmptyBPixel() basegfx::snapToNearestMultiple(double, double) basegfx::snapToRange(double, double, double) basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon const&) @@ -143,7 +136,6 @@ editeng::MisspellRange::MisspellRange() editeng::Section::Section() formula::DoubleVectorRefToken::GetArrayLength() const formula::FormulaDlg::CheckMatrix() -formula::FormulaDlg::isUserMatrix() const framework::MenuBarManager::getComponentContext() framework::MenuManager::getContext() jfw_plugin::VendorBase::createInstance() @@ -160,13 +152,10 @@ sc::sidebar::CellLineStyleValueSet::SetImage(Image) sc_apitest::main() sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) -sd::SdPhotoAlbumDialog::createXShapeFromUrl(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>, com::sun::star::uno::Reference<com::sun::star::graphic::XGraphicProvider>) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::framework::FrameworkHelper::GetPaneWindow(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&) sd::framework::FrameworkHelper::GetResource(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&) -sd::framework::FrameworkHelper::RequestResourceDeactivation(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&) sd::framework::Pane::SetWindow(Window*) -sd::sidebar::CurrentMasterPagesSelector::NotifyHint(SfxBroadcaster&, SfxHint const&) sd::sidebar::LayoutMenu::GetMinimumWidth() sd::sidebar::LayoutMenu::GetPreferredSize() sd::sidebar::LayoutMenu::GetPreferredWidth(int) @@ -181,8 +170,6 @@ sfx2::sidebar::Deck::PrintWindowTree(std::__debug::vector<sfx2::sidebar::Panel*, sfx2::sidebar::EnumContext::EvaluateMatch(std::__debug::vector<sfx2::sidebar::EnumContext, std::allocator<sfx2::sidebar::EnumContext> > const&) const sfx2::sidebar::EnumContext::GetApplication() const sfx2::sidebar::EnumContext::GetCombinedContext() const -sfx2::sidebar::FocusManager::IsAnyButtonFocused() const -sfx2::sidebar::FocusManager::IsAnyPanelFocused() const sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&) sfx2::sidebar::Panel::PrintWindowTree() sfx2::sidebar::SidebarDockingWindow::GetChildWindow() diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx index a52dbb001e96..c3393e6278fc 100644 --- a/vcl/inc/dbggui.hxx +++ b/vcl/inc/dbggui.hxx @@ -35,14 +35,6 @@ void DbgGUIDeInit(); void DbgGUIStart(); void DbgDialogTest( Window* pWindow ); -/** registers a named user-defined channel for emitting the diagnostic messages - @return - a unique number for this channel, which can be used for ->DbgData::nErrorOut, - ->DbgData::nWarningOut and ->DbgData::nTraceOut - @see DBG_OUT_USER_CHANNEL_0 -*/ -sal_uInt16 DbgRegisterNamedUserChannel( const OUString& _rChannelUIName, DbgPrintLine pProc ); - #define DBGGUI_INIT() DbgGUIInit() #define DBGGUI_DEINIT() DbgGUIDeInit() #define DBGGUI_START() DbgGUIStart() diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 6833a95cd7d7..52177f079550 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -1785,16 +1785,6 @@ void DbgGUIStart() } } -// ----------------------------------------------------------------------- - -sal_uInt16 DbgRegisterNamedUserChannel( const OUString& _rChannelUIName, DbgPrintLine pProc ) -{ - DbgChannelId nChannelId = DbgRegisterUserChannel( pProc ); - UserDefinedChannels& rChannels = ImplDbgGetUserDefinedChannels(); - rChannels[ _rChannelUIName ] = nChannelId; - return nChannelId; -} - #endif // DBG_UTIL /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index d27090def05c..8e3836596e32 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -384,19 +384,6 @@ BitmapColor BitmapReadAccess::GetColorWithFallback( double fY, double fX, const return rFallback; } -BitmapColor BitmapReadAccess::GetColorWithFallback( long nY, long nX, const BitmapColor& rFallback ) const -{ - if(mpBuffer) - { - if(nX >= 0 && nY >= 0 && nX < mpBuffer->mnWidth && nY < mpBuffer->mnHeight) - { - return GetColor(nY, nX); - } - } - - return rFallback; -} - BitmapWriteAccess::BitmapWriteAccess( Bitmap& rBitmap ) : BitmapReadAccess( rBitmap, sal_True ), mpLineColor ( NULL ), diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx index 06c9c09128f2..791a75d9329d 100644 --- a/vcl/source/gdi/bmpacc3.cxx +++ b/vcl/source/gdi/bmpacc3.cxx @@ -243,44 +243,4 @@ void BitmapWriteAccess::DrawRect( const Rectangle& rRect ) } } -void BitmapWriteAccess::FillPolyPolygon( const PolyPolygon& rPolyPoly ) -{ - const sal_uInt16 nCount = rPolyPoly.Count(); - - if( nCount && mpFillColor ) - { - const BitmapColor& rFillColor = *mpFillColor; - Region aRegion( rPolyPoly ); - //Rectangle aRect; - - aRegion.Intersect( Rectangle( Point(), Size( Width(), Height() ) ) ); - - if( !aRegion.IsEmpty() ) - { - RectangleVector aRectangles; - aRegion.GetRegionRectangles(aRectangles); - - for(RectangleVector::const_iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); ++aRectIter) - { - for(long nY = aRectIter->Top(), nEndY = aRectIter->Bottom(); nY <= nEndY; nY++) - { - for(long nX = aRectIter->Left(), nEndX = aRectIter->Right(); nX <= nEndX; nX++) - { - SetPixel(nY, nX, rFillColor); - } - } - } - - //RegionHandle aRegHandle( aRegion.BeginEnumRects() ); - // - //while( aRegion.GetEnumRects( aRegHandle, aRect ) ) - // for( long nY = aRect.Top(), nEndY = aRect.Bottom(); nY <= nEndY; nY++ ) - // for( long nX = aRect.Left(), nEndX = aRect.Right(); nX <= nEndX; nX++ ) - // SetPixel( nY, nX, rFillColor ); - // - //aRegion.EndEnumRects( aRegHandle ); - } - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |