include/sfx2/templdlg.hxx | 2 -- include/svtools/treelistbox.hxx | 2 -- sfx2/source/dialog/templdlg.cxx | 10 ---------- sfx2/source/sidebar/AsynchronousCall.cxx | 26 -------------------------- sfx2/source/sidebar/AsynchronousCall.hxx | 1 - svtools/source/contnr/treelistbox.cxx | 12 ------------ svx/uiconfig/ui/optgridpage.ui | 8 ++++++-- unusedcode.easy | 1 - 8 files changed, 6 insertions(+), 56 deletions(-)
New commits: commit 6a39fdf81fa561a587b9b9c6a28ba2891f448563 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 28 09:22:32 2014 +0100 callcatcher: update unused code Change-Id: I6cb74836f98d7507359f39e1fd03a1462b2e0c31 diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index 31102fe..a15d4e7 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -50,8 +50,6 @@ public: virtual void Update(); - void SetParagraphFamily(); - // converts from SFX_STYLE_FAMILY Ids to 1-5 static sal_uInt16 SFX2_DLLPUBLIC SfxFamilyIdToNId(SfxStyleFamily nFamily); // converts from 1-5 to SFX_STYLE_FAMILY Ids diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index e756d4a..f5b1e83 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -772,8 +772,6 @@ public: virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); void EnableContextMenuHandling( void ); - void EnableContextMenuHandling( bool bEnable ); - bool IsContextMenuHandlingEnabled( void ) const; void EnableList( bool _bEnable ); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 2ab1726..6c42846 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -155,14 +155,6 @@ SfxTemplateDialog::~SfxTemplateDialog() delete pImpl; } -void SfxTemplateDialog::SetParagraphFamily() -{ - // first select the paragraph family - pImpl->FamilySelect( SFX_STYLE_FAMILY_PARA ); - // then select the automatic filter - pImpl->SetAutomaticFilter(); -} - void SfxTemplateDialog::DataChanged( const DataChangedEvent& _rDCEvt ) { if ( ( DATACHANGED_SETTINGS == _rDCEvt.GetType() ) && @@ -175,8 +167,6 @@ void SfxTemplateDialog::DataChanged( const DataChangedEvent& _rDCEvt ) SfxDockingWindow::DataChanged( _rDCEvt ); } - - void SfxTemplateDialog::Update() { pImpl->Update(); diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx index 2ce02dc..767e2e7 100644 --- a/sfx2/source/sidebar/AsynchronousCall.cxx +++ b/sfx2/source/sidebar/AsynchronousCall.cxx @@ -29,36 +29,17 @@ AsynchronousCall::AsynchronousCall (void) { } - - - AsynchronousCall::AsynchronousCall (const Action& rAction) : maAction(rAction), mnCallId(0) { } - - - AsynchronousCall::~AsynchronousCall (void) { CancelRequest(); } - - - -void AsynchronousCall::RequestCall (const Action& rAction) -{ - CancelRequest(); - maAction = rAction; - RequestCall(); -} - - - - void AsynchronousCall::RequestCall (void) { if (mnCallId == 0) @@ -68,9 +49,6 @@ void AsynchronousCall::RequestCall (void) } } - - - void AsynchronousCall::CancelRequest (void) { if (mnCallId != 0) @@ -80,9 +58,6 @@ void AsynchronousCall::CancelRequest (void) } } - - - IMPL_LINK(AsynchronousCall, HandleUserCall, void*, EMPTYARG ) { mnCallId = 0; @@ -92,7 +67,6 @@ IMPL_LINK(AsynchronousCall, HandleUserCall, void*, EMPTYARG ) return sal_True; } - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/AsynchronousCall.hxx b/sfx2/source/sidebar/AsynchronousCall.hxx index d3ecd5d..665a35b 100644 --- a/sfx2/source/sidebar/AsynchronousCall.hxx +++ b/sfx2/source/sidebar/AsynchronousCall.hxx @@ -38,7 +38,6 @@ public: AsynchronousCall (const Action& rAction); ~AsynchronousCall (void); - void RequestCall (const Action& rAction); void RequestCall (void); void CancelRequest (void); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index e165ace..29956ca 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3817,18 +3817,6 @@ void SvTreeListBox::EnableContextMenuHandling( void ) pImp->bContextMenuHandling = true; } -void SvTreeListBox::EnableContextMenuHandling( bool b ) -{ - assert(pImp && "-SvTreeListBox::EnableContextMenuHandling(): No implementation!"); - pImp->bContextMenuHandling = b; -} - -bool SvTreeListBox::IsContextMenuHandlingEnabled( void ) const -{ - assert(pImp && "-SvTreeListBox::IsContextMenuHandlingEnabled(): No implementation!"); - return pImp->bContextMenuHandling; -} - void SvTreeListBox::EnableList( bool _bEnable ) { // call base class method diff --git a/unusedcode.easy b/unusedcode.easy index 29dc6f9..4e5facb 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -36,7 +36,6 @@ ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*) SfxInt64Item::SetValue(long) -SfxTemplateDialogWrapper::SetParagraphFamily() StyleSettings::SetCursorSize(long) StyleSettings::SetFloatTitleHeight(long) StyleSettings::SetHideDisabledMenuItems(bool) commit 4bd317f845c2f3470c7fc354e478be08c2949e0c Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 28 08:44:58 2014 +0100 Resolves: fdo#77516 sub-grid shouldn't be allowed as 0 regression from commit 3cb6587abbf6888ac9fb3b0cccc9a5aa0dc29b55 Author: Csikós Tamás <csks.t...@gmail.com> Date: Sun Jul 7 13:40:53 2013 +0200 modern .ui widgetlayout for optgrid Change-Id: I9e998ce203c16c2303e00347ce6a2992c92cc8dc diff --git a/svx/uiconfig/ui/optgridpage.ui b/svx/uiconfig/ui/optgridpage.ui index 0908713..802a304 100644 --- a/svx/uiconfig/ui/optgridpage.ui +++ b/svx/uiconfig/ui/optgridpage.ui @@ -1,19 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">3.9399999999999999</property> + <property name="lower">0.01</property> + <property name="upper">10</property> <property name="value">1</property> <property name="step_increment">0.20000000000000001</property> <property name="page_increment">1</property> </object> <object class="GtkAdjustment" id="adjustment2"> + <property name="lower">1</property> <property name="upper">99</property> <property name="value">2</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> <object class="GtkAdjustment" id="adjustment3"> + <property name="lower">1</property> <property name="upper">50</property> <property name="step_increment">1</property> <property name="page_increment">10</property>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits