packimages/CustomTarget_images.mk | 4 +- svtools/inc/svtools/slidesorterbaropt.hxx | 4 -- svtools/source/config/slidesorterbaropt.cxx | 47 ---------------------------- toolkit/source/awt/scrollabledialog.cxx | 2 + unusedcode.easy | 3 - 5 files changed, 4 insertions(+), 56 deletions(-)
New commits: commit 4b3bc8095ccef6dc5b4bd0d3a548f49195fc0a92 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Fri Sep 21 14:31:42 2012 +0200 packimages: add $(OUTDIR)/res/img back until helpcontent2 is converted Change-Id: Ibd083bb30ab80453209be97a415f52a7cb9f4c49 diff --git a/packimages/CustomTarget_images.mk b/packimages/CustomTarget_images.mk index c899288..2c40d34 100644 --- a/packimages/CustomTarget_images.mk +++ b/packimages/CustomTarget_images.mk @@ -45,7 +45,7 @@ $(packimages_DIR)/images.zip : \ $(call gb_Helper_abbreviate_dirs, \ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ -m $(SRCDIR)/icon-themes/galaxy -c $(packimages_DIR) \ - -l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -s $< -o $@ \ + -l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -l $(OUTDIR)/res/img -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) $(packimages_DIR)/images_%.zip : \ @@ -55,7 +55,7 @@ $(packimages_DIR)/images_%.zip : \ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ -m $(SRCDIR)/icon-themes/galaxy -c $(SRCDIR)/icon-themes/$* \ $(packimages_CUSTOM_FALLBACK_1) $(packimages_CUSTOM_FALLBACK_2) \ - -l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -s $< -o $@ \ + -l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -l $(OUTDIR)/res/img -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) # make sure to have one to keep packing happy commit c3745c4bab84955067782ece5eab1beab007a4aa Author: Matúš Kukan <matus.ku...@gmail.com> Date: Fri Sep 21 13:24:23 2012 +0200 unusedcode: add #if SCROLLABLEFRAME for ScrollableWrapper<GroupBox> Change-Id: I68df188c229f7cd31d5b79c073fe9440e307ad1d diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx index 88b0d7d..d12afdd 100644 --- a/toolkit/source/awt/scrollabledialog.cxx +++ b/toolkit/source/awt/scrollabledialog.cxx @@ -158,7 +158,9 @@ void ScrollableWrapper<T>::ResetScrollBars() } template class ScrollableWrapper< Dialog >; +#if SCROLLABLEFRAME template class ScrollableWrapper< GroupBox >; +#endif } // toolkit /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index 69888fe..65239d1 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -98,4 +98,3 @@ sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::RegisterFactory(unsigned short) std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector() std::__cxx1998::vector<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::~vector() -toolkit::ScrollableWrapper<GroupBox>::ScrollableWrapper(Window*, long) commit 96afd76fc4c2298bebbcff1ad8b45ddc76b0e557 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Fri Sep 21 12:46:06 2012 +0200 unusedcode: SvtSlideSorterBarOptions::*ListenerLink Change-Id: I7e396b9ed7f3d64c0b085448fdea562e3d740084 diff --git a/svtools/inc/svtools/slidesorterbaropt.hxx b/svtools/inc/svtools/slidesorterbaropt.hxx index c00952a..512eae8 100644 --- a/svtools/inc/svtools/slidesorterbaropt.hxx +++ b/svtools/inc/svtools/slidesorterbaropt.hxx @@ -34,7 +34,6 @@ is faster and smaller then a complete implementation! */ class SvtSlideSorterBarOptions_Impl; -class Link; /** collect informations about sidebar group @@ -56,9 +55,6 @@ class SVT_DLLPUBLIC SvtSlideSorterBarOptions: public utl::detail::Options SvtSlideSorterBarOptions(); virtual ~SvtSlideSorterBarOptions(); - void AddListenerLink( const Link& rLink ); - void RemoveListenerLink( const Link& rLink ); - bool GetVisibleImpressView() const; void SetVisibleImpressView( bool bVisible ); bool GetVisibleOutlineView() const; diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx index 634495d..a0f9581 100644 --- a/svtools/source/config/slidesorterbaropt.cxx +++ b/svtools/source/config/slidesorterbaropt.cxx @@ -23,16 +23,9 @@ #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <tools/link.hxx> #include <rtl/logfile.hxx> #include <rtl/instance.hxx> -#include "itemholder2.hxx" - -#include <svtools/imgdef.hxx> -#include <vcl/svapp.hxx> - -#include <list> using namespace ::utl; using namespace ::rtl; @@ -59,8 +52,6 @@ using namespace ::com::sun::star; class SvtSlideSorterBarOptions_Impl : public ConfigItem { - private: - ::std::list<Link> aList; Sequence< OUString > m_seqPropertyNames; public: @@ -102,10 +93,6 @@ class SvtSlideSorterBarOptions_Impl : public ConfigItem bool m_bVisibleSlideSorterView; bool m_bVisibleDrawView; - void AddListenerLink( const Link& rLink ); - void RemoveListenerLink( const Link& rLink ); - void CallListeners(); - private: /** return list of key names of our configuration management which represent oue module tree @@ -268,33 +255,9 @@ void SvtSlideSorterBarOptions_Impl::Load( const Sequence< OUString >& rPropertyN } } -void SvtSlideSorterBarOptions_Impl::AddListenerLink( const Link& rLink ) -{ - aList.push_back( rLink ); -} - -void SvtSlideSorterBarOptions_Impl::RemoveListenerLink( const Link& rLink ) -{ - for ( ::std::list<Link>::iterator iter = aList.begin(); iter != aList.end(); ++iter ) - { - if ( *iter == rLink ) - { - aList.erase(iter); - break; - } - } -} - -void SvtSlideSorterBarOptions_Impl::CallListeners() -{ - for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter ) - iter->Call( this ); -} - void SvtSlideSorterBarOptions_Impl::Notify( const Sequence< OUString >& rPropertyNames ) { Load( rPropertyNames ); - CallListeners(); } void SvtSlideSorterBarOptions_Impl::Commit() @@ -462,14 +425,4 @@ Mutex & SvtSlideSorterBarOptions::GetInitMutex() return theSvtSlideSorterBarOptionsMutex::get(); } -void SvtSlideSorterBarOptions::AddListenerLink( const Link& rLink ) -{ - m_pDataContainer->AddListenerLink( rLink ); -} - -void SvtSlideSorterBarOptions::RemoveListenerLink( const Link& rLink ) -{ - m_pDataContainer->RemoveListenerLink( rLink ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index f5c6221..69888fe 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -6,8 +6,6 @@ ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Loca ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() 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&) -SvtSlideSorterBarOptions::AddListenerLink(Link const&) -SvtSlideSorterBarOptions::RemoveListenerLink(Link const&) SvtUserOptions::SetCompany(rtl::OUString const&) SvtUserOptions::SetCountry(rtl::OUString const&) SvtUserOptions::SetFax(rtl::OUString const&)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits