cui/source/tabpages/page.cxx | 37 -----------------------------
cui/source/tabpages/paragrph.cxx | 20 ++++-----------
include/svx/ctredlin.hxx | 1
include/svx/fmmodel.hxx | 1
include/svx/frmdirlbox.hxx | 6 ----
include/svx/gridctrl.hxx | 1
include/svx/itemwin.hxx | 2 -
include/svx/langbox.hxx | 1
include/svx/nbdtmg.hxx | 12 +++------
include/svx/pagectrl.hxx | 7 -----
include/svx/paraprev.hxx | 7 ++---
include/svx/relfld.hxx | 4 ---
include/svx/sidebar/LineWidthPopup.hxx | 2 -
include/svx/svddrgv.hxx | 4 ---
include/svx/svdedtv.hxx | 12 ---------
include/svx/svdedxv.hxx | 5 +--
include/svx/svdetc.hxx | 3 --
include/svx/svdmodel.hxx | 8 ------
include/svx/svdmrkv.hxx | 5 ---
sd/source/ui/dlg/brkdlg.cxx | 2 -
sd/source/ui/func/futext.cxx | 2 -
sd/source/ui/view/sdview.cxx | 1
svx/inc/svdibrow.hxx | 4 ---
svx/source/dialog/ctredlin.cxx | 3 --
svx/source/dialog/frmdirlbox.cxx | 1
svx/source/dialog/hdft.cxx | 35 ---------------------------
svx/source/dialog/langbox.cxx | 4 ---
svx/source/dialog/pagectrl.cxx | 31 ------------------------
svx/source/dialog/paraprev.cxx | 4 ---
svx/source/dialog/relfld.cxx | 5 ---
svx/source/fmcomp/gridcell.cxx | 7 -----
svx/source/fmcomp/gridctrl.cxx | 3 --
svx/source/form/fmPropBrw.cxx | 3 --
svx/source/form/fmmodel.cxx | 12 ---------
svx/source/inc/fmPropBrw.hxx | 1
svx/source/inc/gridcell.hxx | 3 --
svx/source/sidebar/line/LineWidthPopup.cxx | 10 -------
svx/source/sidebar/nbdtmg.cxx | 2 -
svx/source/svdraw/svddrgv.cxx | 5 ---
svx/source/svdraw/svdedtv.cxx | 9 -------
svx/source/svdraw/svdedxv.cxx | 1
svx/source/svdraw/svdetc.cxx | 4 ---
svx/source/svdraw/svdibrow.cxx | 8 ------
svx/source/svdraw/svdmodel.cxx | 10 -------
svx/source/svdraw/svdmrkv.cxx | 1
svx/source/tbxctrls/itemwin.cxx | 12 ++-------
sw/source/core/draw/dview.cxx | 1
sw/source/uibase/frmdlg/colex.cxx | 14 ----------
48 files changed, 26 insertions(+), 310 deletions(-)
New commits:
commit 95c348afa8f4f17c058c449ded75025175af0e4a
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Jun 20 14:26:45 2017 +0200
loplugin:unusedfields in svx part2
Change-Id: Ie9fd55b71a152f428a397d9917918f0e9de39aaf
Reviewed-on: https://gerrit.libreoffice.org/39014
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 437cdb41a0e5..147242fe1df1 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1163,14 +1163,6 @@ void SvxPageDescPage::ResetBackground_Impl(const
SfxItemSet& rSet)
}
m_pBspWin->setHeaderFillAttributes(aHeaderFillAttributes);
- nWhich = GetWhich(SID_ATTR_BORDER_OUTER);
-
- if(rTmpSet.GetItemState(nWhich) == SfxItemState::SET)
- {
- const SvxBoxItem& rItem =
- static_cast<const SvxBoxItem&>(rTmpSet.Get( nWhich ));
- m_pBspWin->SetHdBorder( rItem );
- }
}
}
@@ -1207,13 +1199,6 @@ void SvxPageDescPage::ResetBackground_Impl(const
SfxItemSet& rSet)
}
m_pBspWin->setFooterFillAttributes(aFooterFillAttributes);
- nWhich = GetWhich(SID_ATTR_BORDER_OUTER);
-
- if(rTmpSet.GetItemState(nWhich) == SfxItemState::SET)
- {
- const SvxBoxItem& rItem = static_cast< const SvxBoxItem&
>(rTmpSet.Get(nWhich));
- m_pBspWin->SetFtBorder(rItem);
- }
}
}
@@ -1241,12 +1226,6 @@ void SvxPageDescPage::ResetBackground_Impl(const
SfxItemSet& rSet)
}
m_pBspWin->setPageFillAttributes(aPageFillAttributes);
- pItem = GetItem(rSet, SID_ATTR_BORDER_OUTER);
-
- if(pItem)
- {
- m_pBspWin->SetBorder(static_cast< const SvxBoxItem& >(*pItem));
- }
}
void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
@@ -1311,14 +1290,6 @@ void SvxPageDescPage::InitHeadFoot_Impl( const
SfxItemSet& rSet )
}
m_pBspWin->setHeaderFillAttributes(aHeaderFillAttributes);
- const sal_uInt16 nWhich(GetWhich(SID_ATTR_BORDER_OUTER));
-
- if ( rHeaderSet.GetItemState( nWhich ) >= SfxItemState::DEFAULT )
- {
- const SvxBoxItem& rItem =
- static_cast<const SvxBoxItem&>(rHeaderSet.Get( nWhich ));
- m_pBspWin->SetHdBorder( rItem );
- }
}
// evaluate footer attributes
@@ -1373,14 +1344,6 @@ void SvxPageDescPage::InitHeadFoot_Impl( const
SfxItemSet& rSet )
}
m_pBspWin->setFooterFillAttributes(aFooterFillAttributes);
- const sal_uInt16 nWhich(GetWhich(SID_ATTR_BORDER_OUTER));
-
- if ( rFooterSet.GetItemState( nWhich ) >= SfxItemState::DEFAULT )
- {
- const SvxBoxItem& rItem =
- static_cast<const SvxBoxItem&>(rFooterSet.Get( nWhich ));
- m_pBspWin->SetFtBorder( rItem );
- }
}
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 986f433852e0..38827706dec8 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -609,11 +609,11 @@ void SvxStdParagraphTabPage::EnableRelativeMode()
{
DBG_ASSERT( GetItemSet().GetParent(), "RelativeMode, but no parent-set!" );
- m_pLeftIndent->EnableRelativeMode( 0, 999, 5 );
- m_pFLineIndent->EnableRelativeMode( 0, 999, 5 );
- m_pRightIndent->EnableRelativeMode( 0, 999, 5 );
- m_pTopDist->EnableRelativeMode( 0, 999, 5 );
- m_pBottomDist->EnableRelativeMode( 0, 999, 5 );
+ m_pLeftIndent->EnableRelativeMode( 0, 999 );
+ m_pFLineIndent->EnableRelativeMode( 0, 999 );
+ m_pRightIndent->EnableRelativeMode( 0, 999 );
+ m_pTopDist->EnableRelativeMode( 0, 999 );
+ m_pBottomDist->EnableRelativeMode( 0, 999 );
bRelativeMode = true;
}
@@ -895,19 +895,11 @@ void SvxStdParagraphTabPage::UpdateExample_Impl()
case LLINESPACE_115:
case LLINESPACE_15:
case LLINESPACE_2:
- m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos );
- break;
-
case LLINESPACE_PROP:
- m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos,
- (sal_uInt16)m_pLineDistAtPercentBox->Denormalize(
m_pLineDistAtPercentBox->GetValue() ) );
- break;
-
case LLINESPACE_MIN:
case LLINESPACE_DURCH:
case LLINESPACE_FIX:
- m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos,
- (sal_uInt16)GetCoreValue( *m_pLineDistAtMetricBox,
MapUnit::MapTwip ) );
+ m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos );
break;
}
m_pExampleWin->Invalidate();
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index aaacfd23954b..8d115784e9e0 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -113,7 +113,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxRedlinTable : public
SvSimpleTable
private:
- bool bIsCalc;
sal_uInt16 nDatePos;
bool bAuthor;
bool bDate;
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index 4cbe427411ef..5f064bae4151 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -59,7 +59,6 @@ public:
virtual SdrPage* AllocPage(bool bMasterPage) override;
virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF)
override;
virtual SdrPage* RemovePage(sal_uInt16 nPgNum) override;
- virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) override;
virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF)
override;
virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum) override;
diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index 8f2a5c191f12..6fe30a571457 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -51,12 +51,6 @@ public:
void SelectEntryValue( SvxFrameDirection eDirection );
/** Returns the currently selected frame direction. */
SvxFrameDirection GetSelectEntryValue() const;
-
- /** Saves the currently selected frame direction. */
- void SaveValue() { meSaveValue = GetSelectEntryValue(); }
-
-private:
- SvxFrameDirection meSaveValue; /// Saved value for later comparison.
};
typedef FrameDirectionListBox FrameDirListBox;
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 0af05ee18ce9..5889af9bff89 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -297,7 +297,6 @@ private:
bool m_bHandle : 1;
bool m_bFilterMode : 1;
bool m_bWantDestruction : 1;
- bool m_bInAdjustDataSource : 1;
bool m_bPendingAdjustRows : 1; // if an async adjust is
pending, is it for AdjustRows or AdjustDataSource ?
bool m_bHideScrollbars : 1;
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index e09c811e553b..d0dd8826bc3e 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -104,7 +104,6 @@ protected:
private:
sal_uInt16 nCurPos;
bool bSelect;
- bool bRelease;
static void ReleaseFocus_Impl();
};
@@ -122,7 +121,6 @@ protected:
private:
sal_uInt16 nCurPos;
- bool bRelease;
static void ReleaseFocus_Impl();
};
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index d7a7f26e9a40..e26545a6797a 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -95,7 +95,6 @@ protected:
OUString m_aAllString;
std::unique_ptr<css::uno::Sequence< sal_Int16 >>
m_pSpellUsedLang;
- SvxLanguageListFlags m_nLangList;
bool m_bHasLangNone;
bool m_bLangNoneIsLangAll;
bool m_bWithCheckmark;
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 004fecd7b777..030b692ec8c3 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -77,7 +77,7 @@ class SVX_DLLPUBLIC BulletsSettings
{
public:
bool bIsCustomized;
- rtl::OUString sDescription;
+ OUString sDescription;
sal_Unicode cBulletChar;
vcl::Font aFont;
BulletsSettings() : bIsCustomized(false), cBulletChar(0) {}
@@ -87,16 +87,12 @@ public:
class SVX_DLLPUBLIC NumberSettings_Impl
{
public:
- bool bIsCustomized;
- rtl::OUString sDescription;
- sal_uInt16 nIndex; //index in the tab page display
- sal_uInt16 nIndexDefault;
- NumSettings_Impl *pNumSetting;
+ bool bIsCustomized;
+ OUString sDescription;
+ NumSettings_Impl* pNumSetting;
public:
NumberSettings_Impl() :
bIsCustomized(false),
- nIndex((sal_uInt16)0xFFFF),
- nIndexDefault((sal_uInt16)0xFFFF),
pNumSetting(nullptr)
{}
};
diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx
index 438018e08fbd..cf2065cc4f38 100644
--- a/include/svx/pagectrl.hxx
+++ b/include/svx/pagectrl.hxx
@@ -40,7 +40,6 @@ private:
long nLeft;
long nRight;
- SvxBoxItem* pBorder;
bool bResetBackground;
bool bFrameDirection;
SvxFrameDirection nFrameDirection;
@@ -49,13 +48,11 @@ private:
long nHdRight;
long nHdDist;
long nHdHeight;
- SvxBoxItem* pHdBorder;
long nFtLeft;
long nFtRight;
long nFtDist;
long nFtHeight;
- SvxBoxItem* pFtBorder;
drawinglayer::attribute::SdrAllFillAttributesHelperPtr
maHeaderFillAttributes;
drawinglayer::attribute::SdrAllFillAttributesHelperPtr
maFooterFillAttributes;
@@ -82,7 +79,6 @@ protected:
public:
SvxPageWindow(vcl::Window* pParent);
virtual ~SvxPageWindow() override;
- virtual void dispose() override;
void setHeaderFillAttributes(const
drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes)
{
@@ -113,7 +109,6 @@ public:
void SetBottom(long nNew) { nBottom = nNew; }
void SetLeft(long nNew) { nLeft = nNew; }
void SetRight(long nNew) { nRight = nNew; }
- void SetBorder(const SvxBoxItem& rNew);
long GetTop() const { return nTop; }
long GetBottom() const { return nBottom; }
@@ -124,7 +119,6 @@ public:
void SetHdRight(long nNew) { nHdRight = nNew; }
void SetHdDist(long nNew) { nHdDist = nNew; }
void SetHdHeight(long nNew) { nHdHeight = nNew; }
- void SetHdBorder(const SvxBoxItem& rNew);
long GetHdLeft() const { return nHdLeft; }
long GetHdRight() const { return nHdRight; }
@@ -135,7 +129,6 @@ public:
void SetFtRight(long nNew) { nFtRight = nNew; }
void SetFtDist(long nNew) { nFtDist = nNew; }
void SetFtHeight(long nNew) { nFtHeight = nNew; }
- void SetFtBorder(const SvxBoxItem& rNew);
long GetFtLeft() const { return nFtLeft; }
long GetFtRight() const { return nFtRight; }
diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx
index a7ac58eb1f35..e604ffbd867f 100644
--- a/include/svx/paraprev.hxx
+++ b/include/svx/paraprev.hxx
@@ -52,10 +52,9 @@ private:
SvxAdjust eLastLine;
// line distance
SvxPrevLineSpace eLine;
- sal_uInt16 nLineVal;
OUString aText;
- tools::Rectangle Lines[9];
+ tools::Rectangle Lines[9];
protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect) override;
@@ -94,9 +93,9 @@ public:
{
eLastLine = eNew;
}
- void SetLineSpace( SvxPrevLineSpace eNew, sal_uInt16 nNew = 0 )
+ void SetLineSpace( SvxPrevLineSpace eNew )
{
- eLine = eNew; nLineVal = nNew;
+ eLine = eNew;
}
void SetText( const OUString& rStr ) override
{
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 26feb9a81a1e..1964c716de64 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -31,7 +31,6 @@ class SVX_DLLPUBLIC SvxRelativeField : public MetricField
private:
sal_uInt16 nRelMin;
sal_uInt16 nRelMax;
- sal_uInt16 nRelStep;
bool bRelativeMode;
bool bRelative;
bool bNegativeEnabled;
@@ -42,8 +41,7 @@ protected:
public:
SvxRelativeField(vcl::Window* pParent, WinBits nBits, FieldUnit eUnit);
- void EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax,
- sal_uInt16 nStep );
+ void EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax );
void SetRelative( bool bRelative );
bool IsRelative() const { return bRelative; }
void EnableNegativeMode() {bNegativeEnabled = true;}
diff --git a/include/svx/sidebar/LineWidthPopup.hxx
b/include/svx/sidebar/LineWidthPopup.hxx
index fd7a0ea8215b..4f4823e0abe7 100644
--- a/include/svx/sidebar/LineWidthPopup.hxx
+++ b/include/svx/sidebar/LineWidthPopup.hxx
@@ -48,9 +48,7 @@ private:
MapUnit m_eMapUnit;
bool m_bVSFocus;
bool m_bCustom;
- bool m_bCloseByEdit;
long m_nCustomWidth;
- long m_nTmpCustomWidth;
VclPtr<MetricField> m_xMFWidth;
VclPtr<VclContainer> m_xBox;
VclPtr<LineWidthValueSet> m_xVSWidth;
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 76228abf3c16..e3b0e153e641 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -34,16 +34,14 @@ protected:
SdrHdl* mpDragHdl;
SdrDragMethod* mpCurrentSdrDragMethod;
SdrUndoGeoObj* mpInsPointUndo;
- tools::Rectangle maDragLimit;
+ tools::Rectangle maDragLimit;
OUString maInsPointUndoStr;
SdrHdlKind meDragHdl;
sal_uIntPtr mnDragXorPolyLimit;
sal_uIntPtr mnDragXorPointLimit;
- sal_uInt16 mnDetailedEdgeDraggingLimit;
bool mbFramDrag : 1; // currently frame
dragging
- bool mbDragSpecial : 1; // currently Special
Obj-dragging
bool mbMarkedHitMovesAlways : 1; // Persistent
bool mbDragLimit : 1; // Limit on SnapRect
instead of BoundRect
bool mbDragHdl : 1; // TRUE: RefPt is slid
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index f849846f720a..81c680f1c085 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -82,7 +82,6 @@ protected:
bool bGroupPossible : 1;
bool bUnGroupPossible : 1;
bool bGrpEnterPossible : 1;
- bool bDeletePossible : 1;
bool bToTopPossible : 1;
bool bToBtmPossible : 1;
bool bReverseOrderPossible : 1;
@@ -92,7 +91,6 @@ protected:
bool bCombineNoPolyPolyPossible : 1;
bool bDismantleMakeLinesPossible : 1;
bool bOrthoDesiredOnMarked : 1;
- bool bMoreThanOneNotMovable : 1; // more then one
objects are not moveable
bool bOneOrMoreMovable : 1; // at least one
object is moveable
bool bMoreThanOneNoMovRot : 1; // more then one
object is not movable nor turnable (Crook)
bool bContortionPossible : 1; // all polygones
(grouped if necessary)
@@ -112,12 +110,8 @@ protected:
bool bCanConvToPath : 1;
bool bCanConvToPoly : 1;
bool bCanConvToContour : 1;
- bool bCanConvToPathLineToArea : 1;
- bool bCanConvToPolyLineToArea : 1;
bool bMoveProtect : 1;
bool bResizeProtect : 1;
- // maintain Z-order of the virtual objects (Writer)
- bool bBundleVirtObj : 1;
private:
SVX_DLLPRIVATE void ImpClearVars();
@@ -397,12 +391,6 @@ public:
void DoImportMarkedMtf(SvdProgressInfo *pProgrInfo=nullptr);
bool IsImportMtfPossible() const { ForcePossibilities(); return
bImportMtfPossible; }
- // If the mode VirtualObjectBundling is switched on, all ToTop/ToBtm
- // virtual objects which reference the same object, are contained
- // in their Z-order (Writer).
- // Default setting is sal_False=switched off.
- void SetVirtualObjectBundling(bool bOn) { bBundleVirtObj=bOn; }
-
// override SdrMarkView, for internal use
virtual void MarkListHasChanged() override;
virtual void ModelHasChanged() override;
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index b1bcbec1d39e..58956b9d143c 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -70,13 +70,12 @@ protected:
OutlinerView* pTextEditOutlinerView; // current view of the
outliners
VclPtr<vcl::Window> pTextEditWin; // matching window to
pTextEditOutlinerView
vcl::Cursor* pTextEditCursorMerker; // to restore the
cursor in each window
- ImpSdrEditPara* pEditPara; // trash bin for
everything else to stay compatible
SdrObject* pMacroObj;
SdrPageView* pMacroPV;
VclPtr<vcl::Window> pMacroWin;
- tools::Rectangle aTextEditArea;
- tools::Rectangle aMinTextEditArea;
+ tools::Rectangle aTextEditArea;
+ tools::Rectangle aMinTextEditArea;
Link<EditFieldInfo*,void> aOldCalcFieldValueLink; // for call the old
handler
Point aMacroDownPos;
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 19ebf31f3468..ef0619358141 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -128,7 +128,6 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16*
pOldWhichTable, sal_uInt16 nRange
class SVX_DLLPUBLIC SvdProgressInfo
{
private:
- size_t m_nSumActionCount; // Sum of all Actions
size_t m_nSumCurAction; // Sum of all handled Actions
size_t m_nActionCount; // Count of Actions in the current object
@@ -145,7 +144,7 @@ private:
public:
SvdProgressInfo( const Link<void*,bool>& _pLink );
- void Init( size_t _nSumActionCount, size_t _nObjCount );
+ void Init( size_t _nObjCount );
void SetNextObject();
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 281c3d3ad8bf..95e613ef767d 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -175,7 +175,6 @@ protected:
SdrUndoGroup* pAktUndoGroup; // for deeper
sal_uInt16 nUndoLevel; // undo nesting
bool bMyPool:1; // to clean up pMyPool from 303a
- bool bUIOnlyDecimalMark:1; // see eUIUnit
bool mbUndoEnabled:1; // If false no undo is recorded or
we are during the execution of an undo action
bool bExtColorTable:1; // ne separate ColorTable
bool mbChanged:1;
@@ -188,7 +187,6 @@ protected:
bool bPasteResize:1; // Objects are being resized due to
Paste with different MapMode
bool bStarDrawPreviewMode:1;
bool mbDisableTextEditUsesCommonUndoManager:1;
- SvStreamEndian nStreamNumberFormat;
sal_uInt16 nDefaultTabulator;
sal_uInt32 nMaxUndoCount;
@@ -196,7 +194,6 @@ protected:
public:
- sal_uInt16 nStarDrawPreviewMasterPageNum;
rtl::Reference<SvxForbiddenCharactersTable> mpForbiddenCharactersTable;
SdrSwapGraphicsMode nSwapGraphicsMode;
@@ -214,11 +211,6 @@ public:
// Color, Dash, Line-End, Hatch, Gradient, Bitmap property lists ...
o3tl::enumarray<XPropertyListType, XPropertyListRef> maProperties;
- // New src638: NumberFormatter for drawing layer and
- // method for getting it. It is constructed on demand
- // and destroyed when destroying the SdrModel.
- SvNumberFormatter* mpNumberFormatter;
-public:
sal_uInt16 getHandoutPageCount() const { return mnHandoutPageCount; }
void setHandoutPageCount( sal_uInt16 nHandoutPageCount ) {
mnHandoutPageCount = nHandoutPageCount; }
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 2a049fc5288e..3009d9871bbb 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -124,7 +124,6 @@ protected:
bool mbDesignMode : 1; // DesignMode for
SdrUnoObj
bool mbForceFrameHandles : 1; // Persistent -
FrameDrag also for single objects
bool mbPlusHdlAlways : 1; // Persistent
- bool mbMarkHdlWhenTextEdit : 1; // Persistent,
default=FALSE
bool mbInsPolyPoint : 1; // at this time
InsPolyPointDragging
bool mbMarkedObjRectDirty : 1;
bool mbMrkPntDirty : 1;
@@ -348,10 +347,6 @@ public:
void SetPlusHandlesAlwaysVisible(bool bOn);
bool IsPlusHandlesAlwaysVisible() const { return mbPlusHdlAlways; }
- // Are Handles visible during TextEdit (in double size)?
- // Persistent, default=FALSE
- void SetMarkHdlWhenTextEdit(bool bOn) { mbMarkHdlWhenTextEdit=bOn; }
-
bool HasMarkableGluePoints() const;
bool HasMarkedGluePoints() const;
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index e6da3e880f27..78d2ab62a195 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -62,7 +62,7 @@ BreakDlg::BreakDlg(
pProgrInfo = new SvdProgressInfo( LINK(this, BreakDlg, UpDate) );
// every action is edited 3 times in DoImport()
- pProgrInfo->Init( nSumActionCount*3, nObjCount );
+ pProgrInfo->Init( nObjCount );
pDrView = _pDrView;
bCancel = false;
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 488032f4bf54..9262929aabba 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -255,7 +255,6 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
bool bReturn = FuDraw::MouseButtonDown(rMEvt);
- mpView->SetMarkHdlWhenTextEdit(true);
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt,
SdrMouseEventKind::BUTTONDOWN, aVEvt);
@@ -900,7 +899,6 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
bool FuText::KeyInput(const KeyEvent& rKEvt)
{
bool bReturn = false;
- mpView->SetMarkHdlWhenTextEdit(true);
vcl::KeyCode nCode = rKEvt.GetKeyCode();
bool bShift = nCode.IsShift();
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index b3008725d98d..9d9b2dc8d880 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -133,7 +133,6 @@ View::View(SdDrawDocument& rDrawDoc, OutputDevice* pOutDev,
EnableExtendedMouseEventDispatcher(false);
SetUseIncompatiblePathCreateInterface(false);
- SetMarkHdlWhenTextEdit(true);
SetMinMoveDistancePixel(2);
SetHitTolerancePixel(2);
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index bcfe6a1dcc7b..682333ad4401 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -41,13 +41,9 @@ friend class ImpItemEdit;
ImpItemListRow* pAktChangeEntry;
long nLastWhichOfs;
sal_uInt16 nLastWhich;
- sal_uInt16 nLastWhichOben;
- sal_uInt16 nLastWhichUnten;
bool bWhichesButNames;
bool bDontHideIneffectiveItems;
bool bDontSortItems;
- bool bShowWhichIds;
- bool bShowRealValues;
private:
void ImpCtor();
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 79bdc8465bc3..b84393490c6f 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -95,7 +95,6 @@ void SvLBoxColorString::Paint(const Point& rPos,
SvTreeListBox& rDev, vcl::Rende
SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits)
: SvSimpleTable(rParent,nBits)
- , bIsCalc(false)
, nDatePos(WRITER_DATE)
, bAuthor(false)
, bDate(false)
@@ -163,9 +162,9 @@ sal_Int32 SvxRedlinTable::ColCompare(SvTreeListEntry*
pLeft,SvTreeListEntry* pRi
return nCompare;
}
+
void SvxRedlinTable::SetCalcView()
{
- bIsCalc=true;
nDatePos=CALC_DATE;
}
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 83ecb4bb0ac1..d4fccb836360 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -38,7 +38,6 @@ inline SvxFrameDirection lclVoidToEnum( void* pDirection )
FrameDirectionListBox::FrameDirectionListBox( vcl::Window* pParent, WinBits
nBits )
: ListBox(pParent, nBits)
- , meSaveValue(SvxFrameDirection::Horizontal_LR_TB)
{
}
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 6a4d0bb2ece3..ac1fa114b4e7 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -730,20 +730,6 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, Button*, void)
}
}
- {
- const sal_uInt16 nWhich = GetWhich(SID_ATTR_BORDER_OUTER);
-
- if(pBBSet->GetItemState(nWhich) == SfxItemState::SET)
- {
- const SvxBoxItem& rItem = static_cast<const
SvxBoxItem&>(pBBSet->Get(nWhich));
-
- if(nId == SID_ATTR_PAGE_HEADERSET)
- m_pBspWin->SetHdBorder(rItem);
- else
- m_pBspWin->SetFtBorder(rItem);
- }
- }
-
}
UpdateExample();
@@ -806,14 +792,6 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet&
rSet )
}
m_pBspWin->setHeaderFillAttributes(aHeaderFillAttributes);
- nWhich = GetWhich(SID_ATTR_BORDER_OUTER);
-
- if(rTmpSet.GetItemState(nWhich) == SfxItemState::SET)
- {
- const SvxBoxItem& rItem =
- static_cast<const SvxBoxItem&>(rTmpSet.Get(nWhich));
- m_pBspWin->SetHdBorder(rItem);
- }
}
}
@@ -851,12 +829,6 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet&
rSet )
m_pBspWin->setFooterFillAttributes(aFooterFillAttributes);
nWhich = GetWhich(SID_ATTR_BORDER_OUTER);
-
- if(rTmpSet.GetItemState(nWhich) == SfxItemState::SET)
- {
- const SvxBoxItem& rItem = static_cast< const SvxBoxItem&
>(rTmpSet.Get(nWhich));
- m_pBspWin->SetFtBorder(rItem);
- }
}
}
@@ -883,13 +855,6 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet&
rSet )
}
m_pBspWin->setPageFillAttributes(aPageFillAttributes);
- nWhich = GetWhich(SID_ATTR_BORDER_OUTER);
-
- if(rSet.GetItemState(nWhich) >= SfxItemState::DEFAULT)
- {
- const SvxBoxItem& rItem = static_cast< const SvxBoxItem&
>(rSet.Get(nWhich));
- m_pBspWin->SetBorder(rItem);
- }
}
void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index f6ee80824c03..2cb2ec5e7d7a 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -138,7 +138,6 @@ VCL_BUILDER_DECL_FACTORY(SvxLanguageComboBox)
SvxLanguageBoxBase::SvxLanguageBoxBase()
: m_pSpellUsedLang(nullptr)
- , m_nLangList(SvxLanguageListFlags::EMPTY)
, m_bHasLangNone(false)
, m_bLangNoneIsLangAll(false)
, m_bWithCheckmark(false)
@@ -150,7 +149,6 @@ void SvxLanguageBoxBase::ImplLanguageBoxBaseInit()
m_aNotCheckedImage = Image(BitmapEx(RID_SVXBMP_NOTCHECKED));
m_aCheckedImage = Image(BitmapEx(RID_SVXBMP_CHECKED));
m_aAllString = SvxResId( RID_SVXSTR_LANGUAGE_ALL );
- m_nLangList = SvxLanguageListFlags::EMPTY;
m_bHasLangNone = false;
m_bLangNoneIsLangAll = false;
@@ -171,7 +169,6 @@ void SvxLanguageBoxBase::ImplLanguageBoxBaseInit()
if ( bInsert )
InsertLanguage( nLangType );
}
- m_nLangList = SvxLanguageListFlags::ALL;
}
}
@@ -227,7 +224,6 @@ void SvxLanguageBoxBase::SetLanguageList(
SvxLanguageListFlags nLangList,
{
ImplClear();
- m_nLangList = nLangList;
m_bHasLangNone = bHasLangNone;
m_bLangNoneIsLangAll = bLangNoneIsLangAll;
m_bWithCheckmark = bCheckSpellAvail;
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 02eb8d54a5cc..1af0c97f9139 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -46,7 +46,6 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent)
nLeft(0),
nRight(0),
- pBorder(nullptr),
bResetBackground(false),
bFrameDirection(false),
nFrameDirection(SvxFrameDirection::Horizontal_LR_TB),
@@ -56,14 +55,11 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent)
nHdDist(0),
nHdHeight(0),
- pHdBorder(nullptr),
nFtLeft(0),
nFtRight(0),
nFtDist(0),
nFtHeight(0),
- pFtBorder(nullptr),
-
maHeaderFillAttributes(),
maFooterFillAttributes(),
maPageFillAttributes(),
@@ -90,13 +86,6 @@ SvxPageWindow::~SvxPageWindow()
disposeOnce();
}
-void SvxPageWindow::dispose()
-{
- delete pHdBorder;
- delete pFtBorder;
- vcl::Window::dispose();
-}
-
VCL_BUILDER_FACTORY(SvxPageWindow)
void SvxPageWindow::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&)
@@ -404,26 +393,6 @@ void SvxPageWindow::drawFillAttributes(vcl::RenderContext&
rRenderContext,
}
-void SvxPageWindow::SetBorder(const SvxBoxItem& rNew)
-{
- delete pBorder;
- pBorder = new SvxBoxItem(rNew);
-}
-
-
-void SvxPageWindow::SetHdBorder(const SvxBoxItem& rNew)
-{
- delete pHdBorder;
- pHdBorder = new SvxBoxItem(rNew);
-}
-
-
-void SvxPageWindow::SetFtBorder(const SvxBoxItem& rNew)
-{
- delete pFtBorder;
- pFtBorder = new SvxBoxItem(rNew);
-}
-
void SvxPageWindow::EnableFrameDirection(bool bEnable)
{
bFrameDirection = bEnable;
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index 4d64c91aebcc..5a7bc24c3440 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -31,9 +31,7 @@ SvxParaPrevWindow::SvxParaPrevWindow( vcl::Window* pParent,
WinBits nBits) :
nLower ( 0 ),
eAdjust ( SvxAdjust::Left ),
eLastLine ( SvxAdjust::Left ),
- eLine ( SvxPrevLineSpace::N1 ),
- nLineVal ( 0 )
-
+ eLine ( SvxPrevLineSpace::N1 )
{
// Count in Twips by default
SetMapMode(MapMode(MapUnit::MapTwip));
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 84c564f5864e..867086467d8d 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -25,7 +25,6 @@ SvxRelativeField::SvxRelativeField(
: MetricField( pParent, nBits)
, nRelMin(0)
, nRelMax(0)
- , nRelStep(0)
, bRelativeMode(false)
, bRelative(false)
, bNegativeEnabled(false)
@@ -85,13 +84,11 @@ void SvxRelativeField::Modify()
}
-void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin,
- sal_uInt16 nMax, sal_uInt16 nStep )
+void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax )
{
bRelativeMode = true;
nRelMin = nMin;
nRelMax = nMax;
- nRelStep = nStep;
SetUnit( FUNIT_CM );
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 58dd644deedd..f5489e3dda16 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -158,8 +158,6 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos,
const Reference< css::bea
case DataType::DATE:
case DataType::TIME:
case DataType::TIMESTAMP:
- m_bDateTime = true;
- SAL_FALLTHROUGH;
case DataType::BIT:
case DataType::BOOLEAN:
case DataType::TINYINT:
@@ -1215,9 +1213,7 @@ void DbTextField::implSetEffectiveMaxTextLen( sal_Int32
_nMaxLen )
DbFormattedField::DbFormattedField(DbGridColumn& _rColumn)
:DbLimitedLengthField(_rColumn)
- ,m_nKeyType(css::util::NumberFormat::UNDEFINED)
{
-
// if our model's format key changes we want to propagate the new value to
our windows
doPropertyListening( FM_PROP_FORMATKEY );
}
@@ -1335,8 +1331,6 @@ void DbFormattedField::Init( vcl::Window& rParent, const
Reference< XRowSet >& x
if (nFormatKey == -1)
nFormatKey = 0;
- m_nKeyType =
comphelper::getNumberFormatType(m_xSupplier->getNumberFormats(), nFormatKey);
-
static_cast<FormattedField*>(m_pWindow.get())->SetFormatter(pFormatterUsed);
static_cast<FormattedField*>(m_pPainter.get())->SetFormatter(pFormatterUsed);
@@ -1448,7 +1442,6 @@ void DbFormattedField::_propertyChanged( const
PropertyChangeEvent& _rEvent )
if (_rEvent.PropertyName == FM_PROP_FORMATKEY )
{
sal_Int32 nNewKey = _rEvent.NewValue.hasValue() ?
::comphelper::getINT32(_rEvent.NewValue) : 0;
- m_nKeyType =
comphelper::getNumberFormatType(m_xSupplier->getNumberFormats(), nNewKey);
DBG_ASSERT(m_pWindow && m_pPainter,
"DbFormattedField::_propertyChanged : where are my windows ?");
if (m_pWindow)
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index af464e75a3ee..2b0aa598f9bd 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -969,7 +969,6 @@ DbGridControl::DbGridControl(
,m_bHandle(true)
,m_bFilterMode(false)
,m_bWantDestruction(false)
- ,m_bInAdjustDataSource(false)
,m_bPendingAdjustRows(false)
,m_bHideScrollbars( false )
,m_bUpdating(false)
@@ -2252,7 +2251,6 @@ void DbGridControl::AdjustDataSource(bool bFull)
if (nNewPos < 0)// could not find any position
return;
- m_bInAdjustDataSource = true;
if (nNewPos != m_nCurrentPos)
{
if (m_bSynchDisplay)
@@ -2270,7 +2268,6 @@ void DbGridControl::AdjustDataSource(bool bFull)
SetCurrent(nNewPos);
RowModified(nNewPos);
}
- m_bInAdjustDataSource = false;
// if the data cursor was moved from outside, this section is voided
SetNoSelection();
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index e727d526b7a0..7b8e4d02f9e0 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -186,7 +186,6 @@ FmPropBrw::FmPropBrw( const Reference< XComponentContext >&
_xORB, SfxBindings*
:SfxFloatingWindow(_pBindings, _pMgr, _pParent,
WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE) )
,SfxControllerItem(SID_FM_PROPERTY_CONTROL, *_pBindings)
,m_bInitialStateChange(true)
- ,m_bInStateChange( false )
,m_xORB(_xORB)
{
@@ -622,7 +621,6 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState
eState, const SfxPool
if (!pState || SID_FM_PROPERTY_CONTROL != nSID)
return;
- m_bInStateChange = true;
try
{
if (eState >= SfxItemState::DEFAULT)
@@ -671,7 +669,6 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState
eState, const SfxPool
{
OSL_FAIL("FmPropBrw::StateChanged: Exception occurred!");
}
- m_bInStateChange = false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index e0dd072fefb5..823632e7f46f 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -39,13 +39,11 @@ struct FmFormModelImplData
{
rtl::Reference<FmXUndoEnvironment> mxUndoEnv;
bool bOpenInDesignIsDefaulted;
- bool bMovingPage;
::boost::optional< sal_Bool >
aControlsUseRefDevice;
FmFormModelImplData()
:bOpenInDesignIsDefaulted( true )
- ,bMovingPage( false )
,aControlsUseRefDevice()
{
}
@@ -109,16 +107,6 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16
nPos)
SdrModel::InsertPage( pPage, nPos );
}
-void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos )
-{
- m_pImpl->bMovingPage = true;
- // see InsertPage for this
-
- SdrModel::MovePage( nPgNum, nNewPos );
-
- m_pImpl->bMovingPage = false;
-}
-
SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum)
{
FmFormPage* pToBeRemovedPage = dynamic_cast< FmFormPage* >( GetPage(
nPgNum ) );
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 04c3a28ab467..5c7ca1cfb643 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -43,7 +43,6 @@ class FmFormShell;
class FmPropBrw : public SfxFloatingWindow, public SfxControllerItem
{
bool m_bInitialStateChange;
- bool m_bInStateChange;
OUString m_sLastActivePage;
css::uno::Reference< css::uno::XComponentContext >
m_xInspectorContext;
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 151a1f19f2eb..74372fc48700 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -91,7 +91,6 @@ private:
bool m_bObject : 1; // does the column reference an object
datatype?
bool m_bHidden : 1;
bool m_bLocked : 1;
- bool m_bDateTime : 1;
static ::svt::CellControllerRef s_xEmptyController;
// used by locked columns
@@ -113,7 +112,6 @@ public:
,m_bObject(false)
,m_bHidden(false)
,m_bLocked(false)
- ,m_bDateTime(false)
{
}
@@ -413,7 +411,6 @@ class DbFormattedField : public DbLimitedLengthField
{
protected:
css::uno::Reference< css::util::XNumberFormatsSupplier > m_xSupplier;
- sal_Int16 m_nKeyType;
public:
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx
b/svx/source/sidebar/line/LineWidthPopup.cxx
index 45c9f0db3d54..408619a6d364 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -36,9 +36,7 @@ LineWidthPopup::LineWidthPopup(LinePropertyPanelBase& rParent)
, m_eMapUnit(MapUnit::MapTwip)
, m_bVSFocus(true)
, m_bCustom(false)
- , m_bCloseByEdit(false)
, m_nCustomWidth(0)
- , m_nTmpCustomWidth(0)
, m_aIMGCus(BitmapEx(RID_SVXBMP_WIDTH_CUSTOM))
, m_aIMGCusGray(BitmapEx(RID_SVXBMP_WIDTH_CUSTOM_GRAY))
{
@@ -123,8 +121,6 @@ IMPL_LINK(LineWidthPopup, VSSelectHdl, ValueSet*,
/*pControl*/, void)
m_rParent.setLineWidth(aWidthItem);
m_rParent.SetWidthIcon(iPos);
m_rParent.SetWidth(nVal);
- m_bCloseByEdit = false;
- m_nTmpCustomWidth = 0;
}
else if (iPos == 9)
{//last custom
@@ -136,8 +132,6 @@ IMPL_LINK(LineWidthPopup, VSSelectHdl, ValueSet*,
/*pControl*/, void)
XLineWidthItem aWidthItem( nVal );
m_rParent.setLineWidth(aWidthItem);
m_rParent.SetWidth(nVal);
- m_bCloseByEdit = false;
- m_nTmpCustomWidth = 0;
}
else
{
@@ -170,16 +164,12 @@ IMPL_LINK(LineWidthPopup, MFModifyHdl, Edit&,
/*rControl*/, void)
sal_Int32 nNewWidth = (short)m_xMFWidth->Denormalize( nVal );
XLineWidthItem aWidthItem(nNewWidth);
m_rParent.setLineWidth(aWidthItem);
-
- m_bCloseByEdit = true;
- m_nTmpCustomWidth = nTmp;
}
void LineWidthPopup::SetWidthSelect(long lValue, bool bValuable, MapUnit
eMapUnit)
{
m_bVSFocus = true;
m_xVSWidth->SetSelItem(0);
- m_bCloseByEdit = false;
m_eMapUnit = eMapUnit;
SvtViewOptions aWinOpt( EViewType::Window, SIDEBAR_LINE_WIDTH_GLOBAL_VALUE
);
if (aWinOpt.Exists())
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index a23d69a54305..aa690a5d7be6 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -418,8 +418,6 @@ void NumberingTypeMgr::Init()
{
NumSettings_Impl* pNew =
lcl_CreateNumberingSettingsPtr(pValuesArr[i]);
NumberSettings_Impl* pNumEntry = new NumberSettings_Impl;
- pNumEntry->nIndex = i + 1;
- pNumEntry->nIndexDefault = i;
pNumEntry->pNumSetting = pNew;
if ( i < 8 )
pNumEntry->sDescription = SvxResId(
RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i );
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 2c4d78762e03..1f8ed61d7817 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -56,7 +56,6 @@ void SdrDragView::ImpClearVars()
meDragHdl=SdrHdlKind::Move;
mpDragHdl=nullptr;
mbDragHdl=false;
- mbDragSpecial=false;
mpCurrentSdrDragMethod=nullptr;
mbDragStripes=false;
mbDragWithCopy=false;
@@ -67,7 +66,6 @@ void SdrDragView::ImpClearVars()
mnDragXorPolyLimit=100;
mnDragXorPointLimit=500;
mbNoDragXorPolys=false;
- mnDetailedEdgeDraggingLimit=10;
mbResizeAtCenter=false;
mbCrookAtCenter=false;
@@ -206,7 +204,6 @@ bool SdrDragView::BegDragObj(const Point& rPnt,
OutputDevice* pOut, SdrHdl* pHdl
SetDragWithCopy(false);
//TODO: aAni.Reset();
mpCurrentSdrDragMethod=nullptr;
- mbDragSpecial=false;
mbDragLimit=false;
SdrDragMode eTmpMode=meDragMode;
if (eTmpMode==SdrDragMode::Move && pHdl!=nullptr &&
pHdl->GetKind()!=SdrHdlKind::Move) {
@@ -462,7 +459,6 @@ bool SdrDragView::BegDragObj(const Point& rPnt,
OutputDevice* pOut, SdrHdl* pHdl
if(!mpCurrentSdrDragMethod)
{
// fallback to DragSpecial if no interaction
defined
- mbDragSpecial = true;
mpCurrentSdrDragMethod = new
SdrDragObjOwn(*this);
}
}
@@ -486,7 +482,6 @@ bool SdrDragView::BegDragObj(const Point& rPnt,
OutputDevice* pOut, SdrHdl* pHdl
// Obj may not Move SpecialDrag, so try with MoveFrameDrag
delete mpCurrentSdrDragMethod;
mpCurrentSdrDragMethod = nullptr;
- mbDragSpecial=false;
if (!IsMoveAllowed())
return false;
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index cdb208e571eb..0382ffc77659 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -48,7 +48,6 @@ void SdrEditView::ImpResetPossibilityFlags()
bGroupPossible =false;
bUnGroupPossible =false;
bGrpEnterPossible =false;
- bDeletePossible =false;
bToTopPossible =false;
bToBtmPossible =false;
bReverseOrderPossible =false;
@@ -60,7 +59,6 @@ void SdrEditView::ImpResetPossibilityFlags()
bDismantleMakeLinesPossible=false;
bOrthoDesiredOnMarked =false;
- bMoreThanOneNotMovable =false;
bOneOrMoreMovable =false;
bMoreThanOneNoMovRot =false;
bContortionPossible =false;
@@ -80,8 +78,6 @@ void SdrEditView::ImpResetPossibilityFlags()
bCanConvToPath =false;
bCanConvToPoly =false;
bCanConvToContour =false;
- bCanConvToPathLineToArea=false;
- bCanConvToPolyLineToArea=false;
bMoveProtect =false;
bResizeProtect =false;
}
@@ -90,7 +86,6 @@ void SdrEditView::ImpClearVars()
{
ImpResetPossibilityFlags();
bPossibilitiesDirty=true; // << Purify didn't like this
- bBundleVirtObj=false;
}
SdrEditView::SdrEditView(SdrModel* pModel1, OutputDevice* pOut):
@@ -492,7 +487,6 @@ void SdrEditView::CheckPossibilities()
}
}
bCombineNoPolyPolyPossible=bCombinePossible;
- bDeletePossible=true;
// accept transformations for now
bMoveAllowed =true;
bResizeFreeAllowed=true;
@@ -591,8 +585,6 @@ void SdrEditView::CheckPossibilities()
// ConvertToCurve: If at least one can be converted, that is
fine.
if (aInfo.bCanConvToPath ) bCanConvToPath
=true;
if (aInfo.bCanConvToPoly ) bCanConvToPoly
=true;
- if (aInfo.bCanConvToPathLineToArea)
bCanConvToPathLineToArea=true;
- if (aInfo.bCanConvToPolyLineToArea)
bCanConvToPolyLineToArea=true;
// Combine/Dismantle
if(bCombinePossible)
@@ -624,7 +616,6 @@ void SdrEditView::CheckPossibilities()
}
}
- bMoreThanOneNotMovable=nMovableCount<nMarkCount-1;
bOneOrMoreMovable=nMovableCount!=0;
bGrpEnterPossible=bUnGroupPossible;
}
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 2643788d7e2c..cb7fa37892f1 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -76,7 +76,6 @@ void SdrObjEditView::ImpClearVars()
pTextEditPV=nullptr;
pTextEditWin=nullptr;
pTextEditCursorMerker=nullptr;
- pEditPara=nullptr;
bTextEditNewObj=false;
bMacroDown=false;
pMacroObj=nullptr;
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 3e78145dcf7f..ba73c511b18b 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -496,7 +496,6 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16*
pOldWhichTable, sal_uInt16 nRange
SvdProgressInfo::SvdProgressInfo( const Link<void*,bool>&_rLink )
{
maLink = _rLink;
- m_nSumActionCount = 0;
m_nSumCurAction = 0;
m_nObjCount = 0;
@@ -509,9 +508,8 @@ SvdProgressInfo::SvdProgressInfo( const
Link<void*,bool>&_rLink )
m_nCurInsert = 0;
}
-void SvdProgressInfo::Init( size_t nSumActionCount, size_t nObjCount )
+void SvdProgressInfo::Init( size_t nObjCount )
{
- m_nSumActionCount = nSumActionCount;
m_nObjCount = nObjCount;
}
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 303ecff96f45..f3aab1a70f86 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -232,15 +232,9 @@ void SdrItemBrowserControl::ImpCtor()
pAktChangeEntry = nullptr;
nLastWhichOfs = 0;
nLastWhich = 0;
- nLastWhichOben = 0; // not implemented yet
- nLastWhichUnten = 0; // not implemented yet
bWhichesButNames = false;
bDontHideIneffectiveItems = false;
bDontSortItems = false;
- bShowWhichIds = false;
- bShowRealValues = false;
- bShowWhichIds = true; // not implemented yet
- bShowRealValues = true; // not implemented yet
InsertDataColumn(
ITEMBROWSER_WHICHCOL_ID,
@@ -459,8 +453,6 @@ void SdrItemBrowserControl::ImpSaveWhich()
nLastWhichOfs=nPos-nTop;
if (nTop<0) nTop=0;
if (nBtm>=(long)aList.size()) nBtm=aList.size()-1;
- nLastWhichOben=ImpGetEntry(nTop)->nWhichId;
- nLastWhichUnten=ImpGetEntry(nBtm)->nWhichId;
}
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index e970442823d1..d487bfd25832 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -124,7 +124,6 @@ void SdrModel::ImpCtor(SfxItemPool* pPool,
::comphelper::IEmbeddedHelper* _pEmbe
eUIUnit=FUNIT_MM;
aUIScale=Fraction(1,1);
nUIUnitDecimalMark=0;
- bUIOnlyDecimalMark=false;
pLayerAdmin=nullptr;
pItemPool=pPool;
bMyPool=false;
@@ -150,12 +149,9 @@ void SdrModel::ImpCtor(SfxItemPool* pPool,
::comphelper::IEmbeddedHelper* _pEmbe
nSwapGraphicsMode=SdrSwapGraphicsMode::DEFAULT;
bPasteResize=false;
bReadOnly=false;
- nStreamNumberFormat=SvStreamEndian::BIG;
nDefaultTabulator=0;
- mpNumberFormatter = nullptr;
bTransparentTextFrames=false;
bStarDrawPreviewMode = false;
- nStarDrawPreviewMasterPageNum = SDRPAGE_NOTFOUND;
mpForbiddenCharactersTable = nullptr;
mbModelLocked = false;
mpOutlinerCache = nullptr;
@@ -172,9 +168,6 @@ void SdrModel::ImpCtor(SfxItemPool* pPool,
::comphelper::IEmbeddedHelper* _pEmbe
else
mnCharCompressType = CharCompressType::NONE;
-#ifdef OSL_LITENDIAN
- nStreamNumberFormat=SvStreamEndian::LITTLE;
-#endif
bExtColorTable=bUseExtColorTable;
if ( pPool == nullptr )
@@ -304,8 +297,6 @@ SdrModel::~SdrModel()
mpForbiddenCharactersTable.clear();
- delete mpNumberFormatter;
-
delete mpImpl->mpUndoFactory;
}
@@ -1042,7 +1033,6 @@ void SdrModel::ImpSetUIUnit()
// end preparations, set member values
aUIUnitFact = Fraction(sal_Int32(nMul), sal_Int32(nDiv));
- bUIOnlyDecimalMark = (nMul == nDiv);
TakeUnitStr(eUIUnit, aUIUnitStr);
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 333eb014a9c9..c2094783068d 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -138,7 +138,6 @@ void SdrMarkView::ImpClearVars()
mbMarkedPointsRectsDirty=false;
mbMarkHandlesHidden = false;
mbMrkPntDirty=false;
- mbMarkHdlWhenTextEdit=false;
// Migrate selections
BrkMarkObj();
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 92f845b7ac48..fb513a9bd596 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -383,8 +383,7 @@ void SvxMetricField::DataChanged( const DataChangedEvent&
rDCEvt )
SvxFillTypeBox::SvxFillTypeBox( vcl::Window* pParent ) :
FillTypeLB( pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL | WB_TABSTOP
),
nCurPos ( 0 ),
- bSelect ( false ),
- bRelease( true )
+ bSelect ( false )
{
SetSizePixel( LogicToPixel( Size(40, 40 ),MapUnit::MapAppFont ));
Fill();
@@ -433,10 +432,9 @@ bool SvxFillTypeBox::EventNotify( NotifyEvent& rNEvt )
bHandled = true;
GetSelectHdl().Call( *this );
break;
+
case KEY_TAB:
- bRelease = false;
GetSelectHdl().Call( *this );
- bRelease = true;
break;
case KEY_ESCAPE:
@@ -463,9 +461,7 @@ void SvxFillTypeBox::ReleaseFocus_Impl()
SvxFillAttrBox::SvxFillAttrBox( vcl::Window* pParent ) :
FillAttrLB( pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL | WB_TABSTOP
),
- nCurPos( 0 ),
- bRelease( true )
-
+ nCurPos( 0 )
{
SetPosPixel( Point( 90, 0 ) );
SetSizePixel( LogicToPixel( Size(50, 80 ), MapUnit::MapAppFont ));
@@ -500,9 +496,7 @@ bool SvxFillAttrBox::EventNotify( NotifyEvent& rNEvt )
bHandled = true;
break;
case KEY_TAB:
- bRelease = false;
GetSelectHdl().Call( *this );
- bRelease = true;
break;
case KEY_ESCAPE:
SelectEntryPos( nCurPos );
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index ce0b4b804e89..a35e124c57c0 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -103,7 +103,6 @@ SwDrawView::SwDrawView( SwViewShellImp &rI, SdrModel *pMd,
OutputDevice *pOutDev
SetHlplVisible( false );
SetGlueVisible( false );
SetFrameDragSingles();
- SetVirtualObjectBundling( true );
SetSwapAsynchron();
EnableExtendedKeyInputDispatcher( false );
diff --git a/sw/source/uibase/frmdlg/colex.cxx
b/sw/source/uibase/frmdlg/colex.cxx
index 3b9c1212159e..ca063234fea1 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -136,13 +136,6 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(
aTempSet));
}
-
- if ( rHeaderSet.GetItemState( RES_BOX ) == SfxItemState::SET )
- {
- const SvxBoxItem& rItem =
- static_cast<const SvxBoxItem&>(rHeaderSet.Get( RES_BOX ));
- SetHdBorder( rItem );
- }
}
else
SetHeader( false );
@@ -182,13 +175,6 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(
aTempSet));
}
-
- if( rFooterSet.GetItemState( RES_BOX ) == SfxItemState::SET )
- {
- const SvxBoxItem& rItem =
- static_cast<const SvxBoxItem&>(rFooterSet.Get( RES_BOX ));
- SetFtBorder( rItem );
- }
}
else
SetFooter( false );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
