This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new 9f486f9493 Fix typo (valu -> value)
9f486f9493 is described below
commit 9f486f9493793cbaaae5daa1516d81e587c68ddb
Author: mseidel <[email protected]>
AuthorDate: Thu Jan 22 12:21:45 2026 +0100
Fix typo (valu -> value)
(cherry picked from commit c05f2616a465dea96e35a8861f2e4c1436673fea)
---
main/svx/inc/svx/nbdtmg.hxx | 69 +++++++++++++++++++-------------------
main/svx/source/sidebar/nbdtmg.cxx | 41 ++++++++++------------
2 files changed, 52 insertions(+), 58 deletions(-)
diff --git a/main/svx/inc/svx/nbdtmg.hxx b/main/svx/inc/svx/nbdtmg.hxx
index 1fd4a0c1ff..893c3ce121 100755
--- a/main/svx/inc/svx/nbdtmg.hxx
+++ b/main/svx/inc/svx/nbdtmg.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef _NBDTMG_HXX
#define _NBDTMG_HXX
#include "svx/svxdllapi.h"
@@ -43,7 +41,7 @@ namespace svx { namespace sidebar {
#define DEFAULT_BULLET_TYPES
8
#define DEFAULT_NONE
10
#define DEFAULT_NUM_TYPE_MEMBER
5
-#define DEFAULT_NUM_VALUSET_COUNT
8
+#define DEFAULT_NUM_VALUESET_COUNT
8
#define DEFAULT_NUMBERING_CACHE_FORMAT_VERSION 0x10
typedef sal_uInt16 NBOType;
@@ -63,7 +61,7 @@ namespace eNBType
const NBOType GRAPHICBULLETS = 0x02;
}
-class SVX_DLLPUBLIC NumSettings_Impl
+class SVX_DLLPUBLIC NumSettings_Impl
{
public:
short nNumberType;
@@ -77,7 +75,7 @@ class SVX_DLLPUBLIC NumSettings_Impl
rtl::OUString sSuffix;
rtl::OUString sBulletChar;
rtl::OUString sBulletFont;
- SvxBrushItem *pBrushItem;
+ SvxBrushItem *pBrushItem;
Size aSize;
public:
@@ -96,7 +94,7 @@ SV_IMPL_PTRARR( NumSettingsArr_Impl, NumSettings_ImplPtr )*/
class NumSettingsArr_Impl;
-class SVX_DLLPUBLIC BulletsSettings
+class SVX_DLLPUBLIC BulletsSettings
{
public:
sal_Bool bIsCustomized;
@@ -110,7 +108,7 @@ class SVX_DLLPUBLIC BulletsSettings
virtual ~BulletsSettings(){}
};
-class SVX_DLLPUBLIC BulletsSettings_Impl:public BulletsSettings
+class SVX_DLLPUBLIC BulletsSettings_Impl:public BulletsSettings
{
public:
sal_Unicode cBulletChar;
@@ -124,7 +122,7 @@ class SVX_DLLPUBLIC BulletsSettings_Impl:public
BulletsSettings
virtual ~BulletsSettings_Impl(){}
};
-class SVX_DLLPUBLIC GrfBulDataRelation: public BulletsSettings
+class SVX_DLLPUBLIC GrfBulDataRelation: public BulletsSettings
{
public:
String sGrfName;
@@ -142,7 +140,7 @@ class SVX_DLLPUBLIC GrfBulDataRelation: public
BulletsSettings
virtual ~GrfBulDataRelation(){}
};
-class SVX_DLLPUBLIC MixBulletsSettings_Impl
+class SVX_DLLPUBLIC MixBulletsSettings_Impl
{
public:
NBType eType;
@@ -159,7 +157,7 @@ class SVX_DLLPUBLIC MixBulletsSettings_Impl
~MixBulletsSettings_Impl(){}
};
-class SVX_DLLPUBLIC NumberSettings_Impl
+class SVX_DLLPUBLIC NumberSettings_Impl
{
public:
sal_Bool bIsCustomized;
@@ -179,7 +177,7 @@ class SVX_DLLPUBLIC NumberSettings_Impl
class NumberSettingsArr_Impl;
-class SVX_DLLPUBLIC OutlineSettings_Impl
+class SVX_DLLPUBLIC OutlineSettings_Impl
{
public:
sal_Bool bIsCustomized;
@@ -231,7 +229,6 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
};
-
class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
{
friend class OutlineTypeMgr;
@@ -257,11 +254,11 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
static BulletsTypeMgr* GetInstance()
{
if ( _instance == 0 )
- {
- _instance = new BulletsTypeMgr(eNBOType::BULLETS);
- }
+ {
+ _instance = new
BulletsTypeMgr(eNBOType::BULLETS);
+ }
- return _instance;
+ return _instance;
}
};
@@ -288,11 +285,11 @@ class SVX_DLLPUBLIC GraphicBulletsTypeMgr: public
NBOTypeMgrBase
static GraphicBulletsTypeMgr* GetInstance()
{
if ( _instance == 0 )
- {
- _instance = new
GraphicBulletsTypeMgr(eNBOType::BULLETS);
- }
+ {
+ _instance = new
GraphicBulletsTypeMgr(eNBOType::BULLETS);
+ }
- return _instance;
+ return _instance;
}
};
@@ -319,11 +316,11 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public
NBOTypeMgrBase
static MixBulletsTypeMgr* GetInstance()
{
if ( _instance == 0 )
- {
- _instance = new
MixBulletsTypeMgr(eNBOType::MIXBULLETS);
- }
+ {
+ _instance = new
MixBulletsTypeMgr(eNBOType::MIXBULLETS);
+ }
- return _instance;
+ return _instance;
}
};
@@ -351,20 +348,20 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public
NBOTypeMgrBase
static NumberingTypeMgr* GetInstance()
{
if ( _instance == 0 )
- {
- _instance = new
NumberingTypeMgr(eNBOType::NUMBERING);
- }
+ {
+ _instance = new
NumberingTypeMgr(eNBOType::NUMBERING);
+ }
- return _instance;
+ return _instance;
}
};
class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase
{
public:
- //NumSettingsArr_Impl*
pNumSettingsArrs[DEFAULT_NUM_VALUSET_COUNT];
- OutlineSettings_Impl*
pOutlineSettingsArrs[DEFAULT_NUM_VALUSET_COUNT];
- OutlineSettings_Impl*
pDefaultOutlineSettingsArrs[DEFAULT_NUM_VALUSET_COUNT];
+ //NumSettingsArr_Impl*
pNumSettingsArrs[DEFAULT_NUM_VALUESET_COUNT];
+ OutlineSettings_Impl*
pOutlineSettingsArrs[DEFAULT_NUM_VALUESET_COUNT];
+ OutlineSettings_Impl*
pDefaultOutlineSettingsArrs[DEFAULT_NUM_VALUESET_COUNT];
static OutlineTypeMgr* _instance;
public:
OutlineTypeMgr(const NBOType aType);
@@ -380,12 +377,14 @@ class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase
static OutlineTypeMgr* GetInstance()
{
if ( _instance == 0 )
- {
- _instance = new OutlineTypeMgr(eNBOType::OUTLINE);
- }
+ {
+ _instance = new
OutlineTypeMgr(eNBOType::OUTLINE);
+ }
- return _instance;
+ return _instance;
}
};
}}
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/sidebar/nbdtmg.cxx
b/main/svx/source/sidebar/nbdtmg.cxx
index 35f1f6dd7f..1eb58e2417 100755
--- a/main/svx/source/sidebar/nbdtmg.cxx
+++ b/main/svx/source/sidebar/nbdtmg.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "precompiled_svx.hxx"
#ifndef _NBDTMG_HXX
#include <svx/nbdtmg.hxx>
@@ -100,7 +98,7 @@ using rtl::OUString;
namespace svx { namespace sidebar {
#define NUM_TYPE_MEMBER 4
-#define NUM_VALUSET_COUNT 16
+#define NUM_VALUESET_COUNT 16
#define MAX_VALUESET_GRAPHIC 30
typedef NumSettings_Impl* NumSettings_ImplPtr;
@@ -241,7 +239,7 @@ void NBOTypeMgrBase::ImplLoad(String filename)
{
*pIStm >> nNumIndex;
sal_uInt16 mLevel = 0x1;
- while (nNumIndex>=0 &&
nNumIndex<DEFAULT_NUM_VALUSET_COUNT) {
+ while (nNumIndex>=0 &&
nNumIndex<DEFAULT_NUM_VALUESET_COUNT) {
SvxNumRule aNum(*pIStm);
// bullet color in font properties is not
stored correctly. Need set transparency bits manually
for(sal_uInt16 i = 0; i < aNum.GetLevelCount();
i++)
@@ -278,7 +276,7 @@ void NBOTypeMgrBase::ImplStore(String filename)
sal_Int32 nNumIndex;
nVersion = DEFAULT_NUMBERING_CACHE_FORMAT_VERSION;
*pOStm << nVersion;
- for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT;
nItem++ ) {
+ for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUESET_COUNT;
nItem++ ) {
if (IsCustomized(nItem)) {
SvxNumRule aDefNumRule(
NUM_BULLET_REL_SIZE|NUM_CONTINUOUS|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE|NUM_SYMBOL_ALIGNMENT,10,
sal_False ,
SVX_RULETYPE_NUMBERING,SvxNumberFormat::LABEL_ALIGNMENT);
@@ -318,7 +316,7 @@ SfxMapUnit NBOTypeMgrBase::GetMapUnit()
return eCoreUnit;
}
/***************************************************************************************************
-**********************Character Bullet Type
lib**********************************************************
+**********************Character Bullet Type
lib*****************************************************
****************************************************************************************************/
BulletsTypeMgr* BulletsTypeMgr::_instance = 0;
BulletsSettings_Impl* BulletsTypeMgr::pActualBullets[] ={0,0,0,0,0,0,0,0};
@@ -601,7 +599,7 @@ Font BulletsTypeMgr::GetBulCharFont(sal_uInt16 nIndex)
return aRet;
}
/***************************************************************************************************
-**********************Graphic Bullet Type
lib***********************************************************
+**********************Graphic Bullet Type
lib*******************************************************
****************************************************************************************************/
GraphicBulletsTypeMgr* GraphicBulletsTypeMgr::_instance = 0;
GraphicBulletsTypeMgr::GraphicBulletsTypeMgr(const NBOType aType):
@@ -844,7 +842,7 @@ String GraphicBulletsTypeMgr::GetGrfName(sal_uInt16 nIndex)
return sRet;
}
/***************************************************************************************************
-**********************Mix Bullets Type
lib**************************************************************
+**********************Mix Bullets Type
lib**********************************************************
****************************************************************************************************/
MixBulletsTypeMgr* MixBulletsTypeMgr::_instance = 0;
MixBulletsSettings_Impl* MixBulletsTypeMgr::pActualBullets[]
={0,0,0,0,0,0,0,0};
@@ -1389,7 +1387,7 @@ sal_Bool MixBulletsTypeMgr::IsCustomized(sal_uInt16
nIndex)
return bRet;
}
/***************************************************************************************************
-**********************Numbering Type
lib**************************************************************
+**********************Numbering Type
lib************************************************************
****************************************************************************************************/
NumberingTypeMgr* NumberingTypeMgr::_instance = 0;
@@ -1471,7 +1469,7 @@ void NumberingTypeMgr::Init()
{
aNumberings =
xDefNum->getDefaultContinuousNumberingLevels( aLocale );
- sal_Int32 nLength = aNumberings.getLength() >
DEFAULT_NUM_VALUSET_COUNT ? DEFAULT_NUM_VALUSET_COUNT :aNumberings.getLength();
+ sal_Int32 nLength = aNumberings.getLength() >
DEFAULT_NUM_VALUESET_COUNT ? DEFAULT_NUM_VALUESET_COUNT
:aNumberings.getLength();
const Sequence<PropertyValue>* pValuesArr =
aNumberings.getConstArray();
for(sal_Int32 i = 0; i < nLength; i++)
@@ -1558,7 +1556,6 @@ sal_uInt16
NumberingTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 m
}
}
-
return (sal_uInt16)0xFFFF;
}
@@ -1689,16 +1686,16 @@ NumberSettings_Impl*
NumberingTypeMgr::GetNumSettingByIndex(sal_uInt16 nIndex) c
return pRet;
}
/***************************************************************************************************
-**********************Multi-level /Outline Type
lib*******************************************************
+**********************Multi-level /Outline Type
lib*************************************************
****************************************************************************************************/
OutlineTypeMgr* OutlineTypeMgr::_instance = 0;
OutlineTypeMgr::OutlineTypeMgr(const NBOType aType):
NBOTypeMgrBase(aType)//,
- //pNumSettingsArrs( new NumSettingsArr_Impl[DEFAULT_NUM_VALUSET_COUNT] )
+ //pNumSettingsArrs( new NumSettingsArr_Impl[DEFAULT_NUM_VALUESET_COUNT]
)
{
Init();
- for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT; nItem++ )
+ for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUESET_COUNT; nItem++ )
{
pDefaultOutlineSettingsArrs[nItem] =
pOutlineSettingsArrs[nItem];
}
@@ -1709,10 +1706,10 @@ OutlineTypeMgr::OutlineTypeMgr(const NBOType aType):
OutlineTypeMgr::OutlineTypeMgr(const NBOType aType,const SfxItemSet* pArg):
NBOTypeMgrBase(aType,pArg)//,
- //pNumSettingsArrs( new NumSettingsArr_Impl[DEFAULT_NUM_VALUSET_COUNT])
+ //pNumSettingsArrs( new NumSettingsArr_Impl[DEFAULT_NUM_VALUESET_COUNT])
{
Init();
- for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT; nItem++ )
+ for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUESET_COUNT; nItem++ )
{
pDefaultOutlineSettingsArrs[nItem] =
pOutlineSettingsArrs[nItem];
}
@@ -1723,10 +1720,10 @@ OutlineTypeMgr::OutlineTypeMgr(const NBOType
aType,const SfxItemSet* pArg):
OutlineTypeMgr::OutlineTypeMgr(const OutlineTypeMgr& aTypeMgr):
NBOTypeMgrBase(aTypeMgr)//,
- //pNumSettingsArrs( new NumSettingsArr_Impl[DEFAULT_NUM_VALUSET_COUNT])
+ //pNumSettingsArrs( new NumSettingsArr_Impl[DEFAULT_NUM_VALUESET_COUNT])
{
Init();
- for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT; nItem++ )
+ for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUESET_COUNT; nItem++ )
{
pDefaultOutlineSettingsArrs[nItem] =
pOutlineSettingsArrs[nItem];
}
@@ -1755,7 +1752,7 @@ void OutlineTypeMgr::Init()
SVX_RULETYPE_NUMBERING,SvxNumberFormat::LABEL_ALIGNMENT);
for(sal_Int32 nItem = 0;
- nItem < aOutlineAccess.getLength() && nItem <
DEFAULT_NUM_VALUSET_COUNT;
+ nItem < aOutlineAccess.getLength() && nItem <
DEFAULT_NUM_VALUESET_COUNT;
nItem++ )
{
pOutlineSettingsArrs[ nItem ] = new
OutlineSettings_Impl;
@@ -1857,7 +1854,6 @@ sal_uInt16
OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*
return iDex+1;
}
-
return (sal_uInt16)0xFFFF;
}
@@ -1936,8 +1932,8 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule&
aNum,sal_uInt16 nIndex,sal_uIn
//if ( mLevel == (sal_uInt16)0xFFFF )
// return sal_False;
- DBG_ASSERT(DEFAULT_NUM_VALUSET_COUNT > nIndex, "wrong index");
- if(DEFAULT_NUM_VALUSET_COUNT <= nIndex)
+ DBG_ASSERT(DEFAULT_NUM_VALUESET_COUNT > nIndex, "wrong index");
+ if(DEFAULT_NUM_VALUESET_COUNT <= nIndex)
return sal_False;
const FontList* pList = 0;
@@ -2088,7 +2084,6 @@ sal_Bool OutlineTypeMgr::IsCustomized(sal_uInt16 nIndex)
return bRet;
}
-
}}
/* vim: set noet sw=4 ts=4: */
