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

CWS gnumake3: merge minibranches

Browse source
This commit is contained in:
Mathias Bauer 2011-01-30 13:32:41 +01:00
commit 68ca083175
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
svtools/source/uno/addrtempuno.cxx
View file

@ -29,7 +29,7 @@
#include "precompiled_svtools.hxx" #include "precompiled_svtools.hxx"
#include "svtools/genericunodialog.hxx" #include "svtools/genericunodialog.hxx"
#include <svtools/addresstemplate.hxx> #include <svtools/addresstemplate.hxx>
#include <cppuhelper/extract.hxx> #include <comphelper/extract.hxx>
#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/typeprovider.hxx>
#include <comphelper/property.hxx> #include <comphelper/property.hxx>
#include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/sdbc/XDataSource.hpp>

2
svtools/source/uno/genericunodialog.cxx
View file

@ -34,7 +34,7 @@
#include <com/sun/star/ucb/AlreadyInitializedException.hpp> #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <toolkit/awt/vclxwindow.hxx> #include <toolkit/awt/vclxwindow.hxx>
#include <cppuhelper/extract.hxx> #include <comphelper/extract.hxx>
#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/typeprovider.hxx>
#include <comphelper/property.hxx> #include <comphelper/property.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>

5
unotools/inc/unotools/unotunnelhelper.hxx
View file

@ -33,10 +33,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp>
#include <rtl/uuid.h> #include <rtl/uuid.h>
#include <rtl/memory.h> #include <rtl/memory.h>
#include <comphelper/extract.hxx>
#ifndef _CPPUHELPER_EXTRACT_HXX_
#include <cppuhelper/extract.hxx>
#endif
namespace utl namespace utl
{ {