diff options
| author | Noel Power <noel.power@novell.com> | 2011-03-23 17:36:02 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2011-03-23 17:36:02 +0000 |
| commit | 3256422d4fa7b4181079f33e9ec8cf77bbf9226a (patch) | |
| tree | 4345967a1937530453286196b6696e19aaded4fb /toolkit | |
| parent | 531faf8b6c10fb65ecb51e216cdbba22b6ae6795 (diff) | |
fix rebase conflict hicup
removed extra include for XDialog.hpp
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/toolkit/controls/dialogcontrol.hxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx index 789cc36385d8..339ea11bdd8b 100644 --- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx +++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx @@ -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" |