#i107450#: move more code out of svx

5 files changed, 6 insertions, 255 deletions

diff --git a/svx/inc/linkmgr.hxx b/svx/inc/linkmgr.hxx
deleted file mode 100644
index b65c91ce7ebd..000000000000
--- a/svx/inc/linkmgr.hxx
+++ /dev/null
@@ -1,101 +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: linkmgr.hxx,v $
- * $Revision: 1.7 $
- *
- * 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 _SVXLINKMGR_HXX
-#define _SVXLINKMGR_HXX
-
-
-#include <sfx2/linkmgr.hxx>
-#include "svx/svxdllapi.h"
-
-class Graphic;
-class Size;
-
-// Damit der Link ueber den Status der zu ladenen Grafik informierten werden
-// verschickt das FileObject ein SvData, mit der FormatId
-// "RegisterStatusInfoId" und ein einem String als Datentraeger. Dieser
-// enthaelt den folgenden enum.
-enum LinkState
-{
-    STATE_LOAD_OK,
-    STATE_LOAD_ERROR,
-    STATE_LOAD_ABORT
-};
-
-class SVX_DLLPUBLIC SvxLinkManager : public ::sfx2::SvLinkManager
-{
-    SvxLinkManager( const SvxLinkManager& );
-    SvxLinkManager& operator=( const SvxLinkManager& );
-
-public:
-    SvxLinkManager( SfxObjectShell * pCacheCont );
-
-    // den Link mit einem PseudoObject verbinden und in die Liste eintragen
-    BOOL InsertFileLink( sfx2::SvBaseLink&,
-                        USHORT nFileType,
-                        const String& rTxt,
-                        const String* pFilterNm = 0,
-                        const String* pRange = 0 );
-
-            // falls am Link schon alles eingestellt ist !
-    BOOL InsertFileLink( sfx2::SvBaseLink& );
-
-        // erfrage die Strings fuer den Dialog
-    virtual BOOL GetDisplayNames( const sfx2::SvBaseLink*,
-                                    String* pType,
-                                    String* pFile = 0,
-                                    String* pLink = 0,
-                                    String* pFilter = 0 ) const;
-
-    virtual sfx2::SvLinkSourceRef CreateObj( sfx2::SvBaseLink * );
-
-    // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln
-    // (ist zur Zeit nur fuer die FileLinks interressant!)
-    void CancelTransfers();
-
-    static void SetTransferPriority( sfx2::SvBaseLink& rLink, USHORT nPrio );
-
-    // um Status Informationen aus dem FileObject an den BaseLink zu
-    // senden, gibt es eine eigene ClipBoardId. Das SvData-Object hat
-    // dann die entsprechenden Informationen als String.
-    // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt
-    // - das braucht Informationen ueber Load/Abort/Error
-    static ULONG  RegisterStatusInfoId();
-
-    // if the mimetype says graphic/bitmap/gdimetafile then get the
-    // graphic from the Any. Return says no errors
-    static BOOL GetGraphicFromAny( const String& rMimeType,
-                                const ::com::sun::star::uno::Any & rValue,
-                                Graphic& rGrf );
-
-};
-
-
-#endif
-
diff --git a/svx/inc/opengrf.hxx b/svx/inc/opengrf.hxx
deleted file mode 100644
index e32ce7d1b243..000000000000
--- a/svx/inc/opengrf.hxx
+++ /dev/null
@@ -1,74 +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: opengrf.hxx,v $
- * $Revision: 1.9 $
- *
- * 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 _SVX_OPENGRF_HXX
-#define _SVX_OPENGRF_HXX
-
-#include <memory>       // auto_ptr
-#include <svtools/filter.hxx>
-#include "svx/svxdllapi.h"
-
-
-struct  SvxOpenGrf_Impl;
-
-class SVX_DLLPUBLIC SvxOpenGraphicDialog
-{
-public:
-    SvxOpenGraphicDialog    ( const String& rTitle );
-    ~SvxOpenGraphicDialog   ();
-
-    short                   Execute();
-
-    void                    SetPath( const String& rPath );
-    void                    SetPath( const String& rPath, sal_Bool bLinkState );
-    String                  GetPath() const;
-
-    int                     GetGraphic(Graphic&) const;
-
-    void                    EnableLink(sal_Bool);
-    void                    AsLink(sal_Bool);
-    sal_Bool                IsAsLink() const;
-
-    String                  GetCurrentFilter() const;
-    void                    SetCurrentFilter(const String&);
-
-    /// Set dialog help id at FileDlgHelper
-    void                    SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId );
-    /// Set control help ids at FileDlgHelper
-    void                    SetDialogHelpId( const INT32 _nHelpId );
-private:
-    // disable copy and assignment
-    SVX_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&);
-    SVX_DLLPRIVATE SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & );
-
-    const std::auto_ptr< SvxOpenGrf_Impl >  mpImpl;
-};
-
-#endif // _SVX_OPENGRF_HXX
-
diff --git a/svx/inc/optextbr.hrc b/svx/inc/optextbr.hrc
deleted file mode 100644
index 9524ab69fbb1..000000000000
--- a/svx/inc/optextbr.hrc
+++ /dev/null
@@ -1,59 +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: optextbr.hrc,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 _SVX_OPTEXTBR_HRC
-#define _SVX_OPTEXTBR_HRC
-
-// defines ---------------------------------------------------------------
-
-#define CB_EXTBRW_ON            10
-#define FT_EXTBRW_EXCEPTION     11
-#define ED_EXTBRW_EXCEPTION     12
-#define LB_EXTBRW_EXCEPTION     13
-#define PB_EXTBRW_ADD           14
-#define PB_EXTBRW_DELETE        15
-#define PB_EXTBRW_IEOPTIONS     16
-#define CB_EXTBRW_NOHINT        17
-#define ED_EXTBRW_FILE          18
-#define PB_EXTBRW_FILE          19
-#define CB_EXTBRW_FILE          20
-
-#define STR_EXTBRW_FILE         30
-
-#define IMG_EXTBRW_WARNING      10
-#define FT_EXTBRW_WARNING       11
-#define CB_EXTBRW_DISABLE       12
-#define GB_EXTBRW_WARNING       13
-#define BTN_EXTBRW_YES          14
-#define BTN_EXTBRW_NO           15
-
-#endif // #ifndef _SVX_OPTEXTBR_HRC
-
-// ******************************************************************* EOF
-
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index faaecd816758..7f8556931fec 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -460,13 +460,6 @@
 #define RID_SVXSTR_RULER_TAB_DECIMAL        (RID_SVX_START + 247)
 #define RID_SVXSTR_RULER_TAB_CENTER         (RID_SVX_START + 248)
 
-// File-/Grafik-Link String, Dialog Name
-#define RID_SVXSTR_FILELINK                 (RID_SVX_START + 255)
-#define RID_SVXSTR_GRAFIKLINK               (RID_SVX_START + 256)
-#define RID_SVXSTR_EDITGRFLINK              (RID_SVX_START + 257)
-#define RID_SVXSTR_GRFLINKPROGRESS          (RID_SVX_START + 258)
-#define RID_SVXGRF_GRAPHICLOAD              (RID_SVX_START + 259)
-
 // Schlie"ssen (im TabDialog Line/Area)
 #define RID_SVXSTR_CLOSE                    (RID_SVX_START + 260)
 
@@ -734,14 +727,6 @@
 #define RID_SVXSTR_HATCH_START              RID_SVXSTR_HATCH0
 #define RID_SVXSTR_HATCH_END                RID_SVXSTR_HATCH10
 
-// strings for error messsages of OpenGraphics dialog
-#define RID_SVXSTR_GRFILTER_OPENERROR       (RID_SVX_START + 683)
-#define RID_SVXSTR_GRFILTER_IOERROR         (RID_SVX_START + 684)
-#define RID_SVXSTR_GRFILTER_FORMATERROR     (RID_SVX_START + 685)
-#define RID_SVXSTR_GRFILTER_VERSIONERROR    (RID_SVX_START + 686)
-#define RID_SVXSTR_GRFILTER_FILTERERROR     (RID_SVX_START + 687)
-#define RID_SVXSTR_GRFILTER_TOOBIG          (RID_SVX_START + 688)
-
 // Default-Bitmap-Names
 #define RID_SVXSTR_BMP0_DEF                 (RID_SVX_START + 691)
 #define RID_SVXSTR_BMP1_DEF                 (RID_SVX_START + 692)
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index a9abeac76fc2..cc8c8c7db211 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -37,9 +37,7 @@
 #include <tools/link.hxx>
 #include <tools/contnr.hxx>
 #include <tools/weakbase.hxx>
-#ifndef _MAPMOD_HXX //autogen
 #include <vcl/mapmod.hxx>
-#endif
 #include <svl/brdcst.hxx>
 #include <tools/string.hxx>
 #include <tools/datetime.hxx>
@@ -86,7 +84,6 @@ class SfxRepeatTarget;
 class SfxStyleSheet;
 class SfxUndoAction;
 class SfxUndoManager;
-class SvxLinkManager;
 class XBitmapList;
 class XBitmapTable;
 class XColorTable;
@@ -107,6 +104,9 @@ class SdrUndoFactory;
 namespace comphelper{
     class IEmbeddedHelper;
 }
+namespace sfx2{
+    class LinkManager;
+}
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #define SDR_SWAPGRAPHICSMODE_NONE       0x00000000
@@ -215,7 +215,7 @@ protected:
     ULONG           nProgressOfs;   // -Handler
     rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool;
     SfxStyleSheet*  pDefaultStyleSheet;
-    SvxLinkManager* pLinkManager;   // LinkManager
+    sfx2::LinkManager* pLinkManager;   // LinkManager
     Container*      pUndoStack;
     Container*      pRedoStack;
     SdrUndoGroup*   pAktUndoGroup;  // Fuer mehrstufige
@@ -403,8 +403,8 @@ public:
     SfxStyleSheet*       GetDefaultStyleSheet() const             { return pDefaultStyleSheet; }
     void                 SetDefaultStyleSheet(SfxStyleSheet* pDefSS) { pDefaultStyleSheet = pDefSS; }
 
-    SvxLinkManager*      GetLinkManager()                         { return pLinkManager; }
-    void                 SetLinkManager(SvxLinkManager* pLinkMgr) { pLinkManager = pLinkMgr; }
+    sfx2::LinkManager*      GetLinkManager()                         { return pLinkManager; }
+    void                 SetLinkManager( sfx2::LinkManager* pLinkMgr ) { pLinkManager = pLinkMgr; }
 
     ::comphelper::IEmbeddedHelper*     GetPersist() const               { return m_pEmbeddedHelper; }
     void                 ClearPersist()                                 { m_pEmbeddedHelper = 0; }