summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/cfg.cxx9
-rw-r--r--cui/source/customize/macropg.cxx12
-rw-r--r--cui/source/dialogs/SpellDialog.cxx4
-rw-r--r--cui/source/dialogs/iconcdlg.cxx3
-rw-r--r--cui/source/inc/SpellDialog.hxx2
-rw-r--r--cui/source/inc/cfg.hxx6
-rw-r--r--cui/source/inc/headertablistbox.hxx4
-rw-r--r--cui/source/inc/iconcdlg.hxx6
-rw-r--r--cui/source/inc/numpages.hxx2
-rw-r--r--cui/source/tabpages/borderconn.cxx14
-rw-r--r--cui/source/tabpages/borderconn.hxx9
-rw-r--r--cui/source/tabpages/numpages.cxx9
12 files changed, 32 insertions, 48 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 9dbe49f9882b..c238dc7121c8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1200,7 +1200,7 @@ bool MenuSaveInData::Apply()
uno::Reference< lang::XSingleComponentFactory > xFactory (
m_xMenuSettings, uno::UNO_QUERY );
- Apply( pRootEntry, xIndexContainer, xFactory );
+ Apply( xIndexContainer, xFactory );
try
{
@@ -1237,14 +1237,9 @@ bool MenuSaveInData::Apply()
}
void MenuSaveInData::Apply(
- SvxConfigEntry* pRootEntry_,
uno::Reference< container::XIndexContainer >& rMenuBar,
- uno::Reference< lang::XSingleComponentFactory >& rFactory,
- SvTreeListEntry *pParentEntry )
+ uno::Reference< lang::XSingleComponentFactory >& rFactory )
{
- (void)pRootEntry_;
- (void)pParentEntry;
-
SvxEntries::const_iterator iter = GetEntries()->begin();
SvxEntries::const_iterator end = GetEntries()->end();
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 778b5134f0e4..c57913a2f01e 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -195,16 +195,16 @@ void MacroEventListBox::ConnectElements()
maListBox->InitHeaderBar( maHeaderBar.get() );
}
-void MacroEventListBox::Show( bool bVisible, ShowFlags nFlags )
+void MacroEventListBox::Show( bool bVisible )
{
- maListBox->Show( bVisible, nFlags );
- maHeaderBar->Show( bVisible, nFlags );
+ maListBox->Show( bVisible );
+ maHeaderBar->Show( bVisible );
}
-void MacroEventListBox::Enable( bool bEnable, bool bChild )
+void MacroEventListBox::Enable( bool bEnable )
{
- maListBox->Enable( bEnable, bChild );
- maHeaderBar->Enable( bEnable, bChild );
+ maListBox->Enable( bEnable );
+ maHeaderBar->Enable( bEnable );
}
// assign button ("Add Command") is enabled only if it is not read only
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index f1b552fc4576..7b772b114faf 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1979,10 +1979,10 @@ void SentenceEditWindow_Impl::ResetUndo()
}
-void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, bool bTryMerg )
+void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction )
{
::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager();
- rUndoMgr.AddUndoAction(pAction, bTryMerg);
+ rUndoMgr.AddUndoAction(pAction);
GetSpellDialog()->m_pUndoPB->Enable();
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 6e39a876bcab..a6a9abab6ea6 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -279,8 +279,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage(
const Image& rChoiceIcon,
CreatePage pCreateFunc /* != 0 */,
GetPageRanges pRangesFunc /* darf 0 sein */,
- bool bItemsOnDemand,
- sal_uLong /*nPos*/
+ bool bItemsOnDemand
)
{
IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index ab7437783f4b..c52708001acc 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -111,7 +111,7 @@ public:
void ResetUndo();
void Undo();
- void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false );
+ void AddUndoAction( SfxUndoAction *pAction );
sal_uInt16 GetUndoActionCount();
void UndoActionStart( sal_uInt16 nId );
void UndoActionEnd();
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 0b47d2c9675b..abc928061ef8 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -176,10 +176,8 @@ private:
static MenuSaveInData* GetDefaultData() { return pDefaultData; }
void Apply(
- SvxConfigEntry* pRootEntry,
css::uno::Reference< css::container::XIndexContainer >& rNewMenuBar,
- css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory,
- SvTreeListEntry *pParent = nullptr );
+ css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory );
public:
@@ -290,7 +288,7 @@ public:
SvxEntries* GetEntries() const { return mpEntries; }
void SetEntries( SvxEntries* entries ) { mpEntries = entries; }
- void SetMain( bool bValue = true ) { bIsMain = bValue; }
+ void SetMain() { bIsMain = true; }
bool IsMain() { return bIsMain; }
void SetParentData( bool bValue = true ) { bIsParentData = bValue; }
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index 71397b777ffd..1ec22e23f789 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -52,8 +52,8 @@ public:
void ConnectElements();/**< should be called after all manipulations on elements are done
calcs real sizes depending on sizes of this */
- void Show( bool bVisible = true, ShowFlags nFlags = ShowFlags::NONE ); ///< same meaning as Windows::Show()
- void Enable( bool bEnable = true, bool bChild = true ); ///< same meaning as Windows::Enable()
+ void Show( bool bVisible = true ); ///< same meaning as Windows::Show()
+ void Enable( bool bEnable = true ); ///< same meaning as Windows::Enable()
};
#endif
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 76d8d37f71c8..23a3cb622a8f 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -91,8 +91,8 @@ public:
virtual bool FillItemSet( SfxItemSet* ) = 0;
virtual void Reset( const SfxItemSet& ) = 0;
- bool HasExchangeSupport() const { return bHasExchangeSupport; }
- void SetExchangeSupport( bool bNew = true ) { bHasExchangeSupport = bNew; }
+ bool HasExchangeSupport() const { return bHasExchangeSupport; }
+ void SetExchangeSupport() { bHasExchangeSupport = true; }
enum {
KEEP_PAGE = 0x0000, ///< error handling
@@ -181,7 +181,7 @@ public:
SvxIconChoiceCtrlEntry* AddTabPage(
sal_uInt16 nId, const OUString& rIconText, const Image& rChoiceIcon,
CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = nullptr /* NULL allowed*/,
- bool bItemsOnDemand = false, sal_uLong nPos = TREELIST_APPEND );
+ bool bItemsOnDemand = false );
void SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
sal_uInt16 GetCurPageId() const { return mnCurrentPageId; }
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index b29e32993ea7..c5243bf15344 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -457,7 +457,7 @@ public:
const SfxItemSet* rAttrSet);
void SetMetric(FieldUnit eSet);
- void SetModified(bool bRepaint = true);
+ void SetModified();
virtual void PageCreated(const SfxAllItemSet& aSet) override;
};
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index aecef5b2be2d..ce94e50ca3ff 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -265,24 +265,22 @@ ShadowConnection::ShadowConnection( const SfxItemSet& rItemSet,
sfx::ItemConnectionBase* CreateFrameLineConnection( sal_uInt16 nSlot,
- FrameSelector& rFrameSel, FrameBorderType eBorder, sfx::ItemConnFlags nFlags )
+ FrameSelector& rFrameSel, FrameBorderType eBorder )
{
- return new sfx::ItemControlConnection< LineItemWrapper, FrameSelectorWrapper >( nSlot, new FrameSelectorWrapper( rFrameSel, eBorder ), nFlags );
+ return new sfx::ItemControlConnection< LineItemWrapper, FrameSelectorWrapper >( nSlot, new FrameSelectorWrapper( rFrameSel, eBorder ), sfx::ITEMCONN_DEFAULT );
}
sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet,
MetricField& rMfLeft, MetricField& rMfRight,
- MetricField& rMfTop, MetricField& rMfBottom,
- sfx::ItemConnFlags nFlags )
+ MetricField& rMfTop, MetricField& rMfBottom )
{
- return new MarginConnection( rItemSet, rMfLeft, rMfRight, rMfTop, rMfBottom, nFlags );
+ return new MarginConnection( rItemSet, rMfLeft, rMfRight, rMfTop, rMfBottom, sfx::ITEMCONN_DEFAULT );
}
sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet,
- ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor,
- sfx::ItemConnFlags nFlags )
+ ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor )
{
- return new ShadowConnection( rItemSet, rVsPos, rMfSize, rLbColor, nFlags );
+ return new ShadowConnection( rItemSet, rVsPos, rMfSize, rLbColor, sfx::ITEMCONN_DEFAULT );
}
diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx
index 466c631709f9..17343d80025f 100644
--- a/cui/source/tabpages/borderconn.hxx
+++ b/cui/source/tabpages/borderconn.hxx
@@ -36,21 +36,18 @@ class FrameSelector;
/** Creates an item connection object that connects an SvxLineItem with an
svx::FrameSelector control. */
sfx::ItemConnectionBase* CreateFrameLineConnection( sal_uInt16 nSlot,
- FrameSelector& rFrameSel, FrameBorderType eBorder,
- sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT );
+ FrameSelector& rFrameSel, FrameBorderType eBorder );
/** Creates an item connection object that connects an SvxMarginItem with the
controls of the SvxBorderTabPage. */
sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet,
MetricField& rMfLeft, MetricField& rMfRight,
- MetricField& rMfTop, MetricField& rMfBottom,
- sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT );
+ MetricField& rMfTop, MetricField& rMfBottom );
/** Creates an item connection object that connects an SvxShadowItem with the
controls of the SvxBorderTabPage. */
sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet,
- ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor,
- sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT );
+ ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor );
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 7361c98e6cd7..45e51f632b0d 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -3664,14 +3664,11 @@ IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, StandardHdl_Impl, Button*, void)
SetModified();
}
-void SvxNumPositionTabPage::SetModified(bool bRepaint)
+void SvxNumPositionTabPage::SetModified()
{
bModified = true;
- if(bRepaint)
- {
- m_pPreviewWIN->SetLevel(nActNumLvl);
- m_pPreviewWIN->Invalidate();
- }
+ m_pPreviewWIN->SetLevel(nActNumLvl);
+ m_pPreviewWIN->Invalidate();
}
void SvxNumOptionsTabPage::SetModified(bool bRepaint)
generated by cgit (git 2.34.1) at 2025-01-17 01:00:01 +0000