diff options
-rw-r--r-- | idlc/inc/idlc/astdeclaration.hxx | 1 | ||||
-rw-r--r-- | idlc/source/astdeclaration.cxx | 33 | ||||
-rw-r--r-- | include/vcl/outdev.hxx | 6 | ||||
-rw-r--r-- | sfx2/source/sidebar/Deck.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/sidebar/Deck.hxx | 5 | ||||
-rw-r--r-- | sfx2/source/sidebar/Panel.cxx | 23 | ||||
-rw-r--r-- | sfx2/source/sidebar/Panel.hxx | 4 | ||||
-rw-r--r-- | unusedcode.easy | 12 | ||||
-rw-r--r-- | vcl/source/gdi/outdev2.cxx | 8 |
9 files changed, 11 insertions, 97 deletions
diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx index 3f776625518a..0906a5bd7b22 100644 --- a/idlc/inc/idlc/astdeclaration.hxx +++ b/idlc/inc/idlc/astdeclaration.hxx @@ -65,7 +65,6 @@ public: virtual ~AstDeclaration(); // Data access - void setName(const OString& name); const OString& getLocalName() const { return m_localName; } const OString& getScopedName() const diff --git a/idlc/source/astdeclaration.cxx b/idlc/source/astdeclaration.cxx index 822a26bd6e89..4840eca74f6a 100644 --- a/idlc/source/astdeclaration.cxx +++ b/idlc/source/astdeclaration.cxx @@ -98,39 +98,6 @@ void AstDeclaration::setPredefined(bool bPredefined) } } -void AstDeclaration::setName(const OString& name) -{ - m_scopedName = name; - sal_Int32 nIndex = name.lastIndexOf( ':' ); - m_localName = name.copy( nIndex+1 ); - -// Huh ? There is always at least one token - -// sal_Int32 count = name.getTokenCount(':'); - -// if ( count > 0 ) -// { -// m_localName = name.getToken(count-1, ':'); -// m_scopedName = name; -// } else if ( m_pScope ) -// { -// m_localName = name; -// AstDeclaration* pDecl = scopeAsDecl(m_pScope); -// if (pDecl) -// { -// m_scopedName = pDecl->getScopedName(); -// if (m_scopedName.getLength() > 0) -// m_scopedName += sGlobal; -// m_scopedName += m_localName; -// } -// } else -// { -// m_localName = name; -// m_scopedName = name; -// } - m_fullName = convertName(m_scopedName); -} - bool AstDeclaration::isType() const { switch (m_nodeType) { case NT_interface: diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 8873150fed8a..cbdf725bcd2f 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -845,6 +845,9 @@ private: SAL_DLLPRIVATE static void ImplUpdateFontDataForAllFrames( FontUpdateHandler_t pHdl, bool bNewFontLists ); SAL_DLLPRIVATE long ImplGetGradientSteps( const Gradient& rGradient, const Rectangle& rRect, bool bMtf ); + //not implemented; to detect misuses of DrawOutDev(...OutputDevice&); + void DrawOutDev( const Point&, const Size&, const Point&, const Size&, const Printer&); + public: virtual ~OutputDevice(); @@ -1036,9 +1039,6 @@ public: virtual void DrawOutDev( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPt, const Size& rSrcSize, const OutputDevice& rOutDev ); - void DrawOutDev( const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPt, const Size& rSrcSize, - const Printer& rOutDev ); virtual void CopyArea( const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize, sal_uInt16 nFlags = 0 ); diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 8eaf4706d56c..8cb6e834edfc 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -364,27 +364,11 @@ void Deck::PrintWindowSubTree (Window* pRoot, int nIndentation) PrintWindowSubTree(pRoot->GetChild(nIndex), nIndentation+1); } - - - void Deck::PrintWindowTree (void) { PrintWindowSubTree(this, 0); } - - -#ifdef DEBUG -void Deck::PrintWindowTree (const ::std::vector<Panel*>& rPanels) -{ - (void)rPanels; - - PrintWindowTree(); -} -#endif - - - IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*, EMPTYARG) { const sal_Int32 nYOffset (-mpVerticalScrollBar->GetThumbPos()); diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index 63c014f4161b..5a0850ce7a61 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -69,10 +69,7 @@ public: virtual void DataChanged (const DataChangedEvent& rEvent); virtual bool Notify (NotifyEvent& rEvent); - void PrintWindowTree (void); -#ifdef DEBUG - void PrintWindowTree (const ::std::vector<Panel*>& rPanels); -#endif + void PrintWindowTree(); static void PrintWindowSubTree (Window* pRoot, int nIndentation); sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; } diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index 9a9fd85741dc..53c805fd02e8 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -223,34 +223,11 @@ void Panel::DataChanged (const DataChangedEvent& rEvent) SetBackground(Theme::GetPaint(Theme::Paint_PanelBackground).GetWallpaper()); } - - - Reference<ui::XSidebarPanel> Panel::GetPanelComponent (void) const { return mxPanelComponent; } - - - -#ifdef DEBUG -void Panel::PrintWindowTree (void) -{ - Window* pElementWindow = VCLUnoHelper::GetWindow(GetElementWindow()); - if (pElementWindow != NULL) - { - OSL_TRACE("panel parent is %x", pElementWindow->GetParent()); - Deck::PrintWindowSubTree(pElementWindow, 2); - } - else - OSL_TRACE(" panel is empty"); -} -#endif - - - - Reference<awt::XWindow> Panel::GetElementWindow (void) { if (mxElement.is()) diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx index cd3e63512eac..fb902c8f1d0f 100644 --- a/sfx2/source/sidebar/Panel.hxx +++ b/sfx2/source/sidebar/Panel.hxx @@ -68,10 +68,6 @@ public: virtual void DataChanged (const DataChangedEvent& rEvent); virtual void Activate (void); -#ifdef DEBUG - void PrintWindowTree (void); -#endif - private: const ::rtl::OUString msPanelId; ::boost::scoped_ptr<PanelTitleBar> mpTitleBar; diff --git a/unusedcode.easy b/unusedcode.easy index 8634a81fd132..de96f918548c 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,4 +1,3 @@ -AstDeclaration::setName(rtl::OString const&) BigInt::BigInt(unsigned int) CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&) Chart2ExportTest::testFdo74115WallGradientFill() @@ -30,12 +29,15 @@ SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint c ScDocument::CreateFormatTable() const ScExtIButton::GetSelected() const ScFormulaCellGroup::scheduleCompilation() -ScTableProtection::getEnhancedProtection() const -ScTableProtection::updateReference(UpdateRefMode, ScDocument*, ScRange const&, short, int, short) ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) SdrItemBrowser::ForceParent() SdrItemBrowser::SdrItemBrowser(SdrView&) +SdrTextObj::NbcSetAutoGrowHeight(bool) +SdrTextObj::NbcSetAutoGrowWidth(bool) +SdrTextObj::NbcSetFitToSize(SdrFitToSizeType) +SdrTextObj::NbcSetMaxTextFrameHeight(long) +SdrTextObj::NbcSetMaxTextFrameWidth(long) SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*) SfxInt64Item::SetValue(long) StyleSettings::SetActiveColor2(Color const&) @@ -196,11 +198,11 @@ sc::CLBuildKernelThread::finish() sc::CLBuildKernelThread::produce() sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) -sfx2::sidebar::Deck::PrintWindowTree(std::vector<sfx2::sidebar::Panel*, std::allocator<sfx2::sidebar::Panel*> > const&) -sfx2::sidebar::Panel::PrintWindowTree() +sdr::contact::ViewObjectContactOfOpenGLObj::getWindow() const 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::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&) std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>) std::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long) utl::extractTime(com::sun::star::util::DateTime const&, com::sun::star::util::Time&) vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool) +writerfilter::dmapper::SdtHelper::appendToInteropGrabBag(rtl::OUString const&, com::sun::star::uno::Any const&) diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index b088d6a7aa93..c5d18c9feb62 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -328,14 +328,6 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize, } } -void OutputDevice::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/, - const Point& /*rSrcPt*/, const Size& /*rSrcSize*/, - const Printer& /*rOutDev*/ ) -{ - // This should never occur! You can't call this function on a Printer instance - DBG_ASSERT( false, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" ); -} - void OutputDevice::CopyArea( const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize, sal_uInt16 nFlags ) |