cws impress190: rebase m82

7 files changed, 1 insertions, 74 deletions

diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 0c14dec72583..dfc7e3e3bf88 100644..100755
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -179,13 +179,6 @@ public:
 
     enum ChangeHint { CH_VIEW_SHELL_INVALID, CH_VIEW_SHELL_VALID };
 
-    /** Handle a change outside the outliner which may affect the outliner.
-        At the moment this is restricted to changes of the main view shell
-        but later may include any changes that are detected now by
-        DetectChange().
-    */
-    void HandleOutsideChange (ChangeHint eHint);
-
     int         GetIgnoreCurrentPageChangesLevel() const     { return mnIgnoreCurrentPageChangesLevel; };
     void        IncreIgnoreCurrentPageChangesLevel()     { mnIgnoreCurrentPageChangesLevel++; };
     void        DecreIgnoreCurrentPageChangesLevel()     { mnIgnoreCurrentPageChangesLevel--; };
@@ -421,15 +414,6 @@ private:
     */
     void EndOfSearch (void);
 
-    /** Prepare to commence searching/spell checking on the specified page.
-        This also creates a proper page iterator.
-        @param nPageIndex
-            Index of the page to prepare for searching.  The default value
-            of -1 is a flag for using the first/last page of the current
-            edit mode/view mode depending on the search direction.
-    */
-    void InitPage (USHORT nPageIndex = (USHORT)-1);
-
     /** Show a dialog that tells the user that the search has ended either
         because there are no more matches after finding at least one or that
         no match has been found at all.
@@ -521,11 +505,6 @@ private:
     */
     bool HandleFailedSearch (void);
 
-    /** Return a parent window for a dialog.  The returned window depends on
-        the search mode.
-    */
-    ::Window* GetParentForDialog (void);
-
     /** Take a position as returned by an object iterator and switch to the
         view and page on which the object specified by this position is
         located.
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index ce291a6f5a00..92301f06289c 100644..100755
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -109,13 +109,6 @@ public:
     */
     explicit Iterator (IteratorImplBase* pObject);
 
-    /** Create a new iterator with the implementation object being the copy
-        of the provided one.
-        @param rObject
-            A copy of this object will become the implementation object.
-    */
-    explicit Iterator (const IteratorImplBase& rObject);
-
     ~Iterator (void);
 
     /** Assign the iterator from the given one.  The implementation object
@@ -240,9 +233,8 @@ private:
             This specifies whether the returned iterator points to the
             first, (one past the) last, or current object.
         @return
-            Returns an iterator as constructed by one of the
+            Returns an iterator as constructed by
             <member>CreateSelectionIterator()</member>,
-            <member>CreateViewIterator()</member>, or <member>CreateDocumentIterator()</member>.
      */
     Iterator CreateIterator (IteratorLocation aLocation);
 
@@ -270,24 +262,6 @@ private:
         IteratorLocation aLocation=BEGIN);
 
     /** Create an iterator that iterates over all <type>SdrObjects</type>
-        objects of the <member>mpOutliner</member> outliner that belong to
-        the current view.
-        @param pDocument
-            The document to which the objects belong.
-        @param pViewShell
-            The view shell which displays the objects.
-        @param bDirectionIsForward
-            The direction of iteration.  It defaults to forward.
-        @param aLocation
-            This specifies at which object the iterator points initially.
-    */
-    Iterator CreateViewIterator (
-        SdDrawDocument* pDocument,
-        const boost::shared_ptr<ViewShell>& rpViewShell,
-        bool bDirectionIsForward=true,
-        IteratorLocation aLocation=BEGIN);
-
-    /** Create an iterator that iterates over all <type>SdrObjects</type>
         objects of the <member>mpOutliner</member> outliner.
         @param pDocument
             The document to which the objects belong.
@@ -356,9 +330,6 @@ public:
             assigned to the data members of this object.
     */
     IteratorPosition (const IteratorPosition& aPosition);
-    /** Create a new object and set its data members to the given values.
-    */
-    IteratorPosition (SdrObject* pObject, sal_Int32 nText, sal_Int32 nPageIndex, PageKind ePageKind, EditMode eEditMode);
 
     /// The destructor is a no-op at the moment.
     ~IteratorPosition (void);
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 1d801baa5d3c..6811da762934 100644..100755
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -441,7 +441,6 @@ public:
     CharClass*          GetCharClass() const { return mpCharClass; }
 
     void                RestoreLayerNames();
-    void                MakeUniqueLayerNames();
 
     void                UpdateAllLinks();
 
@@ -465,18 +464,6 @@ public:
 
     static SdDrawDocument* pDocLockedInsertingLinks;  // static to prevent recursions while resolving links
 
-    /** This method acts as a simplified front end for the more complex
-        <member>CreatePage()</member> method.
-        @param nPageNum
-            The page number as passed to the <member>GetSdPage()</member>
-            method from which to use certain properties for the new pages.
-            These include the auto layout.
-        @return
-            Returns an index of the inserted pages that can be used with the
-            <member>GetSdPage()</member> method.
-    */
-    USHORT CreatePage (USHORT nPageNum);
-
     /** Create and insert a set of two new pages: a standard (draw) page and
         the associated notes page.  The new pages are inserted direclty
         after the specified page set.
@@ -687,7 +674,6 @@ namespace sd
 class ModifyGuard
 {
 public:
-    ModifyGuard( DrawDocShell* pDocShell );
     ModifyGuard( SdDrawDocument* pDoc );
     ~ModifyGuard();
 
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 0dad3ca237cb..f0d5cc64a3c4 100644..100755
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -141,8 +141,6 @@ public:
 
     SD_DLLPUBLIC SvNumberFormatter*     GetNumberFormatter();
 
-    ::com::sun::star::text::WritingMode GetDefaultWritingMode() const;
-
     //virtuelle Methoden fuer den Optionendialog
     virtual SfxItemSet*  CreateItemSet( USHORT nId );
     virtual void         ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index d1ce1b0af8c0..1b87a6a9e10f 100755
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
@@ -62,10 +62,6 @@ namespace sd
             returns the first shape if pObj is 0 */
         SdrObject* getNextShape(SdrObject* pObj) const;
 
-        /** returns the shape prior to the given shape in the list or 0
-            returns the last shape if pObj is 0 */
-        SdrObject* getPreviousShape( SdrObject* pObj ) const;
-
         /**
         */
         SdrObject* getNextShape();
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 7dfeac99121b..fd9dbeae5977 100644..100755
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -68,7 +68,6 @@ public:
     SfxStyleSheetBase*  GetActualStyleSheet()                                   { return mpActualStyleSheet; }
 
     SfxStyleSheetBase*  GetTitleSheet(const String& rLayoutName);
-    String              GetLayoutName() const;
 
                         // Caller muss Liste loeschen
     List*               CreateOutlineSheetList(const String& rLayoutName);
@@ -82,7 +81,6 @@ public:
                             when styles are missing.
     */
     SD_DLLPUBLIC void                CreateLayoutStyleSheets(const String& rLayoutName, sal_Bool bCheck = sal_False );
-    void                EraseLayoutStyleSheets(const String& rLayoutName);
     List*               CreateLayoutSheetNames(const String& rLayoutName) const;
     void                CreateLayoutSheetList(const String& rLayoutName, SdStyleSheetVector& rLayoutSheets);
     void                CopyLayoutSheets(const String& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index ced8a48c5bb6..6fa186596fba 100644..100755
--- a/sd/inc/textapi.hxx
+++ b/sd/inc/textapi.hxx
@@ -53,7 +53,6 @@ public:
     virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
 
     OutlinerParaObject* CreateText();
-    void                SetString( const String& rText );
     void                SetText( OutlinerParaObject& rText );
     String              GetText();