fix rebase conflict hicup

removed extra include for XDialog.hpp
This commit is contained in:
Noel Power 2011-03-23 17:36:02 +00:00
parent 531faf8b6c
commit 3256422d4f

View file

@ -31,7 +31,6 @@
#include <toolkit/controls/controlmodelcontainerbase.hxx>
#include <com/sun/star/awt/XTopWindow.hpp>
#include <com/sun/star/awt/XDialog2.hpp>
#include <com/sun/star/awt/XDialog.hpp>
#include <com/sun/star/awt/XSimpleTabController.hpp>
#include <com/sun/star/resource/XStringResourceResolver.hpp>
#include "toolkit/helper/servicenames.hxx"