rename sd::Outliner to SdOutliner

having a top level data structure share a name with one of its
supertypes makes it very hard to grep

Change-Id: Id5145c12c8fd9e8c8fb09897896eae0da7bfdefe

3 files changed, 21 insertions, 20 deletions

diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 98249bd4d0e9..aef606b390d8 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -57,6 +57,9 @@ struct SearchSelection
     }
 };
 
+} // end of namespace sd
+
+
 /** The main purpose of this class is searching and replacing as well as
     spelling of impress documents.  The main part of both tasks lies in
     iterating over the pages and view modes of a document and apply the
@@ -109,7 +112,7 @@ struct SearchSelection
     queried.  This is only sufficient for searching the outline view.
     </p>
 */
-class Outliner
+class SdOutliner
     : public SdrOutliner
 {
 public:
@@ -126,11 +129,11 @@ public:
             <const>OutlinerMode::OutlineView</const> are defined in
             editeng/outliner.hxx.
     */
-    Outliner( SdDrawDocument* pDoc, OutlinerMode nMode );
-    virtual ~Outliner() override;
+    SdOutliner( SdDrawDocument* pDoc, OutlinerMode nMode );
+    virtual ~SdOutliner() override;
     /// Forbid copy construction and copy assignment
-    Outliner(const Outliner&) = delete;
-    Outliner& operator=(const Outliner&) = delete;
+    SdOutliner(const Outliner&) = delete;
+    SdOutliner& operator=(const Outliner&) = delete;
 
     /** Despite the name this method is called prior to spell checking *and*
         searching and replacing.  The position of current view
@@ -202,7 +205,7 @@ private:
         pointer to avoid keeping it alive when the view is changed
         during searching.
     */
-    std::weak_ptr<ViewShell> mpWeakViewShell;
+    std::weak_ptr<::sd::ViewShell> mpWeakViewShell;
     /// This window contains the view.
     VclPtr< ::sd::Window> mpWindow;
     /// The document on whose objects and pages this class operates.
@@ -363,7 +366,7 @@ private:
             The return value specifies whether the search ended (</sal_True>) or
             another call to this method is required (</sal_False>).
     */
-    bool SearchAndReplaceOnce(std::vector<SearchSelection>* pSelections = nullptr);
+    bool SearchAndReplaceOnce(std::vector<::sd::SearchSelection>* pSelections = nullptr);
 
     /** Detect changes of the document or view and react accordingly.  Such
         changes may occur because different calls to
@@ -511,7 +514,7 @@ private:
         It handles i.e. registering at the associated view as selection
         change listener.
     */
-    void SetViewShell (const std::shared_ptr<ViewShell>& rpViewShell);
+    void SetViewShell (const std::shared_ptr<::sd::ViewShell>& rpViewShell);
 
     /** Activate or deactivate the search in the current selection.  Call
         this method whenever the selection has changed.  This method creates
@@ -538,8 +541,6 @@ private:
     sal_uInt16 ShowModalMessageBox (Dialog& rMessageBox);
 };
 
-} // end of namespace sd
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index 9adac49e28d4..0bb838b75d7e 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -28,11 +28,11 @@
 #include <vector>
 
 class SdDrawDocument;
+class SdOutliner;
 
 namespace sd {
 
 class ViewShell;
-class Outliner;
 
 namespace outliner {
 
@@ -141,14 +141,14 @@ private:
     std::unique_ptr<IteratorImplBase> mxIterator;
 };
 
-/** This class wraps the <type>Outliner</type> class and represents it as
+/** This class wraps the <type>SdOutliner</type> class and represents it as
     a container of <type>SdrObject</type> objects.  Its main purpose is to
     provide iterators for certain sub-sets of those objects.  These sub-sets
     are a) the set of the currently selected objects, b) all objects in the
     current view, and c) all objects in all views.
 
     <p>The direction of the returned iterators depends on the underlying
-    <type>Outliner</type> object and is usually set in the search
+    <type>SdOutliner</type> object and is usually set in the search
     dialog.</p>
 */
 class OutlinerContainer
@@ -159,7 +159,7 @@ public:
             The outliner that is represented by the new object as
             <type>SdrObject</type> container.
     */
-    OutlinerContainer (::sd::Outliner* pOutliner);
+    OutlinerContainer (SdOutliner* pOutliner);
 
     /** Return an iterator that points to the first object of one of the
         sets described above.  This takes also into account the direction of
@@ -193,7 +193,7 @@ public:
 
 private:
     /// The wrapped outliner that is represented as object container.
-    ::sd::Outliner* mpOutliner;
+    SdOutliner* mpOutliner;
 
     /** Create an iterator.  The object pointed to depends on the search
         direction retrieved from the outliner object
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 1bb04670b857..1235655e88ac 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -58,9 +58,9 @@ namespace com
 namespace sd
 {
     class FrameView;
-    class Outliner;
 }
 
+class SdOutliner;
 class Timer;
 class SfxObjectShell;
 class SdPage;
@@ -141,8 +141,8 @@ public:
     SAL_DLLPRIVATE bool getDocReadOnly() const { return bReadOnly; }
 private:
     OUString            msDocAccTitle;
-    ::sd::Outliner*     mpOutliner;          ///< local outliner for outline mode
-    ::sd::Outliner*     mpInternalOutliner;  ///< internal outliner for creation of text objects
+    SdOutliner*     mpOutliner;          ///< local outliner for outline mode
+    SdOutliner*     mpInternalOutliner;  ///< internal outliner for creation of text objects
     Timer*              mpWorkStartupTimer;
     Idle*               mpOnlineSpellingIdle;
     sd::ShapeList*      mpOnlineSpellingList;
@@ -215,8 +215,8 @@ public:
 
     SAL_DLLPRIVATE SfxItemPool&        GetPool() { return( *pItemPool ); }
 
-    SAL_DLLPRIVATE ::sd::Outliner* GetOutliner(bool bCreateOutliner=true);
-    ::sd::Outliner* GetInternalOutliner(bool bCreateOutliner=true);
+    SAL_DLLPRIVATE SdOutliner* GetOutliner(bool bCreateOutliner=true);
+    SdOutliner* GetInternalOutliner(bool bCreateOutliner=true);
 
     SAL_DLLPRIVATE ::sd::DrawDocShell*     GetDocSh() const { return mpDocSh; }