merge to m66

11 files changed, 349 insertions, 358 deletions

diff --git a/svtools/inc/calendar.hxx b/svtools/inc/calendar.hxx
index 6f20a7f8c6c3..1c81945a669c 100644
--- a/svtools/inc/calendar.hxx
+++ b/svtools/inc/calendar.hxx
@@ -251,6 +251,7 @@ private:
     USHORT          mnDragScrollHitTest;
 
 #ifdef _SV_CALENDAR_CXX
+    using Control::ImplInitSettings;
     using Window::ImplInit;
     SVT_DLLPRIVATE void         ImplInit( WinBits nWinStyle );
     SVT_DLLPRIVATE void         ImplInitSettings();
diff --git a/svtools/inc/privsplt.hxx b/svtools/inc/privsplt.hxx
deleted file mode 100644
index 50a500de8848..000000000000
--- a/svtools/inc/privsplt.hxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: privsplt.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_PRIVSPLT_HXX
-#define _SV_PRIVSPLT_HXX
-
-#include <vcl/fixed.hxx>
-
-enum PRIVSPLIT_DIRECTION {PRIVSPLIT_HORZ,PRIVSPLIT_VERT };
-
-class SvPrivatSplit : public FixedLine
-{
-    private:
-
-        Link                aCtrModifiedLink;
-        BOOL                aMovingFlag;
-        Pointer             aWinPointer;
-        PRIVSPLIT_DIRECTION eAdrSplit;
-        short               nOldX;
-        short               nOldY;
-        short               nNewX;
-        short               nNewY;
-        short               nMinPos;
-        short               nMaxPos;
-        Range               aXMovingRange;
-        Range               aYMovingRange;
-        short               nDeltaX;
-        short               nDeltaY;
-        void                ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
-
-    protected:
-        virtual void        MouseButtonDown( const MouseEvent& rMEvt );
-        virtual void        Tracking( const TrackingEvent& rTEvt );
-
-    public:
-
-        SvPrivatSplit( Window* pWindow, const ResId& rResId,PRIVSPLIT_DIRECTION eAdrSplit);
-
-        SvPrivatSplit( Window* pParent,PRIVSPLIT_DIRECTION eAdrSplit, WinBits nStyle = 0);
-
-        virtual short   GetDeltaX();
-        virtual short   GetDeltaY();
-
-        virtual void    CtrModified();
-
-        void            SetXRange(Range cRgeX);
-        void            SetYRange(Range cRgeY);
-
-        void            MoveSplitTo(Point aPos);
-
-        virtual void    StateChanged( StateChangedType nType );
-        virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-
-        void            SetCtrModifiedHdl( const Link& rLink ) { aCtrModifiedLink = rLink; }
-        const Link&     GetCtrModifiedHdl() const { return aCtrModifiedLink; }
-};
-
-
-#endif
diff --git a/svtools/inc/sectctr.hxx b/svtools/inc/sectctr.hxx
deleted file mode 100644
index da73e7aed4a7..000000000000
--- a/svtools/inc/sectctr.hxx
+++ /dev/null
@@ -1,154 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sectctr.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SECTCTR_HXX
-#define _SV_SECTCTR_HXX
-
-#include <vcl/sv.h>
-#include <vcl/ctrl.hxx>
-
-class ImplSplitWindow;
-class ScrollBar;
-class ScrollBarBox;
-class SvSection;
-
-#define SECTION_APPEND      ((USHORT)0xFFFF)
-#define SECTION_NOTFOUND    ((USHORT)0xFFFF)
-
-#define WB_SECTION_STYLE    WB_VSCROLL | WB_HSCROLL | WB_TABSTOP
-
-class SvSectionControl : public Control
-{
-private:
-
-    Window              aSplitWinContainer;
-    ImplSplitWindow*    pSplitWin;
-    ScrollBar*          pVScrollBar;
-    ScrollBar*          pHScrollBar;
-    ScrollBarBox*       pScrollBarBox;
-    DockingWindow*      pDummy;
-    long                nRealHeight;
-    long                nMaxHeight;
-    long                nMinWidth;
-    Wallpaper           aWallpaper;
-
-    DECL_LINK( ScrollHdl, ScrollBar* );
-    DECL_LINK( EndScrollHdl, ScrollBar* );
-
-
-protected:
-
-    virtual void        Resize();
-    virtual void        Paint( const Rectangle& rRect );
-    virtual void        StateChanged( StateChangedType nStateChange );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
-    virtual void        Command( const CommandEvent& rCEvt );
-    virtual long        PreNotify( NotifyEvent& rNEvt );
-    virtual long        Notify( NotifyEvent& rNEvt );
-    virtual long        KeyEventNotify( const KeyEvent& rKEvt );
-    using Control::SetPosSizePixel;
-    virtual void        SetPosSizePixel( long nX, long nY,long nWidth, long nHeight,USHORT nFlags);
-
-
-
-    long                CalcMaxHeight();
-    long                CalcRealHeight();
-    long                CalcSectionWidth();
-
-    void                SetScrollBars(BOOL bVert,BOOL bHorz);
-    void                ShowScrollBarBox();
-    void                UpdateScrollBars();
-
-    BOOL                VScrollResize(Size &aSize);
-    BOOL                HScrollResize(Size &aSize);
-    void                SetChildPos(long nPos, BOOL bScrolling = TRUE);
-
-public:
-                        SvSectionControl( Window* pParent,WinBits nStyle = WB_SECTION_STYLE);
-                        SvSectionControl( Window* pParent, const ResId& rResId );
-                        ~SvSectionControl();
-
-
-    void                InsertSection(  USHORT nSectionId,SvSection* pSection,long nSize,USHORT nPos);
-    void                InsertSection(  USHORT nSectionId,SvSection* pSection,USHORT nPos);
-    void                RemoveSection( USHORT nSectionId );
-    void                Clear();
-
-    USHORT              GetSectionCount() const;
-    USHORT              GetSectionId( USHORT nPos ) const;
-    USHORT              GetSectionPos( USHORT nSectionId ) const;
-    USHORT              GetSectionId( const Point& rPos ) const;
-
-    void                SetSectionSize( USHORT nId, long nNewSize );
-    long                GetSectionSize( USHORT nId ) const;
-
-    /*
-    void                SetCurSectionId( USHORT nSectionId );
-    USHORT              GetCurSectionId() const;
-
-    void                SetFirstSectionId( USHORT nSectionId );
-    USHORT              GetFirstSectionId() const { return GetSectionId( mnFirstSectionPos ); }
-
-    void                MakeVisible( USHORT nSectionId );
-    */
-
-    void                SetSectionWidth( USHORT nSectionId, long nWidth);
-    long                GetSectionWidth( USHORT nSectionId ) const;
-
-    void                SetSection( USHORT nSectionId, SvSection* pPage );
-    SvSection*          GetSection( USHORT nSectionId ) const;
-
-    void                SetSectionText( USHORT nSectionId, const XubString& rText );
-    XubString           GetSectionText( USHORT nSectionId ) const;
-
-    void                SetHelpText( USHORT nSectionId, const XubString& rText );
-    const XubString&    GetHelpText( USHORT nSectionId ) const;
-
-    void                SetHelpId( USHORT nSectionId, ULONG nHelpId );
-    ULONG               GetHelpId( USHORT nSectionId ) const;
-
-    void                SetHelpText( const XubString& rText )
-                            { Control::SetHelpText( rText ); }
-    const XubString&    GetHelpText() const
-                            { return Control::GetHelpText(); }
-
-    void                SetHelpId( ULONG nId )
-                            { Control::SetHelpId( nId ); }
-    ULONG               GetHelpId() const
-                            { return Control::GetHelpId(); }
-
-    using Control::SetBackground;
-    void                SetBackground( const Wallpaper& rBackground ){aWallpaper=rBackground; }
-    const Wallpaper&    GetBackground() const { return aWallpaper; }
-
-};
-
-
-#endif
diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx
index c72c7c54f877..60fcbc9efb1a 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/svtools/inc/svtools/editbrowsebox.hxx
@@ -675,6 +675,7 @@ namespace svt
     private:
         virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect,
                                 sal_uInt16 nColumnId ) const;
+        using Control::ImplInitSettings;
         SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
         SVT_DLLPRIVATE void DetermineFocus( const sal_uInt16 _nGetFocusFlags = 0);
         inline void HideAndDisable(CellControllerRef& rController);
diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx
index f4cccd3115b8..68763a3fd487 100644
--- a/svtools/inc/svtools/embedhlp.hxx
+++ b/svtools/inc/svtools/embedhlp.hxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: embedhlp.hxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -131,6 +128,13 @@ namespace svt
         BOOL            is() const { return mxObj.is(); }
 
         BOOL            IsChart() const;
+
+        // #i104867#
+        // Provides a graphic version number for the fetchable Graphic during this object's lifetime. Internally,
+        // that number is incremented at each change of the Graphic. This mechanism is needed to identify if a
+        // remembered Graphic (e.g. primitives) has changed compared to the current one, but without actively
+        // fetching the Graphic what would be too expensive e.g. for charts
+        sal_uInt32 getGraphicVersion() const;
         void            SetDefaultSizeForChart( const Size& rSizeIn_100TH_MM );//#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this method
     };
 }
diff --git a/svtools/inc/svtools/section.hxx b/svtools/inc/svtools/section.hxx
deleted file mode 100644
index 48941d06b7ca..000000000000
--- a/svtools/inc/svtools/section.hxx
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: section.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SECTION_HXX
-#define _SV_SECTION_HXX
-
-#include <vcl/sv.h>
-#include <vcl/ctrl.hxx>
-#include <vcl/dockwin.hxx>
-#include <vcl/tabpage.hxx>
-#include <svtools/expander.hxx>
-#include <svtools/privsplt.hxx>
-
-class SvSectionControl;
-
-class SvSection : public DockingWindow
-{
-private:
-        SvSectionControl*       pSectionControl;
-        USHORT                  nSectionID;
-        Window*                 pChildWin;
-        XubString               aName;
-        long                    nHeight;
-        long                    nMinHeight;
-        long                    nMinWidth;
-        long                    nOldHeight;
-
-        DECL_LINK( ToggleHdl,   SvExpander* );
-        DECL_LINK( SplitHdl,    SvPrivatSplit* );
-
-        void                    ImplExpandSection();
-        void                    ImplShrinkSection();
-
-protected:
-        SvExpander              aExpander;
-        Window                  aChildWinContainer;
-        SvPrivatSplit           aPrivatSplit;
-
-        virtual void            Resize();
-        virtual void            Paint( const Rectangle& rRect );
-        virtual long            Notify( NotifyEvent& rNEvt );
-
-public:
-        SvSection(const XubString& rName,SvSectionControl* pParent,
-                    WinBits nStyle = 0);
-        SvSection(const XubString& rName,SvSectionControl* pParent,
-                    Window* pChildWin, WinBits nStyle = 0);
-
-        virtual void            SetScrollPos(long nPos);
-        void                    SetChildPos(long nPos);
-
-        void                    SetSectionControl(SvSectionControl* pParent);
-        const SvSectionControl* GetSectionControl()const ;
-        void                    SetSectionText( const XubString& );
-        const XubString&            GetSectionText() const {return aName;}
-
-        void                    SetChildWin(Window* pChildWin);
-        Window*                 GetChildWin() const {return pChildWin;}
-
-        void                    SetSectionID(USHORT nId) {nSectionID=nId;}
-        USHORT                  GetSectionID() const {return nSectionID;}
-
-        void                    SetMaxHeight(long nHeight);
-        long                    GetMaxHeight();
-
-        void                    SetMinHeight(long nHeight);
-        long                    GetMinHeight();
-
-        void                    SetMinWidth(long nWidth);
-        long                    GetMinWidth();
-
-        void                    ExpandSection();
-        void                    ShrinkSection();
-        BOOL                    IsExpanded();
-};
-
-#endif
diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx
index b1e0d368c9ba..ccf77299965c 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/svtools/inc/svtools/svmedit.hxx
@@ -61,6 +61,7 @@ protected:
     void            DataChanged( const DataChangedEvent& rDCEvt );
     virtual long    PreNotify( NotifyEvent& rNEvt );
     long            Notify( NotifyEvent& rNEvt );
+    using Control::ImplInitSettings;
     void            ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
     WinBits         ImplInitStyle( WinBits nStyle );
 
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 647851008c8f..fc12f9517b6d 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -285,6 +285,7 @@ private:
 #ifdef _SV_VALUESET_CXX
     friend class ValueSetAcc;
     friend class ValueItemAcc;
+    using Control::ImplInitSettings;
     using Window::ImplInit;
     SVT_DLLPRIVATE void         ImplInit();
     SVT_DLLPRIVATE void         ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst
index 0a3ccd8a9819..3570ea9bf143 100644
--- a/svtools/prj/d.lst
+++ b/svtools/prj/d.lst
@@ -22,12 +22,315 @@ mkdir: %_DEST%\inc%_EXT%\svtools
 ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
 
+<<<<<<< local
 ..\inc\svtools\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
 ..\inc\svtools\*.h %_DEST%\inc%_EXT%\svtools\*.h
 ..\inc\svtools\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
 ..\inc\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
 ..\inc\*.h %_DEST%\inc%_EXT%\svtools\*.h
 ..\inc\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
+=======
+..\inc\svtools\svldllapi.h %_DEST%\inc%_EXT%\svtools\svldllapi.h
+..\inc\svtools\svtdllapi.h %_DEST%\inc%_EXT%\svtools\svtdllapi.h
+
+..\inc\svtools\globalnameitem.hxx %_DEST%\inc%_EXT%\svtools\globalnameitem.hxx
+..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\svtools\imagemgr.hxx
+..\inc\imagemgr.hrc %_DEST%\inc%_EXT%\svtools\imagemgr.hrc
+..\inc\testtool.hxx %_DEST%\inc%_EXT%\svtools\testtool.hxx
+..\inc\flbytes.hxx %_DEST%\inc%_EXT%\svtools\flbytes.hxx
+..\inc\adrparse.hxx %_DEST%\inc%_EXT%\svtools\adrparse.hxx
+..\inc\svtools\aeitem.hxx %_DEST%\inc%_EXT%\svtools\aeitem.hxx
+..\inc\svtools\brdcst.hxx %_DEST%\inc%_EXT%\svtools\brdcst.hxx
+..\inc\broadcast.hxx %_DEST%\inc%_EXT%\svtools\broadcast.hxx
+..\inc\svtools\brwbox.hxx %_DEST%\inc%_EXT%\svtools\brwbox.hxx
+..\inc\calendar.hxx %_DEST%\inc%_EXT%\svtools\calendar.hxx
+..\inc\svtools\cancel.hxx %_DEST%\inc%_EXT%\svtools\cancel.hxx
+..\inc\cntnrsrt.hxx %_DEST%\inc%_EXT%\svtools\cntnrsrt.hxx
+..\inc\svtools\colrdlg.hxx %_DEST%\inc%_EXT%\svtools\colrdlg.hxx
+..\inc\svtools\colctrl.hxx %_DEST%\inc%_EXT%\svtools\colctrl.hxx
+..\inc\ctrlbox.hxx %_DEST%\inc%_EXT%\svtools\ctrlbox.hxx
+..\inc\ctrltool.hxx %_DEST%\inc%_EXT%\svtools\ctrltool.hxx
+..\inc\collatorres.hxx %_DEST%\inc%_EXT%\svtools\collatorres.hxx
+..\inc\indexentryres.hxx %_DEST%\inc%_EXT%\svtools\indexentryres.hxx
+..\inc\cntwids.hrc %_DEST%\inc%_EXT%\svtools\cntwids.hrc
+..\inc\svtools\dateitem.hxx %_DEST%\inc%_EXT%\svtools\dateitem.hxx
+..\inc\svtools\dtritem.hxx %_DEST%\inc%_EXT%\svtools\dtritem.hxx
+..\inc\svtools\frqitem.hxx %_DEST%\inc%_EXT%\svtools\frqitem.hxx
+..\inc\svtools\cstitem.hxx %_DEST%\inc%_EXT%\svtools\cstitem.hxx
+..\inc\svtools\tfrmitem.hxx %_DEST%\inc%_EXT%\svtools\tfrmitem.hxx
+..\inc\svtools\cntwall.hxx %_DEST%\inc%_EXT%\svtools\cntwall.hxx
+..\inc\svtools\langtab.hxx %_DEST%\inc%_EXT%\svtools\langtab.hxx
+..\inc\itemdel.hxx %_DEST%\inc%_EXT%\svtools\itemdel.hxx
+..\inc\wallitem.hxx %_DEST%\inc%_EXT%\svtools\wallitem.hxx
+..\inc\svtools\sfontitm.hxx %_DEST%\inc%_EXT%\svtools\sfontitm.hxx
+..\inc\svtools\bintitem.hxx %_DEST%\inc%_EXT%\svtools\bintitem.hxx
+..\inc\stylepool.hxx %_DEST%\inc%_EXT%\svtools\stylepool.hxx
+..\inc\dialogcontrolling.hxx %_DEST%\inc%_EXT%\svtools\dialogcontrolling.hxx
+..\inc\svtools\eitem.hxx %_DEST%\inc%_EXT%\svtools\eitem.hxx
+..\inc\eventcfg.hxx %_DEST%\inc%_EXT%\svtools\eventcfg.hxx
+..\inc\filedlg.hxx %_DEST%\inc%_EXT%\svtools\filedlg.hxx
+..\inc\svtools\filerec.hxx %_DEST%\inc%_EXT%\svtools\filerec.hxx
+..\inc\svtools\flagitem.hxx %_DEST%\inc%_EXT%\svtools\flagitem.hxx
+..\inc\svtools\fltcall.hxx %_DEST%\inc%_EXT%\svtools\fltcall.hxx
+..\inc\svtools\wmf.hxx %_DEST%\inc%_EXT%\svtools\wmf.hxx
+..\inc\fltdefs.hxx %_DEST%\inc%_EXT%\svtools\fltdefs.hxx
+..\inc\svtools\filter.hxx %_DEST%\inc%_EXT%\svtools\filter.hxx
+..\inc\svtools\FilterConfigItem.hxx %_DEST%\inc%_EXT%\svtools\FilterConfigItem.hxx
+..\inc\svtools\fmtfield.hxx %_DEST%\inc%_EXT%\svtools\fmtfield.hxx
+..\inc\svtools\hint.hxx %_DEST%\inc%_EXT%\svtools\hint.hxx
+..\inc\svtools\accessibletableprovider.hxx %_DEST%\inc%_EXT%\svtools\accessibletableprovider.hxx
+..\inc\svtools\AccessibleBrowseBoxObjType.hxx %_DEST%\inc%_EXT%\svtools\AccessibleBrowseBoxObjType.hxx
+..\inc\svtools\accessiblefactory.hxx %_DEST%\inc%_EXT%\svtools\accessiblefactory.hxx
+..\inc\svtools\textwindowpeer.hxx %_DEST%\inc%_EXT%\svtools\textwindowpeer.hxx
+..\inc\imgdef.hxx %_DEST%\inc%_EXT%\svtools\imgdef.hxx
+..\inc\inetdef.hxx %_DEST%\inc%_EXT%\svtools\inetdef.hxx
+..\inc\svtools\inethist.hxx %_DEST%\inc%_EXT%\svtools\inethist.hxx
+..\inc\inetmsg.hxx %_DEST%\inc%_EXT%\svtools\inetmsg.hxx
+..\inc\inetstrm.hxx %_DEST%\inc%_EXT%\svtools\inetstrm.hxx
+..\inc\svtools\intitem.hxx %_DEST%\inc%_EXT%\svtools\intitem.hxx
+..\inc\svtools\visitem.hxx %_DEST%\inc%_EXT%\svtools\visitem.hxx
+..\inc\svtools\imageitm.hxx %_DEST%\inc%_EXT%\svtools\imageitm.hxx
+..\inc\svtools\isethint.hxx %_DEST%\inc%_EXT%\svtools\isethint.hxx
+..\inc\svtools\itemiter.hxx %_DEST%\inc%_EXT%\svtools\itemiter.hxx
+..\inc\svtools\itempool.hxx %_DEST%\inc%_EXT%\svtools\itempool.hxx
+..\inc\svtools\itemset.hxx %_DEST%\inc%_EXT%\svtools\itemset.hxx
+..\inc\svtools\lckbitem.hxx %_DEST%\inc%_EXT%\svtools\lckbitem.hxx
+..\inc\listener.hxx %_DEST%\inc%_EXT%\svtools\listener.hxx
+..\inc\listeneriter.hxx %_DEST%\inc%_EXT%\svtools\listeneriter.hxx
+..\inc\svtools\lstner.hxx %_DEST%\inc%_EXT%\svtools\lstner.hxx
+..\inc\svtools\macitem.hxx %_DEST%\inc%_EXT%\svtools\macitem.hxx
+..\inc\memberid.hrc %_DEST%\inc%_EXT%\svtools\memberid.hrc
+..\inc\svtools\nranges.hxx %_DEST%\inc%_EXT%\svtools\nranges.hxx
+..\inc\svtools\ownlist.hxx %_DEST%\inc%_EXT%\svtools\ownlist.hxx
+..\inc\prgsbar.hxx %_DEST%\inc%_EXT%\svtools\prgsbar.hxx
+..\inc\svtools\prnsetup.hxx %_DEST%\inc%_EXT%\svtools\prnsetup.hxx
+..\inc\poolcach.hxx %_DEST%\inc%_EXT%\svtools\poolcach.hxx
+..\inc\svtools\poolitem.hxx %_DEST%\inc%_EXT%\svtools\poolitem.hxx
+..\inc\svtools\printdlg.hxx %_DEST%\inc%_EXT%\svtools\printdlg.hxx
+..\inc\svtools\ptitem.hxx %_DEST%\inc%_EXT%\svtools\ptitem.hxx
+..\inc\svtools\szitem.hxx %_DEST%\inc%_EXT%\svtools\szitem.hxx
+..\inc\svtools\rectitem.hxx %_DEST%\inc%_EXT%\svtools\rectitem.hxx
+..\inc\svtools\rngitem.hxx %_DEST%\inc%_EXT%\svtools\rngitem.hxx
+..\inc\ruler.hxx %_DEST%\inc%_EXT%\svtools\ruler.hxx
+..\inc\scrwin.hxx %_DEST%\inc%_EXT%\svtools\scrwin.hxx
+..\inc\svtools\sharecontrolfile.hxx %_DEST%\inc%_EXT%\svtools\sharecontrolfile.hxx
+..\inc\svtools\documentlockfile.hxx %_DEST%\inc%_EXT%\svtools\documentlockfile.hxx
+..\inc\svtools\lockfilecommon.hxx %_DEST%\inc%_EXT%\svtools\lockfilecommon.hxx
+..\inc\svtools\slstitm.hxx %_DEST%\inc%_EXT%\svtools\slstitm.hxx
+..\inc\svtools\ilstitem.hxx %_DEST%\inc%_EXT%\svtools\ilstitem.hxx
+..\inc\svtools\smplhint.hxx %_DEST%\inc%_EXT%\svtools\smplhint.hxx
+..\inc\svtools\cnclhint.hxx %_DEST%\inc%_EXT%\svtools\cnclhint.hxx
+..\inc\svtools\inettype.hxx %_DEST%\inc%_EXT%\svtools\inettype.hxx
+..\inc\svtools\brwhead.hxx %_DEST%\inc%_EXT%\svtools\brwhead.hxx
+..\inc\svtools\solar.hrc %_DEST%\inc%_EXT%\svtools\solar.hrc
+..\inc\scriptedtext.hxx %_DEST%\inc%_EXT%\svtools\scriptedtext.hxx
+..\inc\svtools\stdctrl.hxx %_DEST%\inc%_EXT%\svtools\stdctrl.hxx
+..\inc\svtools\stritem.hxx %_DEST%\inc%_EXT%\svtools\stritem.hxx
+..\inc\svtools\style.hrc %_DEST%\inc%_EXT%\svtools\style.hrc
+..\inc\svtools\style.hxx %_DEST%\inc%_EXT%\svtools\style.hxx
+..\inc\svtools\svarray.hxx %_DEST%\inc%_EXT%\svtools\svarray.hxx
+..\inc\svtools\svdde.hxx %_DEST%\inc%_EXT%\svtools\svdde.hxx
+..\inc\svtools\svtdata.hxx %_DEST%\inc%_EXT%\svtools\svtdata.hxx
+..\inc\tabbar.hxx %_DEST%\inc%_EXT%\svtools\tabbar.hxx
+..\inc\taskbar.hxx %_DEST%\inc%_EXT%\svtools\taskbar.hxx
+..\inc\svtools\undo.hxx %_DEST%\inc%_EXT%\svtools\undo.hxx
+..\inc\whiter.hxx %_DEST%\inc%_EXT%\svtools\whiter.hxx
+..\inc\svtools\valueset.hxx %_DEST%\inc%_EXT%\svtools\valueset.hxx
+..\inc\stdmenu.hxx %_DEST%\inc%_EXT%\svtools\stdmenu.hxx
+..\inc\svtools\headbar.hxx %_DEST%\inc%_EXT%\svtools\headbar.hxx
+..\inc\svtools\svicnvw.hxx %_DEST%\inc%_EXT%\svtools\svicnvw.hxx
+..\inc\svtools\svlbitm.hxx %_DEST%\inc%_EXT%\svtools\svlbitm.hxx
+..\inc\svtools\svlbox.hxx %_DEST%\inc%_EXT%\svtools\svlbox.hxx
+..\inc\svtools\svtabbx.hxx %_DEST%\inc%_EXT%\svtools\svtabbx.hxx
+..\inc\svtools\svtreebx.hxx %_DEST%\inc%_EXT%\svtools\svtreebx.hxx
+..\inc\tooltiplbox.hxx %_DEST%\inc%_EXT%\svtools\tooltiplbox.hxx
+..\inc\svtools\treelist.hxx %_DEST%\inc%_EXT%\svtools\treelist.hxx
+..\inc\svtools\xtextedt.hxx %_DEST%\inc%_EXT%\svtools\xtextedt.hxx
+..\inc\svtools\texteng.hxx %_DEST%\inc%_EXT%\svtools\texteng.hxx
+..\inc\svtools\textview.hxx %_DEST%\inc%_EXT%\svtools\textview.hxx
+..\inc\svtools\textdata.hxx %_DEST%\inc%_EXT%\svtools\textdata.hxx
+..\inc\txtattr.hxx %_DEST%\inc%_EXT%\svtools\txtattr.hxx
+..\inc\sychconv.hxx %_DEST%\inc%_EXT%\svtools\sychconv.hxx
+..\inc\svtools\ttprops.hxx %_DEST%\inc%_EXT%\svtools\ttprops.hxx
+..\inc\svtools\transfer.hxx %_DEST%\inc%_EXT%\svtools\transfer.hxx
+..\inc\svtools\embedtransfer.hxx %_DEST%\inc%_EXT%\svtools\embedtransfer.hxx
+..\inc\svtools\embedhlp.hxx %_DEST%\inc%_EXT%\svtools\embedhlp.hxx
+..\inc\cliplistener.hxx %_DEST%\inc%_EXT%\svtools\cliplistener.hxx
+..\inc\txtcmp.hxx %_DEST%\inc%_EXT%\svtools\txtcmp.hxx
+..\inc\urlbmk.hxx %_DEST%\inc%_EXT%\svtools\urlbmk.hxx
+..\inc\inetimg.hxx %_DEST%\inc%_EXT%\svtools\inetimg.hxx
+..\inc\svtools\svmedit.hxx %_DEST%\inc%_EXT%\svtools\svmedit.hxx
+..\inc\svtools\editsyntaxhighlighter.hxx %_DEST%\inc%_EXT%\svtools\editsyntaxhighlighter.hxx
+..\inc\svtools\syntaxhighlight.hxx %_DEST%\inc%_EXT%\svtools\syntaxhighlight.hxx
+..\inc\svtools\svmedit2.hxx %_DEST%\inc%_EXT%\svtools\svmedit2.hxx
+..\inc\svtools\svstdarr.hxx %_DEST%\inc%_EXT%\svtools\svstdarr.hxx
+..\inc\svtools\metitem.hxx %_DEST%\inc%_EXT%\svtools\metitem.hxx
+..\inc\svtools\nfversi.hxx %_DEST%\inc%_EXT%\svtools\nfversi.hxx
+..\inc\svtools\nfkeytab.hxx %_DEST%\inc%_EXT%\svtools\nfkeytab.hxx
+..\inc\nfsymbol.hxx %_DEST%\inc%_EXT%\svtools\nfsymbol.hxx
+..\inc\svtools\wizdlg.hxx %_DEST%\inc%_EXT%\svtools\wizdlg.hxx
+..\inc\svtools\zforlist.hxx %_DEST%\inc%_EXT%\svtools\zforlist.hxx
+..\inc\svtools\zformat.hxx %_DEST%\inc%_EXT%\svtools\zformat.hxx
+..\inc\numuno.hxx %_DEST%\inc%_EXT%\svtools\numuno.hxx
+..\inc\svtools\ondemand.hxx %_DEST%\inc%_EXT%\svtools\ondemand.hxx
+..\inc\svtools\loginerr.hxx %_DEST%\inc%_EXT%\svtools\loginerr.hxx
+..\inc\svtools\logindlg.hxx %_DEST%\inc%_EXT%\svtools\logindlg.hxx
+..\inc\svtools\httpcook.hxx %_DEST%\inc%_EXT%\svtools\httpcook.hxx
+..\inc\imageresourceaccess.hxx %_DEST%\inc%_EXT%\svtools\imageresourceaccess.hxx
+..\inc\svtools\itemprop.hxx %_DEST%\inc%_EXT%\svtools\itemprop.hxx
+..\inc\addresstemplate.hxx %_DEST%\inc%_EXT%\svtools\addresstemplate.hxx
+..\inc\svtools\genericunodialog.hxx %_DEST%\inc%_EXT%\svtools\genericunodialog.hxx
+..\inc\svtools\editbrowsebox.hxx %_DEST%\inc%_EXT%\svtools\editbrowsebox.hxx
+..\inc\svtools\editimplementation.hxx %_DEST%\inc%_EXT%\svtools\editimplementation.hxx
+..\inc\templatefoldercache.hxx %_DEST%\inc%_EXT%\svtools\templatefoldercache.hxx
+..\inc\folderrestriction.hxx %_DEST%\inc%_EXT%\svtools\folderrestriction.hxx
+..\inc\filenotation.hxx %_DEST%\inc%_EXT%\svtools\filenotation.hxx
+..\inc\svtools\urlcontrol.hxx %_DEST%\inc%_EXT%\svtools\urlcontrol.hxx
+..\inc\svtools\fileurlbox.hxx %_DEST%\inc%_EXT%\svtools\fileurlbox.hxx
+..\inc\svtools\toolboxcontroller.hxx %_DEST%\inc%_EXT%\svtools\toolboxcontroller.hxx
+..\inc\framestatuslistener.hxx %_DEST%\inc%_EXT%\svtools\framestatuslistener.hxx
+..\inc\statusbarcontroller.hxx %_DEST%\inc%_EXT%\svtools\statusbarcontroller.hxx
+..\inc\svtools\generictoolboxcontroller.hxx %_DEST%\inc%_EXT%\svtools\generictoolboxcontroller.hxx
+..\inc\svtools\restrictedpaths.hxx %_DEST%\inc%_EXT%\svtools\restrictedpaths.hxx
+
+..\inc\svtools\imap.hxx %_DEST%\inc%_EXT%\svtools\imap.hxx
+..\inc\svtools\imapobj.hxx %_DEST%\inc%_EXT%\svtools\imapobj.hxx
+..\inc\svtools\imaprect.hxx %_DEST%\inc%_EXT%\svtools\imaprect.hxx
+..\inc\svtools\imapcirc.hxx %_DEST%\inc%_EXT%\svtools\imapcirc.hxx
+..\inc\svtools\imappoly.hxx %_DEST%\inc%_EXT%\svtools\imappoly.hxx
+
+..\inc\svtools\parhtml.hxx %_DEST%\inc%_EXT%\svtools\parhtml.hxx
+..\inc\htmltokn.h %_DEST%\inc%_EXT%\svtools\htmltokn.h
+..\inc\htmlkywd.hxx %_DEST%\inc%_EXT%\svtools\htmlkywd.hxx
+..\inc\svtools\svparser.hxx %_DEST%\inc%_EXT%\svtools\svparser.hxx
+..\inc\svtools\htmlout.hxx %_DEST%\inc%_EXT%\svtools\htmlout.hxx
+..\source\svrtf\rtfout.hxx %_DEST%\inc%_EXT%\svtools\rtfout.hxx
+..\inc\svtools\parrtf.hxx %_DEST%\inc%_EXT%\svtools\parrtf.hxx
+..\source\svrtf\rtftoken.h %_DEST%\inc%_EXT%\svtools\rtftoken.h
+..\source\svrtf\rtfkeywd.hxx %_DEST%\inc%_EXT%\svtools\rtfkeywd.hxx
+
+..\inc\svtools\ctypeitm.hxx %_DEST%\inc%_EXT%\svtools\ctypeitm.hxx
+
+..\inc\strmadpt.hxx %_DEST%\inc%_EXT%\svtools\strmadpt.hxx
+..\inc\instrm.hxx %_DEST%\inc%_EXT%\svtools\instrm.hxx
+..\inc\outstrm.hxx %_DEST%\inc%_EXT%\svtools\outstrm.hxx
+
+..\inc\expander.hxx %_DEST%\inc%_EXT%\svtools\expander.hxx
+..\source\svsql\converter.hxx %_DEST%\inc%_EXT%\svtools\converter.hxx
+
+..\inc\filectrl.hxx %_DEST%\inc%_EXT%\svtools\filectrl.hxx
+..\inc\svtools\cenumitm.hxx %_DEST%\inc%_EXT%\svtools\cenumitm.hxx
+..\inc\svtools\cintitem.hxx %_DEST%\inc%_EXT%\svtools\cintitem.hxx
+..\inc\svtools\custritm.hxx %_DEST%\inc%_EXT%\svtools\custritm.hxx
+
+..\inc\sfxecode.hxx %_DEST%\inc%_EXT%\svtools\sfxecode.hxx
+..\inc\svtools\ehdl.hxx %_DEST%\inc%_EXT%\svtools\ehdl.hxx
+..\inc\svtools\svtools.hrc %_DEST%\inc%_EXT%\svtools\svtools.hrc
+..\source\dialogs\filedlg2.hrc %_DEST%\inc%_EXT%\svtools\filedlg2.hrc
+
+..\inc\xmlement.hxx %_DEST%\inc%_EXT%\svtools\xmlement.hxx
+..\inc\svtools\tresitem.hxx %_DEST%\inc%_EXT%\svtools\tresitem.hxx
+..\inc\urihelper.hxx %_DEST%\inc%_EXT%\svtools\urihelper.hxx
+..\inc\reginfo.hxx %_DEST%\inc%_EXT%\svtools\reginfo.hxx
+..\inc\cacheoptions.hxx %_DEST%\inc%_EXT%\svtools\cacheoptions.hxx
+..\inc\svtools\cjkoptions.hxx %_DEST%\inc%_EXT%\svtools\cjkoptions.hxx
+..\inc\javaoptions.hxx %_DEST%\inc%_EXT%\svtools\javaoptions.hxx
+..\inc\svtools\accelcfg.hxx %_DEST%\inc%_EXT%\svtools\accelcfg.hxx
+..\inc\svtools\pathoptions.hxx %_DEST%\inc%_EXT%\svtools\pathoptions.hxx
+..\inc\svtools\useroptions.hxx %_DEST%\inc%_EXT%\svtools\useroptions.hxx
+..\inc\fstathelper.hxx %_DEST%\inc%_EXT%\svtools\fstathelper.hxx
+..\inc\svtools\saveopt.hxx %_DEST%\inc%_EXT%\svtools\saveopt.hxx
+..\inc\svtools\undoopt.hxx %_DEST%\inc%_EXT%\svtools\undoopt.hxx
+..\inc\svtools\helpopt.hxx %_DEST%\inc%_EXT%\svtools\helpopt.hxx
+..\inc\svtools\optionsdlg.hxx %_DEST%\inc%_EXT%\svtools\optionsdlg.hxx
+..\inc\svtools\moduleoptions.hxx %_DEST%\inc%_EXT%\svtools\moduleoptions.hxx
+..\inc\svtools\securityoptions.hxx %_DEST%\inc%_EXT%\svtools\securityoptions.hxx
+..\inc\svtools\extendedsecurityoptions.hxx %_DEST%\inc%_EXT%\svtools\extendedsecurityoptions.hxx
+..\inc\svtools\miscopt.hxx %_DEST%\inc%_EXT%\svtools\miscopt.hxx
+..\inc\svtools\localisationoptions.hxx %_DEST%\inc%_EXT%\svtools\localisationoptions.hxx
+..\inc\svtools\workingsetoptions.hxx %_DEST%\inc%_EXT%\svtools\workingsetoptions.hxx
+..\inc\svtools\viewoptions.hxx %_DEST%\inc%_EXT%\svtools\viewoptions.hxx
+..\inc\svtools\internaloptions.hxx %_DEST%\inc%_EXT%\svtools\internaloptions.hxx
+..\inc\svtools\startoptions.hxx %_DEST%\inc%_EXT%\svtools\startoptions.hxx
+..\inc\svtools\historyoptions.hxx %_DEST%\inc%_EXT%\svtools\historyoptions.hxx
+..\inc\svtools\inetoptions.hxx %_DEST%\inc%_EXT%\svtools\inetoptions.hxx
+..\inc\svtools\menuoptions.hxx %_DEST%\inc%_EXT%\svtools\menuoptions.hxx
+..\inc\svtools\options3d.hxx %_DEST%\inc%_EXT%\svtools\options3d.hxx
+..\inc\svtools\optionsdrawinglayer.hxx %_DEST%\inc%_EXT%\svtools\optionsdrawinglayer.hxx
+..\inc\svtools\fontoptions.hxx %_DEST%\inc%_EXT%\svtools\fontoptions.hxx
+..\inc\svtools\addxmltostorageoptions.hxx %_DEST%\inc%_EXT%\svtools\addxmltostorageoptions.hxx
+..\inc\svtools\defaultoptions.hxx %_DEST%\inc%_EXT%\svtools\defaultoptions.hxx
+..\inc\svtools\printwarningoptions.hxx %_DEST%\inc%_EXT%\svtools\printwarningoptions.hxx
+..\inc\svtools\printoptions.hxx %_DEST%\inc%_EXT%\svtools\printoptions.hxx
+..\inc\svtools\dynamicmenuoptions.hxx %_DEST%\inc%_EXT%\svtools\dynamicmenuoptions.hxx
+..\inc\svtools\compatibility.hxx %_DEST%\inc%_EXT%\svtools\compatibility.hxx
+..\inc\svtools\syslocaleoptions.hxx %_DEST%\inc%_EXT%\svtools\syslocaleoptions.hxx
+..\inc\localresaccess.hxx %_DEST%\inc%_EXT%\svtools\localresaccess.hxx
+..\inc\svtools\wizardmachine.hxx %_DEST%\inc%_EXT%\svtools\wizardmachine.hxx
+..\inc\svtools\roadmapwizard.hxx %_DEST%\inc%_EXT%\svtools\roadmapwizard.hxx
+..\inc\roadmap.hxx %_DEST%\inc%_EXT%\svtools\roadmap.hxx
+..\inc\svtools\hyperlabel.hxx %_DEST%\inc%_EXT%\svtools\hyperlabel.hxx
+..\inc\svtools\fixedhyper.hxx %_DEST%\inc%_EXT%\svtools\fixedhyper.hxx
+..\inc\helpagentwindow.hxx %_DEST%\inc%_EXT%\svtools\helpagentwindow.hxx
+..\inc\pickerhistory.hxx %_DEST%\inc%_EXT%\svtools\pickerhistory.hxx
+..\inc\pickerhistoryaccess.hxx %_DEST%\inc%_EXT%\svtools\pickerhistoryaccess.hxx
+..\inc\pickerhelper.hxx %_DEST%\inc%_EXT%\svtools\pickerhelper.hxx
+..\inc\regoptions.hxx %_DEST%\inc%_EXT%\svtools\regoptions.hxx
+..\inc\svtools\accessibilityoptions.hxx %_DEST%\inc%_EXT%\svtools\accessibilityoptions.hxx
+..\inc\svtools\cmdoptions.hxx %_DEST%\inc%_EXT%\svtools\cmdoptions.hxx
+..\inc\svtools\ctloptions.hxx %_DEST%\inc%_EXT%\svtools\ctloptions.hxx
+..\inc\svtools\languageoptions.hxx %_DEST%\inc%_EXT%\svtools\languageoptions.hxx
+..\inc\svtools\sourceviewconfig.hxx %_DEST%\inc%_EXT%\svtools\sourceviewconfig.hxx
+..\inc\svtools\colorcfg.hxx %_DEST%\inc%_EXT%\svtools\colorcfg.hxx
+
+..\inc\lngmisc.hxx %_DEST%\inc%_EXT%\svtools\lngmisc.hxx
+..\inc\svtools\lingucfg.hxx %_DEST%\inc%_EXT%\svtools\lingucfg.hxx
+..\inc\linguprops.hxx %_DEST%\inc%_EXT%\svtools\linguprops.hxx
+..\inc\searchopt.hxx %_DEST%\inc%_EXT%\svtools\searchopt.hxx
+
+..\inc\PasswordHelper.hxx %_DEST%\inc%_EXT%\svtools\PasswordHelper.hxx
+
+..\inc\svtools\syslocale.hxx %_DEST%\inc%_EXT%\svtools\syslocale.hxx
+
+..\inc\unoimap.hxx %_DEST%\inc%_EXT%\svtools\unoimap.hxx
+..\inc\unoevent.hxx %_DEST%\inc%_EXT%\svtools\unoevent.hxx
+
+..\inc\svtools\stringtransfer.hxx %_DEST%\inc%_EXT%\svtools\stringtransfer.hxx
+
+..\inc\ivctrl.hxx %_DEST%\inc%_EXT%\svtools\ivctrl.hxx
+..\inc\fileview.hxx %_DEST%\inc%_EXT%\svtools\fileview.hxx
+..\inc\templdlg.hxx %_DEST%\inc%_EXT%\svtools\templdlg.hxx
+..\inc\asynclink.hxx %_DEST%\inc%_EXT%\svtools\asynclink.hxx
+..\inc\svtools\inettbc.hxx %_DEST%\inc%_EXT%\svtools\inettbc.hxx
+..\inc\svtools\urlfilter.hxx %_DEST%\inc%_EXT%\svtools\urlfilter.hxx
+
+..\inc\controldims.hrc %_DEST%\inc%_EXT%\svtools\controldims.hrc
+
+..\inc\svtools\helpid.hrc %_DEST%\inc%_EXT%\svtools\helpid.hrc
+..\inc\svtools\insdlg.hxx %_DEST%\inc%_EXT%\svtools\insdlg.hxx
+..\inc\soerr.hxx %_DEST%\inc%_EXT%\svtools\soerr.hxx
+..\inc\sores.hxx %_DEST%\inc%_EXT%\svtools\sores.hxx
+
+..\inc\textwindowaccessibility.hxx %_DEST%\inc%_EXT%\svtools\textwindowaccessibility.hxx
+
+..\inc\fontsubstconfig.hxx %_DEST%\inc%_EXT%\svtools\fontsubstconfig.hxx
+..\inc\apearcfg.hxx %_DEST%\inc%_EXT%\svtools\apearcfg.hxx
+..\inc\fltrcfg.hxx %_DEST%\inc%_EXT%\svtools\fltrcfg.hxx
+..\inc\misccfg.hxx %_DEST%\inc%_EXT%\svtools\misccfg.hxx
+..\inc\acceleratorexecute.hxx %_DEST%\inc%_EXT%\svtools\acceleratorexecute.hxx
+
+..\inc\QueryFolderName.hxx %_DEST%\inc%_EXT%\svtools\QueryFolderName.hxx
+..\inc\DocumentInfoPreview.hxx %_DEST%\inc%_EXT%\svtools\DocumentInfoPreview.hxx
+..\inc\svtools\javacontext.hxx %_DEST%\inc%_EXT%\svtools\javacontext.hxx
+..\inc\svtools\javainteractionhandler.hxx %_DEST%\inc%_EXT%\svtools\javainteractionhandler.hxx
+..\inc\dialogclosedlistener.hxx %_DEST%\inc%_EXT%\svtools\dialogclosedlistener.hxx
+..\inc\svtools\options.hxx %_DEST%\inc%_EXT%\svtools\options.hxx
+..\inc\contextmenuhelper.hxx %_DEST%\inc%_EXT%\svtools\contextmenuhelper.hxx
+..\inc\extcolorcfg.hxx %_DEST%\inc%_EXT%\svtools\extcolorcfg.hxx
+
+..\inc\svtools\chartprettypainter.hxx %_DEST%\inc%_EXT%\svtools\chartprettypainter.hxx
+..\inc\svtools\extensionlistbox.hxx %_DEST%\inc%_EXT%\svtools\extensionlistbox.hxx
+>>>>>>> other
 
 dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi"
 
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index b3b5829b479e..916738af70ae 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -579,8 +579,7 @@ Rectangle SvtIconChoiceCtrl::GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) co
 
 void SvtIconChoiceCtrl::FillLayoutData() const
 {
-    DBG_ASSERT( !mpLayoutData, "SvtIconChoiceCtrl::FillLayoutData: shouldn't this be called with non-existent layout data only?" );
-    mpLayoutData = new ::vcl::ControlLayoutData();
+    CreateLayoutData();
 
     SvtIconChoiceCtrl* pNonConstMe = const_cast< SvtIconChoiceCtrl* >( this );
 
@@ -598,7 +597,7 @@ void SvtIconChoiceCtrl::FillLayoutData() const
         sal_Bool bLargeIconMode = WB_ICON == ( _pImp->GetStyle() & ( VIEWMODE_MASK ) );
         sal_uInt16 nTextPaintFlags = bLargeIconMode ? PAINTFLAG_HOR_CENTERED : PAINTFLAG_VER_CENTERED;
 
-        _pImp->PaintItem( aTextRect, IcnViewFieldTypeText, pEntry, nTextPaintFlags, pNonConstMe, &sEntryText, mpLayoutData );
+        _pImp->PaintItem( aTextRect, IcnViewFieldTypeText, pEntry, nTextPaintFlags, pNonConstMe, &sEntryText, GetLayoutData() );
 
         ++nPos;
     }
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 93a75681da52..3554f6955171 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -7,7 +7,6 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: embedhlp.cxx,v $
- * $Revision: 1.28 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -190,7 +189,6 @@ void SAL_CALL EmbedEventListener_Impl::modified( const lang::EventObject& ) thro
             pObject->UpdateReplacementOnDemand();
         }
     }
-
 }
 
 void SAL_CALL EmbedEventListener_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException )
@@ -251,6 +249,9 @@ struct EmbeddedObjectRef_Impl
     sal_Int64                                   nViewAspect;
     BOOL                                        bIsLocked;
     sal_Bool                                    bNeedUpdate;
+
+    // #i104867#
+    sal_uInt32                                  mnGraphicVersion;
     awt::Size                                   aDefaultSizeForChart_In_100TH_MM;//#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this member
 };
 
@@ -263,6 +264,7 @@ void EmbeddedObjectRef::Construct_Impl()
     mpImp->nViewAspect = embed::Aspects::MSOLE_CONTENT;
     mpImp->bIsLocked = FALSE;
     mpImp->bNeedUpdate = sal_False;
+    mpImp->mnGraphicVersion = 0;
     mpImp->aDefaultSizeForChart_In_100TH_MM = awt::Size(8000,7000);
 }
 
@@ -298,12 +300,14 @@ EmbeddedObjectRef::EmbeddedObjectRef( const EmbeddedObjectRef& rObj )
         mpImp->pGraphic = 0;
 
     mpImp->pHCGraphic = 0;
+    mpImp->mnGraphicVersion = 0;
 }
 
 EmbeddedObjectRef::~EmbeddedObjectRef()
 {
     delete mpImp->pGraphic;
-    if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic );
+    if ( mpImp->pHCGraphic )
+        DELETEZ( mpImp->pHCGraphic );
     Clear();
 }
 /*
@@ -454,10 +458,15 @@ void EmbeddedObjectRef::GetReplacement( BOOL bUpdate )
         DELETEZ( mpImp->pGraphic );
         mpImp->aMediaType = ::rtl::OUString();
         mpImp->pGraphic = new Graphic;
-        if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic );
+        if ( mpImp->pHCGraphic )
+            DELETEZ( mpImp->pHCGraphic );
+        mpImp->mnGraphicVersion++;
     }
     else if ( !mpImp->pGraphic )
+    {
         mpImp->pGraphic = new Graphic;
+        mpImp->mnGraphicVersion++;
+    }
     else
     {
         DBG_ERROR("No update, but replacement exists already!");
@@ -470,6 +479,7 @@ void EmbeddedObjectRef::GetReplacement( BOOL bUpdate )
         GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
         if( mpImp->pGraphic )
             pGF->ImportGraphic( *mpImp->pGraphic, String(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW );
+        mpImp->mnGraphicVersion++;
         delete pGraphicStream;
     }
 }
@@ -599,6 +609,7 @@ Graphic* EmbeddedObjectRef::GetHCGraphic() const
                         mpImp->pHCGraphic = pGraphic;
                     else
                         delete pGraphic;
+                    mpImp->mnGraphicVersion++;
                 }
 
                 delete pStream;
@@ -616,7 +627,9 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream
         delete mpImp->pGraphic;
     mpImp->pGraphic = new Graphic();
     mpImp->aMediaType = rMediaType;
-    if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic );
+    if ( mpImp->pHCGraphic )
+        DELETEZ( mpImp->pHCGraphic );
+    mpImp->mnGraphicVersion++;
 
     SvStream* pGraphicStream = ::utl::UcbStreamHelper::CreateStream( xInGrStream );
 
@@ -624,6 +637,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream
     {
         GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
         pGF->ImportGraphic( *mpImp->pGraphic, String(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW );
+        mpImp->mnGraphicVersion++;
 
         if ( mpImp->pContainer )
         {
@@ -646,7 +660,9 @@ void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const ::rtl::OUStri
         delete mpImp->pGraphic;
     mpImp->pGraphic = new Graphic( rGraphic );
     mpImp->aMediaType = rMediaType;
-    if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic );
+    if ( mpImp->pHCGraphic )
+        DELETEZ( mpImp->pHCGraphic );
+    mpImp->mnGraphicVersion++;
 
     if ( mpImp->pContainer )
         SetGraphicToContainer( rGraphic, *mpImp->pContainer, mpImp->aPersistName, rMediaType );
@@ -881,7 +897,9 @@ void EmbeddedObjectRef::UpdateReplacementOnDemand()
 {
     DELETEZ( mpImp->pGraphic );
     mpImp->bNeedUpdate = sal_True;
-    if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic );
+    if ( mpImp->pHCGraphic )
+        DELETEZ( mpImp->pHCGraphic );
+    mpImp->mnGraphicVersion++;
 
     if( mpImp->pContainer )
     {
@@ -915,6 +933,12 @@ BOOL EmbeddedObjectRef::IsChart() const
     return sal_False;
 }
 
+// #i104867#
+sal_uInt32 EmbeddedObjectRef::getGraphicVersion() const
+{
+    return mpImp->mnGraphicVersion;
+}
+
 void EmbeddedObjectRef::SetDefaultSizeForChart( const Size& rSizeIn_100TH_MM )
 {
     //#i103460# charts do not necessaryly have an own size within ODF files,
@@ -929,4 +953,5 @@ void EmbeddedObjectRef::SetDefaultSizeForChart( const Size& rSizeIn_100TH_MM )
         xSizeTransmitter->setDefaultSize( mpImp->aDefaultSizeForChart_In_100TH_MM );
 }
 
-}
+} // namespace svt
+