diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-10-31 00:36:06 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-10-31 00:36:06 +0100 |
| commit | be3ac782e544a45fedcbd1c241656890b29a0dbd (patch) | |
| tree | c040bef998793d5073962c7bf7eefb3040533f05 /svx/inc | |
| parent | #i106421#: move msfilter to filter (diff) | |
| download | core-be3ac782e544a45fedcbd1c241656890b29a0dbd.tar.gz core-be3ac782e544a45fedcbd1c241656890b29a0dbd.zip | |
#i106421#: move svx/source/cui to cui
Diffstat (limited to 'svx/inc')
32 files changed, 92 insertions, 2089 deletions
diff --git a/svx/inc/connect.hrc b/svx/inc/connect.hrc deleted file mode 100644 index f6c49e5c7d6e..000000000000 --- a/svx/inc/connect.hrc +++ /dev/null @@ -1,48 +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: connect.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. - * - ************************************************************************/ -#define FL_DISTANCE 1 -#define FL_DELTA 2 -#define FT_LINE_1 1 -#define FT_LINE_2 2 -#define FT_LINE_3 3 -#define MTR_FLD_LINE_1 1 -#define MTR_FLD_LINE_2 2 -#define MTR_FLD_LINE_3 3 -#define FT_HORZ_1 4 -#define FT_HORZ_2 5 -#define MTR_FLD_HORZ_1 4 -#define MTR_FLD_HORZ_2 5 -#define MTR_FLD_VERT_1 6 -#define MTR_FLD_VERT_2 7 -#define FT_VERT_2 7 -#define FT_VERT_1 6 -#define FT_TYPE 8 -#define LB_TYPE 1 -#define CTL_PREVIEW 1 diff --git a/svx/inc/defdlgname.hxx b/svx/inc/defdlgname.hxx deleted file mode 100644 index 1fcc17b1f41a..000000000000 --- a/svx/inc/defdlgname.hxx +++ /dev/null @@ -1,43 +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: defdlgname.hxx,v $ - * $Revision: 1.5 $ - * - * 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_DEF_DLG_NAME_HXX -#define _SVX_DEF_DLG_NAME_HXX - -// define ---------------------------------------------------------------- - -#define MESS_BTN_1 ((USHORT)0) -#define MESS_BTN_2 ((USHORT)1) - -// const ----------------------------------------------------------------- - -const short RET_BTN_1 = 100; -const short RET_BTN_2 = 101; - -#endif diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 9f807f44d5f5..949c1e85af95 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -61,23 +61,8 @@ #define HID_FM_PROPDLG_TAB_GENERAL (HID_FORM_DLG_START + 6) #define HID_FM_PROPDLG_TAB_DATA (HID_FORM_DLG_START + 7) #define HID_FM_PROPDLG_TAB_EVT (HID_FORM_DLG_START + 8) -#define HID_FM_DLG_SEARCH (HID_FORM_DLG_START + 9) -#define HID_SEARCH_TEXT (HID_FORM_DLG_START + 10) -#define HID_SEARCH_ALLFIELDS (HID_FORM_DLG_START + 11) #define HID_SEARCH_SINGLEFIELD (HID_FORM_DLG_START + 12) -#define HID_SEARCH_FIELDSELECTION (HID_FORM_DLG_START + 13) -#define HID_SEARCH_POSITION (HID_FORM_DLG_START + 14) -#define HID_SEARCH_FORMATTER (HID_FORM_DLG_START + 15) -#define HID_SEARCH_CASE (HID_FORM_DLG_START + 16) -#define HID_SEARCH_BACKWARD (HID_FORM_DLG_START + 17) -#define HID_SEARCH_STARTOVER (HID_FORM_DLG_START + 18) -#define HID_SEARCH_WILDCARD (HID_FORM_DLG_START + 19) -#define HID_SEARCH_REGULAR (HID_FORM_DLG_START + 20) -#define HID_SEARCH_APPROX (HID_FORM_DLG_START + 21) -#define HID_SEARCH_APPROXSETTINGS (HID_FORM_DLG_START + 22) -#define HID_SEARCH_BTN_SEARCH (HID_FORM_DLG_START + 23) -#define HID_SEARCH_BTN_CLOSE (HID_FORM_DLG_START + 24) #define HID_TABORDER_CONTROLS (HID_FORM_DLG_START + 25) @@ -92,8 +77,6 @@ #define HID_GRID_TRAVEL_ABSOLUTE (HID_FORM_DLG_START + 33) #define HID_GRID_NUMBEROFRECORDS (HID_FORM_DLG_START + 34) -#define UID_SEARCH_RECORDSTATUS (HID_FORM_DLG_START + 35) - #define UID_FORMPROPBROWSER_FRAME (HID_FORM_DLG_START + 37) #define UID_ABSOLUTE_RECORD_WINDOW (HID_FORM_DLG_START + 38) diff --git a/svx/inc/galctrl.hxx b/svx/inc/galctrl.hxx index ac51c0eadb18..3e56b4ea08b2 100644 --- a/svx/inc/galctrl.hxx +++ b/svx/inc/galctrl.hxx @@ -95,6 +95,7 @@ public: ~GalleryPreview(); void SetGraphic( const Graphic& rGraphic ) { aGraphicObj.SetGraphic( rGraphic ); } + bool SetGraphic( const INetURLObject& ); void PreviewMedia( const INetURLObject& rURL ); }; diff --git a/svx/inc/galdlg.hxx b/svx/inc/galdlg.hxx deleted file mode 100644 index 0351bee44b57..000000000000 --- a/svx/inc/galdlg.hxx +++ /dev/null @@ -1,72 +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: galdlg.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 _SVX_GALDLG_HXX_ -#define _SVX_GALDLG_HXX_ - - -#include <vos/thread.hxx> -#include <bootstrp/sstring.hxx> -#include <vcl/dialog.hxx> -#include <vcl/graph.hxx> -#include <vcl/fixed.hxx> -#include <vcl/button.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/menu.hxx> -#include <vcl/edit.hxx> -#include <vcl/combobox.hxx> -#include <vcl/sound.hxx> -#include <svl/slstitm.hxx> -#include <svtools/transfer.hxx> -#include <goodies/grfmgr.hxx> -#include <sfx2/tabdlg.hxx> -#include "galctrl.hxx" -#include "galmisc.hxx" - -// ------------ -// - Forwards - -// ------------ - -class GalleryTheme; - -// ---------------- -// - ExchangeData - -// ---------------- - -struct ExchangeData -{ - GalleryTheme* pTheme; - String aEditedTitle; - Date aThemeChangeDate; - Time aThemeChangeTime; -}; - - -#endif // _SVX_GALDLG_HXX_ diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index 88b632061f0c..556399b2a5f3 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -36,27 +36,10 @@ // - Defines - // ----------- -// Gallery-TabDialoge/-TabPages -#define RID_SVXTABDLG_GALLERY (RID_SVX_GALLERY_START) -#define RID_SVXTABPAGE_GALLERY_GENERAL (RID_SVX_GALLERY_START + 1) - -#define RID_SVXTABDLG_GALLERYTHEME (RID_SVX_GALLERY_START + 2) -#define RID_SVXTABPAGE_GALLERYTHEME_GENERAL (RID_SVX_GALLERY_START + 3) -#define RID_SVXTABPAGE_GALLERYTHEME_FILES (RID_SVX_GALLERY_START + 4) - // Dialoge #define RID_SVXDLG_GALLERYBROWSER (RID_SVX_GALLERY_START + 5) -#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS (RID_SVX_GALLERY_START + 6) -#define RID_SVXDLG_GALLERY_TAKE_PROGRESS (RID_SVX_GALLERY_START + 7) -#define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS (RID_SVX_GALLERY_START + 8) -#define RID_SVXDLG_GALLERY_THEMEID (RID_SVX_GALLERY_START + 9) // Gallery-Strings -#define RID_SVXSTR_GALLERY_ACTUALIZE (RID_SVX_GALLERY_START + 10) -#define RID_SVXSTR_GALLERY_FOPENERROR (RID_SVX_GALLERY_START + 11) -#define RID_SVXSTR_GALLERY_NOFILES (RID_SVX_GALLERY_START + 12) -#define RID_SVXSTR_GALLERY_NOTHEME (RID_SVX_GALLERY_START + 13) -#define RID_SVXSTR_GALLERY_DELETEOBJ (RID_SVX_GALLERY_START + 14) #define RID_SVXSTR_EXTFORMAT1_SYS (RID_SVX_GALLERY_START + 15) #define RID_SVXSTR_EXTFORMAT1_UI (RID_SVX_GALLERY_START + 16) #define RID_SVXSTR_EXTFORMAT2_SYS (RID_SVX_GALLERY_START + 17) @@ -67,42 +50,38 @@ #define RID_SVXSTR_EXTFORMAT4_UI (RID_SVX_GALLERY_START + 22) #define RID_SVXSTR_EXTFORMAT5_SYS (RID_SVX_GALLERY_START + 23) #define RID_SVXSTR_EXTFORMAT5_UI (RID_SVX_GALLERY_START + 24) +#define RID_SVXSTR_GALLERY_FOPENERROR (RID_SVX_GALLERY_START + 11) +#define RID_SVXSTR_GALLERY_NOTHEME (RID_SVX_GALLERY_START + 13) +#define RID_SVXSTR_GALLERY_DELETEOBJ (RID_SVX_GALLERY_START + 14) #define RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS (RID_SVX_GALLERY_START + 25) #define RID_SVXSTR_GALLERY_FILTER (RID_SVX_GALLERY_START + 26) #define RID_SVXSTR_GALLERY_LENGTH (RID_SVX_GALLERY_START + 27) #define RID_SVXSTR_GALLERY_SIZE (RID_SVX_GALLERY_START + 28) #define RID_SVXSTR_GALLERY_DELETEDD (RID_SVX_GALLERY_START + 29) -#define RID_SVXSTR_GALLERY_SEARCH (RID_SVX_GALLERY_START + 30) #define RID_SVXSTR_GALLERY_SGIERROR (RID_SVX_GALLERY_START + 31) #define RID_SVXSTR_GALLERY_NEWTHEME (RID_SVX_GALLERY_START + 32) #define RID_SVXSTR_GALLERY_BROWSER (RID_SVX_GALLERY_START + 33) #define RID_SVXSTR_GALLERY_THEMEERR (RID_SVX_GALLERY_START + 34) +#define RID_SVXSTR_GALLERY_IMPORTTHEME (RID_SVX_GALLERY_START + 41) +#define RID_SVXSTR_GALLERY_CREATETHEME (RID_SVX_GALLERY_START + 42) +#define RID_SVXSTR_GALLERY_DIALOGID (RID_SVX_GALLERY_START + 80) +#define RID_SVXSTR_GALLERY_DELETETHEME (RID_SVX_GALLERY_START + 83) +#define RID_SVXSTR_GALLERY_TITLE (RID_SVX_GALLERY_START + 84) +#define RID_SVXSTR_GALLERY_PATH (RID_SVX_GALLERY_START + 85) +#define RID_SVXSTR_GALLERY_ICONVIEW (RID_SVX_GALLERY_START + 86) +#define RID_SVXSTR_GALLERY_LISTVIEW (RID_SVX_GALLERY_START + 87) // Controls fuer Gallery -#define RID_SVXDLG_GALLERY_CBX (RID_SVX_GALLERY_START + 35) #define RID_SVXMN_GALLERY1 (RID_SVX_GALLERY_START + 36) #define RID_SVXMN_GALLERY2 (RID_SVX_GALLERY_START + 37) -// zus. Strings -#define RID_SVXSTR_GALLERYPROPS_THEME (RID_SVX_GALLERY_START + 38) -#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_SVX_GALLERY_START + 39) -#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_SVX_GALLERY_START + 40) -#define RID_SVXSTR_GALLERY_IMPORTTHEME (RID_SVX_GALLERY_START + 41) -#define RID_SVXSTR_GALLERY_CREATETHEME (RID_SVX_GALLERY_START + 42) -#define RID_SVXSTR_GALLERY_READONLY (RID_SVX_GALLERY_START + 43) -#define RID_SVXSTR_GALLERY_ALLFILES (RID_SVX_GALLERY_START + 44) - // Images #define RID_SVXBMP_GALLERY (RID_SVX_GALLERY_START + 46) #define RID_SVXBMP_THEME (RID_SVX_GALLERY_START + 47) #define RID_SVXBMP_THEME_NORMAL (RID_SVX_GALLERY_START + 48) -#define RID_SVXBMP_THEME_NORMAL_BIG (RID_SVX_GALLERY_START + 49) #define RID_SVXBMP_THEME_IMPORTED (RID_SVX_GALLERY_START + 50) -#define RID_SVXBMP_THEME_IMPORTED_BIG (RID_SVX_GALLERY_START + 51) #define RID_SVXBMP_THEME_READONLY (RID_SVX_GALLERY_START + 52) -#define RID_SVXBMP_THEME_READONLY_BIG (RID_SVX_GALLERY_START + 53) #define RID_SVXBMP_THEME_DEFAULT (RID_SVX_GALLERY_START + 54) -#define RID_SVXBMP_THEME_DEFAULT_BIG (RID_SVX_GALLERY_START + 55) #define RID_SVXIMG_GALLERY_VIEW_ICON (RID_SVX_GALLERY_START + 56) #define RID_SVXIMG_GALLERY_VIEW_LIST (RID_SVX_GALLERY_START + 57) #define RID_SVXIMG_GALLERY_VIEW_ICON_HC (RID_SVX_GALLERY_START + 58) @@ -119,16 +98,6 @@ #define RID_SVXBMP_GALLERY_SOUND_7 (RID_SVX_GALLERY_START + 68) #define RID_SVXBMP_GALLERY_MEDIA (RID_SVX_GALLERY_START + 71) -// weitere IDs -#define RID_SVXSTR_GALLERY_DIALOGID (RID_SVX_GALLERY_START + 80) -#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_SVX_GALLERY_START + 81) -#define RID_SVXDLG_GALLERY_TITLE (RID_SVX_GALLERY_START + 82) -#define RID_SVXSTR_GALLERY_DELETETHEME (RID_SVX_GALLERY_START + 83) -#define RID_SVXSTR_GALLERY_TITLE (RID_SVX_GALLERY_START + 84) -#define RID_SVXSTR_GALLERY_PATH (RID_SVX_GALLERY_START + 85) -#define RID_SVXSTR_GALLERY_ICONVIEW (RID_SVX_GALLERY_START + 86) -#define RID_SVXSTR_GALLERY_LISTVIEW (RID_SVX_GALLERY_START + 87) - // lokale Defines #define BTN_OK 1 #define BTN_CANCEL 1 @@ -194,8 +163,6 @@ #define BTN_THEME 2 #define BTN_RECOVER 3 #define BTN_CLOSEBROWSER 7 -#define BTN_MADDIN1 8 -#define BTN_MADDIN2 9 #define LBX_THEME2 1 #define FL_THEME2 1 #define BTN_NEWTHEME2 1 diff --git a/svx/inc/gallery1.hxx b/svx/inc/gallery1.hxx index ace74e1fe8a4..04ae4814c91d 100644 --- a/svx/inc/gallery1.hxx +++ b/svx/inc/gallery1.hxx @@ -36,7 +36,7 @@ #include <tools/urlobj.hxx> #include <svl/brdcst.hxx> #include "svx/svxdllapi.h" -#include "gallery.hrc" +//#include "gallery.hrc" #include <cstdio> #include <list> @@ -81,7 +81,7 @@ public: BOOL IsImported() const { return bImported; } BOOL IsReadOnly() const { return bReadOnly; } - BOOL IsDefault() const { return( ( nId > 0 ) && ( nId != ( RID_GALLERYSTR_THEME_MYTHEME - RID_GALLERYSTR_THEME_START ) ) ); } + BOOL IsDefault() const; BOOL IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; } diff --git a/svx/inc/galmisc.hxx b/svx/inc/galmisc.hxx index cfda79f0a6ca..752c7cc005d7 100644 --- a/svx/inc/galmisc.hxx +++ b/svx/inc/galmisc.hxx @@ -37,12 +37,40 @@ #include <svl/hint.hxx> #include <svtools/transfer.hxx> #include <svx/svdobj.hxx> -#include "galobj.hxx" #include <com/sun/star/uno/Reference.h> -#ifndef _COM_SUN_STAR_AWT_XPROGRESSMONITOR_HPP #include <com/sun/star/awt/XProgressMonitor.hpp> -#endif #include "svx/svxdllapi.h" +#include <tools/date.hxx> +#include <tools/time.hxx> + +// ------------ +// - Forwards - +// ------------ + +class GalleryTheme; + +// ---------------- +// - ExchangeData - +// ---------------- + +struct ExchangeData +{ + GalleryTheme* pTheme; + String aEditedTitle; + Date aThemeChangeDate; + Time aThemeChangeTime; +}; + +enum SgaObjKind +{ + SGA_OBJ_NONE = 0, // Abstraktes Objekt + SGA_OBJ_BMP = 1, // Bitmap-Objekt + SGA_OBJ_SOUND = 2, // Sound-Objekt + SGA_OBJ_VIDEO = 3, // Video-Objekt + SGA_OBJ_ANIM = 4, // Animations-Objekt + SGA_OBJ_SVDRAW = 5, // Svdraw-Objekt + SGA_OBJ_INET = 6 // Grafik aus dem Internet +}; // ----------- // - Defines - diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index a33a1b5cbd81..76cc793c38c8 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -33,6 +33,7 @@ #include <tools/urlobj.hxx> #include <vcl/graph.hxx> +#include "galmisc.hxx" // ----------- // - Defines - @@ -50,21 +51,6 @@ #define SGA_FORMAT_SVDRAW 0x00010000L #define SGA_FORMAT_ALL 0xFFFFFFFFL -// -------------- -// - SgaObjKind - -// -------------- - -enum SgaObjKind -{ - SGA_OBJ_NONE = 0, // Abstraktes Objekt - SGA_OBJ_BMP = 1, // Bitmap-Objekt - SGA_OBJ_SOUND = 2, // Sound-Objekt - SGA_OBJ_VIDEO = 3, // Video-Objekt - SGA_OBJ_ANIM = 4, // Animations-Objekt - SGA_OBJ_SVDRAW = 5, // Svdraw-Objekt - SGA_OBJ_INET = 6 // Grafik aus dem Internet -}; - // ---------------- // - GalSoundType - // ---------------- diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx index 8d86c44d8ba9..96834327a203 100644 --- a/svx/inc/galtheme.hxx +++ b/svx/inc/galtheme.hxx @@ -42,13 +42,17 @@ #include <svl/lstner.hxx> #include <svtools/transfer.hxx> #include <sot/storage.hxx> -#include "galobj.hxx" -#include "galmisc.hxx" -#include "gallery1.hxx" +#include <svx/svdmodel.hxx> +//#include <svx/galobj.hxx> +#include <svx/galmisc.hxx> +//#include <svx/gallery1.hxx> // ----------------- // - GalleryObject - // ----------------- +// -------------- +// - SgaObjKind - +// -------------- struct GalleryObject { @@ -60,6 +64,11 @@ struct GalleryObject DECLARE_LIST( GalleryObjectList, GalleryObject* ) +class GalleryThemeEntry; +class SgaObject; +class FmFormModel; +class ListBox; + // ----------------- // - GalDragParams - // ----------------- @@ -116,7 +125,7 @@ private: ULONG ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); } INetURLObject ImplGetURL( const GalleryObject* pObject ) const; INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat = CVT_UNKNOWN ); - void ImplSetModified( BOOL bModified ) { pThm->SetModified( bModified ); } + void ImplSetModified( BOOL bModified ); void ImplBroadcast( ULONG nUpdatePos ); GalleryTheme(); @@ -136,20 +145,20 @@ public: SVX_DLLPUBLIC BOOL RemoveObject( ULONG nPos ); BOOL ChangeObjectPos( ULONG nOldPos, ULONG nNewPos ); - const String& GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); } - const String& GetRealName() const { return pThm->GetThemeName(); } + SVX_DLLPUBLIC const String& GetName() const; + const String& GetRealName() const; const String& GetImportName() const { return aImportName; } void SetImportName(const String& rImportName) { aImportName = rImportName; } const String& GetDestDir() const { return m_aDestDir; } void SetDestDir(const String& rDestDir) { m_aDestDir = rDestDir; } - const INetURLObject& GetThmURL() const { return pThm->GetThmURL(); } - const INetURLObject& GetSdgURL() const { return pThm->GetSdgURL(); } - const INetURLObject& GetSdvURL() const { return pThm->GetSdvURL(); } + const INetURLObject& GetThmURL() const; + SVX_DLLPUBLIC const INetURLObject& GetSdgURL() const; + const INetURLObject& GetSdvURL() const; - UINT32 GetId() const { return pThm->GetId(); } - void SetId( UINT32 nNewId, BOOL bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); } + SVX_DLLPUBLIC UINT32 GetId() const; + void SetId( UINT32 nNewId, BOOL bResetThemeName ); void SetDragging( BOOL bSet ) { bDragging = bSet; } BOOL IsDragging() const { return bDragging; } @@ -164,12 +173,12 @@ public: void SetDragPos( ULONG nPos ) { nDragPos = nPos; } ULONG GetDragPos() const { return nDragPos; } - BOOL IsThemeNameFromResource() const { return pThm->IsNameFromResource(); } + BOOL IsThemeNameFromResource() const; - BOOL IsImported() const { return pThm->IsImported(); } - BOOL IsReadOnly() const { return pThm->IsReadOnly(); } - BOOL IsDefault() const { return pThm->IsDefault(); } - BOOL IsModified() const { return pThm->IsModified(); } + SVX_DLLPUBLIC BOOL IsImported() const; + SVX_DLLPUBLIC BOOL IsReadOnly() const; + SVX_DLLPUBLIC BOOL IsDefault() const; + BOOL IsModified() const; SVX_DLLPUBLIC void Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL ); void AbortActualize() { bAbortActualize = TRUE; } @@ -216,6 +225,7 @@ public: SvStream& WriteData( SvStream& rOut ) const; SvStream& ReadData( SvStream& rIn ); + static SVX_DLLPUBLIC void InsertAllThemes( ListBox& rListBox ); }; SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme ); diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 678c2810b232..16770086f08e 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -35,148 +35,58 @@ // Help-Ids -------------------------------------------------------------- -#define HID_GALLERY_BROWSER (HID_SVX_START + 0) #define HID_GALLERY_THEME (HID_SVX_START + 1) #define HID_GALLERY_NEW_THEME (HID_SVX_START + 2) #define HID_GALLERY_RENAME_THEME (HID_SVX_START + 3) -#define HID_GALLERY_SEARCH (HID_SVX_START + 4) -#define HID_GALLERY_APPLY (HID_SVX_START + 5) -#define HID_GALLERY_ACTUALIZE (HID_SVX_START + 6) #define HID_GALLERY_WINDOW (HID_SVX_START + 7) #define HID_GALLERY_RENAME (HID_SVX_START + 8) #define HID_GALLERY_PROPERTIES (HID_SVX_START + 9) +#define HID_GALLERY_PREVIEW (HID_SVX_START + 424) +#define HID_GALLERY_ACTUALIZE (HID_SVX_START + 6) #define HID_TRANS_POSITION (HID_SVX_START + 10) #define HID_TRANS_SIZE (HID_SVX_START + 11) -#define HID_TRANS_ANGLE (HID_SVX_START + 12) -#define HID_TRANS_SLANT (HID_SVX_START + 13) - -#define HID_TABULATOR (HID_SVX_START + 14) -#define HID_BORDER (HID_SVX_START + 15) -#define HID_BACKGROUND (HID_SVX_START + 16) -#define HID_ALIGNMENT (HID_SVX_START + 17) -#define HID_NUMBERFORMAT (HID_SVX_START + 18) -#define HID_CAPTION (HID_SVX_START + 19) -#define HID_FORMAT_PAGE (HID_SVX_START + 20) #define HID_FORMAT_HEADER (HID_SVX_START + 21) #define HID_FORMAT_FOOTER (HID_SVX_START + 22) #define HID_FORMAT_CHAR_STD (HID_SVX_START + 23) #define HID_FORMAT_CHAR_EXT (HID_SVX_START + 24) -#define HID_FORMAT_PARAGRAPH_STD (HID_SVX_START + 25) -#define HID_FORMAT_PARAGRAPH_EXT (HID_SVX_START + 26) -#define HID_FORMAT_PARAGRAPH_ALIGN (HID_SVX_START + 27) - -#define HID_AREA_AREA (HID_SVX_START + 30) -#define HID_AREA_HATCH (HID_SVX_START + 31) -#define HID_AREA_BITMAP (HID_SVX_START + 32) -#define HID_AREA_GRADIENT (HID_SVX_START + 33) -#define HID_LINE_LINE (HID_SVX_START + 34) -#define HID_LINE_DEF (HID_SVX_START + 35) -#define HID_LINE_ENDDEF (HID_SVX_START + 36) -#define HID_AREA_SHADOW (HID_SVX_START + 37) -#define HID_AREA_TRANSPARENCE (HID_SVX_START + 38) - -#define HID_OPTIONS_COLOR (HID_SVX_START + 40) -#define HID_OPTIONS_SAVE (HID_SVX_START + 41) -#define HID_OPTIONS_PATH (HID_SVX_START + 42) -#define HID_OPTIONS_GENERAL (HID_SVX_START + 43) -#define HID_OPTIONS_LINGU (HID_SVX_START + 44) -#define HID_OPTIONS_SPELL (HID_SVX_START + 45) -#define HID_OPTIONS_DICT_NEW (HID_SVX_START + 46) -#define HID_OPTIONS_DICT_EDIT (HID_SVX_START + 47) -#define HID_OPTIONS_GRID (HID_SVX_START + 48) -#define HID_OPTIONS_INET (HID_SVX_START + 49) -#define HID_DLG_NAME (HID_SVX_START + 50) -#define HID_DLG_MESSBOX (HID_SVX_START + 51) -#define HID_SEARCHATTR (HID_SVX_START + 52) #define HID_HYPHENATE (HID_SVX_START + 53) -#define HID_SPELLCHECK (HID_SVX_START + 54) -#define HID_SEARCHSIMILARITY (HID_SVX_START + 55) #define HID_PASSWORD (HID_SVX_START + 56) -#define HID_MULTIPATH (HID_SVX_START + 57) - -#define HID_GALLERY_PROPERTIES_GENERAL (HID_SVX_START + 58) - -// #i68101# -#define HID_DLG_OBJECT_NAME (HID_SVX_START + 59) -#define HID_DLG_OBJECT_TITLE_DESC (HID_SVX_START + 60) - -//#define HID_BASICIDE_OBJECTS (HID_SVX_START + 59) -//#define HID_MACRO_OPTIONS (HID_SVX_START + 60) -//#define HID_BASICIDE_BRKPNTS (HID_SVX_START + 61) -//#define HID_BASICIDE_MODULS (HID_SVX_START + 62) -//#define HID_BASICIDE_LIBS_TP (HID_SVX_START + 63) -//#define HID_BASICIDE_LIBS_DLG (HID_SVX_START + 64) -//#define HID_BASICIDE_CONTROLS (HID_SVX_START + 65) -//#define HID_BASICIDE_MACROS (HID_SVX_START + 66) -//#define HID_BASICIDE_LIBS (HID_SVX_START + 67) -//#define HID_BASICIDE_ORG_TC (HID_SVX_START + 68) #define HID_POPUP_COLOR (HID_SVX_START + 70) #define HID_POPUP_BRUSH (HID_SVX_START + 71) #define HID_POPUP_FRAME (HID_SVX_START + 72) #define HID_POPUP_LINE (HID_SVX_START + 73) -#define HID_OPTIONS_MAIL (HID_SVX_START + 74) #define HID_THES_LANGUAGE (HID_SVX_START + 75) -#define HID_OPTIONS_PROXY (HID_SVX_START + 76) #define HID_OPTIONS_CACHE (HID_SVX_START + 77) #define HID_OPTIONS_TYPE (HID_SVX_START + 78) -#define HID_OPTIONS_SEARCH (HID_SVX_START + 79) - -//#define HID_BASICIDE_MODULES_TREE (HID_SVX_START + 80) -//#define HID_BASICIDE_LIBS_TREE (HID_SVX_START + 81) -//#define HID_BASICIDE_LIBSDLG_TREE (HID_SVX_START + 82) -//#define HID_BASICIDE_OBJECTCAT (HID_SVX_START + 83) +#define HID_OPTIONS_GRID (HID_SVX_START + 48) #define HID_PAGE_LIGHT3D (HID_SVX_START + 84) -#define HID_PAGE_MEASURE (HID_SVX_START + 85) -#define HID_PAGE_TEXTATTR (HID_SVX_START + 86) #define HID_PAGE_3DATTR (HID_SVX_START + 87) #define HID_CTRL_COLOR (HID_SVX_START + 88) -#define HID_PAGE_CONNECTION (HID_SVX_START + 89) -#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_SVX_START + 90) -#define HID_PAGE_DISTRIBUTE (HID_SVX_START + 91) #define HID_WIN_FONTWORK_ALIGN (HID_SVX_START + 92) #define HID_WIN_FONTWORK_CHARSPACE (HID_SVX_START + 93) #define HID_CTL_FONTWORK_FAVORITES (HID_SVX_START + 94) -#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_SVX_START + 100) #define HID_BACKGROUND_CTL_PATTERNSET (HID_SVX_START + 101) #define HID_BACKGROUND_CTL_PATCOLORSET (HID_SVX_START + 102) -#define HID_BACKGROUND_CTL_POSITION (HID_SVX_START + 103) #define HID_BMPMASK_CTL_QCOL_1 (HID_SVX_START + 104) #define HID_BMPMASK_CTL_PIPETTE (HID_SVX_START + 105) -#define HID_BORDER_CTL_PRESETS (HID_SVX_START + 106) -#define HID_BORDER_CTL_SHADOWS (HID_SVX_START + 107) -#define HID_CHARMAP_CTL_SHOWSET (HID_SVX_START + 108) -#define HID_CHARMAP_CTL_SHOWTEXT (HID_SVX_START + 109) -#define HID_CHARMAP_CTL_SHOWCHAR (HID_SVX_START + 110) #define HID_FONTWORK_CTL_FORMS (HID_SVX_START + 111) #define HID_LIGHT3D_CTL_LIGHT (HID_SVX_START + 112) -#define HID_MEASURE_CTL_POSITION (HID_SVX_START + 113) -#define HID_MEASURE_CTL_PREVIEW (HID_SVX_START + 114) -#define HID_SEARCHATTR_CTL_ATTR (HID_SVX_START + 115) -#define HID_TEXTATTR_CTL_POSITION (HID_SVX_START + 116) #define HID_3DATTR_CTL_DISTANCE (HID_SVX_START + 117) #define HID_3DATTR_CTL_FOCALLENGTH (HID_SVX_START + 118) #define HID_COLOR_CTL_COLORS (HID_SVX_START + 119) -#define HID_OPTPATH_CTL_PATH (HID_SVX_START + 120) #define HID_OPTLINGU_CTL_DICTS (HID_SVX_START + 121) #define HID_OPTINET2_CTL_TYPES (HID_SVX_START + 122) #define HID_OPTIONS_DICT_DELETE (HID_SVX_START + 123) -#define HID_TPCOLOR_RGB_1 (HID_SVX_START + 124) -#define HID_TPCOLOR_RGB_2 (HID_SVX_START + 125) -#define HID_TPCOLOR_RGB_3 (HID_SVX_START + 126) -#define HID_TPCOLOR_CMYK_1 (HID_SVX_START + 127) -#define HID_TPCOLOR_CMYK_2 (HID_SVX_START + 128) -#define HID_TPCOLOR_CMYK_3 (HID_SVX_START + 129) - #define HID_BMPMASK_TBI_PIPETTE (HID_SVX_START + 130) //#define HID_BASICIDE_PROP_BROWSER (HID_SVX_START + 131) #define HID_STYLE_LISTBOX (HID_SVX_START + 132) @@ -197,9 +107,6 @@ #define HID_FONTWORK_TBI_SHADOW_NORMAL (HID_SVX_START + 146) #define HID_FONTWORK_TBI_SHADOW_SLANT (HID_SVX_START + 147) -#define HID_NUMBERFORMAT_TBI_ADD (HID_SVX_START + 148) -#define HID_NUMBERFORMAT_TBI_REMOVE (HID_SVX_START + 149) - #define HID_CONTDLG_APPLY (HID_SVX_START + 150) #define HID_CONTDLG_WORKPLACE (HID_SVX_START + 151) #define HID_CONTDLG_SELECT (HID_SVX_START + 152) @@ -286,13 +193,6 @@ #define HID_SPELLDLG_EXTRAS_THESAURUS (HID_SVX_START + 220) #define HID_SPELLDLG_EXTRAS_OPTIONS (HID_SVX_START + 221) -#define HID_TPSHADOW_CTRL (HID_SVX_START + 222) -#define HID_TPHATCH_CTRL (HID_SVX_START + 223) -#define HID_TPPOSITION_CTRL (HID_SVX_START + 224) -#define HID_TPSIZE_CTRL (HID_SVX_START + 225) -#define HID_TPROTATION_CTRL1 (HID_SVX_START + 226) -#define HID_TPROTATION_CTRL2 (HID_SVX_START + 227) - #define HID_OPTIONS_SSLSITE (HID_SVX_START + 228) #define HID_OPTIONS_SSLPERSONAL (HID_SVX_START + 229) #define HID_OPTIONS_COOKIES (HID_SVX_START + 230) @@ -300,14 +200,6 @@ #define HID_OPTIONS_CHANNELS (HID_SVX_START + 232) #define HID_OPTINET2_CTL_CHANNELS (HID_SVX_START + 233) -#define HID_CAPTION_CTL_TYPE (HID_SVX_START + 234) - -#define HID_NUMBERFORMAT_TBI_INFO (HID_SVX_START + 235) -#define HID_NUMBERFORMAT_LB_FORMAT (HID_SVX_START + 236) - -#define HID_ALIGNMENT_CTR_DIAL (HID_SVX_START + 237) -#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_SVX_START + 238) - #define HID_REDLINING_FILTER_PAGE (HID_SVX_START + 239) #define HID_REDLINING_FILTER_CB_DATE (HID_SVX_START + 240) #define HID_REDLINING_FILTER_LB_DATE (HID_SVX_START + 241) @@ -349,22 +241,8 @@ #define HID_MNU_FUNC_NONE (HID_SVX_START + 274) #define HID_REDLINING_FILTER_CB_ACTION (HID_SVX_START + 275) -#define HID_REDLINING_DLG (HID_SVX_START + 276) -#define HID_REDLINING_EDIT (HID_SVX_START + 277) -#define HID_REDLINING_PREV (HID_SVX_START + 278) -#define HID_REDLINING_NEXT (HID_SVX_START + 279) #define HID_REDLINING_TABCONTROL (HID_SVX_START + 280) -#define HID_VALUESET_SINGLENUM (HID_SVX_START + 281) -#define HID_VALUESET_BULLET (HID_SVX_START + 282) -#define HID_VALUESET_NUM (HID_SVX_START + 283) -#define HID_VALUESET_NUMBMP (HID_SVX_START + 284) -#define HID_SVXPAGE_PICK_NUM (HID_SVX_START + 285) -#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_SVX_START + 286) -#define HID_SVXPAGE_PICK_BMP (HID_SVX_START + 287) -#define HID_SVXPAGE_PICK_BULLET (HID_SVX_START + 288) -#define HID_SVXPAGE_NUM_OPTIONS (HID_SVX_START + 289) -#define HID_SVXPAGE_NUM_POSITION (HID_SVX_START + 290) //#define HID_BASICIDE_MODULWINDOW (HID_SVX_START + 291) //#define HID_BASICIDE_DIALOGWINDOW (HID_SVX_START + 292) @@ -380,7 +258,6 @@ #define HID_EDITENG_SPELLER_IGNORE (HID_SVX_START + 299) #define HID_EDITENG_SPELLER_AUTOCORRECT (HID_SVX_START + 300) -#define HID_OPTPATH_HEADERBAR (HID_SVX_START + 301) #define HID_OPTCOOKIES_HEADERBAR (HID_SVX_START + 302) #define HID_TPPAGE_FULLSIZE (HID_SVX_START + 303) @@ -388,32 +265,9 @@ #define HID_POPUP_LINEEND (HID_SVX_START + 304) #define HID_POPUP_LINEEND_CTRL (HID_SVX_START + 305) -#define HID_SPELLDLG_SETWORD (HID_SVX_START + 306) - -#define HID_HYPERLINK_INTERNET (HID_SVX_START + 315) -#define HID_HYPERLINK_MAIL (HID_SVX_START + 316) -#define HID_HYPERLINK_DOCUMENT (HID_SVX_START + 317) -#define HID_HYPERLINK_NEWDOCUMENT (HID_SVX_START + 318) -#define HID_HYPERLINK_MARKWND (HID_SVX_START + 319) - -#define HID_ICCDIALOG_RESET_BTN (HID_SVX_START + 320) -#define HID_ICCDIALOG_CHOICECTRL (HID_SVX_START + 321) - -#define HID_HYPERDLG_INET_PATH (HID_SVX_START + 322) -#define HID_HYPERDLG_MAIL_PATH (HID_SVX_START + 323) -#define HID_HYPERDLG_DOC_PATH (HID_SVX_START + 324) -#define HID_ICCDIALOG_OK_BTN (HID_SVX_START + 325) -#define HID_ICCDIALOG_CANCEL_BTN (HID_SVX_START + 326) - -#define HID_HYPERLINK_MARKWND_APPLY (HID_SVX_START + 327) -#define HID_HYPERLINK_MARKWND_CLOSE (HID_SVX_START + 328) -#define HID_HYPERLINK_MARKWND_TREE (HID_SVX_START + 329) - #define HID_AUTOCORR_HELP_START (HID_SVX_START + 331) #define HID_AUTOCORR_HELP_END (HID_SVX_START + 370) -#define HID_SVXPAGE_GRFCROP (HID_SVX_START + 375) - // #i58240# set HelpIDs for scrollbars and switcher #define HID_CTRL3D_HSCROLL (HID_SVX_START + 376) #define HID_CTRL3D_VSCROLL (HID_SVX_START + 377) @@ -432,24 +286,8 @@ #define HID_GRFFILTER_SEPIA (HID_SVX_START + 390) #define HID_GRFFILTER_SOLARIZE (HID_SVX_START + 391) -#define HID_SVXPAGE_CHAR_NAME (HID_SVX_START + 392) -#define HID_SVXPAGE_CHAR_EFFECTS (HID_SVX_START + 393) -#define HID_SVXPAGE_CHAR_POSITION (HID_SVX_START + 394) -#define HID_SVXPAGE_CHAR_TWOLINES (HID_SVX_START + 395) #define HID_SVXPAGE_CHAR_EFFECTS_CTRL (HID_SVX_START + 396) -#define HID_LNGDLG_NUM_PREBREAK (HID_SVX_START + 400) - -#define HID_EDIT_MODULES (HID_SVX_START + 401) -#define HID_CLB_EDIT_MODULES_DICS (HID_SVX_START + 402) -#define HID_CLB_EDIT_MODULES_MODULES (HID_SVX_START + 403) -#define HID_CLB_LINGU_MODULES (HID_SVX_START + 404) -#define HID_CLB_LINGU_OPTIONS (HID_SVX_START + 405) - -#define HID_SVXPAGE_PARA_ASIAN (HID_SVX_START + 406) - -#define HID_GRFFILTER_EMBOSS_LIGHT (HID_SVX_START + 408) - #define HID_GALLERY_NEWTHEME (HID_SVX_START + 410) #define HID_GALLERY_THEMELIST (HID_SVX_START + 411) @@ -457,73 +295,37 @@ #define HID_SVXDLG_PROPBRW (HID_SVX_START + 413) #define HID_SVX_DLG_LABELCONTROL (HID_SVX_START + 414) -#define HID_OPTIONS_ASIAN_LAYOUT (HID_SVX_START + 415) #define HID_SVXTBX_FORM (HID_SVX_START + 416) -#define HID_WARN_NAME_DUPLICATE (HID_SVX_START + 417) #define HID_POPUP_COLOR_CTRL (HID_SVX_START + 418) #define HID_RUBY_DIALOG (HID_SVX_START + 419) -#define HID_SVXPAGE_JSEARCH_OPTIONS (HID_SVX_START + 420) #define HID_SVXTBX_UNDO_REDO_CTRL (HID_SVX_START + 421) #define HID_GALLERY_MN_COPYCLIPBOARD (HID_SVX_START + 422) #define HID_GALLERY_MN_PASTECLIPBOARD (HID_SVX_START + 423) -#define HID_GALLERY_PREVIEW (HID_SVX_START + 424) #define HID_GALLERY_ICONVIEW (HID_SVX_START + 425) #define HID_GALLERY_LISTVIEW (HID_SVX_START + 426) -#define HID_SVXDLG_FILTER_WARNING (HID_SVX_START + 427) - -#define HID_TRANS_POSITION_SIZE (HID_SVX_START + 428) -#define HID_OPTIONS_COLORCONFIG (HID_SVX_START + 429) -#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME (HID_SVX_START + 430) -#define HID_OPTIONS_ACCESSIBILITYCONFIG (HID_SVX_START + 431) //no new entries here!! HID_SVX_EXT0_START == 39868 #define HID_FILL_ATTR_LISTBOX (HID_SVX_EXT0_START + 1) #define HID_FILL_TYPE_LISTBOX (HID_SVX_EXT0_START + 2) -#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN (HID_SVX_EXT0_START + 3) #define HID_OPTIONS_SSO (HID_SVX_EXT0_START + 4) #define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_SVX_EXT0_START + 5) #define HID_EDITENG_SPELLER_PARALANGUAGE (HID_SVX_EXT0_START + 6) -#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME (HID_SVX_EXT0_START + 7) -#define HID_OPTIONS_PATHS_SELECTFOLDER (HID_SVX_EXT0_START + 8) -#define HID_GALLERY_NEWTHEME_FINDFILES (HID_SVX_EXT0_START + 9) -#define HID_GALLERY_NEWTHEME_ADDFILES (HID_SVX_EXT0_START + 10) #define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE (HID_SVX_EXT0_START + 11) -#define HID_OPTIONS_CTL (HID_SVX_EXT0_START + 12) #define HID_REDLINING_VIEW_DG_VIEW_TABLE (HID_SVX_EXT0_START + 13) #define HID_REDLINING_VIEW_DG_VIEW_HEADER (HID_SVX_EXT0_START + 14) -#define HID_DIALOG_HANGULHANJA (HID_SVX_EXT0_START + 15) -#define HID_SPLDLG_BUTTON_CLOSE (HID_SVX_EXT0_START + 16) -#define HID_SPLDLG_BUTTON_IGNORE (HID_SVX_EXT0_START + 17) -#define HID_SPLDLG_BUTTON_IGNOREALL (HID_SVX_EXT0_START + 18) -#define HID_SPLDLG_BUTTON_CHANGE (HID_SVX_EXT0_START + 19) -#define HID_SPLDLG_BUTTON_CHANGEALL (HID_SVX_EXT0_START + 20) -#define HID_HANGULDLG_BUTTON_CLOSE (HID_SVX_EXT0_START + 21) -#define HID_HANGULDLG_BUTTON_IGNORE (HID_SVX_EXT0_START + 22) -#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_SVX_EXT0_START + 23) -#define HID_HANGULDLG_BUTTON_CHANGE (HID_SVX_EXT0_START + 24) -#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_SVX_EXT0_START + 25) #define HID_SPLDLG_EDIT_NEWWORD (HID_SVX_EXT0_START + 26) -#define HID_HANGULDLG_EDIT_NEWWORD (HID_SVX_EXT0_START + 27) -#define HID_DLG_SECURITY_OPTIONS (HID_SVX_EXT0_START + 28) -#define HID_DLG_WEBCONNECTION_INFO (HID_SVX_EXT0_START + 29) -#define HID_SPLDLG_BUTTON_EXPLAIN (HID_SVX_EXT0_START + 30) #define HID_SPLDLG_CHECKBOX_CHECKGRAMMAR (HID_SVX_EXT0_START + 31) #define HID_AUTOCORR_DLG (HID_OFA_START + 0) -#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_OFA_START + 1) -#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_OFA_START + 2) -#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_OFA_START + 3) -#define HID_OFACTL_AUTOCORR_REPLACE (HID_OFA_START + 4) #define HID_OFAWIN_MAIL_HEADER (HID_OFA_START + 5) #define HID_OFAWIN_MAIL_ATTACH (HID_OFA_START + 6) #define HID_OFACTL_MAIL_ATTACH (HID_OFA_START + 7) -#define HID_OFA_TP_MISC (HID_OFA_START + 8) #define HID_OFA_HYPERLINK (HID_OFA_START + 10) #define HID_OFA_DLGTABNEW (HID_OFA_START + 11) #define HID_OFA_HYPERLINK_DLG (HID_OFA_START + 12) @@ -542,8 +344,6 @@ #define HID_OFA_HYPERLINK_TARGET (HID_OFA_START + 25) #define HID_OFA_HYPERLINK_SEARCH (HID_OFA_START + 26) #define HID_OFA_MAILTOOLBOX (HID_OFA_START + 27) -#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_OFA_START + 28) -#define HID_OFA_TP_VIEW (HID_OFA_START + 29) #define HID_OFA_MAILMENU_OPEN (HID_OFA_START + 30) #define HID_OFA_MAILMENU_DELETE (HID_OFA_START + 31) #define HID_OFA_MAILMENU_RENAME (HID_OFA_START + 32) @@ -558,31 +358,21 @@ #define HID_OFA_MAILATTACH_RECEIPT_CB (HID_OFA_START + 43) #define HID_OFA_MAILATTACH_PRIORITY_LB (HID_OFA_START + 44) #define HID_OFA_MAILATTACH_TABBAR (HID_OFA_START + 45) -#define HID_OFAPAGE_AUTOCORR_CLB (HID_OFA_START + 46) -#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_OFA_START + 47) -#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_OFA_START + 48) #define HID_OFA_DLGFORMNEW (HID_OFA_START + 49) #define HID_OFA_TP_APPEARANCE (HID_OFA_START + 50) #define HID_OFA_HYPERLINK_NAME (HID_OFA_START + 51) #define HID_OFA_HYPERLINK_URL_TXT (HID_OFA_START + 52) #define HID_OFA_HYPERLINK_URL (HID_OFA_START + 53) #define HID_OFA_MAILMENU_FILE (HID_OFA_START + 54) -#define HID_OFA_FONT_SUBSTITUTION (HID_OFA_START + 55) -#define HID_OFA_FONT_SUBST_CLB (HID_OFA_START + 56) -#define HID_OFA_SUBST_APPLY (HID_OFA_START + 57) -#define HID_OFA_SUBST_DELETE (HID_OFA_START + 58) #define HID_OFADLG_REGISTRATION (HID_OFA_START + 59) #define HID_OFA_TP_DESKTOP (HID_OFA_START + 60) #define HID_REGISTRATION_REGISTER (HID_OFA_START + 61) #define HID_REGISTRATION_ENABLE_KEY (HID_OFA_START + 62) -#define HID_AUTOCORR_LANGUAGE (HID_OFA_START + 63) #define HID_OFA_MAILHEAD_RCPT_CB (HID_OFA_START + 64) #define HID_OFA_SENDMENU_PLAIN (HID_OFA_START + 65) #define HID_OFA_SENDMENU_ENCRYPT (HID_OFA_START + 66) #define HID_OFA_SENDMENU_SIGN (HID_OFA_START + 67) #define HID_OFA_SENDMENU_SIGNANDENCRYPT (HID_OFA_START + 68) -#define HID_OFADLG_OPTIONS_TREE (HID_OFA_START + 69) -#define HID_OFADLG_TREELISTBOX (HID_OFA_START + 70) #define HID_OFADLG_TREE_GENERAL (HID_OFA_START + 71) #define HID_OFADLG_TREE_INTERNET (HID_OFA_START + 72) #define HID_OFADLG_TREE_BROWSER (HID_OFA_START + 73) @@ -593,107 +383,11 @@ #define HID_OFADLG_TREE_DRAWING (HID_OFA_START + 78) #define HID_OFADLG_TREE_IMAGE (HID_OFA_START + 79) #define HID_OFADLG_TREE_FORMULA (HID_OFA_START + 80) -#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_OFA_START + 113) #define HID_OFADLG_TREE_CHART (HID_OFA_START + 115) #define HID_OFADLG_TREE_BASE (HID_OFA_START + 116) #define HID_OFADLG_TREE_FILTER (HID_OFA_START + 117) -#define HID_OFAPAGE_MSFLTR2_CLB (HID_OFA_START + 118) -#define HID_OFA_TP_LANGUAGES (HID_OFA_START + 119) #define HID_OFADLG_TREE_LANGUAGE (HID_OFA_START + 120) -#define HID_OFA_CONNPOOL_DRIVERLIST (HID_OFA_START + 121) -#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_OFA_START + 122) // #define HID_OFA_TP_HELPERPROG (HID_OFA_START + 123) -#define HID_OFA_TP_MEMORY (HID_OFA_START + 124) -#define HID_DBPATH_CTL_PATH (HID_OFA_START + 125) -#define HID_DBPATH_HEADERBAR (HID_OFA_START + 126) -#define HID_OFAPAGE_SMARTTAG_OPTIONS (HID_OFA_START + 127) - -#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST (HID_SVX_EXT0_START + 28) - -#define HID_COLORPAGE_LISTBOX_START (HID_SVX_EXT0_START + 29) -#define HID_COLORPAGE_DOCCOLOR_LB (HID_SVX_EXT0_START + 29) -#define HID_COLORPAGE_DOCBOUNDARIES_LB (HID_SVX_EXT0_START + 30) -#define HID_COLORPAGE_APPBACKGROUND_LB (HID_SVX_EXT0_START + 31) -#define HID_COLORPAGE_OBJECTBOUNDARIES_LB (HID_SVX_EXT0_START + 32) -#define HID_COLORPAGE_TABLEBOUNDARIES_LB (HID_SVX_EXT0_START + 33) -#define HID_COLORPAGE_FONTCOLOR_LB (HID_SVX_EXT0_START + 34) -#define HID_COLORPAGE_LINKS_LB (HID_SVX_EXT0_START + 35) -#define HID_COLORPAGE_LINKSVISITED_LB (HID_SVX_EXT0_START + 36) -#define HID_COLORPAGE_ANCHOR_LB (HID_SVX_EXT0_START + 37) -#define HID_COLORPAGE_SPELL_LB (HID_SVX_EXT0_START + 38) -#define HID_COLORPAGE_WRITERTEXTGRID_LB (HID_SVX_EXT0_START + 39) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB (HID_SVX_EXT0_START + 40) -#define HID_COLORPAGE_WRITERIDXSHADINGS_LB (HID_SVX_EXT0_START + 41) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB (HID_SVX_EXT0_START + 42) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB (HID_SVX_EXT0_START + 43) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB (HID_SVX_EXT0_START + 44) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB (HID_SVX_EXT0_START + 45) -#define HID_COLORPAGE_WRITERPAGEBREAKS_LB (HID_SVX_EXT0_START + 46) -#define HID_COLORPAGE_HTMLSGML_LB (HID_SVX_EXT0_START + 47) -#define HID_COLORPAGE_HTMLCOMMENT_LB (HID_SVX_EXT0_START + 48) -#define HID_COLORPAGE_HTMLKEYWORD_LB (HID_SVX_EXT0_START + 49) -#define HID_COLORPAGE_HTMLUNKNOWN_LB (HID_SVX_EXT0_START + 50) -#define HID_COLORPAGE_CALCGRID_LB (HID_SVX_EXT0_START + 51) -#define HID_COLORPAGE_CALCPAGEBREAK_LB (HID_SVX_EXT0_START + 52) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB (HID_SVX_EXT0_START + 53) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB (HID_SVX_EXT0_START + 54) -#define HID_COLORPAGE_CALCDETECTIVE_LB (HID_SVX_EXT0_START + 55) -#define HID_COLORPAGE_CALCDETECTIVEERROR_LB (HID_SVX_EXT0_START + 56) -#define HID_COLORPAGE_CALCREFERENCE_LB (HID_SVX_EXT0_START + 57) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB (HID_SVX_EXT0_START + 58) -#define HID_COLORPAGE_DRAWGRID_LB (HID_SVX_EXT0_START + 59) -#define HID_COLORPAGE_DRAWDRAWING_LB (HID_SVX_EXT0_START + 60) -#define HID_COLORPAGE_DRAWFILL_LB (HID_SVX_EXT0_START + 61) -#define HID_COLORPAGE_BASICIDENTIFIER_LB (HID_SVX_EXT0_START + 62) -#define HID_COLORPAGE_BASICCOMMENT_LB (HID_SVX_EXT0_START + 63) -#define HID_COLORPAGE_BASICNUMBER_LB (HID_SVX_EXT0_START + 64) -#define HID_COLORPAGE_BASICSTRING_LB (HID_SVX_EXT0_START + 65) -#define HID_COLORPAGE_BASICOPERATOR_LB (HID_SVX_EXT0_START + 66) -#define HID_COLORPAGE_BASICKEYWORD_LB (HID_SVX_EXT0_START + 67) -#define HID_COLORPAGE_BASICERROR_LB (HID_SVX_EXT0_START + 68) - -#define HID_COLORPAGE_CHECKBOX_START (HID_SVX_EXT0_START + 69) -#define HID_COLORPAGE_DOCCOLOR_CB (HID_SVX_EXT0_START + 69) -#define HID_COLORPAGE_DOCBOUNDARIES_CB (HID_SVX_EXT0_START + 70) -#define HID_COLORPAGE_APPBACKGROUND_CB (HID_SVX_EXT0_START + 71) -#define HID_COLORPAGE_OBJECTBOUNDARIES_CB (HID_SVX_EXT0_START + 72) -#define HID_COLORPAGE_TABLEBOUNDARIES_CB (HID_SVX_EXT0_START + 73) -#define HID_COLORPAGE_FONTCOLOR_CB (HID_SVX_EXT0_START + 74) -#define HID_COLORPAGE_LINKS_CB (HID_SVX_EXT0_START + 75) -#define HID_COLORPAGE_LINKSVISITED_CB (HID_SVX_EXT0_START + 76) -#define HID_COLORPAGE_ANCHOR_CB (HID_SVX_EXT0_START + 77) -#define HID_COLORPAGE_SPELL_CB (HID_SVX_EXT0_START + 78) -#define HID_COLORPAGE_WRITERTEXTGRID_CB (HID_SVX_EXT0_START + 79) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB (HID_SVX_EXT0_START + 80) -#define HID_COLORPAGE_WRITERIDXSHADINGS_CB (HID_SVX_EXT0_START + 81) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB (HID_SVX_EXT0_START + 82) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB (HID_SVX_EXT0_START + 83) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB (HID_SVX_EXT0_START + 84) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB (HID_SVX_EXT0_START + 85) -#define HID_COLORPAGE_WRITERPAGEBREAKS_CB (HID_SVX_EXT0_START + 86) -#define HID_COLORPAGE_HTMLSGML_CB (HID_SVX_EXT0_START + 87) -#define HID_COLORPAGE_HTMLCOMMENT_CB (HID_SVX_EXT0_START + 88) -#define HID_COLORPAGE_HTMLKEYWORD_CB (HID_SVX_EXT0_START + 89) -#define HID_COLORPAGE_HTMLUNKNOWN_CB (HID_SVX_EXT0_START + 90) -#define HID_COLORPAGE_CALCGRID_CB (HID_SVX_EXT0_START + 91) -#define HID_COLORPAGE_CALCPAGEBREAK_CB (HID_SVX_EXT0_START + 92) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB (HID_SVX_EXT0_START + 93) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB (HID_SVX_EXT0_START + 94) -#define HID_COLORPAGE_CALCDETECTIVE_CB (HID_SVX_EXT0_START + 95) -#define HID_COLORPAGE_CALCDETECTIVEERROR_CB (HID_SVX_EXT0_START + 96) -#define HID_COLORPAGE_CALCREFERENCE_CB (HID_SVX_EXT0_START + 97) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB (HID_SVX_EXT0_START + 98) -#define HID_COLORPAGE_DRAWGRID_CB (HID_SVX_EXT0_START + 99) -#define HID_COLORPAGE_DRAWDRAWING_CB (HID_SVX_EXT0_START + 100) -#define HID_COLORPAGE_DRAWFILL_CB (HID_SVX_EXT0_START + 101) -#define HID_COLORPAGE_BASICIDENTIFIER_CB (HID_SVX_EXT0_START + 102) -#define HID_COLORPAGE_BASICCOMMENT_CB (HID_SVX_EXT0_START + 103) -#define HID_COLORPAGE_BASICNUMBER_CB (HID_SVX_EXT0_START + 104) -#define HID_COLORPAGE_BASICSTRING_CB (HID_SVX_EXT0_START + 105) -#define HID_COLORPAGE_BASICOPERATOR_CB (HID_SVX_EXT0_START + 106) -#define HID_COLORPAGE_BASICKEYWORD_CB (HID_SVX_EXT0_START + 107) -#define HID_COLORPAGE_BASICERROR_CB (HID_SVX_EXT0_START + 108) -#define HID_SVXPAGE_SWPOSSIZE (HID_SVX_EXT0_START + 109) #define HID_POPUP_EXTRUSION_DEPTH (HID_SVX_EXT0_START + 110) #define HID_POPUP_EXTRUSION_LIGHTING (HID_SVX_EXT0_START + 111) @@ -704,36 +398,14 @@ #define HID_MENU_EXTRUSION_LIGHTING (HID_SVX_EXT0_START + 116) #define HID_VALUESET_EXTRUSION_LIGHTING (HID_SVX_EXT0_START + 117) #define HID_MENU_EXTRUSION_SURFACE (HID_SVX_EXT0_START + 118) -#define HID_SCRIPTORG_DIALOG (HID_SVX_EXT0_START + 119) #define HID_POPUP_EXTRUSION_DIRECTION (HID_SVX_EXT0_START + 120) -#define HID_GALLERY_EDIT_MSNAME (HID_SVX_EXT0_START + 121) // Hangul Hanja extensions -#define HID_HANGULHANJA_OPT_DLG (HID_SVX_EXT0_START + 122) -#define HID_HANGULHANJA_NEWDICT_DLG (HID_SVX_EXT0_START + 123) -#define HID_HANGULHANJA_EDIT_DLG (HID_SVX_EXT0_START + 124) -#define HID_HANGULDLG_BUTTON_OPTIONS (HID_SVX_EXT0_START + 125) -#define HID_HANGULHANJA_OPT_DICTS_LB (HID_SVX_EXT0_START + 126) #define HID_SVXTBX_TEXT_CONTROL_ATTRIBUTES (HID_SVX_EXT0_START + 127) -#define HID_OPTIONS_JAVA (HID_SVX_EXT0_START + 128) -#define HID_OPTIONS_JAVA_LIST (HID_SVX_EXT0_START + 129) -#define HID_OPTIONS_JAVA_PARAMETER (HID_SVX_EXT0_START + 130) -#define HID_OPTIONS_JAVA_CLASSPATH (HID_SVX_EXT0_START + 131) // listbox for event config #define HID_SVX_MACRO_LB_EVENT (HID_SVX_EXT0_START + 132) -#define HID_SVX_CONFIG_EVENT (HID_SVX_EXT0_START + 133) -#define HID_CONFIG_EVENT_OFFICE_BASED (HID_SVX_EXT0_START + 134) -#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_SVX_EXT0_START + 135) - -#define HID_SELECTOR_CATEGORIES (HID_SVX_EXT0_START + 136) -#define HID_SELECTOR_COMMANDS (HID_SVX_EXT0_START + 137) -#define HID_SELECTOR_DIALOG (HID_SVX_EXT0_START + 138) -#define HID_SVX_CONFIG_MENU (HID_SVX_EXT0_START + 139) -#define HID_SVX_CONFIG_MENU_CONTENTS (HID_SVX_EXT0_START + 140) -#define HID_SVX_CONFIG_TOOLBAR (HID_SVX_EXT0_START + 141) -#define HID_SVX_CONFIG_TOOLBAR_CONTENTS (HID_SVX_EXT0_START + 142) -#define HID_SCRIPTSBOX (HID_SVX_EXT0_START + 143) + #define HID_SVX_RUN_MACRO (HID_SVX_EXT0_START + 144) #define HID_SVX_BASIC_MACRO_ORGANIZER (HID_SVX_EXT0_START + 145) #define HID_SVX_BASIC_DIALOG_ORGANIZER (HID_SVX_EXT0_START + 146) @@ -767,27 +439,6 @@ #define HID_SVX_MDLG_ERR_REP_OPTIONS (HID_SVX_EXT0_START + 168) #define HID_SVX_MDLG_ERR_REP_PREVIEW (HID_SVX_EXT0_START + 169) -#define HID_HANGULDLG_SUGGESTIONS (HID_SVX_EXT0_START + 170) -#define HID_HANGULDLG_SUGGESTIONS_GRID (HID_SVX_EXT0_START + 171) -#define HID_HANGULDLG_SUGGESTIONS_LIST (HID_SVX_EXT0_START + 172) - -#define HID_SVX_MODIFY_TOOLBAR_ITEM (HID_SVX_EXT0_START + 173) -#define HID_SVX_SAVE_IN (HID_SVX_EXT0_START + 174) -#define HID_SVX_CONFIG_MENU_ORGANIZER (HID_SVX_EXT0_START + 175) -#define HID_SVX_CONFIG_ICON_SELECTOR (HID_SVX_EXT0_START + 176) -#define HID_SVX_CONFIG_NAME_SUBMENU (HID_SVX_EXT0_START + 177) -#define HID_SVX_CONFIG_RENAME_MENU (HID_SVX_EXT0_START + 178) -#define HID_SVX_CONFIG_RENAME_MENU_ITEM (HID_SVX_EXT0_START + 179) -#define HID_SVX_CONFIG_RENAME_TOOLBAR (HID_SVX_EXT0_START + 180) -#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM (HID_SVX_EXT0_START + 181) -#define HID_SVX_NEW_TOOLBAR (HID_SVX_EXT0_START + 182) -#define HID_SVX_MODIFY_TOOLBAR (HID_SVX_EXT0_START + 183) -#define HID_SVX_NEW_TOOLBAR_ITEM (HID_SVX_EXT0_START + 184) -#define HID_SVX_CONFIG_MENU_LISTBOX (HID_SVX_EXT0_START + 185) -#define HID_SVX_OPTIONS_ONLINEUPDATE (HID_SVX_EXT0_START + 186) -#define HID_OPTIONS_CHART_DEFCOLORS (HID_SVX_EXT0_START + 187) -#define HID_OPTIONS_MULTIPATH_LIST (HID_SVX_EXT0_START + 188) - #define HID_COLORPAGE_DBREPORTHEADER_CB (HID_SVX_EXT0_START + 189) #define HID_COLORPAGE_DBREPORTFOOTER_CB (HID_SVX_EXT0_START + 190) #define HID_COLORPAGE_DBPAGEHEADER_CB (HID_SVX_EXT0_START + 191) @@ -807,16 +458,6 @@ #define HID_COLORPAGE_DBCOLUMNFOOTER_LB (HID_SVX_EXT0_START + 205) #define HID_COLORPAGE_DBDETAIL_LB (HID_SVX_EXT0_START + 206) -#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_SVX_EXT0_START + 207) -#define HID_SPLDLG_BUTTON_IGNORERULE (HID_SVX_EXT0_START + 208) - -#define HID_CONFIG_ACCEL (HID_SVX_EXT0_START + 209) -#define HID_ACCELCONFIG_LISTBOX (HID_SVX_EXT0_START + 210) -#define HID_CONFIGGROUP_ACC_LISTBOX (HID_SVX_EXT0_START + 211) -#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_SVX_EXT0_START + 212) -#define HID_MACRO_LB_EVENT (HID_SVX_EXT0_START + 213) -#define HID_MACRO_GROUP (HID_SVX_EXT0_START + 214) -#define HID_MACRO_MACROS (HID_SVX_EXT0_START + 215) #define HID_MACROCHECKDIALOG (HID_SVX_EXT0_START + 216) #define HID_MACRO_HEADERTABLISTBOX (HID_SVX_EXT0_START + 217) @@ -826,7 +467,7 @@ // Overrun check --------------------------------------------------------- // ----------------------------------------------------------------------- -#define ACT_SVX_HID_END HID_OPTIONS_ACCESSIBILITYCONFIG +#define ACT_SVX_HID_END HID_GALLERY_PREVIEW #if ACT_SVX_HID_END > HID_SVX_END #error Resource-Ueberlauf in #line, #file #endif diff --git a/svx/inc/hlmarkwn_def.hxx b/svx/inc/hlmarkwn_def.hxx deleted file mode 100644 index a668737411a6..000000000000 --- a/svx/inc/hlmarkwn_def.hxx +++ /dev/null @@ -1,39 +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: hlmarkwn_def.hxx,v $ - * $Revision: 1.5 $ - * - * 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_BKWND_HYPERLINK_DEF_HXX -#define _SVX_BKWND_HYPERLINK_DEF_HXX - -#define LERR_NOERROR 0 -#define LERR_NOENTRIES 1 -#define LERR_DOCNOTOPEN 2 - -#endif - diff --git a/svx/inc/multipat.hrc b/svx/inc/multipat.hrc deleted file mode 100644 index 6ef22855ff8b..000000000000 --- a/svx/inc/multipat.hrc +++ /dev/null @@ -1,47 +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: multipat.hrc,v $ - * $Revision: 1.5 $ - * - * 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_MULTIPAT_HRC -#define _SVX_MULTIPAT_HRC - -// defines --------------------------------------------------------------- - -#define FL_MULTIPATH 10 -#define LB_MULTIPATH 11 -#define LB_RADIOBUTTON 12 -#define FT_RADIOBUTTON 13 -#define BTN_ADD_MULTIPATH 14 -#define BTN_DEL_MULTIPATH 15 -#define BTN_MULTIPATH_OK 16 -#define BTN_MULTIPATH_CANCEL 17 -#define BTN_MULTIPATH_HELP 18 -#define STR_HEADER_PATHS 19 - -#endif - diff --git a/svx/inc/optaccessibility.hrc b/svx/inc/optaccessibility.hrc deleted file mode 100644 index 248cf16bc96e..000000000000 --- a/svx/inc/optaccessibility.hrc +++ /dev/null @@ -1,87 +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: optaccessibility.hrc,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 _SVX_OPTACCESSIBILITY_HRC -#define _SVX_OPTACCESSIBILITY_HRC - -#include <svtools/controldims.hrc> - -// defines for positions and sizes - -#define GB_WIDTH 248 -#define CB_WIDTH 240 -#define EDIT_WIDTH 25 - -#define COL0 6 -#define COL1 (COL0+6) -#define COL2 (COL1+10) -#define COL3 (COL1+(CB_WIDTH * 2/3)) -#define COL4 (COL3+EDIT_WIDTH+RSC_SP_CTRL_DESC_X) - -#define UNIT_WIDTH (COL1+CB_WIDTH-COL4) - -#define ROWSPACE RSC_SP_CTRL_DESC_Y -#define LINESPACE 1 -#define GROUPSPACE RSC_SP_CTRL_DESC_Y + 2 -#define ROWA_0 3 -#define ROWA_1 ( ROWA_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE ) -#define ROWA_2 ( ROWA_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWA_3 ( ROWA_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWA_4 ( ROWA_3 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWA_5 ( ROWA_4 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) - -#define ROWB_0 ( ROWA_5 + RSC_CD_TEXTBOX_HEIGHT + ROWSPACE + GROUPSPACE ) -#define ROWB_1 ( ROWB_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE ) -#define ROWB_2 ( ROWB_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWB_3 ( ROWB_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) - -#define WHOLE_HEIGHT 185 -#define LASTTEXT_HEIGHT (WHOLE_HEIGHT-ROWB_8) -#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) -#define DIFF(v1,v2) (v2-v1) -#define SUM(v1,v2) (v2+v1) - -// - -#define FL_MISCELLANEOUS 1 -#define CB_PAGE_PREVIEWS 2 -#define FL_HC_OPTIONS 3 -#define CB_TIPHELP 4 -#define NF_TIPHELP 5 -#define FT_TIPHELP 6 -#define CB_ANIMATED_GRAPHICS 7 -#define CB_ANIMATED_TEXTS 8 -#define CB_AUTOMATIC_FONT_COLOR 9 -#define CB_SYSTEM_FONT 10 -#define CB_ACCESSIBILITY_TOOL 11 -#define CB_TEXTSELECTION 12 -#define CB_AUTO_DETECT_HC 13 - -#endif - diff --git a/svx/inc/optasian.hrc b/svx/inc/optasian.hrc deleted file mode 100644 index 2d9c8a282352..000000000000 --- a/svx/inc/optasian.hrc +++ /dev/null @@ -1,52 +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: optasian.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_OPTASIAN_HRC -#define _SVX_OPTASIAN_HRC - -#define GB_KERNING 1 -#define RB_CHAR_KERNING 2 -#define RB_CHAR_PUNCT 3 -#define GB_CHAR_DIST 4 -#define RB_NO_COMP 5 -#define RB_PUNCT_COMP 6 -#define RB_PUNCT_KANA_COMP 7 -#define GB_START_END 8 -#define CB_STANDARD 9 - -#define FT_LANGUAGE 11 -#define LB_LANGUAGE 12 -#define FT_START 13 -#define ED_START 14 -#define FT_END 15 -#define ED_END 16 -#define FT_HINT 17 - -#endif - diff --git a/svx/inc/optcolor.hrc b/svx/inc/optcolor.hrc deleted file mode 100644 index 06730cf196c0..000000000000 --- a/svx/inc/optcolor.hrc +++ /dev/null @@ -1,222 +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: optcolor.hrc,v $ - * $Revision: 1.8.196.1 $ - * - * 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_OPTCOLOR_HRC -#define _SVX_OPTCOLOR_HRC - -//Color config page -#define FL_COLORSCHEME 1 -#define FT_COLORSCHEME 2 -#define LB_COLORSCHEME 3 -#define PB_SAVESCHEME 4 -#define PB_DELETESCHEME 5 -#define FL_CUSTOMCOLORS 6 -#define CT_COLORCONFIG 7 - -#define HB_HEADER 10 -#define VB_VSCROLL 11 -#define WN_SCROLL 12 -#define ST_ON 17 -#define ST_UIELEM 18 -#define ST_COLSET 19 -#define ST_PREVIEW 20 - -#define FT_GENERAL 30 -#define FT_DOCCOLOR 31 -#define LB_DOCCOLOR 32 -#define WN_DOCCOLOR 33 -#define CB_DOCBOUND 34 -#define LB_DOCBOUND 35 -#define WN_DOCBOUND 36 -#define FT_APPBACKGROUND 37 -#define LB_APPBACKGROUND 38 -#define WN_APPBACKGROUND 39 -#define CB_OBJECTBOUNDARIES 40 -#define LB_OBJECTBOUNDARIES 41 -#define WN_OBJECTBOUNDARIES 42 -#define CB_TABLEBOUNDARIES 43 -#define LB_TABLEBOUNDARIES 44 -#define WN_TABLEBOUNDARIES 45 -#define FT_FONTCOLOR 46 -#define LB_FONTCOLOR 47 -#define WN_FONTCOLOR 48 -#define CB_LINKS 49 -#define LB_LINKS 50 -#define WN_LINKS 51 -#define CB_LINKSVISITED 52 -#define LB_LINKSVISITED 53 -#define WN_LINKSVISITED 54 - -#define FT_SPELL 58 -#define LB_SPELL 59 -#define WN_SPELL 60 - -#define FT_WRITER 61 -#define FT_WRITERTEXTGRID 62 -#define LB_WRITERTEXTGRID 63 -#define WN_WRITERTEXTGRID 64 -#define CB_WRITERFIELDSHADINGS 65 -#define LB_WRITERFIELDSHADINGS 66 -#define WN_WRITERFIELDSHADINGS 67 -#define CB_WRITERIDXSHADINGS 68 -#define LB_WRITERIDXSHADINGS 69 -#define WN_WRITERIDXSHADINGS 70 -#define LB_WRITERDIRECTCURSOR 71 -#define FT_WRITERDIRECTCURSOR 72 -#define WN_WRITERDIRECTCURSOR 73 -#define LB_WRITERSCRIPTINDICATOR 77 -#define FT_WRITERSCRIPTINDICATOR 78 -#define WN_WRITERSCRIPTINDICATOR 79 -#define LB_WRITERSECTIONBOUNDARIES 80 -#define CB_WRITERSECTIONBOUNDARIES 81 -#define WN_WRITERSECTIONBOUNDARIES 82 -#define LB_WRITERPAGEBREAKS 83 -#define FT_WRITERPAGEBREAKS 84 -#define WN_WRITERPAGEBREAKS 85 - -#define FT_HTML 88 -#define FT_HTMLSGML 89 -#define LB_HTMLSGML 90 -#define WN_HTMLSGML 91 -#define FT_HTMLCOMMENT 92 -#define LB_HTMLCOMMENT 93 -#define WN_HTMLCOMMENT 94 -#define FT_HTMLKEYWORD 95 -#define LB_HTMLKEYWORD 96 -#define WN_HTMLKEYWORD 97 -#define FT_HTMLUNKNOWN 98 -#define LB_HTMLUNKNOWN 99 -#define WN_HTMLUNKNOWN 100 - -#define FT_CALC 103 -#define FT_CALCGRID 104 -#define LB_CALCGRID 105 -#define WN_CALCGRID 106 -#define FT_CALCPAGEBREAK 107 -#define LB_CALCPAGEBREAK 108 -#define WN_CALCPAGEBREAK 109 -#define FT_CALCPAGEBREAKMANUAL 100 -#define LB_CALCPAGEBREAKMANUAL 101 -#define WN_CALCPAGEBREAKMANUAL 112 -#define FT_CALCPAGEBREAKAUTO 113 -#define LB_CALCPAGEBREAKAUTO 114 -#define WN_CALCPAGEBREAKAUTO 115 -#define FT_CALCDETECTIVE 116 -#define LB_CALCDETECTIVE 117 -#define WN_CALCDETECTIVE 118 -#define FT_CALCDETECTIVEERROR 119 -#define LB_CALCDETECTIVEERROR 120 -#define WN_CALCDETECTIVEERROR 121 -#define FT_CALCREFERENCE 122 -#define LB_CALCREFERENCE 123 -#define WN_CALCREFERENCE 124 -#define FT_CALCNOTESBACKGROUND 125 -#define LB_CALCNOTESBACKGROUND 126 -#define WN_CALCNOTESBACKGROUND 127 -#define FT_DRAW 128 -#define FT_DRAWGRID 132 -#define LB_DRAWGRID 133 -#define WN_DRAWGRID 134 -#define FT_BASICIDENTIFIER 141 -#define LB_BASICIDENTIFIER 142 -#define WN_BASICIDENTIFIER 143 -#define FT_BASICCOMMENT 144 -#define LB_BASICCOMMENT 145 -#define WN_BASICCOMMENT 146 -#define FT_BASICNUMBER 147 -#define LB_BASICNUMBER 148 -#define WN_BASICNUMBER 142 -#define FT_BASICSTRING 153 -#define LB_BASICSTRING 154 -#define WN_BASICSTRING 155 -#define FT_BASICOPERATOR 156 -#define LB_BASICOPERATOR 157 -#define WN_BASICOPERATOR 158 -#define FT_BASICKEYWORD 159 -#define LB_BASICKEYWORD 160 -#define WN_BASICKEYWORD 161 -#define FT_BASIC 162 -#define FT_BASICERROR 163 -#define LB_BASICERROR 164 -#define WN_BASICERROR 165 - -#define FT_SQL_COMMAND 173 -#define FT_SQLIDENTIFIER 174 -#define LB_SQLIDENTIFIER 175 -#define WN_SQLIDENTIFIER 176 -#define FT_SQLNUMBER 177 -#define LB_SQLNUMBER 178 -#define WN_SQLNUMBER 179 -#define FT_SQLSTRING 180 -#define LB_SQLSTRING 181 -#define WN_SQLSTRING 182 -#define FT_SQLOPERATOR 183 -#define LB_SQLOPERATOR 184 -#define WN_SQLOPERATOR 185 -#define FT_SQLKEYWORD 186 -#define LB_SQLKEYWORD 187 -#define WN_SQLKEYWORD 188 -#define FT_SQLPARAMETER 189 -#define LB_SQLPARAMETER 190 -#define WN_SQLPARAMETER 191 -#define FT_SQLCOMMENT 192 -#define LB_SQLCOMMENT 193 -#define WN_SQLCOMMENT 194 - -#define ST_EXTENSION 166 - - - -#define _FT_WIDTH 120 -#define _LINE_HEIGHT 15 -#define _FT_HEIGHT 10 -#define _CB_WIDTH 130 -#define _FT_XPOS 14 -#define _CB_XPOS 6 -#define _LB_XPOS 139 -#define _LB_WIDTH 50 -#define _LB_HEIGHT 50 -#define _WN_WIDTH 30 -#define _WN_HEIGHT 12 -#define _WN_XPOS 195 - -#define FT_SMARTTAGS 168 -#define LB_SMARTTAGS 169 -#define WN_SMARTTAGS 170 - -#define ST_SPELL_CHECK_HIGHLIGHTING 171 -#define ST_GRAMMAR_CHECK_HIGHLIGHTING 172 - - -#endif - - - - - diff --git a/svx/inc/optctl.hrc b/svx/inc/optctl.hrc deleted file mode 100644 index 4897926f610c..000000000000 --- a/svx/inc/optctl.hrc +++ /dev/null @@ -1,61 +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: optctl.hrc,v $ - * $Revision: 1.6 $ - * - * 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_OPTCTL_HRC -#define _SVX_OPTCTL_HRC - -#include <svtools/controldims.hrc> - -#define FL_SEQUENCECHECKING 10 -#define CB_SEQUENCECHECKING 11 -#define CB_RESTRICTED 12 -#define CB_TYPE_REPLACE 13 - -#define FL_CURSORCONTROL 20 -#define FT_MOVEMENT 21 -#define RB_MOVEMENT_LOGICAL 22 -#define RB_MOVEMENT_VISUAL 23 - -#define FL_GENERAL 30 -#define FT_NUMERALS 31 -#define LB_NUMERALS 32 - -#define EXTRA_SPACE_Y 16 -#define ROW_0 (RSC_SP_TBPG_INNERBORDER_TOP) -#define ROW_1 (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_2 (ROW_1+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_3 (ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y) -#define ROW_4 (ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_5 (ROW_4+(RSC_CD_RADIOBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) -#define ROW_6 (ROW_5+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y) -#define ROW_7 (ROW_6+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_8 (ROW_7+(RSC_CD_DROPDOWN_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) - -#endif // #ifndef _SVX_OPTCTL_HRC - diff --git a/svx/inc/optgenrl.hrc b/svx/inc/optgenrl.hrc deleted file mode 100644 index 4c519d5ebb70..000000000000 --- a/svx/inc/optgenrl.hrc +++ /dev/null @@ -1,88 +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: optgenrl.hrc,v $ - * $Revision: 1.5 $ - * - * 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_OPTGENRL_HRC -#define _SVX_OPTGENRL_HRC - -// defines ------------------------------------------------------------------ - -#define FT_COMPANY 10 -#define ED_COMPANY 11 -#define FT_NAME 12 -#define FT_NAME_RUSS 13 -#define ED_FATHERNAME 14 -#define ED_FIRSTNAME 15 -#define ED_NAME 16 -#define ED_SHORTNAME 17 -#define FT_STREET 18 -#define FT_STREET_RUSS 19 -#define ED_STREET 20 -#define ED_APARTMENTNR 21 -#define FT_CITY 22 -#define ED_PLZ 23 -#define ED_CITY 24 -#define ED_US_CITY 25 -#define ED_US_STATE 26 -#define ED_US_ZIPCODE 27 -#define FT_COUNTRY 28 -#define ED_COUNTRY 29 -#define FT_TITLEPOS 30 -#define ED_TITLE 31 -#define ED_POSITION 32 -#define FT_PHONE 33 -#define ED_TELPRIVAT 34 -#define ED_TELCOMPANY 35 -#define FT_FAXMAIL 36 -#define ED_FAX 37 -#define ED_EMAIL 38 -#define GB_ADDRESS 39 -#define CB_USEDATA 40 -#define FT_NAME_EASTERN 41 - -#define STR_US_STATE 10 -#define STR_QUERY_REG 11 - -// Positionierungshilfen f"ur den Dialog - -#define HSPACE 2 -#define VSPACE 3 -#define LINEH 12 -#define FLINEH 8 -#define LEFT 12 -#define MID 100 -#define RIGHT 248 -#define TOP 10 -#define LINE(y) (14+y*15) -#define FLINE(y) (16+y*15) -#define NAMELEN 74 - -#endif // #ifndef _SVX_OPTGENRL_HRC - -// ******************************************************************* EOF - diff --git a/svx/inc/optimprove.hrc b/svx/inc/optimprove.hrc deleted file mode 100644 index 919b01c6fb6a..000000000000 --- a/svx/inc/optimprove.hrc +++ /dev/null @@ -1,53 +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: optimprove.hrc,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 _SVX_OPTIMPROVE_HRC -#define _SVX_OPTIMPROVE_HRC - -// defines --------------------------------------------------------------- - -#define FL_IMPROVE 10 -#define FT_INVITATION 11 -#define RB_YES 12 -#define RB_NO 13 -#define FL_DATA 14 -#define FT_NR_REPORTS 15 -#define FT_NR_REPORTS_VALUE 16 -#define FT_NR_ACTIONS 17 -#define FT_NR_ACTIONS_VALUE 18 -#define PB_SHOWDATA 19 -#define FI_INFO 20 -#define WIN_INFO 21 -#define BTN_OK 22 - -#define STR_INFO 10 -#define STR_MOREINFO 11 - -#endif - diff --git a/svx/inc/optinet2.hrc b/svx/inc/optinet2.hrc deleted file mode 100644 index da394d6d249f..000000000000 --- a/svx/inc/optinet2.hrc +++ /dev/null @@ -1,175 +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: optinet2.hrc,v $ - * $Revision: 1.11 $ - * - * 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_OPTINET_HRC -#define _SVX_OPTINET_HRC - -#ifndef _SVT_CONTROLDIMS_HRC_ -#include <svtools/controldims.hrc> -#endif - -// Proxy ------------------------------------------------------------------ -#define GB_SETTINGS 1 -#define FT_PROXYMODE 2 -#define LB_PROXYMODE 2 -#define FT_HTTP_PROXY 3 -#define ED_HTTP_PROXY 3 -#define FT_HTTP_PORT 4 -#define ED_HTTP_PORT 4 -#define FT_FTP_PROXY 5 -#define ED_FTP_PROXY 5 -#define FT_FTP_PORT 6 -#define ED_FTP_PORT 6 -#define FT_SOCKS_PROXY 7 -#define ED_SOCKS_PROXY 7 -#define FT_SOCKS_PORT 8 -#define ED_SOCKS_PORT 8 -#define FT_NOPROXYFOR 11 -#define ED_NOPROXYFOR 11 -#define ED_NOPROXYDESC 12 -#define ST_PROXY_FROM_BROWSER 13 -#define FT_HTTPS_PROXY 14 -#define ED_HTTPS_PROXY 14 -#define FT_HTTPS_PORT 15 -#define ED_HTTPS_PORT 15 - -// Search ------------------------------------------------------------------ -#define GB_SEARCH 40 -#define LB_SEARCH 40 -#define FT_SEARCH_NAME 41 -#define ED_SEARCH_NAME 41 -#define FT_SEARCH 42 -#define RB_AND 43 -#define RB_OR 44 -#define RB_EXACT 45 -#define FT_URL 46 -#define ED_URL 46 -#define FT_POSTFIX 47 -#define ED_POSTFIX 47 -#define FT_SEPARATOR 48 -#define ED_SEPARATOR 48 -#define FT_CASE 49 -#define ED_CASE 49 -#define PB_CHANGE 53 -#define PB_DELETE 54 -#define PB_ADD 55 -#define PB_NEW 56 -#define MSG_MODIFY 57 - -// Protocols -------------------------------------------------------------- -#define GB_DNS 105 -#define RB_DNS_AUTO 106 -#define RB_DNS_MANUAL 107 -#define ED_DNS 107 - -#define ST_MSG_255_0 111 -#define ST_MSG_255_1 112 - -// Site Certificate -------------------------------------------------------- -#define GB_SITECERT 120 -#define LB_SITECERT 121 -#define LB_FILTERCERT 122 -#define PB_EDIT_CERT 123 -#define PB_DELETE_CERT 124 - -// personal Certificate ---------------------------------------------------- -#define GB_PERSCERT 130 -#define LB_PERSCERT 131 -#define PB_NEW_PERSCERT 132 -#define PB_INFO_PERSCERT 133 -#define PB_DELETE_PERSCERT 134 - -// Security ------------------------------------------------------------- - -#define FL_SEC_SECURITYOPTIONS 10 -#define FI_SEC_SECURITYOPTIONS 11 -#define PB_SEC_SECURITYOPTIONS 12 -#define FL_SEC_PASSWORDS 13 -#define CB_SEC_SAVEPASSWORDS 14 -#define PB_SEC_CONNECTIONS 15 -#define CB_SEC_MASTERPASSWORD 16 -#define FI_SEC_MASTERPASSWORD 17 -#define PB_SEC_MASTERPASSWORD 18 -#define FL_SEC_MACROSEC 19 -#define FI_SEC_MACROSEC 20 -#define PB_SEC_MACROSEC 21 -#define FL_SEC_FILESHARING 22 -#define CB_SEC_RECOMMREADONLY 23 -#define CB_SEC_RECORDCHANGES 24 -#define PB_SEC_PROTRECORDS 25 - -#define STR_SEC_PROTRECORDS 10 -#define STR_SEC_UNPROTRECORDS 11 -#define STR_SEC_NOPASSWDSAVE 12 - -#define TP_WIDTH 260 -#define TP_HEIGHT 185 -#define OFFS_BUTTON_Y (-6) -#define BORDER_OFFSET 8 -#define COL_0 (RSC_SP_TBPG_INNERBORDER_LEFT) -#define COL_1 (COL_0+RSC_SP_FLGR_SPACE_X) -#define COL_1a (COL_1+RSC_SP_CHK_TEXTINDENT) -#define COL_4 (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT) -#define COL_3 (COL_4-RSC_CD_PUSHBUTTON_WIDTH) -#define COL_2 (COL_3-RSC_SP_CTRL_DESC_X) - -#define ROW_0 (RSC_SP_FLGR_INNERBORDER_TOP) -#define ROW_1 (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define ROW_2 (ROW_1+3*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define ROW_2a (ROW_2-RSC_SP_FLGR_SPACE_Y-RSC_CD_PUSHBUTTON_HEIGHT) -#define ROW_3 (ROW_2+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define ROW_4 (ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_DESC_Y-1) -#define ROW_4a (ROW_4+RSC_CD_CHECKBOX_HEIGHT+1) -#define ROW_5 (ROW_4a+4*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define ROW_6 (ROW_5+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define ROW_7 (ROW_6+2*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define ROW_8 (ROW_7+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define ROW_9 (ROW_8+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_DESC_Y) - -// Defines - JavaScriptDisableQueryBox_Impl ------------------------------- - -#define IMG_JSCPT_WARNING 220 -#define FT_JSCPT_WARNING 221 -#define CB_JSCPT_DISABLE 222 -#define GB_JSCPT_WARNING 223 -#define BTN_JSCPT_YES 224 -#define BTN_JSCPT_NO 225 - -// Defines - SvxEMailTabPage_Impl -#define FL_MAIL 1 -#define FT_MAILERURL 2 -#define FI_MAILERURL 3 -#define ED_MAILERURL 4 -#define PB_MAILERURL 5 -#define STR_DEFAULT_FILENAME 6 - -#endif // #ifndef _SVX_OPTINET_HRC - -// ******************************************************************* EOF - diff --git a/svx/inc/optjsearch.hrc b/svx/inc/optjsearch.hrc deleted file mode 100644 index dfe6b7bdb07a..000000000000 --- a/svx/inc/optjsearch.hrc +++ /dev/null @@ -1,53 +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: optjsearch.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. - * - ************************************************************************/ - -#define FL_TREAT_AS_EQUAL 100 -#define CB_MATCH_CASE 101 -#define CB_MATCH_FULL_HALF_WIDTH 102 -#define CB_MATCH_HIRAGANA_KATAKANA 103 -#define CB_MATCH_CONTRACTIONS 104 -#define CB_MATCH_MINUS_DASH_CHOON 105 -#define CB_MATCH_REPEAT_CHAR_MARKS 106 -#define CB_MATCH_VARIANT_FORM_KANJI 107 -#define CB_MATCH_OLD_KANA_FORMS 108 -#define CB_MATCH_DIZI_DUZU 109 -#define CB_MATCH_BAVA_HAFA 110 -#define CB_MATCH_TSITHICHI_DHIZI 111 -#define CB_MATCH_HYUFYU_BYUVYU 112 -#define CB_MATCH_SESHE_ZEJE 113 -#define CB_MATCH_IAIYA 114 -#define CB_MATCH_KIKU 115 - -#define FL_IGNORE 200 -#define CB_IGNORE_PUNCTUATION 201 -#define CB_IGNORE_WHITESPACES 202 -#define CB_MATCH_PROLONGED_SOUNDMARK 203 -#define CB_IGNORE_MIDDLE_DOT 204 - diff --git a/svx/inc/optpath.hrc b/svx/inc/optpath.hrc deleted file mode 100644 index 0fcef57dcf4c..000000000000 --- a/svx/inc/optpath.hrc +++ /dev/null @@ -1,46 +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: optpath.hrc,v $ - * $Revision: 1.5 $ - * - * 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_OPTPATH_HRC -#define _SVX_OPTPATH_HRC - -// defines --------------------------------------------------------------- - -#define FT_TYPE 10 -#define FT_PATH 11 -#define LB_PATH 12 -#define BTN_PATH 13 -#define BTN_STANDARD 14 -#define GB_STD 15 -#define IMG_LOCK 16 -#define IMG_LOCK_HC 17 -#define STR_MULTIPATHDLG 18 - -#endif - diff --git a/svx/inc/optsave.hrc b/svx/inc/optsave.hrc deleted file mode 100644 index c5b2ab5e765a..000000000000 --- a/svx/inc/optsave.hrc +++ /dev/null @@ -1,84 +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: optsave.hrc,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_OPTSAVE_HRC -#define _SVX_OPTSAVE_HRC - -// defines ------------------------------------------------------------------ - -#define LB_LOAD 10 -#define CB_LOAD_SETTINGS 11 -#define CB_LOAD_DOCPRINTER 12 -#define GB_SAVE 13 -#define BTN_DOCINFO 14 -#define BTN_BACKUP 15 -#define BTN_AUTOSAVE 16 -#define ED_AUTOSAVE 17 -#define FT_MINUTE 18 -#define BTN_AUTOSAVEPROMPT 19 -#define BTN_NOPRETTYPRINTING 20 -#define FI_BACKUP 21 -#define BTN_WARNALIENFORMAT 22 -#define FT_ODF_VERSION 23 -#define LB_ODF_VERSION 24 - -#define GB_RELATIVE 40 -#define BTN_RELATIVE_FSYS 41 -#define BTN_RELATIVE_INET 42 - -#define FL_FILTER 43 -#define FT_APP 44 -#define LB_APP 45 -#define FT_FILTER 46 -#define LB_FILTER 47 -#define FI_FILTER 48 -#define FT_WARN 49 -#define FI_ODF_WARNING 50 - -#define IMG_ODF_WARNING 1 -#define IMG_ODF_WARNING_HC 2 - -#define APP_WRITER 0 -#define APP_WRITER_WEB 1 -#define APP_WRITER_GLOBAL 2 -#define APP_CALC 3 -#define APP_IMPRESS 4 -#define APP_DRAW 5 -#define APP_MATH 6 -#define APP_COUNT 7 - -//Filter warning -#define PB_OK 1 -#define FT_FILTER_WARNING 2 -#define CB_DONT_SHOW_AGAIN 3 -#define IMG_WARNING 4 -#define PB_CANCEL 5 - -#endif // #ifndef _SVX_OPTSAVE_HRC - diff --git a/svx/inc/optspell.hrc b/svx/inc/optspell.hrc deleted file mode 100644 index e13ba3ea09a2..000000000000 --- a/svx/inc/optspell.hrc +++ /dev/null @@ -1,45 +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: optspell.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. - * - ************************************************************************/ - -// defines --------------------------------------------------------------- - -#define BTN_OK 10 -#define BTN_CANCEL 11 -#define BTN_BOOK 12 - -#define LB_BOOK 20 -#define GB_BOOK 21 - -#define BTN_CAPS 30 -#define BTN_NUMS 31 -#define BTN_UPLOW 32 -#define GB_AUDIT 33 - - diff --git a/svx/inc/radiobtnbox.hxx b/svx/inc/radiobtnbox.hxx deleted file mode 100644 index a0477d25b262..000000000000 --- a/svx/inc/radiobtnbox.hxx +++ /dev/null @@ -1,66 +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: radiobtnbox.hxx,v $ - * $Revision: 1.5 $ - * - * 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_RADIOBTNBOX_HXX -#define _SVX_RADIOBTNBOX_HXX - -// include --------------------------------------------------------------- - -#include <svx/simptabl.hxx> -#include "svx/svxdllapi.h" - -namespace svx { - -// class SvxRadioButtonListBox ------------------------------------------- - -class SVX_DLLPUBLIC SvxRadioButtonListBox : public SvxSimpleTable -{ - using SvxSimpleTable::SetTabs; - -private: - Point m_aCurMousePoint; - -protected: - virtual void SetTabs(); - virtual void MouseButtonUp( const MouseEvent& _rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - -public: - SvxRadioButtonListBox( Window* _pParent, const ResId& _rId ); - ~SvxRadioButtonListBox(); - - void HandleEntryChecked( SvLBoxEntry* _pEntry ); - - const Point& GetCurMousePoint() const; -}; - -} // end of namespace ::svx - -#endif // #ifndef _SVX_RADIOBTNBOX_HXX - diff --git a/svx/inc/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx index 411a16d60e31..411a16d60e31 100755 --- a/svx/inc/EnhancedCustomShapeFunctionParser.hxx +++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx index c4a7ce195267..af3551c83301 100644 --- a/svx/inc/svx/dlgctrl.hxx +++ b/svx/inc/svx/dlgctrl.hxx @@ -408,6 +408,7 @@ public: void Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); void SelectEntryByList( const XDashList* pList, const String& rStr, const XDash& rDash, USHORT nDist = 0 ); + void FillStyles(); }; /************************************************************************* diff --git a/svx/inc/svx/optimprove.hxx b/svx/inc/svx/optimprove.hxx deleted file mode 100644 index 61f184239e88..000000000000 --- a/svx/inc/svx/optimprove.hxx +++ /dev/null @@ -1,143 +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: optimprove.hxx,v $ - * $Revision: 1.2 $ - * - * 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_OPTIMPROVE_HXX -#define _SVX_OPTIMPROVE_HXX - -// include --------------------------------------------------------------- - -#include "svx/svxdllapi.h" - -#include <vcl/tabpage.hxx> -#include <vcl/fixed.hxx> -#include <vcl/button.hxx> -#include <svtools/fixedhyper.hxx> -#include <sfx2/basedlgs.hxx> -#include <sfx2/tabdlg.hxx> - -// class SvxEmptyPage ---------------------------------------------------- - -class SvxEmptyPage : public TabPage -{ -public: - SvxEmptyPage( Window* pParent ); -}; - -// class SvxImprovementPage ---------------------------------------------- - -class SvxImprovementPage : public TabPage -{ -private: - FixedLine m_aImproveFL; - FixedText m_aInvitationFT; - RadioButton m_aYesRB; - RadioButton m_aNoRB; - FixedLine m_aDataFL; - FixedText m_aNumberOfReportsFT; - FixedText m_aNumberOfReportsValueFT; - FixedText m_aNumberOfActionsFT; - FixedText m_aNumberOfActionsValueFT; - PushButton m_aShowDataPB; - - String m_sInfo; - String m_sMoreInfo; - -public: - SvxImprovementPage( Window* pParent ); - ~SvxImprovementPage(); - - inline bool IsYesChecked() const { return m_aYesRB.IsChecked() != FALSE; } - - inline String GetPageText() const { return GetText(); } - inline String GetInvitationText() const { return m_aInvitationFT.GetText(); } - inline String GetYesButtonText() const { return m_aYesRB.GetText(); } - inline String GetNoButtonText() const { return m_aNoRB.GetText(); } - inline String GetInfoText() const { return m_sInfo; } - inline String GetTitleText() const { return m_aImproveFL.GetText(); } -}; - -class SvxImprovementOptionsPage : public SfxTabPage -{ -private: - FixedLine m_aImproveFL; - FixedText m_aInvitationFT; - RadioButton m_aYesRB; - RadioButton m_aNoRB; - svt::FixedHyperlinkImage m_aInfoFI; - FixedLine m_aDataFL; - FixedText m_aNumberOfReportsFT; - FixedText m_aNumberOfReportsValueFT; - FixedText m_aNumberOfActionsFT; - FixedText m_aNumberOfActionsValueFT; - PushButton m_aShowDataPB; - - String m_sInfo; - String m_sMoreInfo; - ::rtl::OUString m_sLogPath; - - SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet ); - - DECL_LINK( HandleHyperlink, svt::FixedHyperlinkImage * ); - DECL_LINK( HandleShowData, PushButton * ); - -public: - virtual ~SvxImprovementOptionsPage(); - - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static sal_uInt16* GetRanges(); - - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); -}; - -class SvxImprovementDialog : public SfxSingleTabDialog -{ -private: - SvxImprovementPage* m_pPage; - - DECL_LINK( HandleOK, OKButton * ); - DECL_LINK( HandleHyperlink, svt::FixedHyperlinkImage * ); - -public: - SvxImprovementDialog( Window* pParent, const String& rInfoURL ); -}; - -class SvxInfoWindow : public Window -{ -private: - FixedText m_aInfoText; - -public: - SvxInfoWindow( Window* pParent, const ResId& rResId ); - - void SetInfoText( const String& rText ); -}; - -#endif - diff --git a/svx/inc/svx/optlingu.hxx b/svx/inc/svx/optlingu.hxx deleted file mode 100644 index 6c2a0a7ac528..000000000000 --- a/svx/inc/svx/optlingu.hxx +++ /dev/null @@ -1,185 +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: optlingu.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 _SVX_OPTLINGU_HXX -#define _SVX_OPTLINGU_HXX - -// include --------------------------------------------------------------- - -#include <vcl/group.hxx> -#include <vcl/fixed.hxx> -#include <vcl/toolbox.hxx> -#include <vcl/field.hxx> -#include <svtools/fixedhyper.hxx> -#include <sfx2/tabdlg.hxx> -#include <svx/checklbx.hxx> -#include <svx/langbox.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include "svx/svxdllapi.h" - -namespace com{namespace sun{namespace star{ -namespace beans{ - class XPropertySet; -} -namespace linguistic2{ - class XDictionary; - class XDictionaryList; - class XSpellChecker; -}}}} - -class SvLBoxEntry; -class SvxLinguData_Impl; - -// define ---------------------------------------------------------------- - -#define GROUP_MODULES ((sal_uInt16)0x0008) - -// forward --------------------------------------------------------------- - -class SvxEditModulesDlg : public ModalDialog -{ - FixedLine aModulesFL; - FixedText aLanguageFT; - SvxLanguageBox aLanguageLB; - - SvxCheckListBox aModulesCLB; - PushButton aPrioUpPB; - PushButton aPrioDownPB; - PushButton aBackPB; - svt::FixedHyperlink aMoreDictsLink; - - FixedLine aButtonsFL; - HelpButton aHelpPB; - OKButton aClosePB; - - String sSpell; - String sHyph; - String sThes; - String sGrammar; - - SvxLinguData_Impl* pDefaultLinguData; - SvxLinguData_Impl& rLinguData; - - SvLBoxButtonData* pCheckButtonData; - - SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); - -#ifdef _SVX_OPTLINGU_CXX - DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); - DECL_LINK( UpDownHdl_Impl, PushButton * ); - DECL_LINK( ClickHdl_Impl, PushButton * ); - DECL_LINK( BackHdl_Impl, PushButton * ); - DECL_LINK( SelectHdlLB_Impl, ListBox * ); - DECL_LINK( LangSelectHdl_Impl, ListBox* ); - DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); - DECL_LINK( OpenURLHdl_Impl, svt::FixedHyperlink* ); -#endif - -public: - SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData); - virtual ~SvxEditModulesDlg(); -}; - -// class SvxLinguTabPage ------------------------------------------------- - -class SVX_DLLPUBLIC SvxLinguTabPage : public SfxTabPage -{ -private: - FixedLine aLinguisticFL; - FixedText aLinguModulesFT; - SvxCheckListBox aLinguModulesCLB; - PushButton aLinguModulesEditPB; - FixedText aLinguDicsFT; - SvxCheckListBox aLinguDicsCLB; - PushButton aLinguDicsNewPB; - PushButton aLinguDicsEditPB; - PushButton aLinguDicsDelPB; - FixedText aLinguOptionsFT; - SvxCheckListBox aLinguOptionsCLB; - PushButton aLinguOptionsEditPB; - svt::FixedHyperlink aMoreDictsLink; - - String sCapitalWords; - String sWordsWithDigits; - String sCapitalization; - String sSpellSpecial; - String sSpellAuto; - String sGrammarAuto; - String sNumMinWordlen; - String sNumPreBreak; - String sNumPostBreak; - String sHyphAuto; - String sHyphSpecial; - - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > xProp; - - com::sun::star::uno::Reference< - com::sun::star::linguistic2::XDictionaryList > xDicList; - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::linguistic2::XDictionary > > aDics; - - SvLBoxButtonData* pCheckButtonData; - - SvxLinguData_Impl* pLinguData; - - SVX_DLLPRIVATE SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet ); - SVX_DLLPRIVATE SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); - - SVX_DLLPRIVATE void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); - SVX_DLLPRIVATE ULONG GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); - -#ifdef _SVX_OPTLINGU_CXX - DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); - DECL_LINK( ClickHdl_Impl, PushButton * ); - DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * ); - DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); - DECL_LINK( PostDblClickHdl_Impl, SvTreeListBox * ); - DECL_LINK( OpenURLHdl_Impl, svt::FixedHyperlink* ); - - SVX_DLLPRIVATE void UpdateModulesBox_Impl(); - SVX_DLLPRIVATE void UpdateDicBox_Impl(); -#endif - -public: - virtual ~SvxLinguTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static sal_uInt16* GetRanges(); - - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - - void HideGroups( sal_uInt16 nGrp ); -}; - -#endif - diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index e4b3b6152022..fc79ee795c63 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -361,6 +361,9 @@ class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory public: static SvxAbstractDialogFactory* Create(); + // define dtor as this will create typeinfo in svx library + virtual ~SvxAbstractDialogFactory(); + virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, const SfxItemSet* pAttrSet, sal_uInt32 nResId, @@ -382,8 +385,7 @@ public: HangulHanjaConversion::ConversionDirection _ePrimaryDirection, sal_uInt32 nResId) = 0; - virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent, //add for FmShowColsDialog - sal_uInt32 nResId) = 0 ; + virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0; virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog const SfxItemSet& rCoreSet, @@ -394,23 +396,17 @@ public: svx::SpellDialogChildWindow* pSpellChildWindow )=0; virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, //add for ActualizeProgress - GalleryTheme* pThm, - sal_uInt32 nResId) = 0; + GalleryTheme* pThm ) = 0; virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, //add for SearchProgress - const INetURLObject& rStartURL, - sal_uInt32 nResId) = 0; - virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent, //add for TakeProgress - sal_uInt32 nResId) = 0; + const INetURLObject& rStartURL ) = 0; + virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ) = 0; virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, //add for TitleDialog - const String& rOldText, - sal_uInt32 nResId) = 0; + const String& rOldText ) = 0; virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, //add for SvxZoomDialog - GalleryTheme* pThm, - sal_uInt32 nResId) = 0; + GalleryTheme* pThm ) = 0; virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, //add for GalleryThemeProperties ExchangeData* pData, - SfxItemSet* pItemSet, - sal_uInt32 nResId) = 0; + SfxItemSet* pItemSet ) = 0; virtual AbstractURLDlg * CreateURLDialog( Window* pParent, const String& rURL, const String& rAltText, const String& rDescription, const String& rTarget, const String& rName, @@ -448,8 +444,7 @@ public: const SfxItemSet& rOptionsSet, USHORT nUniqueId, INT32 nInitialFlags, sal_uInt32 nResId) = 0; //add for SvxJSearchOptionsDialog - virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent, - sal_uInt32 nResId) = 0; //add for FmInputRecordNoDialog + virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0; virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl, sal_uInt32 nResId ) = 0; //add for SvxNewDictionaryDialog diff --git a/svx/inc/unolingu.hxx b/svx/inc/unolingu.hxx index 8dc76a291ceb..c2ba7aa60565 100644 --- a/svx/inc/unolingu.hxx +++ b/svx/inc/unolingu.hxx @@ -201,9 +201,9 @@ public: //TL:TODO: remove those functions or make them inline SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > SvxGetSpellChecker(); -::com::sun::star::uno::Reference< +SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > SvxGetHyphenator(); -::com::sun::star::uno::Reference< +SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > SvxGetThesaurus(); SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > SvxGetDictionaryList(); diff --git a/svx/inc/xattr.hxx b/svx/inc/xattr.hxx index c1f5051b0565..bbd14abf0c99 100644 --- a/svx/inc/xattr.hxx +++ b/svx/inc/xattr.hxx @@ -63,7 +63,7 @@ class XGradientTable; #include <svx/xfillit0.hxx> #include <svx/xtextit0.hxx> #include <svx/xsetit.hxx> -#include <xlinjoit.hxx> +#include <svx/xlinjoit.hxx> #endif // _XATTR_HXX |