[Libreoffice-commits] core.git: editeng/source filter/source include/editeng sd/source svx/source sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 7 06:39:24 UTC 2018
editeng/source/uno/unonrule.cxx | 2 +-
filter/source/msfilter/svdfppt.cxx | 3 +--
include/editeng/numitem.hxx | 3 +--
sd/source/core/drawdoc4.cxx | 2 +-
sd/source/core/stlpool.cxx | 5 ++---
svx/source/sidebar/nbdtmg.cxx | 6 ++----
sw/source/core/doc/number.cxx | 2 +-
7 files changed, 9 insertions(+), 14 deletions(-)
New commits:
commit 3aa02154941bd04c1646948bcfbec20c2873e189
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 5 11:43:30 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Dec 7 07:38:53 2018 +0100
remove unused SvxNumRuleFlags::CHAR_TEXT_DISTANCE
which is dead as far back as its introduction in
commit fd069bee7e57ad529c3c0974559fd2d84ec3151a
Date: Mon Sep 18 16:07:07 2000 +0000
initial import
Change-Id: Ieff923732005aaa48cfae4918e8094020e6a540b
Reviewed-on: https://gerrit.libreoffice.org/64715
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 1f5c104fca9f..ea7b262523f7 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -487,7 +487,7 @@ css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(const SvxN
}
else
{
- SvxNumRule aDefaultRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR | SvxNumRuleFlags::CHAR_TEXT_DISTANCE, SVX_MAX_NUM, false);
+ SvxNumRule aDefaultRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR, SVX_MAX_NUM, false);
return new SvxUnoNumberingRules( aDefaultRule );
}
}
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 2670bff723e2..42807c8585bc 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -4380,8 +4380,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
eNumRuleType = SvxNumRuleType::NUMBERING;
break;
}
- SvxNumRule aRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR |
- SvxNumRuleFlags::CHAR_TEXT_DISTANCE,
+ SvxNumRule aRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR,
nLevels, false, eNumRuleType );
for ( sal_uInt16 nCount = 0; nDepth < nLevels; nCount++ )
{
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 94cc2e90cf07..8fb543e7a305 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -221,7 +221,6 @@ enum class SvxNumRuleFlags
{
NONE = 0x0000,
CONTINUOUS = 0x0001, // consecutive numbers possible?
- CHAR_TEXT_DISTANCE = 0x0002, // Distance Symbol<->Text?
CHAR_STYLE = 0x0004, // Character styles?
BULLET_REL_SIZE = 0x0008, // relative bullet size?
BULLET_COLOR = 0x0010, // Bullet color
@@ -231,7 +230,7 @@ enum class SvxNumRuleFlags
};
namespace o3tl
{
- template<> struct typed_flags<SvxNumRuleFlags> : is_typed_flags<SvxNumRuleFlags, 0x03df> {};
+ template<> struct typed_flags<SvxNumRuleFlags> : is_typed_flags<SvxNumRuleFlags, 0x03dd> {};
}
enum class SvxNumRuleType
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index d4a56c215b29..1f4a7d9dfabf 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1249,7 +1249,7 @@ void SdDrawDocument::SetTextDefaults() const
aNumberFormat.SetStart(1);
aNumberFormat.SetNumAdjust(SvxAdjust::Left);
- SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR | SvxNumRuleFlags::CHAR_TEXT_DISTANCE, SVX_MAX_NUM, false);
+ SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR, SVX_MAX_NUM, false);
//aNumberFormat.SetAbsLSpace( 0 );
//aNumberFormat.SetFirstLineOffset( 0 );
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index cfbaf9f31079..2cb12ccfcf79 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1102,7 +1102,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
aNumberFormat.SetStart(1);
aNumberFormat.SetNumAdjust(SvxAdjust::Left);
- SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR | SvxNumRuleFlags::CHAR_TEXT_DISTANCE, SVX_MAX_NUM, false);
+ SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR, SVX_MAX_NUM, false);
for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ )
{
@@ -1158,8 +1158,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
aNumberFormat.SetStart(1);
aNumberFormat.SetNumAdjust(SvxAdjust::Left);
- SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR |
- SvxNumRuleFlags::CHAR_TEXT_DISTANCE,
+ SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR,
SVX_MAX_NUM, false );
for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ )
{
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 256dcfd96252..a9417d04cddd 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -228,8 +228,7 @@ void NBOTypeMgrBase::ImplStore(const OUString& filename)
xOStm->WriteUInt32( nVersion );
for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT; nItem++ ) {
if (IsCustomized(nItem)) {
- SvxNumRule aDefNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::CONTINUOUS | SvxNumRuleFlags::BULLET_COLOR |
- SvxNumRuleFlags::CHAR_TEXT_DISTANCE,
+ SvxNumRule aDefNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::CONTINUOUS | SvxNumRuleFlags::BULLET_COLOR,
10, false,
SvxNumRuleType::NUMBERING, SvxNumberFormat::LABEL_ALIGNMENT);
xOStm->WriteInt32( nItem );
@@ -593,8 +592,7 @@ void OutlineTypeMgr::Init()
{
aOutlineAccess = xDefNum->getDefaultOutlineNumberings( aLocale );
- SvxNumRule aDefNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::CONTINUOUS | SvxNumRuleFlags::BULLET_COLOR |
- SvxNumRuleFlags::CHAR_TEXT_DISTANCE,
+ SvxNumRule aDefNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::CONTINUOUS | SvxNumRuleFlags::BULLET_COLOR,
10, false,
SvxNumRuleType::NUMBERING, SvxNumberFormat::LABEL_ALIGNMENT);
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index dd44e1ec29d9..1c36ad4bde67 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -840,7 +840,7 @@ void SwNumRule::SetSvxRule(const SvxNumRule& rNumRule, SwDoc* pDoc)
SvxNumRule SwNumRule::MakeSvxNumRule() const
{
- SvxNumRule aRule(SvxNumRuleFlags::CONTINUOUS | SvxNumRuleFlags::CHAR_TEXT_DISTANCE | SvxNumRuleFlags::CHAR_STYLE |
+ SvxNumRule aRule(SvxNumRuleFlags::CONTINUOUS | SvxNumRuleFlags::CHAR_STYLE |
SvxNumRuleFlags::ENABLE_LINKED_BMP | SvxNumRuleFlags::ENABLE_EMBEDDED_BMP,
MAXLEVEL, mbContinusNum,
meRuleType == NUM_RULE ? SvxNumRuleType::NUMBERING : SvxNumRuleType::OUTLINE_NUMBERING );
More information about the Libreoffice-commits
mailing list