summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/svx/ctredlin.hxx1
-rw-r--r--include/svx/fmmodel.hxx1
-rw-r--r--include/svx/frmdirlbox.hxx6
-rw-r--r--include/svx/gridctrl.hxx1
-rw-r--r--include/svx/itemwin.hxx2
-rw-r--r--include/svx/langbox.hxx1
-rw-r--r--include/svx/nbdtmg.hxx12
-rw-r--r--include/svx/pagectrl.hxx7
-rw-r--r--include/svx/paraprev.hxx7
-rw-r--r--include/svx/relfld.hxx4
-rw-r--r--include/svx/sidebar/LineWidthPopup.hxx2
-rw-r--r--include/svx/svddrgv.hxx4
-rw-r--r--include/svx/svdedtv.hxx12
-rw-r--r--include/svx/svdedxv.hxx5
-rw-r--r--include/svx/svdetc.hxx3
-rw-r--r--include/svx/svdmodel.hxx8
-rw-r--r--include/svx/svdmrkv.hxx5
17 files changed, 12 insertions, 69 deletions
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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 18:27:09 +0000