[Libreoffice-commits] core.git: unusedcode.easy writerfilter/source
unusedcode.easy |3 -
writerfilter/source/dmapper/TDefTableHandler.cxx | 46 ---
writerfilter/source/dmapper/TDefTableHandler.hxx |3 -
3 files changed, 52 deletions(-)
New commits:
commit 5e16ece1dd59caf7229a7db3504712cedd9a9775
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Apr 20 09:12:24 2015 +0200
writerfilter: remove newly unused methods
Change-Id: Ie15422d7936cd84d5c4a07a5b75fdb02efc6ea1e
diff --git a/unusedcode.easy b/unusedcode.easy
index 26c96f6..5914c9c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -112,6 +112,3 @@
vclcanvas::CanvasHelper::setData(com::sun::star::uno::Sequencesigned char cons
vclcanvas::CanvasHelper::setPixel(com::sun::star::uno::Sequencesigned char
const, com::sun::star::rendering::IntegerBitmapLayout const,
com::sun::star::geometry::IntegerPoint2D const)
vclcanvas::DeviceHelper::enterFullScreenMode(bool)
vclcanvas::SpriteDeviceHelper::createBuffers(int)
-writerfilter::dmapper::TDefTableHandler::getCellCount() const
-writerfilter::dmapper::TDefTableHandler::getRowProperties() const
-writerfilter::dmapper::TDefTableHandler::getTableWidth() const
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx
b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 18746ce..677781b 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -418,35 +418,6 @@ void TDefTableHandler::lcl_sprm(Sprm rSprm)
}
}
-
-PropertyMapPtr TDefTableHandler::getRowProperties() const
-{
-PropertyMapPtr pPropertyMap(new PropertyMap);
-
-// Writer only wants the separators, Word provides also the outer border
positions
-if( m_aCellBorderPositions.size() 2 )
-{
-//determine table width
-double nFullWidth =
m_aCellBorderPositions[m_aCellBorderPositions.size() - 1] -
m_aCellBorderPositions[0];
-//the positions have to be distibuted in a range of 1
-const double nFullWidthRelative = 1.;
-uno::Sequence text::TableColumnSeparator aSeparators(
m_aCellBorderPositions.size() - 2 );
-text::TableColumnSeparator* pSeparators = aSeparators.getArray();
-for( sal_uInt32 nBorder = 1; nBorder m_aCellBorderPositions.size() -
1; ++nBorder )
-{
-sal_Int16 nRelPos =
-sal::static_int_cast sal_Int16
(double(m_aCellBorderPositions[nBorder]) * nFullWidthRelative / nFullWidth );
-
-pSeparators[nBorder - 1].Position = nRelPos;
-pSeparators[nBorder - 1].IsVisible = sal_True;
-}
-pPropertyMap-Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny(
aSeparators ) );
-}
-
-return pPropertyMap;
-}
-
-
void TDefTableHandler::fillCellProperties(
size_t nCell, ::std::shared_ptr TablePropertyMap
pCellProperties ) const
{
@@ -476,23 +447,6 @@ void TDefTableHandler::fillCellProperties(
}
-sal_Int32 TDefTableHandler::getTableWidth() const
-{
-sal_Int32 nWidth = 0;
-if( m_aCellBorderPositions.size() 1 )
-{
-//determine table width
-nWidth = m_aCellBorderPositions[m_aCellBorderPositions.size() - 1] -
m_aCellBorderPositions[0];
-}
-return nWidth;
-}
-
-
-size_t TDefTableHandler::getCellCount() const
-{
-return m_aCellVertAlign.size();
-}
-
void TDefTableHandler::enableInteropGrabBag(const OUString aName)
{
m_aInteropGrabBagName = aName;
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx
b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 65a6f56..18fd424 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -73,10 +73,7 @@ public:
TDefTableHandler();
virtual ~TDefTableHandler();
-size_t getCellCount() const;
voidfillCellProperties( size_t
nCell, ::std::shared_ptr TablePropertyMap pCellProperties) const;
-::std::shared_ptrPropertyMapgetRowProperties() const;
-sal_Int32 getTableWidth() const;
void enableInteropGrabBag(const OUString aName);
css::beans::PropertyValue getInteropGrabBag(const OUString aName =
OUString());
static OUString getBorderTypeString(sal_Int32 nType);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unusedcode.easy writerfilter/source
unusedcode.easy|1 -
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx |6 --
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx |1 -
3 files changed, 8 deletions(-)
New commits:
commit c356bd37bdebd5a9eea1d25c628212f071659158
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Sep 12 09:29:12 2014 +0200
Unused writerfilter::ooxml::OOXMLBooleanValue ctor
Change-Id: I8cf92c38a41423e5bae2852b8affeea2164646f0
diff --git a/unusedcode.easy b/unusedcode.easy
index b525d1f..73783ba 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -218,4 +218,3 @@ svt::CheckInvariants(void const*)
svt::table::UnoControlTableModel::checkInvariants() const
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
writerfilter::dmapper::StyleSheetTable::GetStyleIdFromIndex(unsigned int)
-writerfilter::ooxml::OOXMLBooleanValue::OOXMLBooleanValue(char const*)
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index 3a6b1be..f338037 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -286,12 +286,6 @@ OOXMLBooleanValue::OOXMLBooleanValue(bool bValue)
{
}
-OOXMLBooleanValue::OOXMLBooleanValue(const char *pValue)
-: mbValue(false)
-{
-mbValue = GetBooleanValue(pValue);
-}
-
OOXMLBooleanValue::~OOXMLBooleanValue()
{
}
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
index e820fde..af9e1d7 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
@@ -104,7 +104,6 @@ class OOXMLBooleanValue : public OOXMLValue
protected:
bool mbValue;
explicit OOXMLBooleanValue(bool bValue);
-explicit OOXMLBooleanValue(const char *pValue);
public:
static OOXMLValue::Pointer_t Create (bool bValue);
static OOXMLValue::Pointer_t Create (const char *pValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unusedcode.easy writerfilter/source
unusedcode.easy |1 -
writerfilter/source/dmapper/DomainMapper.cxx | 14 +++---
2 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit bac420f9a8ba8d99213ee48ef6c2f50aba409f08
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Aug 15 09:51:04 2014 +0200
Use DomainMapper::IsStyleSheetImport()
Change-Id: I2ae8f5ed808b7f1728a95f0e9d90d671e6ef2047
diff --git a/unusedcode.easy b/unusedcode.easy
index 7ce6296..dc8ae96 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -217,6 +217,5 @@ svt::CheckInvariants(void const*)
svt::table::TableControl_Impl::impl_checkInvariants() const
svt::table::UnoControlTableModel::checkInvariants() const
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
-writerfilter::dmapper::DomainMapper::IsStyleSheetImport() const
writerfilter::dmapper::StyleSheetTable::GetStyleIdFromIndex(unsigned int)
writerfilter::ooxml::OOXMLBooleanValue::OOXMLBooleanValue(char const*)
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index f001d99..b5ce4a3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1150,7 +1150,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext )
unsupported numbering level nIntValue);
break;
}
-if( m_pImpl-IsStyleSheetImport() )
+if( IsStyleSheetImport() )
{
//style sheets cannot have a numbering rule attached
StyleSheetPropertyMap* pStyleSheetPropertyMap = dynamic_cast
StyleSheetPropertyMap* ( rContext.get() );
@@ -1165,7 +1165,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext )
//convert the ListTable entry to a NumberingRules propery and
apply it
ListsManager::Pointer pListTable = m_pImpl-GetListTable();
ListDef::Pointer pList = pListTable-GetList( nIntValue );
-if( m_pImpl-IsStyleSheetImport() )
+if( IsStyleSheetImport() )
{
//style sheets cannot have a numbering rule attached
StyleSheetPropertyMap* pStyleSheetPropertyMap = dynamic_cast
StyleSheetPropertyMap* ( rContext.get() );
@@ -1174,7 +1174,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext )
}
if( pList.get( ) )
{
-if( !m_pImpl-IsStyleSheetImport() )
+if( !IsStyleSheetImport() )
{
uno::Any aRules = uno::makeAny( pList-GetNumberingRules(
) );
rContext-Insert( PROP_NUMBERING_RULES, aRules );
@@ -1184,7 +1184,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext )
}
else
{
-if( m_pImpl-IsStyleSheetImport() )
+if( IsStyleSheetImport() )
{
// set the number id for AbstractNum references
StyleSheetPropertyMap* pStyleSheetPropertyMap =
dynamic_cast StyleSheetPropertyMap* ( rContext.get() );
@@ -1376,7 +1376,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext )
case NS_ooxml::LN_CT_PPrBase_outlineLvl:
{
sal_Int16 nLvl = static_cast sal_Int16 ( nIntValue );
-if( m_pImpl-IsStyleSheetImport() )
+if( IsStyleSheetImport() )
{
StyleSheetPropertyMap* pStyleSheetPropertyMap = dynamic_cast
StyleSheetPropertyMap* ( rContext.get() );
@@ -1600,7 +1600,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext )
}
}
// Make sure char sizes defined in the stylesheets don't affect
char props from direct formatting.
-if (!m_pImpl-IsStyleSheetImport())
+if (!IsStyleSheetImport())
m_pImpl-deferCharacterProperty( nSprmId, uno::makeAny(
nIntValue ));
m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, (nSprmId ==
NS_ooxml::LN_EG_RPrBase_sz ? OUString(sz) : OUString(szCs)),
OUString::number(nIntValue));
}
@@ -1773,7 +1773,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext )
// fdo#81033: for RTF, a tab stop is inherited from the style if it
// is also applied to the paragraph directly, and cleared if it is
// not applied to the paragraph directly = don't InitTabStopFromStyle
-if (!m_pImpl-IsStyleSheetImport() !IsRTFImport())
+if (!IsStyleSheetImport() !IsRTFImport())
{
uno::Any aValue =
m_pImpl-GetPropertyFromStyleSheet(PROP_PARA_TAB_STOPS);
uno::Sequence style::TabStop aStyleTabStops;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: unusedcode.easy writerfilter/source
unusedcode.easy |1
writerfilter/source/resourcemodel/resourcemodel.cxx | 37
writerfilter/source/resourcemodel/resourcemodel.hxx |1
3 files changed, 39 deletions(-)
New commits:
commit c23faa9a5a47e059536b99573da6832ef5705faf
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Feb 19 16:04:05 2014 +0100
writerfilter: unused WW8TableManager
Change-Id: I29a4b2326a8fe25c1f2288d6218e1e0a9b2ad3e5
diff --git a/unusedcode.easy b/unusedcode.easy
index 1388f49..c5f3dc6 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -369,7 +369,6 @@ svx::frame::Style::Style(editeng::SvxBorderLine const,
double, unsigned short)
utl::MediaDescriptor::PROP_DEEPDETECTION()
utl::toISO8601(com::sun::star::util::Time const)
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, int)
-writerfilter::WW8TableManager::WW8TableManager()
writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar,
std::char_traitschar, std::allocatorchar , char const*,
boost::shared_ptrwriterfilter::Referencewriterfilter::BinaryObj )
writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar,
std::char_traitschar, std::allocatorchar , char const*,
boost::shared_ptrwriterfilter::Referencewriterfilter::Properties )
writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar,
std::char_traitschar, std::allocatorchar , char const*, rtl::OUString
const)
diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx
b/writerfilter/source/resourcemodel/resourcemodel.cxx
index 275b377..bb07526 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.cxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.cxx
@@ -158,43 +158,6 @@ void WW8TableDataHandler::endCell(const string end)
// - WW8TableDataManager ---
-class WW8TableManager :
-public TableManagerstring, TablePropsRef_t
-{
-typedef TableDataHandlerstring, TablePropsRef_t
-TableDataHandlerPointer_t;
-
-public:
-WW8TableManager();
-virtual ~WW8TableManager() {}
-virtual void endParagraphGroup();
-virtual bool sprm(Sprm rSprm);
-};
-
-WW8TableManager::WW8TableManager()
-{
-TableDataHandlerstring, TablePropsRef_t::Pointer_t pHandler(new
WW8TableDataHandler());
-setHandler(pHandler);
-}
-
-bool WW8TableManager::sprm(Sprm rSprm)
-{
-TableManagerstring, TablePropsRef_t::sprm(rSprm);
-output.setDepth(getTableDepthNew());
-return true;
-}
-
-void WW8TableManager::endParagraphGroup()
-{
-string tmpStr = tabledepth depth=\;
-char sBuffer[256];
-snprintf(sBuffer, sizeof(sBuffer), % SAL_PRIuUINT32, getTableDepthNew());
-tmpStr += sBuffer;
-tmpStr += \/;
-output.addItem(tmpStr);
-TableManagerstring, TablePropsRef_t::endParagraphGroup();
-}
-
void WW8BinaryObjHandler::data
(const sal_uInt8 * buf, size_t length,
writerfilter::ReferenceProperties::Pointer_t /*pRef*/)
diff --git a/writerfilter/source/resourcemodel/resourcemodel.hxx
b/writerfilter/source/resourcemodel/resourcemodel.hxx
index ebbe356..3deb27e 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.hxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.hxx
@@ -19,7 +19,6 @@
#include resourcemodel/WW8ResourceModel.hxx
namespace writerfilter {
-class WW8TableManager;
class WW8BinaryObjHandler : public BinaryObj
{
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unusedcode.easy writerfilter/source
unusedcode.easy |1
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 10 --
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |2 -
writerfilter/source/ooxml/OOXMLFastHelper.hxx | 28 --
writerfilter/source/ooxml/factoryimpl_ns.xsl | 10 --
5 files changed, 51 deletions(-)
New commits:
commit 957676441635d236743b61ccb74128821d07d0d0
Author: Petr Vorel petr.vo...@gmail.com
Date: Thu Jan 9 08:35:11 2014 +0100
remove unused code from writerfilter
Not sure whether void OOXMLFastHelperT::mark(OOXMLFastContextHandler *
pHandler, Id nId, const OUString rValue) is really unused (tested on linux
build seems to be unused).
If it IS unused the commit should NOT be included and
writerfilter::ooxml::OOXMLFastContextHandler::mark(unsigned int const,
boost::shared_ptrwriterfilter::ooxml::OOXMLValue) is to be put into
unusedcode.exclude.
Change-Id: I5ae08427e62f89df3d4112486837d8eb5fa752f0
Reviewed-on: https://gerrit.libreoffice.org/7327
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/unusedcode.easy b/unusedcode.easy
index 6eb8fa6..35f844a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -210,4 +210,3 @@
writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar, std::ch
writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar,
std::char_traitschar, std::allocatorchar , char const*,
boost::shared_ptrwriterfilter::Referencewriterfilter::Properties )
writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar,
std::char_traitschar, std::allocatorchar , char const*, rtl::OUString
const)
writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar,
std::char_traitschar, std::allocatorchar , char const*, unsigned int)
-writerfilter::ooxml::OOXMLFastContextHandler::mark(unsigned int const,
boost::shared_ptrwriterfilter::ooxml::OOXMLValue)
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 2d192ad..b1af30f 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -550,16 +550,6 @@ Token_t OOXMLFastContextHandler::getToken() const
return mnToken;
}
-void OOXMLFastContextHandler::mark(const Id rId, OOXMLValue::Pointer_t pVal)
-{
-OOXMLPropertySetImpl::Pointer_t pPropSet(new OOXMLPropertySetImpl());
-OOXMLPropertyImpl::Pointer_t pProperty
-(new OOXMLPropertyImpl(rId, pVal, OOXMLPropertyImpl::ATTRIBUTE));
-
-pPropSet-add(pProperty);
-mpStream-props(pPropSet);
-}
-
void OOXMLFastContextHandler::setParent
(OOXMLFastContextHandler * pParent)
{
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 86a3b25..c5909bf 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -151,8 +151,6 @@ public:
virtual void setToken(Token_t nToken);
virtual Token_t getToken() const;
-void mark(const Id rId, OOXMLValue::Pointer_t pVal);
-
void resolveFootnote(const sal_Int32 nId);
void resolveEndnote(const sal_Int32 nId);
void resolveComment(const sal_Int32 nId);
diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx
b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
index 7198494..9a5f941 100644
--- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
@@ -52,10 +52,6 @@ public:
static void newProperty(OOXMLFastContextHandler * pHandler,
Id nId, sal_Int32 nValue);
-static void mark(OOXMLFastContextHandler * pHandler,
- Id nId,
- const OUString rValue);
-
static void attributes
(OOXMLFastContextHandler * pContext,
const uno::Reference xml::sax::XFastAttributeList Attribs);
@@ -216,30 +212,6 @@ void
OOXMLFastHelperT::newProperty(OOXMLFastContextHandler * pHandler,
pHandler-newProperty(nId, pVal);
}
-template class T
-void OOXMLFastHelperT::mark(OOXMLFastContextHandler * pHandler,
- Id nId,
- const OUString rValue)
-{
-OOXMLValue::Pointer_t pVal(new T(rValue));
-
-#ifdef DEBUG_HELPER
-string aStr = (*QNameToString::Instance())(nId);
-
-debug_logger-startElement(helper.mark);
-debug_logger-attribute(name, aStr);
-debug_logger-attribute(value,
-OUStringToOString
-(rValue, RTL_TEXTENCODING_ASCII_US).getStr());
-
-if (aStr.empty())
-debug_logger-element(unknown-qname);
-
-debug_logger-endElement();
-#endif
-
-pHandler-mark(nId, pVal);
-}
}}
#endif // INCLUDED_FAST_HELPER_HXX
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl
[Libreoffice-commits] core.git: unusedcode.easy writerfilter/source
unusedcode.easy |1
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 37 ---
writerfilter/source/dmapper/DomainMapperTableManager.hxx |3 -
3 files changed, 41 deletions(-)
New commits:
commit 0be6adc8fcf9f4017b409aa3ec51a1e8c663e608
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jul 3 15:52:45 2013 +0200
Drop unused DomainMapperTableManager::CopyTextProperties()
Change-Id: Ibe99d4f3f4254329ca1b7269221f4e7cba1201a1
diff --git a/unusedcode.easy b/unusedcode.easy
index 529c1ef..2c163f9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -223,4 +223,3 @@ utl::ConfigItem::getUniqueSetElementName(rtl::OUString
const, rtl::OUString)
utl::toISO8601(com::sun::star::util::Time const)
vcl::unohelper::getNaturalStringSorterForAppLocale()
vclmain::createApplication()
-writerfilter::dmapper::DomainMapperTableManager::CopyTextProperties(boost::shared_ptrwriterfilter::dmapper::PropertyMap,
boost::shared_ptrwriterfilter::dmapper::StyleSheetTable)
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 6aabf59..54bbe4a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -724,43 +724,6 @@ void DomainMapperTableManager::clearData()
}
-void lcl_CopyTextProperties(PropertyMapPtr pToFill,
-const StyleSheetEntry* pStyleSheetEntry, StyleSheetTablePtr
pStyleSheetTable)
-{
-if( !pStyleSheetEntry )
-return;
-//fill base style properties first, recursively
-if( !pStyleSheetEntry-sBaseStyleIdentifier.isEmpty())
-{
-const StyleSheetEntryPtr pParentStyleSheet =
-
pStyleSheetTable-FindStyleSheetByISTD(pStyleSheetEntry-sBaseStyleIdentifier);
-OSL_ENSURE( pParentStyleSheet, table style not found );
-lcl_CopyTextProperties( pToFill, pParentStyleSheet.get( ),
pStyleSheetTable);
-}
-
-PropertyMap::const_iterator aPropIter =
pStyleSheetEntry-pProperties-begin();
-while(aPropIter != pStyleSheetEntry-pProperties-end())
-{
-//copy all text properties form the table style to the current run
attributes
-if( aPropIter-first.bIsTextProperty )
-pToFill-insert(*aPropIter);
-++aPropIter;
-}
-}
-void DomainMapperTableManager::CopyTextProperties(PropertyMapPtr pContext,
StyleSheetTablePtr pStyleSheetTable)
-{
-if( !m_pTableStyleTextProperies.get())
-{
-m_pTableStyleTextProperies.reset( new PropertyMap );
-const StyleSheetEntryPtr pStyleSheetEntry =
pStyleSheetTable-FindStyleSheetByISTD(
-m_sTableStyleName);
-OSL_ENSURE( pStyleSheetEntry, table style not found );
-lcl_CopyTextProperties(m_pTableStyleTextProperies,
pStyleSheetEntry.get( ), pStyleSheetTable);
-}
-pContext-InsertProps(m_pTableStyleTextProperies);
-}
-
-
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 6243b61..f36ac5d2 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -93,9 +93,6 @@ public:
const OUString getTableStyleName() const { return m_sTableStyleName; }
const com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue
getCurrentTablePosition();
-/// copy the text properties of the table style and its parent into
pContext
-voidCopyTextProperties(PropertyMapPtr pContext, StyleSheetTablePtr
pStyleSheetTable);
-
inline virtual void cellProps(TablePropertyMapPtr pProps)
{
if ( m_pStyleProps.get( ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
