strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

solve some merge problems

Browse source
This commit is contained in:
Philipp Lohmann [pl] 2010-01-15 00:20:57 +01:00
parent b59c89d2ae
commit 5390c9fba7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
starmath/source/unomodel.cxx
View file

@ -52,7 +52,7 @@
#include <xmloff/xmluconv.hxx> #include <xmloff/xmluconv.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <comphelper/propertysetinfo.hxx> #include <comphelper/propertysetinfo.hxx>
#include <svtools/moduleoptions.hxx> #include <unotools/moduleoptions.hxx>
#include <unomodel.hxx> #include <unomodel.hxx>
#include <document.hxx> #include <document.hxx>

4
sw/source/core/view/vprint.cxx
View file

@ -54,8 +54,8 @@
#include <svx/svdview.hxx> #include <svx/svdview.hxx>
#include <unotools/localedatawrapper.hxx> #include <unotools/localedatawrapper.hxx>
#include <svtools/moduleoptions.hxx> #include <unotools/moduleoptions.hxx>
#include <svtools/languageoptions.hxx> #include <svl/languageoptions.hxx>
#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/view/XRenderable.hpp> #include <com/sun/star/view/XRenderable.hpp>