dbaccess/source/ui/dlg/directsql.cxx | 29 ---- include/sfx2/sidebar/ControlFactory.hxx | 4 include/sfx2/sidebar/SidebarToolBox.hxx | 11 - include/sfx2/tabdlg.hxx | 2 include/svtools/editsyntaxhighlighter.hxx | 1 include/svx/dlgctrl.hxx | 16 -- include/svx/paraprev.hxx | 1 include/toolkit/helper/tkresmgr.hxx | 3 sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 8 - sd/source/ui/animations/CustomAnimationList.cxx | 14 -- sd/source/ui/animations/CustomAnimationList.hxx | 1 sfx2/source/dialog/tabdlg.cxx | 37 ----- sfx2/source/sidebar/ControlFactory.cxx | 15 -- sfx2/source/sidebar/SidebarToolBox.cxx | 41 ----- svtools/source/edit/editsyntaxhighlighter.cxx | 7 - svx/source/dialog/dlgctrl.cxx | 111 ---------------- svx/source/dialog/paraprev.cxx | 23 --- sw/source/ui/inc/numberingtypelistbox.hxx | 2 sw/source/ui/misc/numberingtypelistbox.cxx | 12 - toolkit/source/helper/tkresmgr.cxx | 12 - unusedcode.easy | 25 +++ 21 files changed, 26 insertions(+), 349 deletions(-)
New commits: commit bfafc8c3a137a98ad2cd939b11161f9961bc48d7 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Aug 10 11:17:05 2013 +0100 callcatcher: update unused code mostly ResId using ctors left stranded post .ui conversion Change-Id: I06689eea30ee9146ba05294f52056c0d263695f5 diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 91cb646..8393306 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -37,35 +37,6 @@ namespace dbaui using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; - - //==================================================================== - //= LargeEntryListBox - //==================================================================== - class LargeEntryListBox : public ListBox - { - public: - LargeEntryListBox( Window* _pParent, const ResId& _rId ); - - protected: - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - }; - - //-------------------------------------------------------------------- - LargeEntryListBox::LargeEntryListBox( Window* _pParent, const ResId& _rId ) - :ListBox(_pParent, _rId ) - { - EnableUserDraw(sal_True); - } - - //-------------------------------------------------------------------- - void LargeEntryListBox::UserDraw( const UserDrawEvent& _rUDEvt ) - { - if (LISTBOX_ENTRY_NOTFOUND == _rUDEvt.GetItemId()) - ListBox::UserDraw( _rUDEvt ); - else - _rUDEvt.GetDevice()->DrawText( _rUDEvt.GetRect(), GetEntry( _rUDEvt.GetItemId() ), TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER | TEXT_DRAW_ENDELLIPSIS); - } - //==================================================================== //= DirectSQLDialog //==================================================================== diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx index be66aecb3..af6d771 100644 --- a/include/sfx2/sidebar/ControlFactory.hxx +++ b/include/sfx2/sidebar/ControlFactory.hxx @@ -42,10 +42,6 @@ public: static CheckBox* CreateMenuButton (Window* pParentWindow); static ImageRadioButton* CreateTabItem (Window* pParentWindow); - - static ImageRadioButton* CreateCustomImageRadionButton( - Window* pParentWindow, - const ResId& rResId ); }; diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index ec63cc3..c3e01b8 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -41,16 +41,7 @@ class SFX2_DLLPUBLIC SidebarToolBox : public ToolBox { public: - /** Create a new tool box. - When a valid XFrame is given then the tool box will handle its - buttons and drop-downs. Otherwise the caller has to do that. - */ - SidebarToolBox ( - Window* pParentWindow, - const ResId& rResId, - const cssu::Reference<css::frame::XFrame>& rxFrame); - SidebarToolBox ( - Window* pParentWindow); + SidebarToolBox(Window* pParentWindow); virtual ~SidebarToolBox (void); using ToolBox::InsertItem; diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index ee8c1f6..9d31183 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -223,8 +223,6 @@ public: const SfxItemSet* GetExampleSet() const { return pExampleSet; } SfxViewFrame* GetViewFrame() const { return pFrame; } - void EnableApplyButton(sal_Bool bEnable = sal_True); - sal_Bool IsApplyButtonEnabled() const; void SetApplyHandler(const Link& _rHdl); SAL_DLLPRIVATE void Start_Impl(); diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx index 747d056..6f1adba 100644 --- a/include/svtools/editsyntaxhighlighter.hxx +++ b/include/svtools/editsyntaxhighlighter.hxx @@ -40,7 +40,6 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit public: MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL); - MultiLineEditSyntaxHighlight( Window* pParent, const ResId& rResId , HighlighterLanguage aLanguage = HIGHLIGHT_SQL); ~MultiLineEditSyntaxHighlight(); virtual void UpdateData(); diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 5056383..ed5a3e1 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -177,10 +177,9 @@ protected: void ChangePixel( sal_uInt16 nPixel ); public: - SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumber = 8 ); - SvxPixelCtl( Window* pParent, sal_uInt16 nNumber = 8 ); + SvxPixelCtl( Window* pParent, sal_uInt16 nNumber = 8 ); - ~SvxPixelCtl(); + ~SvxPixelCtl(); virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -224,7 +223,6 @@ class SVX_DLLPUBLIC HatchingLB : public ListBox { XHatchListRef mpList; public: - explicit HatchingLB(Window* pParent, ResId Id); explicit HatchingLB(Window* pParent, WinBits aWB); virtual void Fill( const XHatchListRef &pList ); @@ -239,7 +237,6 @@ class SVX_DLLPUBLIC GradientLB : public ListBox { XGradientListRef mpList; public: - explicit GradientLB(Window* pParent, ResId Id); explicit GradientLB(Window* pParent, WinBits aWB); virtual void Fill( const XGradientListRef &pList ); @@ -255,7 +252,6 @@ public: class SVX_DLLPUBLIC BitmapLB : public ListBox { public: - explicit BitmapLB(Window* pParent, ResId Id); explicit BitmapLB(Window* pParent, WinBits aWB); virtual void Fill(const XBitmapListRef &pList); @@ -308,7 +304,6 @@ private: bool mbAddStandardFields : 1; public: - LineLB(Window* pParent, ResId Id); LineLB(Window* pParent, WinBits aWB); virtual ~LineLB(); @@ -328,9 +323,8 @@ class SVX_DLLPUBLIC LineEndLB : public ListBox { public: - LineEndLB( Window* pParent, ResId Id ); - LineEndLB( Window* pParent, WinBits aWB ); - virtual ~LineEndLB (void); + LineEndLB( Window* pParent, WinBits aWB ); + virtual ~LineEndLB (void); virtual void Fill( const XLineEndListRef &pList, bool bStart = true ); @@ -391,7 +385,6 @@ private: Size maSymbolSize; public: - SvxXLinePreview( Window* pParent, const ResId& rResId ); SvxXLinePreview( Window* pParent ); virtual ~SvxXLinePreview(); @@ -417,7 +410,6 @@ private: SdrObject* mpRectangleObject; public: - SvxXRectPreview(Window* pParent, const ResId& rResId); SvxXRectPreview(Window* pParent); virtual ~SvxXRectPreview(); diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index 5f7fdfa..e0855ae 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -68,7 +68,6 @@ protected: void DrawParagraph( sal_Bool bAll ); public: - SvxParaPrevWindow( Window* pParent, const ResId& rId ); SvxParaPrevWindow( Window* pParent, WinBits nBits); void SetFirstLineOfst( short nNew ) { nFirstLineOfst = nNew; } diff --git a/include/toolkit/helper/tkresmgr.hxx b/include/toolkit/helper/tkresmgr.hxx index 362220a..8e9c07d 100644 --- a/include/toolkit/helper/tkresmgr.hxx +++ b/include/toolkit/helper/tkresmgr.hxx @@ -27,7 +27,6 @@ class SimpleResMgr; class ResMgr; #define TK_RES_STRING(id) TkResMgr::loadString(id) -#define TK_RES_IMAGE(id) TkResMgr::loadImage(id) // ----------------------------------------------------------------------------- // TkResMgr @@ -60,8 +59,6 @@ public: // loads the string with the specified resource id static OUString loadString( sal_uInt16 nResId ); - // loads the image with the specified resource id - static Image loadImage( sal_uInt16 nResId ); static Image getImageFromURL( const OUString& i_rImageURL ); }; diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 52e72c1..e9d7079 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -69,7 +69,6 @@ const int MISCEFFECTS = 4; class CategoryListBox : public ListBox { public: - CategoryListBox( Window* pParent, const ResId& rResId ); CategoryListBox( Window* pParent ); ~CategoryListBox(); @@ -87,13 +86,6 @@ private: Link maDoubleClickHdl; }; -CategoryListBox::CategoryListBox( Window* pParent, const ResId& rResId ) -: ListBox( pParent, rResId ) -{ - EnableUserDraw( sal_True ); - SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) ); -} - CategoryListBox::CategoryListBox( Window* pParent ) : ListBox( pParent, WB_TABSTOP | WB_BORDER ) { diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 40d759a..3554249 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -455,20 +455,6 @@ void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* ) // ==================================================================== -CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId, ICustomAnimationListController* pController ) -: SvTreeListBox( pParent, rResId ) -, mbIgnorePaint( false ) -, mpController( pController ) -, mpLastParentEntry(0) -{ - SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ); - - EnableContextMenuHandling(); - SetSelectionMode( MULTIPLE_SELECTION ); - SetIndent(16); - SetNodeDefaultImages(); -} - CustomAnimationList::CustomAnimationList( ::Window* pParent ) : SvTreeListBox( pParent, WB_TABSTOP | WB_BORDER ), mpController(0) diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index da4dae1..61a4867 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -46,7 +46,6 @@ class CustomAnimationList : public SvTreeListBox, public ISequenceListener friend struct stl_append_effect_func; public: - CustomAnimationList( ::Window* pParent, const ResId& rResId, ICustomAnimationListController* pController ); CustomAnimationList( ::Window* pParent ); virtual ~CustomAnimationList(); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index f6c3e12..2a9c605 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -731,43 +731,6 @@ void SfxTabDialog::SetApplyHandler(const Link& _rHdl) // ----------------------------------------------------------------------- -void SfxTabDialog::EnableApplyButton(sal_Bool bEnable) -{ - if ( IsApplyButtonEnabled() == bEnable ) - // nothing to do - return; - - // create or remove the apply button - if ( bEnable ) - { - m_pApplyBtn = new PushButton(m_pActionArea); - // in the z-order, the apply button should be behind the ok button, thus appearing at the right side of it - m_pApplyBtn->SetZOrder(m_pOKBtn, WINDOW_ZORDER_BEHIND); - m_pApplyBtn->SetText(SfxResId( STR_APPLY ).toString()); - m_pApplyBtn->Show(); - - m_pApplyBtn->SetHelpId( HID_TABDLG_APPLY_BTN ); - } - else - { - delete m_pApplyBtn; - m_pApplyBtn = NULL; - } - - // adjust the layout - if (IsReallyShown()) - AdjustLayout(); -} - -// ----------------------------------------------------------------------- - -sal_Bool SfxTabDialog::IsApplyButtonEnabled() const -{ - return ( NULL != m_pApplyBtn ); -} - -// ----------------------------------------------------------------------- - void SfxTabDialog::Start_Impl() { DBG_ASSERT( pImpl->aData.size() == m_pTabCtrl->GetPageCount(), "not all pages registered" ); diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx index 1b79267..ea5d19a 100644 --- a/sfx2/source/sidebar/ControlFactory.cxx +++ b/sfx2/source/sidebar/ControlFactory.cxx @@ -34,26 +34,11 @@ CheckBox* ControlFactory::CreateMenuButton (Window* pParentWindow) return new MenuButton(pParentWindow); } - - - ImageRadioButton* ControlFactory::CreateTabItem (Window* pParentWindow) { return new TabItem(pParentWindow); } - - - -ImageRadioButton* ControlFactory::CreateCustomImageRadionButton( - Window* pParentWindow, - const ResId& rResId ) -{ - return new CustomImageRadioButton( - pParentWindow, - rResId ); -} - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 8b0e899..6d93c5f 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -39,47 +39,6 @@ using ::rtl::OUString; namespace sfx2 { namespace sidebar { -SidebarToolBox::SidebarToolBox ( - Window* pParentWindow, - const ResId& rResId, - const cssu::Reference<css::frame::XFrame>& rxFrame) - : ToolBox(pParentWindow, rResId), - mbParentIsBorder(false), - maItemSeparator(Theme::GetImage(Theme::Image_ToolBoxItemSeparator)), - maControllers(), - mbAreHandlersRegistered(false) -{ - SetBackground(Wallpaper()); - SetPaintTransparent(true); - SetToolboxButtonSize( TOOLBOX_BUTTONSIZE_SMALL ); - - if (rxFrame.is()) - { - const sal_uInt16 nItemCount (GetItemCount()); - if (nItemCount == 1) - { - // When there is only one item then make that as wide as - // the tool box. - CreateController(GetItemId(0), rxFrame, GetSizePixel().Width()); - } - else - for (sal_uInt16 nItemIndex=0; nItemIndex<nItemCount; ++nItemIndex) - CreateController(GetItemId(nItemIndex), rxFrame, 0); - UpdateIcons(rxFrame); - - SetSizePixel(CalcWindowSizePixel()); - - RegisterHandlers(); - } - -#ifdef DEBUG - SetText(A2S("SidebarToolBox")); -#endif -} - - - - SidebarToolBox::SidebarToolBox (Window* pParentWindow) : ToolBox(pParentWindow, 0), mbParentIsBorder(false), diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index d3df007..fdb6f7b 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -32,13 +32,6 @@ MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, Win aHighlighter.initialize( aLanguage ); } -MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, const ResId& rResId , - HighlighterLanguage aLanguage): MultiLineEdit(pParent,rResId), mbDoBracketHilight(true) -{ - EnableUpdateData(300); - aHighlighter.initialize( aLanguage ); -} - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeMultiLineEditSyntaxHighlight(Window *pParent, VclBuilder::stringmap &) { return new MultiLineEditSyntaxHighlight(pParent); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index ba848b9..9c2178b 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -752,22 +752,6 @@ void SvxRectCtl::SetCS(CTL_STYLE eNew) // Control for editing bitmaps -SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumber ) : - Control ( pParent, rResId ), - nLines ( nNumber ), - bPaintable ( sal_True ) -{ - aRectSize = GetOutputSize(); - - SetPixelColor( Color( COL_BLACK ) ); - SetBackgroundColor( Color( COL_WHITE ) ); - SetLineColor( Application::GetSettings().GetStyleSettings().GetShadowColor() ); - - nSquares = nLines * nLines; - pPixel = new sal_uInt16[ nSquares ]; - memset(pPixel, 0, nSquares * sizeof(sal_uInt16)); -} - SvxPixelCtl::SvxPixelCtl(Window* pParent, sal_uInt16 nNumber) : Control(pParent, WB_BORDER) , nLines(nNumber) @@ -1030,13 +1014,6 @@ void FillAttrLB::Fill( const XColorListRef &pColorTab ) // Fills the listbox (provisional) with strings -HatchingLB::HatchingLB( Window* pParent, ResId Id) -: ListBox( pParent, Id ), - mpList ( NULL ) -{ - SetEdgeBlending(true); -} - HatchingLB::HatchingLB( Window* pParent, WinBits nWinStyle) : ListBox( pParent, nWinStyle ), mpList ( NULL ) @@ -1136,13 +1113,6 @@ void FillAttrLB::Fill( const XHatchListRef &pList ) // Fills the listbox (provisional) with strings -GradientLB::GradientLB( Window* pParent, ResId Id) -: ListBox( pParent, Id ), - mpList(NULL) -{ - SetEdgeBlending(true); -} - GradientLB::GradientLB( Window* pParent, WinBits aWB) : ListBox( pParent, aWB ), mpList(NULL) @@ -1266,13 +1236,6 @@ void FillAttrLB::Fill( const XGradientListRef &pList ) // BitmapLB Constructor -BitmapLB::BitmapLB(Window* pParent, ResId Id) -: ListBox(pParent, Id), - maBitmapEx(), - mpList(NULL) -{ - SetEdgeBlending(true); -} BitmapLB::BitmapLB( Window* pParent, WinBits aWB) : ListBox( pParent, aWB ), maBitmapEx(), @@ -1454,13 +1417,6 @@ void FillTypeLB::Fill() SetUpdateMode( sal_True ); } -LineLB::LineLB(Window* pParent, ResId Id) -: ListBox(pParent, Id), - mbAddStandardFields(true) -{ - // No EdgeBlending for LineStyle/Dash SetEdgeBlending(true); -} - LineLB::LineLB(Window* pParent, WinBits aWB) : ListBox(pParent, aWB), mbAddStandardFields(true) @@ -1568,12 +1524,6 @@ void LineLB::Modify( const XDashEntry& rEntry, sal_uInt16 nPos, const Bitmap& rB // Fills the listbox (provisional) with strings -LineEndLB::LineEndLB( Window* pParent, ResId Id ) - : ListBox( pParent, Id ) -{ - // No EdgeBlending for LineEnds SetEdgeBlending(true); -} - LineEndLB::LineEndLB( Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) { @@ -1828,55 +1778,6 @@ void SvxPreviewBase::DataChanged(const DataChangedEvent& rDCEvt) } } -SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId ) -: SvxPreviewBase( pParent, rResId ), - mpLineObjA( 0L ), - mpLineObjB( 0L ), - mpLineObjC( 0L ), - mpGraphic( 0L ), - mbWithSymbol( sal_False ) -{ - InitSettings( sal_True, sal_True ); - - const Size aOutputSize(GetOutputSize()); - const sal_Int32 nDistance(500L); - const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance)); - - // create DrawObjectA - const sal_Int32 aYPosA(aOutputSize.Height() / 2); - const basegfx::B2DPoint aPointA1( nDistance, aYPosA); - const basegfx::B2DPoint aPointA2( aPointA1.getX() + ((nAvailableLength * 14) / 20), aYPosA ); - basegfx::B2DPolygon aPolygonA; - aPolygonA.append(aPointA1); - aPolygonA.append(aPointA2); - mpLineObjA = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aPolygonA)); - mpLineObjA->SetModel(&getModel()); - - // create DrawObectB - const sal_Int32 aYPosB1((aOutputSize.Height() * 3) / 4); - const sal_Int32 aYPosB2((aOutputSize.Height() * 1) / 4); - const basegfx::B2DPoint aPointB1( aPointA2.getX() + nDistance, aYPosB1); - const basegfx::B2DPoint aPointB2( aPointB1.getX() + ((nAvailableLength * 2) / 20), aYPosB2 ); - const basegfx::B2DPoint aPointB3( aPointB2.getX() + ((nAvailableLength * 2) / 20), aYPosB1 ); - basegfx::B2DPolygon aPolygonB; - aPolygonB.append(aPointB1); - aPolygonB.append(aPointB2); - aPolygonB.append(aPointB3); - mpLineObjB = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonB)); - mpLineObjB->SetModel(&getModel()); - - // create DrawObectC - const basegfx::B2DPoint aPointC1( aPointB3.getX() + nDistance, aYPosB1); - const basegfx::B2DPoint aPointC2( aPointC1.getX() + ((nAvailableLength * 1) / 20), aYPosB2 ); - const basegfx::B2DPoint aPointC3( aPointC2.getX() + ((nAvailableLength * 1) / 20), aYPosB1 ); - basegfx::B2DPolygon aPolygonC; - aPolygonC.append(aPointC1); - aPolygonC.append(aPointC2); - aPolygonC.append(aPointC3); - mpLineObjC = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonC)); - mpLineObjC->SetModel(&getModel()); -} - void SvxXLinePreview::Resize() { SvxPreviewBase::Resize(); @@ -2017,18 +1918,6 @@ void SvxXLinePreview::Paint( const Rectangle& ) LocalPostPaint(); } -SvxXRectPreview::SvxXRectPreview( Window* pParent, const ResId& rResId ) -: SvxPreviewBase( pParent, rResId ), - mpRectangleObject(0) -{ - InitSettings(true, true); - - // create RectangleObject - const Rectangle aObjectSize(Point(), GetOutputSize()); - mpRectangleObject = new SdrRectObj(aObjectSize); - mpRectangleObject->SetModel(&getModel()); -} - SvxXRectPreview::SvxXRectPreview(Window* pParent) : SvxPreviewBase(pParent) , mpRectangleObject(0) diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index 8de4a37..adc29a3 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -23,29 +23,6 @@ // class SvxParaPrevWindow ----------------------------------------------- -SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, const ResId& rId ) : - - Window( pParent, rId ), - - nLeftMargin ( 0 ), - nRightMargin ( 0 ), - nFirstLineOfst ( 0 ), - nUpper ( 0 ), - nLower ( 0 ), - eAdjust ( SVX_ADJUST_LEFT ), - eLastLine ( SVX_ADJUST_LEFT ), - eLine ( SVX_PREV_LINESPACE_1 ), - nLineVal ( 0 ) - -{ - // Count in Twips by default - SetMapMode( MapMode( MAP_TWIP ) ); - - aSize = Size( 11905, 16837 ); - - SetBorderStyle( WINDOW_BORDER_MONO ); -} - SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, WinBits nBits) : Window( pParent, nBits), diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/ui/inc/numberingtypelistbox.hxx index 260fc05..7eaaa36 100644 --- a/sw/source/ui/inc/numberingtypelistbox.hxx +++ b/sw/source/ui/inc/numberingtypelistbox.hxx @@ -35,8 +35,6 @@ class SW_DLLPUBLIC SwNumberingTypeListBox : public ListBox SwNumberingTypeListBox_Impl* pImpl; public: - SwNumberingTypeListBox( Window* pWin, const ResId& rResId, - sal_uInt16 nTypeFlags = INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING|INSERT_NUM_TYPE_NO_NUMBERING|INSERT_NUM_EXTENDED_TYPES ); SwNumberingTypeListBox( Window* pWin, WinBits nStyle = WB_BORDER ); ~SwNumberingTypeListBox(); diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index c908fb6..224dab5 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -36,18 +36,6 @@ struct SwNumberingTypeListBox_Impl uno::Reference<text::XNumberingTypeInfo> xInfo; }; -SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, const ResId& rResId, - sal_uInt16 nTypeFlags ) : - ListBox(pWin, rResId), - pImpl(new SwNumberingTypeListBox_Impl) -{ - uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); - uno::Reference<text::XDefaultNumberingProvider> xDefNum = text::DefaultNumberingProvider::create(xContext); - - pImpl->xInfo = uno::Reference<text::XNumberingTypeInfo>(xDefNum, uno::UNO_QUERY); - Reload(nTypeFlags); -} - SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, WinBits nStyle ) : ListBox(pWin, nStyle), pImpl(new SwNumberingTypeListBox_Impl) diff --git a/toolkit/source/helper/tkresmgr.cxx b/toolkit/source/helper/tkresmgr.cxx index a9ed95eb..5b9fbce 100644 --- a/toolkit/source/helper/tkresmgr.cxx +++ b/toolkit/source/helper/tkresmgr.cxx @@ -77,18 +77,6 @@ OUString TkResMgr::loadString( sal_uInt16 nResId ) } // ----------------------------------------------------------------------------- -Image TkResMgr::loadImage( sal_uInt16 nResId ) -{ - Image aReturn; - - ensureImplExists(); - if ( m_pResMgr ) - aReturn = Image( ResId( nResId, *m_pResMgr ) ); - - return aReturn; -} - -// ----------------------------------------------------------------------------- Image TkResMgr::getImageFromURL( const OUString& i_rImageURL ) { if ( i_rImageURL.isEmpty() ) diff --git a/unusedcode.easy b/unusedcode.easy index d95c992..2b35769 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -4,13 +4,15 @@ (anonymous namespace)::StringTokenizer::getNextToken() (anonymous namespace)::VBATest::testMiscOLEStuff() AffineMatrixItem::GetAffineMatrix2D() const +BitmapWriteAccess::FillPolyPolygon(PolyPolygon const&) +BitmapWriteAccess::FillPolygon(Polygon 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&) -LineEndLB::LineEndLB(Window*, long) Menu::GetItemImageAngle(unsigned short) const Menu::GetItemImageMirrorMode(unsigned short) const Menu::GetLogo() const @@ -26,6 +28,9 @@ OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const OutputDevice::PixelToLogic(Region const&, MapMode const&) const RawBitmap::RawBitmap() RawBitmap::~RawBitmap() +RecentDocsView::SetHeight(long) +RecentDocsView::SetThumbnailSize(long, long) +RecentDocsView::loadRecentDocs() RscCompiler::Append(rtl::OString const&, rtl::OString const&) Ruler::GetPageWidth() const SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*) @@ -37,7 +42,11 @@ ScCellValue::hasNumeric() const ScCellValue::hasString() const ScCellValue::set(EditTextObject const&) ScCellValue::set(ScFormulaCell const&) +ScColorScaleEntry::UpdateMoveTab(short, short, short) ScColumn::MoveListeners(SvtBroadcaster&, int) +ScCompiler::IsCharWordChar(String const&, unsigned short, formula::FormulaGrammar::AddressConvention) +ScCompiler::IsWordChar(String const&, unsigned short, formula::FormulaGrammar::AddressConvention) +ScComplexRefData::IsDeleted() const ScDBQueryDataIterator::DataAccessInternal::setPos(unsigned long) ScDPFilteredCache::SingleFilter::getMatchValue() const ScDPObject::ParseFilters(ScDPGetPivotDataField&, std::__debug::vector<ScDPGetPivotDataField, std::allocator<ScDPGetPivotDataField> >&, rtl::OUString const&) @@ -46,11 +55,11 @@ ScDocument::GetCellCount(short, short) const ScDocument::GetFormulaTokens(ScAddress const&) const ScDocument::GetStringCell(ScAddress const&) const ScDocument::IsEmptyData(short, short) const +ScEditUtil::GetSpaceDelimitedString(EditTextObject const&) ScExtIButton::GetSelected() const ScFormulaCell::GetResultDouble() const ScFormulaCell::HasColRowName() const ScFormulaCell::IsSharedInvariant() const -ScFormulaCell::SetResultToken(formula::FormulaToken const*) ScGlobal::GetStandardFormat(double, SvNumberFormatter&, unsigned long, short) ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>&, rtl::OUString const&, ScDocument const*, formula::FormulaGrammar::AddressConvention, unsigned short, unsigned short) ScRefCellValue::commit(ScColumn&, int) const @@ -60,12 +69,14 @@ ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any cons ServerFont::GetGlyphBitmap1(int, RawBitmap&) const ServerFont::GetGlyphBitmap8(int, RawBitmap&) const SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*) +SfxGrabBagItem::SetGrabBag(std::__debug::map<rtl::OUString, com::sun::star::uno::Any, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, com::sun::star::uno::Any> > > const&) SfxTemplatePanelControl::GetISfxTemplateCommon() SfxTemplatePanelControl::SetParagraphFamily() SmFontPickList::Contains(Font const&) const StatusBar::CopyItems(StatusBar const&) StatusBar::HideItems() StatusBar::ShowItems() +String::Equals(unsigned short const*, unsigned short, unsigned short) const SvFileStream::GetFileHandle() const SvdProgressInfo::ReportError() SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short) @@ -82,12 +93,13 @@ SvtAccessibilityOptions::SetPreviewUsesCheckeredBackground(unsigned char) SvxGalleryItem::SvxGalleryItem(unsigned short) SvxNumRule::Create(SvStream&) SvxNumberFormat::Create(SvStream&) +SwFont::SwFont() Test::test1Table1Page() TextEngine::GetLeftMargin() const ThumbnailView::DeselectItem(unsigned short) ThumbnailView::GetItemText(unsigned short) const ThumbnailView::SetColor(Color const&) -TkResMgr::loadImage(unsigned short) +UnoControlBase::ImplGetPropertyValue_INT64(unsigned short) VclMultiLineEdit::SetTextSelectable(bool) apitest::XCellRangesQuery::testQueryFormulaCells() apitest::XDataPilotDescriptor::testGetHiddenFields() @@ -126,11 +138,12 @@ comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<co comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const connectivity::file::OStatement_Base::reset() -connectivity::firebird::OPreparedStatement::checkParameterIndex(int) 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::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char) connectivity::sdbcx::OGroup::OGroup(unsigned char) dbtools::DBTypeConversion::getMsFromTime(com::sun::star::util::Time const&) +dbtools::DBTypeConversion::toINT32(com::sun::star::util::Date const&) +dbtools::DBTypeConversion::toINT64(com::sun::star::util::Time const&) drawinglayer::attribute::FontAttribute::isDefault() const drawinglayer::attribute::MaterialAttribute3D::isDefault() const drawinglayer::attribute::Sdr3DLightAttribute::isDefault() const @@ -159,6 +172,8 @@ 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::fillDurationComboBox(ListBox*) +sd::fillRepeatComboBox(ListBox*) 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&) @@ -187,6 +202,8 @@ sfx2::sidebar::SidebarController::ShowDetailMenu(rtl::OUString const&) const sfx2::sidebar::SidebarDockingWindow::GetChildWindow() sfx2::sidebar::SidebarPanelBase::GetControl() const sfx2::sidebar::SidebarPanelBase::SetControl(Window*) +sfx2::sidebar::SidebarToolBox::SetBorderWindow(Window const*) +sfx2::sidebar::ToolBoxBackground::ToolBoxBackground(Window*, bool) 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>)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits