diff options
-rw-r--r-- | cui/source/customize/cfg.cxx | 56 | ||||
-rw-r--r-- | cui/source/inc/cfg.hxx | 2 | ||||
-rw-r--r-- | editeng/inc/editeng/lcolitem.hxx | 1 | ||||
-rw-r--r-- | editeng/source/items/textitem.cxx | 7 | ||||
-rw-r--r-- | svtools/inc/svtools/ivctrl.hxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 8 | ||||
-rw-r--r-- | svx/inc/svx/dlgctl3d.hxx | 1 | ||||
-rw-r--r-- | svx/inc/svx/fntctrl.hxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/dlgctl3d.cxx | 11 | ||||
-rw-r--r-- | svx/source/dialog/fntctrl.cxx | 23 | ||||
-rw-r--r-- | unusedcode.easy | 13 |
11 files changed, 0 insertions, 128 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 5103e299c9e7..0fae48f193b8 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -5697,60 +5697,4 @@ SvxIconChangeDialog::SvxIconChangeDialog( aLineEditDescription.SetText(aMessage); } -BitmapEx SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize) -{ - Point aEmptyPoint(0,0); - double imgposX = 0; - double imgposY = 0; - BitmapEx aRet = aBitmap; - double imgOldWidth = aRet.GetSizePixel().Width(); - double imgOldHeight =aRet.GetSizePixel().Height(); - - Size aScaledSize; - if (imgOldWidth >= aStandardSize || imgOldHeight >= aStandardSize) - { - sal_Int32 imgNewWidth = 0; - sal_Int32 imgNewHeight = 0; - - if (imgOldWidth >= imgOldHeight) - { - imgNewWidth = aStandardSize; - imgNewHeight = sal_Int32(imgOldHeight / (imgOldWidth / aStandardSize) + 0.5); - imgposX = 0; - imgposY = (aStandardSize - (imgOldHeight / (imgOldWidth / aStandardSize) + 0.5)) / 2 + 0.5; - } - else - { - imgNewHeight = aStandardSize; - imgNewWidth = sal_Int32(imgOldWidth / (imgOldHeight / aStandardSize) + 0.5); - imgposY = 0; - imgposX = (aStandardSize - (imgOldWidth / (imgOldHeight / aStandardSize) + 0.5)) / 2 + 0.5; - } - - aScaledSize = Size( imgNewWidth, imgNewHeight ); - aRet.Scale( aScaledSize, BMP_SCALE_INTERPOLATE ); - } - else - { - imgposX = (aStandardSize - imgOldWidth) / 2 + 0.5; - imgposY = (aStandardSize - imgOldHeight) / 2 + 0.5; - } - - Size aStdSize( aStandardSize, aStandardSize ); - Rectangle aRect(aEmptyPoint, aStdSize ); - - VirtualDevice aVirDevice( *Application::GetDefaultDevice(), 0, 1 ); - aVirDevice.SetOutputSizePixel( aStdSize ); - aVirDevice.SetFillColor( COL_TRANSPARENT ); - aVirDevice.SetLineColor( COL_TRANSPARENT ); - - //draw a rect into virDevice - aVirDevice.DrawRect( aRect ); - Point aPointPixel( (long)imgposX, (long)imgposY ); - aVirDevice.DrawBitmapEx( aPointPixel, aRet ); - aRet = aVirDevice.GetBitmapEx( aEmptyPoint, aStdSize ); - - return aRet; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 9bb95b62eafe..037a68c8ca7f 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -764,8 +764,6 @@ private: void ImportGraphics( const com::sun::star::uno::Sequence< rtl::OUString >& aURLs ); - BitmapEx AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize); - public: SvxIconSelectorDialog( diff --git a/editeng/inc/editeng/lcolitem.hxx b/editeng/inc/editeng/lcolitem.hxx index f8561b93d184..5af82bc7a6f7 100644 --- a/editeng/inc/editeng/lcolitem.hxx +++ b/editeng/inc/editeng/lcolitem.hxx @@ -44,7 +44,6 @@ public: TYPEINFO(); SvxLineColorItem( const sal_uInt16 nId ); - SvxLineColorItem( const Color& aColor, const sal_uInt16 nId ); SvxLineColorItem( const SvxLineColorItem& rCopy ); ~SvxLineColorItem(); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index ba0d20b03e35..1fab9391d4be 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2770,13 +2770,6 @@ SvxLineColorItem::SvxLineColorItem( const sal_uInt16 nId ) : // ----------------------------------------------------------------------- -SvxLineColorItem::SvxLineColorItem( const Color& rCol, const sal_uInt16 nId ) : - SvxColorItem( rCol, nId ) -{ -} - -// ----------------------------------------------------------------------- - SvxLineColorItem::SvxLineColorItem( const SvxLineColorItem &rCopy ) : SvxColorItem( rCopy ) { diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx index ba3daeed58f4..8abaae60473d 100644 --- a/svtools/inc/svtools/ivctrl.hxx +++ b/svtools/inc/svtools/ivctrl.hxx @@ -147,8 +147,6 @@ public: sal_Bool IsCursored() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); } sal_Bool IsDropTarget() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); } sal_Bool IsBlockingEmphasis() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); } - sal_Bool WasMoved() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_POS_MOVED) !=0); } - void SetMoved( sal_Bool bMoved ); sal_Bool IsPosLocked() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); } void LockPos( sal_Bool bLock ); // Nur bei AutoArrange gesetzt. Den Kopf der Liste gibts per SvxIconChoiceCtrl::GetPredecessorHead diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 7f1b374cb34a..b16ebc4d6405 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -64,14 +64,6 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( sal_uInt16 _nFlags ) pflink = 0; } -void SvxIconChoiceCtrlEntry::SetMoved( sal_Bool bMoved ) -{ - if( bMoved ) - nFlags |= ICNVIEW_FLAG_POS_MOVED; - else - nFlags &= ~ICNVIEW_FLAG_POS_MOVED; -} - void SvxIconChoiceCtrlEntry::LockPos( sal_Bool bLock ) { if( bLock ) diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx index 2f910dd4d1e4..63161b1b72c8 100644 --- a/svx/inc/svx/dlgctl3d.hxx +++ b/svx/inc/svx/dlgctl3d.hxx @@ -176,7 +176,6 @@ private: public: SvxLightCtl3D( Window* pParent, const ResId& rResId); - SvxLightCtl3D( Window* pParent, WinBits nStyle = 0); ~SvxLightCtl3D(); // react to size changes diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index 6a5c32fa25dc..723c2fd21f46 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -57,7 +57,6 @@ private: SVX_DLLPRIVATE void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); public: - SvxFontPrevWindow( Window* pParent ); SvxFontPrevWindow( Window* pParent, const ResId& rId ); virtual ~SvxFontPrevWindow(); @@ -77,11 +76,8 @@ public: void SetBackColor( const Color& rColor ); void UseResourceText( sal_Bool bUse = sal_True ); void SetDrawBaseLine( sal_Bool bSet = sal_True ); - void SetPreviewBackgroundToCharacter( sal_Bool bSet = sal_True ); void Paint( const Rectangle& ); - sal_Bool IsTwoLines() const; - void SetTwoLines(sal_Bool bSet); void SetNoLines(sal_Bool bSet); void SetBrackets(sal_Unicode cStart, sal_Unicode cEnd); diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 09df1e8235b4..04f03442eee0 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -996,17 +996,6 @@ SvxLightCtl3D::SvxLightCtl3D( Window* pParent, const ResId& rResId) Init(); } -SvxLightCtl3D::SvxLightCtl3D( Window* pParent, WinBits nStyle ) -: Control(pParent, nStyle), - maLightControl(this, 0), - maHorScroller(this, WB_HORZ | WB_DRAG), - maVerScroller(this, WB_VERT | WB_DRAG), - maSwitcher(this, 0) -{ - // init members - Init(); -} - void SvxLightCtl3D::Init() { // #i58240# set HelpIDs for scrollbars and switcher diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index c9548d92001d..4c795fcd8b8f 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -520,12 +520,6 @@ void SvxFontPrevWindow::Init() SetBorderStyle( WINDOW_BORDER_MONO ); } -SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent ) : - Window( pParent ) -{ - Init(); -} - SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) : Window( pParent, rId ) { @@ -654,13 +648,6 @@ void SvxFontPrevWindow::SetDrawBaseLine( sal_Bool bSet ) // ----------------------------------------------------------------------- -void SvxFontPrevWindow::SetPreviewBackgroundToCharacter(sal_Bool bSet) -{ - pImpl->bPreviewBackgroundToCharacter = bSet; -} - -// ----------------------------------------------------------------------- - void SvxFontPrevWindow::Paint( const Rectangle& ) { Printer* pPrinter = pImpl->pPrinter; @@ -851,16 +838,6 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) } } -sal_Bool SvxFontPrevWindow::IsTwoLines() const -{ - return pImpl->bTwoLines; -} - -void SvxFontPrevWindow::SetTwoLines(sal_Bool bSet) -{ - pImpl->bTwoLines = bSet; -} - void SvxFontPrevWindow::SetNoLines(sal_Bool bSet) { pImpl->bNoLines = bSet; diff --git a/unusedcode.easy b/unusedcode.easy index f3513fe17ac7..e3e59cbd505f 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -58,15 +58,10 @@ CalendarWrapper::setFirstDayOfWeek(short) CalendarWrapper::setMinimumNumberOfDaysForFirstWeek(short) CertificateContainer::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&) CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char) -CharClass::isAlpha(String const&) const -CharClass::isAlphaNumeric(String const&) const -CharClass::isAsciiAlphaNumeric(String const&) -CharClass::toLower(rtl::OUString&) const CharPosArray::Insert(CharPosArray const*, unsigned short, unsigned short, unsigned short) CharPosArray::Replace(int const&, unsigned short) CharPosArray::Replace(int const*, unsigned short, unsigned short) CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*) -CloneList::Count() const Color::IncreaseContrast(unsigned char) ComboBox::SetTopEntry(unsigned short) CommunicationLinkList::DeleteAndDestroy(unsigned short, unsigned short) @@ -928,10 +923,6 @@ SvxEditSourceHint::SetEndValue(unsigned long) SvxEditSourceHint::SetStartValue(unsigned long) SvxEditSourceHint::SetValue(unsigned long) SvxFont::DrawText(OutputDevice*, Point const&, String const&, unsigned short, unsigned short) const -SvxFontPrevWindow::IsTwoLines() const -SvxFontPrevWindow::SetNoLines(unsigned char) -SvxFontPrevWindow::SetPreviewBackgroundToCharacter(unsigned char) -SvxFontPrevWindow::SvxFontPrevWindow(Window*) SvxFrameDirectionItem::SvxFrameDirectionItem(unsigned short) SvxGrafToolBoxControl::RegisterControl(unsigned short, SfxModule*) SvxGraphCtrlAccessibleContext::checkChildIndex(long) @@ -942,13 +933,9 @@ SvxHtmlOptions::RemoveListenerLink(Link const&) SvxHyperlinkTabPageBase::FileExists(INetURLObject const&) SvxIMapDlg::GetTargetList() const SvxIconChoiceCtrlEntry::LockPos(unsigned char) -SvxIconChoiceCtrlEntry::SetMoved(unsigned char) -SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx&, long) SvxInsertStatusBarControl::GetDefItemWidth(StatusBar const&) SvxJustifyMethodItem::SvxJustifyMethodItem(unsigned short) SvxLanguageBox::SvxLanguageBox(Window*, long, unsigned char) -SvxLightCtl3D::SvxLightCtl3D(Window*, long) -SvxLineColorItem::SvxLineColorItem(Color const&, unsigned short) SvxListBoxControl::RegisterControl(unsigned short, SfxModule*) SvxMSDffManager::GetAutoForm(MSO_SPT) const SvxMSDffManager::ImportFontWork(SvStream&, SfxItemSet&, Rectangle&) const |