[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/markdata.hxx |4
sc/source/core/data/markdata.cxx | 36
sc/source/ui/view/tabview2.cxx | 38 --
sc/source/ui/view/viewdata.cxx |6 --
4 files changed, 84 deletions(-)
New commits:
commit 62a8580587aec1c1a3070448b063889c01ac5c11
Author: Ahmet Hakan Çelik
AuthorDate: Thu Feb 17 20:05:22 2022 +0300
Commit: Heiko Tietze
CommitDate: Fri Feb 18 09:47:58 2022 +0100
Revert tdf#64345: EDITING: Selected area looses selection when switching
sheet
This reverts commit c82634d5a222120b3a95cff1b950a7f7a1f5ded1
Change-Id: I627b46f710da723ad58295d4fa0821df17eebd9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130108
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index 027ca939d8df..69a7acfde8ab 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -46,8 +46,6 @@ public:
private:
MarkedTabsType maTabMarked;
-std::vector>> maSheetsMark;
-
ScRange aMarkRange; // area
ScRange aMultiRange;// maximum area altogether
ScMultiSel aMultiSel; // multi selection
@@ -130,8 +128,6 @@ public:
std::vector GetMarkedRowSpans() const;
std::vector GetMarkedColSpans() const;
-std::vector>>& GetSheetsMark() {
return maSheetsMark; }
-
boolIsColumnMarked( SCCOL nCol ) const;
boolIsRowMarked( SCROW nRow ) const;
boolIsAllMarked( const ScRange& rRange ) const; // Multi
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 440553deaedc..65d1375d4c23 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -170,21 +170,13 @@ void ScMarkData::SetAreaTab( SCTAB nTab )
void ScMarkData::SelectTable( SCTAB nTab, bool bNew )
{
-std::vector>>&
vMark(GetSheetsMark());
-
if ( bNew )
{
maTabMarked.insert( nTab );
-
-for (auto : vMark)
-if (a[0].first == nTab)
-SetMarkArea(a[0].second);
}
else
{
maTabMarked.erase( nTab );
-if (IsMarked())
-ResetMark();
}
}
@@ -631,9 +623,6 @@ bool ScMarkData::HasAnyMultiMarks() const
void ScMarkData::InsertTab( SCTAB nTab )
{
-std::vector>>&
vMark(GetSheetsMark());
-std::vector> tempVect;
-
std::set tabMarked;
for (const auto& rTab : maTabMarked)
{
@@ -643,29 +632,10 @@ void ScMarkData::InsertTab( SCTAB nTab )
tabMarked.insert(rTab + 1);
}
maTabMarked.swap(tabMarked);
-
-ScRange emptScRange;
-// update sheets mark after insert
-for (size_t i=0; i>>&
vMark(GetSheetsMark());
-
std::set tabMarked;
for (const auto& rTab : maTabMarked)
{
@@ -675,12 +645,6 @@ void ScMarkData::DeleteTab( SCTAB nTab )
tabMarked.insert(rTab - 1);
}
maTabMarked.swap(tabMarked);
-
-if (!vMark.empty())
-vMark.clear();
-
-if (IsMarked())
-ResetMark();
}
void ScMarkData::ShiftCols(const ScDocument& rDoc, SCCOL nStartCol, sal_Int32
nColOffset)
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index b5ca9b40d521..91754ed4cf83 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -595,44 +595,6 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY,
SCTAB nCurZ,
if ( !bCols && !bRows )
aHdrFunc.SetAnchorFlag( false );
-
-std::vector>>&
vMark(rMark.GetSheetsMark());
-std::vector> tempVect;
-
-bool bFound = false;
-for (size_t i=0; i 2)
-{
-for (size_t k=0; k>>&
vMark(maMarkData.GetSheetsMark());
-
if (nDestTab==SC_TAB_APPEND)
nDestTab = mrDoc.GetTableCount() - 1; // something had to have been
copied
@@ -963,10 +961,6 @@ void ScViewData::CopyTab( SCTAB nSrcTab, SCTAB nDestTab )
UpdateCurrentTab();
maMarkData.InsertTab(nDestTab);
-
-if (!vMark.empty())
-vMark.clear();
-
}
void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/markdata.hxx |4
sc/source/core/data/markdata.cxx | 37 +
sc/source/ui/view/tabview2.cxx | 38 ++
sc/source/ui/view/viewdata.cxx |6 ++
4 files changed, 85 insertions(+)
New commits:
commit c82634d5a222120b3a95cff1b950a7f7a1f5ded1
Author: Ahmet Hakan Çelik
AuthorDate: Sun Jul 25 12:31:28 2021 +0300
Commit: Heiko Tietze
CommitDate: Tue Feb 1 11:18:13 2022 +0100
tdf#64345: EDITING: Selected area looses selection when switching sheet
Change-Id: Idf59c3968319053431741394e2ad218d7be6463d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119478
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index 69a7acfde8ab..027ca939d8df 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -46,6 +46,8 @@ public:
private:
MarkedTabsType maTabMarked;
+std::vector>> maSheetsMark;
+
ScRange aMarkRange; // area
ScRange aMultiRange;// maximum area altogether
ScMultiSel aMultiSel; // multi selection
@@ -128,6 +130,8 @@ public:
std::vector GetMarkedRowSpans() const;
std::vector GetMarkedColSpans() const;
+std::vector>>& GetSheetsMark() {
return maSheetsMark; }
+
boolIsColumnMarked( SCCOL nCol ) const;
boolIsRowMarked( SCROW nRow ) const;
boolIsAllMarked( const ScRange& rRange ) const; // Multi
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 65d1375d4c23..fd5c20cad3c3 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
@@ -170,13 +171,21 @@ void ScMarkData::SetAreaTab( SCTAB nTab )
void ScMarkData::SelectTable( SCTAB nTab, bool bNew )
{
+std::vector>>&
vMark(GetSheetsMark());
+
if ( bNew )
{
maTabMarked.insert( nTab );
+
+for (auto : vMark)
+if (a[0].first == nTab)
+SetMarkArea(a[0].second);
}
else
{
maTabMarked.erase( nTab );
+if (IsMarked())
+ResetMark();
}
}
@@ -623,6 +632,9 @@ bool ScMarkData::HasAnyMultiMarks() const
void ScMarkData::InsertTab( SCTAB nTab )
{
+std::vector>>&
vMark(GetSheetsMark());
+std::vector> tempVect;
+
std::set tabMarked;
for (const auto& rTab : maTabMarked)
{
@@ -632,10 +644,29 @@ void ScMarkData::InsertTab( SCTAB nTab )
tabMarked.insert(rTab + 1);
}
maTabMarked.swap(tabMarked);
+
+ScRange emptScRange;
+// update sheets mark after insert
+for (size_t i=0; i>>&
vMark(GetSheetsMark());
+
std::set tabMarked;
for (const auto& rTab : maTabMarked)
{
@@ -645,6 +676,12 @@ void ScMarkData::DeleteTab( SCTAB nTab )
tabMarked.insert(rTab - 1);
}
maTabMarked.swap(tabMarked);
+
+if (!vMark.empty())
+vMark.clear();
+
+if (IsMarked())
+ResetMark();
}
void ScMarkData::ShiftCols(const ScDocument& rDoc, SCCOL nStartCol, sal_Int32
nColOffset)
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index aae991eaf799..bf2f1603815b 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -595,6 +595,44 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY,
SCTAB nCurZ,
if ( !bCols && !bRows )
aHdrFunc.SetAnchorFlag( false );
+
+std::vector>>&
vMark(rMark.GetSheetsMark());
+std::vector> tempVect;
+
+bool bFound = false;
+for (size_t i=0; i 2)
+{
+for (size_t k=0; k>>&
vMark(maMarkData.GetSheetsMark());
+
if (nDestTab==SC_TAB_APPEND)
nDestTab = mrDoc.GetTableCount() - 1; // something had to have been
copied
@@ -961,6 +963,10 @@ void ScViewData::CopyTab( SCTAB nSrcTab, SCTAB nDestTab )
UpdateCurrentTab();
maMarkData.InsertTab(nDestTab);
+
+if (!vMark.empty())
+vMark.clear();
+
}
void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
[Libreoffice-commits] core.git: xmloff/qa
xmloff/qa/unit/text.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit c1d10276d32cbdaecf6894be723ab8d29cc7dbe2 Author: Ahmet Hakan Çelik AuthorDate: Sun Mar 7 16:40:47 2021 +0300 Commit: Mike Kaganski CommitDate: Fri Apr 23 07:45:59 2021 +0200 tdf#139734: Drop redundant asserts after MacrosTest::loadFromDesktop Change-Id: If5b2f2433b4be7b654b08815cbfb08faaac309db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112130 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx index 30646655bf3a..d3b1fcc84a2c 100644 --- a/xmloff/qa/unit/text.cxx +++ b/xmloff/qa/unit/text.cxx @@ -55,7 +55,6 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMailMergeInEditeng) getComponent() = loadFromDesktop(aURL); // Without the accompanying fix in place, this test would have failed, as unexpected // in editeng text aborted the whole import process. -CPPUNIT_ASSERT(getComponent().is()); } CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testCommentResolved) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/framework/saxeventkeeperimpl.cxx|3 +--
xmlsecurity/source/framework/signaturecreatorimpl.cxx |3 +--
xmlsecurity/source/framework/signatureverifierimpl.cxx |3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 348595440143b210f55bfa541ab3f853d468f19f
Author: Ahmet Hakan Çelik
AuthorDate: Sun Mar 7 19:06:33 2021 +0300
Commit: Michael Stahl
CommitDate: Wed Apr 14 11:07:06 2021 +0200
tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctor
Change-Id: Ie7507e6beb470708bb4e52a7b926433043b80d85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112133
Tested-by: Jenkins
Reviewed-by: John Turpish
Reviewed-by: Michael Stahl
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index b0c03880348f..5e2f697d64ac 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -1131,8 +1131,7 @@ OUString SAXEventKeeperImpl_getImplementationName ()
css::uno::Sequence< OUString > SAXEventKeeperImpl_getSupportedServiceNames( )
{
-css::uno::Sequence aRet {
"com.sun.star.xml.crypto.sax.SAXEventKeeper" };
-return aRet;
+return { "com.sun.star.xml.crypto.sax.SAXEventKeeper" };
}
/* XServiceInfo */
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index 826f800409f6..ca90abe9a004 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -153,8 +153,7 @@ OUString SignatureCreatorImpl_getImplementationName ()
css::uno::Sequence< OUString > SignatureCreatorImpl_getSupportedServiceNames(
)
{
-css::uno::Sequence aRet {
"com.sun.star.xml.crypto.sax.SignatureCreator" };
-return aRet;
+return { "com.sun.star.xml.crypto.sax.SignatureCreator" };
}
/* XServiceInfo */
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx
b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index 4e9dc08af972..489e8348604c 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -109,8 +109,7 @@ OUString SignatureVerifierImpl_getImplementationName ()
css::uno::Sequence< OUString > SignatureVerifierImpl_getSupportedServiceNames(
)
{
-css::uno::Sequence aRet {
"com.sun.star.xml.crypto.sax.SignatureVerifier" };
-return aRet;
+return { "com.sun.star.xml.crypto.sax.SignatureVerifier" };
}
/* XServiceInfo */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/autoform.cxx | 58 +++
1 file changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 7f9a66cb11f0889bf10542a17c144f9665c0ce70
Author: Ahmet Hakan Çelik
AuthorDate: Tue Mar 9 10:51:14 2021 +0300
Commit: Michael Stahl
CommitDate: Fri Apr 9 10:50:00 2021 +0200
tdf#140226: Make use of SfxPoolItems more typesafe by using StaticWhichCast
Change-Id: Ia6c71d84241093843e7efd12b6f0aceee3edaa61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112190
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 2a3eee322087..9e88957575b4 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -338,35 +338,35 @@ void ScAutoFormatData::PutItem( sal_uInt16 nIndex, const
SfxPoolItem& rItem )
ScAutoFormatDataField& rField = GetField( nIndex );
switch( rItem.Which() )
{
-case ATTR_FONT: rField.SetFont( static_cast(rItem) ); break;
-case ATTR_FONT_HEIGHT: rField.SetHeight( static_cast(rItem) ); break;
-case ATTR_FONT_WEIGHT: rField.SetWeight( static_cast(rItem) ); break;
-case ATTR_FONT_POSTURE: rField.SetPosture( static_cast(rItem) );break;
-case ATTR_CJK_FONT: rField.SetCJKFont( static_cast(rItem) ); break;
-case ATTR_CJK_FONT_HEIGHT: rField.SetCJKHeight( static_cast(rItem) ); break;
-case ATTR_CJK_FONT_WEIGHT: rField.SetCJKWeight( static_cast(rItem) ); break;
-case ATTR_CJK_FONT_POSTURE: rField.SetCJKPosture( static_cast(rItem) ); break;
-case ATTR_CTL_FONT: rField.SetCTLFont( static_cast(rItem) ); break;
-case ATTR_CTL_FONT_HEIGHT: rField.SetCTLHeight( static_cast(rItem) ); break;
-case ATTR_CTL_FONT_WEIGHT: rField.SetCTLWeight( static_cast(rItem) ); break;
-case ATTR_CTL_FONT_POSTURE: rField.SetCTLPosture( static_cast(rItem) ); break;
-case ATTR_FONT_UNDERLINE: rField.SetUnderline( static_cast(rItem) );break;
-case ATTR_FONT_OVERLINE:rField.SetOverline( static_cast(rItem) ); break;
-case ATTR_FONT_CROSSEDOUT: rField.SetCrossedOut( static_cast(rItem) ); break;
-case ATTR_FONT_CONTOUR: rField.SetContour( static_cast(rItem) );break;
-case ATTR_FONT_SHADOWED:rField.SetShadowed( static_cast(rItem) ); break;
-case ATTR_FONT_COLOR: rField.SetColor( static_cast(rItem) );break;
-case ATTR_BORDER: rField.SetBox( static_cast(rItem) );break;
-case ATTR_BORDER_TLBR: rField.SetTLBR( static_cast(rItem) ); break;
-case ATTR_BORDER_BLTR: rField.SetBLTR( static_cast(rItem) ); break;
-case ATTR_BACKGROUND: rField.SetBackground( static_cast(rItem) ); break;
-case ATTR_HOR_JUSTIFY: rField.SetHorJustify( static_cast(rItem) ); break;
-case ATTR_VER_JUSTIFY: rField.SetVerJustify( static_cast(rItem) ); break;
-case ATTR_STACKED: rField.SetStacked( static_cast(rItem) ); break;
-case ATTR_MARGIN: rField.SetMargin( static_cast(rItem) ); break;
-case ATTR_LINEBREAK:rField.SetLinebreak( static_cast(rItem) ); break;
-case ATTR_ROTATE_VALUE: rField.SetRotateAngle( static_cast(rItem) ); break;
-case ATTR_ROTATE_MODE: rField.SetRotateMode( static_cast(rItem) ); break;
+case ATTR_FONT: rField.SetFont(
rItem.StaticWhichCast(ATTR_FONT) );break;
+case ATTR_FONT_HEIGHT: rField.SetHeight(
rItem.StaticWhichCast(ATTR_FONT_HEIGHT) ); break;
+case ATTR_FONT_WEIGHT: rField.SetWeight(
rItem.StaticWhichCast(ATTR_FONT_WEIGHT) ); break;
+case ATTR_FONT_POSTURE: rField.SetPosture(
rItem.StaticWhichCast(ATTR_FONT_POSTURE) ); break;
+case ATTR_CJK_FONT: rField.SetCJKFont(
rItem.StaticWhichCast(ATTR_CJK_FONT) ); break;
+case ATTR_CJK_FONT_HEIGHT: rField.SetCJKHeight(
rItem.StaticWhichCast(ATTR_CJK_FONT_HEIGHT) );break;
+case ATTR_CJK_FONT_WEIGHT: rField.SetCJKWeight(
rItem.StaticWhichCast(ATTR_CJK_FONT_WEIGHT) );break;
+case ATTR_CJK_FONT_POSTURE: rField.SetCJKPosture(
rItem.StaticWhichCast(ATTR_CJK_FONT_POSTURE) ); break;
+case ATTR_CTL_FONT: rField.SetCTLFont(
rItem.StaticWhichCast(ATTR_CTL_FONT) ); break;
+case ATTR_CTL_FONT_HEIGHT: rField.SetCTLHeight(
rItem.StaticWhichCast(ATTR_CTL_FONT_HEIGHT) );break;
+case ATTR_CTL_FONT_WEIGHT: rField.SetCTLWeight(
rItem.StaticWhichCast(ATTR_CTL_FONT_WEIGHT) );break;
+case ATTR_CTL_FONT_POSTURE: rField.SetCTLPosture(
[Libreoffice-commits] core.git: basctl/source idl/inc idl/source
basctl/source/dlged/dlged.cxx |4 ++--
idl/inc/types.hxx |6 +++---
idl/source/objects/types.cxx | 12 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 0726ecd9e2f2d94e9f49eb40d2b4952475e02764
Author: Ahmet Hakan Çelik
AuthorDate: Mon Mar 8 11:13:46 2021 +0300
Commit: Michael Stahl
CommitDate: Tue Mar 16 11:45:04 2021 +0100
tdf#114441: Convert use of sal_uLong to better integer types
Change-Id: I173d57105429e2bdf2288678fa7911b8541a402b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112154
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index d74d375357ce..9ddb6adbc8a5 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -278,8 +278,8 @@ void DlgEditor::InitScrollBars()
pHScroll->SetRange( Range( 0, aPgSize.Width() ));
pVScroll->SetRange( Range( 0, aPgSize.Height() ));
-pHScroll->SetVisibleSize( static_cast(aOutSize.Width()) );
-pVScroll->SetVisibleSize( static_cast(aOutSize.Height()) );
+pHScroll->SetVisibleSize( aOutSize.Width() );
+pVScroll->SetVisibleSize( aOutSize.Height() );
pHScroll->SetLineSize( aOutSize.Width() / 10 );
pVScroll->SetLineSize( aOutSize.Height() / 10 );
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 97c353b36541..298e863c6663 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -44,7 +44,7 @@ public:
virtual boolTest( SvTokenStream & rInStm );
virtual boolReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
override;
-sal_uLong MakeSfx( OStringBuffer& rAtrrArray ) const;
+size_t MakeSfx( OStringBuffer& rAtrrArray ) const;
virtual voidInsert( SvSlotElementList& );
};
@@ -70,7 +70,7 @@ public:
SvRefMemberList&
GetAttrList() { return aAttrList; }
-sal_uLong GetAttrCount() const { return aAttrList.size(); }
+size_t GetAttrCount() const { return aAttrList.size(); }
voidSetType( MetaTypeType nT );
MetaTypeTypeGetMetaTypeType() const { return nType; }
@@ -81,7 +81,7 @@ public:
virtual boolReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
override;
-sal_uLong MakeSfx( OStringBuffer& rAtrrArray );
+size_t MakeSfx( OStringBuffer& rAtrrArray );
virtual voidWriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
boolReadMethodArgs( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 9cb1684caffc..a0238d9b4c78 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -96,7 +96,7 @@ bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
return bOk;
}
-sal_uLong SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray ) const
+size_t SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray ) const
{
SvMetaType * pType = GetType();
DBG_ASSERT( pType, "no type for attribute" );
@@ -199,15 +199,15 @@ void SvMetaType::ReadContextSvIdl( SvIdlDataBase & rBase,
}
}
-sal_uLong SvMetaType::MakeSfx( OStringBuffer& rAttrArray )
+size_t SvMetaType::MakeSfx( OStringBuffer& rAttrArray )
{
-sal_uLong nC = 0;
+size_t nC = 0;
if( GetBaseType()->GetMetaTypeType() == MetaTypeType::Struct )
{
-sal_uLong nAttrCount = GetAttrCount();
+size_t nAttrCount = GetAttrCount();
// write the single attributes
-for( sal_uLong n = 0; n < nAttrCount; n++ )
+for( size_t n = 0; n < nAttrCount; n++ )
{
nC += aAttrList[n]->MakeSfx( rAttrArray );
if( n +1 < nAttrCount )
@@ -224,7 +224,7 @@ void SvMetaType::WriteSfxItem(
OString aVarName = " a" + rItemName + "_Impl";
OStringBuffer aAttrArray(1024);
-sal_uLong nAttrCount = MakeSfx( aAttrArray );
+size_t nAttrCount = MakeSfx( aAttrArray );
OString aAttrCount( OString::number(nAttrCount));
OString aTypeName = "SfxType" + aAttrCount;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/sidebar/PageOrientationControl.hxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 57c8f13d176cccf913573dafaf10a870619822fc Author: Ahmet Hakan Çelik AuthorDate: Sun Mar 7 15:46:21 2021 +0300 Commit: Ilmari Lauhakangas CommitDate: Sun Mar 7 14:42:41 2021 +0100 tdf#124176 Use pragma once in sw/source/uibase/sidebar Change-Id: I0f4f5b1d612d2fa92582fc8a26dc35d01fbfe4bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112129 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index 5f71ca925894..da82474b08cc 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -16,8 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEORIENTATIONCONTROL_HXX -#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEORIENTATIONCONTROL_HXX +#pragma once #include #include @@ -55,6 +54,4 @@ private: } // end of namespace sw::sidebar -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
