diff options
| author | Philipp Lohmann <pl@openoffice.org> | 2009-06-11 16:36:55 +0000 |
|---|---|---|
| committer | Philipp Lohmann <pl@openoffice.org> | 2009-06-11 16:36:55 +0000 |
| commit | f40c3598c55e8be6c343890081edf68872de06b1 (patch) | |
| tree | d045d5d4207b5c488581faad9b9b531e8994e91f /starmath | |
| parent | 7d476e2e47e4572c44b325e976048bb8ae6959b6 (diff) | |
solve a merge problem
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/unomodel.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 3491044e35b5..241415ef0b22 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -79,8 +79,6 @@ using namespace ::com::sun::star::script; #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
-#define A2OU(cChar) rtl::OUString::createFromAscii(cChar)
-
////////////////////////////////////////////////////////////
SmPrintUIOptions::SmPrintUIOptions()
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 2b84c4dfc424..f229293b6b9d 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -70,7 +70,6 @@ #include <vcl/wrkwin.hxx> #include "unomodel.hxx" -#include "mathml.hxx" #include "view.hxx" #include "config.hxx" #include "dialog.hxx" |