summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-01-24 01:45:48 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-01-24 01:45:48 +0100
commit2d0b31d2a7ceb58e4f0567fe0c255d16c8f502ff (patch)
tree4f54f4873fdb53fe7452de31d7fa2100a34aa306
parent092bf0c4eedb52987cd2efde4f87e64fe645e290 (diff)
Remove FORMAT_PAINTBRUSH_ALSO_COPY_NUMBERFORMAT_FOR_TABLES directive.
-rw-r--r--sw/source/ui/uiview/formatclipboard.cxx25
1 files changed, 0 insertions, 25 deletions
diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx
index fd6303e29a..4182565291 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -64,12 +64,6 @@
#include <swundo.hxx> // fuer die UndoIds
#include <boost/shared_ptr.hpp>
-//#define FORMAT_PAINTBRUSH_ALSO_COPY_NUMBERFORMAT_FOR_TABLES 1
-
-#ifdef FORMAT_PAINTBRUSH_ALSO_COPY_NUMBERFORMAT_FOR_TABLES
-#include <cellatr.hxx>
-#endif
-
/*--------------------------------------------------------------------
--------------------------------------------------------------------*/
@@ -126,9 +120,6 @@ SfxItemSet* lcl_CreateEmptyItemSet( int nSelectionType, SfxItemPool& rPool
FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE,
FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION,
FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN,
-#ifdef FORMAT_PAINTBRUSH_ALSO_COPY_NUMBERFORMAT_FOR_TABLES
- RES_BOXATR_FORMAT, RES_BOXATR_FORMAT,
-#endif
0);
}
else if( nSelectionType & nsSelectionType::SEL_TXT )
@@ -189,11 +180,6 @@ void lcl_getTableAttributes( SfxItemSet& rSet, SwWrtShell &rSh )
rSh.GetRowSplit(pSplit);
if(pSplit)
rSet.Put(*pSplit);
-
- //-- numberformat in cells
-#ifdef FORMAT_PAINTBRUSH_ALSO_COPY_NUMBERFORMAT_FOR_TABLES
- rSh.GetTblBoxFormulaAttrs( rSet ); //RES_BOXATR_FORMAT
-#endif
}
void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh )
@@ -282,17 +268,6 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh )
if( SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, FALSE, &pItem) )
rSh.SetRowSplit(*static_cast<const SwFmtRowSplit*>(pItem));
-
- //-- numberformat in cells
-#ifdef FORMAT_PAINTBRUSH_ALSO_COPY_NUMBERFORMAT_FOR_TABLES
- if( SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_FORMAT, FALSE, &pItem ))
- {
- SfxItemSet aBoxSet( *rSet.GetPool(), RES_BOXATR_FORMAT, RES_BOXATR_FORMAT );
- aBoxSet.Put( SwTblBoxNumFormat( ((SfxUInt32Item*)pItem)->GetValue() ));
- rSh.SetTblBoxFormulaAttrs( aBoxSet );
-
- }
-#endif
}
}//end anonymous namespace