gnumake2: merging minibranches

accessibility/source/extended/AccessibleToolPanelDeck.cxx

@@ -35,7 +35,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 /** === end UNO includes === **/
 
-#include <svtools/toolpanel/toolpaneldeck.hxx>
+#include <svtools/toolpaneldeck.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>

accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx

@@ -38,8 +38,8 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 /** === end UNO includes === **/
 
-#include <svtools/toolpanel/toolpaneldeck.hxx>
-#include <svtools/toolpanel/paneltabbar.hxx>
+#include <svtools/toolpaneldeck.hxx>
+#include <svtools/paneltabbar.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>

accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx

@@ -35,8 +35,8 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 /** === end UNO includes === **/
 
-#include <svtools/toolpanel/toolpaneldeck.hxx>
-#include <svtools/toolpanel/paneltabbar.hxx>
+#include <svtools/toolpaneldeck.hxx>
+#include <svtools/paneltabbar.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <tools/diagnose_ex.h>