diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-06-23 22:40:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 14:19:01 +0100 |
commit | efa55cfd745843990503dea40995e78907611c6e (patch) | |
tree | d10e078639acf171f69065edce335dabd0d55af6 | |
parent | 467926acd3bfff2975f330d3550abf161dc5b4f5 (diff) |
callcatcher: update unused code
Change-Id: I65c19a21ae9b6deb1601adf2f3fe8fe8faa7e9ed
-rw-r--r-- | Makefile.top | 1 | ||||
-rw-r--r-- | sc/source/filter/inc/formulabuffer.hxx | 1 | ||||
-rw-r--r-- | sc/source/filter/inc/sheetdatabuffer.hxx | 7 | ||||
-rw-r--r-- | sc/source/filter/inc/worksheethelper.hxx | 3 | ||||
-rw-r--r-- | sc/source/filter/oox/formulabuffer.cxx | 13 | ||||
-rw-r--r-- | sc/source/filter/oox/sheetdatabuffer.cxx | 11 | ||||
-rw-r--r-- | sc/source/filter/oox/worksheethelper.cxx | 15 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLStylesImportHelper.cxx | 41 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLStylesImportHelper.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaformat.hxx | 1 | ||||
-rw-r--r-- | sw/inc/docary.hxx | 1 | ||||
-rw-r--r-- | sw/source/core/doc/docnew.cxx | 6 | ||||
-rwxr-xr-x | unusedcode.easy | 8 | ||||
-rw-r--r-- | vcl/inc/vcl/syschild.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/toolbox.hxx | 3 | ||||
-rw-r--r-- | vcl/source/window/syschild.cxx | 14 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 95 |
17 files changed, 3 insertions, 220 deletions
diff --git a/Makefile.top b/Makefile.top index 70cce8a6f508..4e8c97617350 100644 --- a/Makefile.top +++ b/Makefile.top @@ -478,6 +478,7 @@ findunusedcode: | grep -v ^lucene:: \ | grep -v ^Matrix3d:: \ | grep -v ^salhelper:: \ + | grep -v ^VSDInternalStream:: \ | grep -v ^WP1 \ | grep -v ^WP3 \ | grep -v ^WP42 \ diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index 0097dc7cb037..a0b96ce6d558 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -71,7 +71,6 @@ typedef ::std::map< sal_Int32, std::vector< ValueAddressPair > > FormulaValueMap void createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ); ::com::sun::star::uno::Reference< com::sun::star::table::XCellRange > getRange( const ::com::sun::star::table::CellRangeAddress& rRange); - ::com::sun::star::uno::Reference< com::sun::star::table::XCell > getCell( ::com::sun::star::table::CellAddress& rAddress ); com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheet > mxCurrSheet; FormulaDataMap cellFormulas; ArrayFormulaDataMap cellArrayFormulas; diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index c840bc17f33a..898d03949256 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -187,8 +187,6 @@ public: void setErrorCell( const CellModel& rModel, sal_uInt8 nErrorCode ); /** Inserts a formula cell into the sheet. */ void setFormulaCell( const CellModel& rModel, const ApiTokenSequence& rTokens ); - /** Inserts a shared formula cell into the sheet (OOXML only). */ - void setFormulaCell( const CellModel& rModel, sal_Int32 nSharedId ); /** Inserts the passed token array as array formula. */ void createArrayFormula( @@ -198,11 +196,6 @@ public: void createTableOperation( const ::com::sun::star::table::CellRangeAddress& rRange, const DataTableModel& rModel ); - /** Creates a named range with a special name for a shared formula with the - specified identifier and formula definition (OOXML only). */ - void createSharedFormula( - sal_Int32 nSharedId, - const ApiTokenSequence& rTokens ); /** Creates a named range with a special name for a shared formula with the specified base address and formula definition (BIFF only). */ diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 02422633d5b8..d1cbf09bef32 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -293,9 +293,6 @@ public: void putValue( const ::com::sun::star::table::CellAddress& rAddress, double fValue ) const; - void putFormulaResult( - const ::com::sun::star::table::CellAddress& rAddress, - double fValue ) const; /** Inserts a string cell directly into the Calc sheet. */ void putString( diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index a82e19551792..f2f1d69023ac 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -48,19 +48,6 @@ Reference< XCellRange > FormulaBuffer::getRange( const CellRangeAddress& rRange) return xRange; } -Reference< XCell > FormulaBuffer::getCell( CellAddress& rAddress ) -{ - Reference< XCell > xCell; - try - { - xCell = mxCurrSheet->getCellByPosition( rAddress.Column, rAddress.Row ); - } - catch( Exception& ) - { - } - return xCell; -} - void FormulaBuffer::finalizeImport() { ISegmentProgressBarRef xFormulaBar = getProgressBar().createSegment( getProgressBar().getFreeLength() ); diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 3f0aea4b3aae..0ce3594eb183 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -329,12 +329,6 @@ void SheetDataBuffer::setFormulaCell( const CellModel& rModel, const ApiTokenSeq setCellFormat( rModel ); } -void SheetDataBuffer::setFormulaCell( const CellModel& rModel, sal_Int32 nSharedId ) -{ - setCellFormula( rModel.maCellAddr, resolveSharedFormula( BinAddress( nSharedId, 0 ) ) ); - setCellFormat( rModel ); -} - void SheetDataBuffer::createArrayFormula( const CellRangeAddress& rRange, const ApiTokenSequence& rTokens ) { /* Array formulas will be inserted later in finalizeImport(). This is @@ -351,11 +345,6 @@ void SheetDataBuffer::createTableOperation( const CellRangeAddress& rRange, cons maTableOperations.push_back( TableOperation( rRange, rModel ) ); } -void SheetDataBuffer::createSharedFormula( sal_Int32 nSharedId, const ApiTokenSequence& rTokens ) -{ - createSharedFormula( BinAddress( nSharedId, 0 ), rTokens ); -} - void SheetDataBuffer::createSharedFormula( const CellAddress& rCellAddr, const ApiTokenSequence& rTokens ) { createSharedFormula( BinAddress( rCellAddr ), rTokens ); diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 0bb8ba2887e1..cc2eb634d491 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1534,21 +1534,6 @@ void WorksheetHelper::putValue( const CellAddress& rAddress, double fValue ) con getScDocument().SetValue( aAddress.Col(), aAddress.Row(), aAddress.Tab(), fValue ); } -void WorksheetHelper::putFormulaResult( const CellAddress& rAddress, double fValue ) const -{ - ScDocument& rDoc = getScDocument(); - ScAddress aCellPos; - ScUnoConversion::FillScAddress( aCellPos, rAddress ); - ScBaseCell* pBaseCell = rDoc.GetCell( aCellPos ); - if ( pBaseCell->GetCellType() == CELLTYPE_FORMULA ) - { - ScFormulaCell* pCell = static_cast< ScFormulaCell* >( pBaseCell ); - pCell->SetHybridDouble( fValue ); - pCell->ResetDirty(); - pCell->ResetChanged(); - } -} - void WorksheetHelper::setCellFormulaValue( const ::com::sun::star::table::CellAddress& rAddress, double fValue ) { diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 1ae7ef01d150..56d30e2650c8 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -144,35 +144,6 @@ void ScMyStyleRanges::AddCurrencyRange(const ScRange& rRange, aItr->mpRanges->addRange(rRange); } -void ScMyStyleRanges::InsertRow(const sal_Int32 nRow, const sal_Int32 nTab, ScDocument* /*pDoc*/) -{ - if (mpTextList) - mpTextList->insertRow(static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab)); - if (mpNumberList) - mpNumberList->insertRow(static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab)); - if (mpTimeList) - mpTimeList->insertRow(static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab)); - if (mpDateTimeList) - mpDateTimeList->insertRow(static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab)); - if (mpPercentList) - mpPercentList->insertRow(static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab)); - if (mpLogicalList) - mpLogicalList->insertRow(static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab)); - if (mpUndefinedList) - mpUndefinedList->insertRow(static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab)); - - if (pCurrencyList) - { - ScMyCurrencyStylesSet::iterator aItr(pCurrencyList->begin()); - ScMyCurrencyStylesSet::iterator aEndItr(pCurrencyList->end()); - while (aItr != aEndItr) - { - aItr->mpRanges->insertRow(static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab)); - ++aItr; - } - } -} - void ScMyStyleRanges::InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* /*pDoc*/) { if (mpTextList) @@ -502,18 +473,6 @@ void ScMyStylesImportHelper::AddCell(const ScAddress& rAddress) AddRange(aScRange); } -void ScMyStylesImportHelper::InsertRow(const sal_Int32 nRow, const sal_Int32 nTab, ScDocument* pDoc) -{ - ScXMLImport::MutexGuard aGuard(rImport); - ScMyStylesSet::iterator aItr(aCellStyles.begin()); - ScMyStylesSet::iterator aEndItr(aCellStyles.end()); - while (aItr != aEndItr) - { - aItr->xRanges->InsertRow(nRow, nTab, pDoc); - ++aItr; - } -} - void ScMyStylesImportHelper::InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc) { ScXMLImport::MutexGuard aGuard(rImport); diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index c5bf5d315522..6a988d061fae 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -115,7 +115,6 @@ public: void AddCurrencyRange(const ScRange& rRange, const rtl::OUString* pStyleName, const rtl::OUString* pCurrency, ScXMLImport& rImport, const sal_uInt32 nMaxRanges); - void InsertRow(const sal_Int32 nRow, const sal_Int32 nTab, ScDocument* pDoc); void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); void SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport); }; @@ -178,7 +177,6 @@ public: rtl::OUString* pCurrency, const sal_Int16 nCellType); void AddRange(const ScRange& rRange); void AddCell(const ScAddress& rAddress); - void InsertRow(const sal_Int32 nRow, const sal_Int32 nTab, ScDocument* pDoc); // a row is inserted before nRow void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); // a col is inserted before nCol void EndTable(); void SetStylesToRanges(); diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index d2c0e0908135..f5520116631b 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -70,7 +70,6 @@ public: ScVbaFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( css::script::BasicErrorException ); virtual ~ScVbaFormat() {} virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() = 0; - css::uno::Reference< css::lang::XServiceInfo > getXServiceInfo() { return mxServiceInfo; } void SAL_CALL setAddIndent( const css::uno::Any& _BAddIndent) throw( css::uno::RuntimeException ) { _BAddIndent >>= mbAddIndent; } css::uno::Any SAL_CALL getAddIndent() throw( css::uno::RuntimeException ) { return css::uno::makeAny( mbAddIndent ); } // Interface Methods diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 6c7f99402d03..86b5bd8b33f3 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -102,7 +102,6 @@ public: virtual size_t GetFmtCount() const { return size(); } virtual SwFmt* GetFmt(size_t idx) const { return (SwFmt*)operator[](idx); } sal_uInt16 GetPos(const SwTxtFmtColl* pFmt) const; - bool Contains(const SwTxtFmtColl* pFmt) const; virtual ~SwTxtFmtColls() {} }; diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index d95cbaa3dfc0..3f9f6e4783cb 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -1280,16 +1280,10 @@ sal_uInt16 SwTxtFmtColls::GetPos(const SwTxtFmtColl* p) const return it == end() ? USHRT_MAX : it - begin(); } -bool SwTxtFmtColls::Contains(const SwTxtFmtColl* p) const -{ - return std::find(begin(), end(), p) != end(); -} - sal_uInt16 SwGrfFmtColls::GetPos(const SwGrfFmtColl* p) const { const_iterator it = std::find(begin(), end(), p); return it == end() ? USHRT_MAX : it - begin(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index ffc27a2fe4d5..be8bcde81085 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,4 +1,4 @@ -FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool) +FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool) HTMLControls::Insert(HTMLControl const*&, unsigned short&) HTMLControls::Insert(HTMLControl const**, unsigned short) HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short) @@ -56,14 +56,11 @@ ScValidationEntries_Impl::Insert(ScValidationData* const*, unsigned short) ScValidationEntries_Impl::Insert(ScValidationEntries_Impl const*, unsigned short, unsigned short) ScValidationEntries_Impl::Remove(ScValidationData* const&, unsigned short) ScValidationEntries_Impl::Remove(unsigned short, unsigned short) -ScVbaFormat<ooo::vba::excel::XRange>::getXServiceInfo() ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&) ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() -ScVbaFormat<ooo::vba::excel::XStyle>::getXServiceInfo() ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&) SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>) -SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short) SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&) SpinButton::SpinButton(Window*, ResId const&) SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short) @@ -74,6 +71,7 @@ String::String(rtl::OString const&, unsigned short, unsigned int) String::String(unsigned short const*) SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char) SvPtrarr::Replace(void* const*, unsigned short, unsigned short) +SvPtrarr::_ForEach(unsigned short, unsigned short, unsigned char (*)(void* const&, void*), void*) SvStringsISortDtor::Insert(String* const*, unsigned short) SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*) @@ -163,7 +161,6 @@ SwSortTableLines::Insert(SwTableLine* const&, unsigned short&) SwSortTableLines::Insert(SwTableLine* const*, unsigned short) SwSortTableLines::Remove(SwTableLine* const&, unsigned short) SwSortTableLines::Remove(unsigned short, unsigned short) -SwTOXMarks::DeleteAndDestroy(unsigned short, unsigned short) SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short) SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&) SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short) @@ -198,7 +195,6 @@ SwpHtStart::Insert(SwTxtAttr const*&, unsigned short&) SwpHtStart::Insert(SwTxtAttr const**, unsigned short) SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short) SwpHtStart::Remove(SwTxtAttr const*&, unsigned short) -SystemChildWindow::SystemChildWindow(Window*, ResId const&) TempFile::IsValid() const TextEngine::GetLeftMargin() const TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&) diff --git a/vcl/inc/vcl/syschild.hxx b/vcl/inc/vcl/syschild.hxx index 6dacf76c10a1..6cbc417a0180 100644 --- a/vcl/inc/vcl/syschild.hxx +++ b/vcl/inc/vcl/syschild.hxx @@ -55,7 +55,6 @@ public: SystemChildWindow( Window* pParent, WinBits nStyle = 0 ); // create a SystemChildWindow using the given SystemWindowData SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, sal_Bool bShow = sal_True ); - SystemChildWindow( Window* pParent, const ResId& rResId ); ~SystemChildWindow(); const SystemEnvData* GetSystemData() const; diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index d812dfc9ac6d..c35c6a968f86 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -331,9 +331,6 @@ public: static SAL_DLLPRIVATE void ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode ); static SAL_DLLPRIVATE sal_uInt16 ImplFindItemPos( ToolBox* pBox, const Point& rPos ); static SAL_DLLPRIVATE sal_uInt16 ImplFindItemPos( const ImplToolItem* pItem, const std::vector< ImplToolItem >& rList ); - static SAL_DLLPRIVATE void ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, sal_Bool bBlack, sal_Bool bColTransform, - sal_Bool bLeft = sal_False, sal_Bool bTop = sal_False, - long nSize = 6 ); static SAL_DLLPRIVATE void ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight ); static SAL_DLLPRIVATE sal_uInt16 ImplCountLineBreaks( const ToolBox *pThis ); SAL_DLLPRIVATE ImplToolBoxPrivateData* ImplGetToolBoxPrivateData() const { return mpData; } diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 752bf43009bc..4022f2cefd7f 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -152,20 +152,6 @@ SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWin // ----------------------------------------------------------------------- -SystemChildWindow::SystemChildWindow( Window* pParent, const ResId& rResId ) : - Window( WINDOW_SYSTEMCHILDWINDOW ) -{ - rResId.SetRT( RSC_WINDOW ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInitSysChild( pParent, nStyle, NULL ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - -// ----------------------------------------------------------------------- - SystemChildWindow::~SystemChildWindow() { Hide(); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 5ddafaf769dd..be3ddb296207 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2924,101 +2924,6 @@ static void ImplDrawDropdownArrow( ToolBox *pBox, const Rectangle& rDropDownRect pBox->SetLineColor( ); } -void ToolBox::ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, sal_Bool bBlack, sal_Bool bColTransform, - sal_Bool bLeft, sal_Bool bTop, long nSize ) -{ - Color aOldFillColor = pBox->GetFillColor(); - WindowAlign eAlign = pBox->meAlign; - long n = 0; - long nHalfSize; - if ( bLeft ) - eAlign = WINDOWALIGN_RIGHT; - else if ( bTop ) - eAlign = WINDOWALIGN_BOTTOM; - - nHalfSize = nSize/2; - - switch ( eAlign ) - { - case WINDOWALIGN_LEFT: - if ( bBlack ) - pBox->SetFillColor( Color( bColTransform ? COL_WHITE : COL_BLACK ) ); - while ( n <= nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+n, nY+n, nX+n, nY+nSize-n ) ); - n++; - } - if ( bBlack ) - { - pBox->SetFillColor( aOldFillColor ); - n = 1; - while ( n < nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+n, nY+1+n, nX+n, nY+nSize-1-n ) ); - n++; - } - } - break; - case WINDOWALIGN_TOP: - if ( bBlack ) - pBox->SetFillColor( Color( bColTransform ? COL_WHITE : COL_BLACK ) ); - while ( n <= nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+n, nY+n, nX+nSize-n, nY+n ) ); - n++; - } - if ( bBlack ) - { - pBox->SetFillColor( aOldFillColor ); - n = 1; - while ( n < nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+1+n, nY+n, nX+nSize-1-n, nY+n ) ); - n++; - } - } - break; - case WINDOWALIGN_RIGHT: - if ( bBlack ) - pBox->SetFillColor( Color( bColTransform ? COL_WHITE : COL_BLACK ) ); - while ( n <= nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+nHalfSize-n, nY+n, nX+nHalfSize-n, nY+nSize-n ) ); - n++; - } - if ( bBlack ) - { - pBox->SetFillColor( aOldFillColor ); - n = 1; - while ( n < nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+nHalfSize-n, nY+1+n, nX+nHalfSize-n, nY+nSize-1-n ) ); - n++; - } - } - break; - case WINDOWALIGN_BOTTOM: - if ( bBlack ) - pBox->SetFillColor( Color( bColTransform ? COL_WHITE : COL_BLACK ) ); - while ( n <= nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+n, nY+nHalfSize-n, nX+nSize-n, nY+nHalfSize-n ) ); - n++; - } - if ( bBlack ) - { - pBox->SetFillColor( aOldFillColor ); - n = 1; - while ( n < nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+1+n, nY+nHalfSize-n, nX+nSize-1-n, nY+nHalfSize-n ) ); - n++; - } - } - break; - } -} - // ----------------------------------------------------------------------- void ToolBox::ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight ) |