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 /oox | |
| parent | 94108f529a11062eb2749b5141752c884d106464 (diff) | |
Fixed conflict resolution problems
Change-Id: Icfe653b3a5f307d21a8c99ce4c133234aa36378b
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/oox/vml/vmltextbox.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx index 427bb79a832b..754ec21f40d0 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; |