diff options
-rw-r--r-- | svtools/source/config/extcolorcfg.cxx | 7 | ||||
-rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 11 | ||||
-rw-r--r-- | svtools/source/control/toolbarmenuimp.hxx | 1 | ||||
-rw-r--r-- | unusedcode.easy | 6 | ||||
-rw-r--r-- | vcl/inc/vcl/graph.hxx | 1 | ||||
-rw-r--r-- | vcl/source/gdi/graph.cxx | 7 |
6 files changed, 4 insertions, 29 deletions
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 57a6a913b9a1..fed1326cbc85 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -132,8 +132,6 @@ public: const rtl::OUString& GetLoadedScheme() const {return m_sLoadedScheme;} - uno::Sequence< ::rtl::OUString> GetSchemeNames(); - sal_Bool AddScheme(const rtl::OUString& rNode); sal_Bool RemoveScheme(const rtl::OUString& rNode); void SetModified(){ConfigItem::SetModified();} @@ -512,11 +510,6 @@ void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName } } -uno::Sequence< ::rtl::OUString> ExtendedColorConfig_Impl::GetSchemeNames() -{ - return GetNodeNames(C2U("ExtendedColorScheme/ColorSchemes")); -} - sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme) { if(ConfigItem::AddNode(C2U("ExtendedColorScheme/ColorSchemes"), rScheme)) diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index deffcebc1a7c..39055f18fcc5 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -105,17 +105,6 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Stri // -------------------------------------------------------------------- -ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, MenuItemBits nBits ) -: mrMenu( rMenu ) -{ - init( nEntryId, nBits ); - - maImage = rImage; - mbHasImage = true; -} - -// -------------------------------------------------------------------- - ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const String& rText, MenuItemBits nBits ) : mrMenu( rMenu ) { diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index f732f3dfbdb5..e4874836765f 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -92,7 +92,6 @@ public: public: ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const String& rText, MenuItemBits nBits ); - ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, MenuItemBits nBits ); ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const String& rText, MenuItemBits nBits ); ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* pControl, MenuItemBits nBits ); ~ToolbarMenuEntry(); diff --git a/unusedcode.easy b/unusedcode.easy index a979058b9159..6b5984c78414 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -240,6 +240,9 @@ Graphic::GetGraphicsCompressMode(SvStream&) Graphic::StartAnimation(OutputDevice*, Point const&, long, OutputDevice*) Graphic::WriteEmbedded(SvStream&) GraphicConverter::ImplConvert(unsigned long, void*, unsigned long, void**, unsigned long) +GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const +GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const +GraphicHelper::getDeviceInfo() const GraphicReader::IsPreviewModeEnabled() const GroupTable::SkipCurrentGroup() HTMLControls::Insert(HTMLControl const*&, unsigned short&) @@ -3036,8 +3039,7 @@ oox::AttributeList::getHyperHex(int, long) const oox::AttributeList::getUnsignedHex(int, unsigned int) const oox::BinaryInputStream::readNulCharArrayUC(unsigned short) oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference<com::sun::star::container::XIndexContainer> const&, int, com::sun::star::uno::Any const&) -oox::GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const -oox::GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const +oox::GraphicHelper::convertScreenPixelToHmm(com::sun::star::awt::Point const&) const oox::ObjectContainer::getObject(rtl::OUString const&) const oox::PropertyMap::dump() oox::PropertyMap::dumpCode() diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx index 2ca801cfb97b..837393575aff 100644 --- a/vcl/inc/vcl/graph.hxx +++ b/vcl/inc/vcl/graph.hxx @@ -176,7 +176,6 @@ public: Link GetAnimationNotifyHdl() const; sal_uLong GetAnimationLoopCount() const; - void ResetAnimationLoopCount(); sal_uLong GetChecksum() const; diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 8fa11e969aa8..1bb208bff8e4 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -655,13 +655,6 @@ sal_uLong Graphic::GetAnimationLoopCount() const // ------------------------------------------------------------------------ -void Graphic::ResetAnimationLoopCount() -{ - mpImpGraphic->ImplResetAnimationLoopCount(); -} - -// ------------------------------------------------------------------------ - GraphicReader* Graphic::GetContext() { return mpImpGraphic->ImplGetContext(); |