[Libreoffice-commits] core.git: cui/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Jun 23 07:01:23 UTC 2017
cui/source/customize/acccfg.cxx | 13 -------------
cui/source/customize/cfgutil.cxx | 8 --------
cui/source/customize/eventdlg.cxx | 4 ----
cui/source/customize/eventdlg.hxx | 2 --
cui/source/dialogs/SpellDialog.cxx | 15 ++-------------
cui/source/dialogs/cuigaldlg.cxx | 5 -----
cui/source/dialogs/cuihyperdlg.cxx | 2 --
cui/source/dialogs/hangulhanjadlg.cxx | 4 ----
cui/source/dialogs/hyphen.cxx | 3 ---
cui/source/dialogs/iconcdlg.cxx | 10 +---------
cui/source/inc/SpellDialog.hxx | 1 -
cui/source/inc/acccfg.hxx | 2 --
cui/source/inc/cfgutil.hxx | 5 +----
cui/source/inc/cuigaldlg.hxx | 1 -
cui/source/inc/cuihyperdlg.hxx | 1 -
cui/source/inc/cuitabarea.hxx | 14 --------------
cui/source/inc/cuitabline.hxx | 6 ------
cui/source/inc/grfpage.hxx | 1 -
cui/source/inc/hangulhanjadlg.hxx | 2 --
cui/source/inc/hyphen.hxx | 1 -
cui/source/inc/iconcdlg.hxx | 2 --
cui/source/inc/optdict.hxx | 1 -
cui/source/inc/page.hxx | 5 ++---
cui/source/inc/paragrph.hxx | 1 -
cui/source/inc/swpossizetabpage.hxx | 2 --
cui/source/inc/tabstpge.hxx | 1 -
cui/source/inc/textanim.hxx | 1 -
cui/source/options/optdict.cxx | 4 ----
cui/source/tabpages/backgrnd.cxx | 9 ---------
cui/source/tabpages/grfpage.cxx | 4 ----
cui/source/tabpages/page.cxx | 3 +--
cui/source/tabpages/paragrph.cxx | 4 +---
cui/source/tabpages/swpossizetabpage.cxx | 12 ------------
cui/source/tabpages/tabarea.cxx | 7 +------
cui/source/tabpages/tabline.cxx | 6 +-----
cui/source/tabpages/tabstpge.cxx | 11 -----------
cui/source/tabpages/textanim.cxx | 2 +-
cui/source/tabpages/tparea.cxx | 4 ----
cui/source/tabpages/tpline.cxx | 4 +---
cui/source/tabpages/tplnedef.cxx | 1 -
cui/source/tabpages/tplneend.cxx | 1 -
cui/source/tabpages/tpshadow.cxx | 6 +-----
cui/source/tabpages/tptrans.cxx | 4 +---
43 files changed, 14 insertions(+), 181 deletions(-)
New commits:
commit 75ddf3a22aa83d1b067085bd7132acab5a088856
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jun 22 14:20:39 2017 +0200
loplugin:unusedfields in cui
Change-Id: I6d3ef43ab915d65794f1052f1f184eda10d39e1a
Reviewed-on: https://gerrit.libreoffice.org/39136
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index b80b6e054455..23bb736d3319 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -720,8 +720,6 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const SfxItemSet& aSet )
: SfxTabPage(pParent, "AccelConfigPage", "cui/ui/accelconfigpage.ui", &aSet)
, m_pMacroInfoItem()
- , m_pStringItem()
- , m_pFontItem()
, m_pFileDlg(nullptr)
, aLoadAccelConfigStr(CuiResId(RID_SVXSTR_LOADACCELCONFIG))
, aSaveAccelConfigStr(CuiResId(RID_SVXSTR_SAVEACCELCONFIG))
@@ -923,7 +921,6 @@ void SfxAcceleratorConfigPage::Init(const uno::Reference<ui::XAcceleratorConfigu
xModel = xController->getModel();
m_aStylesInfo.init(m_sModuleLongName, xModel);
- m_pFunctionBox->SetStylesInfo(&m_aStylesInfo);
m_pGroupLBox->SetStylesInfo(&m_aStylesInfo);
m_bStylesInfoInitialized = true;
}
@@ -1429,16 +1426,6 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet* rSet )
m_pMacroInfoItem = &dynamic_cast<const SfxMacroInfoItem&>(*pMacroItem);
m_pGroupLBox->SelectMacro( m_pMacroInfoItem );
}
- else
- {
- const SfxPoolItem* pStringItem=nullptr;
- if( SfxItemState::SET == rSet->GetItemState( SID_CHARMAP, true, &pStringItem ) )
- m_pStringItem = dynamic_cast<const SfxStringItem*>( pStringItem );
-
- const SfxPoolItem* pFontItem=nullptr;
- if( SfxItemState::SET == rSet->GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) )
- m_pFontItem = dynamic_cast<const SfxStringItem*>( pFontItem );
- }
}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 6e2019ba1ce8..37567adb9591 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -249,7 +249,6 @@ std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyles(const OUString& s
SfxConfigFunctionListBox::SfxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox( pParent, nStyle )
- , pStylesInfo( nullptr )
{
SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
GetModel()->SetSortMode( SortAscending );
@@ -360,11 +359,6 @@ OUString SfxConfigFunctionListBox::GetCurLabel()
return pData->sCommand;
}
-void SfxConfigFunctionListBox::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
-{
- pStylesInfo = pStyles;
-}
-
struct SvxConfigGroupBoxResource_Impl
{
Image m_hdImage;
@@ -1046,7 +1040,6 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry )
*/
{
SfxGroupInfo_Impl *pInfo = static_cast<SfxGroupInfo_Impl*>(pEntry->GetUserData());
- pInfo->bWasOpened = true;
switch ( pInfo->nKind )
{
case SfxCfgKind::GROUP_SCRIPTCONTAINER:
@@ -1212,7 +1205,6 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog(
xModel = xController->getModel();
m_aStylesInfo.init(aModuleName, xModel);
- m_pCommands->SetStylesInfo(&m_aStylesInfo);
m_pCategories->SetStylesInfo(&m_aStylesInfo);
UpdateUI();
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 4053836ce02d..78bbdf3d95f3 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -58,7 +58,6 @@ SvxEventConfigPage::SvxEventConfigPage(vcl::Window *pParent, const SfxItemSet& r
SvxEventConfigPage::EarlyInit)
: SvxMacroTabPage_(pParent, "EventsConfigPage",
"cui/ui/eventsconfigpage.ui", rSet)
- , bAppConfig(true)
{
get(m_pSaveInListBox, "savein");
@@ -157,8 +156,6 @@ void SvxEventConfigPage::ImplInitDocument()
m_pSaveInListBox->SetEntryData( nPos, new bool(false) );
m_pSaveInListBox->SelectEntryPos( nPos );
-
- bAppConfig = false;
}
}
catch( const uno::Exception& )
@@ -173,7 +170,6 @@ IMPL_LINK_NOARG( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void )
m_pSaveInListBox->GetSelectEntryPos()));
mpImpl->pEventLB->SetUpdateMode( false );
- bAppConfig = *bApp;
if ( *bApp )
{
SetReadOnly( false );
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index 764972a0c8a0..0b0a00b50976 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -35,8 +35,6 @@ class SvxEventConfigPage : public SvxMacroTabPage_
css::uno::Reference< css::container::XNameReplace > m_xDocumentEvents;
css::uno::Reference< css::util::XModifiable > m_xDocumentModifiable;
- bool bAppConfig;
-
DECL_LINK( SelectHdl_Impl, ListBox&, void );
SvxEventConfigPage (const SvxEventConfigPage &) = delete;
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 19f67ea90acb..6ecf295bb80b 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -93,8 +93,6 @@ class SpellUndoAction_Impl : public SfxUndoAction
bool m_bEnableChangePB;
bool m_bEnableChangeAllPB;
//undo of MarkNextError - used in change and change all, ignore and ignore all
- long m_nNewErrorStart;
- long m_nNewErrorEnd;
long m_nOldErrorStart;
long m_nOldErrorEnd;
bool m_bIsErrorLanguageSelected;
@@ -110,8 +108,6 @@ public:
m_rActionLink( rActionLink),
m_bEnableChangePB(false),
m_bEnableChangeAllPB(false),
- m_nNewErrorStart(-1),
- m_nNewErrorEnd(-1),
m_nOldErrorStart(-1),
m_nOldErrorEnd(-1),
m_bIsErrorLanguageSelected(false),
@@ -127,10 +123,8 @@ public:
void SetEnableChangeAllPB(){m_bEnableChangeAllPB = true;}
bool IsEnableChangeAllPB(){return m_bEnableChangeAllPB;}
- void SetErrorMove(long nNewStart, long nNewEnd, long nOldStart, long nOldEnd)
+ void SetErrorMove(long nOldStart, long nOldEnd)
{
- m_nNewErrorStart = nNewStart;
- m_nNewErrorEnd = nNewEnd;
m_nOldErrorStart = nOldStart;
m_nOldErrorEnd = nOldEnd;
}
@@ -169,7 +163,6 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,
: SfxModelessDialog (_pBindings, pChildWindow,
pParent, "SpellingDialog", "cui/ui/spellingdialog.ui")
, aDialogUndoLink(LINK (this, SpellDialog, DialogUndoHdl))
- , bModified(false)
, bFocusLocked(true)
, rParent(*pChildWindow)
, pImpl( new SpellDialog_Impl )
@@ -569,7 +562,6 @@ IMPL_LINK_NOARG(SpellDialog, ChangeHdl, Button*, void)
OUString aString = getReplacementString();
m_pSentenceED->ChangeMarkedWord(aString, GetSelectedLang_Impl());
SpellContinue_Impl();
- bModified = false;
m_pSentenceED->UndoActionEnd();
}
if(!m_pChangePB->IsEnabled())
@@ -602,7 +594,6 @@ IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl, Button*, void)
m_pSentenceED->ChangeMarkedWord(aString, eLang);
SpellContinue_Impl();
- bModified = false;
m_pSentenceED->UndoActionEnd();
}
@@ -649,7 +640,6 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton, void )
}
SpellContinue_Impl();
- bModified = false;
m_pSentenceED->UndoActionEnd();
}
@@ -931,7 +921,6 @@ IMPL_LINK(SpellDialog, ModifyHdl, Edit&, rEd, void)
{
if (m_pSentenceED == &rEd)
{
- bModified = true;
m_pSuggestionLB->SetNoSelection();
m_pSuggestionLB->Disable();
OUString sNewText( m_pSentenceED->GetText() );
@@ -1620,7 +1609,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, const css
//add an undo action
SpellUndoAction_Impl* pAction = new SpellUndoAction_Impl(
SPELLUNDO_CHANGE_NEXTERROR, GetSpellDialog()->aDialogUndoLink);
- pAction->SetErrorMove(m_nErrorStart, m_nErrorEnd, nOldErrorStart, nOldErrorEnd);
+ pAction->SetErrorMove(nOldErrorStart, nOldErrorEnd);
const SpellErrorAttrib* pOldAttrib = static_cast<const SpellErrorAttrib*>(
pTextEngine->FindAttrib( TextPaM(0, nOldErrorStart), TEXTATTR_SPELL_ERROR ));
pAction->SetErrorLanguageSelected(pOldAttrib && pOldAttrib->GetErrorDescription().aSuggestions.getLength() &&
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 0e59258bf288..196d8acd6c73 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -709,7 +709,6 @@ VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( vcl::Window* pParent, const Sf
TPGalleryThemeProperties::TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet )
: SfxTabPage(pWindow, "GalleryFilesPage", "cui/ui/galleryfilespage.ui", &rSet)
, pData(nullptr)
- , nCurFilterPos(0)
, nFirstExtFilterPos(0)
, bEntriesFound(false)
, bInputAllowed(true)
@@ -766,8 +765,6 @@ void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, sh
bSearchRecursive = true; // UI choice no longer possible, windows file picker allows no user controls
SearchFiles();
}
-
- nCurFilterPos = m_pCbbFileType->GetEntryPos( m_pCbbFileType->GetText() );
}
@@ -1009,8 +1006,6 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl, Button*, void)
bSearchRecursive = true; // UI choice no longer possible, windows file picker allows no user controls
SearchFiles();
}
-
- nCurFilterPos = m_pCbbFileType->GetEntryPos( m_pCbbFileType->GetText() );
}
}
catch (const IllegalArgumentException&)
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index c5bd7a669c99..04f3d29418f5 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -82,7 +82,6 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
: IconChoiceDialog( pParent, "HyperlinkDialog", "cui/ui/hyperlinkdialog.ui" ),
maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ),
mpBindings ( pBindings ),
- mbReadOnly ( false ),
mbIsHTMLDoc ( false )
{
mbGrabFocus = true;
@@ -359,7 +358,6 @@ void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
void SvxHpLinkDlg::SetReadOnlyMode( bool bRdOnly )
{
- mbReadOnly = bRdOnly;
if ( bRdOnly )
GetOKButton().Disable();
else
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 4b23004e5888..dfa081b62cd2 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1098,7 +1098,6 @@ namespace svx
HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(vcl::Window* _pParent)
: ModalDialog( _pParent, "HangulHanjaOptDialog",
"cui/ui/hangulhanjaoptdialog.ui" )
- , m_pCheckButtonData(nullptr)
, m_xConversionDictionaryList(nullptr)
{
get(m_pDictsLB, "dicts");
@@ -1159,9 +1158,6 @@ namespace svx
}
}
- delete m_pCheckButtonData;
- m_pCheckButtonData = nullptr;
-
m_pDictsLB.clear();
m_pIgnorepostCB.clear();
m_pShowrecentlyfirstCB.clear();
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index a31c070ab83d..3767af0b3048 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -312,7 +312,6 @@ void SvxHyphenWordDialog::SelLeft()
break;
}
}
- m_nHyphPos = GetHyphIndex_Impl();
EnableLRBtn_Impl();
}
}
@@ -334,7 +333,6 @@ void SvxHyphenWordDialog::SelRight()
break;
}
}
- m_nHyphPos = GetHyphIndex_Impl();
EnableLRBtn_Impl();
}
@@ -450,7 +448,6 @@ SvxHyphenWordDialog::SvxHyphenWordDialog(
, m_aActWord(rWord)
, m_nActLanguage(nLang)
, m_nMaxHyphenationPos(0)
- , m_nHyphPos(0)
, m_nOldPos(0)
, m_nHyphenationPositionsOffset(0)
, m_bBusy(false)
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 70a1b87afc10..2b0214810e75 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -154,9 +154,7 @@ IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID,
pSet ( nullptr ),
pOutSet ( nullptr ),
pExampleSet ( nullptr ),
- pRanges ( nullptr ),
-
- bInOK ( false )
+ pRanges ( nullptr )
{
get(m_pOKBtn, "ok");
get(m_pApplyBtn, "apply");
@@ -348,8 +346,6 @@ IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl, SvtIconChoiceCtrl*, void)
IMPL_LINK_NOARG(IconChoiceDialog, OkHdl, Button*, void)
{
- bInOK = true;
-
if ( OK_Impl() )
{
Ok();
@@ -360,8 +356,6 @@ IMPL_LINK_NOARG(IconChoiceDialog, OkHdl, Button*, void)
IMPL_LINK_NOARG(IconChoiceDialog, ApplyHdl, Button*, void)
{
- bInOK = true;
-
if ( OK_Impl() )
{
Ok();
@@ -653,8 +647,6 @@ bool IconChoiceDialog::OK_Impl()
void IconChoiceDialog::Ok()
{
- bInOK = true;
-
if ( !pOutSet )
{
if ( !pExampleSet && pSet )
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 04af246c6f82..aab0989e6751 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -168,7 +168,6 @@ private:
Link<SpellUndoAction_Impl&,void> aDialogUndoLink;
- bool bModified;
bool bFocusLocked;
svx::SpellDialogChildWindow& rParent;
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index ded5f76078dc..1239e65363bb 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -107,8 +107,6 @@ class SfxAcceleratorConfigPage : public SfxTabPage
friend class SfxAccCfgTabListBox_Impl;
private:
const SfxMacroInfoItem* m_pMacroInfoItem;
- const SfxStringItem* m_pStringItem;
- const SfxStringItem* m_pFontItem;
sfx2::FileDialogHelper* m_pFileDlg;
VclPtr<SfxAccCfgTabListBox_Impl> m_pEntriesBox;
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index d409054acd92..e7af1f258d1a 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -93,13 +93,12 @@ struct SfxGroupInfo_Impl
SfxCfgKind nKind;
sal_uInt16 nUniqueID;
void* pObject;
- bool bWasOpened;
OUString sCommand;
OUString sLabel;
OUString sHelpText;
SfxGroupInfo_Impl( SfxCfgKind n, sal_uInt16 nr, void* pObj = nullptr ) :
- nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(false) {}
+ nKind( n ), nUniqueID( nr ), pObject( pObj ) {}
};
typedef std::vector<std::unique_ptr<SfxGroupInfo_Impl> > SfxGroupInfoArr_Impl;
@@ -108,7 +107,6 @@ class SfxConfigFunctionListBox : public SvTreeListBox
{
friend class SfxConfigGroupListBox;
SfxGroupInfoArr_Impl aArr;
- SfxStylesInfo_Impl* pStylesInfo;
virtual void MouseMove( const MouseEvent& rMEvt ) override;
@@ -123,7 +121,6 @@ public:
OUString GetCurLabel();
OUString GetSelectedScriptURI();
OUString GetHelpText();
- void SetStylesInfo(SfxStylesInfo_Impl* pStyles);
};
struct SvxConfigGroupBoxResource_Impl;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index a0cd12637028..0c623a835460 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -256,7 +256,6 @@ class TPGalleryThemeProperties : public SfxTabPage
OUString aLastFilterName;
OUString aPreviewString;
INetURLObject aURL;
- sal_uInt16 nCurFilterPos;
sal_uInt16 nFirstExtFilterPos;
bool bEntriesFound;
bool bInputAllowed;
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 897d30a09aed..03461d7d5f86 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -69,7 +69,6 @@ private:
std::unique_ptr<SfxItemSet> mpItemSet;
bool mbGrabFocus : 1;
- bool mbReadOnly : 1;
bool mbIsHTMLDoc : 1;
DECL_LINK (ClickOkHdl_Impl, Button *, void );
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 595738d4055d..6b0cd7309254 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -123,7 +123,6 @@ private:
ChangeType mnHatchingListState;
PageType mnPageType;
- bool mbAreaTP;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
@@ -149,7 +148,6 @@ class SvxTransparenceTabPage : public SvxTabPage
static const sal_uInt16 pTransparenceRanges[];
const SfxItemSet& rOutAttrs;
- RectPoint eRP;
PageType nPageType;
sal_uInt16 nDlgType;
@@ -241,7 +239,6 @@ private:
XHatchListRef m_pHatchingList;
XBitmapListRef m_pBitmapList;
XPatternListRef m_pPatternList;
- SdrModel* mpDrawModel;
// Placeholders for pointer-based entries; these will be inited
// to point to these so that the page is usable without that
@@ -255,10 +252,6 @@ private:
ChangeType* m_pnGradientListState;
ChangeType* m_pnHatchingListState;
- PageType m_nPageType;
- sal_uInt16 m_nDlgType;
- bool* m_pbAreaTP;
-
XFillAttrSetItem m_aXFillAttr;
SfxItemSet& m_rXFSet;
@@ -291,10 +284,6 @@ public:
{ m_pHatchingList = pHtchLst; }
void SetBitmapList( XBitmapListRef const & pBmpLst) { m_pBitmapList = pBmpLst; }
void SetPatternList( XPatternListRef const &pPtrnLst ) { m_pPatternList = pPtrnLst; }
- void SetDrawModel( SdrModel* pModel ) { mpDrawModel = pModel; }
- void SetPageType( PageType nInType ) { m_nPageType = nInType; }
- void SetDlgType( sal_uInt16 nInType ) { m_nDlgType = nInType; }
- void SetAreaTP( bool* pIn ) { m_pbAreaTP = pIn; }
virtual void PageCreated(const SfxAllItemSet& aSet) override;
void CreatePage(sal_Int32 nId, SfxTabPage* pTab);
void SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
@@ -321,13 +310,11 @@ private:
VclPtr<SvxXShadowPreview> m_pCtlXRectPreview;
const SfxItemSet& m_rOutAttrs;
- RectPoint m_eRP;
XColorListRef m_pColorList;
ChangeType* m_pnColorListState;
PageType m_nPageType;
sal_uInt16 m_nDlgType;
- bool* m_pbAreaTP;
XFillAttrSetItem m_aXFillAttr;
SfxItemSet& m_rXFSet;
@@ -354,7 +341,6 @@ public:
void SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; }
void SetPageType( PageType nInType ) { m_nPageType = nInType; }
void SetDlgType( sal_uInt16 nInType ) { m_nDlgType = nInType; }
- void SetAreaTP( bool* pIn ) { m_pbAreaTP = pIn; }
void SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
virtual void PageCreated(const SfxAllItemSet& aSet) override;
};
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 5b39cc711182..79a4f587c1da 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -55,7 +55,6 @@ private:
PageType nPageType;
sal_Int32 nPosDashLb;
sal_Int32 nPosLineEndLb;
- bool mbAreaTP;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
@@ -146,7 +145,6 @@ private:
bool m_bSymbols;
const SfxItemSet& m_rOutAttrs;
- RectPoint m_eRP;
bool m_bObjSelected;
XLineAttrSetItem m_aXLineAttr;
@@ -264,7 +262,6 @@ private:
const SfxItemSet& rOutAttrs;
XDash aDash;
- bool bObjSelected;
XLineStyleItem aXLStyle;
XLineWidthItem aXWidth;
@@ -317,7 +314,6 @@ public:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
void SetDashList( XDashListRef const & pDshLst ) { pDashList = pDshLst; }
- void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; }
void SetPageType( PageType* pInType ) { pPageType = pInType; }
void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
@@ -347,7 +343,6 @@ private:
const SfxItemSet& rOutAttrs;
const SdrObject* pPolyObj;
- bool bObjSelected;
XLineStyleItem aXLStyle;
XLineWidthItem aXWidth;
@@ -387,7 +382,6 @@ public:
void SetLineEndList( XLineEndListRef const & pInList ) { pLineEndList = pInList; }
void SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; }
- void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; }
void SetPageType( PageType* pInType ) { pPageType = pInType; }
void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 2a6fa79a5322..452dcbd7e9e4 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -87,7 +87,6 @@ class SvxGrfCropPage : public SfxTabPage
long nOldWidth;
long nOldHeight;
bool bReset;
- bool bInitialized;
bool bSetOrigSize;
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 182eefc80f7d..39241df6fec5 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -207,8 +207,6 @@ namespace svx
VclPtr<PushButton> m_pDeletePB;
VclPtr<OKButton> m_pOkPB;
- SvLBoxButtonData* m_pCheckButtonData;
-
HHDictList m_aDictList;
css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList;
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index f5adb46d55d8..88a6e3c2b46f 100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -58,7 +58,6 @@ class SvxHyphenWordDialog : public SfxModalDialog
OUString m_aActWord; // actual word to be hyphenated
LanguageType m_nActLanguage; // and its language
sal_Int16 m_nMaxHyphenationPos; // right most valid hyphenation pos
- sal_uInt16 m_nHyphPos;
sal_Int32 m_nOldPos;
sal_Int32 m_nHyphenationPositionsOffset;
bool m_bBusy;
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 21fe5c49fcea..7efc4e48504e 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -116,8 +116,6 @@ private:
SfxItemSet* pExampleSet;
sal_uInt16* pRanges;
- bool bInOK;
-
DECL_LINK( ChosePageHdl_Impl, SvtIconChoiceCtrl*, void );
DECL_LINK( OkHdl, Button*, void );
DECL_LINK( ApplyHdl, Button*, void) ;
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index d0858b52da4f..c4f4905442b9 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -114,7 +114,6 @@ private:
css::uno::Reference<
css::linguistic2::XDictionary > > aDics; //! snapshot copy to work on
- short nOld;
long nWidth;
bool bFirstSelect;
bool bDoNothing;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 1f86cb772874..72838e5d481f 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -136,7 +136,6 @@ private:
bool bBorderModified;
SvxModeType eMode;
Paper ePaperStart;
- Paper ePaperEnd;
MarginPosition m_nPos;
VclPtr<Printer> mpDefPrinter;
@@ -193,8 +192,8 @@ public:
virtual ~SvxPageDescPage() override;
virtual void dispose() override;
- void SetPaperFormatRanges( Paper eStart, Paper eEnd )
- { ePaperStart = eStart; ePaperEnd = eEnd; }
+ void SetPaperFormatRanges( Paper eStart )
+ { ePaperStart = eStart; }
void SetCollectionList(const std::vector<OUString> &aList);
virtual void PageCreated(const SfxAllItemSet& aSet) override;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index abe414a4f24c..2060cd224064 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -84,7 +84,6 @@ private:
long nWidth;
long nMinFixDist;
bool bRelativeMode;
- bool bNegativeIndents;
void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr );
void Init_Impl();
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 865539625e46..fdd97c4566d8 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -92,8 +92,6 @@ class SvxSwPosSizeTabPage : public SfxTabPage
double m_fWidthHeightRatio; //width-to-height ratio to support the KeepRatio button
bool m_bHtmlMode;
- bool m_bAtHoriPosModified;
- bool m_bAtVertPosModified;
bool m_bIsVerticalFrame;
bool m_bPositioningDisabled;
bool m_bIsMultiSelection;
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 77505c1090ab..264a6478c3f7 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -101,7 +101,6 @@ private:
SvxTabStopItem aNewTabs;
long nDefDist;
FieldUnit eDefUnit;
- bool bCheck;
void InitTabPos_Impl( sal_uInt16 nPos = 0 );
void SetFillAndTabType_Impl();
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 8469f3601637..9b4a635d4568 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -94,7 +94,6 @@ public:
class SvxTextTabDialog : public SfxTabDialog
{
sal_uInt16 m_nTextId;
- sal_uInt16 m_nTextAnimId;
private:
const SdrView* pView;
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 437c2cb7f97e..a8beb91cfa46 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -45,8 +45,6 @@ using namespace linguistic;
// static ----------------------------------------------------------------
-static const short NOACTDICT = -1;
-
static long nStaticTabs[]=
{
2,10,71,120
@@ -218,7 +216,6 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
ModalDialog( pParent, "EditDictionaryDialog" ,"cui/ui/editdictionarydialog.ui" ),
sModify (CuiResId(STR_MODIFY)),
- nOld ( NOACTDICT ),
bFirstSelect (true),
bDoNothing (false),
bDicIsReadonly (false)
@@ -480,7 +477,6 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId )
{
Reference< XDictionary > xDic = aDics.getConstArray()[ nId ];
- nOld = nId;
EnterWait();
OUString aStr;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index c2149a9a3efa..98ae9a091dcf 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -100,11 +100,6 @@ struct SvxBackgroundPage_Impl
{}
};
-static inline sal_uInt8 lcl_TransparencyToPercent(sal_uInt8 nTrans)
-{
- return (nTrans * 100 + 127) / 254;
-}
-
/// Returns the fill style of the currently selected entry.
static drawing::FillStyle lcl_getFillStyle(ListBox* pLbSelect)
{
@@ -171,7 +166,6 @@ private:
Point aDrawPos;
Size aDrawSize;
::tools::Rectangle aDrawRect;
- sal_uInt8 nTransparency;
};
BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent)
@@ -179,7 +173,6 @@ BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent)
, bIsBmp(false)
, pBitmap(nullptr)
, aDrawRect(Point(0,0), GetOutputSizePixel())
- , nTransparency(0)
{
SetBorderStyle(WindowBorderStyle::MONO);
Invalidate(aDrawRect);
@@ -215,8 +208,6 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor )
{
const static Color aTranspCol( COL_TRANSPARENT );
- nTransparency = lcl_TransparencyToPercent( rColor.GetTransparency() );
-
SetFillColor( rColor == aTranspCol ? GetSettings().GetStyleSettings().GetFieldColor() : Color(rColor.GetRGBColor()) );
Invalidate(aDrawRect);
}
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index b0e0325e8995..4073bcfc5bff 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -55,7 +55,6 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet )
, nOldWidth(0)
, nOldHeight(0)
, bReset(false)
- , bInitialized(false)
, bSetOrigSize(false)
{
get(m_pCropFrame, "cropframe");
@@ -318,8 +317,6 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet)
SID_ATTR_GRAF_KEEP_ZOOM), m_pZoomConstRB->IsChecked() ) );
}
- bInitialized = false;
-
return bModified;
}
@@ -369,7 +366,6 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
m_pHeightMF->SetValue(nHeight, FUNIT_TWIP);
}
m_pHeightMF->SaveValue();
- bInitialized = true;
if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) )
{
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 147242fe1df1..50e83e91714b 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -152,7 +152,6 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
bLandscape ( false ),
eMode ( SVX_PAGE_MODE_STANDARD ),
ePaperStart ( PAPER_A3 ),
- ePaperEnd ( PAPER_ENV_DL ),
m_nPos ( 0 ),
mpDefPrinter ( nullptr ),
mbDelPrinter ( false ),
@@ -1647,7 +1646,7 @@ void SvxPageDescPage::PageCreated(const SfxAllItemSet& aSet)
if(pPaperStartItem && pPaperEndItem)
{
- SetPaperFormatRanges((Paper)pPaperStartItem->GetEnumValue(),(Paper)pPaperEndItem->GetEnumValue());
+ SetPaperFormatRanges((Paper)pPaperStartItem->GetEnumValue());
}
if(pCollectListItem)
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 38827706dec8..656858c86093 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -633,8 +633,7 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( vcl::Window* pParent, const Sfx
nWidth ( 11905 /*567 * 50*/ ),
nMinFixDist(0L),
- bRelativeMode ( false ),
- bNegativeIndents(false)
+ bRelativeMode ( false )
{
get(m_pLeftIndent,"spinED_LEFTINDENT");
@@ -705,7 +704,6 @@ void SvxStdParagraphTabPage::EnableNegativeMode()
m_pRightIndent->SetMin(-9999);
m_pRightIndent->EnableNegativeMode();
m_pLeftIndent->EnableNegativeMode();
- bNegativeIndents = true;
}
void SvxStdParagraphTabPage::SetLineSpacing_Impl
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 2e2e98945ce1..3c92d5a7a8f5 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -522,8 +522,6 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet&
, m_nOldVRel(RelOrientation::PRINT_AREA)
, m_fWidthHeightRatio(1.0)
, m_bHtmlMode(false)
- , m_bAtHoriPosModified(false)
- , m_bAtVertPosModified(false)
, m_bIsVerticalFrame(false)
, m_bPositioningDisabled(false)
, m_bIsMultiSelection(false)
@@ -1258,11 +1256,6 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox&, rLB, void )
UpdateExample();
- if (bHori)
- m_bAtHoriPosModified = true;
- else
- m_bAtVertPosModified = true;
-
if (m_bHtmlMode && RndStdIds::FLY_AT_CHAR == GetAnchorType()) // again special treatment
{
if(bHori)
@@ -1321,11 +1314,6 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void )
UpdateExample();
- if (bHori)
- m_bAtHoriPosModified = true;
- else
- m_bAtVertPosModified = true;
-
// special treatment for HTML-Mode with horz-vert-dependencies
if (m_bHtmlMode && RndStdIds::FLY_AT_CHAR == GetAnchorType())
{
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 1d21b7edd216..536db24bde8b 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -67,8 +67,7 @@ SvxAreaTabDialog::SvxAreaTabDialog
mnPatternListState ( ChangeType::NONE ),
mnGradientListState ( ChangeType::NONE ),
mnHatchingListState ( ChangeType::NONE ),
- mnPageType( PageType::Area ),
- mbAreaTP( false )
+ mnPageType( PageType::Area )
{
m_nAreaTabPage = AddTabPage( "RID_SVXPAGE_AREA", SvxAreaTabPage::Create, nullptr );
@@ -248,10 +247,6 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
static_cast<SvxAreaTabPage&>(rPage).SetHatchingList( mpHatchingList );
static_cast<SvxAreaTabPage&>(rPage).SetBitmapList( mpBitmapList );
static_cast<SvxAreaTabPage&>(rPage).SetPatternList( mpPatternList );
- static_cast<SvxAreaTabPage&>(rPage).SetDrawModel( mpDrawModel );
- static_cast<SvxAreaTabPage&>(rPage).SetPageType( mnPageType );
- static_cast<SvxAreaTabPage&>(rPage).SetDlgType( 0 );
- static_cast<SvxAreaTabPage&>(rPage).SetAreaTP( &mbAreaTP );
static_cast<SvxAreaTabPage&>(rPage).SetGrdChgd( &mnGradientListState );
static_cast<SvxAreaTabPage&>(rPage).SetHtchChgd( &mnHatchingListState );
static_cast<SvxAreaTabPage&>(rPage).SetBmpChgd( &mnBitmapListState );
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 85b4f311de3c..3a1269c1bc45 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -65,8 +65,7 @@ SvxLineTabDialog::SvxLineTabDialog
mnColorListState( ChangeType::NONE ),
nPageType( PageType::Area ), // We use it here primarily to get the right attributes with FillItemSet
nPosDashLb( 0 ),
- nPosLineEndLb( 0 ),
- mbAreaTP( false )
+ nPosLineEndLb( 0 )
{
bool bLineOnly = false;
if( pObj && pObj->GetObjInventor() == SdrInventor::Default )
@@ -214,7 +213,6 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
static_cast<SvxLineDefTabPage&>(rPage).SetPageType( &nPageType );
static_cast<SvxLineDefTabPage&>(rPage).SetPosDashLb( &nPosDashLb );
static_cast<SvxLineDefTabPage&>(rPage).SetDashChgd( &nDashListState );
- static_cast<SvxLineDefTabPage&>(rPage).SetObjSelected( bObjSelected );
static_cast<SvxLineDefTabPage&>(rPage).Construct();
}
else if(nId == m_nEndTabPage)
@@ -225,7 +223,6 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
static_cast<SvxLineEndDefTabPage&>(rPage).SetPageType( &nPageType );
static_cast<SvxLineEndDefTabPage&>(rPage).SetPosLineEndLb( &nPosLineEndLb );
static_cast<SvxLineEndDefTabPage&>(rPage).SetLineEndChgd( &nLineEndListState );
- static_cast<SvxLineEndDefTabPage&>(rPage).SetObjSelected( bObjSelected );
static_cast<SvxLineEndDefTabPage&>(rPage).Construct();
}
else if (nId == m_nShadowTabPage)
@@ -233,7 +230,6 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
static_cast<SvxShadowTabPage&>(rPage).SetColorList( pColorList );
static_cast<SvxShadowTabPage&>(rPage).SetPageType( nPageType );
static_cast<SvxShadowTabPage&>(rPage).SetDlgType( 0 );
- static_cast<SvxShadowTabPage&>(rPage).SetAreaTP( &mbAreaTP );
static_cast<SvxShadowTabPage&>(rPage).SetColorChgd( &mnColorListState );
}
}
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 25870806419f..7be2085f9786 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -95,7 +95,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage(vcl::Window* pParent, const SfxItemSet&
, aNewTabs(0, 0, SvxTabAdjust::Left, GetWhich(SID_ATTR_TABSTOP))
, nDefDist(0)
, eDefUnit(FUNIT_100TH_MM)
- , bCheck(false)
{
get(m_pTabBox,"ED_TABPOS");
//the tab images
@@ -510,8 +509,6 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void )
m_pDelBtn->Enable();
m_pTabBox->GrabFocus();
- // If no RadioButton was clicked, we need to put anyway
- bCheck = true;
// Set the selection into the position Edit
m_pTabBox->SetSelection(Selection(0, m_pTabBox->GetText().getLength()));
}
@@ -551,9 +548,6 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl, Button*, void)
m_pNewBtn->Enable();
m_pTabBox->GrabFocus();
}
-
- // If no RadioButton was clicked, we need to put anyway
- bCheck = true;
}
IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl, Button*, void)
@@ -562,15 +556,11 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl, Button*, void)
{
aNewTabs = SvxTabStopItem( 0 );
InitTabPos_Impl();
-
- // So that we put in FillItemSet()
- bCheck = true;
}
}
IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, Button *, pBox, void )
{
- bCheck = true;
SvxTabAdjust eAdj;
m_pDezChar->Disable();
m_pDezCharLabel->Disable();
@@ -602,7 +592,6 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, Button *, pBox, void )
IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, Button *, pBox, void )
{
- bCheck = true;
sal_uInt8 cFill = ' ';
m_pFillChar->SetText( "" );
m_pFillChar->Disable();
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 9b89ce0c1237..31f3e4cb04bf 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -53,7 +53,7 @@ SvxTextTabDialog::SvxTextTabDialog( vcl::Window* pParent,
pView ( pSdrView )
{
m_nTextId = AddTabPage( "RID_SVXPAGE_TEXTATTR", SvxTextAttrPage::Create, nullptr);
- m_nTextAnimId = AddTabPage( "RID_SVXPAGE_TEXTANIMATION", SvxTextAnimationPage::Create, nullptr);
+ AddTabPage( "RID_SVXPAGE_TEXTANIMATION", SvxTextAnimationPage::Create, nullptr);
}
/*************************************************************************
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 53d9ab5a2248..5e682bf92075 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -96,7 +96,6 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
m_pHatchingList( nullptr ),
m_pBitmapList( nullptr ),
m_pPatternList( nullptr ),
- mpDrawModel(nullptr),
// local fixed not o be changed values for local pointers
maFixed_ChangeType(ChangeType::NONE),
@@ -107,9 +106,6 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
m_pnPatternListState(&maFixed_ChangeType),
m_pnGradientListState(&maFixed_ChangeType),
m_pnHatchingListState(&maFixed_ChangeType),
- m_nPageType(PageType::Area),
- m_nDlgType(0),
- m_pbAreaTP(nullptr),
m_aXFillAttr ( rInAttrs.GetPool() ),
m_rXFSet ( m_aXFillAttr.GetItemSet() )
{
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 319442e2cb1a..0e6c80f070ce 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -97,7 +97,6 @@ SvxLineTabPage::SvxLineTabPage
m_bSymbols(false),
m_rOutAttrs ( rInAttrs ),
- m_eRP( RectPoint::LT ),
m_bObjSelected( false ),
m_aXLineAttr ( rInAttrs.GetPool() ),
@@ -1666,9 +1665,8 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void)
}
-void SvxLineTabPage::PointChanged( vcl::Window*, RectPoint eRcPt )
+void SvxLineTabPage::PointChanged( vcl::Window*, RectPoint )
{
- m_eRP = eRcPt;
}
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 12aaf3c9c964..b5c99ea3495e 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -61,7 +61,6 @@ SvxLineDefTabPage::SvxLineDefTabPage
, "cui/ui/linestyletabpage.ui"
, &rInAttrs ),
rOutAttrs ( rInAttrs ),
- bObjSelected ( false ),
aXLStyle ( drawing::LineStyle_DASH ),
aXWidth ( XOUT_WIDTH ),
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 924a9895dc70..df8309d1054c 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -62,7 +62,6 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
, &rInAttrs ),
rOutAttrs ( rInAttrs ),
pPolyObj ( nullptr ),
- bObjSelected ( false ),
aXLStyle ( css::drawing::LineStyle_SOLID ),
aXWidth ( XOUT_WIDTH ),
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 76ae22b242b9..5c0d43068f2d 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -54,11 +54,9 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInA
"cui/ui/shadowtabpage.ui",
rInAttrs ),
m_rOutAttrs ( rInAttrs ),
- m_eRP ( RectPoint::LT ),
m_pnColorListState ( nullptr ),
m_nPageType ( PageType::Area ),
m_nDlgType ( 0 ),
- m_pbAreaTP ( nullptr ),
m_aXFillAttr ( rInAttrs.GetPool() ),
m_rXFSet ( m_aXFillAttr.GetItemSet() )
{
@@ -504,10 +502,8 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl, Edit&, void)
}
-void SvxShadowTabPage::PointChanged( vcl::Window*, RectPoint eRcPt )
+void SvxShadowTabPage::PointChanged( vcl::Window*, RectPoint )
{
- m_eRP = eRcPt;
-
// repaint shadow
ModifyShadowHdl_Impl( *m_pMtrTransparent );
}
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 6a0cee181285..086d037e0fd0 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -239,7 +239,6 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt
"cui/ui/transparencytabpage.ui",
rInAttrs),
rOutAttrs ( rInAttrs ),
- eRP ( RectPoint::LT ),
nPageType ( PageType::Area ),
nDlgType (0),
bBitmap ( false ),
@@ -487,9 +486,8 @@ DeactivateRC SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet)
return DeactivateRC::LeavePage;
}
-void SvxTransparenceTabPage::PointChanged(vcl::Window* , RectPoint eRcPt)
+void SvxTransparenceTabPage::PointChanged(vcl::Window* , RectPoint )
{
- eRP = eRcPt;
}
More information about the Libreoffice-commits
mailing list