CWS gnumake: resync to m91; conflicts unresolved

1 files changed, 9 insertions, 16 deletions

diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/classes/framelistanalyzer.hxx
index 55388120bd6a..745eabafb73a 100644
--- a/framework/inc/classes/framelistanalyzer.hxx
+++ b/framework/inc/classes/framelistanalyzer.hxx
@@ -29,13 +29,6 @@
 #define __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_
 
 //_______________________________________________
-//  my own includes
-
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/debug.hxx>
-#include <general.h>
-
-//_______________________________________________
 //  interface includes
 #include <com/sun/star/frame/XFrame.hpp>
 
@@ -89,10 +82,10 @@ class FWI_DLLPUBLIC FrameListAnalyzer
     public:
 
         /** provides access to the frame container, which should be analyzed. */
-        const css::uno::Reference< css::frame::XFramesSupplier >& m_xSupplier;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& m_xSupplier;
 
         /** hold the reference frame, which is used e.g. to detect other frames with the same model. */
-        const css::uno::Reference< css::frame::XFrame >& m_xReferenceFrame;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& m_xReferenceFrame;
 
         /** enable/disable some special analyzing steps.
             see impl_analyze() for further informations. */
@@ -101,19 +94,19 @@ class FWI_DLLPUBLIC FrameListAnalyzer
         /** contains all frames, which uses the same model like the reference frame.
             Will be filled only if m_eDetectMode has set the flag E_MODEL.
             The reference frame is never part of this list! */
-        css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lModelFrames;
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lModelFrames;
 
         /** contains all frames, which does not contain the same model like the reference frame.
             Filling of it can't be supressed by m_eDetectMode.
             The reference frame is never part of this list!
             All frames inside this list are visible ones. */
-        css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lOtherVisibleFrames;
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherVisibleFrames;
 
         /** contains all frames, which does not contain the same model like the reference frame.
             Filling of it can't be supressed by m_eDetectMode.
             The reference frame is never part of this list!
             All frames inside this list are hidden ones. */
-        css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lOtherHiddenFrames;
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherHiddenFrames;
 
         /** points to the help frame.
             Will be set only, if any other frame (means different from the reference frame)
@@ -138,7 +131,7 @@ class FWI_DLLPUBLIC FrameListAnalyzer
             Analyzing of the help frame ignores the visible state of any frame.
             But note: a hidden help frame indicates a wrong state!
          */
-        css::uno::Reference< css::frame::XFrame > m_xHelp;
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xHelp;
 
         /** points to the frame, which contains the backing component.
             Will be set only, if any other frame (means different from the reference frame)
@@ -164,7 +157,7 @@ class FWI_DLLPUBLIC FrameListAnalyzer
             Analyzing of the help frame ignores the visible state of any frame.
             But note: a hidden backing mode frame indicates a wrong state!
          */
-        css::uno::Reference< css::frame::XFrame > m_xBackingComponent;
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xBackingComponent;
 
         /** is set to true only, if the reference frame is a hidden one.
             This value is undefined if m_eDetectMode doesn't have set the flag E_HIDDEN! */
@@ -201,8 +194,8 @@ class FWI_DLLPUBLIC FrameListAnalyzer
                     analyze steps. Note: Some member values will be undefined, if
                     an analyze step will be disabled.
          */
-                 FrameListAnalyzer( const css::uno::Reference< css::frame::XFramesSupplier >& xSupplier       ,
-                                    const css::uno::Reference< css::frame::XFrame >&          xReferenceFrame ,
+                 FrameListAnalyzer( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& xSupplier       ,
+                                    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&          xReferenceFrame ,
                                           sal_uInt32                                          eDetectMode     );
         virtual ~FrameListAnalyzer();