build vba in offuh, requires a move of oovbaapi to ure; misc sw fixes

18 files changed, 19 insertions, 243 deletions

diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index b244b9656d..d7ac00e461 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -238,5 +238,6 @@ class SwSidebarWin : public Window
 
 } } // eof namespace sw::sidebarwindows
 
+#endif // _SIDEBARWIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index c1839c7650..0bffbcb34e 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -244,9 +244,6 @@ public:
     sal_Int32 GetChildIndex( const SwFrm& rParentFrm,
                              Window& rChild ) const;
 
-    sal_Int32 GetChildIndex( const SwFrm& rParentFrm,
-                             Window& rChild ) const;
-
     // update preview data (and fire events if necessary)
     void UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages,
                         const Fraction&  _rScale,
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 6f3c56e312..497e4eb6f1 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -727,9 +727,6 @@ public:
     // Check SwSpellIter data to see if the last sentence got grammar checked.
     bool HasLastSentenceGotGrammarChecked() const;
 
-
-    // check SwSpellIter data to see if the last sentence got grammar checked
-    bool HasLastSentenceGotGrammarChecked() const;
     // Is text conversion active somewhere else?
     BOOL HasConvIter() const;
 
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index eb3a95fbb6..444988abce 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -325,10 +325,10 @@ public:
     virtual SwFieldType* ChgTyp( SwFieldType* );
 
     /** expand the field.
-        @param  bInClipboard    field is in clipboard document?
-        @return     the generated text (suitable for display)
-      */
-    String              ExpandField(bool const bInClipboard) const;
+        @param  bCached     return cached field value.
+        @remark     most callers should use the cached field value.
+                    this is because various fields need special handing
+                    (ChangeExpansion()) to return correct values, and only
                     SwTxtFormatter::NewFldPortion() sets things up properly.
         @return     the generated text (suitable for display)
       */
@@ -336,7 +336,6 @@ public:
 
     virtual String      GetFieldName() const;
 
-
     SwField *           CopyField() const;
 
     // ResId
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 2ca0efcec0..49dc1ddb90 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -794,13 +794,6 @@ public:
                     ::com::sun::star::text::XTextContent> const& xParagraph)
             { m_wXParagraph = xParagraph; }
 
-    SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
-        ::com::sun::star::text::XTextContent> const& GetXParagraph() const
-            { return m_wXParagraph; }
-    SW_DLLPRIVATE void SetXParagraph(::com::sun::star::uno::Reference<
-                    ::com::sun::star::text::XTextContent> const& xParagraph)
-            { m_wXParagraph = xParagraph; }
-
     // sfx2::Metadatable
     virtual ::sfx2::IXmlIdRegistry& GetRegistry();
     virtual bool IsInClipboard() const;
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 99ddafcd29..95fd11a82e 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -84,6 +84,7 @@ private:
     String m_sLinkFileName;
     String m_sLinkFilePassword; // must be changed to Sequence
     ::com::sun::star::uno::Sequence <sal_Int8> m_Password;
+
     /// it seems this flag caches the current final "hidden" state
     bool m_bHiddenFlag          : 1;
     /// flags that correspond to attributes in the format:
@@ -133,68 +134,6 @@ public:
     String const& GetLinkFileName() const   { return m_sLinkFileName; };
     void SetLinkFileName(String const& rNew, String const* pPassWd = 0)
     {
-private:
-    SectionType m_eType;
-    void SetPassword(::com::sun::star::uno::Sequence<sal_Int8> const& rNew)
-                                            { m_Password = rNew; }
-    bool IsLinkType() const
-    { return (DDE_LINK_SECTION == m_eType) || (FILE_LINK_SECTION == m_eType); }
-
-    String m_sSectionName;
-    String m_sCondition;
-    String m_sLinkFileName;
-    String m_sLinkFilePassword; // JP 27.02.2001: must be changed to Sequence
-    ::com::sun::star::uno::Sequence <sal_Int8> m_Password;
-
-    /// it seems this flag caches the current final "hidden" state
-    bool m_bHiddenFlag          : 1;
-    /// flags that correspond to attributes in the format:
-    /// may have different value than format attribute:
-    /// format attr has value for this section, while flag is
-    /// effectively ORed with parent sections!
-    bool m_bProtectFlag         : 1;
-    friend class SwSectionFrm;
-    bool m_bEditInReadonlyFlag  : 1;
-    bool m_bHidden              : 1; // all paragraphs hidden?
-    bool m_bCondHiddenFlag      : 1; // Hiddenflag for condition
-    bool m_bConnectFlag         : 1; // connected to server?
-
-public:
-    SwSectionData m_Data;
-
-    SwSectionData(SectionType const eType, String const& rName);
-    explicit SwSectionData(SwSection const&);
-    SwSectionData(SwSectionData const&);
-    SwSectionData & operator=(SwSectionData const&);
-    bool operator==(SwSectionData const&) const;
-
-    String const& GetSectionName() const    { return m_sSectionName; }
-    void SetSectionName(String const& rName){ m_sSectionName = rName; }
-    SectionType GetType() const             { return m_eType; }
-    void SetType(SectionType const eNew)    { m_eType = eNew; }
-
-    bool IsHidden() const { return m_bHidden; }
-    void SetHidden(bool const bFlag = true) { m_bHidden = bFlag; }
-
-    bool IsHiddenFlag() const { return m_bHiddenFlag; }
-    SW_DLLPRIVATE void
-        SetHiddenFlag(bool const bFlag) { m_bHiddenFlag = bFlag; }
-    bool IsProtectFlag() const { return m_bProtectFlag; }
-    SW_DLLPRIVATE void
-        SetProtectFlag(bool const bFlag) { m_bProtectFlag = bFlag; }
-    bool IsEditInReadonlyFlag() const { return m_bEditInReadonlyFlag; }
-    void SetEditInReadonlyFlag(bool const bFlag)
-        { m_bEditInReadonlyFlag = bFlag; }
-
-    void SetCondHidden(bool const bFlag = true) { m_bCondHiddenFlag = bFlag; };
-    bool IsCondHidden() const { return m_bCondHiddenFlag; }
-
-    String const& GetCondition() const      { return m_sCondition; }
-    void SetCondition(String const& rNew)   { m_sCondition = rNew; }
-
-    String const& GetLinkFileName() const   { return m_sLinkFileName; };
-    void SetLinkFileName(String const& rNew, String const* pPassWd = 0)
-    {
         m_sLinkFileName = rNew;
         if (pPassWd) { SetLinkFilePassword(*pPassWd); }
     }
@@ -259,14 +198,13 @@ public:
     bool IsProtect() const;
     void SetProtect(bool const bFlag = true);
     bool IsEditInReadonly() const;
-    bool IsEditInReadonly() const;
     void SetEditInReadonly(bool const bFlag = true);
+
     // erfrage die internen Flags (Zustand inklusive Parents nicht, was
     // aktuell an der Section gesetzt ist!!)
     bool IsHiddenFlag()  const { return m_Data.IsHiddenFlag(); }
     bool IsProtectFlag() const { return m_Data.IsProtectFlag(); }
     bool IsEditInReadonlyFlag() const { return m_Data.IsEditInReadonlyFlag(); }
-    bool IsEditInReadonlyFlag() const { return m_Data.IsEditInReadonlyFlag(); }
 
     void SetCondHidden(bool const bFlag = true);
     bool IsCondHidden() const { return m_Data.IsCondHidden(); }
@@ -328,7 +266,6 @@ public:
     // #b6521322#
     void BreakLink();
 
-
 };
 
 
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index dee9b57ccf..c58d4aa892 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -495,4 +495,6 @@ public:
     virtual GetTabPageRanges			GetTabPageRangesFunc( USHORT nId ) = 0;
 };
 
+#endif // _SW_ABSTDLG_HXX
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index e00e0519e5..10c7addb34 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -485,23 +485,6 @@ public:
     const SwTableBox * getTableBox() const;
 };
 
-class SwCellFrm;
-class SW_DLLPUBLIC SwTableCellInfo : public ::boost::noncopyable
-{
-    struct Impl;
-    ::std::auto_ptr<Impl> m_pImpl;
-
-    const SwCellFrm * getCellFrm() const ;
-
-public:
-    SwTableCellInfo(const SwTable * pTable);
-    ~SwTableCellInfo();
-
-    bool getNext();
-    SwRect getRect() const;
-    const SwTableBox * getTableBox() const;
-};
-
 #endif	//_SWTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index daab978079..94a4070eb7 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -93,85 +93,6 @@ class UnoActionRemoveContext
 
 
 ::com::sun::star::uno::Sequence< sal_Int8 > CreateUnoTunnelId();
-};
-
-
-::com::sun::star::uno::Sequence< sal_Int8 > CreateUnoTunnelId();
-
-/// helper function for implementing SwClient::Modify 
-void ClientModify(SwClient* pClient, SfxPoolItem *pOld, SfxPoolItem *pNew);
-
-
-#include <boost/utility.hpp>
-#include <osl/diagnose.h>
-#include <vos/mutex.hxx>
-#include <vcl/svapp.hxx>
-
-namespace sw {
-
-    template<typename T> class UnoImplPtr
-        : private ::boost::noncopyable
-    {
-        private:
-            T * m_p;
-
-        public:
-            UnoImplPtr(T *const i_p)
-                : m_p(i_p)
-            {
-                OSL_ENSURE(i_p, "UnoImplPtr: null");
-            }
-
-            ~UnoImplPtr()
-            {
-                ::vos::OGuard g(Application::GetSolarMutex());
-                delete m_p; // #i105557#: call dtor with locked solar mutex
-                m_p = 0;
-            }
-
-            T & operator * () const { return *m_p; }
-
-            T * operator ->() const { return  m_p; }
-
-            T * get        () const { return  m_p; }
-    };
-
-    template< class C > C *
-    UnoTunnelGetImplementation(
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XUnoTunnel > const & xUnoTunnel)
-    {
-        if (!xUnoTunnel.is()) { return 0; }
-        C *const pC( reinterpret_cast< C* >(
-                        ::sal::static_int_cast< sal_IntPtr >(
-                            xUnoTunnel->getSomething(C::getUnoTunnelId()))));
-        return pC;
-    }
-
-    template< class C > sal_Int64
-    UnoTunnelImpl(const ::com::sun::star::uno::Sequence< sal_Int8 > & rId,
-                  C *const pThis)
-    {
-        if ((rId.getLength() == 16) &&
-            (0 == rtl_compareMemory(C::getUnoTunnelId().getConstArray(),
-                                    rId.getConstArray(), 16)))
-        {
-            return ::sal::static_int_cast< sal_Int64 >(
-                    reinterpret_cast< sal_IntPtr >(pThis) );
-        }
-        return 0;
-    }
-
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >
-    GetSupportedServiceNamesImpl(
-            size_t const nServices, char const*const pServices[]);
-    sal_Bool SupportsServiceImpl(
-            size_t const nServices, char const*const pServices[],
-            ::rtl::OUString const & rServiceName);
-
-} // namespace sw
-
-#endif // SW_UNOBASECLASS_HXX
 
 /// helper function for implementing SwClient::Modify 
 void ClientModify(SwClient* pClient, SfxPoolItem *pOld, SfxPoolItem *pNew);
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 44650dacf9..3657bd09ab 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1311,11 +1311,6 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
                 OSL_ENSURE( false,
                         "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <Window>." );
             }
-            else if ( rChildFrmOrObj.GetWindow() )
-            {
-                ASSERT( false,
-                        "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <Window>." );
-            }
         }
     }
 }
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index e03c34dbfb..038eca902f 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -347,7 +347,7 @@ const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const
             {
                 // For FLY_AS_CHAR the parent is the anchor
                 pParent = pFly->GetAnchorFrm();
-                ASSERT( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
+                OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
                         "parent is not accessible" );
             }
             else
@@ -374,16 +374,16 @@ const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const
     {
         const SwDrawContact *pContact =
             static_cast< const SwDrawContact* >( GetUserCall( mpDrawObj ) );
-        ASSERT( pContact, "sdr contact is missing" );
+        OSL_ENSURE( pContact, "sdr contact is missing" );
         if( pContact )
         {
             const SwFrmFmt *pFrmFmt = pContact->GetFmt();
-            ASSERT( pFrmFmt, "frame format is missing" );
+            OSL_ENSURE( pFrmFmt, "frame format is missing" );
             if( pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
             {
                 // For FLY_AS_CHAR the parent is the anchor
                 pParent = pContact->GetAnchorFrm();
-                ASSERT( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
+                OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
                         "parent is not accessible" );
 
             }
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index ad00de2487..e7fd8644da 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -168,38 +168,4 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
              rFrm.GetDrawObjs() );
 }
 
-::std::pair< SwAccessibleChildMap::iterator, bool > SwAccessibleChildMap::insert(
-                                                const sal_uInt32 nPos,
-                                                const SwAccessibleChildMapKey::LayerId eLayerId,
-                                                const SwAccessibleChild& rLower )
-{
-    SwAccessibleChildMapKey aKey( eLayerId, nPos );
-    value_type aEntry( aKey, rLower );
-    return _SwAccessibleChildMap::insert( aEntry );
-}
-
-::std::pair< SwAccessibleChildMap::iterator, bool > SwAccessibleChildMap::insert(
-                                                const SdrObject *pObj,
-                                                const SwAccessibleChild& rLower )
-{
-    const SdrLayerID nLayer = pObj->GetLayer();
-    SwAccessibleChildMapKey::LayerId eLayerId =
-                    (nHellId == nLayer)
-                    ? SwAccessibleChildMapKey::HELL
-                    : ( (nControlsId == nLayer)
-                        ? SwAccessibleChildMapKey::CONTROLS
-                        : SwAccessibleChildMapKey::HEAVEN );
-    SwAccessibleChildMapKey aKey( eLayerId, pObj->GetOrdNum() );
-    value_type aEntry( aKey, rLower );
-    return _SwAccessibleChildMap::insert( aEntry );
-}
-
-/* static */ sal_Bool SwAccessibleChildMap::IsSortingRequired( const SwFrm& rFrm )
-{
-    return ( rFrm.IsPageFrm() &&
-             static_cast< const SwPageFrm& >( rFrm ).GetSortedObjs() ) ||
-           ( rFrm.IsTxtFrm() &&
-             rFrm.GetDrawObjs() );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index 07de9eee0f..559672b45e 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -73,7 +73,7 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
             }
             if ( !aCurr.IsValid() )
             {
-                ::vos::ORef < SwAccessibleContext > xAccImpl =
+                ::rtl::Reference < SwAccessibleContext > xAccImpl =
                                     rAccMap.GetContextImpl( &rFrm, sal_False );
                 if( xAccImpl.isValid() )
                 {
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 7edf72ece9..300d806b8c 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -693,7 +693,7 @@ void SwAccPreviewData::Update( const SwAccessibleMap& rAccMap,
 void SwAccPreviewData::InvalidateSelection( const SwPageFrm* _pSelectedPageFrm )
 {
     mpSelPage = _pSelectedPageFrm;
-    ASSERT( mpSelPage, "selected page not found" );
+    OSL_ENSURE( mpSelPage, "selected page not found" );
 }
 
 struct ContainsPredicate
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 9b3fe63fe6..7964323ab0 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -65,9 +65,9 @@ struct LayoutInfoOrder
         else
         {
             // corresponding <SwFrm> instances are in different repeating table header rows
-            ASSERT( rLayoutInfo.mpAnchorFrm->FindTabFrm(),
+            OSL_ENSURE( rLayoutInfo.mpAnchorFrm->FindTabFrm(),
                     "<LayoutInfoOrder::operator()> - table frame not found" );
-            ASSERT( rNewLayoutInfo.mpAnchorFrm->FindTabFrm(),
+            OSL_ENSURE( rNewLayoutInfo.mpAnchorFrm->FindTabFrm(),
                     "<LayoutInfoOrder::operator()> - table frame not found" );
             const SwTabFrm* pLayoutInfoTabFrm( rLayoutInfo.mpAnchorFrm->FindTabFrm() );
             const SwTabFrm* pNewLayoutInfoTabFrm( rNewLayoutInfo.mpAnchorFrm->FindTabFrm() );
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index 0d22fd2f3b..3b79e632e5 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -568,7 +568,7 @@ uno::Any SwXFieldmarkParameters::getByName(const OUString& aName)
 uno::Sequence<OUString> SwXFieldmarkParameters::getElementNames()
     throw (uno::RuntimeException)
 {
-    vos::OGuard aGuard(Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
     IFieldmark::parameter_map_t* pParameters = getCoreParameters();
     uno::Sequence<OUString> vResult(pParameters->size());
     OUString* pOutEntry = vResult.getArray();
@@ -577,20 +577,6 @@ uno::Sequence<OUString> SwXFieldmarkParameters::getElementNames()
     return vResult;
 }
 
-::sal_Bool SwXFieldmarkParameters::hasByName(const OUString& aName)
-    throw (uno::RuntimeException)
-{
-    vos::OGuard aGuard(Application::GetSolarMutex());
-    IFieldmark::parameter_map_t* pParameters = getCoreParameters();
-    return (pParameters->find(aName) != pParameters->end());
-}
-
-uno::Type SwXFieldmarkParameters::getElementType()
-    throw (uno::RuntimeException)
-{
-    return ::cppu::UnoType< ::cppu::UnoVoidType>::get();
-}
-
 ::sal_Bool SwXFieldmarkParameters::hasElements()
     throw (uno::RuntimeException)
 {
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index a53c8a131f..054b3ec1ea 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -303,7 +303,6 @@ public:
     bool Write( SvStream *pTableStram ) const;
     void WriteDocx( const DocxAttributeOutput* rAttrOutput ) const;
     void WriteRtf( const RtfAttributeOutput* rAttrOutput ) const;
-    void WriteRtf( const RtfAttributeOutput* rAttrOutput ) const;
     rtl::OUString GetFamilyName() const { return rtl::OUString( msFamilyNm ); }
     friend bool operator < (const wwFont &r1, const wwFont &r2);
 };
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 57d3d2f2a7..884f43d52e 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -889,7 +889,7 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
     {
         // --> this moves non-resizable object so that when adding borders the baseline remains the same 
         const SwFlyFrmFmt *pFlyFrmFmt = dynamic_cast< const SwFlyFrmFmt * >( GetFlyFrmFmt() );
-        ASSERT( pFlyFrmFmt, "Could not find fly frame." );
+        OSL_ENSURE( pFlyFrmFmt, "Could not find fly frame." );
         if ( pFlyFrmFmt )
         {
             const Point &rPoint = pFlyFrmFmt->GetLastFlyFrmPrtRectPos();