summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/editeng/acorrcfg.hxx4
-rw-r--r--include/editeng/formatbreakitem.hxx18
-rw-r--r--include/editeng/keepitem.hxx12
-rw-r--r--include/editeng/lrspitem.hxx20
-rw-r--r--include/editeng/memberids.hrc2
-rw-r--r--include/editeng/numitem.hxx6
-rw-r--r--include/editeng/outliner.hxx10
-rw-r--r--include/editeng/protitem.hxx6
-rw-r--r--include/editeng/spltitem.hxx16
-rw-r--r--include/editeng/svxacorr.hxx4
-rw-r--r--include/editeng/svxfont.hxx2
-rw-r--r--include/editeng/svxrtf.hxx2
-rw-r--r--include/editeng/swafopt.hxx18
-rw-r--r--include/filter/msfilter/msdffimp.hxx8
-rw-r--r--include/svl/zforlist.hxx4
-rw-r--r--include/svtools/svparser.hxx2
-rw-r--r--include/svx/clipboardctl.hxx2
-rw-r--r--include/svx/clipfmtitem.hxx12
-rw-r--r--include/svx/hlnkitem.hxx2
-rw-r--r--include/svx/optgrid.hxx24
20 files changed, 87 insertions, 87 deletions
diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx
index 1a90fb301e7c..e2fd887ad02e 100644
--- a/include/editeng/acorrcfg.hxx
+++ b/include/editeng/acorrcfg.hxx
@@ -96,8 +96,8 @@ public:
// the pointer is transferred to the possession of the ConfigItems!
void SetAutoCorrect( SvxAutoCorrect* );
- bool IsAutoFmtByInput() const { return bAutoFmtByInput; }
- void SetAutoFmtByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();}
+ bool IsAutoFormatByInput() const { return bAutoFmtByInput; }
+ void SetAutoFormatByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();}
bool IsSaveRelFile() const { return bFileRel; }
void SetSaveRelFile( bool bSet ) { bFileRel = bSet; aSwConfig.SetModified(); }
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index 65a1bf12cc81..7dee5d66e039 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -24,7 +24,7 @@
#include <editeng/editengdllapi.h>
-// class SvxFmtBreakItem -------------------------------------------------
+// class SvxFormatBreakItem -------------------------------------------------
/* [Description]
@@ -33,15 +33,15 @@
*/
#define FMTBREAK_NOAUTO ((sal_uInt16)0x0001)
-class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxFormatBreakItem : public SfxEnumItem
{
public:
TYPEINFO_OVERRIDE();
- inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
+ inline SvxFormatBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
const sal_uInt16 nWhich );
- inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak );
- inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy );
+ inline SvxFormatBreakItem( const SvxFormatBreakItem& rBreak );
+ inline SvxFormatBreakItem& operator=( const SvxFormatBreakItem& rCpy );
// "pure virtual Methods" from SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -69,17 +69,17 @@ public:
};
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak,
+inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak,
const sal_uInt16 _nWhich ) :
SfxEnumItem( _nWhich, (sal_uInt16)eBreak )
{}
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) :
+inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxFormatBreakItem& rBreak ) :
SfxEnumItem( rBreak )
{}
-inline SvxFmtBreakItem& SvxFmtBreakItem::operator=(
- const SvxFmtBreakItem& rBreak )
+inline SvxFormatBreakItem& SvxFormatBreakItem::operator=(
+ const SvxFormatBreakItem& rBreak )
{
SetValue( rBreak.GetValue() );
return *this;
diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx
index 1092311baeda..4646cf75b919 100644
--- a/include/editeng/keepitem.hxx
+++ b/include/editeng/keepitem.hxx
@@ -23,21 +23,21 @@
#include <editeng/editengdllapi.h>
-// class SvxFmtKeepItem ------------------------------------------------
+// class SvxFormatKeepItem ------------------------------------------------
/* [Description]
This item describes a logical variable "keep paragraphs together?".
*/
-class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFormatKeepItem : public SfxBoolItem
{
public:
TYPEINFO_OVERRIDE();
- inline SvxFmtKeepItem( const bool bKeep /*= false*/,
+ inline SvxFormatKeepItem( const bool bKeep /*= false*/,
const sal_uInt16 _nWhich );
- inline SvxFmtKeepItem& operator=( const SvxFmtKeepItem& rSplit );
+ inline SvxFormatKeepItem& operator=( const SvxFormatKeepItem& rSplit );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -50,11 +50,11 @@ public:
OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
};
-inline SvxFmtKeepItem::SvxFmtKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
+inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
SfxBoolItem( _nWhich, bKeep )
{}
-inline SvxFmtKeepItem& SvxFmtKeepItem::operator=( const SvxFmtKeepItem& rKeep )
+inline SvxFormatKeepItem& SvxFormatKeepItem::operator=( const SvxFormatKeepItem& rKeep )
{
SetValue( rKeep.GetValue() );
return *this;
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 123264e9cd89..4e1b0796bbd6 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -36,7 +36,7 @@
0 coordinate for the first line indent:
UI UI LAYOUT UI/TEXT UI/TEXT (Where?)
- SetTxtLeft SetTxtFirst GetLeft GetTxtLeft GetTxtFirst (What?)
+ SetTextLeft SetTxtFirst GetLeft GetTextLeft GetTxtFirst (What?)
500 -500 0 500 -500 (How much?)
500 0 500 500 0
500 +500 500 500 +500
@@ -115,16 +115,16 @@ public:
inline sal_uInt16 GetPropRight() const { return nPropRightMargin;}
// The UI/text interface:
- inline void SetTxtLeft( const long nL, const sal_uInt16 nProp = 100 );
- inline long GetTxtLeft() const { return nTxtLeft; }
+ inline void SetTextLeft( const long nL, const sal_uInt16 nProp = 100 );
+ inline long GetTextLeft() const { return nTxtLeft; }
- inline void SetTxtFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
- inline short GetTxtFirstLineOfst() const { return nFirstLineOfst; }
- inline void SetPropTxtFirstLineOfst( const sal_uInt16 nProp = 100 )
+ inline void SetTextFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
+ inline short GetTextFirstLineOfst() const { return nFirstLineOfst; }
+ inline void SetPropTextFirstLineOfst( const sal_uInt16 nProp = 100 )
{ nPropFirstLineOfst = nProp; }
- inline sal_uInt16 GetPropTxtFirstLineOfst() const
+ inline sal_uInt16 GetPropTextFirstLineOfst() const
{ return nPropFirstLineOfst; }
- inline void SetTxtFirstLineOfstValue( const short nValue )
+ inline void SetTextFirstLineOfstValue( const short nValue )
{ nFirstLineOfst = nValue; }
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
@@ -159,7 +159,7 @@ inline void SvxLRSpaceItem::SetRight( const long nR, const sal_uInt16 nProp )
nRightMargin = (nR * nProp) / 100;
nPropRightMargin = nProp;
}
-inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
+inline void SvxLRSpaceItem::SetTextFirstLineOfst( const short nF,
const sal_uInt16 nProp )
{
nFirstLineOfst = short((long(nF) * nProp ) / 100);
@@ -167,7 +167,7 @@ inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
AdjustLeft();
}
-inline void SvxLRSpaceItem::SetTxtLeft( const long nL, const sal_uInt16 nProp )
+inline void SvxLRSpaceItem::SetTextLeft( const long nL, const sal_uInt16 nProp )
{
if (0 == nL)
{
diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.hrc
index 1e9e623a8466..d3768a8237a1 100644
--- a/include/editeng/memberids.hrc
+++ b/include/editeng/memberids.hrc
@@ -172,7 +172,7 @@
#define MID_BACK_COLOR_TRANSPARENCY 10
#define MID_SHADING_VALUE 11
-//SvxFmtBreakItem
+//SvxFormatBreakItem
#define MID_BREAK_BEFORE 0
#define MID_BREAK_AFTER 1
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index ae7b3150d72c..bcf8b29b054a 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -71,7 +71,7 @@ public:
void SetShowSymbol(bool bSet) {bShowSymbol = bSet;}
bool IsShowSymbol()const{return bShowSymbol;}
- bool IsTxtFmt() const
+ bool IsTextFormat() const
{
return com::sun::star::style::NumberingType::NUMBER_NONE != nNumType &&
com::sun::star::style::NumberingType::CHAR_SPECIAL != nNumType &&
@@ -163,8 +163,8 @@ public:
void SetSuffix(const OUString& rSet) { sSuffix = rSet;}
const OUString& GetSuffix() const { return sSuffix;}
- void SetCharFmtName(const OUString& rSet){ sCharStyleName = rSet; }
- virtual OUString GetCharFmtName()const;
+ void SetCharFormatName(const OUString& rSet){ sCharStyleName = rSet; }
+ virtual OUString GetCharFormatName()const;
void SetBulletFont(const vcl::Font* pFont);
const vcl::Font* GetBulletFont() const {return pBulletFont;}
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 4b47caeb97ec..5a2dbe9f8cf9 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -524,14 +524,14 @@ public:
const SvxFieldItem& GetField() const { return rFldItem; }
- Color* GetTxtColor() const { return pTxtColor; }
- void SetTxtColor( const Color& rColor )
+ Color* GetTextColor() const { return pTxtColor; }
+ void SetTextColor( const Color& rColor )
{ delete pTxtColor; pTxtColor = new Color( rColor ); }
- Color* GetFldColor() const { return pFldColor; }
- void SetFldColor( const Color& rColor )
+ Color* GetFieldColor() const { return pFldColor; }
+ void SetFieldColor( const Color& rColor )
{ delete pFldColor; pFldColor = new Color( rColor ); }
- void ClearFldColor()
+ void ClearFieldColor()
{ delete pFldColor; pFldColor = 0; }
sal_Int32 GetPara() const { return nPara; }
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index 66fa1a30d1ca..119a8dd3a4ba 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -57,10 +57,10 @@ public:
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
- bool IsCntntProtected() const { return bCntnt; }
+ bool IsContentProtected() const { return bCntnt; }
bool IsSizeProtected() const { return bSize; }
bool IsPosProtected() const { return bPos; }
- void SetCntntProtect( bool bNew ) { bCntnt = bNew; }
+ void SetContentProtect( bool bNew ) { bCntnt = bNew; }
void SetSizeProtect ( bool bNew ) { bSize = bNew; }
void SetPosProtect ( bool bNew ) { bPos = bNew; }
@@ -77,7 +77,7 @@ inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId )
inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy )
{
- bCntnt = rCpy.IsCntntProtected();
+ bCntnt = rCpy.IsContentProtected();
bSize = rCpy.IsSizeProtected();
bPos = rCpy.IsPosProtected();
return *this;
diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index f84ce3b348bc..c5c8b769d8b5 100644
--- a/include/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
@@ -24,22 +24,22 @@
class SvXMLUnitConverter;
-// class SvxFmtSplitItem -------------------------------------------------
+// class SvxFormatSplitItem -------------------------------------------------
/* [Description]
This item describes a logical variable "split paragraph yes or no".
*/
-class EDITENG_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFormatSplitItem : public SfxBoolItem
{
public:
TYPEINFO_OVERRIDE();
- virtual ~SvxFmtSplitItem();
+ virtual ~SvxFormatSplitItem();
- inline SvxFmtSplitItem( const bool bSplit /*= true*/,
+ inline SvxFormatSplitItem( const bool bSplit /*= true*/,
const sal_uInt16 nWh );
- inline SvxFmtSplitItem& operator=( const SvxFmtSplitItem& rSplit );
+ inline SvxFormatSplitItem& operator=( const SvxFormatSplitItem& rSplit );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -52,12 +52,12 @@ public:
OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
};
-inline SvxFmtSplitItem::SvxFmtSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
+inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
SfxBoolItem( nWh, bSplit )
{}
-inline SvxFmtSplitItem& SvxFmtSplitItem::operator=(
- const SvxFmtSplitItem& rSplit )
+inline SvxFormatSplitItem& SvxFormatSplitItem::operator=(
+ const SvxFormatSplitItem& rSplit )
{
SetValue( rSplit.GetValue() );
return *this;
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index d4438d42d835..18fb82a31315 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -232,7 +232,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
OUString sShareAutoCorrFile, sUserAutoCorrFile;
- SvxSwAutoFmtFlags aSwFlags; // StarWriter AutoFormat Flags
+ SvxSwAutoFormatFlags aSwFlags; // StarWriter AutoFormat Flags
// all languages in a table
boost::ptr_map<LanguageTag, SvxAutoCorrectLanguageLists>* pLangTable;
@@ -328,7 +328,7 @@ public:
// Query/Set the current settings of AutoCorrect
long GetFlags() const { return nFlags; }
- inline SvxSwAutoFmtFlags& GetSwFlags() { return aSwFlags;}
+ inline SvxSwAutoFormatFlags& GetSwFlags() { return aSwFlags;}
bool IsAutoCorrFlag( long nFlag ) const
{ return (nFlags & nFlag) != 0; }
void SetAutoCorrFlag( long nFlag, bool bOn = true );
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 51a0c0dcdde6..c84df967ac0d 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -89,7 +89,7 @@ public:
Size GetPhysTxtSize( const OutputDevice *pOut, const OUString &rTxt );
- Size GetTxtSize( const OutputDevice *pOut, const OUString &rTxt,
+ Size GetTextSize( const OutputDevice *pOut, const OUString &rTxt,
const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const;
void QuickDrawText( OutputDevice *pOut, const Point &rPos, const OUString &rTxt,
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 39290ec9f376..42098f663220 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -225,7 +225,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
// Execute pard / plain
void RTFPardPlain( bool bPard, SfxItemSet** ppSet );
- void BuildWhichTbl();
+ void BuildWhichTable();
enum RTF_CharTypeDef
{
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 7bfcb353f3e5..5cf829d94ff8 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -59,7 +59,7 @@ public:
} // namespace editeng
// Class of options for AutoFormat
-struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
+struct EDITENG_DLLPUBLIC SvxSwAutoFormatFlags
{
vcl::Font aBulletFont;
vcl::Font aByInputBulletFont;
@@ -83,7 +83,7 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
bool bChgUserColl : 1;
bool bChgEnumNum : 1;
- bool bAFmtByInput : 1;
+ bool bAFormatByInput : 1;
bool bDelEmptyNode : 1;
bool bSetNumRule : 1;
@@ -109,10 +109,10 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
bool bAutoCmpltAppendBlanc : 1;
bool bAutoCmpltShowAsTip : 1;
- bool bAFmtDelSpacesAtSttEnd : 1;
- bool bAFmtDelSpacesBetweenLines : 1;
- bool bAFmtByInpDelSpacesAtSttEnd : 1;
- bool bAFmtByInpDelSpacesBetweenLines : 1;
+ bool bAFormatDelSpacesAtSttEnd : 1;
+ bool bAFormatDelSpacesBetweenLines : 1;
+ bool bAFormatByInpDelSpacesAtSttEnd : 1;
+ bool bAFormatByInpDelSpacesBetweenLines : 1;
bool bAutoCmpltKeepList : 1;
@@ -122,9 +122,9 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
bDummy8 : 1
;
- SvxSwAutoFmtFlags();
- SvxSwAutoFmtFlags( const SvxSwAutoFmtFlags& rAFFlags ) { *this = rAFFlags; }
- SvxSwAutoFmtFlags& operator=( const SvxSwAutoFmtFlags& );
+ SvxSwAutoFormatFlags();
+ SvxSwAutoFormatFlags( const SvxSwAutoFormatFlags& rAFFlags ) { *this = rAFFlags; }
+ SvxSwAutoFormatFlags& operator=( const SvxSwAutoFormatFlags& );
};
#endif
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index fc54adeaba6b..a3572ca48f7b 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -55,7 +55,7 @@ class Polygon;
namespace tools { class PolyPolygon; }
class FmFormModel;
class SdrModel;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
struct SvxMSDffBLIPInfo;
struct SvxMSDffShapeInfo;
@@ -695,12 +695,12 @@ public:
void StoreShapeOrder(sal_uLong nId,
sal_uLong nTxBx,
SdrObject* pObject,
- SwFlyFrmFmt* pFly = 0,
+ SwFlyFrameFormat* pFly = 0,
short nHdFtSection = 0) const;
void ExchangeInShapeOrder(SdrObject* pOldObject,
sal_uLong nTxBx,
- SwFlyFrmFmt* pFly,
+ SwFlyFrameFormat* pFly,
SdrObject* pObject) const;
void RemoveFromShapeOrder( SdrObject* pObject ) const;
@@ -778,7 +778,7 @@ struct SvxMSDffShapeOrder
{
sal_uLong nShapeId; ///< shape id used in PLCF SPA and in mso_fbtSp (FSP)
sal_uLong nTxBxComp; ///< chain or box number in the Text-Box-Story (or NULL)
- SwFlyFrmFmt* pFly; ///< format of frame that was inserted as a replacement
+ SwFlyFrameFormat* pFly; ///< format of frame that was inserted as a replacement
///< for a Sdr-Text object in Writer - needed for
///< chaining!
short nHdFtSection; ///< used by Writer to find out if linked frames are in
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index bc553c013966..0127662ebcfb 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -593,9 +593,9 @@ public:
SvNumberFormatterIndexTable* MergeFormatter(SvNumberFormatter& rNewTable);
/// Whether a merge table is present or not
- bool HasMergeFmtTbl() const;
+ bool HasMergeFormatTable() const;
/// Return the new format index for an old format index, if a merge table exists
- sal_uInt32 GetMergeFmtIndex( sal_uInt32 nOldFmt ) const;
+ sal_uInt32 GetMergeFormatIndex( sal_uInt32 nOldFmt ) const;
/** Convert the ugly old tools' Table type bloated with new'ed sal_uInt32
entries merge table to ::std::map with old index key and new index key.
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index b8705dc16ffc..eabdf18c6807 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -169,7 +169,7 @@ public:
// build a Which-Map 'rWhichMap' from an array of WhichIds
// 'pWhichIds'. It has the length 'nWhichIds'.
// The WhichMap is not deleted.
- static void BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap,
+ static void BuildWhichTable( std::vector<sal_uInt16> &rWhichMap,
sal_uInt16 *pWhichIds,
sal_uInt16 nWhichIds );
};
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 64ed0d94e832..6b00c35b14fd 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -28,7 +28,7 @@
#include <svx/svxdllapi.h>
class PopupMenu;
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipBoardControl : public SfxToolBoxControl
{
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index e8a9453f2da8..052ed8ffc6e7 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -24,11 +24,11 @@
#include <svl/poolitem.hxx>
#include <svx/svxdllapi.h>
-struct SvxClipboardFmtItem_Impl;
+struct SvxClipboardFormatItem_Impl;
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFmtItem : public SfxPoolItem
+class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFormatItem : public SfxPoolItem
{
- SvxClipboardFmtItem_Impl* pImpl;
+ SvxClipboardFormatItem_Impl* pImpl;
protected:
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -36,9 +36,9 @@ protected:
public:
TYPEINFO_OVERRIDE();
- SvxClipboardFmtItem( sal_uInt16 nId = 0 );
- SvxClipboardFmtItem( const SvxClipboardFmtItem& );
- virtual ~SvxClipboardFmtItem();
+ SvxClipboardFormatItem( sal_uInt16 nId = 0 );
+ SvxClipboardFormatItem( const SvxClipboardFormatItem& );
+ virtual ~SvxClipboardFormatItem();
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index a448aa120844..06c4af78bfbb 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -87,7 +87,7 @@ public:
void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro );
void SetMacroTable( const SvxMacroTableDtor& rTbl );
- const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTable; }
+ const SvxMacroTableDtor* GetMacroTable() const { return pMacroTable; }
void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; }
sal_uInt16 GetMacroEvents() const { return nMacroEvents; }
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 9aeee8d1c8c1..68b8072ebfa0 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -48,23 +48,23 @@ public:
SvxOptionsGrid();
~SvxOptionsGrid();
- void SetFldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;}
- void SetFldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;}
- void SetFldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;}
- void SetFldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;}
- void SetFldSnapX( sal_uInt32 nSet){nFldSnapX = nSet;}
- void SetFldSnapY ( sal_uInt32 nSet){nFldSnapY = nSet;}
+ void SetFieldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;}
+ void SetFieldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;}
+ void SetFieldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;}
+ void SetFieldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;}
+ void SetFieldSnapX( sal_uInt32 nSet){nFldSnapX = nSet;}
+ void SetFieldSnapY ( sal_uInt32 nSet){nFldSnapY = nSet;}
void SetUseGridSnap( bool bSet ) {bUseGridsnap = bSet;}
void SetSynchronize( bool bSet ) {bSynchronize = bSet;}
void SetGridVisible( bool bSet ) {bGridVisible = bSet;}
void SetEqualGrid( bool bSet ) {bEqualGrid = bSet;}
- sal_uInt32 GetFldDrawX( ) const { return nFldDrawX; }
- sal_uInt32 GetFldDivisionX() const { return nFldDivisionX;}
- sal_uInt32 GetFldDrawY ( ) const { return nFldDrawY; }
- sal_uInt32 GetFldDivisionY() const { return nFldDivisionY;}
- sal_uInt32 GetFldSnapX( ) const { return nFldSnapX; }
- sal_uInt32 GetFldSnapY ( ) const { return nFldSnapY; }
+ sal_uInt32 GetFieldDrawX( ) const { return nFldDrawX; }
+ sal_uInt32 GetFieldDivisionX() const { return nFldDivisionX;}
+ sal_uInt32 GetFieldDrawY ( ) const { return nFldDrawY; }
+ sal_uInt32 GetFieldDivisionY() const { return nFldDivisionY;}
+ sal_uInt32 GetFieldSnapX( ) const { return nFldSnapX; }
+ sal_uInt32 GetFieldSnapY ( ) const { return nFldSnapY; }
bool GetUseGridSnap( ) const { return bUseGridsnap; }
bool GetSynchronize( ) const { return bSynchronize; }
bool GetGridVisible( ) const { return bGridVisible; }
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 12:57:26 +0000