diff options
-rw-r--r-- | basctl/source/basicide/baside2.hxx | 1 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 23 | ||||
-rw-r--r-- | include/svtools/tabbar.hxx | 1 | ||||
-rw-r--r-- | include/svtools/treelistbox.hxx | 1 | ||||
-rw-r--r-- | include/vcl/ctrl.hxx | 3 | ||||
-rw-r--r-- | sc/inc/scmod.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/app/scmod.cxx | 87 | ||||
-rw-r--r-- | sc/source/ui/condformat/condformatmgr.cxx | 7 | ||||
-rw-r--r-- | sc/source/ui/inc/anyrefdg.hxx | 7 | ||||
-rw-r--r-- | sc/source/ui/inc/condformatmgr.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/anyrefdg.cxx | 6 | ||||
-rw-r--r-- | svtools/source/contnr/imivctl.hxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 10 | ||||
-rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 7 | ||||
-rw-r--r-- | svtools/source/control/tabbar.cxx | 17 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlexport/data/ooo96040-2.odt | bin | 0 -> 308517 bytes | |||
-rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 1 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 8 | ||||
-rw-r--r-- | unusedcode.easy | 2 | ||||
-rw-r--r-- | vcl/source/control/ctrl.cxx | 5 |
20 files changed, 4 insertions, 191 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 401553aa26a9..1fc931f3ad39 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -179,7 +179,6 @@ private: protected: virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; BreakPoint* FindBreakPoint( const Point& rMousePos ); - void ShowMarker(vcl::RenderContext& rRenderContext); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 95b6a95d455a..33aa565305de 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1426,29 +1426,6 @@ void BreakPointWindow::SetNoMarker () SetMarkerPos(NoMarker); } -void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext) -{ - if (nMarkerPos == NoMarker) - return; - - Size const aOutSz = GetOutputSize(); - long const nLineHeight = GetTextHeight(); - - Image aMarker = GetImage(bErrorMarker ? IMGID_ERRORMARKER : IMGID_STEPMARKER); - - Size aMarkerSz(aMarker.GetSizePixel()); - aMarkerSz = rRenderContext.PixelToLogic(aMarkerSz); - Point aMarkerOff(0, 0); - aMarkerOff.X() = (aOutSz.Width() - aMarkerSz.Width()) / 2; - aMarkerOff.Y() = (nLineHeight - aMarkerSz.Height()) / 2; - - sal_uLong nY = nMarkerPos * nLineHeight - nCurYOffset; - Point aPos(0, nY); - aPos += aMarkerOff; - - rRenderContext.DrawImage(aPos, aMarker); -} - BreakPoint* BreakPointWindow::FindBreakPoint( const Point& rMousePos ) { size_t nLineHeight = GetTextHeight(); diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 2e071306c82c..bd90be6ec240 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -372,7 +372,6 @@ private: SVT_DLLPRIVATE bool ImplDeactivatePage(); SVT_DLLPRIVATE void ImplPrePaint(vcl::RenderContext& rRenderContext); SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount ); - SVT_DLLPRIVATE Rectangle ImplGetInsertTabRect(ImplTabBarItem* pItem) const; DECL_DLLPRIVATE_LINK(ImplClickHdl, ImplTabButton*); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 24446dcca726..b96ecd2a5e44 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -757,7 +757,6 @@ public: SvTreeListEntry* GetEntry( const Point& rPos, bool bHit = false ) const; - void PaintEntry(SvTreeListEntry* pEntry, vcl::RenderContext& rRenderContext); long PaintEntry(SvTreeListEntry* pEntry, long nLine, vcl::RenderContext& rRenderContext, SvLBoxTabFlags nTabFlagMask = SvLBoxTabFlags::ALL); virtual Rectangle GetFocusRect( SvTreeListEntry*, long nLine ); diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index e526e31a44cc..ee5b8845efc6 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -60,9 +60,6 @@ protected: void CreateLayoutData() const; /// determines whether we currently have layout data bool HasLayoutData() const; - /// returns the current layout data - vcl::ControlLayoutData* - GetLayoutData() const; /** this calls both our event listeners, and a specified handler diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index d51d100a4e8b..936fb436abb8 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -73,7 +73,6 @@ class ScFormEditData; class ScMarkData; struct ScDragData; struct ScClipData; -class ScAnyRefModalDlg; // for internal Drag&Drop: @@ -113,7 +112,6 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener bool mbIsInSharedDocSaving:1; std::map<sal_uInt16, std::list<VclPtr<vcl::Window> > > m_mapRefWindow; - std::stack<VclPtr<ScAnyRefModalDlg> > maAnyRefDlgStack; public: SFX_DECL_INTERFACE(SCID_APP) @@ -257,10 +255,6 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO SC_DLLPUBLIC bool RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); SC_DLLPUBLIC bool UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); SC_DLLPUBLIC vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor ); - - ScAnyRefModalDlg* GetCurrentAnyRefDlg(); - void PushNewAnyRefDlg( ScAnyRefModalDlg* pDlg ); - void PopAnyRefDlg(); }; #define SC_MOD() ( *reinterpret_cast<ScModule**>(GetAppData(SHL_CALC)) ) diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 48a3ad1c3574..f2b7b1bbffbb 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1604,7 +1604,6 @@ bool ScModule::IsModalMode(SfxObjectShell* pDocSh) if ( nCurRefDlgId ) { SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId ); - ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg(); if ( pChildWnd ) { IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow()); @@ -1612,10 +1611,6 @@ bool ScModule::IsModalMode(SfxObjectShell* pDocSh) bIsModal = pChildWnd->IsVisible() && pRefDlg && !( pRefDlg->IsRefInputMode() && pRefDlg->IsDocAllowed(pDocSh) ); } - else if(pModalDlg) - { - bIsModal = pModalDlg->IsVisible() && !(pModalDlg->IsRefInputMode() && pModalDlg->IsDocAllowed(pDocSh) ); - } else { // in 592 and above, the dialog isn't visible in other views @@ -1646,7 +1641,6 @@ bool ScModule::IsTableLocked() if ( nCurRefDlgId ) { SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId ); - ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg(); if ( pChildWnd ) { IAnyRefDialog* pRefDlg(dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow())); @@ -1656,8 +1650,6 @@ bool ScModule::IsTableLocked() bLocked = pRefDlg->IsTableLocked(); } } - else if( pModalDlg ) - bLocked = pModalDlg->IsTableLocked(); else bLocked = true; // for other views, see IsModalMode } @@ -1674,11 +1666,8 @@ bool ScModule::IsRefDialogOpen() if ( nCurRefDlgId ) { SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId ); - ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg(); if ( pChildWnd ) bIsOpen = pChildWnd->IsVisible(); - else if(pModalDlg) - bIsOpen = pModalDlg->IsVisible(); else bIsOpen = true; // for other views, see IsModalMode } @@ -1695,17 +1684,12 @@ bool ScModule::IsFormulaMode() if ( nCurRefDlgId ) { SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId ); - ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg(); if ( pChildWnd ) { IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow()); assert(pRefDlg); bIsFormula = pChildWnd->IsVisible() && pRefDlg && pRefDlg->IsRefInputMode(); } - else if(pModalDlg) - { - bIsFormula = pModalDlg->IsVisible() && pModalDlg->IsRefInputMode(); - } else bIsFormula = true; } @@ -1744,8 +1728,7 @@ void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc, if( nCurRefDlgId ) { SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId ); - ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg(); - OSL_ENSURE( pChildWnd || pModalDlg, "NoChildWin" ); + OSL_ENSURE( pChildWnd, "NoChildWin" ); if ( pChildWnd ) { if ( nCurRefDlgId == SID_OPENDLG_CONSOLIDATE && pMarkData ) @@ -1767,13 +1750,6 @@ void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc, pRefDlg->SetReference( aNew, pDoc ); } } - else if(pModalDlg) - { - // hide the (color) selection now instead of later from LoseFocus, - // don't abort the ref input that causes this call (bDoneRefMode = sal_False) - pModalDlg->HideReference( false ); - pModalDlg->SetReference( aNew, pDoc ); - } } else { @@ -1797,8 +1773,7 @@ void ScModule::AddRefEntry() if ( nCurRefDlgId ) { SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId ); - ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg(); - OSL_ENSURE( pChildWnd || pModalDlg, "NoChildWin" ); + OSL_ENSURE( pChildWnd, "NoChildWin" ); if ( pChildWnd ) { IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow()); @@ -1808,8 +1783,6 @@ void ScModule::AddRefEntry() pRefDlg->AddRefEntry(); } } - else if(pModalDlg) - pModalDlg->AddRefEntry(); } else { @@ -1830,8 +1803,7 @@ void ScModule::EndReference() if ( nCurRefDlgId ) { SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId ); - ScAnyRefModalDlg* pModalDlg = GetCurrentAnyRefDlg(); - OSL_ENSURE( pChildWnd || pModalDlg, "NoChildWin" ); + OSL_ENSURE( pChildWnd, "NoChildWin" ); if ( pChildWnd ) { IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow()); @@ -1841,8 +1813,6 @@ void ScModule::EndReference() pRefDlg->SetActive(); } } - else if (pModalDlg) - pModalDlg->SetActive(); } } @@ -2270,57 +2240,6 @@ vcl::Window * ScModule::Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAn return NULL; } -ScAnyRefModalDlg* ScModule::GetCurrentAnyRefDlg() -{ - if(!maAnyRefDlgStack.empty()) - return maAnyRefDlgStack.top(); - - return NULL; -} - -void ScModule::PushNewAnyRefDlg( ScAnyRefModalDlg* pNewDlg ) -{ - maAnyRefDlgStack.push( pNewDlg ); - - // prevent mismatch between calls to - // SetInRefMode(true) and SetInRefMode(false) - if(maAnyRefDlgStack.size() != 1) - return; - - SfxViewShell* pViewShell = SfxViewShell::GetFirst(); - while(pViewShell) - { - if ( pViewShell->ISA(ScTabViewShell) ) - { - ScTabViewShell* pViewSh = static_cast<ScTabViewShell*>(pViewShell); - pViewSh->SetInRefMode( true ); - } - pViewShell = SfxViewShell::GetNext( *pViewShell ); - } -} - -void ScModule::PopAnyRefDlg() -{ - maAnyRefDlgStack.pop(); - - if(maAnyRefDlgStack.empty()) - { - // no modal ref dlg any more - // disable the flag in ScGridWindow - SfxViewShell* pViewShell = SfxViewShell::GetFirst(); - while(pViewShell) - { - if ( pViewShell->ISA(ScTabViewShell) ) - { - ScTabViewShell* pViewSh = static_cast<ScTabViewShell*>(pViewShell); - pViewSh->SetInRefMode( false ); - } - pViewShell = SfxViewShell::GetNext( *pViewShell ); - } - - } -} - using namespace com::sun::star; #define LINGUPROP_AUTOSPELL "IsSpellAuto" diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index b7f3dce512a2..05ad63aa6ec9 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -92,13 +92,6 @@ ScConditionalFormat* ScCondFormatManagerWindow::GetSelection() return mpFormatList->GetFormat(nIndex); } -void ScCondFormatManagerWindow::Update() -{ - Clear(); - maMapLBoxEntryToCondIndex.clear(); - Init(); -} - void ScCondFormatManagerWindow::setColSizes() { HeaderBar &rBar = GetTheHeaderBar(); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index eef11c9b442c..5bcc688a96d4 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -261,13 +261,6 @@ void ScRefHdlrImplBase<TWindow, bBindRef>::StateChanged( StateChangedType nState ScRefHandler::stateChanged( nStateChange, bBindRef ); } -class ScAnyRefModalDlg : public ScRefHdlModalImpl -{ -public: - ScAnyRefModalDlg(vcl::Window* pParent, const OUString& rID, - const OUString& rUIXMLDescription); -}; - template<class TDerived, class TBase, bool bBindRef = true> struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef > { diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 76e26fd34202..d713383a6ece 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -41,7 +41,6 @@ public: void DeleteSelection(); ScConditionalFormat* GetSelection(); - void Update(); virtual void Resize() SAL_OVERRIDE; }; diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 116e0e3498c2..99d4f585fd45 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -1016,10 +1016,4 @@ void ScRefHdlModalImpl::StateChanged( StateChangedType nStateChange ) ScRefHandler::stateChanged( nStateChange, true ); } -ScAnyRefModalDlg::ScAnyRefModalDlg(vcl::Window* pParent, const OUString& rID, - const OUString& rUIXMLDescription) - : ScRefHdlModalImpl(pParent, rID, rUIXMLDescription) -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 9673800b2e8c..9da5b13038b2 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -364,7 +364,6 @@ public: void LoseFocus(); void SetUpdateMode( bool bUpdate ); bool GetUpdateMode() const { return bUpdateMode; } - void PaintEntry(SvxIconChoiceCtrlEntry* pEntry, bool bIsBackgroundPainted = false); void PaintEntry(SvxIconChoiceCtrlEntry*, const Point&, vcl::RenderContext& rRenderContext, bool bIsBackgroundPainted = false); void SetEntryPos( @@ -389,7 +388,6 @@ public: SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos, bool bHit = false ); - static Point GetEntryPos( SvxIconChoiceCtrlEntry* ); void MakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, bool bBound = true ); void Arrange( diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 64dbe4d3bf50..1d951235b57c 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1518,11 +1518,6 @@ void SvxIconChoiceCtrl_Impl::SetUpdateMode( bool bUpdate ) } } -void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, bool /*bIsBackgroundPainted*/) -{ - pView->Invalidate(CalcFocusRect(pEntry)); -} - // priorities of the emphasis: bDropTarget => bCursored => bSelected void SvxIconChoiceCtrl_Impl::PaintEmphasis(const Rectangle& rTextRect, const Rectangle& rImageRect, bool bSelected, bool bDropTarget, bool bCursored, vcl::RenderContext& rRenderContext, bool bIsBackgroundPainted) @@ -1822,11 +1817,6 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos, return 0; } -Point SvxIconChoiceCtrl_Impl::GetEntryPos( SvxIconChoiceCtrlEntry* pEntry ) -{ - return pEntry->aRect.TopLeft(); -} - void SvxIconChoiceCtrl_Impl::MakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, bool bBound ) { if ( bBound ) diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 3b27f3d4ce2a..bdf372cfdd02 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -2855,13 +2855,6 @@ void SvTreeListBox::ImplInitStyle() Invalidate(); } -void SvTreeListBox::PaintEntry(SvTreeListEntry* pEntry, vcl::RenderContext& rRenderContext) -{ - DBG_ASSERT(pEntry,"PaintEntry:No Entry"); - if (pEntry) - pImp->PaintEntry(pEntry, rRenderContext); -} - void SvTreeListBox::InvalidateEntry(SvTreeListEntry* pEntry) { DBG_ASSERT(pEntry,"InvalidateEntry:No Entry"); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 291786f43ca8..b2930714fb59 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -1657,23 +1657,6 @@ ImplTabBarItem* TabBar::ImplGetLastTabBarItem( sal_uInt16 nItemCount ) return pItem; } -Rectangle TabBar::ImplGetInsertTabRect(ImplTabBarItem* pItem) const -{ - if (mbHasInsertTab && pItem) - { - sal_Int32 aScaleFactor = GetDPIScaleFactor(); - sal_Int32 nInsertTabWidth = aScaleFactor * INSERT_TAB_WIDTH; - Rectangle aInsTabRect = pItem->maRect; - if (!mbMirrored) - aInsTabRect.setX(aInsTabRect.getX() + aInsTabRect.getWidth()); - else - aInsTabRect.setX(aInsTabRect.getX() - nInsertTabWidth); - aInsTabRect.setWidth(nInsertTabWidth); - return aInsTabRect; - } - return Rectangle(); -} - bool TabBar::DeactivatePage() { return true; diff --git a/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt b/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt Binary files differnew file mode 100644 index 000000000000..e8e7e997f0e5 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 7d0a938a5cb3..d50b5a0bc660 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1548,7 +1548,6 @@ private: bool InAnyApo() const { return InEqualOrHigherApo(1); } void TabCellEnd(); void StopTable(); - short GetTableLeft(); bool IsInvalidOrToBeMergedTabCell() const; // Nummerierungen / Aufzaehlungen ( Autonumbered List Data Descriptor ) diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 216721a824fd..b70c7896ed02 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -3488,14 +3488,6 @@ void SwWW8ImplReader::StopTable() } } -// GetTableLeft() is needed for graphic objects bound to paragraphs in tables. -// For indented tables the base for WW is the margin that would be used without -// the table; SW uses the left table margin. -short SwWW8ImplReader::GetTableLeft() -{ - return (m_pTableDesc) ? m_pTableDesc->GetMinLeft() : 0; -} - bool SwWW8ImplReader::IsInvalidOrToBeMergedTabCell() const { if( !m_pTableDesc ) diff --git a/unusedcode.easy b/unusedcode.easy index 40e3fb1cf048..b3008e600630 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -86,7 +86,6 @@ dbaccess::StorageInputStream::close() dbaui::OTableRowView::SetUpdatable(bool) 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::AttributeConversion::decodeUnsignedHex(rtl::OUString const&) oox::drawingml::TextListStyle::dump() const sc::CLBuildKernelThread::CLBuildKernelThread() sc::CLBuildKernelThread::consume() @@ -99,6 +98,7 @@ sc::FormulaGroupAreaListener::getRange() const sc::FormulaGroupAreaListener::getTopCellPos() const 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> > >::_M_move_data(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::integral_constant<bool, true>) 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) diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 04c94554d14c..a0aa05a6031b 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -116,11 +116,6 @@ bool Control::HasLayoutData() const return mpControlData && mpControlData->mpLayoutData != NULL; } -vcl::ControlLayoutData* Control::GetLayoutData() const -{ - return mpControlData->mpLayoutData; -} - void Control::SetText( const OUString& rStr ) { ImplClearLayoutData(); |