oox/inc/oox/vml/vmltextbox.hxx | 2 +- writerfilter/source/dmapper/DomainMapperTableManager.hxx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
New commits: commit 6c6c6c3e876a831fcd954fc3fedb7d21bc142fe8 Author: Cédric Bosdonnat <cedric.bosdon...@free.fr> Date: Fri Feb 22 18:48:51 2013 +0100 Fixed conflict resolution problems Change-Id: Icfe653b3a5f307d21a8c99ce4c133234aa36378b diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx index 427bb79..754ec21 100644 --- a/oox/inc/oox/vml/vmltextbox.hxx +++ b/oox/inc/oox/vml/vmltextbox.hxx @@ -95,7 +95,7 @@ public: /// Text distance from the border (inset attribute of v:textbox), valid only if set. bool borderDistanceSet; int borderDistanceLeft, borderDistanceTop, borderDistanceRight, borderDistanceBottom; - OUString maLayoutFlow; + ::rtl::OUString maLayoutFlow; private: typedef ::std::vector< TextPortionModel > PortionVector; diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 97866b0..424c108 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
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits