diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2010-10-05 11:18:24 -0400 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2010-10-05 11:18:24 -0400 |
commit | 7d082ba75b237eb8b9e5fbc6e128d92674793fc0 (patch) | |
tree | 2553d8f2bc00614964aa8d29854f0ee155498028 | |
parent | native bool support in SvXMLUnitConverter (diff) | |
download | core-7d082ba75b237eb8b9e5fbc6e128d92674793fc0.tar.gz core-7d082ba75b237eb8b9e5fbc6e128d92674793fc0.zip |
Ported calc-distributed-cell-text-*.diff from ooo-build.
This feature enables horizontal 'distributed' alignment and vertical
'justified' and 'distributed' alignments for cell contents in Calc.
Note that this feature relies on ODF 1.2 extended in order for the
relevant cell attributes to be saved in ODS.
-rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 2 | ||||
-rw-r--r-- | dbaccess/util/makefile.mk | 3 | ||||
-rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 142da37eb892..2b96b5883459 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -295,6 +295,8 @@ #include <connectivity/FValue.hxx> #endif +#include <editeng/justifyitem.hxx> + // ......................................................................... namespace dbaui { diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk index 8430b5edf8dc..653d58018ba8 100644 --- a/dbaccess/util/makefile.mk +++ b/dbaccess/util/makefile.mk @@ -128,7 +128,8 @@ SHL2STDLIBS= \ $(CPPULIB) \ $(SO2LIB) \ $(VOSLIB) \ - $(SALLIB) + $(SALLIB) \ + $(EDITENGLIB) .IF "$(GUI)"=="OS2" SHL2STDLIBS+= $(LB)$/i$(TARGET).lib diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 209017ed062e..ccf1da9582cf 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -69,6 +69,7 @@ #include <editeng/flstitem.hxx> #include <editeng/akrnitem.hxx> #include <editeng/colritem.hxx> +#include <editeng/justifyitem.hxx> #include <svx/drawitem.hxx> #include <editeng/twolinesitem.hxx> #include <editeng/charreliefitem.hxx> |