sw/source/core/doc/swtblfmt.cxx | 7 ++++++-
sw/source/ui/table/tautofmt.cxx | 6 ++----
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 0e010db7b2a98bada410ec2f2e36b61ce09f74f5
Author: Alex Ivan <alexni...@yahoo.com>
Date: Mon Jul 29 19:37:51 2013 +0300
Temporary disable of AutoFormat save mechanism
Temporarily disabled saving any modification to the existing
table format file upon closing the AutoFormat window.
Most likely, further modifications will be made to this once
it is clear how the table styles will be stored.
Change-Id: I894d10003876044ba0b08c462fc0b6622bbb2595
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index eb92dc2..da75280 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -178,8 +178,6 @@ SwAutoFormatDlg::SwAutoFormatDlg( Window* pParent,
SwWrtShell* pWrtShell,
SwAutoFormatDlg::~SwAutoFormatDlg()
{
- if (bCoreDataChanged)
- pTableTbl->Save();
delete pTableTbl;
}
commit 673df31f09fb7a8e52e836ca514d07c6ef10647b
Author: Alex Ivan <alexni...@yahoo.com>
Date: Mon Jul 29 19:17:21 2013 +0300
Fix resizing of AutoFormat window crashing
An incorrect modification of the pointer to the currently
selected style caused a crash if a resize of the respective
window was attempted.
Change-Id: Ibb66f1256268820db5440871c30a9697a0634f87
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index bdb2478..eb92dc2 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -478,7 +478,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl)
String sNm;
// FIXME Yuk! we are creating the table styles ATM, but in the
targetted
// ideal, the table styles are created with the document
- SwStyleNameMapper::GetUIName( RES_POOLCOLL_STANDARD, sNm );
+ sNm = SwStyleNameMapper::GetUIName( RES_POOLCOLL_STANDARD, sNm );
SwTableFmt* pStyle = pShell->GetDoc()->FindTblFmtByName(sNm);
if ( !pStyle )
pStyle = pShell->GetDoc()->MakeTblFrmFmt(sNm, NULL);
@@ -491,7 +491,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl)
aTmp.SetWidthHeight( sal_False );
if( nOldIdx != nIndex )
- m_pWndPreview->NotifyChange( aTmp );
+ m_pWndPreview->NotifyChange( *(SwTableAutoFmt*)0 );
UpdateChecks( aTmp, sal_False );
}
commit 1658441f88b267f6e2ba0344066bbddca444ecc4
Author: Alex Ivan <alexni...@yahoo.com>
Date: Mon Jul 29 13:57:47 2013 +0300
Fix RepeatHeading storage in SwTableFmt
Fixed an issue where improper storage of the RepeatHeading value
in SwTableFmt would cause a crash upon attempting to retrieve
the value.
Change-Id: I655d4f1f9760bc9e95c53c8fe292ea761e25fefd
diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx
index 15c63c7..db24264 100644
--- a/sw/source/core/doc/swtblfmt.cxx
+++ b/sw/source/core/doc/swtblfmt.cxx
@@ -238,7 +238,12 @@ sal_Bool SwTableFmt::GetRowSplit() const
sal_uInt16 SwTableFmt::GetRepeatHeading() const
{
- return (static_cast<const SfxUInt16Item&>( GetFmtAttr(
FN_PARAM_TABLE_HEADLINE ) )).GetValue();
+ const SfxPoolItem* pItem;
+
+ if( SFX_ITEM_SET == GetItemState( FN_PARAM_TABLE_HEADLINE, sal_False,
&pItem ) )
+ return ((const SfxUInt16Item*)pItem)->GetValue();
+
+ return 0;
}
void SwTableFmt::RestoreTableProperties( SwTableFmt* pSrcFmt, SwTable &table )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
