diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-02-22 18:48:51 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-02-22 18:48:51 +0100 |
| commit | 6c6c6c3e876a831fcd954fc3fedb7d21bc142fe8 (patch) | |
| tree | dc46339acfe24bda0483c082d7606b01f8090890 /writerfilter/source | |
| parent | 94108f529a11062eb2749b5141752c884d106464 (diff) | |
Fixed conflict resolution problems
Change-Id: Icfe653b3a5f307d21a8c99ce4c133234aa36378b
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.hxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 97866b0f8cc7..424c10814cac 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -92,7 +92,6 @@ public: IntVectorPtr getCurrentCellWidths( ); const ::rtl::OUString& getTableStyleName() const { return m_sTableStyleName; } - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getTablePosition() { return m_aTablePosition; } const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getCurrentTablePosition(); /// copy the text properties of the table style and its parent into pContext |