[Libreoffice-commits] core.git: Branch 'feature/table-style-rebased' - 3 commits - sw/inc sw/source xmloff/source
Jan Holesovsky
kendy at collabora.com
Fri Sep 25 08:21:44 PDT 2015
sw/inc/swtblfmt.hxx | 12 +++++------
sw/source/core/doc/swtblfmt.cxx | 36 ++++++++++++++++-----------------
sw/source/core/docnode/ndtbl.cxx | 4 +--
sw/source/ui/dbui/dbinsdlg.cxx | 2 -
xmloff/source/table/XMLTableExport.cxx | 4 +--
5 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit df35e64d217a1790ca1ff96b7de0cdb100fa2538
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Sep 25 17:12:43 2015 +0200
getLength() -> !isEmpty().
Change-Id: Iab205adca1a6bca306d04f2f3dead8b66369d139
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 6ca1e47..dd39814 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1757,7 +1757,7 @@ void SwInsertDBColAutoPilot::Load()
pTableStyle = 0;
sTmp = pNewData->sTAutoFormatNm;
- if( sTmp.getLength() )
+ if( !sTmp.isEmpty() )
{
pTableStyle = pView->GetWrtShell().GetDoc()->GetTableStyles()->FindStyle( sTmp );
}
commit a5365dfaed7b92ea58dd9fc842243d7d41db1b01
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Sep 25 16:38:50 2015 +0200
sal_Bool -> bool.
Change-Id: I3abfa76e4bd15edf517f85bb3dbff4088c316095
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 20ef6952..2b9b6b2 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -111,16 +111,16 @@ public:
void SetBreak( const SvxFormatBreakItem& rNew );
void SetPageDesc( const SwFormatPageDesc& rNew );
void SetKeepWithNextPara( const SvxFormatKeepItem& rNew );
- void SetLayoutSplit( const sal_Bool& rNew );
- void SetCollapsingBorders( const sal_Bool& rNew );
- void SetRowSplit( const sal_Bool& rNew );
+ void SetLayoutSplit( const bool& rNew );
+ void SetCollapsingBorders( const bool& rNew );
+ void SetRowSplit( const bool& rNew );
void SetRepeatHeading( const sal_uInt16& rNew );
void SetShadow( const SvxShadowItem& rNew );
const SvxFormatKeepItem& GetKeepWithNextPara() const;
- sal_Bool GetLayoutSplit() const;
- sal_Bool GetCollapsingBorders() const;
- sal_Bool GetRowSplit() const;
+ bool GetLayoutSplit() const;
+ bool GetCollapsingBorders() const;
+ bool GetRowSplit() const;
sal_uInt16 GetRepeatHeading() const;
bool IsFont() const;
diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx
index da2d770..57f9bfe 100644
--- a/sw/source/core/doc/swtblfmt.cxx
+++ b/sw/source/core/doc/swtblfmt.cxx
@@ -178,17 +178,17 @@ void SwTableFormat::SetKeepWithNextPara( const SvxFormatKeepItem& rNew )
SetFormatAttr( rNew );
}
-void SwTableFormat::SetLayoutSplit( const sal_Bool& rNew )
+void SwTableFormat::SetLayoutSplit( const bool& rNew )
{
SetFormatAttr( SwFormatLayoutSplit( rNew ) );
}
-void SwTableFormat::SetCollapsingBorders( const sal_Bool& rNew )
+void SwTableFormat::SetCollapsingBorders( const bool& rNew )
{
SetFormatAttr( SfxBoolItem( RES_COLLAPSING_BORDERS, rNew ) );
}
-void SwTableFormat::SetRowSplit( const sal_Bool& rNew )
+void SwTableFormat::SetRowSplit( const bool& rNew )
{
SetFormatAttr( SwFormatRowSplit( rNew ) );
}
@@ -208,17 +208,17 @@ const SvxFormatKeepItem& SwTableFormat::GetKeepWithNextPara() const
return SwFormat::GetKeep();
}
-sal_Bool SwTableFormat::GetLayoutSplit() const
+bool SwTableFormat::GetLayoutSplit() const
{
return SwFormat::GetLayoutSplit().GetValue();
}
-sal_Bool SwTableFormat::GetCollapsingBorders() const
+bool SwTableFormat::GetCollapsingBorders() const
{
return (static_cast<const SfxBoolItem&>( GetFormatAttr( RES_COLLAPSING_BORDERS ) )).GetValue();
}
-sal_Bool SwTableFormat::GetRowSplit() const
+bool SwTableFormat::GetRowSplit() const
{
return SwFormat::GetRowSplit().GetValue();
}
@@ -227,7 +227,7 @@ sal_uInt16 SwTableFormat::GetRepeatHeading() const
{
const SfxPoolItem* pItem;
- if( SfxItemState::SET == GetItemState( FN_PARAM_TABLE_HEADLINE, sal_False, &pItem ) )
+ if( SfxItemState::SET == GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem ) )
return ((const SfxUInt16Item*)pItem)->GetValue();
return 0;
@@ -238,9 +238,9 @@ bool SwTableFormat::IsFont() const
for( sal_uInt8 n = 0; n < 16; ++n )
{
if( GetBoxFormat( n )->IsFont() )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
bool SwTableFormat::IsJustify() const
@@ -248,9 +248,9 @@ bool SwTableFormat::IsJustify() const
for( sal_uInt8 n = 0; n < 16; ++n )
{
if( GetBoxFormat( n )->IsJustify() )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
bool SwTableFormat::IsFrame() const
@@ -258,9 +258,9 @@ bool SwTableFormat::IsFrame() const
for( sal_uInt8 n = 0; n < 16; ++n )
{
if( GetBoxFormat( n )->IsFrame() )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
bool SwTableFormat::IsBackground() const
@@ -268,9 +268,9 @@ bool SwTableFormat::IsBackground() const
for( sal_uInt8 n = 0; n < 16; ++n )
{
if( GetBoxFormat( n )->IsBackground() )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
bool SwTableFormat::IsValueFormat() const
@@ -278,9 +278,9 @@ bool SwTableFormat::IsValueFormat() const
for( sal_uInt8 n = 0; n < 16; ++n )
{
if( GetBoxFormat( n )->IsValueFormat() )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
void SwTableFormat::RestoreTableProperties( SwTableFormat* pSrcFormat, SwTable &rTable )
@@ -294,7 +294,7 @@ void SwTableFormat::RestoreTableProperties( SwTableFormat* pSrcFormat, SwTable &
return;
SwTableFormat *pTableStyle = (SwTableFormat*)pHardFormat->GetRegisteredIn();
- sal_Bool bRowSplit = sal_True;
+ bool bRowSplit = true;
sal_uInt16 nRepeatHeading = 0;
if( pSrcFormat )
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index d6c0f52..2a4be67 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2007,7 +2007,7 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
getIDocumentState().SetModified();
getIDocumentFieldsAccess().SetFieldsDirty( true, NULL, 0 );
- return sal_True;
+ return true;
}
SwUndoTableNdsChg* pUndo = 0;
@@ -3408,7 +3408,7 @@ bool SwDoc::MergeTable( const SwPosition& rPos, bool bWithPrev, sal_uInt16 nMode
if( pTableNd->GetTable().ISA( SwDDETable ) ||
pDelTableNd->GetTable().ISA( SwDDETable ))
- return sal_False;
+ return false;
// Delete HTML Layout
pTableNd->GetTable().SetHTMLTableLayout( 0 );
commit 1685ef248c5c4346ff5e51219f9ee8e20fa4939b
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Sep 24 22:43:58 2015 +0200
Fix indentation.
Change-Id: I664ec7985e1b670496262596e62360517e291963
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 38824f8..245cc27 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -516,7 +516,7 @@ void XMLTableExport::exportTableTemplates()
Reference< XNameAccess > xStyleNames( xTableStyle, UNO_QUERY_THROW );
mrExport.AddAttribute(XML_NAMESPACE_TEXT, XML_STYLE_NAME, GetExport().EncodeStyleName( xTableStyle->getName() ) );
- SvXMLElementExport tableTemplate( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_TEMPLATE, true, true );
+ SvXMLElementExport tableTemplate( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_TEMPLATE, true, true );
const TableStyleElement* pElements = getTableStyleMap();
while( pElements->meElement != XML_TOKEN_END )
@@ -527,7 +527,7 @@ void XMLTableExport::exportTableTemplates()
if( xStyle.is() )
{
mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, GetExport().EncodeStyleName( xStyle->getName() ) );
- SvXMLElementExport element( mrExport, XML_NAMESPACE_TABLE, pElements->meElement, true, true );
+ SvXMLElementExport element( mrExport, XML_NAMESPACE_TABLE, pElements->meElement, true, true );
}
}
catch(const Exception&)
More information about the Libreoffice-commits
mailing list